livekit-client 2.11.2 → 2.11.3

package/dist/livekit-client.esm.mjs

@@ -10156,7 +10156,8 @@ const KEY_PROVIDER_DEFAULTS = {
   ratchetSalt: SALT,
   ratchetWindowSize: 8,
   failureTolerance: DECRYPTION_FAILURE_TOLERANCE,
-  keyringSize: 16
+  keyringSize: 16,
+  allowKeyExtraction: false
 };
 
 var KeyProviderEvent;
@@ -10200,9 +10201,10 @@ 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, false, usage === 'derive' ? ['deriveBits', 'deriveKey'] : ['encrypt', 'decrypt']);
+      return crypto.subtle.importKey('raw', keyBytes, algorithm, extractable, usage === 'derive' ? ['deriveBits', 'deriveKey'] : ['encrypt', 'decrypt']);
     }();
   });
 }
@@ -11109,7 +11111,7 @@ var TrackEvent;
 
 function cloneDeep(value) {
   if (typeof value === 'undefined') {
-    return;
+    return value;
   }
   if (typeof structuredClone === 'function') {
     return structuredClone(value);
@@ -11186,7 +11188,7 @@ function getOSVersion(ua) {
   return ua.includes('mac os') ? getMatch(/\(.+?(\d+_\d+(:?_\d+)?)/, ua, 1).replace(/_/g, '.') : undefined;
 }
 
-var version$1 = "2.11.2";
+var version$1 = "2.11.3";
 
 const version = version$1;
 const protocolVersion = 15;
@@ -12062,6 +12064,12 @@ function unwrapConstraint(constraint) {
   }
   throw Error('could not unwrap constraint');
 }
+function toWebsocketUrl(url) {
+  if (url.startsWith('http')) {
+    return url.replace(/^(http)/, 'ws');
+  }
+  return url;
+}
 function toHttpUrl(url) {
   if (url.startsWith('ws')) {
     return url.replace(/^(ws)/, 'http');
@@ -12187,8 +12195,8 @@ function splitUtf8(s, n) {
 }
 
 function mergeDefaultOptions(options, audioDefaults, videoDefaults) {
-  var _a, _b, _c;
-  var _d, _e;
+  var _a, _b;
+  var _c, _d;
   const {
     optionsWithoutProcessor,
     audioProcessor,
@@ -12196,13 +12204,13 @@ function mergeDefaultOptions(options, audioDefaults, videoDefaults) {
   } = extractProcessorsFromOptions(options !== null && options !== void 0 ? options : {});
   const defaultAudioProcessor = audioDefaults === null || audioDefaults === void 0 ? void 0 : audioDefaults.processor;
   const defaultVideoProcessor = videoDefaults === null || videoDefaults === void 0 ? void 0 : videoDefaults.processor;
-  const clonedOptions = (_a = cloneDeep(optionsWithoutProcessor)) !== null && _a !== void 0 ? _a : {};
+  const clonedOptions = optionsWithoutProcessor !== null && optionsWithoutProcessor !== void 0 ? optionsWithoutProcessor : {};
   if (clonedOptions.audio === true) clonedOptions.audio = {};
   if (clonedOptions.video === true) clonedOptions.video = {};
   // use defaults
   if (clonedOptions.audio) {
     mergeObjectWithoutOverwriting(clonedOptions.audio, audioDefaults);
-    (_b = (_d = clonedOptions.audio).deviceId) !== null && _b !== void 0 ? _b : _d.deviceId = {
+    (_a = (_c = clonedOptions.audio).deviceId) !== null && _a !== void 0 ? _a : _c.deviceId = {
       ideal: 'default'
     };
     if (audioProcessor || defaultAudioProcessor) {
@@ -12211,7 +12219,7 @@ function mergeDefaultOptions(options, audioDefaults, videoDefaults) {
   }
   if (clonedOptions.video) {
     mergeObjectWithoutOverwriting(clonedOptions.video, videoDefaults);
-    (_c = (_e = clonedOptions.video).deviceId) !== null && _c !== void 0 ? _c : _e.deviceId = {
+    (_b = (_d = clonedOptions.video).deviceId) !== null && _b !== void 0 ? _b : _d.deviceId = {
       ideal: 'default'
     };
     if (videoProcessor || defaultVideoProcessor) {
@@ -12469,7 +12477,7 @@ function extractProcessorsFromOptions(options) {
   return {
     audioProcessor,
     videoProcessor,
-    optionsWithoutProcessor: newOptions
+    optionsWithoutProcessor: cloneDeep(newOptions)
   };
 }
 function getTrackSourceFromProto(source) {
@@ -12628,9 +12636,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.on(KeyProviderEvent.SetKey, keyInfo => this.postKey(keyInfo)).on(KeyProviderEvent.RatchetRequest, (participantId, keyIndex) => this.postRatchetRequest(participantId, keyIndex, keyProvider.getOptions().allowKeyExtraction));
   }
-  postRatchetRequest(participantIdentity, keyIndex) {
+  postRatchetRequest(participantIdentity, keyIndex, extractable) {
     if (!this.worker) {
       throw Error('could not ratchet key, worker is missing');
     }
@@ -12638,7 +12646,8 @@ class E2EEManager extends eventsExports.EventEmitter {
       kind: 'ratchetRequest',
       data: {
         participantIdentity: participantIdentity,
-        keyIndex
+        keyIndex,
+        extractable
       }
     };
     this.worker.postMessage(msg);
@@ -12966,7 +12975,7 @@ class AsyncQueue {
 }
 
 function createRtcUrl(url, searchParams) {
-  const urlObj = new URL(url);
+  const urlObj = new URL(toWebsocketUrl(url));
   searchParams.forEach((value, key) => {
     urlObj.searchParams.set(key, value);
   });
@@ -19442,13 +19451,23 @@ class LocalTrackPublication extends TrackPublication {
  */
 function createLocalTracks(options, loggerOptions) {
   return __awaiter(this, void 0, void 0, function* () {
-    // set default options to true
-    const internalOptions = Object.assign({}, options !== null && options !== void 0 ? options : {});
+    options !== null && options !== void 0 ? options : options = {};
     let attemptExactMatch = false;
-    let retryAudioOptions = options === null || options === void 0 ? void 0 : options.audio;
-    let retryVideoOptions = options === null || options === void 0 ? void 0 : options.video;
+    const {
+      audioProcessor,
+      videoProcessor,
+      optionsWithoutProcessor: internalOptions
+    } = extractProcessorsFromOptions(options);
+    let retryAudioOptions = internalOptions.audio;
+    let retryVideoOptions = internalOptions.video;
+    if (audioProcessor && typeof internalOptions.audio === 'object') {
+      internalOptions.audio.processor = audioProcessor;
+    }
+    if (videoProcessor && typeof internalOptions.video === 'object') {
+      internalOptions.video.processor = videoProcessor;
+    }
     // if the user passes a device id as a string, we default to exact match
-    if (internalOptions.audio && typeof internalOptions.audio === 'object' && typeof internalOptions.audio.deviceId === 'string') {
+    if (options.audio && typeof internalOptions.audio === 'object' && typeof internalOptions.audio.deviceId === 'string') {
       const deviceId = internalOptions.audio.deviceId;
       internalOptions.audio.deviceId = {
         exact: deviceId
@@ -19483,10 +19502,6 @@ function createLocalTracks(options, loggerOptions) {
         deviceId: 'default'
       };
     }
-    const {
-      audioProcessor,
-      videoProcessor
-    } = extractProcessorsFromOptions(internalOptions);
     const opts = mergeDefaultOptions(internalOptions, audioDefaults, videoDefaults);
     const constraints = constraintsForOptions(opts);
     // Keep a reference to the promise on DeviceManager and await it in getLocalDevices()