livekit-client 1.2.2 → 1.2.5

package/src/room/track/create.ts

@@ -1,3 +1,4 @@
+import DeviceManager from '../DeviceManager';
 import { TrackInvalidError } from '../errors';
 import { mediaTrackToLocalTrack } from '../participant/publishUtils';
 import { audioDefaults, videoDefaults } from './defaults';
@@ -30,7 +31,21 @@ export async function createLocalTracks(
 
   const opts = mergeDefaultOptions(options, audioDefaults, videoDefaults);
   const constraints = constraintsForOptions(opts);
-  const stream = await navigator.mediaDevices.getUserMedia(constraints);
+
+  // 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 (options.audio) {
+    DeviceManager.userMediaPromiseMap.set('audioinput', mediaPromise);
+    mediaPromise.catch(() => DeviceManager.userMediaPromiseMap.delete('audioinput'));
+  }
+  if (options.video) {
+    DeviceManager.userMediaPromiseMap.set('videoinput', mediaPromise);
+    mediaPromise.catch(() => DeviceManager.userMediaPromiseMap.delete('videoinput'));
+  }
+
+  const stream = await mediaPromise;
   return stream.getTracks().map((mediaStreamTrack) => {
     const isAudio = mediaStreamTrack.kind === 'audio';
     let trackOptions = isAudio ? options!.audio : options!.video;

package/src/room/utils.ts

@@ -122,10 +122,12 @@ export class Future<T> {
 
   reject!: (e: any) => void;
 
-  constructor() {
-    this.promise = new Promise<T>((resolve, reject) => {
-      this.resolve = resolve;
-      this.reject = reject;
-    });
+  constructor(promise?: Promise<T>) {
+    this.promise =
+      promise ??
+      new Promise<T>((resolve, reject) => {
+        this.resolve = resolve;
+        this.reject = reject;
+      });
   }
 }