remote-codex 0.11.22 → 0.11.24

package/apps/supervisor-api/dist/index.js

@@ -27428,6 +27428,7 @@ function constantTimeEqual(left, right) {
 
 // src/relay-tunnel-client.ts
 var RELAY_HEARTBEAT_INTERVAL_MS = 3e4;
+var RELAY_CONNECT_TIMEOUT_MS = 15e3;
 var RELAY_RECONNECT_INITIAL_DELAY_MS = 1e3;
 var RELAY_RECONNECT_MAX_DELAY_MS = 3e4;
 var RelayTunnelClient = class {
@@ -27443,6 +27444,7 @@ var RelayTunnelClient = class {
   handleClientMessage;
   socket = null;
   heartbeatHandle = null;
+  connectTimeoutHandle = null;
   reconnectHandle = null;
   reconnectDelayMs = RELAY_RECONNECT_INITIAL_DELAY_MS;
   stopped = false;
@@ -27464,42 +27466,50 @@ var RelayTunnelClient = class {
     const url = new URL("/supervisor/tunnel", this.config.serverUrl ?? void 0);
     url.searchParams.set("token", this.config.agentToken ?? "");
     url.searchParams.set("deviceToken", this.config.agentToken ?? "");
-    this.socket = new WebSocket(url);
-    this.socket.addEventListener("open", () => {
+    const socket = new WebSocket(url);
+    this.socket = socket;
+    this.connectTimeoutHandle = setTimeout(() => {
+      if (this.socket === socket && socket.readyState !== WebSocket.OPEN) {
+        this.closeAndReconnect(socket);
+      }
+    }, RELAY_CONNECT_TIMEOUT_MS);
+    socket.addEventListener("open", () => {
+      this.clearConnectTimeout();
       this.reconnectDelayMs = RELAY_RECONNECT_INITIAL_DELAY_MS;
       this.sendHeartbeat();
+      this.clearHeartbeat();
       this.heartbeatHandle = setInterval(() => {
         this.sendHeartbeat();
       }, RELAY_HEARTBEAT_INTERVAL_MS);
     });
-    this.socket.addEventListener("close", () => {
-      this.clearHeartbeat();
-      this.cleanupRelayClients();
-      this.socket = null;
-      this.scheduleReconnect();
+    socket.addEventListener("close", () => {
+      this.closeAndReconnect(socket);
+    });
+    socket.addEventListener("error", () => {
+      this.closeAndReconnect(socket);
     });
-    this.socket.addEventListener("message", (event) => {
+    socket.addEventListener("message", (event) => {
       void this.handleMessage(String(event.data));
     });
   }
   stop() {
     this.stopped = true;
     this.clearHeartbeat();
+    this.clearConnectTimeout();
     this.clearReconnect();
     this.cleanupRelayClients();
     this.socket?.close();
     this.socket = null;
   }
   sendHeartbeat() {
-    if (this.socket?.readyState !== WebSocket.OPEN) {
+    const socket = this.socket;
+    if (socket?.readyState !== WebSocket.OPEN) {
       return;
     }
-    this.socket.send(
-      JSON.stringify({
-        type: "relay.heartbeat",
-        timestamp: (/* @__PURE__ */ new Date()).toISOString()
-      })
-    );
+    this.sendEnvelope(socket, {
+      type: "relay.heartbeat",
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
+    });
   }
   async handleMessage(rawMessage) {
     let parsed;
@@ -27530,27 +27540,52 @@ var RelayTunnelClient = class {
       return;
     }
     const response = await this.handleRequest(parsed.payload);
-    this.socket?.send(
-      JSON.stringify({
+    const socket = this.socket;
+    if (socket?.readyState !== WebSocket.OPEN) {
+      return;
+    }
+    this.sendEnvelope(
+      socket,
+      {
         type: "relay.response",
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         requestId: parsed.requestId,
         payload: response
-      })
+      }
     );
   }
   sendClientMessage(clientId, message) {
-    if (this.socket?.readyState !== WebSocket.OPEN) {
+    const socket = this.socket;
+    if (socket?.readyState !== WebSocket.OPEN) {
       return;
     }
-    this.socket.send(
-      JSON.stringify({
-        type: "relay.server.message",
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        clientId,
-        payload: message
-      })
-    );
+    this.sendEnvelope(socket, {
+      type: "relay.server.message",
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      clientId,
+      payload: message
+    });
+  }
+  sendEnvelope(socket, message) {
+    try {
+      socket.send(JSON.stringify(message));
+    } catch {
+      this.closeAndReconnect(socket);
+    }
+  }
+  closeAndReconnect(socket) {
+    if (this.socket !== socket) {
+      return;
+    }
+    this.clearHeartbeat();
+    this.clearConnectTimeout();
+    this.cleanupRelayClients();
+    this.socket = null;
+    try {
+      socket.close();
+    } catch {
+    }
+    this.scheduleReconnect();
   }
   clearHeartbeat() {
     if (this.heartbeatHandle) {
@@ -27558,6 +27593,12 @@ var RelayTunnelClient = class {
       this.heartbeatHandle = null;
     }
   }
+  clearConnectTimeout() {
+    if (this.connectTimeoutHandle) {
+      clearTimeout(this.connectTimeoutHandle);
+      this.connectTimeoutHandle = null;
+    }
+  }
   scheduleReconnect() {
     if (this.stopped || this.reconnectHandle) {
       return;