@lingyao037/openclaw-lingyao-cli 0.9.5 → 0.9.7

package/dist/{accounts-CzjBLXMH.d.ts → accounts-BykE02r0.d.ts}

@@ -1,4 +1,4 @@
-import { L as LingyaoRuntime, g as LingyaoAccount, c as DeviceToken, D as DeviceInfo } from './types-Zbv12l39.js';
+import { L as LingyaoRuntime, g as LingyaoAccount, c as DeviceToken, D as DeviceInfo } from './types-LFC6Wpqo.js';
 
 /**
  * Account storage and management

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
-import { L as LingyaoRuntime, H as HealthStatus } from './types-Zbv12l39.js';
-import { A as AccountManager } from './accounts-CzjBLXMH.js';
+import { L as LingyaoRuntime, H as HealthStatus } from './types-LFC6Wpqo.js';
+import { A as AccountManager } from './accounts-BykE02r0.js';
 
 /**
  * Probe status levels

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { R as ResolvedAccount, L as LingyaoProbeResult } from './status-DdIuhIHE.js';
+import { R as ResolvedAccount, L as LingyaoProbeResult } from './status-CVwSoPKi.js';
 import * as openclaw_plugin_sdk from 'openclaw/plugin-sdk';
 import { PluginRuntime, ChannelPlugin } from 'openclaw/plugin-sdk';
-import { L as LingyaoRuntime, S as SyncRequest, a as SyncResponse, b as LingyaoMessage, D as DeviceInfo, c as DeviceToken, d as LingyaoConfig, N as NotifyPayload, H as HealthStatus } from './types-Zbv12l39.js';
-export { A as AckRequest, e as DiarySyncPayload, F as FailedEntry, f as LINGYAO_SERVER_URL, g as LingyaoAccount, h as LingyaoAccountConfig, M as MemorySyncPayload, i as MessageType, j as NotifyAction, k as NotifyRequest, P as PairingCode, l as PairingConfirmRequest, m as PairingConfirmResponse, n as PollRequest, o as PollResponse, Q as QueuedMessage, T as TokenRefreshRequest, p as TokenRefreshResponse, W as WebSocketConnection } from './types-Zbv12l39.js';
-import { A as AccountManager } from './accounts-CzjBLXMH.js';
+import { L as LingyaoRuntime, S as SyncRequest, a as SyncResponse, b as LingyaoMessage, D as DeviceInfo, c as DeviceToken, d as LingyaoConfig, N as NotifyPayload, H as HealthStatus } from './types-LFC6Wpqo.js';
+export { A as AckRequest, e as DiarySyncPayload, F as FailedEntry, f as LINGYAO_SERVER_URL, g as LingyaoAccount, h as LingyaoAccountConfig, M as MemorySyncPayload, i as MessageType, j as NotifyAction, k as NotifyRequest, P as PairingCode, l as PairingConfirmRequest, m as PairingConfirmResponse, n as PollRequest, o as PollResponse, Q as QueuedMessage, T as TokenRefreshRequest, p as TokenRefreshResponse, W as WebSocketConnection, q as getLingyaoGatewayWsUrl } from './types-LFC6Wpqo.js';
+import { A as AccountManager } from './accounts-BykE02r0.js';
 
 /**
  * 灵爻服务器 HTTP 客户端
@@ -134,6 +134,11 @@ declare class ServerHttpClient {
      * 检查是否已注册
      */
     isReady(): boolean;
+    /**
+     * Clear local gateway token/session (storage + in-memory). Used when WS handshake
+     * fails with 404 or when forcing re-registration with the same gatewayId.
+     */
+    clearLocalSession(): Promise<void>;
     /**
      * 从存储恢复会话
      */
@@ -164,18 +169,17 @@ declare class ServerHttpClient {
  */
 type ConnectionState = "connecting" | "connected" | "disconnected" | "error";
 /**
- * WebSocket 消息类型
+ * WebSocket 消息类型（与 `lingyao/server/src/server.ts` 中 Gateway 协议一致）
  */
 declare enum WSMessageType {
-    REGISTER = "register",
-    HEARTBEAT = "heartbeat",
-    SEND_MESSAGE = "send_message",
-    ACK = "ack",
-    REGISTERED = "registered",
-    HEARTBEAT_ACK = "heartbeat_ack",
+    GATEWAY_REGISTER = "gateway_register",
+    GATEWAY_HEARTBEAT = "gateway_heartbeat",
+    GATEWAY_SEND_MESSAGE = "gateway_send_message",
+    GATEWAY_REGISTERED = "gateway_registered",
+    GATEWAY_HEARTBEAT_ACK = "gateway_heartbeat_ack",
     MESSAGE_DELIVERED = "message_delivered",
     MESSAGE_FAILED = "message_failed",
-    APP_MESSAGE = "app_message",// 来自 App 的消息
+    APP_MESSAGE = "app_message",
     DEVICE_ONLINE = "device_online",
     PAIRING_COMPLETED = "pairing_completed",
     ERROR = "error"
@@ -218,6 +222,9 @@ type WSClientEvent = {
 } | {
     type: "error";
     error: Error;
+} | {
+    type: "fatal_handshake";
+    reason: "http_404";
 } | {
     type: "message";
     message: WSMessage;
@@ -259,6 +266,8 @@ declare class LingyaoWSClient {
     private connectionId;
     private heartbeatTimer;
     private reconnectTimer;
+    /** When set, close handler will not schedule reconnect (e.g. HTTP 404 on upgrade). */
+    private suppressReconnect;
     private messageHandlers;
     private logger;
     constructor(runtime: LingyaoRuntime, config: WSClientConfig);
@@ -330,6 +339,10 @@ declare class LingyaoWSClient {
      * 处理消息发送成功
      */
     private handleMessageDelivered;
+    /**
+     * 设备上线（服务器可选推送）
+     */
+    private handleDeviceOnline;
     /**
      * 处理配对完成通知（来自 lingyao.live 服务器）
      */

package/dist/index.js

@@ -409,6 +409,9 @@ import { createHash as createHash2 } from "crypto";
 
 // src/types.ts
 var LINGYAO_SERVER_URL = "https://api.lingyao.live";
+function getLingyaoGatewayWsUrl() {
+  return LINGYAO_SERVER_URL.replace(/^https:/i, "wss:") + "/lyoc/gateway/ws";
+}
 var MessageType = /* @__PURE__ */ ((MessageType2) => {
   MessageType2["SYNC_DIARY"] = "sync_diary";
   MessageType2["SYNC_MEMORY"] = "sync_memory";
@@ -445,7 +448,8 @@ var ServerHttpClient = class {
     this.storagePrefix = storagePrefix;
     this.config = {
       baseURL: serverConfig.baseURL || "https://api.lingyao.live",
-      apiBase: serverConfig.apiBase || "/v1",
+      // Public API (api.lingyao.live) serves gateway HTTP under /lyoc; local relay also accepts /lyoc (see server getApiPathSuffix).
+      apiBase: serverConfig.apiBase || "/lyoc",
       timeout: serverConfig.timeout || 3e4,
       connectionTimeout: serverConfig.connectionTimeout || 5e3
     };
@@ -525,6 +529,10 @@ var ServerHttpClient = class {
           throw new Error("Gateway already registered");
         } else if (status === 400) {
           throw new Error(`Invalid request: ${data?.details || "Unknown error"}`);
+        } else if (status === 404) {
+          throw new Error(
+            "Lingyao gateway register returned 404. Check server URL and /lyoc/gateway/register; the gatewayId may be invalid or the API may not be deployed on this host."
+          );
         }
         throw new Error(`Registration failed: ${axiosError.message}`);
       }
@@ -659,6 +667,26 @@ var ServerHttpClient = class {
   isReady() {
     return this.isRegistered && !!this.gatewayToken;
   }
+  /**
+   * Clear local gateway token/session (storage + in-memory). Used when WS handshake
+   * fails with 404 or when forcing re-registration with the same gatewayId.
+   */
+  async clearLocalSession() {
+    this.stopHeartbeat();
+    this.gatewayToken = null;
+    this.webhookSecret = null;
+    this.tokenExpiresAt = 0;
+    this.isRegistered = false;
+    const keys = ["gatewayToken", "webhookSecret", "tokenExpiresAt", "serverConfig"];
+    for (const k of keys) {
+      try {
+        await this.runtime.storage.delete(this.storageKey(k));
+      } catch (e) {
+        this.runtime.logger.warn(`Failed to delete storage key ${k}`, e);
+      }
+    }
+    this.runtime.logger.info("Cleared local Lingyao gateway session");
+  }
   /**
    * 从存储恢复会话
    */
@@ -705,6 +733,23 @@ var ServerHttpClient = class {
 
 // src/websocket-client.ts
 import WebSocket from "ws";
+function isWebsocketUpgradeNotFoundError(message) {
+  return /Unexpected server response:\s*404/i.test(message) || /\b404\b/.test(message);
+}
+function normalizeIncomingGatewayMessageType(type) {
+  switch (type) {
+    case "registered":
+      return "gateway_registered" /* GATEWAY_REGISTERED */;
+    case "heartbeat_ack":
+      return "gateway_heartbeat_ack" /* GATEWAY_HEARTBEAT_ACK */;
+    case "gateway_registered":
+      return "gateway_registered" /* GATEWAY_REGISTERED */;
+    case "gateway_heartbeat_ack":
+      return "gateway_heartbeat_ack" /* GATEWAY_HEARTBEAT_ACK */;
+    default:
+      return type;
+  }
+}
 var LingyaoWSClient = class {
   config;
   ws = null;
@@ -712,16 +757,19 @@ var LingyaoWSClient = class {
   connectionId = null;
   heartbeatTimer = null;
   reconnectTimer = null;
+  /** When set, close handler will not schedule reconnect (e.g. HTTP 404 on upgrade). */
+  suppressReconnect = false;
   messageHandlers = /* @__PURE__ */ new Map();
   logger;
   constructor(runtime, config) {
     this.logger = runtime.logger;
     this.config = { ...config };
-    this.registerMessageHandler("registered" /* REGISTERED */, this.handleRegistered.bind(this));
-    this.registerMessageHandler("heartbeat_ack" /* HEARTBEAT_ACK */, this.handleHeartbeatAck.bind(this));
+    this.registerMessageHandler("gateway_registered" /* GATEWAY_REGISTERED */, this.handleRegistered.bind(this));
+    this.registerMessageHandler("gateway_heartbeat_ack" /* GATEWAY_HEARTBEAT_ACK */, this.handleHeartbeatAck.bind(this));
     this.registerMessageHandler("message_delivered" /* MESSAGE_DELIVERED */, this.handleMessageDelivered.bind(this));
     this.registerMessageHandler("message_failed" /* MESSAGE_FAILED */, this.handleMessageFailed.bind(this));
     this.registerMessageHandler("app_message" /* APP_MESSAGE */, this.handleAppMessage.bind(this));
+    this.registerMessageHandler("device_online" /* DEVICE_ONLINE */, this.handleDeviceOnline.bind(this));
     this.registerMessageHandler("pairing_completed" /* PAIRING_COMPLETED */, this.handlePairingCompleted.bind(this));
     this.registerMessageHandler("error" /* ERROR */, this.handleError.bind(this));
   }
@@ -734,6 +782,7 @@ var LingyaoWSClient = class {
       return;
     }
     this.state = "connecting";
+    this.suppressReconnect = false;
     this.emitEvent({ type: "disconnected", code: 0, reason: "Reconnecting" });
     try {
       this.logger.info(`Connecting to Lingyao server: ${this.config.url}`);
@@ -794,12 +843,14 @@ var LingyaoWSClient = class {
   async handleMessage(data) {
     try {
       const message = JSON.parse(data.toString());
-      this.logger.debug("Received message from server", { type: message.type });
-      const handler = this.messageHandlers.get(message.type);
+      const rawType = String(message.type);
+      const handlerKey = normalizeIncomingGatewayMessageType(rawType);
+      this.logger.debug("Received message from server", { type: rawType, handlerKey });
+      const handler = this.messageHandlers.get(handlerKey);
       if (handler) {
         handler(message);
       } else {
-        this.logger.warn("No handler for message type", { type: message.type });
+        this.logger.warn("No handler for message type", { type: rawType });
       }
       this.emitEvent({ type: "message", message });
     } catch (error) {
@@ -810,7 +861,16 @@ var LingyaoWSClient = class {
    * 处理连接错误
    */
   handleErrorEvent(error) {
-    this.logger.error("WebSocket error", error);
+    const msg = error?.message ?? String(error);
+    if (isWebsocketUpgradeNotFoundError(msg)) {
+      this.suppressReconnect = true;
+      this.logger.error(
+        "WebSocket handshake failed with HTTP 404 \u2014 stopping reconnect loop. If the gateway was removed server-side, remove `gatewayId` from channels.lingyao.accounts.* or use a new account id; if the path is wrong, verify wss://\u2026/lyoc/gateway/ws is deployed on api.lingyao.live.",
+        { gatewayId: this.config.gatewayId, message: msg }
+      );
+    } else {
+      this.logger.error("WebSocket error", error);
+    }
     this.state = "error";
     this.emitEvent({ type: "error", error });
   }
@@ -827,6 +887,11 @@ var LingyaoWSClient = class {
       this.logger.error("WebSocket closed with 1008 (Invalid Token). Stopping reconnect loop.");
       return;
     }
+    if (this.suppressReconnect) {
+      this.suppressReconnect = false;
+      this.emitEvent({ type: "fatal_handshake", reason: "http_404" });
+      return;
+    }
     if (code !== 1e3) {
       this.scheduleReconnect();
     }
@@ -836,7 +901,7 @@ var LingyaoWSClient = class {
    */
   sendRegister() {
     const message = {
-      type: "register" /* REGISTER */,
+      type: "gateway_register" /* GATEWAY_REGISTER */,
       id: this.generateMessageId(),
       timestamp: Date.now(),
       payload: {
@@ -865,7 +930,7 @@ var LingyaoWSClient = class {
    */
   sendHeartbeat() {
     const message = {
-      type: "heartbeat" /* HEARTBEAT */,
+      type: "gateway_heartbeat" /* GATEWAY_HEARTBEAT */,
       id: this.generateMessageId(),
       timestamp: Date.now(),
       payload: {
@@ -936,7 +1001,7 @@ var LingyaoWSClient = class {
    */
   sendNotification(deviceId, notification) {
     const message = {
-      type: "send_message" /* SEND_MESSAGE */,
+      type: "gateway_send_message" /* GATEWAY_SEND_MESSAGE */,
       id: this.generateMessageId(),
       timestamp: Date.now(),
       payload: {
@@ -975,6 +1040,14 @@ var LingyaoWSClient = class {
       messageId: message.id
     });
   }
+  /**
+   * 设备上线（服务器可选推送）
+   */
+  handleDeviceOnline(message) {
+    this.logger.debug("Device online (server push)", {
+      payload: message.payload
+    });
+  }
   /**
    * 处理配对完成通知（来自 lingyao.live 服务器）
    */
@@ -2683,7 +2756,7 @@ var MultiAccountOrchestrator = class {
       }
       await this.registerToServer(state);
       const wsClient = new LingyaoWSClient(this.runtime, {
-        url: `${LINGYAO_SERVER_URL}/v1/gateway/ws`,
+        url: getLingyaoGatewayWsUrl(),
         gatewayId,
         token: httpClient.getGatewayToken() ?? void 0,
         reconnectInterval: 5e3,
@@ -2905,6 +2978,11 @@ var MultiAccountOrchestrator = class {
           });
           state.errorHandler.handleError(event.error);
           break;
+        case "fatal_handshake":
+          if (event.reason === "http_404") {
+            void this.handleWsHandshake404(state);
+          }
+          break;
         case "pairing_completed":
           this.handlePairingCompleted(state, event);
           break;
@@ -2928,6 +3006,45 @@ var MultiAccountOrchestrator = class {
       this.runtime.logger.error(`[${state.accountId}] Failed to auto-bind device: ${deviceId}`, error);
     }
   }
+  /**
+   * After HTTP 404 on WebSocket upgrade: clear local tokens, re-register once, reconnect.
+   * Does not fix wrong server URL or permanently deleted gateway rows (user must fix config).
+   */
+  async handleWsHandshake404(state) {
+    if (state.wsHandshake404RecoveryAttempted) {
+      this.runtime.logger.error(
+        `[${state.accountId}] Lingyao WebSocket still failing after one recovery attempt. Check that wss://\u2026/lyoc/gateway/ws is deployed; if the gateway was removed, delete \`channels.lingyao.accounts.${state.accountId}.gatewayId\` or use a new account id, then restart.`
+      );
+      return;
+    }
+    state.wsHandshake404RecoveryAttempted = true;
+    const { httpClient, wsClient, accountId } = state;
+    if (!httpClient || !wsClient) {
+      return;
+    }
+    this.runtime.logger.info(`[${accountId}] WS HTTP 404 \u2014 clearing local session and re-registering...`);
+    try {
+      await httpClient.clearLocalSession();
+      const response = await httpClient.register({
+        websocket: true,
+        compression: false,
+        maxMessageSize: 1048576
+      });
+      wsClient.updateToken(response.gatewayToken);
+      await wsClient.connect();
+      this.runtime.logger.info(`[${accountId}] Re-register OK; WebSocket reconnect issued.`);
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : String(error);
+      if (msg.includes("already registered")) {
+        this.runtime.logger.error(
+          `[${accountId}] Re-register failed: gateway still registered on server but local session was cleared. Remove or change \`gatewayId\` under this account, or reset the gateway on lingyao.live, then restart OpenClaw.`,
+          error
+        );
+      } else {
+        this.runtime.logger.error(`[${accountId}] WS 404 recovery (clear + register) failed`, error);
+      }
+    }
+  }
   /**
    * Handle invalid token by re-registering the gateway and reconnecting WS
    */
@@ -3164,7 +3281,7 @@ var LingyaoChannel = class {
     try {
       await this.registerToServer();
       this.wsClient = new LingyaoWSClient(this.runtime, {
-        url: `${LINGYAO_SERVER_URL}/v1/gateway/ws`,
+        url: getLingyaoGatewayWsUrl(),
         gatewayId: this.gatewayId,
         token: this.serverClient?.getGatewayToken() ?? void 0,
         reconnectInterval: 5e3,
@@ -3313,6 +3430,11 @@ var LingyaoChannel = class {
           )
         );
         break;
+      case "fatal_handshake":
+        this.runtime.logger.error(
+          "Lingyao WebSocket upgrade failed (HTTP 404). Use the OpenClaw plugin path for automatic recovery, or clear gateway session / gatewayId in config."
+        );
+        break;
     }
   }
   /**
@@ -3702,7 +3824,7 @@ async function createPlugin(runtime, config = {}) {
 }
 var pluginMetadata = {
   name: "lingyao",
-  version: "0.9.1",
+  version: "0.9.7",
   description: "Lingyao Channel Plugin - bidirectional sync via lingyao.live server relay",
   type: "channel",
   capabilities: {
@@ -3738,6 +3860,7 @@ export {
   createPlugin,
   index_default as default,
   getDefaultConfig,
+  getLingyaoGatewayWsUrl,
   initializeLingyaoRuntime,
   lingyaoPlugin,
   pluginMetadata,