livekit-client 2.18.7 → 2.18.9

package/src/room/Room.ts

@@ -233,7 +233,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     this.sidToIdentity = new Map();
     this.options = { ...roomOptionDefaults, ...options };
 
-    this.log = getLogger(this.options.loggerName ?? LoggerNames.Room);
+    this.log = getLogger(this.options.loggerName ?? LoggerNames.Room, () => this.logContext);
     this.transcriptionReceivedTimes = new Map();
 
     this.options.audioCaptureDefaults = {
@@ -290,8 +290,10 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       .on('trackUnpublished', (event) => {
         this.emit(RoomEvent.LocalDataTrackUnpublished, event.sid);
       })
-      .on('packetAvailable', ({ bytes }) => {
-        this.engine.sendLossyBytes(bytes, DataChannelKind.DATA_TRACK_LOSSY, 'wait');
+      .on('packetAvailable', ({ handle, bytes }) => {
+        this.engine
+          .sendLossyBytes(bytes, DataChannelKind.DATA_TRACK_LOSSY, 'wait')
+          .finally(() => this.outgoingDataTrackManager.handlePacketSendComplete(handle));
       });
 
     this.disconnectLock = new Mutex();
@@ -329,7 +331,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       this.switchActiveDevice(
         'audiooutput',
         unwrapConstraint(this.options.audioOutput.deviceId),
-      ).catch((e) => this.log.warn(`Could not set audio output: ${e.message}`, this.logContext));
+      ).catch((e) => this.log.warn(`Could not set audio output: ${e.message}`));
     }
 
     if (isWeb()) {
@@ -467,8 +469,8 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     return {
       room: this.name,
       roomID: this.roomInfo?.sid,
-      participant: this.localParticipant.identity,
-      participantID: this.localParticipant.sid,
+      participant: this.localParticipant?.identity,
+      participantID: this.localParticipant?.sid,
     };
   }
 
@@ -555,7 +557,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       .on(EngineEvent.Resuming, () => {
         this.clearConnectionReconcile();
         this.isResuming = true;
-        this.log.info('Resuming signal connection', this.logContext);
+        this.log.debug('Resuming signal connection');
         if (this.setAndEmitConnectionState(ConnectionState.SignalReconnecting)) {
           this.emit(RoomEvent.SignalReconnecting);
         }
@@ -563,7 +565,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       .on(EngineEvent.Resumed, () => {
         this.registerConnectionReconcile();
         this.isResuming = false;
-        this.log.info('Resumed signal connection', this.logContext);
+        this.log.debug('Resumed signal connection');
         this.updateSubscriptions();
         this.emitBufferedEvents();
         if (this.setAndEmitConnectionState(ConnectionState.Connected)) {
@@ -613,7 +615,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
         if (!event.info) {
           this.log.warn(
             `received PublishDataTrackResponse, but event.info was ${event.info}, so skipping.`,
-            this.logContext,
           );
           return;
         }
@@ -632,7 +633,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
         if (!event.info) {
           this.log.warn(
             `received UnPublishDataTrackResponse, but event.info was ${event.info}, so skipping.`,
-            this.logContext,
           );
           return;
         }
@@ -732,7 +732,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     if (this.state !== ConnectionState.Disconnected) {
       return;
     }
-    this.log.debug(`prepareConnection to ${url}`, this.logContext);
+    this.log.debug(`prepareConnection to ${url}`);
     try {
       if (isCloud(new URL(url)) && token) {
         this.regionUrlProvider = new RegionUrlProvider(url, token);
@@ -742,13 +742,13 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
         if (regionUrl && this.state === ConnectionState.Disconnected) {
           this.regionUrl = regionUrl;
           await fetch(toHttpUrl(regionUrl), { method: 'HEAD' });
-          this.log.debug(`prepared connection to ${regionUrl}`, this.logContext);
+          this.log.debug(`prepared connection to ${regionUrl}`);
         }
       } else {
         await fetch(toHttpUrl(url), { method: 'HEAD' });
       }
     } catch (e) {
-      this.log.warn('could not prepare connection', { ...this.logContext, error: e });
+      this.log.warn('could not prepare connection', { error: e });
     }
   }
 
@@ -768,7 +768,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
 
     if (this.state === ConnectionState.Connected) {
       // when the state is reconnecting or connected, this function returns immediately
-      this.log.info(`already connected to room ${this.name}`, this.logContext);
+      this.log.info(`already connected to room ${this.name}`);
       unlockDisconnect();
       return Promise.resolve();
     }
@@ -798,7 +798,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
           this.regionUrlProvider?.setServerReportedRegions(settings);
         })
         .catch((e) => {
-          this.log.warn('could not fetch region settings', { ...this.logContext, error: e });
+          this.log.warn('could not fetch region settings', { error: e });
         });
     }
 
@@ -864,7 +864,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
           if (nextUrl && !this.abortController?.signal.aborted) {
             this.log.info(
               `Initial connection failed with ConnectionError: ${error.message}. Retrying with another region: ${nextUrl}`,
-              this.logContext,
             );
             this.recreateEngine(true);
             await connectFn(resolve, reject, nextUrl);
@@ -930,7 +929,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     }
 
     if (serverInfo.version === '0.15.1' && this.options.dynacast) {
-      this.log.debug('disabling dynacast due to server version', this.logContext);
+      this.log.debug('disabling dynacast due to server version');
       // dynacast has a bug in 0.15.1, so we cannot use it then
       roomOptions.dynacast = false;
     }
@@ -950,7 +949,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
         this.e2eeManager.setSifTrailer(joinResponse.sifTrailer);
       } catch (e: any) {
         this.log.error(e instanceof Error ? e.message : 'Could not set SifTrailer', {
-          ...this.logContext,
           error: e,
         });
       }
@@ -975,7 +973,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       this.isResuming ||
       this.engine?.pendingReconnect
     ) {
-      this.log.info('Reconnection attempt replaced by new connection attempt', this.logContext);
+      this.log.info('Reconnection attempt replaced by new connection attempt');
       // make sure we close and recreate the existing engine in order to get rid of any potentially ongoing reconnection attempts
       this.recreateEngine(true);
     } else {
@@ -1027,7 +1025,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
         resultingError.status = err.status;
       }
       this.log.debug(`error trying to establish signal connection`, {
-        ...this.logContext,
         error: err,
       });
       throw resultingError;
@@ -1077,12 +1074,10 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     const unlock = await this.disconnectLock.lock();
     try {
       if (this.state === ConnectionState.Disconnected) {
-        this.log.debug('already disconnected', this.logContext);
+        this.log.debug('already disconnected');
         return;
       }
-      this.log.info('disconnect from room', {
-        ...this.logContext,
-      });
+      this.log.info('disconnect from room');
       if (
         this.state === ConnectionState.Connecting ||
         this.state === ConnectionState.Reconnecting ||
@@ -1090,7 +1085,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       ) {
         // try aborting pending connection attempt
         const msg = 'Abort connection attempt due to user initiated disconnect';
-        this.log.warn(msg, this.logContext);
+        this.log.warn(msg);
         this.abortController?.abort(msg);
         // in case the abort controller didn't manage to cancel the connection attempt, reject the connect promise explicitly
         this.connectFuture?.reject?.(ConnectionError.cancelled('Client initiated disconnect'));
@@ -1256,7 +1251,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
   }
 
   private onPageLeave = async () => {
-    this.log.info('Page leave detected, disconnecting', this.logContext);
+    this.log.info('Page leave detected, disconnecting');
     await this.disconnect();
   };
 
@@ -1299,7 +1294,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
           if (!document.hidden) {
             this.log.debug(
               'page visible again, triggering startAudio to resume playback and update playback status',
-              this.logContext,
             );
             this.startAudio();
           }
@@ -1359,7 +1353,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
         } else {
           this.log.warn(
             'Resuming video playback failed, make sure you call `startVideo` directly in a user gesture handler',
-            this.logContext,
           );
         }
       });
@@ -1545,11 +1538,11 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       return;
     }
     if (this.state === ConnectionState.Disconnected) {
-      this.log.warn('skipping incoming track after Room disconnected', this.logContext);
+      this.log.warn('skipping incoming track after Room disconnected');
       return;
     }
     if (mediaTrack.readyState === 'ended') {
-      this.log.info('skipping incoming track as it already ended', this.logContext);
+      this.log.debug('skipping incoming track as it already ended');
       return;
     }
     const parts = unpackStreamId(stream.id);
@@ -1561,7 +1554,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     if (streamId && streamId.startsWith('TR')) trackId = streamId;
 
     if (participantSid === this.localParticipant.sid) {
-      this.log.warn('tried to create RemoteParticipant for local participant', this.logContext);
+      this.log.warn('tried to create RemoteParticipant for local participant');
       return;
     }
 
@@ -1574,7 +1567,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       if (participantSid.startsWith('PA')) {
         this.log.error(
           `Tried to add a track for a participant, that's not present. Sid: ${participantSid}`,
-          this.logContext,
         );
       }
       return;
@@ -1588,7 +1580,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       if (!id) {
         this.log.error(
           `Tried to add a track whose 'sid' could not be found for a participant, that's not present. Sid: ${participantSid}`,
-          this.logContext,
         );
         return;
       }
@@ -1598,7 +1589,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     if (!trackId.startsWith('TR')) {
       this.log.warn(
         `Tried to add a track whose 'sid' could not be determined for a participant, that's not present. Sid: ${participantSid}, streamId: ${streamId}, trackId: ${trackId}`,
-        { ...this.logContext, remoteParticipantID: participantSid, streamId, trackId },
+        { remoteParticipantID: participantSid, streamId, trackId },
       );
     }
 
@@ -1645,7 +1636,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     // the subscription before publishTrack has finished adding the publication.
     // defer with a timeout until LocalTrackPublished fires for the matching trackSid
     this.log.debug('deferring LocalTrackSubscribed, publication not yet available', {
-      ...this.logContext,
       subscribedSid,
     });
 
@@ -1677,7 +1667,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       } else {
         this.log.warn(
           'could not find local track publication for LocalTrackSubscribed event after timeout',
-          { ...this.logContext, subscribedSid },
+          { subscribedSid },
         );
       }
     }, TIMEOUT_MS);
@@ -1710,7 +1700,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
 
   private handleSignalRestarted = async (joinResponse: JoinResponse) => {
     this.log.debug(`signal reconnected to server, region ${joinResponse.serverRegion}`, {
-      ...this.logContext,
       region: joinResponse.serverRegion,
     });
     this.bufferedEvents = [];
@@ -1721,18 +1710,12 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       // unpublish & republish tracks
       await this.localParticipant.republishAllTracks(undefined, true);
     } catch (error) {
-      this.log.error('error trying to re-publish tracks after reconnection', {
-        ...this.logContext,
-        error,
-      });
+      this.log.error('error trying to re-publish tracks after reconnection', { error });
     }
 
     try {
       await this.engine.waitForRestarted();
-      this.log.debug(`fully reconnected to server`, {
-        ...this.logContext,
-        region: joinResponse.serverRegion,
-      });
+      this.log.debug(`fully reconnected to server`, { region: joinResponse.serverRegion });
     } catch {
       // reconnection failed, handleDisconnect is being invoked already, just return here
       return;
@@ -1749,6 +1732,8 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     this.bufferedEvents = [];
     this.transcriptionReceivedTimes.clear();
     this.incomingDataStreamManager.clearControllers();
+    this.incomingDataTrackManager.reset();
+    this.outgoingDataTrackManager.reset();
     if (this.state === ConnectionState.Disconnected) {
       return;
     }
@@ -2158,7 +2143,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
   };
 
   private handleAudioPlaybackFailed = (e: any) => {
-    this.log.warn('could not playback audio', { ...this.logContext, error: e });
+    this.log.warn('could not playback audio', { error: e });
     if (!this.canPlaybackAudio) {
       return;
     }
@@ -2304,7 +2289,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       try {
         await Promise.race([this.audioContext.resume(), sleep(200)]);
       } catch (e: any) {
-        this.log.warn('Could not resume audio context', { ...this.logContext, error: e });
+        this.log.warn('Could not resume audio context', { error: e });
       }
     }
 
@@ -2347,7 +2332,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
     if (this.options.audioOutput?.deviceId) {
       participant
         .setAudioOutput(this.options.audioOutput)
-        .catch((e) => this.log.warn(`Could not set audio output: ${e.message}`, this.logContext));
+        .catch((e) => this.log.warn(`Could not set audio output: ${e.message}`));
     }
     return participant;
   }
@@ -2506,7 +2491,6 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       ) {
         consecutiveFailures++;
         this.log.warn('detected connection state mismatch', {
-          ...this.logContext,
           numFailures: consecutiveFailures,
           engine: this.engine
             ? {
@@ -2539,6 +2523,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       // unchanged
       return false;
     }
+    this.log.info(`connection state changed: ${this.state} -> ${state}`);
     this.state = state;
     this.incomingDataStreamManager.setConnected(state === ConnectionState.Connected);
     this.emit(RoomEvent.ConnectionStateChanged, this.state);
@@ -2633,10 +2618,7 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       deviceId &&
       deviceId !== this.localParticipant.activeDeviceMap.get(deviceKind)
     ) {
-      this.log.debug(
-        `local track restarted, setting ${deviceKind} ${deviceId} active`,
-        this.logContext,
-      );
+      this.log.debug(`local track restarted, setting ${deviceKind} ${deviceId} active`);
       this.localParticipant.activeDeviceMap.set(deviceKind, deviceId);
       this.emit(RoomEvent.ActiveDeviceChanged, deviceKind, deviceId);
     }
@@ -2815,13 +2797,9 @@ class Room extends (EventEmitter as new () => TypedEmitter<RoomEventCallbacks>)
       // only extract logContext from arguments in order to avoid logging the whole object tree
       const minimizedArgs = mapArgs(args).filter((arg: unknown) => arg !== undefined);
       if (event === RoomEvent.TrackSubscribed || event === RoomEvent.TrackUnsubscribed) {
-        this.log.trace(`subscribe trace: ${event}`, {
-          ...this.logContext,
-          event,
-          args: minimizedArgs,
-        });
+        this.log.trace(`subscribe trace: ${event}`, { event, args: minimizedArgs });
       }
-      this.log.debug(`room event ${event}`, { ...this.logContext, event, args: minimizedArgs });
+      this.log.debug(`room event ${event}`, { event, args: minimizedArgs });
     }
     return super.emit(event, ...args);
   }

package/src/room/data-track/LocalDataTrack.ts

@@ -1,9 +1,10 @@
 import log, { LoggerNames, type StructuredLogger, getLogger } from '../../logger';
+import { Future } from '../utils';
 import { type DataTrackFrame, DataTrackFrameInternal } from './frame';
 import type { DataTrackHandle } from './handle';
 import type OutgoingDataTrackManager from './outgoing/OutgoingDataTrackManager';
 import { DataTrackPushFrameError } from './outgoing/errors';
-import type { DataTrackOptions } from './outgoing/types';
+import type { DataTrackOptions, EventPacketsFlushedChange } from './outgoing/types';
 import {
   DataTrackSymbol,
   type IDataTrack,
@@ -28,14 +29,40 @@ export default class LocalDataTrack implements ILocalTrack, IDataTrack {
 
   protected log: StructuredLogger = log;
 
+  /** Resolves once the data track has sent all pending packets the rtc data channel buffer. */
+  protected flushedFuture = new Future<void, never>();
+
+  protected isFlushed = true;
+
   /** @internal */
   constructor(options: DataTrackOptions, manager: OutgoingDataTrackManager) {
     this.options = options;
     this.manager = manager;
 
     this.log = getLogger(LoggerNames.DataTracks);
+
+    this.manager.on('packetsFlushedChange', this.handleManagerPacketsFlushedChange);
+    this.manager.on('reset', this.handleManagerReset);
   }
 
+  private handleManagerReset = () => {
+    // When the associated manager resets, mark any in flight flushes as complete
+    // There's nothing actionable a user can do to get these to complete so no
+    // error is being thrown.
+    this.flushedFuture.resolve?.();
+
+    this.manager.off('packetsFlushedChange', this.handleManagerPacketsFlushedChange);
+    this.manager.off('reset', this.handleManagerReset);
+  };
+
+  private handleManagerPacketsFlushedChange = (event: EventPacketsFlushedChange) => {
+    this.isFlushed = event.isFlushed;
+    if (event.isFlushed) {
+      this.flushedFuture.resolve?.();
+      this.flushedFuture = new Future();
+    }
+  };
+
   /** @internal */
   static withExplicitHandle(
     options: DataTrackOptions,
@@ -104,6 +131,38 @@ export default class LocalDataTrack implements ILocalTrack, IDataTrack {
     }
   }
 
+  /**
+   * When called, waits for all in flight packets to be sent before resolving.
+   *
+   * Use this to:
+   *
+   * 1. Send frames exactly in order:
+   * ```ts
+   * await track.tryPush(/* ... *\/);
+   * await track.flush();
+   * await track.tryPush(/* ... *\/);
+   * await track.flush();
+   * // ... etc ...
+   * ```
+   *
+   * 2. Wait for frames to all be delivered before unpublishing a local data track:
+   *
+   * ```ts
+   * await track.tryPush(/* ... *\/);
+   * await track.tryPush(/* ... *\/);
+   * await track.tryPush(/* ... *\/);
+   * // ... etc ...
+   * await track.flush();
+   * await track.unpublish();
+   * ```
+   **/
+  async flush(): Promise<void> {
+    if (this.isFlushed) {
+      return;
+    }
+    return this.flushedFuture.promise;
+  }
+
   /**
    * Unpublish the track from the SFU. Once this is called, any further calls to {@link tryPush}
    * will fail.

package/src/room/data-track/RemoteDataTrack.ts

@@ -66,11 +66,14 @@ export default class RemoteDataTrack implements IRemoteTrack, IDataTrack {
    */
   subscribe(options?: DataTrackSubscribeOptions): ReadableStream<DataTrackFrame> {
     try {
-      const [stream] = this.manager.openSubscriptionStream(
+      const [stream, sfuSubscriptionComplete] = this.manager.openSubscriptionStream(
         this.info.sid,
         options?.signal,
         options?.bufferSize,
       );
+      // Prevent uncaught promise rejections from bubbling up if rejections occur after the
+      // readable stream is discarded.
+      sfuSubscriptionComplete.catch(() => {});
       return stream;
     } catch (err) {
       // NOTE: Rethrow errors to break Throws<...> type boundary

package/src/room/data-track/handle.ts

@@ -66,4 +66,8 @@ export class DataTrackHandleAllocator {
     }
     return this.value;
   }
+
+  reset() {
+    this.value = 0;
+  }
 }

package/src/room/data-track/incoming/IncomingDataTrackManager.test.ts

@@ -327,7 +327,7 @@ describe('DataTrackIncomingManager', () => {
       expect(sfuUpdateSubscriptionEvent.subscribe).toStrictEqual(false);
 
       // 7. Make sure shutting down the manager doesn't throw errors
-      manager.shutdown();
+      manager.reset();
     });
 
     it('should NOT terminate the sfu subscription if the abortsignal is triggered on one of two active subscriptions', async () => {
@@ -675,7 +675,7 @@ describe('DataTrackIncomingManager', () => {
       );
 
       // 4. Shutdown the manager, and make sure it doesn't throw
-      manager.shutdown();
+      manager.reset();
 
       // 5. Make sure the trackUnpublished event fires for the descriptor
       const trackUnpublishedEvent = await managerEvents.waitFor('trackUnpublished');
@@ -866,5 +866,75 @@ describe('DataTrackIncomingManager', () => {
       // 8. Make sure the in flight stream is now complete
       await expect(reader.read()).resolves.toStrictEqual({ value: undefined, done: true });
     });
+
+    it(`should not produce an unhandled promise rejection when RemoteDataTrack.subscribe()'s signal is aborted`, async () => {
+      const manager = new IncomingDataTrackManager();
+      const managerEvents = subscribeToEvents<DataTrackIncomingManagerCallbacks>(manager, [
+        'sfuUpdateSubscription',
+        'trackPublished',
+      ]);
+
+      const sid = 'data track sid';
+
+      // 1. Register the data track so we can get a RemoteDataTrack via trackPublished.
+      await manager.receiveSfuPublicationUpdates(
+        new Map([
+          [
+            'identity',
+            [{ sid, pubHandle: DataTrackHandle.fromNumber(5), name: 'test', usesE2ee: false }],
+          ],
+        ]),
+      );
+      const { track } = await managerEvents.waitFor('trackPublished');
+
+      // 2. Listen for unhandled rejections (coming from sfuSubscriptionComplete) and throw
+      // them so the test will terminate.
+      const onUnhandled = (reason: unknown) => {
+        throw reason;
+      };
+      process.on('unhandledRejection', onUnhandled);
+
+      try {
+        const controller = new AbortController();
+        const stream = track.subscribe({ signal: controller.signal });
+
+        // 3. Consume the stream the way a user would, catching the rejection.
+        const caughtByUser: unknown[] = [];
+        const consumerDone = (async () => {
+          try {
+            const reader = stream.getReader();
+            while (true) {
+              const { done } = await reader.read();
+              if (done) {
+                return;
+              }
+            }
+          } catch (err) {
+            caughtByUser.push(err);
+          }
+        })();
+
+        // Wait until subscribeRequest has kicked off so we abort during the
+        // 'pending' state — the path that rejects sfuSubscriptionComplete.
+        await managerEvents.waitFor('sfuUpdateSubscription');
+
+        // 4. Abort the subscription
+        controller.abort();
+        await consumerDone;
+
+        // Drain microtasks so any unhandledRejection has a chance to fire.
+        await new Promise((resolve) => setTimeout(resolve, 0));
+        await new Promise((resolve) => setTimeout(resolve, 0));
+
+        // 5. Make sure that no `unhandledrejection`s occur and get bubbled up as user
+        // facing errors.
+
+        // But, the error should still get raised by the user so they can catch it / do with it as
+        // they please.
+        expect(caughtByUser).toHaveLength(1);
+      } finally {
+        process.off('unhandledRejection', onUnhandled);
+      }
+    });
   });
 });

package/src/room/data-track/incoming/IncomingDataTrackManager.ts

@@ -92,7 +92,7 @@ export default class IncomingDataTrackManager extends (EventEmitter as new () =>
    *
    * This is an index that allows track descriptors to be looked up
    * by subscriber handle in O(1) time, to make routing incoming packets
-   * a (hot code path) faster.
+   * (a hot code path) faster.
    */
   private subscriptionHandles = new Map<DataTrackHandle, DataTrackSid>();
 
@@ -626,8 +626,9 @@ export default class IncomingDataTrackManager extends (EventEmitter as new () =>
     }
   }
 
-  /** Shutdown the manager, ending any subscriptions. */
-  shutdown() {
+  /** Resets the manager, ending any subscriptions, and getting it ready for the next room
+   * connection.  */
+  reset() {
     for (const descriptor of this.descriptors.values()) {
       this.emit('trackUnpublished', {
         sid: descriptor.info.sid,
@@ -643,5 +644,6 @@ export default class IncomingDataTrackManager extends (EventEmitter as new () =>
       }
     }
     this.descriptors.clear();
+    this.subscriptionHandles.clear();
   }
 }