livekit-client 2.0.1 → 2.0.3

package/dist/livekit-client.esm.mjs

@@ -9980,6 +9980,9 @@ class BaseKeyProvider extends eventsExports.EventEmitter {
       participantIdentity,
       keyIndex
     };
+    if (!this.options.sharedKey && !participantIdentity) {
+      throw new Error('participant identity needs to be passed for encryption key if sharedKey option is false');
+    }
     this.keyInfoMap.set("".concat(participantIdentity !== null && participantIdentity !== void 0 ? participantIdentity : 'shared', "-").concat(keyIndex !== null && keyIndex !== void 0 ? keyIndex : 0), keyInfo);
     this.emit(KeyProviderEvent.SetKey, keyInfo);
   }
@@ -10595,6 +10598,10 @@ var TrackEvent;
    * Fires on RemoteTrackPublication
    */
   TrackEvent["SubscriptionFailed"] = "subscriptionFailed";
+  /**
+   * @internal
+   */
+  TrackEvent["TrackProcessorUpdate"] = "trackProcessorUpdate";
 })(TrackEvent || (TrackEvent = {}));
 
 function r(r, e, n) {
@@ -10703,7 +10710,7 @@ function getMatch(exp, ua) {
   return match && match.length >= id && match[id] || '';
 }
 
-var version$1 = "2.0.1";
+var version$1 = "2.0.3";
 
 const version = version$1;
 const protocolVersion = 12;
@@ -14206,6 +14213,7 @@ class LocalTrack extends Track {
     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
     this._constraints = mediaTrack.getConstraints();
@@ -14270,20 +14278,27 @@ class LocalTrack extends Track {
         this._constraints = newTrack.getConstraints();
       }
       let processedTrack;
-      if (this.processor && newTrack && this.processorElement) {
-        this.log.debug('restarting processor', this.logContext);
-        if (this.kind === 'unknown') {
-          throw TypeError('cannot set processor on track of unknown kind');
+      if (this.processor && newTrack) {
+        const unlock = yield this.processorLock.lock();
+        try {
+          this.log.debug('restarting processor', this.logContext);
+          if (this.kind === 'unknown') {
+            throw TypeError('cannot set processor on track of unknown kind');
+          }
+          if (this.processorElement) {
+            attachToElement(newTrack, this.processorElement);
+            // ensure the processorElement itself stays muted
+            this.processorElement.muted = true;
+          }
+          yield this.processor.restart({
+            track: newTrack,
+            kind: this.kind,
+            element: this.processorElement
+          });
+          processedTrack = this.processor.processedTrack;
+        } finally {
+          unlock();
         }
-        attachToElement(newTrack, this.processorElement);
-        // ensure the processorElement itself stays muted
-        this.processorElement.muted = true;
-        yield this.processor.restart({
-          track: newTrack,
-          kind: this.kind,
-          element: this.processorElement
-        });
-        processedTrack = this.processor.processedTrack;
       }
       if (this.sender) {
         yield this.sender.replaceTrack(processedTrack !== null && processedTrack !== void 0 ? processedTrack : newTrack);
@@ -14376,40 +14391,45 @@ class LocalTrack extends Track {
   }
   restart(constraints) {
     return __awaiter(this, void 0, void 0, function* () {
-      if (!constraints) {
-        constraints = this._constraints;
-      }
-      this.log.debug('restarting track with constraints', Object.assign(Object.assign({}, this.logContext), {
-        constraints
-      }));
-      const streamConstraints = {
-        audio: false,
-        video: false
-      };
-      if (this.kind === Track.Kind.Video) {
-        streamConstraints.video = constraints;
-      } else {
-        streamConstraints.audio = constraints;
+      const unlock = yield this.restartLock.lock();
+      try {
+        if (!constraints) {
+          constraints = this._constraints;
+        }
+        this.log.debug('restarting track with constraints', Object.assign(Object.assign({}, this.logContext), {
+          constraints
+        }));
+        const streamConstraints = {
+          audio: false,
+          video: false
+        };
+        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();
+        // create new track and attach
+        const mediaStream = yield navigator.mediaDevices.getUserMedia(streamConstraints);
+        const newTrack = mediaStream.getTracks()[0];
+        newTrack.addEventListener('ended', this.handleEnded);
+        this.log.debug('re-acquired MediaStreamTrack', this.logContext);
+        yield this.setMediaStreamTrack(newTrack);
+        this._constraints = constraints;
+        this.emit(TrackEvent.Restarted, this);
+        return this;
+      } finally {
+        unlock();
       }
-      // 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 = yield navigator.mediaDevices.getUserMedia(streamConstraints);
-      const newTrack = mediaStream.getTracks()[0];
-      newTrack.addEventListener('ended', this.handleEnded);
-      this.log.debug('re-acquired MediaStreamTrack', this.logContext);
-      yield this.setMediaStreamTrack(newTrack);
-      this._constraints = constraints;
-      this.emit(TrackEvent.Restarted, this);
-      return this;
     });
   }
   setTrackMuted(muted) {
@@ -14548,7 +14568,8 @@ class LocalTrack extends Track {
         const processorOptions = {
           kind: this.kind,
           track: this._mediaStreamTrack,
-          element: this.processorElement
+          element: this.processorElement,
+          audioContext: this.audioContext
         };
         yield processor.init(processorOptions);
         this.processor = processor;
@@ -14561,6 +14582,7 @@ class LocalTrack extends Track {
           }
           yield (_b = this.sender) === null || _b === void 0 ? void 0 : _b.replaceTrack(this.processor.processedTrack);
         }
+        this.emit(TrackEvent.TrackProcessorUpdate, this.processor);
       } finally {
         unlock();
       }
@@ -14587,6 +14609,7 @@ class LocalTrack extends Track {
       (_b = this.processorElement) === null || _b === void 0 ? void 0 : _b.remove();
       this.processorElement = undefined;
       yield this.restart();
+      this.emit(TrackEvent.TrackProcessorUpdate);
     });
   }
 }
@@ -15123,7 +15146,9 @@ class SignalClient {
           let resp;
           if (typeof ev.data === 'string') {
             const json = JSON.parse(ev.data);
-            resp = SignalResponse.fromJson(json);
+            resp = SignalResponse.fromJson(json, {
+              ignoreUnknownFields: true
+            });
           } else if (ev.data instanceof ArrayBuffer) {
             resp = SignalResponse.fromBinary(new Uint8Array(ev.data));
           } else {
@@ -18420,9 +18445,6 @@ class LocalAudioTrack extends LocalTrack {
         if (this.processor) {
           yield this.stopProcessor();
         }
-        if (this.kind === 'unknown') {
-          throw TypeError('cannot set processor on track of unknown kind');
-        }
         const processorOptions = {
           kind: this.kind,
           track: this._mediaStreamTrack,
@@ -18434,6 +18456,7 @@ class LocalAudioTrack extends LocalTrack {
         if (this.processor.processedTrack) {
           yield (_a = this.sender) === null || _a === void 0 ? void 0 : _a.replaceTrack(this.processor.processedTrack);
         }
+        this.emit(TrackEvent.TrackProcessorUpdate, this.processor);
       } finally {
         unlock();
       }
@@ -22034,14 +22057,20 @@ class Room extends eventsExports.EventEmitter {
       const pi = joinResponse.participant;
       this.localParticipant.sid = pi.sid;
       this.localParticipant.identity = pi.identity;
+      if (this.options.e2ee && this.e2eeManager) {
+        try {
+          this.e2eeManager.setSifTrailer(joinResponse.sifTrailer);
+        } catch (e) {
+          this.log.error(e instanceof Error ? e.message : 'Could not set SifTrailer', Object.assign(Object.assign({}, this.logContext), {
+            error: e
+          }));
+        }
+      }
       // populate remote participants, these should not trigger new events
       this.handleParticipantUpdates([pi, ...joinResponse.otherParticipants]);
       if (joinResponse.room) {
         this.handleRoomUpdate(joinResponse.room);
       }
-      if (this.options.e2ee && this.e2eeManager) {
-        this.e2eeManager.setSifTrailer(joinResponse.sifTrailer);
-      }
     };
     this.attemptConnection = (url, token, opts, abortController) => __awaiter(this, void 0, void 0, function* () {
       var _h, _j, _k;
@@ -22476,8 +22505,14 @@ class Room extends eventsExports.EventEmitter {
     this.onLocalTrackUnmuted = pub => {
       this.emit(RoomEvent.TrackUnmuted, pub, this.localParticipant);
     };
+    this.onTrackProcessorUpdate = processor => {
+      var _a;
+      (_a = processor === null || processor === void 0 ? void 0 : processor.onPublish) === null || _a === void 0 ? void 0 : _a.call(processor, this);
+    };
     this.onLocalTrackPublished = pub => __awaiter(this, void 0, void 0, function* () {
-      var _r;
+      var _r, _s, _t, _u, _v;
+      (_r = pub.track) === null || _r === void 0 ? void 0 : _r.on(TrackEvent.TrackProcessorUpdate, this.onTrackProcessorUpdate);
+      (_u = (_t = (_s = pub.track) === null || _s === void 0 ? void 0 : _s.getProcessor()) === null || _t === void 0 ? void 0 : _t.onPublish) === null || _u === void 0 ? void 0 : _u.call(_t, this);
       this.emit(RoomEvent.LocalTrackPublished, pub, this.localParticipant);
       if (pub.track instanceof LocalAudioTrack) {
         const trackIsSilent = yield pub.track.checkForSilence();
@@ -22485,7 +22520,7 @@ class Room extends eventsExports.EventEmitter {
           this.emit(RoomEvent.LocalAudioSilenceDetected, pub);
         }
       }
-      const deviceId = yield (_r = pub.track) === null || _r === void 0 ? void 0 : _r.getDeviceId();
+      const deviceId = yield (_v = pub.track) === null || _v === void 0 ? void 0 : _v.getDeviceId();
       const deviceKind = sourceToKind(pub.source);
       if (deviceKind && deviceId && deviceId !== this.localParticipant.activeDeviceMap.get(deviceKind)) {
         this.localParticipant.activeDeviceMap.set(deviceKind, deviceId);
@@ -22493,6 +22528,8 @@ class Room extends eventsExports.EventEmitter {
       }
     });
     this.onLocalTrackUnpublished = pub => {
+      var _a;
+      (_a = pub.track) === null || _a === void 0 ? void 0 : _a.off(TrackEvent.TrackProcessorUpdate, this.onTrackProcessorUpdate);
       this.emit(RoomEvent.LocalTrackUnpublished, pub, this.localParticipant);
     };
     this.onLocalConnectionQualityChanged = quality => {