@lingyao037/openclaw-lingyao-cli 0.9.6 → 0.9.8

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

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

package/dist/cli.d.ts

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

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { R as ResolvedAccount, L as LingyaoProbeResult } from './status-CVwSoPKi.js';
+import { R as ResolvedAccount, L as LingyaoProbeResult } from './status-BaZOYVZY.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-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';
+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-D3SmE-b0.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-D3SmE-b0.js';
+import { A as AccountManager } from './accounts-t-QtF58y.js';
 
 /**
  * 灵爻服务器 HTTP 客户端
@@ -126,6 +126,10 @@ declare class ServerHttpClient {
      * 获取 Gateway Token
      */
     getGatewayToken(): string | null;
+    /**
+     * HTTP 注册/恢复后由 `serverConfig.heartbeatInterval` 写入（毫秒），用于与 WebSocket `gateway_heartbeat` 对齐。
+     */
+    getHeartbeatIntervalMs(): number;
     /**
      * 检查 Token 是否即将过期
      */
@@ -169,18 +173,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"
@@ -340,6 +343,10 @@ declare class LingyaoWSClient {
      * 处理消息发送成功
      */
     private handleMessageDelivered;
+    /**
+     * 设备上线（服务器可选推送）
+     */
+    private handleDeviceOnline;
     /**
      * 处理配对完成通知（来自 lingyao.live 服务器）
      */

package/dist/index.js

@@ -91,7 +91,8 @@ function extractAccounts(cfg) {
     allowFrom: Array.isArray(lingyao.allowFrom) ? lingyao.allowFrom : [],
     maxOfflineMessages: lingyao.maxOfflineMessages,
     tokenExpiryDays: lingyao.tokenExpiryDays,
-    gatewayId: lingyao.gatewayId
+    gatewayId: lingyao.gatewayId,
+    websocketHeartbeatIntervalMs: lingyao.websocketHeartbeatIntervalMs
   };
   if (!accounts || Object.keys(accounts).length === 0) {
     return { default: baseConfig };
@@ -424,6 +425,25 @@ var MessageType = /* @__PURE__ */ ((MessageType2) => {
   return MessageType2;
 })(MessageType || {});
 
+// src/ws-heartbeat-interval.ts
+var MIN_MS = 5e3;
+var MAX_MS = 55e3;
+var FALLBACK_MS = 3e4;
+function resolveLingyaoWsHeartbeatIntervalMs(account, httpClient) {
+  const fromServer = httpClient.getHeartbeatIntervalMs();
+  const fromCfg = account.rawConfig?.websocketHeartbeatIntervalMs;
+  let ms = typeof fromCfg === "number" && Number.isFinite(fromCfg) && fromCfg > 0 ? fromCfg : fromServer;
+  if (!Number.isFinite(ms) || ms <= 0) {
+    ms = FALLBACK_MS;
+  }
+  return Math.max(MIN_MS, Math.min(ms, MAX_MS));
+}
+function resolveLingyaoWsHeartbeatIntervalMsFromHttp(httpClient) {
+  const ms = httpClient.getHeartbeatIntervalMs();
+  const base = Number.isFinite(ms) && ms > 0 ? ms : FALLBACK_MS;
+  return Math.max(MIN_MS, Math.min(base, MAX_MS));
+}
+
 // src/server-client.ts
 import axios from "axios";
 function isAxiosError(error) {
@@ -655,6 +675,12 @@ var ServerHttpClient = class {
   getGatewayToken() {
     return this.gatewayToken;
   }
+  /**
+   * HTTP 注册/恢复后由 `serverConfig.heartbeatInterval` 写入（毫秒），用于与 WebSocket `gateway_heartbeat` 对齐。
+   */
+  getHeartbeatIntervalMs() {
+    return this.heartbeatInterval > 0 ? this.heartbeatInterval : 3e4;
+  }
   /**
    * 检查 Token 是否即将过期
    */
@@ -736,6 +762,20 @@ 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;
@@ -750,11 +790,12 @@ var LingyaoWSClient = class {
   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));
   }
@@ -828,12 +869,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) {
@@ -884,7 +927,7 @@ var LingyaoWSClient = class {
    */
   sendRegister() {
     const message = {
-      type: "register" /* REGISTER */,
+      type: "gateway_register" /* GATEWAY_REGISTER */,
       id: this.generateMessageId(),
       timestamp: Date.now(),
       payload: {
@@ -913,7 +956,7 @@ var LingyaoWSClient = class {
    */
   sendHeartbeat() {
     const message = {
-      type: "heartbeat" /* HEARTBEAT */,
+      type: "gateway_heartbeat" /* GATEWAY_HEARTBEAT */,
       id: this.generateMessageId(),
       timestamp: Date.now(),
       payload: {
@@ -984,7 +1027,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: {
@@ -1023,6 +1066,14 @@ var LingyaoWSClient = class {
       messageId: message.id
     });
   }
+  /**
+   * 设备上线（服务器可选推送）
+   */
+  handleDeviceOnline(message) {
+    this.logger.debug("Device online (server push)", {
+      payload: message.payload
+    });
+  }
   /**
    * 处理配对完成通知（来自 lingyao.live 服务器）
    */
@@ -2730,12 +2781,14 @@ var MultiAccountOrchestrator = class {
         messageProcessor.setMessageHandler(this.messageHandler);
       }
       await this.registerToServer(state);
+      const wsHeartbeatMs = resolveLingyaoWsHeartbeatIntervalMs(account, httpClient);
+      this.runtime.logger.info(`Lingyao WebSocket heartbeat interval: ${wsHeartbeatMs}ms (relay serverConfig / config)`);
       const wsClient = new LingyaoWSClient(this.runtime, {
         url: getLingyaoGatewayWsUrl(),
         gatewayId,
         token: httpClient.getGatewayToken() ?? void 0,
         reconnectInterval: 5e3,
-        heartbeatInterval: 3e4,
+        heartbeatInterval: wsHeartbeatMs,
         messageHandler: this.createMessageHandler(state),
         eventHandler: this.createEventHandler(state)
       });
@@ -3224,8 +3277,7 @@ var LingyaoChannel = class {
     this.monitor = new Monitor(runtime);
     this.errorHandler = new ErrorHandler(runtime);
     this.serverClient = new ServerHttpClient(runtime, this.gatewayId, {
-      baseURL: LINGYAO_SERVER_URL,
-      apiBase: "/v1"
+      baseURL: LINGYAO_SERVER_URL
     });
   }
   /**
@@ -3255,12 +3307,13 @@ var LingyaoChannel = class {
     this.runtime.logger.info("Starting Lingyao Channel...");
     try {
       await this.registerToServer();
+      const wsHeartbeatMs = this.serverClient ? resolveLingyaoWsHeartbeatIntervalMsFromHttp(this.serverClient) : 3e4;
       this.wsClient = new LingyaoWSClient(this.runtime, {
         url: getLingyaoGatewayWsUrl(),
         gatewayId: this.gatewayId,
         token: this.serverClient?.getGatewayToken() ?? void 0,
         reconnectInterval: 5e3,
-        heartbeatInterval: 3e4,
+        heartbeatInterval: wsHeartbeatMs,
         messageHandler: this.handleAppMessage.bind(this),
         eventHandler: this.handleClientEvent.bind(this)
       });
@@ -3607,7 +3660,8 @@ var lingyaoAccountConfigSchema = z.object({
   allowFrom: allowFromSchema,
   maxOfflineMessages: z.number().int().min(1).max(1e3).optional(),
   tokenExpiryDays: z.number().int().min(1).max(365).optional(),
-  gatewayId: z.string().min(1).optional()
+  gatewayId: z.string().min(1).optional(),
+  websocketHeartbeatIntervalMs: z.number().int().min(5e3).max(12e4).optional()
 });
 var lingyaoConfigSchema = z.object({
   enabled: z.boolean().default(true),
@@ -3615,6 +3669,7 @@ var lingyaoConfigSchema = z.object({
   allowFrom: allowFromSchema.default([]),
   maxOfflineMessages: z.number().int().min(1).max(1e3).optional().default(100),
   tokenExpiryDays: z.number().int().min(1).max(365).optional().default(30),
+  websocketHeartbeatIntervalMs: z.number().int().min(5e3).max(12e4).optional(),
   defaultAccount: z.string().min(1).optional(),
   accounts: z.record(lingyaoAccountConfigSchema).optional()
 });
@@ -3652,6 +3707,12 @@ var lingyaoChannelConfigSchema = {
       defaultAccount: {
         type: "string"
       },
+      websocketHeartbeatIntervalMs: {
+        type: "integer",
+        minimum: 5e3,
+        maximum: 12e4,
+        description: "WebSocket gateway_heartbeat interval in ms (default: server register response). Use 5000\u201355000 for typical relay timeout."
+      },
       accounts: {
         type: "object",
         additionalProperties: {
@@ -3681,6 +3742,11 @@ var lingyaoChannelConfigSchema = {
             },
             gatewayId: {
               type: "string"
+            },
+            websocketHeartbeatIntervalMs: {
+              type: "integer",
+              minimum: 5e3,
+              maximum: 12e4
             }
           }
         },
@@ -3799,7 +3865,7 @@ async function createPlugin(runtime, config = {}) {
 }
 var pluginMetadata = {
   name: "lingyao",
-  version: "0.9.6",
+  version: "0.9.8",
   description: "Lingyao Channel Plugin - bidirectional sync via lingyao.live server relay",
   type: "channel",
   capabilities: {