@lingyao037/openclaw-lingyao-cli 0.9.2 → 0.9.4

package/cli.mjs

@@ -80,6 +80,7 @@ class LingyaoInstaller {
     this.channelId = 'lingyao';
     this.gatewayId = null;
     this.gatewayToken = null;
+    this.openclawCommand = null;
   }
 
   setOpenClawPath(path) {
@@ -111,7 +112,7 @@ class LingyaoInstaller {
     try {
       const result = spawnSync(command, args, {
         stdio: 'inherit',
-        shell: true,
+        shell: false,
         ...options
       });
       return {
@@ -171,14 +172,39 @@ class LingyaoInstaller {
     return [];
   }
 
+  isNpxEphemeralOpenClawPath(commandPath) {
+    if (!commandPath || typeof commandPath !== 'string') return false;
+    const normalized = commandPath.replace(/\\/g, '/');
+    return normalized.includes('/.npm/_npx/') && normalized.includes('/node_modules/.bin/openclaw');
+  }
+
+  resolveOpenClawCommandPath() {
+    const commandPaths = this.getCommandPathCandidates();
+    if (commandPaths.length === 0) {
+      return null;
+    }
+
+    const nonEphemeral = commandPaths.filter((path) => !this.isNpxEphemeralOpenClawPath(path));
+    if (nonEphemeral.length > 0) {
+      return nonEphemeral[0];
+    }
+
+    return commandPaths[0];
+  }
+
   // 检查 OpenClaw 是否安装
   checkOpenClaw() {
     this.log('\n═══════════════════════════════════════════════════', CYAN);
     this.log('           灵爻 (Lingyao) Plugin 安装器', CYAN);
     this.log('═══════════════════════════════════════════════════\n', CYAN);
 
+    this.openclawCommand = this.resolveOpenClawCommandPath() || 'openclaw';
+    if (this.openclawCommand !== 'openclaw') {
+      this.info(`使用 openclaw 命令: ${this.openclawCommand}`);
+    }
+
     // 检查 OpenClaw 命令
-    const result = this.exec('openclaw', ['--version'], { stdio: 'pipe' });
+    const result = this.exec(this.openclawCommand, ['--version'], { stdio: 'pipe' });
 
     if (result.success) {
       this.success('OpenClaw 已安装');
@@ -391,7 +417,11 @@ class LingyaoInstaller {
   restartGateway() {
     this.log('\n正在重启 OpenClaw Gateway...\n');
 
-    const result = this.exec('openclaw', ['gateway', 'restart']);
+    const command = this.openclawCommand || this.resolveOpenClawCommandPath() || 'openclaw';
+    if (command !== 'openclaw') {
+      this.info(`重启时使用命令: ${command}`);
+    }
+    const result = this.exec(command, ['gateway', 'restart']);
 
     if (result.success) {
       this.success('Gateway 重启成功');
@@ -448,7 +478,52 @@ class LingyaoInstaller {
   }
 
   // HTTP helpers
+  hasProxyEnv() {
+    return Boolean(
+      process.env.HTTPS_PROXY ||
+      process.env.https_proxy ||
+      process.env.HTTP_PROXY ||
+      process.env.http_proxy ||
+      process.env.ALL_PROXY ||
+      process.env.all_proxy
+    );
+  }
+
+  curlJson(method, path, body = null) {
+    return new Promise((resolve, reject) => {
+      const url = `${LINGYAO_API}${path}`;
+      const args = ['-sS', '-X', method, url, '-H', 'Content-Type: application/json'];
+      if (this.gatewayToken) {
+        args.push('-H', `Authorization: Bearer ${this.gatewayToken}`);
+      }
+      if (body !== null) {
+        args.push('-d', JSON.stringify(body));
+      }
+
+      const child = spawn('curl', args, { stdio: ['ignore', 'pipe', 'pipe'], shell: false });
+      let stdout = '';
+      let stderr = '';
+      child.stdout.on('data', (chunk) => { stdout += chunk.toString(); });
+      child.stderr.on('data', (chunk) => { stderr += chunk.toString(); });
+      child.on('error', (error) => reject(error));
+      child.on('close', (code) => {
+        if (code !== 0) {
+          reject(new Error(stderr.trim() || `curl exited with code ${code}`));
+          return;
+        }
+        try {
+          resolve(JSON.parse(stdout));
+        } catch {
+          reject(new Error(`Invalid JSON: ${stdout}`));
+        }
+      });
+    });
+  }
+
   httpsPost(path, body) {
+    if (this.hasProxyEnv()) {
+      return this.curlJson('POST', path, body);
+    }
     return new Promise((resolve, reject) => {
       const data = JSON.stringify(body);
       const url = `${LINGYAO_API}${path}`;
@@ -456,7 +531,7 @@ class LingyaoInstaller {
       if (this.gatewayToken) {
         headers['Authorization'] = `Bearer ${this.gatewayToken}`;
       }
-      const req = https.request(url, { method: 'POST', headers }, (res) => {
+      const req = https.request(url, { method: 'POST', headers, timeout: 10000 }, (res) => {
         let chunk = '';
         res.on('data', (c) => chunk += c);
         res.on('end', () => {
@@ -464,6 +539,9 @@ class LingyaoInstaller {
           catch { reject(new Error(`Invalid JSON: ${chunk}`)); }
         });
       });
+      req.on('timeout', () => {
+        req.destroy(new Error('Request timeout while connecting to lingyao.live'));
+      });
       req.on('error', reject);
       req.write(data);
       req.end();
@@ -471,16 +549,23 @@ class LingyaoInstaller {
   }
 
   httpsGet(path) {
+    if (this.hasProxyEnv()) {
+      return this.curlJson('GET', path, null);
+    }
     return new Promise((resolve, reject) => {
       const url = `${LINGYAO_API}${path}`;
-      https.get(url, (res) => {
+      const req = https.get(url, { timeout: 10000 }, (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);
+      });
+      req.on('timeout', () => {
+        req.destroy(new Error('Request timeout while connecting to lingyao.live'));
+      });
+      req.on('error', reject);
     });
   }
 
@@ -585,6 +670,10 @@ class LingyaoInstaller {
 
     } catch (error) {
       this.error(`配对失败: ${error.message}`);
+      this.warn('网络诊断建议:');
+      this.log('  1) curl -I https://api.lingyao.live/lyoc/health');
+      this.log('  2) nslookup api.lingyao.live');
+      this.log('  3) 如在公司网络/代理环境，请检查 TLS 拦截或防火墙策略');
       return false;
     }
   }
@@ -720,7 +809,8 @@ class LingyaoInstaller {
 
       // 重启网关
       this.log('\n重启 OpenClaw Gateway...');
-      this.exec('openclaw', ['gateway', 'restart']);
+      const command = this.openclawCommand || this.resolveOpenClawCommandPath() || 'openclaw';
+      this.exec(command, ['gateway', 'restart']);
 
       this.success('\n✓ 卸载完成！\n');
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingyao037/openclaw-lingyao-cli",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Lingyao Channel Plugin for OpenClaw - bidirectional sync via lingyao.live server relay",
   "type": "module",
   "main": "./dist/index.js",