squad-openclaw 2026.2.2009 → 2026.2.2010

package/dist/index.js

@@ -1508,6 +1508,25 @@ function readOperatorToken() {
     return null;
   }
 }
+function readGatewayLocalWsConfig() {
+  const defaults = {
+    port: 18789,
+    // Try IPv4, hostname, then IPv6 loopback.
+    hosts: ["127.0.0.1", "localhost", "[::1]"]
+  };
+  const stateDir = getOpenclawStateDir();
+  const configPath = path8.join(stateDir, "openclaw.json");
+  try {
+    const raw = fs7.readFileSync(configPath, "utf-8");
+    const config = JSON.parse(raw);
+    const parsedPort = Number(config?.gateway?.port);
+    if (Number.isFinite(parsedPort) && parsedPort > 0) {
+      defaults.port = parsedPort;
+    }
+  } catch {
+  }
+  return defaults;
+}
 function signDeviceIdentity(keys, clientId, clientMode, role, scopes, token, challengeNonce) {
   const signedAtMs = Date.now();
   const nonce = challengeNonce || crypto3.randomBytes(16).toString("hex");
@@ -1527,6 +1546,7 @@ var RelayClient = class {
   config;
   relayWs = null;
   userConnections = /* @__PURE__ */ new Map();
+  localConnectAttempts = /* @__PURE__ */ new Map();
   reconnectAttempts = 0;
   maxReconnectAttempts = 100;
   reconnectTimer = null;
@@ -1538,9 +1558,11 @@ var RelayClient = class {
   deviceKeys;
   constructor(config) {
     const state = readRelayState();
+    const localWs = readGatewayLocalWsConfig();
     this.config = {
       relayUrl: config.relayUrl,
-      localGatewayPort: config.localGatewayPort ?? 18789,
+      localGatewayPort: config.localGatewayPort ?? localWs.port,
+      localGatewayHosts: config.localGatewayHosts ?? localWs.hosts,
       operatorToken: config.operatorToken ?? readOperatorToken(),
       claimToken: config.claimToken ?? state.claimToken ?? null,
       roomId: config.roomId ?? state.roomId ?? null
@@ -1815,7 +1837,7 @@ var RelayClient = class {
     console.log(`[relay-client] Injected device identity for ${conn.userId}: nonce=${conn.challengeNonce?.substring(0, 12)}...`);
   }
   /** Create a local WS connection to the gateway for a specific user */
-  createUserConnection(userId) {
+  createUserConnection(userId, carry) {
     const existing = this.userConnections.get(userId);
     if (existing) {
       try {
@@ -1823,21 +1845,24 @@ var RelayClient = class {
       } catch {
       }
     }
-    const localUrl = `ws://127.0.0.1:${this.config.localGatewayPort}`;
+    const attempt = this.localConnectAttempts.get(userId) ?? 0;
+    const host = this.config.localGatewayHosts[attempt % this.config.localGatewayHosts.length];
+    const localUrl = `ws://${host}:${this.config.localGatewayPort}`;
     console.log(`[relay-client] Creating local WS for user ${userId} \u2192 ${localUrl}`);
     const localWs = new NodeWebSocket(localUrl);
     const conn = {
       localWs,
       userId,
-      e2e: null,
+      e2e: carry?.e2e ?? null,
       connectHandshakeComplete: false,
       challengeNonce: null,
-      pendingConnect: null,
-      pendingMessages: []
+      pendingConnect: carry?.pendingConnect ?? null,
+      pendingMessages: carry?.pendingMessages ?? []
     };
     this.userConnections.set(userId, conn);
     localWs.on("open", () => {
       console.log(`[relay-client] Local WS for user ${userId} connected`);
+      this.localConnectAttempts.delete(userId);
     });
     localWs.on("message", (data) => {
       try {
@@ -1859,6 +1884,29 @@ Device ID: ${this.deviceKeys.deviceId}`
       const current = this.userConnections.get(userId);
       if (current && current.localWs === localWs) {
         this.userConnections.delete(userId);
+        const nextAttempt = (this.localConnectAttempts.get(userId) ?? 0) + 1;
+        const shouldRetryLocalConnect = code === 1006 && !conn.connectHandshakeComplete && nextAttempt <= 8 && this.relayWs?.readyState === NodeWebSocket.OPEN;
+        if (shouldRetryLocalConnect) {
+          this.localConnectAttempts.set(userId, nextAttempt);
+          const delay = Math.min(300 * nextAttempt, 2e3);
+          console.log(
+            `[relay-client] Local WS unavailable for ${userId}, retrying in ${delay}ms (attempt ${nextAttempt}/8)`
+          );
+          const carry2 = {
+            pendingConnect: conn.pendingConnect,
+            pendingMessages: conn.pendingMessages,
+            e2e: conn.e2e
+          };
+          setTimeout(() => {
+            if (this.destroyed) return;
+            if (this.relayWs?.readyState !== NodeWebSocket.OPEN) return;
+            if (!this.userConnections.has(userId)) {
+              this.createUserConnection(userId, carry2);
+            }
+          }, delay);
+          return;
+        }
+        this.localConnectAttempts.delete(userId);
         this.sendToRelay({
           type: "relay.forward",
           userId,
@@ -1989,10 +2037,8 @@ Device ID: ${this.deviceKeys.deviceId}`
 };
 var relayClient = null;
 function startRelayClient(api, relayUrl) {
-  const localPort = 18789;
   relayClient = new RelayClient({
-    relayUrl,
-    localGatewayPort: localPort
+    relayUrl
   });
   relayClient.start();
   api.registerGatewayMethod(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squad-openclaw",
-  "version": "2026.2.2009",
+  "version": "2026.2.2010",
   "description": "Entity registry, filesystem tools, and version management plugin for OpenClaw gateway",
   "type": "module",
   "main": "./dist/index.js",