livekit-client 1.6.2 → 1.6.4

package/src/proto/livekit_rtc.ts

@@ -9,6 +9,9 @@ import {
   DisconnectReason,
   disconnectReasonFromJSON,
   disconnectReasonToJSON,
+  Encryption_Type,
+  encryption_TypeFromJSON,
+  encryption_TypeToJSON,
   ParticipantInfo,
   ParticipantTracks,
   Room,
@@ -148,7 +151,8 @@ export interface SignalRequest {
     | { $case: "subscriptionPermission"; subscriptionPermission: SubscriptionPermission }
     | { $case: "syncState"; syncState: SyncState }
     | { $case: "simulate"; simulate: SimulateScenario }
-    | { $case: "ping"; ping: number };
+    | { $case: "ping"; ping: number }
+    | { $case: "updateMetadata"; updateMetadata: UpdateParticipantMetadata };
 }
 
 export interface SignalResponse {
@@ -169,7 +173,8 @@ export interface SignalResponse {
     | { $case: "subscriptionPermissionUpdate"; subscriptionPermissionUpdate: SubscriptionPermissionUpdate }
     | { $case: "refreshToken"; refreshToken: string }
     | { $case: "trackUnpublished"; trackUnpublished: TrackUnpublishedResponse }
-    | { $case: "pong"; pong: number };
+    | { $case: "pong"; pong: number }
+    | { $case: "reconnect"; reconnect: ReconnectResponse };
 }
 
 export interface SimulcastCodec {
@@ -198,6 +203,7 @@ export interface AddTrackRequest {
   stereo: boolean;
   /** true if RED (Redundant Encoding) is disabled for audio */
   disableRed: boolean;
+  encryption: Encryption_Type;
 }
 
 export interface TrickleRequest {
@@ -232,6 +238,11 @@ export interface JoinResponse {
   serverInfo?: ServerInfo;
 }
 
+export interface ReconnectResponse {
+  iceServers: ICEServer[];
+  clientConfiguration?: ClientConfiguration;
+}
+
 export interface TrackPublishedResponse {
   cid: string;
   track?: TrackInfo;
@@ -267,8 +278,17 @@ export interface UpdateTrackSettings {
   width: number;
   /** for video, height to receive */
   height: number;
-  /** for video, frame rate to receive */
   fps: number;
+  /**
+   * subscription priority. 1 being the highest (0 is unset)
+   * when unset, server sill assign priority based on the order of subscription
+   * server will use priority in the following ways:
+   * 1. when subscribed tracks exceed per-participant subscription limit, server will
+   *    pause the lowest priority tracks
+   * 2. when the network is congested, server will assign available bandwidth to
+   *    higher priority tracks first. lowest priority tracks can be paused
+   */
+  priority: number;
 }
 
 export interface LeaveRequest {
@@ -286,6 +306,10 @@ export interface UpdateVideoLayers {
   layers: VideoLayer[];
 }
 
+export interface UpdateParticipantMetadata {
+  metadata: string;
+}
+
 export interface ICEServer {
   urls: string[];
   username: string;
@@ -425,6 +449,9 @@ export const SignalRequest = {
     if (message.message?.$case === "ping") {
       writer.uint32(112).int64(message.message.ping);
     }
+    if (message.message?.$case === "updateMetadata") {
+      UpdateParticipantMetadata.encode(message.message.updateMetadata, writer.uint32(122).fork()).ldelim();
+    }
     return writer;
   },
 
@@ -480,6 +507,12 @@ export const SignalRequest = {
         case 14:
           message.message = { $case: "ping", ping: longToNumber(reader.int64() as Long) };
           break;
+        case 15:
+          message.message = {
+            $case: "updateMetadata",
+            updateMetadata: UpdateParticipantMetadata.decode(reader, reader.uint32()),
+          };
+          break;
         default:
           reader.skipType(tag & 7);
           break;
@@ -519,6 +552,8 @@ export const SignalRequest = {
         ? { $case: "simulate", simulate: SimulateScenario.fromJSON(object.simulate) }
         : isSet(object.ping)
         ? { $case: "ping", ping: Number(object.ping) }
+        : isSet(object.updateMetadata)
+        ? { $case: "updateMetadata", updateMetadata: UpdateParticipantMetadata.fromJSON(object.updateMetadata) }
         : undefined,
     };
   },
@@ -555,6 +590,9 @@ export const SignalRequest = {
     message.message?.$case === "simulate" &&
       (obj.simulate = message.message?.simulate ? SimulateScenario.toJSON(message.message?.simulate) : undefined);
     message.message?.$case === "ping" && (obj.ping = Math.round(message.message?.ping));
+    message.message?.$case === "updateMetadata" && (obj.updateMetadata = message.message?.updateMetadata
+      ? UpdateParticipantMetadata.toJSON(message.message?.updateMetadata)
+      : undefined);
     return obj;
   },
 
@@ -641,6 +679,16 @@ export const SignalRequest = {
     if (object.message?.$case === "ping" && object.message?.ping !== undefined && object.message?.ping !== null) {
       message.message = { $case: "ping", ping: object.message.ping };
     }
+    if (
+      object.message?.$case === "updateMetadata" &&
+      object.message?.updateMetadata !== undefined &&
+      object.message?.updateMetadata !== null
+    ) {
+      message.message = {
+        $case: "updateMetadata",
+        updateMetadata: UpdateParticipantMetadata.fromPartial(object.message.updateMetadata),
+      };
+    }
     return message;
   },
 };
@@ -703,6 +751,9 @@ export const SignalResponse = {
     if (message.message?.$case === "pong") {
       writer.uint32(144).int64(message.message.pong);
     }
+    if (message.message?.$case === "reconnect") {
+      ReconnectResponse.encode(message.message.reconnect, writer.uint32(154).fork()).ldelim();
+    }
     return writer;
   },
 
@@ -785,6 +836,9 @@ export const SignalResponse = {
         case 18:
           message.message = { $case: "pong", pong: longToNumber(reader.int64() as Long) };
           break;
+        case 19:
+          message.message = { $case: "reconnect", reconnect: ReconnectResponse.decode(reader, reader.uint32()) };
+          break;
         default:
           reader.skipType(tag & 7);
           break;
@@ -835,6 +889,8 @@ export const SignalResponse = {
         ? { $case: "trackUnpublished", trackUnpublished: TrackUnpublishedResponse.fromJSON(object.trackUnpublished) }
         : isSet(object.pong)
         ? { $case: "pong", pong: Number(object.pong) }
+        : isSet(object.reconnect)
+        ? { $case: "reconnect", reconnect: ReconnectResponse.fromJSON(object.reconnect) }
         : undefined,
     };
   },
@@ -882,6 +938,8 @@ export const SignalResponse = {
       ? TrackUnpublishedResponse.toJSON(message.message?.trackUnpublished)
       : undefined);
     message.message?.$case === "pong" && (obj.pong = Math.round(message.message?.pong));
+    message.message?.$case === "reconnect" &&
+      (obj.reconnect = message.message?.reconnect ? ReconnectResponse.toJSON(message.message?.reconnect) : undefined);
     return obj;
   },
 
@@ -999,6 +1057,13 @@ export const SignalResponse = {
     if (object.message?.$case === "pong" && object.message?.pong !== undefined && object.message?.pong !== null) {
       message.message = { $case: "pong", pong: object.message.pong };
     }
+    if (
+      object.message?.$case === "reconnect" &&
+      object.message?.reconnect !== undefined &&
+      object.message?.reconnect !== null
+    ) {
+      message.message = { $case: "reconnect", reconnect: ReconnectResponse.fromPartial(object.message.reconnect) };
+    }
     return message;
   },
 };
@@ -1085,6 +1150,7 @@ function createBaseAddTrackRequest(): AddTrackRequest {
     sid: "",
     stereo: false,
     disableRed: false,
+    encryption: 0,
   };
 }
 
@@ -1129,6 +1195,9 @@ export const AddTrackRequest = {
     if (message.disableRed === true) {
       writer.uint32(104).bool(message.disableRed);
     }
+    if (message.encryption !== 0) {
+      writer.uint32(112).int32(message.encryption);
+    }
     return writer;
   },
 
@@ -1178,6 +1247,9 @@ export const AddTrackRequest = {
         case 13:
           message.disableRed = reader.bool();
           break;
+        case 14:
+          message.encryption = reader.int32() as any;
+          break;
         default:
           reader.skipType(tag & 7);
           break;
@@ -1203,6 +1275,7 @@ export const AddTrackRequest = {
       sid: isSet(object.sid) ? String(object.sid) : "",
       stereo: isSet(object.stereo) ? Boolean(object.stereo) : false,
       disableRed: isSet(object.disableRed) ? Boolean(object.disableRed) : false,
+      encryption: isSet(object.encryption) ? encryption_TypeFromJSON(object.encryption) : 0,
     };
   },
 
@@ -1229,6 +1302,7 @@ export const AddTrackRequest = {
     message.sid !== undefined && (obj.sid = message.sid);
     message.stereo !== undefined && (obj.stereo = message.stereo);
     message.disableRed !== undefined && (obj.disableRed = message.disableRed);
+    message.encryption !== undefined && (obj.encryption = encryption_TypeToJSON(message.encryption));
     return obj;
   },
 
@@ -1247,6 +1321,7 @@ export const AddTrackRequest = {
     message.sid = object.sid ?? "";
     message.stereo = object.stereo ?? false;
     message.disableRed = object.disableRed ?? false;
+    message.encryption = object.encryption ?? 0;
     return message;
   },
 };
@@ -1550,6 +1625,74 @@ export const JoinResponse = {
   },
 };
 
+function createBaseReconnectResponse(): ReconnectResponse {
+  return { iceServers: [], clientConfiguration: undefined };
+}
+
+export const ReconnectResponse = {
+  encode(message: ReconnectResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    for (const v of message.iceServers) {
+      ICEServer.encode(v!, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.clientConfiguration !== undefined) {
+      ClientConfiguration.encode(message.clientConfiguration, writer.uint32(18).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): ReconnectResponse {
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseReconnectResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          message.iceServers.push(ICEServer.decode(reader, reader.uint32()));
+          break;
+        case 2:
+          message.clientConfiguration = ClientConfiguration.decode(reader, reader.uint32());
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+
+  fromJSON(object: any): ReconnectResponse {
+    return {
+      iceServers: Array.isArray(object?.iceServers) ? object.iceServers.map((e: any) => ICEServer.fromJSON(e)) : [],
+      clientConfiguration: isSet(object.clientConfiguration)
+        ? ClientConfiguration.fromJSON(object.clientConfiguration)
+        : undefined,
+    };
+  },
+
+  toJSON(message: ReconnectResponse): unknown {
+    const obj: any = {};
+    if (message.iceServers) {
+      obj.iceServers = message.iceServers.map((e) => e ? ICEServer.toJSON(e) : undefined);
+    } else {
+      obj.iceServers = [];
+    }
+    message.clientConfiguration !== undefined && (obj.clientConfiguration = message.clientConfiguration
+      ? ClientConfiguration.toJSON(message.clientConfiguration)
+      : undefined);
+    return obj;
+  },
+
+  fromPartial<I extends Exact<DeepPartial<ReconnectResponse>, I>>(object: I): ReconnectResponse {
+    const message = createBaseReconnectResponse();
+    message.iceServers = object.iceServers?.map((e) => ICEServer.fromPartial(e)) || [];
+    message.clientConfiguration = (object.clientConfiguration !== undefined && object.clientConfiguration !== null)
+      ? ClientConfiguration.fromPartial(object.clientConfiguration)
+      : undefined;
+    return message;
+  },
+};
+
 function createBaseTrackPublishedResponse(): TrackPublishedResponse {
   return { cid: "", track: undefined };
 }
@@ -1845,7 +1988,7 @@ export const UpdateSubscription = {
 };
 
 function createBaseUpdateTrackSettings(): UpdateTrackSettings {
-  return { trackSids: [], disabled: false, quality: 0, width: 0, height: 0, fps: 0 };
+  return { trackSids: [], disabled: false, quality: 0, width: 0, height: 0, fps: 0, priority: 0 };
 }
 
 export const UpdateTrackSettings = {
@@ -1868,6 +2011,9 @@ export const UpdateTrackSettings = {
     if (message.fps !== 0) {
       writer.uint32(56).uint32(message.fps);
     }
+    if (message.priority !== 0) {
+      writer.uint32(64).uint32(message.priority);
+    }
     return writer;
   },
 
@@ -1896,6 +2042,9 @@ export const UpdateTrackSettings = {
         case 7:
           message.fps = reader.uint32();
           break;
+        case 8:
+          message.priority = reader.uint32();
+          break;
         default:
           reader.skipType(tag & 7);
           break;
@@ -1912,6 +2061,7 @@ export const UpdateTrackSettings = {
       width: isSet(object.width) ? Number(object.width) : 0,
       height: isSet(object.height) ? Number(object.height) : 0,
       fps: isSet(object.fps) ? Number(object.fps) : 0,
+      priority: isSet(object.priority) ? Number(object.priority) : 0,
     };
   },
 
@@ -1927,6 +2077,7 @@ export const UpdateTrackSettings = {
     message.width !== undefined && (obj.width = Math.round(message.width));
     message.height !== undefined && (obj.height = Math.round(message.height));
     message.fps !== undefined && (obj.fps = Math.round(message.fps));
+    message.priority !== undefined && (obj.priority = Math.round(message.priority));
     return obj;
   },
 
@@ -1938,6 +2089,7 @@ export const UpdateTrackSettings = {
     message.width = object.width ?? 0;
     message.height = object.height ?? 0;
     message.fps = object.fps ?? 0;
+    message.priority = object.priority ?? 0;
     return message;
   },
 };
@@ -2062,6 +2214,53 @@ export const UpdateVideoLayers = {
   },
 };
 
+function createBaseUpdateParticipantMetadata(): UpdateParticipantMetadata {
+  return { metadata: "" };
+}
+
+export const UpdateParticipantMetadata = {
+  encode(message: UpdateParticipantMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.metadata !== "") {
+      writer.uint32(10).string(message.metadata);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): UpdateParticipantMetadata {
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseUpdateParticipantMetadata();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          message.metadata = reader.string();
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+
+  fromJSON(object: any): UpdateParticipantMetadata {
+    return { metadata: isSet(object.metadata) ? String(object.metadata) : "" };
+  },
+
+  toJSON(message: UpdateParticipantMetadata): unknown {
+    const obj: any = {};
+    message.metadata !== undefined && (obj.metadata = message.metadata);
+    return obj;
+  },
+
+  fromPartial<I extends Exact<DeepPartial<UpdateParticipantMetadata>, I>>(object: I): UpdateParticipantMetadata {
+    const message = createBaseUpdateParticipantMetadata();
+    message.metadata = object.metadata ?? "";
+    return message;
+  },
+};
+
 function createBaseICEServer(): ICEServer {
   return { urls: [], username: "", credential: "" };
 }
@@ -3192,7 +3391,7 @@ export const SimulateScenario = {
 declare var self: any | undefined;
 declare var window: any | undefined;
 declare var global: any | undefined;
-var globalThis: any = (() => {
+var tsProtoGlobalThis: any = (() => {
   if (typeof globalThis !== "undefined") {
     return globalThis;
   }
@@ -3222,7 +3421,7 @@ export type Exact<P, I extends P> = P extends Builtin ? P
 
 function longToNumber(long: Long): number {
   if (long.gt(Number.MAX_SAFE_INTEGER)) {
-    throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
+    throw new tsProtoGlobalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
   }
   return long.toNumber();
 }

package/src/room/PCTransport.ts

@@ -30,6 +30,8 @@ export default class PCTransport extends EventEmitter {
 
   remoteStereoMids: string[] = [];
 
+  remoteNackMids: string[] = [];
+
   onOffer?: (offer: RTCSessionDescriptionInit) => void;
 
   constructor(config?: RTCConfiguration) {
@@ -50,7 +52,9 @@ export default class PCTransport extends EventEmitter {
 
   async setRemoteDescription(sd: RTCSessionDescriptionInit): Promise<void> {
     if (sd.type === 'offer') {
-      this.remoteStereoMids = extractStereoTracksFromOffer(sd);
+      let { stereoMids, nackMids } = extractStereoAndNackAudioFromOffer(sd);
+      this.remoteStereoMids = stereoMids;
+      this.remoteNackMids = nackMids;
     }
     await this.pc.setRemoteDescription(sd);
 
@@ -116,7 +120,7 @@ export default class PCTransport extends EventEmitter {
     const sdpParsed = parse(offer.sdp ?? '');
     sdpParsed.media.forEach((media) => {
       if (media.type === 'audio') {
-        ensureAudioNackAndStereo(media, []);
+        ensureAudioNackAndStereo(media, [], []);
       } else if (media.type === 'video') {
         // mung sdp for codec bitrate setting that can't apply by sendEncoding
         this.trackBitrates.some((trackbr): boolean => {
@@ -169,7 +173,7 @@ export default class PCTransport extends EventEmitter {
     const sdpParsed = parse(answer.sdp ?? '');
     sdpParsed.media.forEach((media) => {
       if (media.type === 'audio') {
-        ensureAudioNackAndStereo(media, this.remoteStereoMids);
+        ensureAudioNackAndStereo(media, this.remoteStereoMids, this.remoteNackMids);
       }
     });
     await this.setMungedLocalDescription(answer, write(sdpParsed));
@@ -226,6 +230,7 @@ function ensureAudioNackAndStereo(
     payloads?: string | undefined;
   } & MediaDescription,
   stereoMids: string[],
+  nackMids: string[],
 ) {
   // found opus codec to add nack fb
   let opusPayload = 0;
@@ -243,7 +248,10 @@ function ensureAudioNackAndStereo(
       media.rtcpFb = [];
     }
 
-    if (!media.rtcpFb.some((fb) => fb.payload === opusPayload && fb.type === 'nack')) {
+    if (
+      nackMids.includes(media.mid!) &&
+      !media.rtcpFb.some((fb) => fb.payload === opusPayload && fb.type === 'nack')
+    ) {
       media.rtcpFb.push({
         payload: opusPayload,
         type: 'nack',
@@ -264,8 +272,12 @@ function ensureAudioNackAndStereo(
   }
 }
 
-function extractStereoTracksFromOffer(offer: RTCSessionDescriptionInit): string[] {
+function extractStereoAndNackAudioFromOffer(offer: RTCSessionDescriptionInit): {
+  stereoMids: string[];
+  nackMids: string[];
+} {
   const stereoMids: string[] = [];
+  const nackMids: string[] = [];
   const sdpParsed = parse(offer.sdp ?? '');
   let opusPayload = 0;
   sdpParsed.media.forEach((media) => {
@@ -278,6 +290,10 @@ function extractStereoTracksFromOffer(offer: RTCSessionDescriptionInit): string[
         return false;
       });
 
+      if (media.rtcpFb?.some((fb) => fb.payload === opusPayload && fb.type === 'nack')) {
+        nackMids.push(media.mid!);
+      }
+
       media.fmtp.some((fmtp): boolean => {
         if (fmtp.payload === opusPayload) {
           if (fmtp.config.includes('sprop-stereo=1')) {
@@ -289,5 +305,5 @@ function extractStereoTracksFromOffer(offer: RTCSessionDescriptionInit): string[
       });
     }
   });
-  return stereoMids;
+  return { stereoMids, nackMids };
 }

package/src/room/RTCEngine.ts

@@ -17,6 +17,7 @@ import {
   AddTrackRequest,
   JoinResponse,
   LeaveRequest,
+  ReconnectResponse,
   SignalTarget,
   TrackPublishedResponse,
 } from '../proto/livekit_rtc';
@@ -31,6 +32,7 @@ import {
 import { EngineEvent } from './events';
 import PCTransport, { PCEvents } from './PCTransport';
 import type { ReconnectContext, ReconnectPolicy } from './ReconnectPolicy';
+import CriticalTimers from './timers';
 import type LocalTrack from './track/LocalTrack';
 import type LocalVideoTrack from './track/LocalVideoTrack';
 import type { SimulcastTrackInfo } from './track/LocalVideoTrack';
@@ -279,35 +281,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
 
     this.participantSid = joinResponse.participant?.sid;
 
-    const rtcConfig = { ...this.rtcConfig };
-
-    // update ICE servers before creating PeerConnection
-    if (joinResponse.iceServers && !rtcConfig.iceServers) {
-      const rtcIceServers: RTCIceServer[] = [];
-      joinResponse.iceServers.forEach((iceServer) => {
-        const rtcIceServer: RTCIceServer = {
-          urls: iceServer.urls,
-        };
-        if (iceServer.username) rtcIceServer.username = iceServer.username;
-        if (iceServer.credential) {
-          rtcIceServer.credential = iceServer.credential;
-        }
-        rtcIceServers.push(rtcIceServer);
-      });
-      rtcConfig.iceServers = rtcIceServers;
-    }
-
-    if (
-      joinResponse.clientConfiguration &&
-      joinResponse.clientConfiguration.forceRelay === ClientConfigSetting.ENABLED
-    ) {
-      rtcConfig.iceTransportPolicy = 'relay';
-    }
-
-    // @ts-ignore
-    rtcConfig.sdpSemantics = 'unified-plan';
-    // @ts-ignore
-    rtcConfig.continualGatheringPolicy = 'gather_continually';
+    const rtcConfig = this.makeRTCConfiguration(joinResponse);
 
     this.publisher = new PCTransport(rtcConfig);
     this.subscriber = new PCTransport(rtcConfig);
@@ -448,6 +422,40 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     };
   }
 
+  private makeRTCConfiguration(serverResponse: JoinResponse | ReconnectResponse): RTCConfiguration {
+    const rtcConfig = { ...this.rtcConfig };
+
+    // update ICE servers before creating PeerConnection
+    if (serverResponse.iceServers && !rtcConfig.iceServers) {
+      const rtcIceServers: RTCIceServer[] = [];
+      serverResponse.iceServers.forEach((iceServer) => {
+        const rtcIceServer: RTCIceServer = {
+          urls: iceServer.urls,
+        };
+        if (iceServer.username) rtcIceServer.username = iceServer.username;
+        if (iceServer.credential) {
+          rtcIceServer.credential = iceServer.credential;
+        }
+        rtcIceServers.push(rtcIceServer);
+      });
+      rtcConfig.iceServers = rtcIceServers;
+    }
+
+    if (
+      serverResponse.clientConfiguration &&
+      serverResponse.clientConfiguration.forceRelay === ClientConfigSetting.ENABLED
+    ) {
+      rtcConfig.iceTransportPolicy = 'relay';
+    }
+
+    // @ts-ignore
+    rtcConfig.sdpSemantics = 'unified-plan';
+    // @ts-ignore
+    rtcConfig.continualGatheringPolicy = 'gather_continually';
+
+    return rtcConfig;
+  }
+
   private createDataChannels() {
     if (!this.publisher) {
       return;
@@ -673,14 +681,14 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       return;
     }
 
-    log.debug(`${connection} disconnected`);
+    log.warn(`${connection} disconnected`);
     if (this.reconnectAttempts === 0) {
       // only reset start time on the first try
       this.reconnectStart = Date.now();
     }
 
     const disconnect = (duration: number) => {
-      log.info(
+      log.warn(
         `could not recover connection after ${this.reconnectAttempts} attempts, ${duration}ms. giving up`,
       );
       this.emit(EngineEvent.Disconnected);
@@ -703,10 +711,11 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
 
     log.debug(`reconnecting in ${delay}ms`);
 
-    if (this.reconnectTimeout) {
-      clearTimeout(this.reconnectTimeout);
-    }
-    this.reconnectTimeout = setTimeout(() => this.attemptReconnect(signalEvents), delay);
+    this.clearReconnectTimeout();
+    this.reconnectTimeout = CriticalTimers.setTimeout(
+      () => this.attemptReconnect(signalEvents),
+      delay,
+    );
   };
 
   private async attemptReconnect(signalEvents: boolean = false) {
@@ -733,11 +742,8 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       } else {
         await this.resumeConnection(signalEvents);
       }
-      this.reconnectAttempts = 0;
+      this.clearPendingReconnect();
       this.fullReconnectOnNext = false;
-      if (this.reconnectTimeout) {
-        clearTimeout(this.reconnectTimeout);
-      }
     } catch (e) {
       this.reconnectAttempts += 1;
       let reconnectRequired = false;
@@ -841,7 +847,12 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     }
 
     try {
-      await this.client.reconnect(this.url, this.token, this.participantSid);
+      const res = await this.client.reconnect(this.url, this.token, this.participantSid);
+      if (res) {
+        const rtcConfig = this.makeRTCConfiguration(res);
+        this.publisher.pc.setConfiguration(rtcConfig);
+        this.subscriber.pc.setConfiguration(rtcConfig);
+      }
     } catch (e) {
       let message = '';
       if (e instanceof Error) {
@@ -1034,19 +1045,21 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     }
   }
 
-  private clearPendingReconnect() {
+  private clearReconnectTimeout() {
     if (this.reconnectTimeout) {
-      clearTimeout(this.reconnectTimeout);
+      CriticalTimers.clearTimeout(this.reconnectTimeout);
     }
+  }
+
+  private clearPendingReconnect() {
+    this.clearReconnectTimeout();
     this.reconnectAttempts = 0;
   }
 
   private handleBrowserOnLine = () => {
     // in case the engine is currently reconnecting, attempt a reconnect immediately after the browser state has changed to 'onLine'
     if (this.client.isReconnecting) {
-      if (this.reconnectTimeout) {
-        clearTimeout(this.reconnectTimeout);
-      }
+      this.clearReconnectTimeout();
       this.attemptReconnect(true);
     }
   };