@stream-io/video-client 1.44.1 → 1.44.3

package/dist/src/Call.d.ts

@@ -761,7 +761,7 @@ export declare class Call {
      *
      * @internal
      */
-    applyDeviceConfig: (settings: CallSettingsResponse, publish: boolean) => Promise<void>;
+    applyDeviceConfig: (settings: CallSettingsResponse, publish: boolean, skipSpeakerApply: boolean) => Promise<void>;
     /**
      * Will begin tracking the given element for visibility changes within the
      * configured viewport element (`call.setViewport`).

package/dist/src/StreamSfuClient.d.ts

@@ -103,6 +103,7 @@ export declare class StreamSfuClient {
     private readonly credentials;
     private readonly dispatcher;
     private readonly joinResponseTimeout;
+    private readonly subscriptionsConcurrencyTag;
     private networkAvailableTask;
     /**
      * Promise that resolves when the JoinResponse is received.

package/package.json

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

package/src/Call.ts

@@ -172,6 +172,7 @@ import {
   promiseWithResolvers,
 } from './helpers/promise';
 import { GetCallStatsResponse } from './gen/shims';
+import { isReactNative } from './helpers/platforms';
 
 /**
  * An object representation of a `Call`.
@@ -746,7 +747,8 @@ export class Call {
     // const calls = useCalls().filter((c) => c.ringing);
     const calls = this.clientStore.calls.filter((c) => c.cid !== this.cid);
     this.clientStore.setCalls([this, ...calls]);
-    await this.applyDeviceConfig(settings, false);
+    const skipSpeakerApply = isReactNative();
+    await this.applyDeviceConfig(settings, false, skipSpeakerApply);
   };
 
   /**
@@ -781,8 +783,17 @@ export class Call {
       this.watching = true;
       this.clientStore.registerOrUpdateCall(this);
     }
-
-    await this.applyDeviceConfig(response.call.settings, false);
+    // Skip speaker setup on RN if ringing was requested or the call is already ringing
+    const skipSpeakerApply = isReactNative()
+      ? params?.ring === true
+        ? true
+        : this.ringing
+      : false;
+    await this.applyDeviceConfig(
+      response.call.settings,
+      false,
+      skipSpeakerApply,
+    );
 
     return response;
   };
@@ -812,7 +823,17 @@ export class Call {
       this.clientStore.registerOrUpdateCall(this);
     }
 
-    await this.applyDeviceConfig(response.call.settings, false);
+    // Skip speaker setup on RN if ringing was requested or the call is already ringing
+    const skipSpeakerApply = isReactNative()
+      ? data?.ring === true
+        ? true
+        : this.ringing
+      : false;
+    await this.applyDeviceConfig(
+      response.call.settings,
+      false,
+      skipSpeakerApply,
+    );
 
     return response;
   };
@@ -1144,7 +1165,7 @@ export class Call {
     // device settings should be applied only once, we don't have to
     // re-apply them on later reconnections or server-side data fetches
     if (!this.deviceSettingsAppliedOnce && this.state.settings) {
-      await this.applyDeviceConfig(this.state.settings, true);
+      await this.applyDeviceConfig(this.state.settings, true, false);
       globalThis.streamRNVideoSDK?.callManager.start();
       this.deviceSettingsAppliedOnce = true;
     }
@@ -2796,8 +2817,11 @@ export class Call {
   applyDeviceConfig = async (
     settings: CallSettingsResponse,
     publish: boolean,
+    skipSpeakerApply: boolean,
   ) => {
-    this.speaker.apply(settings);
+    if (!skipSpeakerApply) {
+      this.speaker.apply(settings);
+    }
     await this.camera.apply(settings.video, publish).catch((err) => {
       this.logger.warn('Camera init failed', err);
     });

package/src/StreamSfuClient.ts

@@ -37,6 +37,7 @@ import {
   promiseWithResolvers,
   SafePromise,
 } from './helpers/promise';
+import { withoutConcurrency } from './helpers/concurrency';
 import { getTimers } from './timers';
 import { Tracer, TraceSlice } from './stats';
 import { SfuJoinError } from './errors';
@@ -164,6 +165,9 @@ export class StreamSfuClient {
   private readonly credentials: Credentials;
   private readonly dispatcher: Dispatcher;
   private readonly joinResponseTimeout: number;
+  private readonly subscriptionsConcurrencyTag = Symbol(
+    'subscriptionsConcurrencyTag',
+  );
   private networkAvailableTask: PromiseWithResolvers<void> | undefined;
   /**
    * Promise that resolves when the JoinResponse is received.
@@ -391,15 +395,17 @@ export class StreamSfuClient {
   };
 
   updateSubscriptions = async (tracks: TrackSubscriptionDetails[]) => {
-    await this.joinTask;
-    return retryable(
-      (invocationMeta) =>
-        this.rpc.updateSubscriptions(
-          { sessionId: this.sessionId, tracks },
-          { invocationMeta },
-        ),
-      this.abortController.signal,
-    );
+    return withoutConcurrency(this.subscriptionsConcurrencyTag, async () => {
+      await this.joinTask;
+      return retryable(
+        (invocationMeta) =>
+          this.rpc.updateSubscriptions(
+            { sessionId: this.sessionId, tracks },
+            { invocationMeta },
+          ),
+        this.abortController.signal,
+      );
+    });
   };
 
   setPublisher = async (data: Omit<SetPublisherRequest, 'sessionId'>) => {

package/src/StreamVideoClient.ts

@@ -39,6 +39,7 @@ import {
   getInstanceKey,
 } from './helpers/clientUtils';
 import { logToConsole, ScopedLogger, videoLoggerSystem } from './logger';
+import { isReactNative } from './helpers/platforms';
 import { withoutConcurrency } from './helpers/concurrency';
 import { enableTimerWorker } from './timers';
 
@@ -455,7 +456,7 @@ export class StreamVideoClient {
         clientStore: this.writeableStateStore,
       });
       call.state.updateFromCallResponse(c.call);
-      await call.applyDeviceConfig(c.call.settings, false);
+      await call.applyDeviceConfig(c.call.settings, false, isReactNative());
       if (data.watch) {
         await call.setup();
         this.writeableStateStore.registerCall(call);

package/src/rpc/retryable.ts

@@ -44,6 +44,8 @@ export const retryable = async <
   let result: FinishedUnaryCall<I, O> | undefined = undefined;
   do {
     if (attempt > 0) await sleep(retryInterval(attempt));
+    if (signal?.aborted) throw new Error(signal.reason);
+
     try {
       result = await rpc({ attempt });
     } catch (err) {