claw-control-center 0.1.3 → 0.1.4

package/dist/index.cjs

@@ -6476,6 +6476,9 @@ var CHAT_HISTORY_MAX_PAGES = 100;
 var CRON_LIST_PAGE_LIMIT = 50;
 var CRON_LIST_MAX_PAGES = 100;
 var OPENCLAW_STOP_SETTLE_TIMEOUT_MS = 3e3;
+var GATEWAY_PROTOCOL_MIN = 3;
+var GATEWAY_PROTOCOL_MAX = 4;
+var WEBSOCKET_CONNECTING = 0;
 function createGatewayClient(config) {
   const resolved = resolveGatewayConfig(config);
   const hostKind = resolved.hostKind ?? "openclaw";
@@ -7237,6 +7240,82 @@ function readUnknownPath(value, path) {
   }
   return current;
 }
+function createGatewayFrameError(error) {
+  const message = error?.message ?? "gateway request failed";
+  const details = error?.details !== void 0 ? `: ${JSON.stringify(error.details)}` : "";
+  return new Error(`${message}${details}`);
+}
+function createGatewayHandshakeError(error) {
+  if (!/protocol mismatch/i.test(error.message)) {
+    return error;
+  }
+  return new Error(`Gateway protocol negotiation failed: ${error.message}`);
+}
+function createUnsupportedGatewayProtocolError(expectedProtocol, originalError) {
+  return new Error(
+    `Gateway protocol ${expectedProtocol} is not supported by this client; supported range is ${GATEWAY_PROTOCOL_MIN}-${GATEWAY_PROTOCOL_MAX}. Original error: ${originalError.message}`
+  );
+}
+function extractExpectedGatewayProtocol(error, fallbackMessage) {
+  const fromDetails = readExpectedProtocolValue(error?.details);
+  if (fromDetails !== null) {
+    return fromDetails;
+  }
+  return readExpectedProtocolFromText([error?.message, fallbackMessage].filter(Boolean).join(" "));
+}
+function readExpectedProtocolValue(value, depth = 0) {
+  if (value === null || value === void 0 || depth > 4) {
+    return null;
+  }
+  if (typeof value === "string") {
+    const fromText = readExpectedProtocolFromText(value);
+    if (fromText !== null) {
+      return fromText;
+    }
+    try {
+      return readExpectedProtocolValue(JSON.parse(value), depth + 1);
+    } catch {
+      return null;
+    }
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      const match = readExpectedProtocolValue(item, depth + 1);
+      if (match !== null) {
+        return match;
+      }
+    }
+    return null;
+  }
+  if (typeof value !== "object") {
+    return null;
+  }
+  const record = value;
+  for (const key of ["expectedProtocol", "expected_protocol"]) {
+    const match = coerceGatewayProtocol(record[key]);
+    if (match !== null) {
+      return match;
+    }
+  }
+  for (const item of Object.values(record)) {
+    const match = readExpectedProtocolValue(item, depth + 1);
+    if (match !== null) {
+      return match;
+    }
+  }
+  return null;
+}
+function readExpectedProtocolFromText(value) {
+  const match = value.match(/["']?expectedProtocol["']?\s*[:=]\s*["']?(\d+)["']?/i);
+  return match ? coerceGatewayProtocol(match[1]) : null;
+}
+function coerceGatewayProtocol(value) {
+  const protocol = typeof value === "number" ? value : typeof value === "string" ? Number(value) : Number.NaN;
+  return Number.isInteger(protocol) ? protocol : null;
+}
+function isSupportedGatewayProtocol(protocol) {
+  return protocol >= GATEWAY_PROTOCOL_MIN && protocol <= GATEWAY_PROTOCOL_MAX;
+}
 var RpcSocketClient = class {
   constructor(config) {
     this.config = config;
@@ -7249,6 +7328,8 @@ var RpcSocketClient = class {
   connectPromise = null;
   ready = false;
   challengeNonce = null;
+  connectProtocolOverride = null;
+  connectProtocolRetryUsed = false;
   stopped = false;
   onEvent(listener) {
     this.listeners.add(listener);
@@ -7318,6 +7399,7 @@ var RpcSocketClient = class {
       this.socket = socket;
       this.ready = false;
       this.challengeNonce = null;
+      this.connectProtocolRetryUsed = false;
       let settled = false;
       const finishError = (error) => {
         if (settled) {
@@ -7327,6 +7409,9 @@ var RpcSocketClient = class {
         if (this.socket === socket) {
           this.socket = null;
         }
+        if (socket.readyState === WEBSOCKET_CONNECTING || socket.readyState === wrapper_default.OPEN) {
+          socket.close();
+        }
         this.ready = false;
         this.challengeNonce = null;
         reject(error);
@@ -7394,11 +7479,20 @@ var RpcSocketClient = class {
       clearTimeout(pending.timeout);
     }
     if (!frame.ok) {
-      const message = frame.error?.message ?? "gateway request failed";
-      const details = frame.error?.details ? `: ${JSON.stringify(frame.error.details)}` : "";
-      const error = new Error(`${message}${details}`);
+      const error = createGatewayFrameError(frame.error);
       if (frame.id === "connect-handshake") {
-        rejectConnect(error);
+        const expectedProtocol = extractExpectedGatewayProtocol(frame.error, error.message);
+        if (expectedProtocol !== null && !isSupportedGatewayProtocol(expectedProtocol)) {
+          rejectConnect(createUnsupportedGatewayProtocolError(expectedProtocol, error));
+          return;
+        }
+        if (expectedProtocol !== null && !this.connectProtocolRetryUsed) {
+          this.connectProtocolOverride = expectedProtocol;
+          this.connectProtocolRetryUsed = true;
+          this.sendConnect();
+          return;
+        }
+        rejectConnect(createGatewayHandshakeError(error));
         return;
       }
       pending.reject(error);
@@ -7416,13 +7510,15 @@ var RpcSocketClient = class {
     if (!this.socket || this.socket.readyState !== wrapper_default.OPEN || !this.challengeNonce) {
       return;
     }
+    const minProtocol = this.connectProtocolOverride ?? GATEWAY_PROTOCOL_MIN;
+    const maxProtocol = this.connectProtocolOverride ?? GATEWAY_PROTOCOL_MAX;
     const frame = {
       type: "req",
       id: "connect-handshake",
       method: "connect",
       params: {
-        minProtocol: 4,
-        maxProtocol: 4,
+        minProtocol,
+        maxProtocol,
         client: {
           id: "gateway-client",
           displayName: "Claw Control Center",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-control-center",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",