claw-subagent-service 0.0.9 → 0.0.11

package/cli.js

@@ -50,26 +50,14 @@ function installService() {
   const execPath = process.execPath;
 
   if (platform === 'win32') {
-    // Windows: 优先使用 node-windows，失败时回退 sc 命令（兼容 pkg 打包）
-    try {
-      if (process.pkg) throw new Error('pkg 环境');
-      const Service = require('node-windows').Service;
-      const svc = new Service({
-        name: SERVICE_NAME,
-        description: 'OpenClaw Guard CLI Client',
-        script: DAEMON_PATH,
-        workingdirectory: os.homedir(),
-        nodeOptions: ['--harmony', '--max_old_space_size=4096']
-      });
-      svc.on('install', () => { console.log('[CLI] 服务安装成功'); svc.start(); });
-      svc.on('error', (err) => { console.error(`[CLI] 服务安装失败: ${err.message}`); });
-      svc.install();
-    } catch (err) {
-      // 回退到 sc 命令（pkg 或无 node-windows 环境）
-      console.log('[CLI] 使用 sc 命令安装服务...');
-      const binPath = process.pkg
-        ? `"${execPath}" --run`
-        : `"${execPath}" "${DAEMON_PATH}"`;
+    // Windows: 使用 sc 命令直接创建服务，避免 node-windows 在包目录生成被锁定的 wrapper
+    console.log('[CLI] 使用 sc 命令安装服务...');
+    const binPath = process.pkg
+      ? `"${execPath}" --run`
+      : `"${execPath}" "${DAEMON_PATH}"`;
+
+    // 先停止并删除旧服务（避免文件锁）
+    exec(`net stop ${SERVICE_NAME} 2>nul & sc delete ${SERVICE_NAME} 2>nul`, () => {
       exec(`sc create ${SERVICE_NAME} binPath= "${binPath}" start= auto displayname= "OpenClaw Guard"`, (err2) => {
         if (err2) return console.error(`[CLI] 服务安装失败: ${err2.message}`);
         console.log('[CLI] 服务安装成功');
@@ -77,7 +65,7 @@ function installService() {
           if (err3) console.error(`[CLI] 启动服务失败: ${err3.message}`);
         });
       });
-    }
+    });
   } else if (platform === 'linux') {
     // Linux: systemd
     const execStart = `/usr/bin/node ${DAEMON_PATH}`;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "虾说静态服务",
   "main": "cli.js",
   "bin": {
     "claw-subagent-service": "cli.js"
   },
   "scripts": {
+    "preuninstall": "node scripts/pre-uninstall.js",
     "install-service": "node scripts/install-silent.js",
     "uninstall-service": "node scripts/uninstall.js",
     "dev": "nodemon cli.js --run",

package/scripts/install-silent.js

@@ -1,4 +1,3 @@
-const { Service } = require('node-windows');
 const path = require('path');
 const { exec } = require('child_process');
 const fs = require('fs');
@@ -45,48 +44,44 @@ if (platform === 'win32') {
     // 兜底超时
     setTimeout(() => finish(1, '安装操作超时'), 60000);
 
-    const svc = new Service({
-      name: SERVICE_NAME,
-      description: 'Node.js 静默后台服务（开机自启/崩溃自动恢复/自动更新）',
-      script: DAEMON_PATH,
-      wait: 2,
-      grow: 0.5,
-      abortOnError: false
-    });
-
-    svc.on('install', () => {
-      log('服务安装成功，正在启动...');
-      svc.start();
+    // 先停止并删除旧服务（避免文件锁导致更新失败）
+    exec(`net stop "${SERVICE_NAME}" 2>nul & sc delete "${SERVICE_NAME}" 2>nul`, () => {
+      const binPath = `"${process.execPath}" "${DAEMON_PATH}"`;
+
+      // 使用 sc create 创建服务，避免 node-windows 在包目录生成被锁定的 wrapper
+      const createCmd = `sc create "${SERVICE_NAME}" binPath= "${binPath}" start= auto displayname= "Node.js 静默后台服务"`;
+      exec(createCmd, (err) => {
+        if (err) {
+          log(`创建服务失败: ${err.message}`);
+          return finish(1, `创建服务失败: ${err.message}`);
+        }
+        log('服务注册成功');
+
+        // 设置恢复策略：崩溃后自动重启
+        const recoveryCmd = `sc failure "${SERVICE_NAME}" reset= 0 actions= restart/0/restart/0/restart/0`;
+        exec(recoveryCmd, (err) => {
+          if (err) log(`设置恢复策略失败: ${err.message}`);
+          else log('恢复策略已设置：服务崩溃后系统自动无限重启');
+        });
 
-      const cmd = `sc failure "${SERVICE_NAME}" reset= 0 actions= restart/0/restart/0/restart/0`;
-      exec(cmd, (err) => {
-        if (err) log(`设置恢复策略失败: ${err.message}`);
-        else log('恢复策略已设置：服务崩溃后系统自动无限重启');
-      });
+        // 设置自动启动
+        exec(`sc config "${SERVICE_NAME}" start= auto`, (err) => {
+          if (err) log(`设置自动启动失败: ${err.message}`);
+          else log('启动类型已设为：自动');
+        });
 
-      exec(`sc config "${SERVICE_NAME}" start= auto`, (err) => {
-        if (err) log(`设置自动启动失败: ${err.message}`);
-        else log('启动类型已设为：自动');
+        // 启动服务
+        exec(`net start "${SERVICE_NAME}"`, (err) => {
+          if (err) {
+            log(`启动服务失败: ${err.message}`);
+            finish(1, `启动服务失败: ${err.message}`);
+          } else {
+            log('服务已启动');
+            finish(0, '服务安装成功并已启动');
+          }
+        });
       });
     });
-
-    svc.on('alreadyinstalled', () => {
-      log('服务已存在，尝试启动...');
-      svc.start();
-    });
-
-    svc.on('start', () => {
-      log('服务已启动');
-      finish(0);
-    });
-
-    svc.on('error', (err) => {
-      log(`安装错误: ${err.message}`);
-      finish(1);
-    });
-
-    log('开始安装服务...');
-    svc.install();
   });
 } else if (platform === 'linux') {
   const serviceFile = `/etc/systemd/system/${SERVICE_NAME}.service`;

package/scripts/pre-uninstall.js

@@ -0,0 +1,25 @@
+/**
+ * npm preuninstall 钩子
+ * 在卸载旧版本前停止并删除 Windows 服务，释放文件锁
+ */
+const { execSync } = require('child_process');
+
+const SERVICES = ['SilentNodeService', 'claw-subagent-service'];
+
+if (process.platform === 'win32') {
+  for (const name of SERVICES) {
+    try {
+      execSync(`net stop "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+    } catch (e) {}
+    try {
+      execSync(`sc delete "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+    } catch (e) {}
+  }
+
+  // 等待系统释放文件句柄
+  try {
+    execSync('timeout /t 2 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
+  } catch (e) {}
+}
+
+process.exit(0);

package/service/modules/service-manager.js

@@ -155,38 +155,23 @@ class ServiceManager {
     }
   }
 
-  // Windows 服务安装
+  // Windows 服务安装（使用 sc 命令，避免 node-windows 在包目录生成被锁定的 wrapper）
   async installWindows() {
-    // 使用 node-windows 或手动创建服务
-    const nodeWindowsPath = path.join(__dirname, '..', '..', 'node_modules', 'node-windows');
-    
-    if (!fs.existsSync(nodeWindowsPath)) {
-      this.log?.warn('[ServiceManager] node-windows 未安装，尝试安装...');
-      await this.execCommand('npm install node-windows --save');
-    }
-    
-    const Service = require('node-windows').Service;
-    const svc = new Service({
-      name: this.serviceName,
-      description: this.serviceDesc,
-      script: this.scriptPath,
-      nodeOptions: ['--harmony', '--max_old_space_size=4096']
-    });
-    
-    return new Promise((resolve, reject) => {
-      svc.on('install', () => {
-        this.log?.info('[ServiceManager] Windows 服务安装成功');
-        svc.start();
-        resolve(true);
-      });
-      
-      svc.on('error', (err) => {
-        this.log?.error(`[ServiceManager] Windows 服务安装失败: ${err.message}`);
-        reject(err);
-      });
-      
-      svc.install();
-    });
+    const binPath = `"${process.execPath}" "${this.scriptPath}"`;
+
+    // 先停止并删除旧服务（避免文件锁导致更新失败）
+    try { await this.execCommand(`net stop "${this.serviceName}" 2>nul`); } catch (e) {}
+    try { await this.execCommand(`sc delete "${this.serviceName}" 2>nul`); } catch (e) {}
+
+    // 使用 sc create 创建服务
+    await this.execCommand(`sc create "${this.serviceName}" binPath= "${binPath}" start= auto displayname= "${this.serviceDesc}"`);
+    this.log?.info('[ServiceManager] Windows 服务注册成功');
+
+    // 启动服务
+    await this.execCommand(`net start "${this.serviceName}"`);
+    this.log?.info('[ServiceManager] Windows 服务已启动');
+
+    return true;
   }
 
   // Linux 服务安装 (systemd)

package/service/rongcloud/env-polyfill.js

@@ -78,6 +78,7 @@ defineWinProp('onLine', true);
 defineWinProp('language', 'zh-CN');
 defineGlobalProp('navigator', win.navigator);
 
+defineWinProp('WebSocket', WebSocket);
 defineGlobalProp('WebSocket', WebSocket);
 defineGlobalProp('XMLHttpRequest', win.XMLHttpRequest);
 defineGlobalProp('window', win);