Clear pending track resolver on track unpublish

.changeset/itchy-beans-tell.md

@@ -0,0 +1,5 @@
+---
+'livekit-client': patch
+---
+
+Decrease publication timeout to 10s and clean local state on failed unpublish attempts

src/room/RTCEngine.ts

@@ -72,7 +72,9 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
 
   private _isClosed: boolean = true;
 
-  private pendingTrackResolvers: { [key: string]: (info: TrackInfo) => void } = {};
+  private pendingTrackResolvers: {
+    [key: string]: { resolve: (info: TrackInfo) => void; reject: () => void };
+  } = {};
 
   // true if publisher connection has already been established.
   // this is helpful to know if we need to restart ICE on the publisher connection
@@ -166,18 +168,40 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     }
     return new Promise<TrackInfo>((resolve, reject) => {
       const publicationTimeout = setTimeout(() => {
+        delete this.pendingTrackResolvers[req.cid];
         reject(
           new ConnectionError('publication of local track timed out, no response from server'),
         );
-      }, 15_000);
-      this.pendingTrackResolvers[req.cid] = (info: TrackInfo) => {
-        clearTimeout(publicationTimeout);
-        resolve(info);
+      }, 10_000);
+      this.pendingTrackResolvers[req.cid] = {
+        resolve: (info: TrackInfo) => {
+          clearTimeout(publicationTimeout);
+          resolve(info);
+        },
+        reject: () => {
+          clearTimeout(publicationTimeout);
+          reject('Cancelled publication by calling unpublish');
+        },
       };
       this.client.sendAddTrack(req);
     });
   }
 
+  removeTrack(sender: RTCRtpSender) {
+    if (sender.track && this.pendingTrackResolvers[sender.track.id]) {
+      const { reject } = this.pendingTrackResolvers[sender.track.id];
+      if (reject) {
+        reject();
+      }
+      delete this.pendingTrackResolvers[sender.track.id];
+    }
+    try {
+      this.publisher?.pc.removeTrack(sender);
+    } catch (e: unknown) {
+      log.warn('failed to remove track', { error: e, method: 'removeTrack' });
+    }
+  }
+
   updateMuteStatus(trackSid: string, muted: boolean) {
     this.client.sendMuteTrack(trackSid, muted);
   }
@@ -338,7 +362,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
 
     this.client.onLocalTrackPublished = (res: TrackPublishedResponse) => {
       log.debug('received trackPublishedResponse', res);
-      const resolve = this.pendingTrackResolvers[res.cid];
+      const { resolve } = this.pendingTrackResolvers[res.cid];
       if (!resolve) {
         log.error(`missing track resolver for ${res.cid}`);
         return;

src/room/participant/LocalParticipant.ts

@@ -722,18 +722,18 @@ export default class LocalParticipant extends Participant {
       track.sender
     ) {
       try {
-        this.engine.publisher.pc.removeTrack(track.sender);
+        this.engine.removeTrack(track.sender);
         if (track instanceof LocalVideoTrack) {
           for (const [, trackInfo] of track.simulcastCodecs) {
             if (trackInfo.sender) {
-              this.engine.publisher.pc.removeTrack(trackInfo.sender);
+              this.engine.removeTrack(trackInfo.sender);
               trackInfo.sender = undefined;
             }
           }
           track.simulcastCodecs.clear();
         }
       } catch (e) {
-        log.warn('failed to remove track', { error: e, method: 'unpublishTrack' });
+        log.warn('failed to unpublish track', { error: e, method: 'unpublishTrack' });
       } finally {
         this.engine.negotiate();
       }