livekit-client 1.13.0 → 1.13.1

package/src/room/Room.ts

@@ -209,10 +209,10 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
    */
   async setE2EEEnabled(enabled: boolean) {
     if (this.e2eeManager) {
-      await Promise.all([
-        this.localParticipant.setE2EEEnabled(enabled),
-        this.e2eeManager.setParticipantCryptorEnabled(enabled),
-      ]);
+      await Promise.all([this.localParticipant.setE2EEEnabled(enabled)]);
+      if (this.localParticipant.identity !== '') {
+        this.e2eeManager.setParticipantCryptorEnabled(enabled, this.localParticipant.identity);
+      }
     } else {
       throw Error('e2ee not configured, please set e2ee settings within the room options');
     }
@@ -230,7 +230,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
           this.emit(RoomEvent.ParticipantEncryptionStatusChanged, enabled, participant);
         },
       );
-      this.e2eeManager.on(EncryptionEvent.Error, (error) =>
+      this.e2eeManager.on(EncryptionEvent.EncryptionError, (error) =>
         this.emit(RoomEvent.EncryptionError, error),
       );
       this.e2eeManager?.setup(this);
@@ -1025,7 +1025,15 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       log.warn('tried to create RemoteParticipant for local participant');
       return;
     }
-    const participant = this.getOrCreateParticipant(participantId);
+
+    const participant = this.participants.get(participantId) as RemoteParticipant | undefined;
+
+    if (!participant) {
+      log.error(
+        `Tried to add a track for a participant, that's not present. Sid: ${participantId}`,
+      );
+      return;
+    }
 
     let adaptiveStreamSettings: AdaptiveStreamSettings | undefined;
     if (this.options.adaptiveStream) {
@@ -1445,20 +1453,17 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     return participant;
   }
 
-  private getOrCreateParticipant(id: string, info?: ParticipantInfo): RemoteParticipant {
+  private getOrCreateParticipant(id: string, info: ParticipantInfo): RemoteParticipant {
     if (this.participants.has(id)) {
       return this.participants.get(id) as RemoteParticipant;
     }
-    // it's possible for the RTC track to arrive before signaling data
-    // when this happens, we'll create the participant and make the track work
     const participant = this.createParticipant(id, info);
     this.participants.set(id, participant);
-    if (info) {
-      this.identityToSid.set(info.identity, info.sid);
-      // if we have valid info and the participant wasn't in the map before, we can assume the participant is new
-      // firing here to make sure that `ParticipantConnected` fires before the initial track events
-      this.emitWhenConnected(RoomEvent.ParticipantConnected, participant);
-    }
+
+    this.identityToSid.set(info.identity, info.sid);
+    // if we have valid info and the participant wasn't in the map before, we can assume the participant is new
+    // firing here to make sure that `ParticipantConnected` fires before the initial track events
+    this.emitWhenConnected(RoomEvent.ParticipantConnected, participant);
 
     // also forward events
     // trackPublished is only fired for tracks added after both local participant

package/src/room/participant/LocalParticipant.ts

@@ -104,6 +104,10 @@ export default class LocalParticipant extends Participant {
     return this.microphoneError;
   }
 
+  get isE2EEEnabled(): boolean {
+    return this.encryptionType !== Encryption_Type.NONE;
+  }
+
   getTrack(source: Track.Source): LocalTrackPublication | undefined {
     const track = super.getTrack(source);
     if (track) {

package/src/room/track/LocalTrack.ts

@@ -128,8 +128,23 @@ export default abstract class LocalTrack extends Track {
       newTrack.addEventListener('unmute', this.handleTrackUnmuteEvent);
       this._constraints = newTrack.getConstraints();
     }
+    let processedTrack: MediaStreamTrack | undefined;
+    if (this.processor && newTrack && this.processorElement) {
+      log.debug('restarting processor');
+      if (this.kind === 'unknown') {
+        throw TypeError('cannot set processor on track of unknown kind');
+      }
+
+      attachToElement(newTrack, this.processorElement);
+      await this.processor.restart({
+        track: newTrack,
+        kind: this.kind,
+        element: this.processorElement,
+      });
+      processedTrack = this.processor.processedTrack;
+    }
     if (this.sender) {
-      await this.sender.replaceTrack(newTrack);
+      await this.sender.replaceTrack(processedTrack ?? newTrack);
     }
     this._mediaStreamTrack = newTrack;
     if (newTrack) {
@@ -138,7 +153,7 @@ export default abstract class LocalTrack extends Track {
       // when a valid track is replace, we'd want to start producing
       await this.resumeUpstream();
       this.attachedElements.forEach((el) => {
-        attachToElement(newTrack, el);
+        attachToElement(processedTrack ?? newTrack, el);
       });
     }
   }
@@ -236,14 +251,7 @@ export default abstract class LocalTrack extends Track {
 
     await this.setMediaStreamTrack(newTrack);
     this._constraints = constraints;
-    if (this.processor) {
-      const processor = this.processor;
-      await this.setProcessor(processor);
-    } else {
-      this.attachedElements.forEach((el) => {
-        attachToElement(this._mediaStreamTrack, el);
-      });
-    }
+
     this.emit(TrackEvent.Restarted, this);
     return this;
   }

package/src/room/track/facingMode.ts

@@ -1,4 +1,4 @@
-import log from 'loglevel';
+import log from '../../logger';
 import LocalTrack from './LocalTrack';
 import type { VideoCaptureOptions } from './options';
 

package/src/room/track/processor/types.ts

@@ -29,7 +29,8 @@ export interface TrackProcessor<
   U extends ProcessorOptions<T> = ProcessorOptions<T>,
 > {
   name: string;
-  init: (opts: U) => void;
+  init: (opts: U) => Promise<void>;
+  restart: (opts: U) => Promise<void>;
   destroy: () => Promise<void>;
   processedTrack?: MediaStreamTrack;
 }