@stream-io/video-client 0.5.1 → 0.5.2

package/dist/src/Call.d.ts

@@ -265,9 +265,10 @@ export declare class Call {
      */
     setSortParticipantsBy: CallState['setSortParticipantsBy'];
     /**
+     * Updates the list of video layers to publish.
+     *
      * @internal
-     * @param enabledRids
-     * @returns
+     * @param enabledLayers the list of layers to enable.
      */
     updatePublishQuality: (enabledLayers: VideoLayerSetting[]) => Promise<void | undefined>;
     private assertCallJoined;
@@ -434,6 +435,10 @@ export declare class Call {
      * @param data the request data.
      */
     updateCallMembers: (data: UpdateCallMembersRequest) => Promise<UpdateCallMembersResponse>;
+    /**
+     * Schedules an auto-drop timeout based on the call settings.
+     * Applicable only for ringing calls.
+     */
     private scheduleAutoDrop;
     /**
      * Retrieves the list of recordings for the current call or call session.

package/dist/src/store/stateStore.d.ts

@@ -1,7 +1,7 @@
 import { BehaviorSubject, Observable } from 'rxjs';
 import type { Patch } from './rxUtils';
 import { Call } from '../Call';
-import type { OwnUserResponse } from '../coordinator/connection/types';
+import type { OwnUserResponse } from '../gen/coordinator';
 export declare class StreamVideoWriteableStateStore {
     /**
      * A store keeping data of a successfully connected user over WS to the coordinator server.

package/package.json

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

package/src/Call.ts

@@ -82,10 +82,8 @@ import {
   debounce,
   filter,
   map,
-  pairwise,
   Subject,
   takeWhile,
-  tap,
   timer,
 } from 'rxjs';
 import { TrackSubscriptionDetails } from './gen/video/sfu/signal_rpc/signal';
@@ -1345,9 +1343,10 @@ export class Call {
   };
 
   /**
+   * Updates the list of video layers to publish.
+   *
    * @internal
-   * @param enabledRids
-   * @returns
+   * @param enabledLayers the list of layers to enable.
    */
   updatePublishQuality = async (enabledLayers: VideoLayerSetting[]) => {
     return this.publisher?.updateVideoPublishQuality(enabledLayers);
@@ -1718,45 +1717,30 @@ export class Call {
     >(`${this.streamClientBasePath}/members`, data);
   };
 
+  /**
+   * Schedules an auto-drop timeout based on the call settings.
+   * Applicable only for ringing calls.
+   */
   private scheduleAutoDrop = () => {
-    if (this.dropTimeout) clearTimeout(this.dropTimeout);
-    const subscription = this.state.settings$
-      .pipe(
-        pairwise(),
-        tap(([prevSettings, currentSettings]) => {
-          if (!currentSettings || !this.clientStore.connectedUser) return;
-
-          const isOutgoingCall =
-            this.currentUserId === this.state.createdBy?.id;
-
-          const [prevTimeoutMs, timeoutMs] = isOutgoingCall
-            ? [
-                prevSettings?.ring.auto_cancel_timeout_ms,
-                currentSettings.ring.auto_cancel_timeout_ms,
-              ]
-            : [
-                prevSettings?.ring.incoming_call_timeout_ms,
-                currentSettings.ring.incoming_call_timeout_ms,
-              ];
-          if (
-            typeof timeoutMs === 'undefined' ||
-            timeoutMs === prevTimeoutMs ||
-            timeoutMs === 0
-          )
-            return;
-
-          if (this.dropTimeout) clearTimeout(this.dropTimeout);
-          this.dropTimeout = setTimeout(() => this.leave(), timeoutMs);
-        }),
-        takeWhile(
-          () => !!this.clientStore.calls.find((call) => call.cid === this.cid),
-        ),
-      )
-      .subscribe();
+    clearTimeout(this.dropTimeout);
+    this.leaveCallHooks.add(
+      createSubscription(this.state.settings$, (settings) => {
+        if (!settings) return;
+        // ignore if the call is not ringing
+        if (this.state.callingState !== CallingState.RINGING) return;
 
-    this.leaveCallHooks.add(() => {
-      !subscription.closed && subscription.unsubscribe();
-    });
+        const timeoutInMs = settings.ring.auto_cancel_timeout_ms;
+        // 0 means no auto-drop
+        if (timeoutInMs <= 0) return;
+
+        clearTimeout(this.dropTimeout);
+        this.dropTimeout = setTimeout(() => {
+          this.leave().catch((err) => {
+            this.logger('error', 'Failed to drop call', err);
+          });
+        }, timeoutInMs);
+      }),
+    );
   };
 
   /**

package/src/__tests__/server-side/call.test.ts

@@ -58,7 +58,11 @@ describe('call API', () => {
   });
 
   it('RTMP address', async () => {
-    const resp = await call.getOrCreate();
+    const resp = await call.getOrCreate({
+      data: {
+        created_by_id: 'john',
+      },
+    });
     const address = resp.call.ingress.rtmp.address;
 
     expect(address).toBeDefined();

package/src/rtc/Publisher.ts

@@ -218,12 +218,7 @@ export class Publisher {
         'info',
         `Track ${TrackType[trackType]} has ended, notifying the SFU`,
       );
-      await this.notifyTrackMuteStateChanged(
-        mediaStream,
-        track,
-        trackType,
-        true,
-      );
+      await this.notifyTrackMuteStateChanged(mediaStream, trackType, true);
       // clean-up, this event listener needs to run only once.
       track.removeEventListener('ended', handleTrackEnded);
     };
@@ -295,12 +290,7 @@ export class Publisher {
       await transceiver.sender.replaceTrack(track);
     }
 
-    await this.notifyTrackMuteStateChanged(
-      mediaStream,
-      track,
-      trackType,
-      false,
-    );
+    await this.notifyTrackMuteStateChanged(mediaStream, trackType, false);
   };
 
   /**
@@ -325,12 +315,7 @@ export class Publisher {
         : (transceiver.sender.track.enabled = false);
       // We don't need to notify SFU if unpublishing in response to remote soft mute
       if (this.state.localParticipant?.publishedTracks.includes(trackType)) {
-        await this.notifyTrackMuteStateChanged(
-          undefined,
-          transceiver.sender.track,
-          trackType,
-          true,
-        );
+        await this.notifyTrackMuteStateChanged(undefined, trackType, true);
       }
     }
   };
@@ -369,7 +354,6 @@ export class Publisher {
 
   private notifyTrackMuteStateChanged = async (
     mediaStream: MediaStream | undefined,
-    track: MediaStreamTrack,
     trackType: TrackType,
     isMuted: boolean,
   ) => {

package/src/store/stateStore.ts

@@ -2,7 +2,8 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import type { Patch } from './rxUtils';
 import * as RxUtils from './rxUtils';
 import { Call } from '../Call';
-import type { OwnUserResponse } from '../coordinator/connection/types';
+import { CallingState } from './CallState';
+import type { OwnUserResponse } from '../gen/coordinator';
 import { getLogger } from '../logger';
 
 export class StreamVideoWriteableStateStore {
@@ -22,12 +23,14 @@ export class StreamVideoWriteableStateStore {
     this.connectedUserSubject.subscribe(async (user) => {
       // leave all calls when the user disconnects.
       if (!user) {
+        const logger = getLogger(['client-state']);
         for (const call of this.calls) {
-          getLogger(['client-state'])(
-            'info',
-            `User disconnected, leaving call: ${call.cid}`,
-          );
-          await call.leave();
+          if (call.state.callingState === CallingState.LEFT) continue;
+
+          logger('info', `User disconnected, leaving call: ${call.cid}`);
+          await call.leave().catch((err) => {
+            logger('error', `Error leaving call: ${call.cid}`, err);
+          });
         }
       }
     });