@reactor-team/js-sdk 2.5.0 → 2.5.1

package/dist/index.d.mts

@@ -95,6 +95,11 @@ interface ReactorError {
 declare class ConflictError extends Error {
     constructor(message: string);
 }
+declare class AbortError extends Error {
+    constructor(message: string);
+}
+/** Matches both our custom AbortError and the native DOMException thrown by fetch(). */
+declare function isAbortError(error: unknown): boolean;
 interface ReactorState$1 {
     status: ReactorStatus;
     lastError?: ReactorError;
@@ -200,6 +205,11 @@ declare class Reactor {
     connect(jwtToken?: string, options?: ConnectOptions): Promise<void>;
     /**
      * Sets up event handlers for the machine client.
+     *
+     * Each handler captures the client reference at registration time and
+     * ignores events if this.machineClient has since changed (e.g. after
+     * disconnect + reconnect), preventing stale WebRTC teardown events from
+     * interfering with a new connection.
      */
     private setupMachineClientHandlers;
     /**
@@ -367,4 +377,4 @@ declare function useStats(): ConnectionStats | undefined;
  */
 declare function fetchInsecureJwtToken(apiKey: string, coordinatorUrl?: string): Promise<string>;
 
-export { type AudioTrackOptions, ConflictError, type ConnectOptions, type ConnectionStats, type MessageScope, type Options, PROD_COORDINATOR_URL, Reactor, type ReactorConnectOptions, ReactorController, type ReactorControllerProps, type ReactorError, type ReactorEvent, ReactorProvider, type ReactorState$1 as ReactorState, type ReactorStatus, ReactorView, type ReactorViewProps, type TrackConfig, type VideoTrackOptions, WebcamStream, type WebcamStreamProps, audio, fetchInsecureJwtToken, useReactor, useReactorInternalMessage, useReactorMessage, useReactorStore, useStats, video };
+export { AbortError, type AudioTrackOptions, ConflictError, type ConnectOptions, type ConnectionStats, type MessageScope, type Options, PROD_COORDINATOR_URL, Reactor, type ReactorConnectOptions, ReactorController, type ReactorControllerProps, type ReactorError, type ReactorEvent, ReactorProvider, type ReactorState$1 as ReactorState, type ReactorStatus, ReactorView, type ReactorViewProps, type TrackConfig, type VideoTrackOptions, WebcamStream, type WebcamStreamProps, audio, fetchInsecureJwtToken, isAbortError, useReactor, useReactorInternalMessage, useReactorMessage, useReactorStore, useStats, video };

package/dist/index.d.ts

@@ -95,6 +95,11 @@ interface ReactorError {
 declare class ConflictError extends Error {
     constructor(message: string);
 }
+declare class AbortError extends Error {
+    constructor(message: string);
+}
+/** Matches both our custom AbortError and the native DOMException thrown by fetch(). */
+declare function isAbortError(error: unknown): boolean;
 interface ReactorState$1 {
     status: ReactorStatus;
     lastError?: ReactorError;
@@ -200,6 +205,11 @@ declare class Reactor {
     connect(jwtToken?: string, options?: ConnectOptions): Promise<void>;
     /**
      * Sets up event handlers for the machine client.
+     *
+     * Each handler captures the client reference at registration time and
+     * ignores events if this.machineClient has since changed (e.g. after
+     * disconnect + reconnect), preventing stale WebRTC teardown events from
+     * interfering with a new connection.
      */
     private setupMachineClientHandlers;
     /**
@@ -367,4 +377,4 @@ declare function useStats(): ConnectionStats | undefined;
  */
 declare function fetchInsecureJwtToken(apiKey: string, coordinatorUrl?: string): Promise<string>;
 
-export { type AudioTrackOptions, ConflictError, type ConnectOptions, type ConnectionStats, type MessageScope, type Options, PROD_COORDINATOR_URL, Reactor, type ReactorConnectOptions, ReactorController, type ReactorControllerProps, type ReactorError, type ReactorEvent, ReactorProvider, type ReactorState$1 as ReactorState, type ReactorStatus, ReactorView, type ReactorViewProps, type TrackConfig, type VideoTrackOptions, WebcamStream, type WebcamStreamProps, audio, fetchInsecureJwtToken, useReactor, useReactorInternalMessage, useReactorMessage, useReactorStore, useStats, video };
+export { AbortError, type AudioTrackOptions, ConflictError, type ConnectOptions, type ConnectionStats, type MessageScope, type Options, PROD_COORDINATOR_URL, Reactor, type ReactorConnectOptions, ReactorController, type ReactorControllerProps, type ReactorError, type ReactorEvent, ReactorProvider, type ReactorState$1 as ReactorState, type ReactorStatus, ReactorView, type ReactorViewProps, type TrackConfig, type VideoTrackOptions, WebcamStream, type WebcamStreamProps, audio, fetchInsecureJwtToken, isAbortError, useReactor, useReactorInternalMessage, useReactorMessage, useReactorStore, useStats, video };

package/dist/index.js

@@ -79,6 +79,7 @@ var __async = (__this, __arguments, generator) => {
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AbortError: () => AbortError,
   ConflictError: () => ConflictError,
   PROD_COORDINATOR_URL: () => PROD_COORDINATOR_URL,
   Reactor: () => Reactor,
@@ -88,6 +89,7 @@ __export(index_exports, {
   WebcamStream: () => WebcamStream,
   audio: () => audio,
   fetchInsecureJwtToken: () => fetchInsecureJwtToken,
+  isAbortError: () => isAbortError,
   useReactor: () => useReactor,
   useReactorInternalMessage: () => useReactorInternalMessage,
   useReactorMessage: () => useReactorMessage,
@@ -109,6 +111,14 @@ var ConflictError = class extends Error {
     super(message);
   }
 };
+var AbortError = class extends Error {
+  constructor(message) {
+    super(message);
+  }
+};
+function isAbortError(error) {
+  return error instanceof AbortError || error instanceof Error && error.name === "AbortError";
+}
 
 // src/core/types.ts
 var import_zod = require("zod");
@@ -214,13 +224,17 @@ function rewriteMids(sdp, trackNames) {
 function createOffer(pc, trackNames) {
   return __async(this, null, function* () {
     const offer = yield pc.createOffer();
+    let needsAnswerRestore = false;
     if (trackNames && trackNames.length > 0 && offer.sdp) {
       const munged = rewriteMids(offer.sdp, trackNames);
-      const mungedOffer = new RTCSessionDescription({
-        type: "offer",
-        sdp: munged
-      });
-      yield pc.setLocalDescription(mungedOffer);
+      try {
+        yield pc.setLocalDescription(
+          new RTCSessionDescription({ type: "offer", sdp: munged })
+        );
+      } catch (e) {
+        yield pc.setLocalDescription(offer);
+        needsAnswerRestore = true;
+      }
     } else {
       yield pc.setLocalDescription(offer);
     }
@@ -229,9 +243,49 @@ function createOffer(pc, trackNames) {
     if (!localDescription) {
       throw new Error("Failed to create local description");
     }
-    return localDescription.sdp;
+    let sdp = localDescription.sdp;
+    if (needsAnswerRestore && trackNames && trackNames.length > 0) {
+      sdp = rewriteMids(sdp, trackNames);
+    }
+    return { sdp, needsAnswerRestore };
   });
 }
+function buildMidMapping(transceivers) {
+  var _a;
+  const localToRemote = /* @__PURE__ */ new Map();
+  const remoteToLocal = /* @__PURE__ */ new Map();
+  for (const entry of transceivers) {
+    const mid = (_a = entry.transceiver) == null ? void 0 : _a.mid;
+    if (mid) {
+      localToRemote.set(mid, entry.name);
+      remoteToLocal.set(entry.name, mid);
+    }
+  }
+  return { localToRemote, remoteToLocal };
+}
+function restoreAnswerMids(sdp, remoteToLocal) {
+  const lines = sdp.split("\r\n");
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].startsWith("a=mid:")) {
+      const remoteMid = lines[i].substring("a=mid:".length);
+      const localMid = remoteToLocal.get(remoteMid);
+      if (localMid !== void 0) {
+        lines[i] = `a=mid:${localMid}`;
+      }
+    }
+    if (lines[i].startsWith("a=group:BUNDLE ")) {
+      const parts = lines[i].split(" ");
+      for (let j = 1; j < parts.length; j++) {
+        const localMid = remoteToLocal.get(parts[j]);
+        if (localMid !== void 0) {
+          parts[j] = localMid;
+        }
+      }
+      lines[i] = parts.join(" ");
+    }
+  }
+  return lines.join("\r\n");
+}
 function setRemoteDescription(pc, sdp) {
   return __async(this, null, function* () {
     const sessionDescription = new RTCSessionDescription({
@@ -359,6 +413,22 @@ var CoordinatorClient = class {
     this.baseUrl = options.baseUrl;
     this.jwtToken = options.jwtToken;
     this.model = options.model;
+    this.abortController = new AbortController();
+  }
+  /**
+   * Aborts any in-flight HTTP requests and polling loops.
+   * A fresh AbortController is created so the client remains reusable.
+   */
+  abort() {
+    this.abortController.abort();
+    this.abortController = new AbortController();
+  }
+  /**
+   * The current abort signal, passed to every fetch() and sleep() call.
+   * Protected so subclasses can forward it to their own fetch calls.
+   */
+  get signal() {
+    return this.abortController.signal;
   }
   /**
    * Returns the authorization header with JWT Bearer token
@@ -379,7 +449,8 @@ var CoordinatorClient = class {
         `${this.baseUrl}/ice_servers?model=${this.model}`,
         {
           method: "GET",
-          headers: this.getAuthHeaders()
+          headers: this.getAuthHeaders(),
+          signal: this.signal
         }
       );
       if (!response.ok) {
@@ -413,7 +484,8 @@ var CoordinatorClient = class {
         headers: __spreadProps(__spreadValues({}, this.getAuthHeaders()), {
           "Content-Type": "application/json"
         }),
-        body: JSON.stringify(requestBody)
+        body: JSON.stringify(requestBody),
+        signal: this.signal
       });
       if (!response.ok) {
         const errorText = yield response.text();
@@ -447,7 +519,8 @@ var CoordinatorClient = class {
         `${this.baseUrl}/sessions/${this.currentSessionId}`,
         {
           method: "GET",
-          headers: this.getAuthHeaders()
+          headers: this.getAuthHeaders(),
+          signal: this.signal
         }
       );
       if (!response.ok) {
@@ -460,12 +533,13 @@ var CoordinatorClient = class {
   }
   /**
    * Terminates the current session by sending a DELETE request to the coordinator.
-   * @throws Error if no active session exists or if the request fails (except for 404)
+   * No-op if no session has been created yet.
+   * @throws Error if the request fails (except for 404, which clears local state)
    */
   terminateSession() {
     return __async(this, null, function* () {
       if (!this.currentSessionId) {
-        throw new Error("No active session. Call createSession() first.");
+        return;
       }
       console.debug(
         "[CoordinatorClient] Terminating session:",
@@ -475,7 +549,8 @@ var CoordinatorClient = class {
         `${this.baseUrl}/sessions/${this.currentSessionId}`,
         {
           method: "DELETE",
-          headers: this.getAuthHeaders()
+          headers: this.getAuthHeaders(),
+          signal: this.signal
         }
       );
       if (response.ok) {
@@ -525,7 +600,8 @@ var CoordinatorClient = class {
           headers: __spreadProps(__spreadValues({}, this.getAuthHeaders()), {
             "Content-Type": "application/json"
           }),
-          body: JSON.stringify(requestBody)
+          body: JSON.stringify(requestBody),
+          signal: this.signal
         }
       );
       if (response.status === 200) {
@@ -561,6 +637,9 @@ var CoordinatorClient = class {
       let backoffMs = INITIAL_BACKOFF_MS;
       let attempt = 0;
       while (true) {
+        if (this.signal.aborted) {
+          throw new AbortError("SDP polling aborted");
+        }
         if (attempt >= maxAttempts) {
           throw new Error(
             `SDP polling exceeded maximum attempts (${maxAttempts}) for session ${sessionId}`
@@ -576,7 +655,8 @@ var CoordinatorClient = class {
             method: "GET",
             headers: __spreadProps(__spreadValues({}, this.getAuthHeaders()), {
               "Content-Type": "application/json"
-            })
+            }),
+            signal: this.signal
           }
         );
         if (response.status === 200) {
@@ -621,10 +701,26 @@ var CoordinatorClient = class {
     });
   }
   /**
-   * Utility function to sleep for a given number of milliseconds
+   * Abort-aware sleep. Resolves after `ms` milliseconds unless the
+   * abort signal fires first, in which case it rejects with AbortError.
    */
   sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+    return new Promise((resolve, reject) => {
+      const { signal } = this;
+      if (signal.aborted) {
+        reject(new AbortError("Sleep aborted"));
+        return;
+      }
+      const timer = setTimeout(() => {
+        signal.removeEventListener("abort", onAbort);
+        resolve();
+      }, ms);
+      const onAbort = () => {
+        clearTimeout(timer);
+        reject(new AbortError("Sleep aborted"));
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+    });
   }
 };
 
@@ -646,7 +742,8 @@ var LocalCoordinatorClient = class extends CoordinatorClient {
     return __async(this, null, function* () {
       console.debug("[LocalCoordinatorClient] Fetching ICE servers...");
       const response = yield fetch(`${this.localBaseUrl}/ice_servers`, {
-        method: "GET"
+        method: "GET",
+        signal: this.signal
       });
       if (!response.ok) {
         throw new Error("Failed to get ICE servers from local coordinator.");
@@ -670,7 +767,8 @@ var LocalCoordinatorClient = class extends CoordinatorClient {
       console.debug("[LocalCoordinatorClient] Creating local session...");
       this.sdpOffer = sdpOffer;
       const response = yield fetch(`${this.localBaseUrl}/start_session`, {
-        method: "POST"
+        method: "POST",
+        signal: this.signal
       });
       if (!response.ok) {
         throw new Error("Failed to send local start session command.");
@@ -698,7 +796,8 @@ var LocalCoordinatorClient = class extends CoordinatorClient {
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify(sdpBody)
+        body: JSON.stringify(sdpBody),
+        signal: this.signal
       });
       if (!response.ok) {
         if (response.status === 409) {
@@ -715,7 +814,8 @@ var LocalCoordinatorClient = class extends CoordinatorClient {
     return __async(this, null, function* () {
       console.debug("[LocalCoordinatorClient] Stopping local session...");
       yield fetch(`${this.localBaseUrl}/stop_session`, {
-        method: "POST"
+        method: "POST",
+        signal: this.signal
       });
     });
   }
@@ -790,12 +890,21 @@ var GPUMachineClient = class {
         );
       }
       const trackNames = entries.map((e) => e.name);
-      const offer = yield createOffer(this.peerConnection, trackNames);
+      const { sdp, needsAnswerRestore } = yield createOffer(
+        this.peerConnection,
+        trackNames
+      );
+      if (needsAnswerRestore) {
+        this.midMapping = buildMidMapping(entries);
+      } else {
+        this.midMapping = void 0;
+      }
       console.debug(
         "[GPUMachineClient] Created SDP offer with MIDs:",
-        trackNames
+        trackNames,
+        needsAnswerRestore ? "(needs answer restore)" : "(native munging)"
       );
-      return offer;
+      return sdp;
     });
   }
   /**
@@ -844,7 +953,14 @@ var GPUMachineClient = class {
       }
       this.setStatus("connecting");
       try {
-        yield setRemoteDescription(this.peerConnection, sdpAnswer);
+        let answer = sdpAnswer;
+        if (this.midMapping) {
+          answer = restoreAnswerMids(
+            answer,
+            this.midMapping.remoteToLocal
+          );
+        }
+        yield setRemoteDescription(this.peerConnection, answer);
         console.debug("[GPUMachineClient] Remote description set");
       } catch (error) {
         console.error("[GPUMachineClient] Failed to connect:", error);
@@ -872,6 +988,7 @@ var GPUMachineClient = class {
         this.peerConnection = void 0;
       }
       this.transceiverMap.clear();
+      this.midMapping = void 0;
       this.peerConnected = false;
       this.dataChannelOpen = false;
       this.setStatus("disconnected");
@@ -1096,13 +1213,19 @@ var GPUMachineClient = class {
       }
     };
     this.peerConnection.ontrack = (event) => {
-      var _a;
-      const mid = event.transceiver.mid;
-      const trackName = mid != null ? mid : `unknown-${event.track.id}`;
+      var _a, _b;
+      let trackName;
+      for (const [name, entry] of this.transceiverMap) {
+        if (entry.transceiver === event.transceiver) {
+          trackName = name;
+          break;
+        }
+      }
+      trackName != null ? trackName : trackName = (_a = event.transceiver.mid) != null ? _a : `unknown-${event.track.id}`;
       console.debug(
-        `[GPUMachineClient] Track received: "${trackName}" (${event.track.kind}, mid=${mid})`
+        `[GPUMachineClient] Track received: "${trackName}" (${event.track.kind}, mid=${event.transceiver.mid})`
       );
-      const stream = (_a = event.streams[0]) != null ? _a : new MediaStream([event.track]);
+      const stream = (_b = event.streams[0]) != null ? _b : new MediaStream([event.track]);
       this.emit("trackReceived", trackName, event.track, stream);
     };
     this.peerConnection.onicecandidate = (event) => {
@@ -1325,8 +1448,8 @@ var Reactor = class {
           options == null ? void 0 : options.maxAttempts
         );
         yield this.machineClient.connect(sdpAnswer);
-        this.setStatus("ready");
       } catch (error) {
+        if (isAbortError(error)) return;
         let recoverable = false;
         if (error instanceof ConflictError) {
           recoverable = true;
@@ -1385,6 +1508,7 @@ var Reactor = class {
         );
         yield this.machineClient.connect(sdpAnswer);
       } catch (error) {
+        if (isAbortError(error)) return;
         console.error("[Reactor] Connection failed:", error);
         this.createError(
           "CONNECTION_FAILED",
@@ -1406,17 +1530,25 @@ var Reactor = class {
   }
   /**
    * Sets up event handlers for the machine client.
+   *
+   * Each handler captures the client reference at registration time and
+   * ignores events if this.machineClient has since changed (e.g. after
+   * disconnect + reconnect), preventing stale WebRTC teardown events from
+   * interfering with a new connection.
    */
   setupMachineClientHandlers() {
     if (!this.machineClient) return;
-    this.machineClient.on("message", (message, scope) => {
+    const client = this.machineClient;
+    client.on("message", (message, scope) => {
+      if (this.machineClient !== client) return;
       if (scope === "application") {
         this.emit("message", message);
       } else if (scope === "runtime") {
         this.emit("runtimeMessage", message);
       }
     });
-    this.machineClient.on("statusChanged", (status) => {
+    client.on("statusChanged", (status) => {
+      if (this.machineClient !== client) return;
       switch (status) {
         case "connected":
           this.setStatus("ready");
@@ -1435,13 +1567,15 @@ var Reactor = class {
           break;
       }
     });
-    this.machineClient.on(
+    client.on(
       "trackReceived",
       (name, track, stream) => {
+        if (this.machineClient !== client) return;
         this.emit("trackReceived", name, track, stream);
       }
     );
-    this.machineClient.on("statsUpdate", (stats) => {
+    client.on("statsUpdate", (stats) => {
+      if (this.machineClient !== client) return;
       this.emit("statsUpdate", stats);
     });
   }
@@ -1451,10 +1585,12 @@ var Reactor = class {
    */
   disconnect(recoverable = false) {
     return __async(this, null, function* () {
+      var _a;
       if (this.status === "disconnected" && !this.sessionId) {
         console.warn("[Reactor] Already disconnected");
         return;
       }
+      (_a = this.coordinatorClient) == null ? void 0 : _a.abort();
       if (this.coordinatorClient && !recoverable) {
         try {
           yield this.coordinatorClient.terminateSession();
@@ -2679,6 +2815,7 @@ function fetchInsecureJwtToken(_0) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AbortError,
   ConflictError,
   PROD_COORDINATOR_URL,
   Reactor,
@@ -2688,6 +2825,7 @@ function fetchInsecureJwtToken(_0) {
   WebcamStream,
   audio,
   fetchInsecureJwtToken,
+  isAbortError,
   useReactor,
   useReactorInternalMessage,
   useReactorMessage,