@stream-io/video-client 0.4.0 → 0.4.2

package/dist/src/Call.d.ts

@@ -452,6 +452,7 @@ export declare class Call {
     sendCustomEvent: (payload: {
         [key: string]: any;
     }) => Promise<SendEventResponse>;
+    applyDeviceConfig: () => void;
     private initCamera;
     private initMic;
     /**

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

@@ -47,7 +47,7 @@ export declare abstract class InputMediaDeviceManager<T extends InputMediaDevice
      *
      * @param constraints the constraints to set.
      */
-    setDefaultConstraints(constraints: C): Promise<void>;
+    setDefaultConstraints(constraints: C): void;
     /**
      * Select device
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-client",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "packageManager": "yarn@3.2.4",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/Call.ts

@@ -560,6 +560,8 @@ export class Call {
       this.clientStore.registerCall(this);
     }
 
+    this.applyDeviceConfig();
+
     return response;
   };
 
@@ -587,6 +589,8 @@ export class Call {
       this.clientStore.registerCall(this);
     }
 
+    this.applyDeviceConfig();
+
     return response;
   };
 
@@ -1001,8 +1005,8 @@ export class Call {
       this.state.setCallingState(CallingState.JOINED);
 
       try {
-        await this.initCamera();
-        await this.initMic();
+        await this.initCamera({ setStatus: true });
+        await this.initMic({ setStatus: true });
       } catch (error) {
         this.logger('warn', 'Camera and/or mic init failed during join call');
       }
@@ -1782,7 +1786,12 @@ export class Call {
     );
   };
 
-  private async initCamera() {
+  applyDeviceConfig = () => {
+    this.initCamera({ setStatus: false });
+    this.initMic({ setStatus: false });
+  };
+
+  private async initCamera(options: { setStatus: boolean }) {
     // Wait for any in progress camera operation
     if (this.camera.enablePromise) {
       await this.camera.enablePromise;
@@ -1814,25 +1823,27 @@ export class Call {
       await this.camera.selectTargetResolution(targetResolution);
     }
 
-    // Publish already that was set before we joined
-    if (
-      this.camera.state.status === 'enabled' &&
-      this.camera.state.mediaStream &&
-      !this.publisher?.isPublishing(TrackType.VIDEO)
-    ) {
-      await this.publishVideoStream(this.camera.state.mediaStream);
-    }
+    if (options.setStatus) {
+      // Publish already that was set before we joined
+      if (
+        this.camera.state.status === 'enabled' &&
+        this.camera.state.mediaStream &&
+        !this.publisher?.isPublishing(TrackType.VIDEO)
+      ) {
+        await this.publishVideoStream(this.camera.state.mediaStream);
+      }
 
-    // Start camera if backend config speicifies, and there is no local setting
-    if (
-      this.camera.state.status === undefined &&
-      this.state.settings?.video.camera_default_on
-    ) {
-      await this.camera.enable();
+      // Start camera if backend config speicifies, and there is no local setting
+      if (
+        this.camera.state.status === undefined &&
+        this.state.settings?.video.camera_default_on
+      ) {
+        await this.camera.enable();
+      }
     }
   }
 
-  private async initMic() {
+  private async initMic(options: { setStatus: boolean }) {
     // Wait for any in progress mic operation
     if (this.microphone.enablePromise) {
       await this.microphone.enablePromise;
@@ -1848,21 +1859,23 @@ export class Call {
       return;
     }
 
-    // Publish media stream that was set before we joined
-    if (
-      this.microphone.state.status === 'enabled' &&
-      this.microphone.state.mediaStream &&
-      !this.publisher?.isPublishing(TrackType.AUDIO)
-    ) {
-      await this.publishAudioStream(this.microphone.state.mediaStream);
-    }
+    if (options.setStatus) {
+      // Publish media stream that was set before we joined
+      if (
+        this.microphone.state.status === 'enabled' &&
+        this.microphone.state.mediaStream &&
+        !this.publisher?.isPublishing(TrackType.AUDIO)
+      ) {
+        await this.publishAudioStream(this.microphone.state.mediaStream);
+      }
 
-    // Start mic if backend config specifies, and there is no local setting
-    if (
-      this.microphone.state.status === undefined &&
-      this.state.settings?.audio.mic_default_on
-    ) {
-      await this.microphone.enable();
+      // Start mic if backend config specifies, and there is no local setting
+      if (
+        this.microphone.state.status === undefined &&
+        this.state.settings?.audio.mic_default_on
+      ) {
+        await this.microphone.enable();
+      }
     }
   }
 

package/src/StreamVideoClient.ts

@@ -352,6 +352,7 @@ export class StreamVideoClient {
         clientStore: this.writeableStateStore,
       });
       call.state.updateFromCallResponse(c.call);
+      call.applyDeviceConfig();
       if (data.watch) {
         this.writeableStateStore.registerCall(call);
       }

package/src/__tests__/StreamVideoClient.test.ts

@@ -8,9 +8,6 @@ import { User } from '../coordinator/connection/types';
 const apiKey = process.env.STREAM_API_KEY!;
 const secret = process.env.STREAM_SECRET!;
 
-vi.mock('../devices/CameraManager.ts');
-vi.mock('../devices/MicrophoneManager.ts');
-
 const tokenProvider = (userId: string) => {
   const serverClient = new StreamVideoServerClient(apiKey, { secret });
   return async () => {

package/src/devices/InputMediaDeviceManager.ts

@@ -44,13 +44,12 @@ export abstract class InputMediaDeviceManager<
    * Starts stream.
    */
   async enable() {
-    if (this.state.status === 'enabled') {
-      return;
-    }
+    if (this.state.status === 'enabled') return;
     this.enablePromise = this.unmuteStream();
     try {
       await this.enablePromise;
       this.state.setStatus('enabled');
+      this.enablePromise = undefined;
     } catch (error) {
       this.enablePromise = undefined;
       throw error;
@@ -62,12 +61,9 @@ export abstract class InputMediaDeviceManager<
    */
   async disable() {
     this.state.prevStatus = this.state.status;
-    if (this.state.status === 'disabled') {
-      return;
-    }
-    this.disablePromise = this.muteStream(
-      this.state.disableMode === 'stop-tracks',
-    );
+    if (this.state.status === 'disabled') return;
+    const stopTracks = this.state.disableMode === 'stop-tracks';
+    this.disablePromise = this.muteStream(stopTracks);
     try {
       await this.disablePromise;
       this.state.setStatus('disabled');
@@ -107,7 +103,7 @@ export abstract class InputMediaDeviceManager<
    *
    * @param constraints the constraints to set.
    */
-  async setDefaultConstraints(constraints: C) {
+  setDefaultConstraints(constraints: C) {
     this.state.setDefaultConstraints(constraints);
   }
 
@@ -149,25 +145,24 @@ export abstract class InputMediaDeviceManager<
   }
 
   protected async muteStream(stopTracks: boolean = true) {
-    if (!this.state.mediaStream) {
-      return;
-    }
+    if (!this.state.mediaStream) return;
     this.logger('debug', `${stopTracks ? 'Stopping' : 'Disabling'} stream`);
     if (this.call.state.callingState === CallingState.JOINED) {
       await this.stopPublishStream(stopTracks);
     }
     this.muteLocalStream(stopTracks);
-    this.getTracks().forEach((track) => {
-      if (track.readyState === 'ended') {
+    const allEnded = this.getTracks().every((t) => t.readyState === 'ended');
+    if (allEnded) {
+      if (
+        this.state.mediaStream &&
         // @ts-expect-error release() is present in react-native-webrtc
-        // and must be called to dispose the stream
-        if (typeof this.state.mediaStream.release === 'function') {
-          // @ts-expect-error
-          this.state.mediaStream.release();
-        }
-        this.state.setMediaStream(undefined);
+        typeof this.state.mediaStream.release === 'function'
+      ) {
+        // @ts-expect-error called to dispose the stream in RN
+        this.state.mediaStream.release();
       }
-    });
+      this.state.setMediaStream(undefined);
+    }
   }
 
   private muteTracks() {