livekit-client 2.0.4 → 2.0.6

package/dist/ts4.2/src/index.d.ts

@@ -1,5 +1,5 @@
+import { DataPacket_Kind, DisconnectReason } from '@livekit/protocol';
 import { LogLevel, LoggerNames, getLogger, setLogExtension, setLogLevel } from './logger';
-import { DataPacket_Kind, DisconnectReason } from './proto/livekit_models_pb';
 import DefaultReconnectPolicy from './room/DefaultReconnectPolicy';
 import Room, { ConnectionState } from './room/Room';
 import LocalParticipant from './room/participant/LocalParticipant';

package/dist/ts4.2/src/logger.d.ts

@@ -20,7 +20,7 @@ export declare enum LoggerNames {
     E2EE = "lk-e2ee"
 }
 type LogLevelString = keyof typeof LogLevel;
-export type StructuredLogger = {
+export type StructuredLogger = log.Logger & {
     trace: (msg: string, context?: object) => void;
     debug: (msg: string, context?: object) => void;
     info: (msg: string, context?: object) => void;
@@ -42,6 +42,6 @@ export type LogExtension = (level: LogLevel, msg: string, context?: object) => v
  * use this to hook into the logging function to allow sending internal livekit logs to third party services
  * if set, the browser logs will lose their stacktrace information (see https://github.com/pimterry/loglevel#writing-plugins)
  */
-export declare function setLogExtension(extension: LogExtension, logger?: log.Logger): void;
+export declare function setLogExtension(extension: LogExtension, logger?: StructuredLogger): void;
 export declare const workerLogger: StructuredLogger;
 //# sourceMappingURL=logger.d.ts.map

package/dist/ts4.2/src/room/PCTransportManager.d.ts

@@ -1,4 +1,4 @@
-import { SignalTarget } from '../proto/livekit_rtc_pb';
+import { SignalTarget } from '@livekit/protocol';
 import PCTransport from './PCTransport';
 import type { LoggerOptions } from './types';
 export declare enum PCTransportState {

package/dist/ts4.2/src/room/RTCEngine.d.ts

@@ -1,10 +1,9 @@
+import type { AddTrackRequest, ConnectionQualityUpdate, JoinResponse, StreamStateUpdate, SubscriptionPermissionUpdate, SubscriptionResponse } from '@livekit/protocol';
+import { DataPacket, DataPacket_Kind, DisconnectReason, ParticipantInfo, Room as RoomModel, SpeakerInfo, SubscribedQualityUpdate, TrackInfo, TrackUnpublishedResponse, UserPacket } from '@livekit/protocol';
 import type TypedEventEmitter from 'typed-emitter';
 import type { SignalOptions } from '../api/SignalClient';
 import { SignalClient } from '../api/SignalClient';
 import type { InternalRoomOptions } from '../options';
-import { DataPacket, DataPacket_Kind, DisconnectReason, ParticipantInfo, Room as RoomModel, SpeakerInfo, TrackInfo, UserPacket } from '../proto/livekit_models_pb';
-import type { AddTrackRequest, ConnectionQualityUpdate, JoinResponse, StreamStateUpdate, SubscriptionPermissionUpdate, SubscriptionResponse } from '../proto/livekit_rtc_pb';
-import { SubscribedQualityUpdate, TrackUnpublishedResponse } from '../proto/livekit_rtc_pb';
 import PCTransport from './PCTransport';
 import { PCTransportManager } from './PCTransportManager';
 import type { RegionUrlProvider } from './RegionUrlProvider';
@@ -63,8 +62,9 @@ export default class RTCEngine extends RTCEngine_base {
     /** @internal */
     get logContext(): {
         room: string | undefined;
-        roomSid: string | undefined;
-        identity: string | undefined;
+        roomID: string | undefined;
+        participant: string | undefined;
+        pID: string | undefined;
     };
     join(url: string, token: string, opts: SignalOptions, abortSignal?: AbortSignal): Promise<JoinResponse>;
     close(): Promise<void>;

package/dist/ts4.2/src/room/RegionUrlProvider.d.ts

@@ -1,4 +1,4 @@
-import type { RegionSettings } from '../proto/livekit_rtc_pb';
+import type { RegionSettings } from '@livekit/protocol';
 export declare class RegionUrlProvider {
     private serverUrl;
     private token;

package/dist/ts4.2/src/room/Room.d.ts

@@ -1,7 +1,7 @@
+import { DataPacket_Kind, DisconnectReason, ParticipantPermission, SubscriptionError } from '@livekit/protocol';
 import type TypedEmitter from 'typed-emitter';
 import 'webrtc-adapter';
 import type { InternalRoomOptions, RoomConnectOptions, RoomOptions } from '../options';
-import { DataPacket_Kind, DisconnectReason, ParticipantPermission, SubscriptionError } from '../proto/livekit_models_pb';
 import RTCEngine from './RTCEngine';
 import LocalParticipant from './participant/LocalParticipant';
 import type Participant from './participant/Participant';

package/dist/ts4.2/src/room/participant/LocalParticipant.d.ts

@@ -1,5 +1,5 @@
+import { ParticipantInfo, ParticipantPermission } from '@livekit/protocol';
 import type { InternalRoomOptions } from '../../options';
-import { ParticipantInfo, ParticipantPermission } from '../../proto/livekit_models_pb';
 import type RTCEngine from '../RTCEngine';
 import LocalTrack from '../track/LocalTrack';
 import LocalTrackPublication from '../track/LocalTrackPublication';

package/dist/ts4.2/src/room/participant/Participant.d.ts

@@ -1,6 +1,6 @@
+import { DataPacket_Kind, ParticipantInfo, ParticipantPermission, ConnectionQuality as ProtoQuality, SubscriptionError } from '@livekit/protocol';
 import type TypedEmitter from 'typed-emitter';
 import { StructuredLogger } from '../../logger';
-import { DataPacket_Kind, ParticipantInfo, ParticipantPermission, ConnectionQuality as ProtoQuality, SubscriptionError } from '../../proto/livekit_models_pb';
 import type LocalTrackPublication from '../track/LocalTrackPublication';
 import type RemoteTrack from '../track/RemoteTrack';
 import type RemoteTrackPublication from '../track/RemoteTrackPublication';
@@ -44,8 +44,7 @@ export default class Participant extends Participant_base {
     protected log: StructuredLogger;
     protected loggerOptions?: LoggerOptions;
     protected get logContext(): {
-        participantSid: string;
-        participantId: string;
+        [x: string]: unknown;
     };
     get isEncrypted(): boolean;
     get isAgent(): boolean;

package/dist/ts4.2/src/room/participant/ParticipantTrackPermission.d.ts

@@ -1,4 +1,4 @@
-import { TrackPermission } from '../../proto/livekit_rtc_pb';
+import { TrackPermission } from '@livekit/protocol';
 export interface ParticipantTrackPermission {
     /**
      * The participant identity this permission applies to.

package/dist/ts4.2/src/room/participant/RemoteParticipant.d.ts

@@ -1,5 +1,5 @@
+import type { ParticipantInfo } from '@livekit/protocol';
 import type { SignalClient } from '../../api/SignalClient';
-import type { ParticipantInfo } from '../../proto/livekit_models_pb';
 import RemoteTrackPublication from '../track/RemoteTrackPublication';
 import { Track } from '../track/Track';
 import type { AudioOutputOptions } from '../track/options';
@@ -16,6 +16,10 @@ export default class RemoteParticipant extends Participant {
     private audioOutput?;
     /** @internal */
     static fromParticipantInfo(signalClient: SignalClient, pi: ParticipantInfo): RemoteParticipant;
+    protected get logContext(): {
+        rpID: string;
+        remoteParticipant: string;
+    };
     /** @internal */
     constructor(signalClient: SignalClient, sid: string, identity?: string, name?: string, metadata?: string, loggerOptions?: LoggerOptions);
     protected addTrackPublication(publication: RemoteTrackPublication): void;

package/dist/ts4.2/src/room/track/LocalTrackPublication.d.ts

@@ -1,4 +1,4 @@
-import type { TrackInfo } from '../../proto/livekit_models_pb';
+import type { TrackInfo } from '@livekit/protocol';
 import type { LoggerOptions } from '../types';
 import type LocalAudioTrack from './LocalAudioTrack';
 import type LocalTrack from './LocalTrack';

package/dist/ts4.2/src/room/track/LocalVideoTrack.d.ts

@@ -1,6 +1,5 @@
+import { SubscribedCodec, SubscribedQuality, VideoLayer } from '@livekit/protocol';
 import type { SignalClient } from '../../api/SignalClient';
-import { VideoLayer } from '../../proto/livekit_models_pb';
-import { SubscribedCodec, SubscribedQuality } from '../../proto/livekit_rtc_pb';
 import type { VideoSenderStats } from '../stats';
 import type { LoggerOptions } from '../types';
 import LocalTrack from './LocalTrack';

package/dist/ts4.2/src/room/track/RemoteTrackPublication.d.ts

@@ -1,4 +1,4 @@
-import { SubscriptionError, TrackInfo } from '../../proto/livekit_models_pb';
+import { SubscriptionError, TrackInfo } from '@livekit/protocol';
 import type { LoggerOptions } from '../types';
 import type RemoteTrack from './RemoteTrack';
 import { Track, VideoQuality } from './Track';

package/dist/ts4.2/src/room/track/Track.d.ts

@@ -1,8 +1,7 @@
+import { StreamState as ProtoStreamState, TrackSource, TrackType } from '@livekit/protocol';
 import type TypedEventEmitter from 'typed-emitter';
 import type { SignalClient } from '../../api/SignalClient';
 import { StructuredLogger } from '../../logger';
-import { TrackSource, TrackType } from '../../proto/livekit_models_pb';
-import { StreamState as ProtoStreamState } from '../../proto/livekit_rtc_pb';
 import type { LoggerOptions } from '../types';
 import type { TrackProcessor } from './processor/types';
 export declare enum VideoQuality {

package/dist/ts4.2/src/room/track/TrackPublication.d.ts

@@ -1,7 +1,6 @@
+import { Encryption_Type } from '@livekit/protocol';
+import type { SubscriptionError, TrackInfo, UpdateSubscription, UpdateTrackSettings } from '@livekit/protocol';
 import type TypedEventEmitter from 'typed-emitter';
-import { Encryption_Type } from '../../proto/livekit_models_pb';
-import type { SubscriptionError, TrackInfo } from '../../proto/livekit_models_pb';
-import type { UpdateSubscription, UpdateTrackSettings } from '../../proto/livekit_rtc_pb';
 import type { LoggerOptions } from '../types';
 import LocalAudioTrack from './LocalAudioTrack';
 import LocalVideoTrack from './LocalVideoTrack';

package/dist/ts4.2/src/room/track/utils.d.ts

@@ -1,4 +1,4 @@
-import { TrackPublishedResponse } from '../../proto/livekit_rtc_pb';
+import { TrackPublishedResponse } from '@livekit/protocol';
 import { Track } from './Track';
 import type { TrackPublication } from './TrackPublication';
 import type { AudioCaptureOptions, CreateLocalTracksOptions, ScreenShareCaptureOptions, VideoCaptureOptions } from './options';

package/dist/ts4.2/src/room/utils.d.ts

@@ -1,4 +1,4 @@
-import { ClientInfo } from '../proto/livekit_models_pb';
+import { ClientInfo } from '@livekit/protocol';
 import type LocalAudioTrack from './track/LocalAudioTrack';
 import type RemoteAudioTrack from './track/RemoteAudioTrack';
 import { VideoCodec } from './track/options';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livekit-client",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "JavaScript/TypeScript client SDK for LiveKit",
   "main": "./dist/livekit-client.umd.js",
   "unpkg": "./dist/livekit-client.umd.js",
@@ -36,7 +36,7 @@
   "author": "David Zhao <david@davidzhao.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@bufbuild/protobuf": "^1.3.0",
+    "@livekit/protocol": "1.10.4",
     "events": "^3.3.0",
     "loglevel": "^1.8.0",
     "sdp-transform": "^2.14.1",

package/src/api/SignalClient.ts

@@ -1,27 +1,22 @@
-import { protoInt64 } from '@bufbuild/protobuf';
-import log, { LoggerNames, getLogger } from '../logger';
-import {
-  ClientInfo,
-  DisconnectReason,
-  ParticipantInfo,
-  ReconnectReason,
-  Room,
-  SpeakerInfo,
-  VideoLayer,
-} from '../proto/livekit_models_pb';
 import {
   AddTrackRequest,
+  ClientInfo,
   ConnectionQualityUpdate,
+  DisconnectReason,
   JoinResponse,
   LeaveRequest,
   MuteTrackRequest,
+  ParticipantInfo,
   Ping,
+  ReconnectReason,
   ReconnectResponse,
+  Room,
   SessionDescription,
   SignalRequest,
   SignalResponse,
   SignalTarget,
   SimulateScenario,
+  SpeakerInfo,
   StreamStateUpdate,
   SubscribedQualityUpdate,
   SubscriptionPermission,
@@ -36,7 +31,10 @@ import {
   UpdateSubscription,
   UpdateTrackSettings,
   UpdateVideoLayers,
-} from '../proto/livekit_rtc_pb';
+  VideoLayer,
+  protoInt64,
+} from '@livekit/protocol';
+import log, { LoggerNames, getLogger } from '../logger';
 import { ConnectionError, ConnectionErrorReason } from '../room/errors';
 import CriticalTimers from '../room/timers';
 import type { LoggerOptions } from '../room/types';
@@ -216,7 +214,7 @@ export class SignalClient {
     token: string,
     sid?: string,
     reason?: ReconnectReason,
-  ): Promise<ReconnectResponse | void> {
+  ): Promise<ReconnectResponse | undefined> {
     if (!this.options) {
       this.log.warn(
         'attempted to reconnect without signal options being set, ignoring',
@@ -242,7 +240,7 @@ export class SignalClient {
     token: string,
     opts: ConnectOpts,
     abortSignal?: AbortSignal,
-  ): Promise<JoinResponse | ReconnectResponse | void> {
+  ): Promise<JoinResponse | ReconnectResponse | undefined> {
     this.connectOptions = opts;
     url = toWebsocketUrl(url);
     // strip trailing slash
@@ -252,7 +250,7 @@ export class SignalClient {
     const clientInfo = getClientInfo();
     const params = createConnectionParams(token, clientInfo, opts);
 
-    return new Promise<JoinResponse | ReconnectResponse | void>(async (resolve, reject) => {
+    return new Promise<JoinResponse | ReconnectResponse | undefined>(async (resolve, reject) => {
       const unlock = await this.connectionLock.lock();
       try {
         const abortHandler = async () => {
@@ -356,9 +354,13 @@ export class SignalClient {
               abortSignal?.removeEventListener('abort', abortHandler);
               this.startPingInterval();
               if (resp.message?.case === 'reconnect') {
-                resolve(resp.message?.value);
+                resolve(resp.message.value);
               } else {
-                resolve();
+                this.log.debug(
+                  'declaring signal reconnected without reconnect response received',
+                  this.logContext,
+                );
+                resolve(undefined);
                 shouldProcessMessage = true;
               }
             } else if (this.isEstablishingConnection && resp.message.case === 'leave') {

package/src/connectionHelper/checks/websocket.ts

@@ -1,5 +1,5 @@
+import { ServerInfo_Edition } from '@livekit/protocol';
 import { SignalClient } from '../../api/SignalClient';
-import { ServerInfo_Edition } from '../../proto/livekit_models_pb';
 import { Checker } from './Checker';
 
 export class WebSocketCheck extends Checker {

package/src/e2ee/E2eeManager.ts

@@ -1,7 +1,7 @@
+import { Encryption_Type, TrackInfo } from '@livekit/protocol';
 import { EventEmitter } from 'events';
 import type TypedEventEmitter from 'typed-emitter';
 import log, { LogLevel, workerLogger } from '../logger';
-import { Encryption_Type, TrackInfo } from '../proto/livekit_models_pb';
 import type RTCEngine from '../room/RTCEngine';
 import type Room from '../room/Room';
 import { ConnectionState } from '../room/Room';

package/src/e2ee/worker/FrameCryptor.ts

@@ -67,6 +67,8 @@ export class FrameCryptor extends BaseFrameCryptor {
 
   private sifGuard: SifGuard;
 
+  private detectedCodec?: VideoCodec;
+
   constructor(opts: {
     keys: ParticipantKeyHandler;
     participantIdentity: string;
@@ -85,8 +87,8 @@ export class FrameCryptor extends BaseFrameCryptor {
 
   private get logContext() {
     return {
-      identity: this.participantIdentity,
-      trackId: this.trackId,
+      participant: this.participantIdentity,
+      mediaTrackId: this.trackId,
       fallbackCodec: this.videoCodec,
     };
   }
@@ -229,7 +231,6 @@ export class FrameCryptor extends BaseFrameCryptor {
         encodedFrame.timestamp,
       );
       let frameInfo = this.getUnencryptedBytes(encodedFrame);
-      workerLogger.debug('frameInfo for encoded frame', { ...frameInfo, ...this.logContext });
 
       // Thіs is not encrypted and contains the VP8 payload descriptor or the Opus TOC byte.
       const frameHeader = new Uint8Array(encodedFrame.data, 0, frameInfo.unencryptedBytes);
@@ -334,7 +335,6 @@ export class FrameCryptor extends BaseFrameCryptor {
         const decodedFrame = await this.decryptFrame(encodedFrame, keyIndex);
         this.keys.decryptionSuccess();
         if (decodedFrame) {
-          workerLogger.debug('enqueue decrypted frame', this.logContext);
           return controller.enqueue(decodedFrame);
         }
       } catch (error) {
@@ -375,7 +375,6 @@ export class FrameCryptor extends BaseFrameCryptor {
       throw new TypeError(`no encryption key found for decryption of ${this.participantIdentity}`);
     }
     let frameInfo = this.getUnencryptedBytes(encodedFrame);
-    workerLogger.debug('frameInfo for decoded frame', { ...frameInfo, ...this.logContext });
 
     // Construct frame trailer. Similar to the frame header described in
     // https://tools.ietf.org/html/draft-omara-sframe-00#section-4.2
@@ -534,6 +533,14 @@ export class FrameCryptor extends BaseFrameCryptor {
     var frameInfo = { unencryptedBytes: 0, isH264: false };
     if (isVideoFrame(frame)) {
       let detectedCodec = this.getVideoCodec(frame) ?? this.videoCodec;
+      if (detectedCodec !== this.detectedCodec) {
+        workerLogger.debug('detected different codec', {
+          detectedCodec,
+          oldCodec: this.detectedCodec,
+          ...this.logContext,
+        });
+        this.detectedCodec = detectedCodec;
+      }
 
       if (detectedCodec === 'av1' || detectedCodec === 'vp9') {
         throw new Error(`${detectedCodec} is not yet supported for end to end encryption`);
@@ -591,7 +598,6 @@ export class FrameCryptor extends BaseFrameCryptor {
     // @ts-expect-error payloadType is not yet part of the typescript definition and currently not supported in Safari
     const payloadType = frame.getMetadata().payloadType;
     const codec = payloadType ? this.rtpMap.get(payloadType) : undefined;
-    workerLogger.debug('reading codec from frame', { codec, ...this.logContext });
     return codec;
   }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
+import { DataPacket_Kind, DisconnectReason } from '@livekit/protocol';
 import { LogLevel, LoggerNames, getLogger, setLogExtension, setLogLevel } from './logger';
-import { DataPacket_Kind, DisconnectReason } from './proto/livekit_models_pb';
 import DefaultReconnectPolicy from './room/DefaultReconnectPolicy';
 import Room, { ConnectionState } from './room/Room';
 import LocalParticipant from './room/participant/LocalParticipant';

package/src/logger.ts

@@ -24,7 +24,7 @@ export enum LoggerNames {
 
 type LogLevelString = keyof typeof LogLevel;
 
-export type StructuredLogger = {
+export type StructuredLogger = log.Logger & {
   trace: (msg: string, context?: object) => void;
   debug: (msg: string, context?: object) => void;
   info: (msg: string, context?: object) => void;
@@ -36,6 +36,7 @@ export type StructuredLogger = {
 };
 
 let livekitLogger = log.getLogger('livekit');
+const livekitLoggers = Object.values(LoggerNames).map((name) => log.getLogger(name));
 
 livekitLogger.setDefaultLevel(LogLevel.info);
 
@@ -54,9 +55,7 @@ export function setLogLevel(level: LogLevel | LogLevelString, loggerName?: Logge
   if (loggerName) {
     log.getLogger(loggerName).setLevel(level);
   }
-  for (const logger of Object.entries(log.getLoggers())
-    .filter(([logrName]) => logrName.startsWith('livekit'))
-    .map(([, logr]) => logr)) {
+  for (const logger of livekitLoggers) {
     logger.setLevel(level);
   }
 }
@@ -67,24 +66,28 @@ export type LogExtension = (level: LogLevel, msg: string, context?: object) => v
  * use this to hook into the logging function to allow sending internal livekit logs to third party services
  * if set, the browser logs will lose their stacktrace information (see https://github.com/pimterry/loglevel#writing-plugins)
  */
-export function setLogExtension(extension: LogExtension, logger = livekitLogger) {
-  const originalFactory = logger.methodFactory;
+export function setLogExtension(extension: LogExtension, logger?: StructuredLogger) {
+  const loggers = logger ? [logger] : livekitLoggers;
 
-  logger.methodFactory = (methodName, configLevel, loggerName) => {
-    const rawMethod = originalFactory(methodName, configLevel, loggerName);
+  loggers.forEach((logR) => {
+    const originalFactory = logR.methodFactory;
 
-    const logLevel = LogLevel[methodName as LogLevelString];
-    const needLog = logLevel >= configLevel && logLevel < LogLevel.silent;
+    logR.methodFactory = (methodName, configLevel, loggerName) => {
+      const rawMethod = originalFactory(methodName, configLevel, loggerName);
 
-    return (msg, context?: [msg: string, context: object]) => {
-      if (context) rawMethod(msg, context);
-      else rawMethod(msg);
-      if (needLog) {
-        extension(logLevel, msg, context);
-      }
+      const logLevel = LogLevel[methodName as LogLevelString];
+      const needLog = logLevel >= configLevel && logLevel < LogLevel.silent;
+
+      return (msg, context?: [msg: string, context: object]) => {
+        if (context) rawMethod(msg, context);
+        else rawMethod(msg);
+        if (needLog) {
+          extension(logLevel, msg, context);
+        }
+      };
     };
-  };
-  logger.setLevel(logger.getLevel()); // Be sure to call setLevel method in order to apply plugin
+    logR.setLevel(logR.getLevel());
+  });
 }
 
 export const workerLogger = log.getLogger('lk-e2ee') as StructuredLogger;

package/src/room/PCTransportManager.ts

@@ -1,5 +1,5 @@
+import { SignalTarget } from '@livekit/protocol';
 import log, { LoggerNames, getLogger } from '../logger';
-import { SignalTarget } from '../proto/livekit_rtc_pb';
 import PCTransport, { PCEvents } from './PCTransport';
 import { roomConnectOptionDefaults } from './defaults';
 import { ConnectionError, ConnectionErrorReason } from './errors';

package/src/room/RTCEngine.ts

@@ -1,44 +1,42 @@
-import { EventEmitter } from 'events';
-import type { MediaAttributes } from 'sdp-transform';
-import type TypedEventEmitter from 'typed-emitter';
-import type { SignalOptions } from '../api/SignalClient';
-import {
-  SignalClient,
-  SignalConnectionState,
-  toProtoSessionDescription,
-} from '../api/SignalClient';
-import log, { LoggerNames, getLogger } from '../logger';
-import type { InternalRoomOptions } from '../options';
 import {
+  type AddTrackRequest,
   ClientConfigSetting,
   ClientConfiguration,
+  type ConnectionQualityUpdate,
+  DataChannelInfo,
   DataPacket,
   DataPacket_Kind,
   DisconnectReason,
-  ParticipantInfo,
-  ReconnectReason,
-  Room as RoomModel,
-  SpeakerInfo,
-  TrackInfo,
-  UserPacket,
-} from '../proto/livekit_models_pb';
-import {
-  type AddTrackRequest,
-  type ConnectionQualityUpdate,
-  DataChannelInfo,
   type JoinResponse,
   type LeaveRequest,
+  ParticipantInfo,
+  ReconnectReason,
   type ReconnectResponse,
+  Room as RoomModel,
   SignalTarget,
+  SpeakerInfo,
   type StreamStateUpdate,
   SubscribedQualityUpdate,
   type SubscriptionPermissionUpdate,
   type SubscriptionResponse,
   SyncState,
+  TrackInfo,
   type TrackPublishedResponse,
   TrackUnpublishedResponse,
   UpdateSubscription,
-} from '../proto/livekit_rtc_pb';
+  UserPacket,
+} from '@livekit/protocol';
+import { EventEmitter } from 'events';
+import type { MediaAttributes } from 'sdp-transform';
+import type TypedEventEmitter from 'typed-emitter';
+import type { SignalOptions } from '../api/SignalClient';
+import {
+  SignalClient,
+  SignalConnectionState,
+  toProtoSessionDescription,
+} from '../api/SignalClient';
+import log, { LoggerNames, getLogger } from '../logger';
+import type { InternalRoomOptions } from '../options';
 import PCTransport, { PCEvents } from './PCTransport';
 import { PCTransportManager, PCTransportState } from './PCTransportManager';
 import type { ReconnectContext, ReconnectPolicy } from './ReconnectPolicy';
@@ -205,8 +203,9 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
   get logContext() {
     return {
       room: this.latestJoinResponse?.room?.name,
-      roomSid: this.latestJoinResponse?.room?.sid,
-      identity: this.latestJoinResponse?.participant?.identity,
+      roomID: this.latestJoinResponse?.room?.sid,
+      participant: this.latestJoinResponse?.participant?.identity,
+      pID: this.latestJoinResponse?.participant?.sid,
     };
   }
 
@@ -1005,14 +1004,10 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
 
     this.log.info(`resuming signal connection, attempt ${this.reconnectAttempts}`, this.logContext);
     this.emit(EngineEvent.Resuming);
-
+    let res: ReconnectResponse | undefined;
     try {
       this.setupSignalClientCallbacks();
-      const res = await this.client.reconnect(this.url, this.token, this.participantSid, reason);
-      if (res) {
-        const rtcConfig = this.makeRTCConfiguration(res);
-        this.pcManager.updateConfiguration(rtcConfig);
-      }
+      res = await this.client.reconnect(this.url, this.token, this.participantSid, reason);
     } catch (error) {
       let message = '';
       if (error instanceof Error) {
@@ -1029,6 +1024,13 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     }
     this.emit(EngineEvent.SignalResumed);
 
+    if (res) {
+      const rtcConfig = this.makeRTCConfiguration(res);
+      this.pcManager.updateConfiguration(rtcConfig);
+    } else {
+      this.log.warn('Did not receive reconnect response', this.logContext);
+    }
+
     if (this.shouldFailNext) {
       this.shouldFailNext = false;
       throw new Error('simulated failure');

package/src/room/RegionUrlProvider.ts

@@ -1,5 +1,5 @@
+import type { RegionInfo, RegionSettings } from '@livekit/protocol';
 import log from '../logger';
-import type { RegionInfo, RegionSettings } from '../proto/livekit_rtc_pb';
 import { ConnectionError, ConnectionErrorReason } from './errors';
 import { isCloud } from './utils';