livekit-client 2.0.3 → 2.0.4

package/dist/livekit-client.esm.mjs

@@ -352,7 +352,7 @@ function setLogExtension(extension) {
   };
   logger.setLevel(logger.getLevel()); // Be sure to call setLevel method in order to apply plugin
 }
-loglevelExports.getLogger('lk-e2ee');
+const workerLogger = loglevelExports.getLogger('lk-e2ee');
 
 // Copyright 2021-2023 Buf Technologies, Inc.
 //
@@ -10537,6 +10537,7 @@ var EngineEvent;
   EngineEvent["RemoteMute"] = "remoteMute";
   EngineEvent["SubscribedQualityUpdate"] = "subscribedQualityUpdate";
   EngineEvent["LocalTrackUnpublished"] = "localTrackUnpublished";
+  EngineEvent["Offline"] = "offline";
 })(EngineEvent || (EngineEvent = {}));
 var TrackEvent;
 (function (TrackEvent) {
@@ -10710,7 +10711,7 @@ function getMatch(exp, ua) {
   return match && match.length >= id && match[id] || '';
 }
 
-var version$1 = "2.0.3";
+var version$1 = "2.0.4";
 
 const version = version$1;
 const protocolVersion = 12;
@@ -10737,21 +10738,35 @@ CriticalTimers.clearInterval = function () {
 };
 
 class VideoPreset {
-  constructor(width, height, maxBitrate, maxFramerate, priority) {
-    this.width = width;
-    this.height = height;
-    this.encoding = {
-      maxBitrate,
-      maxFramerate,
-      priority
-    };
+  constructor(widthOrOptions, height, maxBitrate, maxFramerate, priority) {
+    if (typeof widthOrOptions === 'object') {
+      this.width = widthOrOptions.width;
+      this.height = widthOrOptions.height;
+      this.aspectRatio = widthOrOptions.aspectRatio;
+      this.encoding = {
+        maxBitrate: widthOrOptions.maxBitrate,
+        maxFramerate: widthOrOptions.maxFramerate,
+        priority: widthOrOptions.priority
+      };
+    } else if (height !== undefined && maxBitrate !== undefined) {
+      this.width = widthOrOptions;
+      this.height = height;
+      this.aspectRatio = widthOrOptions / height;
+      this.encoding = {
+        maxBitrate,
+        maxFramerate,
+        priority
+      };
+    } else {
+      throw new TypeError('Unsupported options: provide at least width, height and maxBitrate');
+    }
   }
   get resolution() {
     return {
       width: this.width,
       height: this.height,
       frameRate: this.encoding.maxFramerate,
-      aspectRatio: this.width / this.height
+      aspectRatio: this.aspectRatio
     };
   }
 }
@@ -14164,7 +14179,16 @@ class DeviceManager {
       // resolve actual device id if it's 'default': Chrome returns it when no
       // device has been chosen
       const devices = yield this.getDevices(kind);
-      const device = devices.find(d => d.groupId === groupId && d.deviceId !== defaultId);
+      // `default` devices will have the same groupId as the entry with the actual device id so we store the counts for each group id
+      const groupIdCounts = new Map(devices.map(d => [d.groupId, 0]));
+      devices.forEach(d => {
+        var _a;
+        return groupIdCounts.set(d.groupId, ((_a = groupIdCounts.get(d.groupId)) !== null && _a !== void 0 ? _a : 0) + 1);
+      });
+      const device = devices.find(d => {
+        var _a;
+        return (groupId === d.groupId || ((_a = groupIdCounts.get(d.groupId)) !== null && _a !== void 0 ? _a : 0) > 1) && d.deviceId !== defaultId;
+      });
       return device === null || device === void 0 ? void 0 : device.deviceId;
     });
   }
@@ -14372,18 +14396,25 @@ class LocalTrack extends Track {
       return this;
     });
   }
-  replaceTrack(track) {
-    let userProvidedTrack = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  replaceTrack(track, userProvidedOrOptions) {
     return __awaiter(this, void 0, void 0, function* () {
       if (!this.sender) {
         throw new TrackInvalidError('unable to replace an unpublished track');
       }
+      let userProvidedTrack;
+      let stopProcessor;
+      if (typeof userProvidedOrOptions === 'boolean') {
+        userProvidedTrack = userProvidedOrOptions;
+      } else if (userProvidedOrOptions !== undefined) {
+        userProvidedTrack = userProvidedOrOptions.userProvidedTrack;
+        stopProcessor = userProvidedOrOptions.stopProcessor;
+      }
+      this.providedByUser = userProvidedTrack !== null && userProvidedTrack !== void 0 ? userProvidedTrack : true;
       this.log.debug('replace MediaStreamTrack', this.logContext);
       yield this.setMediaStreamTrack(track);
       // this must be synced *after* setting mediaStreamTrack above, since it relies
       // on the previous state in order to cleanup
-      this.providedByUser = userProvidedTrack;
-      if (this.processor) {
+      if (stopProcessor && this.processor) {
         yield this.stopProcessor();
       }
       return this;
@@ -14685,7 +14716,8 @@ class E2EEManager extends eventsExports.EventEmitter {
       const msg = {
         kind: 'init',
         data: {
-          keyProviderOptions: this.keyProvider.getOptions()
+          keyProviderOptions: this.keyProvider.getOptions(),
+          loglevel: workerLogger.getLevel()
         }
       };
       if (this.worker) {
@@ -15123,6 +15155,7 @@ class SignalClient {
         };
         this.ws.onerror = ev => __awaiter(this, void 0, void 0, function* () {
           if (this.state !== SignalConnectionState.CONNECTED) {
+            this.state = SignalConnectionState.DISCONNECTED;
             clearTimeout(wsTimeout);
             try {
               const resp = yield fetch("http".concat(url.substring(2), "/validate").concat(params));
@@ -17532,6 +17565,12 @@ class RTCEngine extends eventsExports.EventEmitter {
             this.handleDisconnect('peerconnection failed', subscriberState === 'failed' ? ReconnectReason.RR_SUBSCRIBER_FAILED : ReconnectReason.RR_PUBLISHER_FAILED);
           }
         }
+        // detect cases where both signal client and peer connection are severed and assume that user has lost network connection
+        const isSignalSevered = this.client.isDisconnected || this.client.currentState === SignalConnectionState.RECONNECTING;
+        const isPCSevered = [PCTransportState.FAILED, PCTransportState.CLOSING, PCTransportState.CLOSED].includes(connectionState);
+        if (isSignalSevered && isPCSevered && !this._isClosed) {
+          this.emit(EngineEvent.Offline);
+        }
       });
       this.pcManager.onTrack = ev => {
         this.emit(EngineEvent.MediaTrackAdded, ev.track, ev.streams[0], ev.receiver);
@@ -18362,6 +18401,10 @@ class LocalAudioTrack extends LocalTrack {
     return __awaiter(this, void 0, void 0, function* () {
       const unlock = yield this.muteLock.lock();
       try {
+        if (this.isMuted) {
+          this.log.debug('Track already muted', this.logContext);
+          return this;
+        }
         // disabled special handling as it will cause BT headsets to switch communication modes
         if (this.source === Track.Source.Microphone && this.stopOnMute && !this.isUserProvided) {
           this.log.debug('stopping mic track', this.logContext);
@@ -18384,6 +18427,10 @@ class LocalAudioTrack extends LocalTrack {
     return __awaiter(this, void 0, void 0, function* () {
       const unlock = yield this.muteLock.lock();
       try {
+        if (!this.isMuted) {
+          this.log.debug('Track already unmuted', this.logContext);
+          return this;
+        }
         const deviceHasChanged = this._constraints.deviceId && this._mediaStreamTrack.getSettings().deviceId !== unwrapConstraint(this._constraints.deviceId);
         if (this.source === Track.Source.Microphone && (this.stopOnMute || this._mediaStreamTrack.readyState === 'ended' || deviceHasChanged) && !this.isUserProvided) {
           this.log.debug('reacquiring mic track', this.logContext);
@@ -18953,6 +19000,10 @@ class LocalVideoTrack extends LocalTrack {
     return __awaiter(this, void 0, void 0, function* () {
       const unlock = yield this.muteLock.lock();
       try {
+        if (this.isMuted) {
+          this.log.debug('Track already muted', this.logContext);
+          return this;
+        }
         if (this.source === Track.Source.Camera && !this.isUserProvided) {
           this.log.debug('stopping camera track', this.logContext);
           // also stop the track, so that camera indicator is turned off
@@ -18974,6 +19025,10 @@ class LocalVideoTrack extends LocalTrack {
     return __awaiter(this, void 0, void 0, function* () {
       const unlock = yield this.muteLock.lock();
       try {
+        if (!this.isMuted) {
+          this.log.debug('Track already unmuted', this.logContext);
+          return this;
+        }
         if (this.source === Track.Source.Camera && !this.isUserProvided) {
           this.log.debug('reacquiring camera track', this.logContext);
           yield this.restartTrack();
@@ -20829,6 +20884,9 @@ class LocalParticipant extends Participant {
   publishTrack(track, options) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
+      if (track instanceof LocalAudioTrack) {
+        track.setAudioContext(this.audioContext);
+      }
       yield (_a = this.reconnectFuture) === null || _a === void 0 ? void 0 : _a.promise;
       if (track instanceof LocalTrack && this.pendingPublishPromises.has(track)) {
         yield this.pendingPublishPromises.get(track);
@@ -20878,9 +20936,6 @@ class LocalParticipant extends Participant {
           loggerContextCb: () => this.logContext
         });
       }
-      if (track instanceof LocalAudioTrack) {
-        track.setAudioContext(this.audioContext);
-      }
       // is it already published? if so skip
       let existingPublication;
       this.trackPublications.forEach(publication => {
@@ -22180,6 +22235,7 @@ class Room extends eventsExports.EventEmitter {
       });
     };
     this.onPageLeave = () => __awaiter(this, void 0, void 0, function* () {
+      this.log.info('Page leave detected, disconnecting', this.logContext);
       yield this.disconnect();
     });
     /**
@@ -22678,7 +22734,11 @@ class Room extends eventsExports.EventEmitter {
       if (this.state === ConnectionState.Reconnecting || this.isResuming) {
         this.sendSyncState();
       }
-    }).on(EngineEvent.Restarting, this.handleRestarting).on(EngineEvent.SignalRestarted, this.handleSignalRestarted).on(EngineEvent.DCBufferStatusChanged, (status, kind) => {
+    }).on(EngineEvent.Restarting, this.handleRestarting).on(EngineEvent.SignalRestarted, this.handleSignalRestarted).on(EngineEvent.Offline, () => {
+      if (this.setAndEmitConnectionState(ConnectionState.Reconnecting)) {
+        this.emit(RoomEvent.Reconnecting);
+      }
+    }).on(EngineEvent.DCBufferStatusChanged, (status, kind) => {
       this.emit(RoomEvent.DCBufferStatusChanged, status, kind);
     });
     if (this.localParticipant) {
@@ -22895,8 +22955,8 @@ class Room extends eventsExports.EventEmitter {
    */
   switchActiveDevice(kind, deviceId) {
     let exact = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    var _a, _b;
-    var _c;
+    var _a, _b, _c;
+    var _d;
     return __awaiter(this, void 0, void 0, function* () {
       let deviceHasChanged = false;
       let success = true;
@@ -22935,14 +22995,18 @@ class Room extends eventsExports.EventEmitter {
         if (!supportsSetSinkId() && !this.options.webAudioMix || this.options.webAudioMix && this.audioContext && !('setSinkId' in this.audioContext)) {
           throw new Error('cannot switch audio output, setSinkId not supported');
         }
-        (_a = (_c = this.options).audioOutput) !== null && _a !== void 0 ? _a : _c.audioOutput = {};
+        if (this.options.webAudioMix) {
+          // setting `default` for web audio output doesn't work, so we need to normalize the id before
+          deviceId = (_a = yield DeviceManager.getInstance().normalizeDeviceId('audiooutput', deviceId)) !== null && _a !== void 0 ? _a : '';
+        }
+        (_b = (_d = this.options).audioOutput) !== null && _b !== void 0 ? _b : _d.audioOutput = {};
         const prevDeviceId = this.options.audioOutput.deviceId;
         this.options.audioOutput.deviceId = deviceId;
         deviceHasChanged = prevDeviceId !== deviceConstraint;
         try {
           if (this.options.webAudioMix) {
             // @ts-expect-error setSinkId is not yet in the typescript type of AudioContext
-            (_b = this.audioContext) === null || _b === void 0 ? void 0 : _b.setSinkId(deviceId);
+            (_c = this.audioContext) === null || _c === void 0 ? void 0 : _c.setSinkId(deviceId);
           } else {
             yield Promise.all(Array.from(this.remoteParticipants.values()).map(p => p.setAudioOutput({
               deviceId
@@ -24065,5 +24129,5 @@ function isFacingModeValue(item) {
   return item === undefined || allowedValues.includes(item);
 }
 
-export { AudioPresets, BaseKeyProvider, ConnectionCheck, ConnectionError, ConnectionQuality, ConnectionState, CriticalTimers, CryptorEvent, DataPacket_Kind, DefaultReconnectPolicy, DeviceUnsupportedError, DisconnectReason, EncryptionEvent, EngineEvent, ExternalE2EEKeyProvider, KeyHandlerEvent, KeyProviderEvent, LivekitError, LocalAudioTrack, LocalParticipant, LocalTrack, LocalTrackPublication, LocalVideoTrack, LogLevel, MediaDeviceFailure, NegotiationError, Participant, ParticipantEvent, PublishDataError, RemoteAudioTrack, RemoteParticipant, RemoteTrack, RemoteTrackPublication, RemoteVideoTrack, Room, RoomEvent, ScreenSharePresets, Track, TrackEvent, TrackInvalidError, TrackPublication, UnexpectedConnectionState, UnsupportedServer, VideoPreset, VideoPresets, VideoPresets43, VideoQuality, attachToElement, createAudioAnalyser, createE2EEKey, createKeyMaterialFromBuffer, createKeyMaterialFromString, createLocalAudioTrack, createLocalScreenTracks, createLocalTracks, createLocalVideoTrack, deriveKeys, detachTrack, facingModeFromDeviceLabel, facingModeFromLocalTrack, getEmptyAudioStreamTrack, getEmptyVideoStreamTrack, getLogger, importKey, isBackupCodec, isBrowserSupported, isE2EESupported, isInsertableStreamSupported, isScriptTransformSupported, isVideoFrame, needsRbspUnescaping, parseRbsp, protocolVersion, ratchet, setLogExtension, setLogLevel, supportsAV1, supportsAdaptiveStream, supportsDynacast, supportsVP9, version, videoCodecs, writeRbsp };
+export { AudioPresets, BaseKeyProvider, ConnectionCheck, ConnectionError, ConnectionQuality, ConnectionState, CriticalTimers, CryptorEvent, DataPacket_Kind, DefaultReconnectPolicy, DeviceUnsupportedError, DisconnectReason, EncryptionEvent, EngineEvent, ExternalE2EEKeyProvider, KeyHandlerEvent, KeyProviderEvent, LivekitError, LocalAudioTrack, LocalParticipant, LocalTrack, LocalTrackPublication, LocalVideoTrack, LogLevel, LoggerNames, MediaDeviceFailure, NegotiationError, Participant, ParticipantEvent, PublishDataError, RemoteAudioTrack, RemoteParticipant, RemoteTrack, RemoteTrackPublication, RemoteVideoTrack, Room, RoomEvent, ScreenSharePresets, Track, TrackEvent, TrackInvalidError, TrackPublication, UnexpectedConnectionState, UnsupportedServer, VideoPreset, VideoPresets, VideoPresets43, VideoQuality, attachToElement, createAudioAnalyser, createE2EEKey, createKeyMaterialFromBuffer, createKeyMaterialFromString, createLocalAudioTrack, createLocalScreenTracks, createLocalTracks, createLocalVideoTrack, deriveKeys, detachTrack, facingModeFromDeviceLabel, facingModeFromLocalTrack, getEmptyAudioStreamTrack, getEmptyVideoStreamTrack, getLogger, importKey, isBackupCodec, isBrowserSupported, isE2EESupported, isInsertableStreamSupported, isScriptTransformSupported, isVideoFrame, needsRbspUnescaping, parseRbsp, protocolVersion, ratchet, setLogExtension, setLogLevel, supportsAV1, supportsAdaptiveStream, supportsDynacast, supportsVP9, version, videoCodecs, writeRbsp };
 //# sourceMappingURL=livekit-client.esm.mjs.map