livekit-client 1.1.4 → 1.1.7

package/dist/livekit-client.esm.mjs

@@ -10070,7 +10070,7 @@ function computeBitrate(currentStats, prevStats) {
   return (bytesNow - bytesPrev) * 8 * 1000 / (currentStats.timestamp - prevStats.timestamp);
 }
 
-var version$1 = "1.1.4";
+var version$1 = "1.1.7";
 
 const version = version$1;
 const protocolVersion = 8;
@@ -10180,6 +10180,15 @@ function getEmptyAudioStreamTrack() {
 
   return emptyAudioStreamTrack;
 }
+class Future {
+  constructor() {
+    this.promise = new Promise((resolve, reject) => {
+      this.resolve = resolve;
+      this.reject = reject;
+    });
+  }
+
+}
 
 const defaultId = 'default';
 class DeviceManager {
@@ -13215,6 +13224,7 @@ class RemoteTrackPublication extends TrackPublication {
 
     this.handleEnded = track => {
       this.emit(TrackEvent.Ended, track);
+      this.setTrack(undefined);
     };
 
     this.handleVisibilityChange = visible => {
@@ -13342,6 +13352,8 @@ class RemoteTrackPublication extends TrackPublication {
   get videoQuality() {
     return this.currentVideoQuality;
   }
+  /** @internal */
+
 
   setTrack(track) {
     if (this.track) {
@@ -13547,7 +13559,9 @@ class RemoteParticipant extends Participant {
     track.isMuted = publication.isMuted;
     track.setMediaStream(mediaStream);
     track.start();
-    publication.setTrack(track); // set participant volume on new microphone tracks
+    publication.setTrack(track); // subscription means participant has permissions to subscribe
+
+    publication._allowed = true; // set participant volume on new microphone tracks
 
     if (this.volume !== undefined && track instanceof RemoteAudioTrack && track.source === Track.Source.Microphone) {
       track.setVolume(this.volume);
@@ -14486,6 +14500,32 @@ class LocalParticipant extends Participant {
       this.updateTrackSubscriptionPermissions();
     }
   }
+  /** @internal */
+
+
+  updateInfo(info) {
+    super.updateInfo(info); // reconcile track mute status.
+    // if server's track mute status doesn't match actual, we'll have to update
+    // the server's copy
+
+    info.tracks.forEach(ti => {
+      var _a, _b;
+
+      const pub = this.tracks.get(ti.sid);
+
+      if (pub) {
+        const mutedOnServer = pub.isMuted || ((_b = (_a = pub.track) === null || _a === void 0 ? void 0 : _a.isUpstreamPaused) !== null && _b !== void 0 ? _b : false);
+
+        if (mutedOnServer !== ti.muted) {
+          livekitLogger.debug('updating server mute state after reconcile', {
+            sid: ti.sid,
+            muted: mutedOnServer
+          });
+          this.engine.client.sendMuteTrack(ti.sid, mutedOnServer);
+        }
+      }
+    });
+  }
 
   getPublicationForTrack(track) {
     let publication;
@@ -14595,57 +14635,6 @@ class LocalParticipant extends Participant {
 
 }
 
-class Queue {
-  constructor() {
-    this.queue = [];
-    this.running = false;
-  }
-
-  enqueue(cb) {
-    livekitLogger.trace('enqueuing request to fire later');
-    this.queue.push(cb);
-  }
-
-  dequeue() {
-    const evt = this.queue.shift();
-    if (evt) evt();
-    livekitLogger.trace('firing request from queue');
-  }
-
-  async run() {
-    if (this.running) return;
-    livekitLogger.trace('start queue');
-    this.running = true;
-
-    while (this.running && this.queue.length > 0) {
-      this.dequeue();
-    }
-
-    this.running = false;
-    livekitLogger.trace('queue finished');
-  }
-
-  pause() {
-    livekitLogger.trace('pausing queue');
-    this.running = false;
-  }
-
-  reset() {
-    livekitLogger.trace('resetting queue');
-    this.running = false;
-    this.queue = [];
-  }
-
-  isRunning() {
-    return this.running;
-  }
-
-  isEmpty() {
-    return this.queue.length === 0;
-  }
-
-}
-
 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
@@ -18131,6 +18120,57 @@ adapterFactory({
   window: typeof window === 'undefined' ? undefined : window
 });
 
+class Queue {
+  constructor() {
+    this.queue = [];
+    this.running = false;
+  }
+
+  enqueue(cb) {
+    livekitLogger.trace('enqueuing request to fire later');
+    this.queue.push(cb);
+  }
+
+  dequeue() {
+    const evt = this.queue.shift();
+    if (evt) evt();
+    livekitLogger.trace('firing request from queue');
+  }
+
+  async run() {
+    if (this.running) return;
+    livekitLogger.trace('start queue');
+    this.running = true;
+
+    while (this.running && this.queue.length > 0) {
+      this.dequeue();
+    }
+
+    this.running = false;
+    livekitLogger.trace('queue finished');
+  }
+
+  pause() {
+    livekitLogger.trace('pausing queue');
+    this.running = false;
+  }
+
+  reset() {
+    livekitLogger.trace('resetting queue');
+    this.running = false;
+    this.queue = [];
+  }
+
+  isRunning() {
+    return this.running;
+  }
+
+  isEmpty() {
+    return this.queue.length === 0;
+  }
+
+}
+
 const passThroughQueueSignals = ['syncState', 'trickle', 'offer', 'answer', 'simulate', 'leave'];
 
 function canPassThroughQueue(req) {
@@ -19427,14 +19467,18 @@ class Room extends events.exports.EventEmitter {
     this.audioEnabled = true;
 
     this.connect = async (url, token, opts) => {
-      var _a, _b; // guard against calling connect
+      var _a, _b, _c, _d;
 
-
-      if (this.state !== ConnectionState.Disconnected) {
+      if (this.state === ConnectionState.Connected) {
+        // when the state is reconnecting or connected, this function returns immediately
         livekitLogger.warn("already connected to room ".concat(this.name));
         return;
       }
 
+      if (this.connectFuture) {
+        return this.connectFuture.promise;
+      }
+
       this.setAndEmitConnectionState(ConnectionState.Connecting);
 
       if (!this.abortController || this.abortController.signal.aborted) {
@@ -19501,49 +19545,47 @@ class Room extends events.exports.EventEmitter {
         this.emit(RoomEvent.SignalConnected);
       } catch (err) {
         this.recreateEngine();
-        this.setAndEmitConnectionState(ConnectionState.Disconnected);
+        this.setAndEmitConnectionState(ConnectionState.Disconnected, new ConnectionError('could not establish signal connection'));
         throw err;
       } // don't return until ICE connected
 
 
-      return new Promise((resolve, reject) => {
-        var _a, _b;
+      const connectTimeout = setTimeout(() => {
+        // timeout
+        this.recreateEngine();
+        this.setAndEmitConnectionState(ConnectionState.Disconnected, new ConnectionError('could not connect PeerConnection after timeout'));
+      }, maxICEConnectTimeout);
 
-        const connectTimeout = setTimeout(() => {
-          // timeout
-          this.recreateEngine();
-          this.setAndEmitConnectionState(ConnectionState.Disconnected);
-          reject(new ConnectionError('could not connect after timeout'));
-        }, maxICEConnectTimeout);
-
-        const abortHandler = () => {
-          livekitLogger.warn('closing engine');
-          clearTimeout(connectTimeout);
-          this.recreateEngine();
-          this.setAndEmitConnectionState(ConnectionState.Disconnected);
-          reject(new ConnectionError('room connection has been cancelled'));
-        };
+      const abortHandler = () => {
+        livekitLogger.warn('closing engine');
+        clearTimeout(connectTimeout);
+        this.recreateEngine();
+        this.setAndEmitConnectionState(ConnectionState.Disconnected, new ConnectionError('room connection has been cancelled'));
+      };
 
-        if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
-          abortHandler();
-        }
+      if ((_c = this.abortController) === null || _c === void 0 ? void 0 : _c.signal.aborted) {
+        abortHandler();
+      }
 
-        (_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.addEventListener('abort', abortHandler);
-        this.engine.once(EngineEvent.Connected, () => {
-          var _a, _b;
+      (_d = this.abortController) === null || _d === void 0 ? void 0 : _d.signal.addEventListener('abort', abortHandler);
+      this.engine.once(EngineEvent.Connected, () => {
+        var _a, _b;
 
-          clearTimeout(connectTimeout);
-          (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.removeEventListener('abort', abortHandler); // also hook unload event
+        clearTimeout(connectTimeout);
+        (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.removeEventListener('abort', abortHandler); // also hook unload event
 
-          if (isWeb()) {
-            window.addEventListener('beforeunload', this.onBeforeUnload);
-            (_b = navigator.mediaDevices) === null || _b === void 0 ? void 0 : _b.addEventListener('devicechange', this.handleDeviceChange);
-          }
+        if (isWeb()) {
+          window.addEventListener('beforeunload', this.onBeforeUnload);
+          (_b = navigator.mediaDevices) === null || _b === void 0 ? void 0 : _b.addEventListener('devicechange', this.handleDeviceChange);
+        }
 
-          this.setAndEmitConnectionState(ConnectionState.Connected);
-          resolve(this);
-        });
+        this.setAndEmitConnectionState(ConnectionState.Connected);
       });
+
+      if (this.connectFuture) {
+        /** @ts-ignore */
+        return this.connectFuture.promise;
+      }
     };
     /**
      * disconnects the room, emits [[RoomEvent.Disconnected]]
@@ -19752,7 +19794,7 @@ class Room extends events.exports.EventEmitter {
 
         pub.track.streamState = Track.streamStateFromProto(streamState.state);
         participant.emit(ParticipantEvent.TrackStreamStateChanged, pub, pub.track.streamState);
-        this.emitWhenConnected(ParticipantEvent.TrackStreamStateChanged, pub, pub.track.streamState, participant);
+        this.emitWhenConnected(RoomEvent.TrackStreamStateChanged, pub, pub.track.streamState, participant);
       });
     };
 
@@ -19771,7 +19813,7 @@ class Room extends events.exports.EventEmitter {
 
       pub._allowed = update.allowed;
       participant.emit(ParticipantEvent.TrackSubscriptionPermissionChanged, pub, pub.subscriptionStatus);
-      this.emitWhenConnected(ParticipantEvent.TrackSubscriptionPermissionChanged, pub, pub.subscriptionStatus, participant);
+      this.emitWhenConnected(RoomEvent.TrackSubscriptionPermissionChanged, pub, pub.subscriptionStatus, participant);
     };
 
     this.handleDataPacket = (userPacket, kind) => {
@@ -19914,6 +19956,15 @@ class Room extends events.exports.EventEmitter {
     let req;
 
     switch (scenario) {
+      case 'signal-reconnect':
+        this.engine.client.close();
+
+        if (this.engine.client.onClose) {
+          this.engine.client.onClose('simulate disconnect');
+        }
+
+        break;
+
       case 'speaker':
         req = SimulateScenario.fromPartial({
           speakerUpdate: 3
@@ -20277,12 +20328,41 @@ class Room extends events.exports.EventEmitter {
     }
   }
 
-  setAndEmitConnectionState(state) {
+  setAndEmitConnectionState(state, error) {
     if (state === this.state) {
       // unchanged
       return false;
     }
 
+    switch (state) {
+      case ConnectionState.Connecting:
+      case ConnectionState.Reconnecting:
+        if (!this.connectFuture) {
+          // reuse existing connect future if possible
+          this.connectFuture = new Future();
+        }
+
+        break;
+
+      case ConnectionState.Connected:
+        if (this.connectFuture) {
+          this.connectFuture.resolve();
+          this.connectFuture = undefined;
+        }
+
+        break;
+
+      case ConnectionState.Disconnected:
+        if (this.connectFuture) {
+          error !== null && error !== void 0 ? error : error = new Error('disconnected from Room');
+          this.connectFuture.reject(error);
+          this.connectFuture = undefined;
+        }
+
+        break;
+
+    }
+
     this.state = state;
     this.emit(RoomEvent.ConnectionStateChanged, this.state);
     return true;