@lingyao037/openclaw-lingyao-cli 0.4.1 → 0.5.0

package/cli.mjs

@@ -15,10 +15,14 @@ import { spawnSync, spawn, execSync } from 'child_process';
 import { existsSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, readdirSync, statSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
+import https from 'https';
+import QRCode from 'qrcode';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+const LINGYAO_API = 'https://api.lingyao.live/lyoc';
+
 // 颜色
 const GREEN = '\x1b[32m';
 const YELLOW = '\x1b[33m';
@@ -33,6 +37,8 @@ class LingyaoInstaller {
     this.skipDeps = skipDeps;
     this.pluginName = '@lingyao/openclaw-lingyao-cli';
     this.channelId = 'lingyao';
+    this.gatewayId = null;
+    this.gatewayToken = null;
   }
 
   setOpenClawPath(path) {
@@ -317,11 +323,15 @@ class LingyaoInstaller {
     }
 
     // 启用 lingyao 插件（serverUrl 已内置，用户不可配置）
+    const gatewayId = this.gatewayId || this.generateGatewayId();
+    this.gatewayId = gatewayId;
+
     config.plugins.entries.lingyao = {
       enabled: true,
       config: {
         maxOfflineMessages: 100,
-        tokenExpiryDays: 30
+        tokenExpiryDays: 30,
+        gatewayId,
       }
     };
 
@@ -382,7 +392,7 @@ class LingyaoInstaller {
     this.warn('注意事项:');
     this.log('  • 确保 OpenClaw Gateway 正在运行');
     this.log('  • 需要可访问的 lingyao.live 中转服务');
-    this.log('  • 配对与设备接入通过灵爻 App 和中转服务完成');
+    this.log('  • 如需重新配对，请再次运行安装命令');
     this.log('');
 
     this.info('架构说明:');
@@ -396,6 +406,175 @@ class LingyaoInstaller {
     this.log('');
   }
 
+  // HTTP helpers
+  httpsPost(path, body) {
+    return new Promise((resolve, reject) => {
+      const data = JSON.stringify(body);
+      const url = new URL(path, LINGYAO_API);
+      const headers = { 'Content-Type': 'application/json' };
+      if (this.gatewayToken) {
+        headers['Authorization'] = `Bearer ${this.gatewayToken}`;
+      }
+      const req = https.request(url, { method: 'POST', headers }, (res) => {
+        let chunk = '';
+        res.on('data', (c) => chunk += c);
+        res.on('end', () => {
+          try { resolve(JSON.parse(chunk)); }
+          catch { reject(new Error(`Invalid JSON: ${chunk}`)); }
+        });
+      });
+      req.on('error', reject);
+      req.write(data);
+      req.end();
+    });
+  }
+
+  httpsGet(path) {
+    return new Promise((resolve, reject) => {
+      const url = new URL(path, LINGYAO_API);
+      https.get(url, (res) => {
+        let chunk = '';
+        res.on('data', (c) => chunk += c);
+        res.on('end', () => {
+          try { resolve(JSON.parse(chunk)); }
+          catch { reject(new Error(`Invalid JSON: ${chunk}`)); }
+        });
+      }).on('error', reject);
+    });
+  }
+
+  // Generate a stable gateway ID
+  generateGatewayId() {
+    const os = require('os');
+    const host = os.hostname().split('.')[0].replace(/[^a-z0-9]/gi, '').toLowerCase();
+    const suffix = Math.random().toString(36).substring(2, 8);
+    return `gw_openclaw_${host}_default_${suffix}`;
+  }
+
+  // Pair device flow: register gateway, init pairing, show QR, poll status
+  async pairDevice() {
+    this.log('\n═══════════════════════════════════════════════════', CYAN);
+    this.log('                   设备配对', CYAN);
+    this.log('═══════════════════════════════════════════════════\n', CYAN);
+
+    try {
+      // 1. Register gateway
+      this.info('正在注册到 lingyao.live...');
+      const regResult = await this.httpsPost('/gateway/register', {
+        gatewayId: this.gatewayId,
+        version: '0.4.1',
+        capabilities: { websocket: true },
+      });
+
+      if (!regResult.gatewayToken) {
+        this.error('Gateway 注册失败');
+        return false;
+      }
+
+      this.gatewayToken = regResult.gatewayToken;
+      this.success('Gateway 注册成功');
+
+      // 2. Init pairing
+      this.info('正在生成配对码...');
+      const pairResult = await this.httpsPost('/pairing/init', {});
+
+      if (!pairResult.session) {
+        this.error('配对码生成失败');
+        return false;
+      }
+
+      // 3. Display QR code and pairing code
+      this.log('');
+      this.log('╔═══════════════════════════════════════════════════════════╗', CYAN);
+      this.log('║  请使用灵爻 App 扫描下方二维码                          ║', CYAN);
+      this.log('╚═══════════════════════════════════════════════════════════╝', CYAN);
+      this.log('');
+
+      try {
+        const qr = await QRCode.toString(pairResult.qrData, {
+          type: 'terminal',
+          small: true,
+        });
+        this.log(qr);
+      } catch {
+        this.info(`配对链接: ${pairResult.qrData}`);
+      }
+
+      this.log('');
+      this.log(`  接入码:  ${YELLOW}${pairResult.code}${NC}`, NC);
+      this.log('');
+      this.info('等待灵爻 App 扫码确认... (Ctrl+C 跳过)');
+      this.log('');
+
+      // 4. Poll pairing status
+      const pollInterval = 3000;
+      const maxAttempts = 600; // 30 minutes max
+      for (let i = 0; i < maxAttempts; i++) {
+        await new Promise(r => setTimeout(r, pollInterval));
+
+        try {
+          const status = await this.httpsGet(`/pairing/status/${pairResult.session}`);
+
+          if (status.status === 'completed') {
+            this.log('');
+            this.success('配对成功！');
+            this.log('');
+            this.log(`  设备 ID: ${status.deviceInfo?.name ?? 'unknown'}`);
+            this.log(`  平台:    ${status.deviceInfo?.platform ?? 'unknown'}`);
+            this.log(`  版本:    ${status.deviceInfo?.version ?? 'unknown'}`);
+            this.log('');
+
+            // Save device info to OpenClaw config
+            this.saveDeviceInfo(status.deviceInfo);
+            return true;
+          }
+
+          if (status.status === 'expired') {
+            this.error('配对码已过期');
+            return false;
+          }
+
+          // Still pending - show spinner dot
+          process.stdout.write('.');
+        } catch {
+          // Network error during polling, just retry
+        }
+      }
+
+      this.warn('\n配对等待超时，可稍后通过灵爻 App 重新配对');
+      return false;
+
+    } catch (error) {
+      this.error(`配对失败: ${error.message}`);
+      return false;
+    }
+  }
+
+  // Save paired device info to OpenClaw config
+  saveDeviceInfo(deviceInfo) {
+    if (!this.openclawPath) return;
+
+    const configFiles = [
+      join(this.openclawPath, 'openclaw.json'),
+      join(this.openclawPath, 'config.json'),
+    ];
+
+    for (const file of configFiles) {
+      if (!existsSync(file)) continue;
+      try {
+        const config = JSON.parse(readFileSync(file, 'utf-8'));
+        if (config.plugins?.entries?.lingyao?.config) {
+          config.plugins.entries.lingyao.config.pairedDevice = deviceInfo;
+          writeFileSync(file, JSON.stringify(config, null, 2), 'utf-8');
+          this.success('设备信息已保存到配置');
+        }
+      } catch {
+        // Ignore config write errors
+      }
+      break; // Only write to first found config file
+    }
+  }
+
   // 主安装流程
   async install() {
     try {
@@ -409,7 +588,7 @@ class LingyaoInstaller {
         return false;
       }
 
-      // 步骤 3: 配置插件
+      // 步骤 3: 配置插件（含 gatewayId 生成）
       if (!this.configurePlugin()) {
         return false;
       }
@@ -417,7 +596,10 @@ class LingyaoInstaller {
       // 步骤 4: 重启网关
       const restarted = this.restartGateway();
 
-      // 步骤 5: 显示说明
+      // 步骤 5: 设备配对
+      await this.pairDevice();
+
+      // 步骤 6: 显示说明
       this.showInstructions();
 
       if (!restarted) {

package/dist/{accounts-DeDlxyS9.d.ts → accounts-BNuShH7y.d.ts}

@@ -179,6 +179,7 @@ interface LingyaoAccountConfig {
     allowFrom?: string[];
     maxOfflineMessages?: number;
     tokenExpiryDays?: number;
+    gatewayId?: string;
 }
 /**
  * Channel configuration

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { L as LingyaoRuntime, H as HealthStatus, A as AccountManager } from './accounts-DeDlxyS9.js';
+import { L as LingyaoRuntime, H as HealthStatus, A as AccountManager } from './accounts-BNuShH7y.js';
 
 /**
  * Probe status levels

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as openclaw_plugin_sdk_core from 'openclaw/plugin-sdk/core';
 import * as openclaw_plugin_sdk from 'openclaw/plugin-sdk';
-import { L as LingyaoRuntime, D as DeviceInfo, a as DeviceToken, A as AccountManager, S as SyncRequest, b as SyncResponse, c as LingyaoMessage, d as LingyaoConfig, N as NotifyPayload, H as HealthStatus } from './accounts-DeDlxyS9.js';
-export { e as AckRequest, f as DiarySyncPayload, F as FailedEntry, g as LINGYAO_SERVER_URL, h as LingyaoAccount, i as LingyaoAccountConfig, M as MemorySyncPayload, j as MessageType, k as NotifyAction, l as NotifyRequest, P as PairingCode, m as PairingConfirmRequest, n as PairingConfirmResponse, o as PollRequest, p as PollResponse, Q as QueuedMessage, T as TokenRefreshRequest, q as TokenRefreshResponse, W as WebSocketConnection } from './accounts-DeDlxyS9.js';
+import { L as LingyaoRuntime, D as DeviceInfo, a as DeviceToken, A as AccountManager, S as SyncRequest, b as SyncResponse, c as LingyaoMessage, d as LingyaoConfig, N as NotifyPayload, H as HealthStatus } from './accounts-BNuShH7y.js';
+export { e as AckRequest, f as DiarySyncPayload, F as FailedEntry, g as LINGYAO_SERVER_URL, h as LingyaoAccount, i as LingyaoAccountConfig, M as MemorySyncPayload, j as MessageType, k as NotifyAction, l as NotifyRequest, P as PairingCode, m as PairingConfirmRequest, n as PairingConfirmResponse, o as PollRequest, p as PollResponse, Q as QueuedMessage, T as TokenRefreshRequest, q as TokenRefreshResponse, W as WebSocketConnection } from './accounts-BNuShH7y.js';
 
 /**
  * 错误处理模块
@@ -431,6 +431,7 @@ declare enum WSMessageType {
     MESSAGE_FAILED = "message_failed",
     APP_MESSAGE = "app_message",// 来自 App 的消息
     DEVICE_ONLINE = "device_online",
+    PAIRING_COMPLETED = "pairing_completed",
     ERROR = "error"
 }
 /**
@@ -478,6 +479,15 @@ type WSClientEvent = {
     type: "appMessage";
     deviceId: string;
     message: AppMessage["payload"]["message"];
+} | {
+    type: "pairing_completed";
+    deviceId: string;
+    deviceInfo: {
+        name: string;
+        platform: string;
+        version: string;
+    };
+    sessionId: string;
 };
 /**
  * WebSocket 客户端配置
@@ -574,6 +584,10 @@ declare class LingyaoWSClient {
      * 处理消息发送成功
      */
     private handleMessageDelivered;
+    /**
+     * 处理配对完成通知（来自 lingyao.live 服务器）
+     */
+    private handlePairingCompleted;
     /**
      * 处理消息发送失败
      */

package/dist/index.js

@@ -97,6 +97,7 @@ function createConfigAdapter() {
         enabled: accountConfig?.enabled !== false,
         dmPolicy: accountConfig?.dmPolicy ?? "paired",
         allowFrom: accountConfig?.allowFrom ?? [],
+        gatewayId: accountConfig?.gatewayId,
         rawConfig: accountConfig
       };
     },
@@ -660,6 +661,7 @@ var LingyaoWSClient = class {
     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("pairing_completed" /* PAIRING_COMPLETED */, this.handlePairingCompleted.bind(this));
     this.registerMessageHandler("error" /* ERROR */, this.handleError.bind(this));
   }
   /**
@@ -908,6 +910,24 @@ var LingyaoWSClient = class {
       messageId: message.id
     });
   }
+  /**
+   * 处理配对完成通知（来自 lingyao.live 服务器）
+   */
+  handlePairingCompleted(message) {
+    const payload = message.payload;
+    this.logger.info("Pairing completed", {
+      deviceId: payload?.deviceId,
+      sessionId: payload?.sessionId
+    });
+    if (this.config.eventHandler) {
+      this.config.eventHandler({
+        type: "pairing_completed",
+        deviceId: payload?.deviceId,
+        deviceInfo: payload?.deviceInfo,
+        sessionId: payload?.sessionId
+      });
+    }
+  }
   /**
    * 处理消息发送失败
    */
@@ -2505,7 +2525,7 @@ var MultiAccountOrchestrator = class {
       return;
     }
     this.runtime.logger.info(`Starting account "${accountId}"`);
-    const gatewayId = generateGatewayId(accountId);
+    const gatewayId = account.gatewayId ?? generateGatewayId(accountId);
     const storagePrefix = `lingyao:${accountId}`;
     const accountManager = new AccountManager(this.runtime);
     const messageProcessor = new MessageProcessor(this.runtime, accountManager);
@@ -2756,9 +2776,29 @@ var MultiAccountOrchestrator = class {
           });
           state.errorHandler.handleError(event.error);
           break;
+        case "pairing_completed":
+          this.handlePairingCompleted(state, event);
+          break;
       }
     };
   }
+  /**
+   * Handle pairing completed event from WS — auto-bind device.
+   */
+  async handlePairingCompleted(state, event) {
+    const { deviceId, deviceInfo } = event;
+    this.runtime.logger.info(`[${state.accountId}] Pairing completed, auto-binding device`, { deviceId, deviceInfo });
+    try {
+      await state.accountManager.addDevice(deviceId, {
+        name: deviceInfo?.name ?? deviceId,
+        platform: deviceInfo?.platform ?? "harmonyos",
+        version: deviceInfo?.version ?? ""
+      });
+      this.runtime.logger.info(`[${state.accountId}] Device auto-bound: ${deviceId}`);
+    } catch (error) {
+      this.runtime.logger.error(`[${state.accountId}] Failed to auto-bind device: ${deviceId}`, error);
+    }
+  }
 };
 
 // src/channel.ts