livekit-client 2.0.2 → 2.0.3

package/src/room/track/LocalTrack.ts

@@ -42,6 +42,8 @@ export default abstract class LocalTrack<
 
   protected audioContext?: AudioContext;
 
+  private restartLock: Mutex;
+
   /**
    *
    * @param mediaTrack
@@ -62,6 +64,7 @@ export default abstract class LocalTrack<
     this.muteLock = new Mutex();
     this.pauseUpstreamLock = new Mutex();
     this.processorLock = new Mutex();
+    this.restartLock = new Mutex();
     this.setMediaStreamTrack(mediaTrack, true);
 
     // added to satisfy TS compiler, constraints are synced with MediaStreamTrack
@@ -239,44 +242,49 @@ export default abstract class LocalTrack<
   }
 
   protected async restart(constraints?: MediaTrackConstraints) {
-    if (!constraints) {
-      constraints = this._constraints;
-    }
-    this.log.debug('restarting track with constraints', { ...this.logContext, constraints });
+    const unlock = await this.restartLock.lock();
+    try {
+      if (!constraints) {
+        constraints = this._constraints;
+      }
+      this.log.debug('restarting track with constraints', { ...this.logContext, constraints });
 
-    const streamConstraints: MediaStreamConstraints = {
-      audio: false,
-      video: false,
-    };
+      const streamConstraints: MediaStreamConstraints = {
+        audio: false,
+        video: false,
+      };
 
-    if (this.kind === Track.Kind.Video) {
-      streamConstraints.video = constraints;
-    } else {
-      streamConstraints.audio = constraints;
-    }
+      if (this.kind === Track.Kind.Video) {
+        streamConstraints.video = constraints;
+      } else {
+        streamConstraints.audio = constraints;
+      }
 
-    // these steps are duplicated from setMediaStreamTrack because we must stop
-    // the previous tracks before new tracks can be acquired
-    this.attachedElements.forEach((el) => {
-      detachTrack(this.mediaStreamTrack, el);
-    });
-    this._mediaStreamTrack.removeEventListener('ended', this.handleEnded);
-    // on Safari, the old audio track must be stopped before attempting to acquire
-    // the new track, otherwise the new track will stop with
-    // 'A MediaStreamTrack ended due to a capture failure`
-    this._mediaStreamTrack.stop();
+      // these steps are duplicated from setMediaStreamTrack because we must stop
+      // the previous tracks before new tracks can be acquired
+      this.attachedElements.forEach((el) => {
+        detachTrack(this.mediaStreamTrack, el);
+      });
+      this._mediaStreamTrack.removeEventListener('ended', this.handleEnded);
+      // on Safari, the old audio track must be stopped before attempting to acquire
+      // the new track, otherwise the new track will stop with
+      // 'A MediaStreamTrack ended due to a capture failure`
+      this._mediaStreamTrack.stop();
 
-    // create new track and attach
-    const mediaStream = await navigator.mediaDevices.getUserMedia(streamConstraints);
-    const newTrack = mediaStream.getTracks()[0];
-    newTrack.addEventListener('ended', this.handleEnded);
-    this.log.debug('re-acquired MediaStreamTrack', this.logContext);
+      // create new track and attach
+      const mediaStream = await navigator.mediaDevices.getUserMedia(streamConstraints);
+      const newTrack = mediaStream.getTracks()[0];
+      newTrack.addEventListener('ended', this.handleEnded);
+      this.log.debug('re-acquired MediaStreamTrack', this.logContext);
 
-    await this.setMediaStreamTrack(newTrack);
-    this._constraints = constraints;
+      await this.setMediaStreamTrack(newTrack);
+      this._constraints = constraints;
 
-    this.emit(TrackEvent.Restarted, this);
-    return this;
+      this.emit(TrackEvent.Restarted, this);
+      return this;
+    } finally {
+      unlock();
+    }
   }
 
   protected setTrackMuted(muted: boolean) {
@@ -459,6 +467,7 @@ export default abstract class LocalTrack<
         }
         await this.sender?.replaceTrack(this.processor.processedTrack);
       }
+      this.emit(TrackEvent.TrackProcessorUpdate, this.processor);
     } finally {
       unlock();
     }
@@ -484,8 +493,8 @@ export default abstract class LocalTrack<
     this.processor = undefined;
     this.processorElement?.remove();
     this.processorElement = undefined;
-
     await this.restart();
+    this.emit(TrackEvent.TrackProcessorUpdate);
   }
 
   protected abstract monitorSender(): void;

package/src/room/track/Track.ts

@@ -11,6 +11,7 @@ import { StreamState as ProtoStreamState } from '../../proto/livekit_rtc_pb';
 import { TrackEvent } from '../events';
 import type { LoggerOptions } from '../types';
 import { isFireFox, isSafari, isWeb } from '../utils';
+import type { TrackProcessor } from './processor/types';
 import { getLogContextFromTrack } from './utils';
 
 const BACKGROUND_REACTION_DELAY = 5000;
@@ -502,4 +503,5 @@ export type TrackEventCallbacks = {
   elementDetached: (element: HTMLMediaElement) => void;
   upstreamPaused: (track: any) => void;
   upstreamResumed: (track: any) => void;
+  trackProcessorUpdate: (processor?: TrackProcessor<Track.Kind, any>) => void;
 };