livekit-client 1.15.7 → 1.15.9

package/dist/livekit-client.esm.mjs

@@ -10614,7 +10614,7 @@ function getMatch(exp, ua) {
   return match && match.length >= id && match[id] || '';
 }
 
-var version$1 = "1.15.7";
+var version$1 = "1.15.9";
 
 const version = version$1;
 const protocolVersion = 11;
@@ -12753,6 +12753,18 @@ SimulateScenario.fields = proto3.util.newFieldList(() => [{
   kind: "scalar",
   T: 3 /* ScalarType.INT64 */,
   oneof: "scenario"
+}, {
+  no: 7,
+  name: "disconnect_signal_on_resume",
+  kind: "scalar",
+  T: 8 /* ScalarType.BOOL */,
+  oneof: "scenario"
+}, {
+  no: 8,
+  name: "disconnect_signal_on_resume_no_messages",
+  kind: "scalar",
+  T: 8 /* ScalarType.BOOL */,
+  oneof: "scenario"
 }]);
 /**
  * @generated from message livekit.Ping
@@ -14835,6 +14847,9 @@ class SignalClient {
   get isDisconnected() {
     return this.state === SignalConnectionState.DISCONNECTING || this.state === SignalConnectionState.DISCONNECTED;
   }
+  get isEstablishingConnection() {
+    return this.state === SignalConnectionState.CONNECTING || this.state === SignalConnectionState.RECONNECTING;
+  }
   constructor() {
     let useJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     let loggerOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -14978,7 +14993,7 @@ class SignalClient {
                 this.startPingInterval();
               }
               resolve(resp.message.value);
-            } else if (this.state === SignalConnectionState.RECONNECTING) {
+            } else if (this.state === SignalConnectionState.RECONNECTING && resp.message.case !== 'leave') {
               // in reconnecting, any message received means signal reconnected
               this.state = SignalConnectionState.CONNECTED;
               abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', abortHandler);
@@ -14989,6 +15004,8 @@ class SignalClient {
                 resolve();
                 shouldProcessMessage = true;
               }
+            } else if (this.isEstablishingConnection && resp.message.case === 'leave') {
+              reject(new ConnectionError('Received leave request while trying to (re)connect'));
             } else if (!opts.reconnect) {
               // non-reconnect case, should receive join response first
               reject(new ConnectionError("did not receive join response, got ".concat((_d = resp.message) === null || _d === void 0 ? void 0 : _d.case, " instead")));
@@ -15003,8 +15020,12 @@ class SignalClient {
           this.handleSignalResponse(resp);
         });
         this.ws.onclose = ev => {
+          if (this.isEstablishingConnection) {
+            reject(new ConnectionError('Websocket got closed during a (re)connection attempt'));
+          }
           this.log.warn("websocket closed", Object.assign(Object.assign({}, this.logContext), {
-            reason: ev.reason
+            reason: ev.reason,
+            state: this.state
           }));
           this.handleOnClose(ev.reason);
         };
@@ -16822,6 +16843,7 @@ class PCTransportManager {
     return __awaiter(this, void 0, void 0, function* () {
       this.log.debug('received server offer', Object.assign(Object.assign({}, this.logContext), {
         RTCSdpType: sd.type,
+        sdp: sd.sdp,
         signalingState: this.subscriber.getSignallingState().toString()
       }));
       yield this.subscriber.setRemoteDescription(sd);
@@ -17393,6 +17415,9 @@ class RTCEngine extends eventsExports.EventEmitter {
       delete this.pendingTrackResolvers[res.cid];
       resolve(res.track);
     };
+    this.client.onLocalTrackUnpublished = response => {
+      this.emit(EngineEvent.LocalTrackUnpublished, response);
+    };
     this.client.onTokenRefresh = token => {
       this.token = token;
     };
@@ -17615,6 +17640,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       }
       // guard for attempting reconnection multiple times while one attempt is still not finished
       if (this.attemptingReconnect) {
+        livekitLogger.warn('already attempting reconnect, returning early', this.logContext);
         return;
       }
       if (((_a = this.clientConfiguration) === null || _a === void 0 ? void 0 : _a.resumeConnection) === ClientConfigSetting.DISABLED ||
@@ -17704,6 +17730,10 @@ class RTCEngine extends eventsExports.EventEmitter {
         this.client.setReconnected();
         this.emit(EngineEvent.SignalRestarted, joinResponse);
         yield this.waitForPCReconnected();
+        // re-check signal connection state before setting engine as resumed
+        if (this.client.currentState !== SignalConnectionState.CONNECTED) {
+          throw new SignalReconnectError('Signal connection got severed during reconnect');
+        }
         (_a = this.regionUrlProvider) === null || _a === void 0 ? void 0 : _a.resetAttempts();
         // reconnect success
         this.emit(EngineEvent.Restarted);
@@ -17740,13 +17770,15 @@ class RTCEngine extends eventsExports.EventEmitter {
           const rtcConfig = this.makeRTCConfiguration(res);
           this.pcManager.updateConfiguration(rtcConfig);
         }
-      } catch (e) {
+      } catch (error) {
         let message = '';
-        if (e instanceof Error) {
-          message = e.message;
-          this.log.error(e.message, this.logContext);
+        if (error instanceof Error) {
+          message = error.message;
+          this.log.error(error.message, Object.assign(Object.assign({}, this.logContext), {
+            error
+          }));
         }
-        if (e instanceof ConnectionError && e.reason === 0 /* ConnectionErrorReason.NotAllowed */) {
+        if (error instanceof ConnectionError && error.reason === 0 /* ConnectionErrorReason.NotAllowed */) {
           throw new UnexpectedConnectionState('could not reconnect, token might be expired');
         }
         throw new SignalReconnectError(message);
@@ -17758,6 +17790,10 @@ class RTCEngine extends eventsExports.EventEmitter {
       }
       yield this.pcManager.triggerIceRestart();
       yield this.waitForPCReconnected();
+      // re-check signal connection state before setting engine as resumed
+      if (this.client.currentState !== SignalConnectionState.CONNECTED) {
+        throw new SignalReconnectError('Signal connection got severed during reconnect');
+      }
       this.client.setReconnected();
       // recreate publish datachannel if it's id is null
       // (for safari https://bugs.webkit.org/show_bug.cgi?id=184688)
@@ -21566,7 +21602,7 @@ class LocalParticipant extends Participant {
       yield Promise.all(localPubs.map(pub => __awaiter(this, void 0, void 0, function* () {
         const track = pub.track;
         yield this.unpublishTrack(track, false);
-        if (restartTracks && !track.isMuted && (track instanceof LocalAudioTrack || track instanceof LocalVideoTrack) && !track.isUserProvided) {
+        if (restartTracks && !track.isMuted && track.source !== Track.Source.ScreenShare && track.source !== Track.Source.ScreenShareAudio && (track instanceof LocalAudioTrack || track instanceof LocalVideoTrack) && !track.isUserProvided) {
           // generally we need to restart the track before publishing, often a full reconnect
           // is necessary because computer had gone to sleep.
           this.log.debug('restarting existing track', Object.assign(Object.assign({}, this.logContext), {
@@ -22066,30 +22102,7 @@ class Room extends eventsExports.EventEmitter {
       this.applyJoinResponse(joinResponse);
       try {
         // unpublish & republish tracks
-        const localPubs = [];
-        this.localParticipant.tracks.forEach(pub => {
-          if (pub.track) {
-            localPubs.push(pub);
-          }
-        });
-        yield Promise.all(localPubs.map(pub => __awaiter(this, void 0, void 0, function* () {
-          const track = pub.track;
-          this.localParticipant.unpublishTrack(track, false);
-          if (!track.isMuted) {
-            if ((track instanceof LocalAudioTrack || track instanceof LocalVideoTrack) && track.source !== Track.Source.ScreenShare && track.source !== Track.Source.ScreenShareAudio && !track.isUserProvided) {
-              // we need to restart the track before publishing, often a full reconnect
-              // is necessary because computer had gone to sleep.
-              this.log.debug('restarting existing track', Object.assign(Object.assign({}, this.logContext), {
-                track: pub.trackSid
-              }));
-              yield track.restartTrack();
-            }
-            this.log.debug('publishing new track', Object.assign(Object.assign({}, this.logContext), {
-              track: pub.trackSid
-            }));
-            yield this.localParticipant.publishTrack(track, pub.options);
-          }
-        })));
+        yield this.localParticipant.republishAllTracks(undefined, true);
       } catch (error) {
         this.log.error('error trying to re-publish tracks after reconnection', Object.assign(Object.assign({}, this.logContext), {
           error
@@ -22584,6 +22597,30 @@ class Room extends eventsExports.EventEmitter {
           // @ts-expect-error function is private
           yield this.engine.client.handleOnClose('simulate resume-disconnect');
           break;
+        case 'disconnect-signal-on-resume':
+          postAction = () => __awaiter(this, void 0, void 0, function* () {
+            // @ts-expect-error function is private
+            yield this.engine.client.handleOnClose('simulate resume-disconnect');
+          });
+          req = new SimulateScenario({
+            scenario: {
+              case: 'disconnectSignalOnResume',
+              value: true
+            }
+          });
+          break;
+        case 'disconnect-signal-on-resume-no-messages':
+          postAction = () => __awaiter(this, void 0, void 0, function* () {
+            // @ts-expect-error function is private
+            yield this.engine.client.handleOnClose('simulate resume-disconnect');
+          });
+          req = new SimulateScenario({
+            scenario: {
+              case: 'disconnectSignalOnResumeNoMessages',
+              value: true
+            }
+          });
+          break;
         case 'full-reconnect':
           this.engine.fullReconnectOnNext = true;
           // @ts-expect-error function is private
@@ -22620,8 +22657,8 @@ class Room extends eventsExports.EventEmitter {
           break;
       }
       if (req) {
-        this.engine.client.sendSimulateScenario(req);
-        postAction();
+        yield this.engine.client.sendSimulateScenario(req);
+        yield postAction();
       }
     });
   }
@@ -22990,7 +23027,11 @@ class Room extends eventsExports.EventEmitter {
       !this.engine.verifyTransport()) {
         consecutiveFailures++;
         this.log.warn('detected connection state mismatch', Object.assign(Object.assign({}, this.logContext), {
-          numFailures: consecutiveFailures
+          numFailures: consecutiveFailures,
+          engine: {
+            closed: this.engine.isClosed,
+            transportsConnected: this.engine.verifyTransport()
+          }
         }));
         if (consecutiveFailures >= 3) {
           this.recreateEngine();
@@ -23073,7 +23114,7 @@ class Room extends eventsExports.EventEmitter {
           name: 'video-dummy'
         }), new LocalVideoTrack(publishOptions.useRealTracks ? (yield window.navigator.mediaDevices.getUserMedia({
           video: true
-        })).getVideoTracks()[0] : createDummyVideoStreamTrack((_a = 160 * participantOptions.aspectRatios[0]) !== null && _a !== void 0 ? _a : 1, 160, true, true), undefined, false, {
+        })).getVideoTracks()[0] : createDummyVideoStreamTrack(160 * ((_a = participantOptions.aspectRatios[0]) !== null && _a !== void 0 ? _a : 1), 160, true, true), undefined, false, {
           loggerName: this.options.loggerName,
           loggerContextCb: () => this.logContext
         }), {
@@ -23112,7 +23153,7 @@ class Room extends eventsExports.EventEmitter {
         });
         const p = this.getOrCreateParticipant(info.identity, info);
         if (participantOptions.video) {
-          const dummyVideo = createDummyVideoStreamTrack((_b = 160 * participantOptions.aspectRatios[i % participantOptions.aspectRatios.length]) !== null && _b !== void 0 ? _b : 1, 160, false, true);
+          const dummyVideo = createDummyVideoStreamTrack(160 * ((_b = participantOptions.aspectRatios[i % participantOptions.aspectRatios.length]) !== null && _b !== void 0 ? _b : 1), 160, false, true);
           const videoTrack = new TrackInfo({
             source: TrackSource.CAMERA,
             sid: Math.floor(Math.random() * 10000).toString(),