livekit-client 2.15.11 → 2.15.12

package/dist/livekit-client.esm.mjs

@@ -12601,7 +12601,7 @@ function getOSVersion(ua) {
   return ua.includes('mac os') ? getMatch(/\(.+?(\d+_\d+(:?_\d+)?)/, ua, 1).replace(/_/g, '.') : undefined;
 }
 
-var version$1 = "2.15.11";
+var version$1 = "2.15.12";
 
 const version = version$1;
 const protocolVersion = 16;
@@ -14797,11 +14797,13 @@ class SignalClient {
       return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         try {
-          const timeoutAbortController = new AbortController();
-          const signals = abortSignal ? [timeoutAbortController.signal, abortSignal] : [timeoutAbortController.signal];
-          const combinedAbort = AbortSignal.any(signals);
-          const abortHandler = event => __awaiter(this, void 0, void 0, function* () {
-            const target = event.currentTarget;
+          let alreadyAborted = false;
+          const abortHandler = eventOrError => __awaiter(this, void 0, void 0, function* () {
+            if (alreadyAborted) {
+              return;
+            }
+            alreadyAborted = true;
+            const target = eventOrError instanceof Event ? eventOrError.currentTarget : eventOrError;
             const reason = getAbortReasonAsString(target, 'Abort handler called');
             // send leave if we have an active stream writer (connection is open)
             if (this.streamWriter && !this.isDisconnected) {
@@ -14812,12 +14814,16 @@ class SignalClient {
             } else {
               this.close();
             }
-            clearTimeout(wsTimeout);
+            cleanupAbortHandlers();
             reject(target instanceof AbortSignal ? target.reason : target);
           });
-          combinedAbort.addEventListener('abort', abortHandler);
+          abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', abortHandler);
+          const cleanupAbortHandlers = () => {
+            clearTimeout(wsTimeout);
+            abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', abortHandler);
+          };
           const wsTimeout = setTimeout(() => {
-            timeoutAbortController.abort(new ConnectionError('room connection has timed out (signal)', ConnectionErrorReason.ServerUnreachable));
+            abortHandler(new ConnectionError('room connection has timed out (signal)', ConnectionErrorReason.ServerUnreachable));
           }, opts.websocketTimeout);
           const handleSignalConnected = (connection, firstMessage) => {
             this.handleSignalConnected(connection, wsTimeout, firstMessage);
@@ -14900,8 +14906,9 @@ class SignalClient {
             handleSignalConnected(connection, firstMessageToProcess);
             resolve(validation.response);
           } catch (e) {
-            clearTimeout(wsTimeout);
             reject(e);
+          } finally {
+            cleanupAbortHandlers();
           }
         } finally {
           unlock();