@stream-io/video-client 1.40.1 → 1.40.2

package/dist/src/StreamSfuClient.d.ts

@@ -1,5 +1,5 @@
 import { Dispatcher, IceTrickleBuffer } from './rtc';
-import { JoinRequest, JoinResponse } from './gen/video/sfu/event/events';
+import { Error as SfuErrorEvent, JoinRequest, JoinResponse } from './gen/video/sfu/event/events';
 import { ICERestartRequest, SendAnswerRequest, SendStatsRequest, SetPublisherRequest, TrackMuteState, TrackSubscriptionDetails } from './gen/video/sfu/signal_rpc/signal';
 import { ICETrickle } from './gen/video/sfu/models/models';
 import { StreamClient } from './coordinator/connection/client';
@@ -170,3 +170,8 @@ export declare class StreamSfuClient {
     private keepAlive;
     private scheduleConnectionCheck;
 }
+export declare class SfuJoinError extends Error {
+    errorEvent: SfuErrorEvent;
+    unrecoverable: boolean;
+    constructor(event: SfuErrorEvent);
+}

package/package.json

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

package/src/Call.ts

@@ -1,4 +1,4 @@
-import { StreamSfuClient } from './StreamSfuClient';
+import { SfuJoinError, StreamSfuClient } from './StreamSfuClient';
 import {
   BasePeerConnectionOpts,
   Dispatcher,
@@ -908,7 +908,10 @@ export class Call {
         break;
       } catch (err) {
         this.logger.warn(`Failed to join call (${attempt})`, this.cid);
-        if (err instanceof ErrorFromResponse && err.unrecoverable) {
+        if (
+          (err instanceof ErrorFromResponse && err.unrecoverable) ||
+          (err instanceof SfuJoinError && err.unrecoverable)
+        ) {
           // if the error is unrecoverable, we should not retry as that signals
           // that connectivity is good, but the coordinator doesn't allow the user
           // to join the call due to some reason (e.g., ended call, expired token...)

package/src/StreamSfuClient.ts

@@ -14,6 +14,7 @@ import {
   SfuEventKinds,
 } from './rtc';
 import {
+  Error as SfuErrorEvent,
   JoinRequest,
   JoinResponse,
   SfuRequest,
@@ -26,7 +27,10 @@ import {
   TrackMuteState,
   TrackSubscriptionDetails,
 } from './gen/video/sfu/signal_rpc/signal';
-import { ICETrickle } from './gen/video/sfu/models/models';
+import {
+  ICETrickle,
+  WebsocketReconnectStrategy,
+} from './gen/video/sfu/models/models';
 import { StreamClient } from './coordinator/connection/client';
 import { generateUUIDv4 } from './coordinator/connection/utils';
 import { Credentials } from './gen/coordinator';
@@ -537,15 +541,27 @@ export class StreamSfuClient {
     const current = this.joinResponseTask;
 
     let timeoutId: NodeJS.Timeout | undefined = undefined;
+    const unsubscribeJoinErrorEvents = this.dispatcher.on('error', (event) => {
+      const { error, reconnectStrategy } = event;
+      if (!error) return;
+      if (reconnectStrategy === WebsocketReconnectStrategy.DISCONNECT) {
+        clearTimeout(timeoutId);
+        unsubscribe?.();
+        unsubscribeJoinErrorEvents();
+        current.reject(new SfuJoinError(event));
+      }
+    });
     const unsubscribe = this.dispatcher.on('joinResponse', (joinResponse) => {
       clearTimeout(timeoutId);
       unsubscribe();
+      unsubscribeJoinErrorEvents();
       this.keepAlive();
       current.resolve(joinResponse);
     });
 
     timeoutId = setTimeout(() => {
       unsubscribe();
+      unsubscribeJoinErrorEvents();
       const message = `Waiting for "joinResponse" has timed out after ${this.joinResponseTimeout}ms`;
       this.tracer?.trace('joinRequestTimeout', message);
       current.reject(new Error(message));
@@ -631,3 +647,15 @@ export class StreamSfuClient {
     }, this.unhealthyTimeoutInMs);
   };
 }
+
+export class SfuJoinError extends Error {
+  errorEvent: SfuErrorEvent;
+  unrecoverable: boolean;
+
+  constructor(event: SfuErrorEvent) {
+    super(event.error?.message || 'Join Error');
+    this.errorEvent = event;
+    this.unrecoverable =
+      event.reconnectStrategy === WebsocketReconnectStrategy.DISCONNECT;
+  }
+}