J3vb/OwnCord
1
0
Fork 0
mirror of https://github.com/J3vb/OwnCord.git synced 2026-09-03 03:50:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: guard replaceTrack with pipeline generation counter (BUG-106)

Browse Source 
Both setupAudioPipeline and teardownAudioPipeline called replaceTrack
as fire-and-forget. If teardown's replaceTrack resolved after setup's,
the WebRTC sender would be bound to the wrong track. Both paths now
capture _pipelineGeneration before the async call and detect stale
completions, preventing out-of-order track replacement.
This commit is contained in:
J3vb
2026-04-02 13:47:22 +02:00
parent 827b370ac1
commit 1754046c7d
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/tauri-client/src/lib/audioPipeline.ts
+23 -5
View File
@@ -124,12 +124,22 @@ export class AudioPipeline {
this.audioPipelineAnalyser = analyser;
this.audioPipelineDest = dest;
// Replace the WebRTC sender's track with the pipeline output
// Replace the WebRTC sender's track with the pipeline output.
// BUG-106: Guard with generation counter to discard stale replaceTrack
// if teardown races ahead of this setup.
const adjustedTrack = dest.stream.getAudioTracks()[0];
const gen = this._pipelineGeneration;
if (adjustedTrack !== undefined && micPub.track.sender) {
void micPub.track.sender.replaceTrack(adjustedTrack).catch((err) => {
log.warn("Failed to replace sender track with pipeline output", err);
});
void micPub.track.sender
.replaceTrack(adjustedTrack)
.then(() => {
if (this._pipelineGeneration !== gen) {
log.debug("replaceTrack (setup) completed after generation change — stale");
}
})
.catch((err) => {
log.warn("Failed to replace sender track with pipeline output", err);
});
}
log.info("Audio pipeline created", { inputGain: this.currentInputGain });
@@ -146,13 +156,21 @@ export class AudioPipeline {
this._pipelineGeneration++;
this.stopVadPolling();
// Restore original mic track on the WebRTC sender
// Restore original mic track on the WebRTC sender.
// BUG-106: Guard with generation counter so a stale teardown replaceTrack
// cannot overwrite a subsequent setup's pipeline track.
const gen = this._pipelineGeneration;
if (this.room !== null) {
const micPub = this.room.localParticipant.getTrackPublication(Track.Source.Microphone);
if (micPub?.track?.sender !== undefined) {
const originalTrack = micPub.track.mediaStreamTrack;
void micPub.track.sender
.replaceTrack(originalTrack)
.then(() => {
if (this._pipelineGeneration !== gen) {
log.debug("replaceTrack (teardown) completed after generation change — stale");
}
})
.catch((err) => log.debug("Failed to replace track during teardown", err));
}
}