livekit-client 0.15.4 → 0.16.3

package/src/room/Room.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'events';
+import type TypedEmitter from 'typed-emitter';
 import { toProtoSessionDescription } from '../api/SignalClient';
 import log from '../logger';
 import { RoomConnectOptions, RoomOptions } from '../options';
@@ -7,7 +8,11 @@ import {
   ParticipantInfo_State, Room as RoomModel, SpeakerInfo, UserPacket,
 } from '../proto/livekit_models';
 import {
-  ConnectionQualityUpdate, SimulateScenario, StreamStateUpdate, SubscriptionPermissionUpdate,
+  ConnectionQualityUpdate,
+  JoinResponse,
+  SimulateScenario,
+  StreamStateUpdate,
+  SubscriptionPermissionUpdate,
 } from '../proto/livekit_rtc';
 import DeviceManager from './DeviceManager';
 import { ConnectionError, UnsupportedServer } from './errors';
@@ -40,7 +45,7 @@ export enum RoomState {
  *
  * @noInheritDoc
  */
-class Room extends EventEmitter {
+class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>) {
   state: RoomState = RoomState.Disconnected;
 
   /** map of sid: [[RemoteParticipant]] */
@@ -113,48 +118,49 @@ class Room extends EventEmitter {
     }
 
     this.engine = new RTCEngine();
-    this.engine.client.signalLatency = this.options.expSignalLatency;
-
-    this.engine.on(
-      EngineEvent.MediaTrackAdded,
-      (
-        mediaTrack: MediaStreamTrack,
-        stream: MediaStream,
-        receiver?: RTCRtpReceiver,
-      ) => {
-        this.onTrackAdded(mediaTrack, stream, receiver);
-      },
-    );
-
-    this.engine.on(EngineEvent.Disconnected, () => {
-      this.handleDisconnect();
-    });
 
+    this.engine.client.signalLatency = this.options.expSignalLatency;
     this.engine.client.onParticipantUpdate = this.handleParticipantUpdates;
     this.engine.client.onRoomUpdate = this.handleRoomUpdate;
     this.engine.client.onSpeakersChanged = this.handleSpeakersChanged;
     this.engine.client.onStreamStateUpdate = this.handleStreamStateUpdate;
     this.engine.client.onSubscriptionPermissionUpdate = this.handleSubscriptionPermissionUpdate;
-    this.engine.on(EngineEvent.ActiveSpeakersUpdate, this.handleActiveSpeakersUpdate);
-    this.engine.on(EngineEvent.DataPacketReceived, this.handleDataPacket);
-
-    this.engine.on(EngineEvent.Reconnecting, () => {
-      this.state = RoomState.Reconnecting;
-      this.emit(RoomEvent.Reconnecting);
-    });
-
-    this.engine.on(EngineEvent.Reconnected, () => {
-      this.state = RoomState.Connected;
-      this.emit(RoomEvent.Reconnected);
-    });
-
-    this.engine.on(EngineEvent.SignalConnected, () => {
-      if (this.state === RoomState.Reconnecting) {
-        this.sendSyncState();
-      }
-    });
-
     this.engine.client.onConnectionQuality = this.handleConnectionQualityUpdate;
+
+    this.engine
+      .on(
+        EngineEvent.MediaTrackAdded,
+        (
+          mediaTrack: MediaStreamTrack,
+          stream: MediaStream,
+          receiver?: RTCRtpReceiver,
+        ) => {
+          this.onTrackAdded(mediaTrack, stream, receiver);
+        },
+      )
+      .on(EngineEvent.Disconnected, () => {
+        this.handleDisconnect();
+      })
+      .on(EngineEvent.ActiveSpeakersUpdate, this.handleActiveSpeakersUpdate)
+      .on(EngineEvent.DataPacketReceived, this.handleDataPacket)
+      .on(EngineEvent.Resuming, () => {
+        this.state = RoomState.Reconnecting;
+        this.emit(RoomEvent.Reconnecting);
+        this.emit(RoomEvent.StateChanged, this.state);
+      })
+      .on(EngineEvent.Resumed, () => {
+        this.state = RoomState.Connected;
+        this.emit(RoomEvent.Reconnected);
+        this.emit(RoomEvent.StateChanged, this.state);
+        this.updateSubscriptions();
+      })
+      .on(EngineEvent.SignalResumed, () => {
+        if (this.state === RoomState.Reconnecting) {
+          this.sendSyncState();
+        }
+      })
+      .on(EngineEvent.Restarting, this.handleRestarting)
+      .on(EngineEvent.Restarted, this.handleRestarted);
   }
 
   /**
@@ -202,6 +208,7 @@ class Room extends EventEmitter {
       }
 
       this.state = RoomState.Connected;
+      this.emit(RoomEvent.StateChanged, this.state);
       const pi = joinResponse.participant!;
       this.localParticipant = new LocalParticipant(
         pi.sid,
@@ -213,10 +220,10 @@ class Room extends EventEmitter {
       this.localParticipant.updateInfo(pi);
       // forward metadata changed for the local participant
       this.localParticipant
-        .on(ParticipantEvent.MetadataChanged, (metadata: object) => {
+        .on(ParticipantEvent.MetadataChanged, (metadata: string | undefined) => {
           this.emit(RoomEvent.MetadataChanged, metadata, this.localParticipant);
         })
-        .on(ParticipantEvent.ParticipantMetadataChanged, (metadata: object) => {
+        .on(ParticipantEvent.ParticipantMetadataChanged, (metadata: string | undefined) => {
           this.emit(RoomEvent.ParticipantMetadataChanged, metadata, this.localParticipant);
         })
         .on(ParticipantEvent.TrackMuted, (pub: TrackPublication) => {
@@ -439,6 +446,45 @@ class Room extends EventEmitter {
     );
   }
 
+  private handleRestarting = () => {
+    this.state = RoomState.Reconnecting;
+    this.emit(RoomEvent.Reconnecting);
+    this.emit(RoomEvent.StateChanged, this.state);
+
+    // also unwind existing participants & existing subscriptions
+    for (const p of this.participants.values()) {
+      this.handleParticipantDisconnected(p.sid, p);
+    }
+  };
+
+  private handleRestarted = async (joinResponse: JoinResponse) => {
+    this.state = RoomState.Connected;
+    this.emit(RoomEvent.Reconnected);
+    this.emit(RoomEvent.StateChanged, this.state);
+
+    // rehydrate participants
+    if (joinResponse.participant) {
+      // with a restart, the sid will have changed, we'll map our understanding to it
+      this.localParticipant.sid = joinResponse.participant.sid;
+      this.handleParticipantUpdates([joinResponse.participant]);
+    }
+    this.handleParticipantUpdates(joinResponse.otherParticipants);
+
+    // unpublish & republish tracks
+    const localPubs: LocalTrackPublication[] = [];
+    this.localParticipant.tracks.forEach((pub) => {
+      if (pub.track) {
+        localPubs.push(pub);
+      }
+    });
+
+    await Promise.all(localPubs.map(async (pub) => {
+      const track = pub.track!;
+      this.localParticipant.unpublishTrack(track, false);
+      this.localParticipant.publishTrack(track, pub.options);
+    }));
+  };
+
   private handleDisconnect(shouldStopTracks = true) {
     if (this.state === RoomState.Disconnected) {
       return;
@@ -469,12 +515,14 @@ class Room extends EventEmitter {
     navigator.mediaDevices.removeEventListener('devicechange', this.handleDeviceChange);
     this.state = RoomState.Disconnected;
     this.emit(RoomEvent.Disconnected);
+    this.emit(RoomEvent.StateChanged, this.state);
   }
 
   private handleParticipantUpdates = (participantInfos: ParticipantInfo[]) => {
     // handle changes to participant state, and send events
     participantInfos.forEach((info) => {
-      if (info.sid === this.localParticipant.sid) {
+      if (info.sid === this.localParticipant.sid
+          || info.identity === this.localParticipant.identity) {
         this.localParticipant.updateInfo(info);
         return;
       }
@@ -676,66 +724,72 @@ class Room extends EventEmitter {
     }
   }
 
+  private createParticipant(id: string, info?: ParticipantInfo): RemoteParticipant {
+    let participant: RemoteParticipant;
+    if (info) {
+      participant = RemoteParticipant.fromParticipantInfo(
+        this.engine.client,
+        info,
+      );
+    } else {
+      participant = new RemoteParticipant(this.engine.client, id, '');
+    }
+    return participant;
+  }
+
   private getOrCreateParticipant(
     id: string,
     info?: ParticipantInfo,
   ): RemoteParticipant {
-    let participant = this.participants.get(id);
-    if (!participant) {
-      // it's possible for the RTC track to arrive before signaling data
-      // when this happens, we'll create the participant and make the track work
-      if (info) {
-        participant = RemoteParticipant.fromParticipantInfo(
-          this.engine.client,
-          info,
-        );
-      } else {
-        participant = new RemoteParticipant(this.engine.client, id, '');
-      }
-      this.participants.set(id, participant);
-      // also forward events
-
-      // trackPublished is only fired for tracks added after both local participant
-      // and remote participant joined the room
-      participant
-        .on(ParticipantEvent.TrackPublished, (trackPublication: RemoteTrackPublication) => {
-          this.emit(RoomEvent.TrackPublished, trackPublication, participant);
-        })
-        .on(ParticipantEvent.TrackSubscribed,
-          (track: RemoteTrack, publication: RemoteTrackPublication) => {
-            // monitor playback status
-            if (track.kind === Track.Kind.Audio) {
-              track.on(TrackEvent.AudioPlaybackStarted, this.handleAudioPlaybackStarted);
-              track.on(TrackEvent.AudioPlaybackFailed, this.handleAudioPlaybackFailed);
-            }
-            this.emit(RoomEvent.TrackSubscribed, track, publication, participant);
-          })
-        .on(ParticipantEvent.TrackUnpublished, (publication: RemoteTrackPublication) => {
-          this.emit(RoomEvent.TrackUnpublished, publication, participant);
-        })
-        .on(ParticipantEvent.TrackUnsubscribed,
-          (track: RemoteTrack, publication: RemoteTrackPublication) => {
-            this.emit(RoomEvent.TrackUnsubscribed, track, publication, participant);
-          })
-        .on(ParticipantEvent.TrackSubscriptionFailed, (sid: string) => {
-          this.emit(RoomEvent.TrackSubscriptionFailed, sid, participant);
-        })
-        .on(ParticipantEvent.TrackMuted, (pub: TrackPublication) => {
-          this.emit(RoomEvent.TrackMuted, pub, participant);
-        })
-        .on(ParticipantEvent.TrackUnmuted, (pub: TrackPublication) => {
-          this.emit(RoomEvent.TrackUnmuted, pub, participant);
-        })
-        .on(ParticipantEvent.MetadataChanged, (metadata: any) => {
-          this.emit(RoomEvent.MetadataChanged, metadata, participant);
+    if (this.participants.has(id)) {
+      return (this.participants.get(id) as RemoteParticipant);
+    }
+    // it's possible for the RTC track to arrive before signaling data
+    // when this happens, we'll create the participant and make the track work
+    const participant = this.createParticipant(id, info);
+    this.participants.set(id, participant);
+
+    // also forward events
+    // trackPublished is only fired for tracks added after both local participant
+    // and remote participant joined the room
+    participant
+      .on(ParticipantEvent.TrackPublished, (trackPublication: RemoteTrackPublication) => {
+        this.emit(RoomEvent.TrackPublished, trackPublication, participant);
+      })
+      .on(ParticipantEvent.TrackSubscribed,
+        (track: RemoteTrack, publication: RemoteTrackPublication) => {
+          // monitor playback status
+          if (track.kind === Track.Kind.Audio) {
+            track.on(TrackEvent.AudioPlaybackStarted, this.handleAudioPlaybackStarted);
+            track.on(TrackEvent.AudioPlaybackFailed, this.handleAudioPlaybackFailed);
+          }
+          this.emit(RoomEvent.TrackSubscribed, track, publication, participant);
         })
-        .on(ParticipantEvent.ParticipantMetadataChanged, (metadata: any) => {
-          this.emit(RoomEvent.ParticipantMetadataChanged, metadata, participant);
+      .on(ParticipantEvent.TrackUnpublished, (publication: RemoteTrackPublication) => {
+        this.emit(RoomEvent.TrackUnpublished, publication, participant);
+      })
+      .on(ParticipantEvent.TrackUnsubscribed,
+        (track: RemoteTrack, publication: RemoteTrackPublication) => {
+          this.emit(RoomEvent.TrackUnsubscribed, track, publication, participant);
         })
-        .on(ParticipantEvent.ConnectionQualityChanged, (quality: ConnectionQuality) => {
-          this.emit(RoomEvent.ConnectionQualityChanged, quality, participant);
-        });
-    }
+      .on(ParticipantEvent.TrackSubscriptionFailed, (sid: string) => {
+        this.emit(RoomEvent.TrackSubscriptionFailed, sid, participant);
+      })
+      .on(ParticipantEvent.TrackMuted, (pub: TrackPublication) => {
+        this.emit(RoomEvent.TrackMuted, pub, participant);
+      })
+      .on(ParticipantEvent.TrackUnmuted, (pub: TrackPublication) => {
+        this.emit(RoomEvent.TrackUnmuted, pub, participant);
+      })
+      .on(ParticipantEvent.MetadataChanged, (metadata: string | undefined) => {
+        this.emit(RoomEvent.MetadataChanged, metadata, participant);
+      })
+      .on(ParticipantEvent.ParticipantMetadataChanged, (metadata: string | undefined) => {
+        this.emit(RoomEvent.ParticipantMetadataChanged, metadata, participant);
+      })
+      .on(ParticipantEvent.ConnectionQualityChanged, (quality: ConnectionQuality) => {
+        this.emit(RoomEvent.ConnectionQualityChanged, quality, participant);
+      });
     return participant;
   }
 
@@ -775,11 +829,88 @@ class Room extends EventEmitter {
     });
   }
 
-  /** @internal */
-  emit(event: string | symbol, ...args: any[]): boolean {
+  /**
+   * After resuming, we'll need to notify the server of the current
+   * subscription settings.
+   */
+  private updateSubscriptions() {
+    for (const p of this.participants.values()) {
+      for (const pub of p.videoTracks.values()) {
+        if (pub.isSubscribed && pub instanceof RemoteTrackPublication) {
+          pub.emitTrackUpdate();
+        }
+      }
+    }
+  }
+
+  // /** @internal */
+  emit<E extends keyof RoomEventCallbacks>(
+    event: E, ...args: Parameters<RoomEventCallbacks[E]>
+  ): boolean {
     log.debug('room event', event, ...args);
     return super.emit(event, ...args);
   }
 }
 
 export default Room;
+
+export type RoomEventCallbacks = {
+  reconnecting: () => void,
+  reconnected: () => void,
+  disconnected: () => void,
+  stateChanged: (state: RoomState) => void,
+  mediaDevicesChanged: () => void,
+  participantConnected: (participant: RemoteParticipant) => void,
+  participantDisconnected: (participant: RemoteParticipant) => void,
+  trackPublished: (publication: RemoteTrackPublication, participant: RemoteParticipant) => void,
+  trackSubscribed: (
+    track: RemoteTrack,
+    publication: RemoteTrackPublication,
+    participant: RemoteParticipant
+  ) => void,
+  trackSubscriptionFailed: (trackSid: string, participant: RemoteParticipant) => void,
+  trackUnpublished: (publication: RemoteTrackPublication, participant: RemoteParticipant) => void,
+  trackUnsubscribed: (
+    track: RemoteTrack,
+    publication: RemoteTrackPublication,
+    participant: RemoteParticipant,
+  ) => void,
+  trackMuted: (publication: TrackPublication, participant: Participant) => void,
+  trackUnmuted: (publication: TrackPublication, participant: Participant) => void,
+  localTrackPublished: (publication: LocalTrackPublication, participant: LocalParticipant) => void,
+  localTrackUnpublished: (
+    publication: LocalTrackPublication,
+    participant: LocalParticipant
+  ) => void,
+  /**
+   * @deprecated use [[participantMetadataChanged]] instead
+  */
+  metadataChanged: (
+    metadata: string | undefined,
+    participant?: RemoteParticipant | LocalParticipant
+  ) => void,
+  participantMetadataChanged: (
+    metadata: string | undefined,
+    participant: RemoteParticipant | LocalParticipant
+  ) => void,
+  activeSpeakersChanged: (speakers: Array<Participant>) => void,
+  roomMetadataChanged: (metadata: string) => void,
+  dataReceived: (
+    payload: Uint8Array,
+    participant?: RemoteParticipant,
+    kind?: DataPacket_Kind
+  ) => void,
+  connectionQualityChanged: (quality: ConnectionQuality, participant: Participant) => void,
+  mediaDevicesError: (error: Error) => void,
+  trackStreamStateChanged: (
+    publication: RemoteTrackPublication,
+    streamState: Track.StreamState,
+    participant: RemoteParticipant,
+  ) => void,
+  trackSubscriptionPermissionChanged: (
+    publication: RemoteTrackPublication,
+    status: TrackPublication.SubscriptionStatus,
+    participant: RemoteParticipant,
+  ) => void,
+  audioPlaybackChanged: (playing: boolean) => void,
+};

package/src/room/events.ts

@@ -7,6 +7,7 @@
  * room.on(RoomEvent.TrackPublished, (track, publication, participant) => {})
  * ```
  */
+
 export enum RoomEvent {
   /**
    * When the connection to the server has been interrupted and it's attempting
@@ -25,6 +26,13 @@ export enum RoomEvent {
    */
   Disconnected = 'disconnected',
 
+  /**
+   * Whenever the connection state of the room changes
+   *
+   * args: ([[RoomState]])
+   */
+  StateChanged = 'stateChanged',
+
   /**
    * When input or output devices on the machine have changed.
    */
@@ -146,7 +154,7 @@ export enum RoomEvent {
    * args: (prevMetadata: string, [[Participant]])
    *
    */
-  ParticipantMetadataChanged = 'participantMetaDataChanged',
+  ParticipantMetadataChanged = 'participantMetadataChanged',
 
   /**
    * Room metadata is a simple way for app-specific state to be pushed to
@@ -366,11 +374,14 @@ export enum ParticipantEvent {
 
 /** @internal */
 export enum EngineEvent {
+  TransportsCreated = 'transportsCreated',
   Connected = 'connected',
   Disconnected = 'disconnected',
-  Reconnecting = 'reconnecting',
-  Reconnected = 'reconnected',
-  SignalConnected = 'singalConnected',
+  Resuming = 'resuming',
+  Resumed = 'resumed',
+  Restarting = 'restarting',
+  Restarted = 'restarted',
+  SignalResumed = 'signalResumed',
   MediaTrackAdded = 'mediaTrackAdded',
   ActiveSpeakersUpdate = 'activeSpeakersUpdate',
   DataPacketReceived = 'dataPacketReceived',

package/src/room/participant/LocalParticipant.ts

@@ -416,8 +416,7 @@ export default class LocalParticipant extends Participant {
     // store RTPSender
     track.sender = transceiver.sender;
     if (track instanceof LocalVideoTrack) {
-      const disableLayerPause = this.roomOptions?.expDisableLayerPause ?? false;
-      track.startMonitor(this.engine.client, disableLayerPause);
+      track.startMonitor(this.engine.client);
     } else if (track instanceof LocalAudioTrack) {
       track.startMonitor();
     }
@@ -434,6 +433,7 @@ export default class LocalParticipant extends Participant {
 
   unpublishTrack(
     track: LocalTrack | MediaStreamTrack,
+    stopOnUnpublish?: boolean,
   ): LocalTrackPublication | null {
     // look through all published tracks to find the right ones
     const publication = this.getPublicationForTrack(track);
@@ -455,7 +455,10 @@ export default class LocalParticipant extends Participant {
     track.off(TrackEvent.Unmuted, this.onTrackUnmuted);
     track.off(TrackEvent.Ended, this.onTrackUnpublish);
 
-    if (this.roomOptions?.stopLocalTrackOnUnpublish ?? true) {
+    if (stopOnUnpublish === undefined) {
+      stopOnUnpublish = this.roomOptions?.stopLocalTrackOnUnpublish ?? true;
+    }
+    if (stopOnUnpublish) {
       track.stop();
     }
 
@@ -507,10 +510,6 @@ export default class LocalParticipant extends Participant {
     return publications;
   }
 
-  get publisherMetrics(): any {
-    return null;
-  }
-
   /**
    * Publish a new data payload to the room. Data will be forwarded to each
    * participant in the room if the destination argument is empty

package/src/room/participant/Participant.ts

@@ -1,8 +1,12 @@
 import { EventEmitter } from 'events';
-import { ConnectionQuality as ProtoQuality, ParticipantInfo } from '../../proto/livekit_models';
+import type TypedEmitter from 'typed-emitter';
+import { ConnectionQuality as ProtoQuality, DataPacket_Kind, ParticipantInfo } from '../../proto/livekit_models';
 import { ParticipantEvent, TrackEvent } from '../events';
+import LocalTrackPublication from '../track/LocalTrackPublication';
+import RemoteTrackPublication from '../track/RemoteTrackPublication';
 import { Track } from '../track/Track';
 import { TrackPublication } from '../track/TrackPublication';
+import { RemoteTrack } from '../track/types';
 
 export enum ConnectionQuality {
   Excellent = 'excellent',
@@ -24,7 +28,9 @@ function qualityFromProto(q: ProtoQuality): ConnectionQuality {
   }
 }
 
-export default class Participant extends EventEmitter {
+export default class Participant extends (
+  EventEmitter as new () => TypedEmitter<ParticipantEventCallbacks>
+) {
   protected participantInfo?: ParticipantInfo;
 
   audioTracks: Map<string, TrackPublication>;
@@ -158,8 +164,8 @@ export default class Participant extends EventEmitter {
     this.metadata = md;
 
     if (changed) {
-      this.emit(ParticipantEvent.MetadataChanged, prevMetadata, this);
-      this.emit(ParticipantEvent.ParticipantMetadataChanged, prevMetadata, this);
+      this.emit(ParticipantEvent.MetadataChanged, prevMetadata);
+      this.emit(ParticipantEvent.ParticipantMetadataChanged, prevMetadata);
     }
   }
 
@@ -212,3 +218,32 @@ export default class Participant extends EventEmitter {
     }
   }
 }
+
+export type ParticipantEventCallbacks = {
+  trackPublished: (publication: RemoteTrackPublication) => void,
+  trackSubscribed: (track: RemoteTrack, publication: RemoteTrackPublication) => void,
+  trackSubscriptionFailed: (trackSid: string) => void,
+  trackUnpublished: (publication: RemoteTrackPublication) => void,
+  trackUnsubscribed: (track: RemoteTrack, publication: RemoteTrackPublication) => void,
+  trackMuted: (publication: TrackPublication) => void,
+  trackUnmuted: (publication: TrackPublication) => void,
+  localTrackPublished: (publication: LocalTrackPublication) => void,
+  localTrackUnpublished: (publication: LocalTrackPublication) => void,
+  /**
+   * @deprecated use [[participantMetadataChanged]] instead
+   */
+  metadataChanged: (prevMetadata: string | undefined, participant?: any) => void,
+  participantMetadataChanged: (prevMetadata: string | undefined, participant?: any) => void,
+  dataReceived: (payload: Uint8Array, kind: DataPacket_Kind) => void,
+  isSpeakingChanged: (speaking: boolean) => void,
+  connectionQualityChanged: (connectionQuality: ConnectionQuality) => void,
+  trackStreamStateChanged: (
+    publication: RemoteTrackPublication,
+    streamState: Track.StreamState
+  ) => void,
+  trackSubscriptionPermissionChanged: (
+    publication: RemoteTrackPublication,
+    status: TrackPublication.SubscriptionStatus
+  ) => void,
+  mediaDevicesError: (error: Error) => void,
+};

package/src/room/participant/RemoteParticipant.ts

@@ -10,9 +10,8 @@ import RemoteAudioTrack from '../track/RemoteAudioTrack';
 import RemoteTrackPublication from '../track/RemoteTrackPublication';
 import RemoteVideoTrack from '../track/RemoteVideoTrack';
 import { Track } from '../track/Track';
-import { TrackPublication } from '../track/TrackPublication';
 import { RemoteTrack } from '../track/types';
-import Participant from './Participant';
+import Participant, { ParticipantEventCallbacks } from './Participant';
 
 export default class RemoteParticipant extends Participant {
   audioTracks: Map<string, RemoteTrackPublication>;
@@ -42,7 +41,7 @@ export default class RemoteParticipant extends Participant {
     this.videoTracks = new Map();
   }
 
-  protected addTrackPublication(publication: TrackPublication) {
+  protected addTrackPublication(publication: RemoteTrackPublication) {
     super.addTrackPublication(publication);
 
     // register action events
@@ -53,6 +52,9 @@ export default class RemoteParticipant extends Participant {
       },
     );
     publication.on(TrackEvent.UpdateSubscription, (sub: UpdateSubscription) => {
+      sub.participantTracks.forEach((pt) => {
+        pt.participantSid = this.sid;
+      });
       this.signalClient.sendUpdateSubscription(sub);
     });
     publication.on(TrackEvent.Ended, (track: RemoteTrack) => {
@@ -231,7 +233,10 @@ export default class RemoteParticipant extends Participant {
   }
 
   /** @internal */
-  emit(event: string | symbol, ...args: any[]): boolean {
+  emit<E extends keyof ParticipantEventCallbacks>(
+    event: E,
+    ...args: Parameters<ParticipantEventCallbacks[E]>
+  ): boolean {
     log.trace('participant event', this.sid, event, ...args);
     return super.emit(event, ...args);
   }

package/src/room/track/LocalAudioTrack.ts

@@ -73,7 +73,14 @@ export default class LocalAudioTrack extends LocalTrack {
       this._currentBitrate = 0;
       return;
     }
-    const stats = await this.getSenderStats();
+
+    let stats: AudioSenderStats | undefined;
+    try {
+      stats = await this.getSenderStats();
+    } catch (e) {
+      log.error('could not get audio sender stats', e);
+      return;
+    }
 
     if (stats && this.prevStats) {
       this._currentBitrate = computeBitrate(stats, this.prevStats);

package/src/room/track/LocalTrackPublication.ts

@@ -3,12 +3,15 @@ import { TrackEvent } from '../events';
 import LocalAudioTrack from './LocalAudioTrack';
 import LocalTrack from './LocalTrack';
 import LocalVideoTrack from './LocalVideoTrack';
+import { TrackPublishOptions } from './options';
 import { Track } from './Track';
 import { TrackPublication } from './TrackPublication';
 
 export default class LocalTrackPublication extends TrackPublication {
   track?: LocalTrack;
 
+  options?: TrackPublishOptions;
+
   constructor(kind: Track.Kind, ti: TrackInfo, track?: LocalTrack) {
     super(kind, ti.sid, ti.name);