livekit-client 2.11.2 → 2.11.4

package/dist/livekit-client.esm.mjs

@@ -11109,7 +11109,7 @@ var TrackEvent;
 
 function cloneDeep(value) {
   if (typeof value === 'undefined') {
-    return;
+    return value;
   }
   if (typeof structuredClone === 'function') {
     return structuredClone(value);
@@ -11186,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.2";
+var version$1 = "2.11.4";
 
 const version = version$1;
 const protocolVersion = 15;
@@ -12062,6 +12062,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 +12193,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 +12202,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 +12217,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) {
@@ -12334,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
  */
@@ -12469,7 +12487,7 @@ function extractProcessorsFromOptions(options) {
   return {
     audioProcessor,
     videoProcessor,
-    optionsWithoutProcessor: newOptions
+    optionsWithoutProcessor: cloneDeep(newOptions)
   };
 }
 function getTrackSourceFromProto(source) {
@@ -12966,7 +12984,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 +19460,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 +19511,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()
@@ -22795,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);
@@ -22812,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;
           }