@stream-io/video-client 1.24.0 → 1.25.0

package/src/gen/video/sfu/event/events.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.6 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
+// @generated by protobuf-ts 2.10.0 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
 // @generated from protobuf file "video/sfu/event/events.proto" (package "stream.video.sfu.event", syntax proto3)
 // tslint:disable
 import { MessageType } from '@protobuf-ts/runtime';
@@ -1048,7 +1048,7 @@ class ChangePublishOptions$Type extends MessageType<ChangePublishOptions> {
         no: 1,
         name: 'publish_options',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => PublishOption,
       },
       { no: 2, name: 'reason', kind: 'scalar', T: 9 /*ScalarType.STRING*/ },
@@ -1089,7 +1089,7 @@ class PinsChanged$Type extends MessageType<PinsChanged> {
         no: 1,
         name: 'pins',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => Pin,
       },
     ]);
@@ -1332,14 +1332,14 @@ class JoinRequest$Type extends MessageType<JoinRequest> {
         no: 9,
         name: 'preferred_publish_options',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => PublishOption,
       },
       {
         no: 10,
         name: 'preferred_subscribe_options',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => SubscribeOption,
       },
     ]);
@@ -1367,14 +1367,14 @@ class ReconnectDetails$Type extends MessageType<ReconnectDetails> {
         no: 3,
         name: 'announced_tracks',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => TrackInfo,
       },
       {
         no: 4,
         name: 'subscriptions',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => TrackSubscriptionDetails,
       },
       {
@@ -1417,14 +1417,14 @@ class Migration$Type extends MessageType<Migration> {
         no: 2,
         name: 'announced_tracks',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => TrackInfo,
       },
       {
         no: 3,
         name: 'subscriptions',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => TrackSubscriptionDetails,
       },
     ]);
@@ -1450,7 +1450,7 @@ class JoinResponse$Type extends MessageType<JoinResponse> {
         no: 4,
         name: 'publish_options',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => PublishOption,
       },
     ]);
@@ -1532,7 +1532,7 @@ class ConnectionQualityChanged$Type extends MessageType<ConnectionQualityChanged
         no: 1,
         name: 'connection_quality_updates',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => ConnectionQualityInfo,
       },
     ]);
@@ -1601,7 +1601,7 @@ class AudioLevelChanged$Type extends MessageType<AudioLevelChanged> {
         no: 1,
         name: 'audio_levels',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => AudioLevel,
       },
     ]);
@@ -1681,7 +1681,7 @@ class VideoSender$Type extends MessageType<VideoSender> {
         no: 3,
         name: 'layers',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => VideoLayerSetting,
       },
       {
@@ -1715,14 +1715,14 @@ class ChangePublishQuality$Type extends MessageType<ChangePublishQuality> {
         no: 1,
         name: 'audio_senders',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => AudioSender,
       },
       {
         no: 2,
         name: 'video_senders',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => VideoSender,
       },
     ]);

package/src/gen/video/sfu/models/models.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.6 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
+// @generated by protobuf-ts 2.10.0 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
 // @generated from protobuf file "video/sfu/models/models.proto" (package "stream.video.sfu.models", syntax proto3)
 // tslint:disable
 import { MessageType } from '@protobuf-ts/runtime';
@@ -811,6 +811,10 @@ export enum ErrorCode {
    * @generated from protobuf enum value: ERROR_CODE_PARTICIPANT_MEDIA_TRANSPORT_FAILURE = 205;
    */
   PARTICIPANT_MEDIA_TRANSPORT_FAILURE = 205,
+  /**
+   * @generated from protobuf enum value: ERROR_CODE_PARTICIPANT_SIGNAL_LOST = 206;
+   */
+  PARTICIPANT_SIGNAL_LOST = 206,
   /**
    * @generated from protobuf enum value: ERROR_CODE_CALL_NOT_FOUND = 300;
    */
@@ -1084,7 +1088,7 @@ class CallState$Type extends MessageType<CallState> {
         no: 1,
         name: 'participants',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => Participant,
       },
       { no: 2, name: 'started_at', kind: 'message', T: () => Timestamp },
@@ -1098,7 +1102,7 @@ class CallState$Type extends MessageType<CallState> {
         no: 4,
         name: 'pins',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => Pin,
       },
     ]);
@@ -1276,7 +1280,7 @@ class SubscribeOption$Type extends MessageType<SubscribeOption> {
         no: 2,
         name: 'codecs',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => Codec,
       },
     ]);
@@ -1409,7 +1413,7 @@ class TrackInfo$Type extends MessageType<TrackInfo> {
         no: 5,
         name: 'layers',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => VideoLayer,
       },
       { no: 6, name: 'mid', kind: 'scalar', T: 9 /*ScalarType.STRING*/ },

package/src/gen/video/sfu/signal_rpc/signal.client.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.6 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
+// @generated by protobuf-ts 2.10.0 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
 // @generated from protobuf file "video/sfu/signal_rpc/signal.proto" (package "stream.video.sfu.signal", syntax proto3)
 // tslint:disable
 import type {

package/src/gen/video/sfu/signal_rpc/signal.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.6 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
+// @generated by protobuf-ts 2.10.0 with parameter long_type_string,client_generic,server_none,eslint_disable,optimize_code_size
 // @generated from protobuf file "video/sfu/signal_rpc/signal.proto" (package "stream.video.sfu.signal", syntax proto3)
 // tslint:disable
 import {
@@ -566,14 +566,14 @@ class SendStatsRequest$Type extends MessageType<SendStatsRequest> {
         no: 16,
         name: 'encode_stats',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => PerformanceStats,
       },
       {
         no: 17,
         name: 'decode_stats',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => PerformanceStats,
       },
       {
@@ -640,7 +640,7 @@ class UpdateMuteStatesRequest$Type extends MessageType<UpdateMuteStatesRequest>
         no: 3,
         name: 'mute_states',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => TrackMuteState,
       },
     ]);
@@ -717,7 +717,7 @@ class UpdateSubscriptionsRequest$Type extends MessageType<UpdateSubscriptionsReq
         no: 3,
         name: 'tracks',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => TrackSubscriptionDetails,
       },
     ]);
@@ -817,7 +817,7 @@ class SetPublisherRequest$Type extends MessageType<SetPublisherRequest> {
         no: 3,
         name: 'tracks',
         kind: 'message',
-        repeat: 1 /*RepeatType.PACKED*/,
+        repeat: 2 /*RepeatType.UNPACKED*/,
         T: () => TrackInfo,
       },
     ]);

package/src/rtc/BasePeerConnection.ts

@@ -5,20 +5,32 @@ import type {
 } from '../coordinator/connection/types';
 import { CallingState, CallState } from '../store';
 import { createSafeAsyncSubscription } from '../store/rxUtils';
-import { PeerType, TrackType } from '../gen/video/sfu/models/models';
+import {
+  ErrorCode,
+  PeerType,
+  TrackType,
+  WebsocketReconnectStrategy,
+} from '../gen/video/sfu/models/models';
+import { NegotiationError } from './NegotiationError';
 import { StreamSfuClient } from '../StreamSfuClient';
 import { AllSfuEvents, Dispatcher } from './Dispatcher';
 import { withoutConcurrency } from '../helpers/concurrency';
 import { StatsTracer, Tracer, traceRTCPeerConnection } from '../stats';
 
+export type OnReconnectionNeeded = (
+  kind: WebsocketReconnectStrategy,
+  reason: string,
+) => void;
+
 export type BasePeerConnectionOpts = {
   sfuClient: StreamSfuClient;
   state: CallState;
   connectionConfig?: RTCConfiguration;
   dispatcher: Dispatcher;
-  onUnrecoverableError?: (reason: string) => void;
+  onReconnectionNeeded?: OnReconnectionNeeded;
   logTag: string;
   enableTracing: boolean;
+  iceRestartDelay?: number;
 };
 
 /**
@@ -33,7 +45,9 @@ export abstract class BasePeerConnection {
   protected readonly dispatcher: Dispatcher;
   protected sfuClient: StreamSfuClient;
 
-  protected onUnrecoverableError?: (reason: string) => void;
+  private onReconnectionNeeded?: OnReconnectionNeeded;
+  private readonly iceRestartDelay: number;
+  private iceRestartTimeout?: NodeJS.Timeout;
   protected isIceRestarting = false;
   private isDisposed = false;
 
@@ -41,6 +55,7 @@ export abstract class BasePeerConnection {
 
   readonly tracer?: Tracer;
   readonly stats: StatsTracer;
+
   private readonly subscriptions: (() => void)[] = [];
   private unsubscribeIceTrickle?: () => void;
   protected readonly lock = Math.random().toString(36).slice(2);
@@ -55,33 +70,23 @@ export abstract class BasePeerConnection {
       connectionConfig,
       state,
       dispatcher,
-      onUnrecoverableError,
+      onReconnectionNeeded,
       logTag,
       enableTracing,
+      iceRestartDelay = 2500,
     }: BasePeerConnectionOpts,
   ) {
     this.peerType = peerType;
     this.sfuClient = sfuClient;
     this.state = state;
     this.dispatcher = dispatcher;
-    this.onUnrecoverableError = onUnrecoverableError;
+    this.iceRestartDelay = iceRestartDelay;
+    this.onReconnectionNeeded = onReconnectionNeeded;
     this.logger = getLogger([
       peerType === PeerType.SUBSCRIBER ? 'Subscriber' : 'Publisher',
       logTag,
     ]);
-    this.pc = new RTCPeerConnection(connectionConfig);
-    this.pc.addEventListener('icecandidate', this.onIceCandidate);
-    this.pc.addEventListener('icecandidateerror', this.onIceCandidateError);
-    this.pc.addEventListener(
-      'iceconnectionstatechange',
-      this.onIceConnectionStateChange,
-    );
-    this.pc.addEventListener('icegatheringstatechange', this.onIceGatherChange);
-    this.pc.addEventListener('signalingstatechange', this.onSignalingChange);
-    this.pc.addEventListener(
-      'connectionstatechange',
-      this.onConnectionStateChange,
-    );
+    this.pc = this.createPeerConnection(connectionConfig);
     this.stats = new StatsTracer(this.pc, peerType, this.trackIdToTrackType);
     if (enableTracing) {
       const tag = `${logTag}-${peerType === PeerType.SUBSCRIBER ? 'sub' : 'pub'}`;
@@ -94,11 +99,27 @@ export abstract class BasePeerConnection {
     }
   }
 
+  private createPeerConnection = (connectionConfig?: RTCConfiguration) => {
+    const pc = new RTCPeerConnection(connectionConfig);
+    pc.addEventListener('icecandidate', this.onIceCandidate);
+    pc.addEventListener('icecandidateerror', this.onIceCandidateError);
+    pc.addEventListener(
+      'iceconnectionstatechange',
+      this.onIceConnectionStateChange,
+    );
+    pc.addEventListener('icegatheringstatechange', this.onIceGatherChange);
+    pc.addEventListener('signalingstatechange', this.onSignalingChange);
+    pc.addEventListener('connectionstatechange', this.onConnectionStateChange);
+    return pc;
+  };
+
   /**
    * Disposes the `RTCPeerConnection` instance.
    */
   dispose() {
-    this.onUnrecoverableError = undefined;
+    clearTimeout(this.iceRestartTimeout);
+    this.iceRestartTimeout = undefined;
+    this.onReconnectionNeeded = undefined;
     this.isDisposed = true;
     this.detachEventHandlers();
     this.pc.close();
@@ -109,17 +130,15 @@ export abstract class BasePeerConnection {
    * Detaches the event handlers from the `RTCPeerConnection`.
    */
   detachEventHandlers() {
-    this.pc.removeEventListener('icecandidate', this.onIceCandidate);
-    this.pc.removeEventListener('icecandidateerror', this.onIceCandidateError);
-    this.pc.removeEventListener('signalingstatechange', this.onSignalingChange);
-    this.pc.removeEventListener(
+    const pc = this.pc;
+    pc.removeEventListener('icecandidate', this.onIceCandidate);
+    pc.removeEventListener('icecandidateerror', this.onIceCandidateError);
+    pc.removeEventListener('signalingstatechange', this.onSignalingChange);
+    pc.removeEventListener(
       'iceconnectionstatechange',
       this.onIceConnectionStateChange,
     );
-    this.pc.removeEventListener(
-      'icegatheringstatechange',
-      this.onIceGatherChange,
-    );
+    pc.removeEventListener('icegatheringstatechange', this.onIceGatherChange);
     this.unsubscribeIceTrickle?.();
     this.subscriptions.forEach((unsubscribe) => unsubscribe());
   }
@@ -129,6 +148,24 @@ export abstract class BasePeerConnection {
    */
   protected abstract restartIce(): Promise<void>;
 
+  /**
+   * Attempts to restart ICE on the `RTCPeerConnection`.
+   * This method intentionally doesn't await the `restartIce()` method,
+   * allowing it to run in the background and handle any errors that may occur.
+   */
+  protected tryRestartIce = () => {
+    this.restartIce().catch((e) => {
+      const reason = 'restartICE() failed, initiating reconnect';
+      this.logger('error', reason, e);
+      const strategy =
+        e instanceof NegotiationError &&
+        e.error.code === ErrorCode.PARTICIPANT_SIGNAL_LOST
+          ? WebsocketReconnectStrategy.FAST
+          : WebsocketReconnectStrategy.REJOIN;
+      this.onReconnectionNeeded?.(strategy, reason);
+    });
+  };
+
   /**
    * Handles events synchronously.
    * Consecutive events are queued and executed one after the other.
@@ -194,6 +231,22 @@ export abstract class BasePeerConnection {
     return this.trackIdToTrackType.get(trackId);
   };
 
+  /**
+   * Checks if the `RTCPeerConnection` is healthy.
+   * It checks the ICE connection state and the peer connection state.
+   * If either state is `failed`, `disconnected`, or `closed`,
+   * it returns `false`, otherwise it returns `true`.
+   */
+  isHealthy = () => {
+    const failedStates = new Set<
+      RTCIceConnectionState | RTCPeerConnectionState
+    >(['failed', 'closed']);
+
+    const iceState = this.pc.iceConnectionState;
+    const connectionState = this.pc.connectionState;
+    return !failedStates.has(iceState) && !failedStates.has(connectionState);
+  };
+
   /**
    * Handles the ICECandidate event and
    * Initiates an ICE Trickle process with the SFU.
@@ -234,8 +287,7 @@ export abstract class BasePeerConnection {
   private onConnectionStateChange = async () => {
     const state = this.pc.connectionState;
     this.logger('debug', `Connection state changed`, state);
-    if (!this.tracer) return;
-    if (state === 'connected' || state === 'failed') {
+    if (this.tracer && (state === 'connected' || state === 'failed')) {
       try {
         const stats = await this.stats.get();
         this.tracer.trace('getstats', stats.delta);
@@ -243,6 +295,17 @@ export abstract class BasePeerConnection {
         this.tracer.trace('getstatsOnFailure', (err as Error).toString());
       }
     }
+
+    // we can't recover from a failed connection state (contrary to ICE)
+    if (state === 'failed') {
+      this.onReconnectionNeeded?.(
+        WebsocketReconnectStrategy.REJOIN,
+        'Connection failed',
+      );
+      return;
+    }
+
+    this.handleConnectionStateUpdate(state);
   };
 
   /**
@@ -251,22 +314,47 @@ export abstract class BasePeerConnection {
   private onIceConnectionStateChange = () => {
     const state = this.pc.iceConnectionState;
     this.logger('debug', `ICE connection state changed`, state);
+    this.handleConnectionStateUpdate(state);
+  };
 
-    if (this.state.callingState === CallingState.OFFLINE) return;
-    if (this.state.callingState === CallingState.RECONNECTING) return;
+  private handleConnectionStateUpdate = (
+    state: RTCIceConnectionState | RTCPeerConnectionState,
+  ) => {
+    const { callingState } = this.state;
+    if (callingState === CallingState.OFFLINE) return;
+    if (callingState === CallingState.RECONNECTING) return;
 
     // do nothing when ICE is restarting
     if (this.isIceRestarting) return;
 
-    if (state === 'failed') {
-      this.onUnrecoverableError?.('ICE connection failed');
-    } else if (state === 'disconnected') {
-      this.logger('debug', `Attempting to restart ICE`);
-      this.restartIce().catch((e) => {
-        const reason = `ICE restart failed`;
-        this.logger('error', reason, e);
-        this.onUnrecoverableError?.(`${reason}: ${e}`);
-      });
+    switch (state) {
+      case 'failed':
+        // in the `failed` state, we try to restart ICE immediately
+        this.logger('info', 'restartICE due to failed connection');
+        this.tryRestartIce();
+        break;
+
+      case 'disconnected':
+        // in the `disconnected` state, we schedule a restartICE() after a delay
+        // as the browser might recover the connection in the meantime
+        this.logger('info', 'disconnected connection, scheduling restartICE');
+        clearTimeout(this.iceRestartTimeout);
+        this.iceRestartTimeout = setTimeout(() => {
+          const currentState = this.pc.iceConnectionState;
+          if (currentState === 'disconnected' || currentState === 'failed') {
+            this.tryRestartIce();
+          }
+        }, this.iceRestartDelay);
+        break;
+
+      case 'connected':
+        // in the `connected` state, we clear the ice restart timeout if it exists
+        if (this.iceRestartTimeout) {
+          this.logger('info', 'connected connection, canceling restartICE');
+          clearTimeout(this.iceRestartTimeout);
+          this.iceRestartTimeout = undefined;
+        }
+        break;
     }
   };
 
@@ -275,12 +363,10 @@ export abstract class BasePeerConnection {
    */
   private onIceCandidateError = (e: Event) => {
     const errorMessage =
-      e instanceof RTCPeerConnectionIceErrorEvent &&
-      `${e.errorCode}: ${e.errorText}`;
-    const iceState = this.pc.iceConnectionState;
-    const logLevel =
-      iceState === 'connected' || iceState === 'checking' ? 'debug' : 'warn';
-    this.logger(logLevel, `ICE Candidate error`, errorMessage);
+      e instanceof RTCPeerConnectionIceErrorEvent
+        ? `${e.errorCode}: ${e.errorText}`
+        : e;
+    this.logger('debug', 'ICE Candidate error', errorMessage);
   };
 
   /**

package/src/rtc/NegotiationError.ts

@@ -0,0 +1,21 @@
+import { Error as SfuError } from '../gen/video/sfu/models/models';
+
+/**
+ * NegotiationError is thrown when there is an error during the negotiation process.
+ * It extends the built-in Error class and includes an SfuError object for more details.
+ */
+export class NegotiationError extends Error {
+  /**
+   * The SfuError object that contains details about the error.
+   */
+  error: SfuError;
+
+  /**
+   * Creates an instance of NegotiationError.
+   */
+  constructor(error: SfuError) {
+    super(error.message);
+    this.name = 'NegotiationError';
+    this.error = error;
+  }
+}

package/src/rtc/Publisher.ts

@@ -2,6 +2,7 @@ import {
   BasePeerConnection,
   BasePeerConnectionOpts,
 } from './BasePeerConnection';
+import { NegotiationError } from './NegotiationError';
 import { TransceiverCache } from './TransceiverCache';
 import {
   PeerType,
@@ -44,11 +45,7 @@ export class Publisher extends BasePeerConnection {
 
     this.on('iceRestart', (iceRestart) => {
       if (iceRestart.peerType !== PeerType.PUBLISHER_UNSPECIFIED) return;
-      this.restartIce().catch((err) => {
-        const reason = `ICE restart failed`;
-        this.logger('warn', reason, err);
-        this.onUnrecoverableError?.(`${reason}: ${err}`);
-      });
+      this.tryRestartIce();
     });
 
     this.on('changePublishQuality', async (event) => {
@@ -189,11 +186,11 @@ export class Publisher extends BasePeerConnection {
   /**
    * Returns true if the given track type is currently being published to the SFU.
    *
-   * @param trackType the track type to check.
+   * @param trackType the track type to check. If omitted, checks if any track is being published.
    */
-  isPublishing = (trackType: TrackType): boolean => {
+  isPublishing = (trackType?: TrackType): boolean => {
     for (const item of this.transceiverCache.items()) {
-      if (item.publishOption.trackType !== trackType) continue;
+      if (trackType && item.publishOption.trackType !== trackType) continue;
 
       const track = item.transceiver.sender.track;
       if (!track) continue;
@@ -338,10 +335,16 @@ export class Publisher extends BasePeerConnection {
 
         const { sdp = '' } = offer;
         const { response } = await this.sfuClient.setPublisher({ sdp, tracks });
-        if (response.error) throw new Error(response.error.message);
+        if (response.error) throw new NegotiationError(response.error);
 
         const { sdp: answerSdp } = response;
         await this.pc.setRemoteDescription({ type: 'answer', sdp: answerSdp });
+      } catch (err) {
+        // negotiation failed, rollback to the previous state
+        if (this.pc.signalingState === 'have-local-offer') {
+          await this.pc.setLocalDescription({ type: 'rollback' });
+        }
+        throw err;
       } finally {
         this.isIceRestarting = false;
       }

package/src/rtc/Subscriber.ts

@@ -2,9 +2,11 @@ import {
   BasePeerConnection,
   BasePeerConnectionOpts,
 } from './BasePeerConnection';
+import { NegotiationError } from './NegotiationError';
 import { PeerType } from '../gen/video/sfu/models/models';
 import { SubscriberOffer } from '../gen/video/sfu/event/events';
 import { toTrackType, trackTypeToParticipantStreamKey } from './helpers/tracks';
+import { enableStereo } from './helpers/sdp';
 
 /**
  * A wrapper around the `RTCPeerConnection` that handles the incoming
@@ -54,11 +56,12 @@ export class Subscriber extends BasePeerConnection {
       return;
     }
     const previousIsIceRestarting = this.isIceRestarting;
+    this.isIceRestarting = true;
     try {
-      this.isIceRestarting = true;
-      await this.sfuClient.iceRestart({
+      const { response } = await this.sfuClient.iceRestart({
         peerType: PeerType.SUBSCRIBER,
       });
+      if (response.error) throw new NegotiationError(response.error);
     } catch (e) {
       // restore the previous state, as our intent for restarting ICE failed
       this.isIceRestarting = previousIsIceRestarting;
@@ -154,6 +157,9 @@ export class Subscriber extends BasePeerConnection {
     this.addTrickledIceCandidates();
 
     const answer = await this.pc.createAnswer();
+    if (answer.sdp) {
+      answer.sdp = enableStereo(subscriberOffer.sdp, answer.sdp);
+    }
     await this.pc.setLocalDescription(answer);
 
     await this.sfuClient.sendAnswer({