@stream-io/video-client 1.25.1 → 1.25.2

package/dist/src/devices/devices.d.ts

@@ -72,3 +72,11 @@ export declare const deviceIds$: import("rxjs").Observable<MediaDeviceInfo[]> |
  * @returns void
  */
 export declare const disposeOfMediaStream: (stream: MediaStream) => void;
+/**
+ * Resolves `default` device id into the real device id. Some browsers (notably,
+ * Chromium-based) report device with id `default` among audio input and output
+ * devices. Since not every browser does that, we never want `default` id to be
+ * used within our SDK. This function tries to find the real id for the `default`
+ * device.
+ */
+export declare function resolveDeviceId(deviceId: string | undefined, kind: MediaDeviceKind): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-client",
-  "version": "1.25.1",
+  "version": "1.25.2",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
   "browser": "dist/index.browser.es.js",

package/src/devices/MicrophoneManagerState.ts

@@ -1,10 +1,10 @@
 import { BehaviorSubject, distinctUntilChanged, Observable } from 'rxjs';
+import { RxUtils } from '../store';
 import {
   InputMediaDeviceManagerState,
   TrackDisableMode,
 } from './InputMediaDeviceManagerState';
-import { getAudioBrowserPermission } from './devices';
-import { RxUtils } from '../store';
+import { getAudioBrowserPermission, resolveDeviceId } from './devices';
 
 export class MicrophoneManagerState extends InputMediaDeviceManagerState {
   private speakingWhileMutedSubject = new BehaviorSubject<boolean>(false);
@@ -42,6 +42,7 @@ export class MicrophoneManagerState extends InputMediaDeviceManagerState {
 
   protected getDeviceIdFromStream(stream: MediaStream): string | undefined {
     const [track] = stream.getAudioTracks();
-    return track?.getSettings().deviceId;
+    const unresolvedDeviceId = track?.getSettings().deviceId;
+    return resolveDeviceId(unresolvedDeviceId, 'audioinput');
   }
 }

package/src/devices/__tests__/CameraManager.test.ts

@@ -31,6 +31,7 @@ vi.mock('../devices.ts', () => {
     getAudioBrowserPermission: () => mockBrowserPermission,
     getVideoBrowserPermission: () => mockBrowserPermission,
     deviceIds$: mockDeviceIds$(),
+    resolveDeviceId: (deviceId) => deviceId,
   };
 });
 

package/src/devices/__tests__/InputMediaDeviceManager.test.ts

@@ -30,6 +30,7 @@ vi.mock('../devices.ts', () => {
     getAudioBrowserPermission: () => mockBrowserPermission,
     getVideoBrowserPermission: () => mockBrowserPermission,
     deviceIds$: mockDeviceIds$(),
+    resolveDeviceId: (deviceId) => deviceId,
   };
 });
 

package/src/devices/__tests__/MicrophoneManager.test.ts

@@ -37,6 +37,7 @@ vi.mock('../devices.ts', () => {
     getAudioBrowserPermission: () => mockBrowserPermission,
     getVideoBrowserPermission: () => mockBrowserPermission,
     deviceIds$: mockDeviceIds$(),
+    resolveDeviceId: (deviceId) => deviceId,
   };
 });
 

package/src/devices/__tests__/MicrophoneManagerRN.test.ts

@@ -33,6 +33,7 @@ vi.mock('../devices.ts', () => {
     getAudioBrowserPermission: () => mockBrowserPermission,
     getVideoBrowserPermission: () => mockBrowserPermission,
     deviceIds$: {},
+    resolveDeviceId: (deviceId) => deviceId,
   };
 });
 

package/src/devices/__tests__/ScreenShareManager.test.ts

@@ -16,6 +16,7 @@ vi.mock('../devices.ts', () => {
     getScreenShareStream: vi.fn(() => Promise.resolve(mockScreenShareStream())),
     checkIfAudioOutputChangeSupported: vi.fn(() => Promise.resolve(true)),
     deviceIds$: () => mockDeviceIds$(),
+    resolveDeviceId: (deviceId) => deviceId,
   };
 });
 

package/src/devices/__tests__/SpeakerManager.test.ts

@@ -20,6 +20,7 @@ vi.mock('../devices.ts', () => {
     getAudioBrowserPermission: () => mockBrowserPermission,
     getVideoBrowserPermission: () => mockBrowserPermission,
     deviceIds$: mockDeviceIds$(),
+    resolveDeviceId: (deviceId) => deviceId,
   };
 });
 

package/src/devices/devices.ts

@@ -13,6 +13,7 @@ import { BrowserPermission } from './BrowserPermission';
 import { lazy } from '../helpers/lazy';
 import { isFirefox } from '../helpers/browsers';
 import { dumpStream, Tracer } from '../stats';
+import { getCurrentValue } from '../store/rxUtils';
 
 /**
  * Returns an Observable that emits the list of available devices
@@ -386,3 +387,26 @@ export const disposeOfMediaStream = (stream: MediaStream) => {
     stream.release();
   }
 };
+
+/**
+ * Resolves `default` device id into the real device id. Some browsers (notably,
+ * Chromium-based) report device with id `default` among audio input and output
+ * devices. Since not every browser does that, we never want `default` id to be
+ * used within our SDK. This function tries to find the real id for the `default`
+ * device.
+ */
+export function resolveDeviceId(
+  deviceId: string | undefined,
+  kind: MediaDeviceKind,
+): string | undefined {
+  if (deviceId !== 'default') return deviceId;
+  const devices = deviceIds$ && getCurrentValue(deviceIds$);
+  if (!devices) return deviceId;
+  const defaultDeviceInfo = devices.find((d) => d.deviceId === deviceId);
+  if (!defaultDeviceInfo) return deviceId;
+  const groupId = defaultDeviceInfo.groupId;
+  const candidates = devices.filter(
+    (d) => d.kind === kind && d.deviceId !== 'default' && d.groupId === groupId,
+  );
+  return candidates.length === 1 ? candidates[0].deviceId : deviceId;
+}