livekit-client 2.11.0 → 2.11.1

package/dist/livekit-client.esm.mjs

@@ -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.0";
+var version$1 = "2.11.1";
 
 const version = version$1;
 const protocolVersion = 15;
@@ -19434,6 +19434,176 @@ class LocalTrackPublication extends TrackPublication {
   }
 }
 
+/**
+ * Creates a local video and audio track at the same time. When acquiring both
+ * audio and video tracks together, it'll display a single permission prompt to
+ * the user instead of two separate ones.
+ * @param options
+ */
+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 : {});
+    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;
+    // 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') {
+      const deviceId = internalOptions.audio.deviceId;
+      internalOptions.audio.deviceId = {
+        exact: deviceId
+      };
+      attemptExactMatch = true;
+      retryAudioOptions = Object.assign(Object.assign({}, internalOptions.audio), {
+        deviceId: {
+          ideal: deviceId
+        }
+      });
+    }
+    if (internalOptions.video && typeof internalOptions.video === 'object' && typeof internalOptions.video.deviceId === 'string') {
+      const deviceId = internalOptions.video.deviceId;
+      internalOptions.video.deviceId = {
+        exact: deviceId
+      };
+      attemptExactMatch = true;
+      retryVideoOptions = Object.assign(Object.assign({}, internalOptions.video), {
+        deviceId: {
+          ideal: deviceId
+        }
+      });
+    }
+    // TODO if internal options don't have device Id specified, set it to 'default'
+    if (internalOptions.audio === true || typeof internalOptions.audio === 'object' && !internalOptions.audio.deviceId) {
+      internalOptions.audio = {
+        deviceId: 'default'
+      };
+    }
+    if (internalOptions.video === true || typeof internalOptions.video === 'object' && !internalOptions.video.deviceId) {
+      internalOptions.video = {
+        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()
+    // works around iOS Safari Bug https://bugs.webkit.org/show_bug.cgi?id=179363
+    const mediaPromise = navigator.mediaDevices.getUserMedia(constraints);
+    if (internalOptions.audio) {
+      DeviceManager.userMediaPromiseMap.set('audioinput', mediaPromise);
+      mediaPromise.catch(() => DeviceManager.userMediaPromiseMap.delete('audioinput'));
+    }
+    if (internalOptions.video) {
+      DeviceManager.userMediaPromiseMap.set('videoinput', mediaPromise);
+      mediaPromise.catch(() => DeviceManager.userMediaPromiseMap.delete('videoinput'));
+    }
+    try {
+      const stream = yield mediaPromise;
+      return yield Promise.all(stream.getTracks().map(mediaStreamTrack => __awaiter(this, void 0, void 0, function* () {
+        const isAudio = mediaStreamTrack.kind === 'audio';
+        let trackOptions = isAudio ? opts.audio : opts.video;
+        if (typeof trackOptions === 'boolean' || !trackOptions) {
+          trackOptions = {};
+        }
+        let trackConstraints;
+        const conOrBool = isAudio ? constraints.audio : constraints.video;
+        if (typeof conOrBool !== 'boolean') {
+          trackConstraints = conOrBool;
+        }
+        // update the constraints with the device id the user gave permissions to in the permission prompt
+        // otherwise each track restart (e.g. mute - unmute) will try to initialize the device again -> causing additional permission prompts
+        const newDeviceId = mediaStreamTrack.getSettings().deviceId;
+        if ((trackConstraints === null || trackConstraints === void 0 ? void 0 : trackConstraints.deviceId) && unwrapConstraint(trackConstraints.deviceId) !== newDeviceId) {
+          trackConstraints.deviceId = newDeviceId;
+        } else if (!trackConstraints) {
+          trackConstraints = {
+            deviceId: newDeviceId
+          };
+        }
+        const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints, loggerOptions);
+        if (track.kind === Track.Kind.Video) {
+          track.source = Track.Source.Camera;
+        } else if (track.kind === Track.Kind.Audio) {
+          track.source = Track.Source.Microphone;
+        }
+        track.mediaStream = stream;
+        if (isAudioTrack(track) && audioProcessor) {
+          yield track.setProcessor(audioProcessor);
+        } else if (isVideoTrack(track) && videoProcessor) {
+          yield track.setProcessor(videoProcessor);
+        }
+        return track;
+      })));
+    } catch (e) {
+      if (!attemptExactMatch) {
+        throw e;
+      }
+      return createLocalTracks(Object.assign(Object.assign({}, options), {
+        audio: retryAudioOptions,
+        video: retryVideoOptions
+      }), loggerOptions);
+    }
+  });
+}
+/**
+ * Creates a [[LocalVideoTrack]] with getUserMedia()
+ * @param options
+ */
+function createLocalVideoTrack(options) {
+  return __awaiter(this, void 0, void 0, function* () {
+    const tracks = yield createLocalTracks({
+      audio: false,
+      video: options
+    });
+    return tracks[0];
+  });
+}
+function createLocalAudioTrack(options) {
+  return __awaiter(this, void 0, void 0, function* () {
+    const tracks = yield createLocalTracks({
+      audio: options,
+      video: false
+    });
+    return tracks[0];
+  });
+}
+/**
+ * Creates a screen capture tracks with getDisplayMedia().
+ * A LocalVideoTrack is always created and returned.
+ * If { audio: true }, and the browser supports audio capture, a LocalAudioTrack is also created.
+ */
+function createLocalScreenTracks(options) {
+  return __awaiter(this, void 0, void 0, function* () {
+    if (options === undefined) {
+      options = {};
+    }
+    if (options.resolution === undefined && !isSafari17()) {
+      options.resolution = ScreenSharePresets.h1080fps30.resolution;
+    }
+    if (navigator.mediaDevices.getDisplayMedia === undefined) {
+      throw new DeviceUnsupportedError('getDisplayMedia not supported');
+    }
+    const constraints = screenCaptureToDisplayMediaStreamOptions(options);
+    const stream = yield navigator.mediaDevices.getDisplayMedia(constraints);
+    const tracks = stream.getVideoTracks();
+    if (tracks.length === 0) {
+      throw new TrackInvalidError('no video track found');
+    }
+    const screenVideo = new LocalVideoTrack(tracks[0], undefined, false);
+    screenVideo.source = Track.Source.ScreenShare;
+    const localTracks = [screenVideo];
+    if (stream.getAudioTracks().length > 0) {
+      const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0], undefined, false);
+      screenAudio.source = Track.Source.ScreenShareAudio;
+      localTracks.push(screenAudio);
+    }
+    return localTracks;
+  });
+}
+
 var ConnectionQuality;
 (function (ConnectionQuality) {
   ConnectionQuality["Excellent"] = "excellent";
@@ -20203,58 +20373,36 @@ class LocalParticipant extends Participant {
       var _a, _b;
       options !== null && options !== void 0 ? options : options = {};
       const mergedOptionsWithProcessors = mergeDefaultOptions(options, (_a = this.roomOptions) === null || _a === void 0 ? void 0 : _a.audioCaptureDefaults, (_b = this.roomOptions) === null || _b === void 0 ? void 0 : _b.videoCaptureDefaults);
-      const {
-        audioProcessor,
-        videoProcessor,
-        optionsWithoutProcessor
-      } = extractProcessorsFromOptions(mergedOptionsWithProcessors);
-      const constraints = constraintsForOptions(optionsWithoutProcessor);
-      let stream;
       try {
-        stream = yield navigator.mediaDevices.getUserMedia(constraints);
+        const tracks = yield createLocalTracks(mergedOptionsWithProcessors, {
+          loggerName: this.roomOptions.loggerName,
+          loggerContextCb: () => this.logContext
+        });
+        const localTracks = tracks.map(track => {
+          if (isAudioTrack(track)) {
+            this.microphoneError = undefined;
+            track.setAudioContext(this.audioContext);
+            track.source = Track.Source.Microphone;
+            this.emit(ParticipantEvent.AudioStreamAcquired);
+          }
+          if (isVideoTrack(track)) {
+            this.cameraError = undefined;
+            track.source = Track.Source.Camera;
+          }
+          return track;
+        });
+        return localTracks;
       } catch (err) {
         if (err instanceof Error) {
-          if (constraints.audio) {
+          if (options.audio) {
             this.microphoneError = err;
           }
-          if (constraints.video) {
+          if (options.video) {
             this.cameraError = err;
           }
         }
         throw err;
       }
-      if (constraints.audio) {
-        this.microphoneError = undefined;
-        this.emit(ParticipantEvent.AudioStreamAcquired);
-      }
-      if (constraints.video) {
-        this.cameraError = undefined;
-      }
-      return Promise.all(stream.getTracks().map(mediaStreamTrack => __awaiter(this, void 0, void 0, function* () {
-        const isAudio = mediaStreamTrack.kind === 'audio';
-        let trackConstraints;
-        const conOrBool = isAudio ? constraints.audio : constraints.video;
-        if (typeof conOrBool !== 'boolean') {
-          trackConstraints = conOrBool;
-        }
-        const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints, {
-          loggerName: this.roomOptions.loggerName,
-          loggerContextCb: () => this.logContext
-        });
-        if (track.kind === Track.Kind.Video) {
-          track.source = Track.Source.Camera;
-        } else if (track.kind === Track.Kind.Audio) {
-          track.source = Track.Source.Microphone;
-          track.setAudioContext(this.audioContext);
-        }
-        track.mediaStream = stream;
-        if (isAudioTrack(track) && audioProcessor) {
-          yield track.setProcessor(audioProcessor);
-        } else if (isVideoTrack(track) && videoProcessor) {
-          yield track.setProcessor(videoProcessor);
-        }
-        return track;
-      })));
     });
   }
   /**
@@ -24266,172 +24414,6 @@ class ConnectionProtocolCheck extends Checker {
   }
 }
 
-/**
- * Creates a local video and audio track at the same time. When acquiring both
- * audio and video tracks together, it'll display a single permission prompt to
- * the user instead of two separate ones.
- * @param options
- */
-function createLocalTracks(options) {
-  return __awaiter(this, void 0, void 0, function* () {
-    var _a, _b;
-    // set default options to true
-    const internalOptions = Object.assign({}, options !== null && options !== void 0 ? 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;
-    // 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') {
-      const deviceId = internalOptions.audio.deviceId;
-      internalOptions.audio.deviceId = {
-        exact: deviceId
-      };
-      attemptExactMatch = true;
-      retryAudioOptions = Object.assign(Object.assign({}, internalOptions.audio), {
-        deviceId: {
-          ideal: deviceId
-        }
-      });
-    }
-    if (internalOptions.video && typeof internalOptions.video === 'object' && typeof internalOptions.video.deviceId === 'string') {
-      const deviceId = internalOptions.video.deviceId;
-      internalOptions.video.deviceId = {
-        exact: deviceId
-      };
-      attemptExactMatch = true;
-      retryVideoOptions = Object.assign(Object.assign({}, internalOptions.video), {
-        deviceId: {
-          ideal: deviceId
-        }
-      });
-    }
-    (_a = internalOptions.audio) !== null && _a !== void 0 ? _a : internalOptions.audio = {
-      deviceId: 'default'
-    };
-    (_b = internalOptions.video) !== null && _b !== void 0 ? _b : internalOptions.video = {
-      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()
-    // works around iOS Safari Bug https://bugs.webkit.org/show_bug.cgi?id=179363
-    const mediaPromise = navigator.mediaDevices.getUserMedia(constraints);
-    if (internalOptions.audio) {
-      DeviceManager.userMediaPromiseMap.set('audioinput', mediaPromise);
-      mediaPromise.catch(() => DeviceManager.userMediaPromiseMap.delete('audioinput'));
-    }
-    if (internalOptions.video) {
-      DeviceManager.userMediaPromiseMap.set('videoinput', mediaPromise);
-      mediaPromise.catch(() => DeviceManager.userMediaPromiseMap.delete('videoinput'));
-    }
-    try {
-      const stream = yield mediaPromise;
-      return yield Promise.all(stream.getTracks().map(mediaStreamTrack => __awaiter(this, void 0, void 0, function* () {
-        const isAudio = mediaStreamTrack.kind === 'audio';
-        let trackOptions = isAudio ? opts.audio : opts.video;
-        if (typeof trackOptions === 'boolean' || !trackOptions) {
-          trackOptions = {};
-        }
-        let trackConstraints;
-        const conOrBool = isAudio ? constraints.audio : constraints.video;
-        if (typeof conOrBool !== 'boolean') {
-          trackConstraints = conOrBool;
-        }
-        // update the constraints with the device id the user gave permissions to in the permission prompt
-        // otherwise each track restart (e.g. mute - unmute) will try to initialize the device again -> causing additional permission prompts
-        const newDeviceId = mediaStreamTrack.getSettings().deviceId;
-        if ((trackConstraints === null || trackConstraints === void 0 ? void 0 : trackConstraints.deviceId) && unwrapConstraint(trackConstraints.deviceId) !== newDeviceId) {
-          trackConstraints.deviceId = newDeviceId;
-        } else if (!trackConstraints) {
-          trackConstraints = {
-            deviceId: newDeviceId
-          };
-        }
-        const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints);
-        if (track.kind === Track.Kind.Video) {
-          track.source = Track.Source.Camera;
-        } else if (track.kind === Track.Kind.Audio) {
-          track.source = Track.Source.Microphone;
-        }
-        track.mediaStream = stream;
-        if (isAudioTrack(track) && audioProcessor) {
-          yield track.setProcessor(audioProcessor);
-        } else if (isVideoTrack(track) && videoProcessor) {
-          yield track.setProcessor(videoProcessor);
-        }
-        return track;
-      })));
-    } catch (e) {
-      if (!attemptExactMatch) {
-        throw e;
-      }
-      return createLocalTracks(Object.assign(Object.assign({}, options), {
-        audio: retryAudioOptions,
-        video: retryVideoOptions
-      }));
-    }
-  });
-}
-/**
- * Creates a [[LocalVideoTrack]] with getUserMedia()
- * @param options
- */
-function createLocalVideoTrack(options) {
-  return __awaiter(this, void 0, void 0, function* () {
-    const tracks = yield createLocalTracks({
-      audio: false,
-      video: options
-    });
-    return tracks[0];
-  });
-}
-function createLocalAudioTrack(options) {
-  return __awaiter(this, void 0, void 0, function* () {
-    const tracks = yield createLocalTracks({
-      audio: options,
-      video: false
-    });
-    return tracks[0];
-  });
-}
-/**
- * Creates a screen capture tracks with getDisplayMedia().
- * A LocalVideoTrack is always created and returned.
- * If { audio: true }, and the browser supports audio capture, a LocalAudioTrack is also created.
- */
-function createLocalScreenTracks(options) {
-  return __awaiter(this, void 0, void 0, function* () {
-    if (options === undefined) {
-      options = {};
-    }
-    if (options.resolution === undefined && !isSafari17()) {
-      options.resolution = ScreenSharePresets.h1080fps30.resolution;
-    }
-    if (navigator.mediaDevices.getDisplayMedia === undefined) {
-      throw new DeviceUnsupportedError('getDisplayMedia not supported');
-    }
-    const constraints = screenCaptureToDisplayMediaStreamOptions(options);
-    const stream = yield navigator.mediaDevices.getDisplayMedia(constraints);
-    const tracks = stream.getVideoTracks();
-    if (tracks.length === 0) {
-      throw new TrackInvalidError('no video track found');
-    }
-    const screenVideo = new LocalVideoTrack(tracks[0], undefined, false);
-    screenVideo.source = Track.Source.ScreenShare;
-    const localTracks = [screenVideo];
-    if (stream.getAudioTracks().length > 0) {
-      const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0], undefined, false);
-      screenAudio.source = Track.Source.ScreenShareAudio;
-      localTracks.push(screenAudio);
-    }
-    return localTracks;
-  });
-}
-
 class PublishAudioCheck extends Checker {
   get description() {
     return 'Can publish audio';