livekit-client 2.11.3 → 2.11.4

package/dist/livekit-client.esm.mjs

@@ -10156,8 +10156,7 @@ const KEY_PROVIDER_DEFAULTS = {
   ratchetSalt: SALT,
   ratchetWindowSize: 8,
   failureTolerance: DECRYPTION_FAILURE_TOLERANCE,
-  keyringSize: 16,
-  allowKeyExtraction: false
+  keyringSize: 16
 };
 
 var KeyProviderEvent;
@@ -10201,10 +10200,9 @@ function importKey(keyBytes_1) {
       name: ENCRYPTION_ALGORITHM
     };
     let usage = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'encrypt';
-    let extractable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     return function* () {
       // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey
-      return crypto.subtle.importKey('raw', keyBytes, algorithm, extractable, usage === 'derive' ? ['deriveBits', 'deriveKey'] : ['encrypt', 'decrypt']);
+      return crypto.subtle.importKey('raw', keyBytes, algorithm, false, usage === 'derive' ? ['deriveBits', 'deriveKey'] : ['encrypt', 'decrypt']);
     }();
   });
 }
@@ -11188,7 +11186,7 @@ function getOSVersion(ua) {
   return ua.includes('mac os') ? getMatch(/\(.+?(\d+_\d+(:?_\d+)?)/, ua, 1).replace(/_/g, '.') : undefined;
 }
 
-var version$1 = "2.11.3";
+var version$1 = "2.11.4";
 
 const version = version$1;
 const protocolVersion = 15;
@@ -12342,6 +12340,18 @@ function getNewAudioContext() {
     return audioContext;
   }
 }
+/**
+ * @internal
+ */
+function kindToSource(kind) {
+  if (kind === 'audioinput') {
+    return Track.Source.Microphone;
+  } else if (kind === 'videoinput') {
+    return Track.Source.Camera;
+  } else {
+    return Track.Source.Unknown;
+  }
+}
 /**
  * @internal
  */
@@ -12636,9 +12646,9 @@ class E2EEManager extends eventsExports.EventEmitter {
     room.localParticipant.on(ParticipantEvent.LocalTrackPublished, publication => __awaiter(this, void 0, void 0, function* () {
       this.setupE2EESender(publication.track, publication.track.sender);
     }));
-    keyProvider.on(KeyProviderEvent.SetKey, keyInfo => this.postKey(keyInfo)).on(KeyProviderEvent.RatchetRequest, (participantId, keyIndex) => this.postRatchetRequest(participantId, keyIndex, keyProvider.getOptions().allowKeyExtraction));
+    keyProvider.on(KeyProviderEvent.SetKey, keyInfo => this.postKey(keyInfo)).on(KeyProviderEvent.RatchetRequest, (participantId, keyIndex) => this.postRatchetRequest(participantId, keyIndex));
   }
-  postRatchetRequest(participantIdentity, keyIndex, extractable) {
+  postRatchetRequest(participantIdentity, keyIndex) {
     if (!this.worker) {
       throw Error('could not ratchet key, worker is missing');
     }
@@ -12646,8 +12656,7 @@ class E2EEManager extends eventsExports.EventEmitter {
       kind: 'ratchetRequest',
       data: {
         participantIdentity: participantIdentity,
-        keyIndex,
-        extractable
+        keyIndex
       }
     };
     this.worker.postMessage(msg);
@@ -22810,7 +22819,7 @@ class Room extends eventsExports.EventEmitter {
       }
     };
     this.handleDeviceChange = () => __awaiter(this, void 0, void 0, function* () {
-      var _a, _b;
+      var _a, _b, _c;
       const previousDevices = DeviceManager.getInstance().previousDevices;
       // check for available devices, but don't request permissions in order to avoid prompts for kinds that haven't been used before
       const availableDevices = yield DeviceManager.getInstance().getDevices(undefined, false);
@@ -22827,15 +22836,20 @@ class Room extends eventsExports.EventEmitter {
           }
         }
       }
-      // inputs are automatically handled via TrackEvent.Ended causing a TrackEvent.Restarted. Here we only need to worry about audiooutputs changing
       const kinds = ['audiooutput', 'audioinput', 'videoinput'];
       for (let kind of kinds) {
+        const targetSource = kindToSource(kind);
+        const targetPublication = this.localParticipant.getTrackPublication(targetSource);
+        if (targetPublication && ((_a = targetPublication.track) === null || _a === void 0 ? void 0 : _a.isUserProvided)) {
+          // if the track is user provided, we don't want to switch devices on behalf of the user
+          continue;
+        }
         const devicesOfKind = availableDevices.filter(d => d.kind === kind);
         const activeDevice = this.getActiveDevice(kind);
-        if (activeDevice === ((_a = previousDevices.filter(info => info.kind === kind)[0]) === null || _a === void 0 ? void 0 : _a.deviceId)) {
+        if (activeDevice === ((_b = previousDevices.filter(info => info.kind === kind)[0]) === null || _b === void 0 ? void 0 : _b.deviceId)) {
           // in  Safari the first device is always the default, so we assume a user on the default device would like to switch to the default once it changes
           // FF doesn't emit an event when the default device changes, so we perform the same best effort and switch to the new device once connected and if it's the first in the array
-          if (devicesOfKind.length > 0 && ((_b = devicesOfKind[0]) === null || _b === void 0 ? void 0 : _b.deviceId) !== activeDevice) {
+          if (devicesOfKind.length > 0 && ((_c = devicesOfKind[0]) === null || _c === void 0 ? void 0 : _c.deviceId) !== activeDevice) {
             yield this.switchActiveDevice(kind, devicesOfKind[0].deviceId);
             continue;
           }