openclaw-vchat-plugin 0.0.1 → 0.0.3

package/bin/openclaw-vchat.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const fs = require('fs');
 const path = require('path');
-const { spawnSync } = require('child_process');
+const { spawnSync, spawn } = require('child_process');
 
 const packageRoot = path.resolve(__dirname, '..');
 const distEntry = path.join(packageRoot, 'dist', 'index.js');
@@ -12,7 +12,8 @@ function printUsage() {
 
 Usage:
   openclaw-vchat start
-  openclaw-vchat install [--pm2]
+  openclaw-vchat install [--pm2] [--startup]
+  openclaw-vchat pair
   openclaw-vchat doctor
   openclaw-vchat version
 `);
@@ -23,6 +24,85 @@ function hasCommand(cmd) {
   return res.status === 0;
 }
 
+function pm2ProcessExists(name) {
+  const res = spawnSync('pm2', ['jlist'], {
+    encoding: 'utf8',
+    env: process.env,
+    cwd: packageRoot,
+  });
+  if (res.status !== 0) {
+    return false;
+  }
+  try {
+    const list = JSON.parse(res.stdout || '[]');
+    return Array.isArray(list) && list.some((item) => item && item.name === name);
+  } catch (_) {
+    return false;
+  }
+}
+
+function getOpenClawHome() {
+  const home = process.env.HOME || process.env.USERPROFILE || '';
+  return process.env.OPENCLAW_HOME || path.join(home, '.openclaw');
+}
+
+function getDeviceConfigPath() {
+  return path.join(getOpenClawHome(), 'wechat-device.json');
+}
+
+function hasDeviceConfig() {
+  return fs.existsSync(getDeviceConfigPath());
+}
+
+function sleep(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function waitForPairingViaPm2Logs(name, timeoutMs) {
+  return new Promise((resolve, reject) => {
+    const child = spawn('pm2', ['logs', name, '--lines', '80'], {
+      stdio: 'inherit',
+      env: process.env,
+      cwd: packageRoot,
+    });
+
+    let settled = false;
+    const finish = (err) => {
+      if (settled) return;
+      settled = true;
+      clearInterval(checkTimer);
+      clearTimeout(timeoutTimer);
+      if (!child.killed) {
+        try {
+          child.kill('SIGINT');
+        } catch (_) {}
+      }
+      if (err) reject(err);
+      else resolve();
+    };
+
+    const checkTimer = setInterval(() => {
+      if (hasDeviceConfig()) {
+        finish();
+      }
+    }, 1000);
+
+    const timeoutTimer = setTimeout(() => {
+      finish(new Error('等待二维码配对超时'));
+    }, timeoutMs);
+
+    child.on('error', (err) => finish(err));
+    child.on('exit', (code) => {
+      if (settled) return;
+      if (hasDeviceConfig()) {
+        finish();
+        return;
+      }
+      finish(new Error(`pm2 logs 退出，exit=${code || 0}`));
+    });
+  });
+}
+
 function runNodeEntry() {
   if (!fs.existsSync(distEntry)) {
     console.error('dist/index.js 不存在，请先执行 npm run build');
@@ -33,12 +113,17 @@ function runNodeEntry() {
 }
 
 function doctor() {
-  const home = process.env.HOME || process.env.USERPROFILE || '';
-  const openclawHome = process.env.OPENCLAW_HOME || path.join(home, '.openclaw');
-  const deviceConfig = path.join(openclawHome, 'wechat-device.json');
+  const openclawHome = getOpenClawHome();
+  const deviceConfig = getDeviceConfigPath();
   const issues = [];
 
   if (!hasCommand('openclaw')) issues.push('未找到 openclaw CLI');
+  else {
+    const versionRes = spawnSync('openclaw', ['--version'], { encoding: 'utf8', env: process.env });
+    if (versionRes.status === 0) {
+      console.log(`openclaw version: ${versionRes.stdout.trim()}`);
+    }
+  }
   if (!fs.existsSync(deviceConfig)) issues.push('未找到 ~/.openclaw/wechat-device.json，设备尚未配对');
   if (!process.env.WECHAT_BACKEND_URL) issues.push('未设置 WECHAT_BACKEND_URL，将使用内置默认值');
   if (!process.env.PLUGIN_SECRET) issues.push('未设置 PLUGIN_SECRET，内部通信将依赖空密钥');
@@ -59,9 +144,17 @@ function doctor() {
   console.log('\nDoctor OK');
 }
 
-function install() {
+function pair() {
+  console.log('启动前台配对模式...');
+  console.log('配对成功后会生成 ~/.openclaw/wechat-device.json');
+  runNodeEntry();
+}
+
+async function install() {
   const args = new Set(process.argv.slice(3));
   const usePm2 = args.has('--pm2');
+  const enableStartup = args.has('--startup');
+  const waitPair = args.has('--wait-pair') || !hasDeviceConfig();
 
   if (!fs.existsSync(distEntry)) {
     console.error('dist/index.js 不存在，请先执行 npm run build，或使用发布后的 npm 包。');
@@ -77,17 +170,59 @@ function install() {
       process.exit(1);
     }
     const name = 'openclaw-vchat';
-    const start = spawnSync('pm2', ['start', process.execPath, '--name', name, '--', distEntry], {
-      stdio: 'inherit',
-      env: process.env,
-      cwd: packageRoot,
-    });
+    let start;
+    if (pm2ProcessExists(name)) {
+      console.log(`检测到现有 pm2 进程 ${name}，改为重启并刷新配置`);
+      start = spawnSync('pm2', ['restart', name, '--update-env'], {
+        stdio: 'inherit',
+        env: process.env,
+        cwd: packageRoot,
+      });
+    } else {
+      start = spawnSync('pm2', ['start', process.execPath, '--name', name, '--', distEntry], {
+        stdio: 'inherit',
+        env: process.env,
+        cwd: packageRoot,
+      });
+    }
     if (start.status !== 0) {
       console.error('pm2 启动失败');
       process.exit(start.status || 1);
     }
     spawnSync('pm2', ['save'], { stdio: 'inherit', env: process.env, cwd: packageRoot });
+    if (enableStartup) {
+      const startup = spawnSync('pm2', ['startup'], {
+        stdio: 'inherit',
+        env: process.env,
+        cwd: packageRoot,
+      });
+      if (startup.status !== 0) {
+        console.error('\npm2 startup 执行失败，通常是需要按上面提示再手动执行一次 sudo 的 launchd 命令。');
+        console.error('安装不会中断，先继续二维码配对；开机自启可稍后补做。');
+      } else {
+        spawnSync('pm2', ['save'], { stdio: 'inherit', env: process.env, cwd: packageRoot });
+        console.log('\nStartup OK: 已尝试启用开机自启');
+      }
+    }
     console.log('\nInstall OK: pm2 进程已创建');
+    if (!enableStartup) {
+      console.log('如需开机自启: openclaw-vchat install --pm2 --startup');
+    }
+    if (waitPair) {
+      console.log('\n检测到当前设备尚未配对，自动进入二维码配对环节...');
+      console.log(`配对文件: ${getDeviceConfigPath()}`);
+      console.log(`将实时输出二维码日志，配对成功后自动结束。`);
+      sleep(1500);
+      try {
+        await waitForPairingViaPm2Logs(name, 15 * 60 * 1000);
+      } catch (error) {
+        console.error(`\n${error.message || '等待配对失败'}`);
+        console.error(`可手动查看日志: pm2 logs ${name}`);
+        process.exit(1);
+      }
+      console.log('\n配对完成：已检测到 wechat-device.json');
+      return;
+    }
     console.log(`查看日志: pm2 logs ${name}`);
     return;
   }
@@ -95,16 +230,28 @@ function install() {
   console.log('\nInstall OK');
   console.log('直接启动: openclaw-vchat start');
   console.log('若需守护进程: openclaw-vchat install --pm2');
+  console.log('若需守护进程 + 开机自启: openclaw-vchat install --pm2 --startup');
+  if (waitPair) {
+    console.log('当前设备尚未配对，建议直接执行: openclaw-vchat pair');
+  }
 }
 
-const cmd = process.argv[2] || 'start';
-if (cmd === 'start') runNodeEntry();
-else if (cmd === 'install') install();
-else if (cmd === 'doctor') doctor();
-else if (cmd === 'version' || cmd === '--version' || cmd === '-v') console.log(pkg.version);
-else if (cmd === 'help' || cmd === '--help' || cmd === '-h') printUsage();
-else {
-  console.error(`未知命令: ${cmd}`);
-  printUsage();
-  process.exit(1);
+async function main() {
+  const cmd = process.argv[2] || 'start';
+  if (cmd === 'start') runNodeEntry();
+  else if (cmd === 'install') await install();
+  else if (cmd === 'pair') pair();
+  else if (cmd === 'doctor') doctor();
+  else if (cmd === 'version' || cmd === '--version' || cmd === '-v') console.log(pkg.version);
+  else if (cmd === 'help' || cmd === '--help' || cmd === '-h') printUsage();
+  else {
+    console.error(`未知命令: ${cmd}`);
+    printUsage();
+    process.exit(1);
+  }
 }
+
+main().catch((error) => {
+  console.error(error.message || String(error));
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-vchat-plugin",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "OpenClaw plugin for VChat mini program - relay server and message channel",
   "main": "dist/index.js",
   "scripts": {