livekit-client 1.9.1 → 1.9.2

package/dist/livekit-client.esm.mjs

@@ -14940,7 +14940,7 @@ var uaParser = {exports: {}};
 var uaParserExports = uaParser.exports;
 var UAParser = /*@__PURE__*/getDefaultExportFromCjs(uaParserExports);
 
-var version$1 = "1.9.1";
+var version$1 = "1.9.2";
 
 const version = version$1;
 const protocolVersion = 9;
@@ -15509,13 +15509,7 @@ class SignalClient {
         this.handleSignalResponse(resp);
       };
       this.ws.onclose = ev => {
-        if (!this.isConnected) return;
-        livekitLogger.debug("websocket connection closed: ".concat(ev.reason));
-        this.isConnected = false;
-        if (this.onClose) {
-          this.onClose(ev.reason);
-        }
-        this.ws = undefined;
+        this.handleOnClose(ev.reason);
       };
     });
   }
@@ -15784,6 +15778,17 @@ class SignalClient {
     }
     this.isReconnecting = false;
   }
+  handleOnClose(reason) {
+    if (!this.isConnected) return;
+    this.clearPingInterval();
+    this.clearPingTimeout();
+    livekitLogger.debug("websocket connection closed: ".concat(reason));
+    this.isConnected = false;
+    if (this.onClose) {
+      this.onClose(reason);
+    }
+    this.ws = undefined;
+  }
   handleWSError(ev) {
     livekitLogger.error('websocket error', ev);
   }
@@ -15799,9 +15804,7 @@ class SignalClient {
     }
     this.pingTimeout = CriticalTimers.setTimeout(() => {
       livekitLogger.warn("ping timeout triggered. last pong received at: ".concat(new Date(Date.now() - this.pingTimeoutDuration * 1000).toUTCString()));
-      if (this.onClose) {
-        this.onClose('ping timeout');
-      }
+      this.handleOnClose('ping timeout');
     }, this.pingTimeoutDuration * 1000);
   }
   /**
@@ -18571,7 +18574,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       } else {
         livekitLogger.info("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(Date.now() - this.reconnectStart, "ms. giving up"));
         this.emit(EngineEvent.Disconnected);
-        this.close();
+        await this.close();
       }
     } finally {
       this.attemptingReconnect = false;
@@ -18792,6 +18795,30 @@ class RTCEngine extends eventsExports.EventEmitter {
   async ensurePublisherConnected(kind) {
     await this.ensureDataTransportConnected(kind, false);
   }
+  /* @internal */
+  verifyTransport() {
+    // primary connection
+    if (!this.primaryPC) {
+      return false;
+    }
+    if (this.primaryPC.connectionState === 'closed' || this.primaryPC.connectionState === 'failed') {
+      return false;
+    }
+    // also verify publisher connection if it's needed or different
+    if (this.hasPublished && this.subscriberPrimary) {
+      if (!this.publisher) {
+        return false;
+      }
+      if (this.publisher.pc.connectionState === 'closed' || this.publisher.pc.connectionState === 'failed') {
+        return false;
+      }
+    }
+    // ensure signal is connected
+    if (!this.client.ws || this.client.ws.readyState === WebSocket.CLOSED) {
+      return false;
+    }
+    return true;
+  }
   /** @internal */
   negotiate() {
     // observe signal state
@@ -22242,6 +22269,7 @@ var ConnectionState;
   ConnectionState["Connected"] = "connected";
   ConnectionState["Reconnecting"] = "reconnecting";
 })(ConnectionState || (ConnectionState = {}));
+const connectionReconcileFrequency = 2 * 1000;
 /** @deprecated RoomState has been renamed to [[ConnectionState]] */
 const RoomState = ConnectionState;
 /**
@@ -22421,6 +22449,7 @@ class Room extends eventsExports.EventEmitter {
       }
       this.setAndEmitConnectionState(ConnectionState.Connected);
       this.emit(RoomEvent.Connected);
+      this.registerConnectionReconcile();
     };
     /**
      * disconnects the room, emits [[RoomEvent.Disconnected]]
@@ -22464,6 +22493,7 @@ class Room extends eventsExports.EventEmitter {
       await this.disconnect();
     };
     this.handleRestarting = () => {
+      this.clearConnectionReconcile();
       // also unwind existing participants & existing subscriptions
       for (const p of this.participants.values()) {
         this.handleParticipantDisconnected(p.sid, p);
@@ -22520,6 +22550,7 @@ class Room extends eventsExports.EventEmitter {
       }
       this.setAndEmitConnectionState(ConnectionState.Connected);
       this.emit(RoomEvent.Reconnected);
+      this.registerConnectionReconcile();
       // emit participant connected events after connection has been re-established
       this.participants.forEach(participant => {
         this.emit(RoomEvent.ParticipantConnected, participant);
@@ -22761,7 +22792,7 @@ class Room extends eventsExports.EventEmitter {
     return (_b = (_a = this.roomInfo) === null || _a === void 0 ? void 0 : _a.numPublishers) !== null && _b !== void 0 ? _b : 0;
   }
   maybeCreateEngine() {
-    if (this.engine) {
+    if (this.engine && !this.engine.isClosed) {
       return;
     }
     this.engine = new RTCEngine(this.options);
@@ -22776,6 +22807,7 @@ class Room extends eventsExports.EventEmitter {
     }).on(EngineEvent.Disconnected, reason => {
       this.handleDisconnect(this.options.stopLocalTrackOnUnpublish, reason);
     }).on(EngineEvent.ActiveSpeakersUpdate, this.handleActiveSpeakersUpdate).on(EngineEvent.DataPacketReceived, this.handleDataPacket).on(EngineEvent.Resuming, () => {
+      this.clearConnectionReconcile();
       if (this.setAndEmitConnectionState(ConnectionState.Reconnecting)) {
         this.emit(RoomEvent.Reconnecting);
       }
@@ -22783,6 +22815,7 @@ class Room extends eventsExports.EventEmitter {
     }).on(EngineEvent.Resumed, () => {
       this.setAndEmitConnectionState(ConnectionState.Connected);
       this.emit(RoomEvent.Reconnected);
+      this.registerConnectionReconcile();
       this.updateSubscriptions();
       // once reconnected, figure out if any participants connected during reconnect and emit events for it
       const diffParticipants = Array.from(this.participants.values()).filter(p => !this.cachedParticipantSids.includes(p.sid));
@@ -23093,41 +23126,45 @@ class Room extends eventsExports.EventEmitter {
     let shouldStopTracks = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     let reason = arguments.length > 1 ? arguments[1] : undefined;
     var _a;
+    this.clearConnectionReconcile();
     if (this.state === ConnectionState.Disconnected) {
       return;
     }
-    this.participants.forEach(p => {
-      p.tracks.forEach(pub => {
-        p.unpublishTrack(pub.trackSid);
+    try {
+      this.participants.forEach(p => {
+        p.tracks.forEach(pub => {
+          p.unpublishTrack(pub.trackSid);
+        });
       });
-    });
-    this.localParticipant.tracks.forEach(pub => {
-      var _a, _b;
-      if (pub.track) {
-        this.localParticipant.unpublishTrack(pub.track, shouldStopTracks);
-      }
-      if (shouldStopTracks) {
-        (_a = pub.track) === null || _a === void 0 ? void 0 : _a.detach();
-        (_b = pub.track) === null || _b === void 0 ? void 0 : _b.stop();
+      this.localParticipant.tracks.forEach(pub => {
+        var _a, _b;
+        if (pub.track) {
+          this.localParticipant.unpublishTrack(pub.track, shouldStopTracks);
+        }
+        if (shouldStopTracks) {
+          (_a = pub.track) === null || _a === void 0 ? void 0 : _a.detach();
+          (_b = pub.track) === null || _b === void 0 ? void 0 : _b.stop();
+        }
+      });
+      this.localParticipant.off(ParticipantEvent.ParticipantMetadataChanged, this.onLocalParticipantMetadataChanged).off(ParticipantEvent.ParticipantNameChanged, this.onLocalParticipantNameChanged).off(ParticipantEvent.TrackMuted, this.onLocalTrackMuted).off(ParticipantEvent.TrackUnmuted, this.onLocalTrackUnmuted).off(ParticipantEvent.LocalTrackPublished, this.onLocalTrackPublished).off(ParticipantEvent.LocalTrackUnpublished, this.onLocalTrackUnpublished).off(ParticipantEvent.ConnectionQualityChanged, this.onLocalConnectionQualityChanged).off(ParticipantEvent.MediaDevicesError, this.onMediaDevicesError).off(ParticipantEvent.ParticipantPermissionsChanged, this.onLocalParticipantPermissionsChanged);
+      this.localParticipant.tracks.clear();
+      this.localParticipant.videoTracks.clear();
+      this.localParticipant.audioTracks.clear();
+      this.participants.clear();
+      this.activeSpeakers = [];
+      if (this.audioContext && typeof this.options.expWebAudioMix === 'boolean') {
+        this.audioContext.close();
+        this.audioContext = undefined;
+      }
+      if (isWeb()) {
+        window.removeEventListener('beforeunload', this.onPageLeave);
+        window.removeEventListener('pagehide', this.onPageLeave);
+        (_a = navigator.mediaDevices) === null || _a === void 0 ? void 0 : _a.removeEventListener('devicechange', this.handleDeviceChange);
       }
-    });
-    this.localParticipant.off(ParticipantEvent.ParticipantMetadataChanged, this.onLocalParticipantMetadataChanged).off(ParticipantEvent.ParticipantNameChanged, this.onLocalParticipantNameChanged).off(ParticipantEvent.TrackMuted, this.onLocalTrackMuted).off(ParticipantEvent.TrackUnmuted, this.onLocalTrackUnmuted).off(ParticipantEvent.LocalTrackPublished, this.onLocalTrackPublished).off(ParticipantEvent.LocalTrackUnpublished, this.onLocalTrackUnpublished).off(ParticipantEvent.ConnectionQualityChanged, this.onLocalConnectionQualityChanged).off(ParticipantEvent.MediaDevicesError, this.onMediaDevicesError).off(ParticipantEvent.ParticipantPermissionsChanged, this.onLocalParticipantPermissionsChanged);
-    this.localParticipant.tracks.clear();
-    this.localParticipant.videoTracks.clear();
-    this.localParticipant.audioTracks.clear();
-    this.participants.clear();
-    this.activeSpeakers = [];
-    if (this.audioContext && typeof this.options.expWebAudioMix === 'boolean') {
-      this.audioContext.close();
-      this.audioContext = undefined;
-    }
-    if (isWeb()) {
-      window.removeEventListener('beforeunload', this.onPageLeave);
-      window.removeEventListener('pagehide', this.onPageLeave);
-      (_a = navigator.mediaDevices) === null || _a === void 0 ? void 0 : _a.removeEventListener('devicechange', this.handleDeviceChange);
+    } finally {
+      this.setAndEmitConnectionState(ConnectionState.Disconnected);
+      this.emit(RoomEvent.Disconnected, reason);
     }
-    this.setAndEmitConnectionState(ConnectionState.Disconnected);
-    this.emit(RoomEvent.Disconnected, reason);
   }
   handleParticipantDisconnected(sid, participant) {
     // remove and send event
@@ -23280,6 +23317,32 @@ class Room extends eventsExports.EventEmitter {
       }
     }
   }
+  registerConnectionReconcile() {
+    this.clearConnectionReconcile();
+    let consecutiveFailures = 0;
+    this.connectionReconcileInterval = CriticalTimers.setInterval(() => {
+      if (
+      // ensure we didn't tear it down
+      !this.engine ||
+      // engine detected close, but Room missed it
+      this.engine.isClosed ||
+      // transports failed without notifying engine
+      !this.engine.verifyTransport()) {
+        consecutiveFailures++;
+        livekitLogger.warn('detected connection state mismatch', {
+          numFailures: consecutiveFailures
+        });
+        if (consecutiveFailures >= 3) this.handleDisconnect(this.options.stopLocalTrackOnUnpublish, DisconnectReason.UNKNOWN_REASON);
+      } else {
+        consecutiveFailures = 0;
+      }
+    }, connectionReconcileFrequency);
+  }
+  clearConnectionReconcile() {
+    if (this.connectionReconcileInterval) {
+      CriticalTimers.clearInterval(this.connectionReconcileInterval);
+    }
+  }
   setAndEmitConnectionState(state) {
     if (state === this.state) {
       // unchanged