claw-subagent-service 0.0.19 → 0.0.20

package/cli.js

@@ -47,11 +47,24 @@ function installService() {
   console.log('[CLI] 安装系统服务...');
 
   const platform = process.platform;
-  const execPath = process.execPath;
 
   if (platform === 'win32') {
     // Windows: 使用 node-windows 注册服务（正确处理路径引号）
     console.log('[CLI] 使用 node-windows 安装服务...');
+
+    // 强制删除可能存在的旧服务（确保配置更新，包括环境变量）
+    try {
+      console.log('[CLI] 清理旧服务...');
+      execSync(`net stop "${SERVICE_NAME}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+    } catch (e) {}
+    try {
+      execSync(`sc.exe delete "${SERVICE_NAME}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+      console.log('[CLI] 旧服务已删除');
+    } catch (e) {}
+    try {
+      execSync('timeout /t 2 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
+    } catch (e) {}
+
     try {
       const userHome = process.env.USERPROFILE || os.homedir();
       const Service = require('node-windows').Service;
@@ -62,10 +75,11 @@ function installService() {
         nodeOptions: ['--harmony', '--max_old_space_size=4096'],
         env: {
           USERPROFILE: userHome,
-          HOME: userHome
+          HOME: userHome,
+          CLAW_SERVICE_HOME: userHome
         }
       });
-      console.log(`[CLI] 服务环境变量 USERPROFILE=${userHome}`);
+      console.log(`[CLI] 服务环境变量 USERPROFILE=${userHome}, CLAW_SERVICE_HOME=${userHome}`);
 
       svc.on('install', () => {
         console.log('[CLI] 服务安装成功');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "虾说静态服务",
   "main": "cli.js",
   "bin": {

package/scripts/install-silent.js

@@ -58,7 +58,8 @@ if (platform === 'win32') {
         abortOnError: false,
         env: {
           USERPROFILE: userHome,
-          HOME: userHome
+          HOME: userHome,
+          CLAW_SERVICE_HOME: userHome
         }
       });
 

package/scripts/post-install.js

@@ -51,6 +51,19 @@ function installAndStartService() {
 
   console.log('[postinstall] 正在注册系统服务...');
 
+  // 强制删除可能存在的旧服务（确保配置更新，包括环境变量）
+  try {
+    console.log('[postinstall] 清理旧服务...');
+    execSync(`net stop "${SERVICE_NAME}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+  } catch (e) {}
+  try {
+    execSync(`sc.exe delete "${SERVICE_NAME}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+    console.log('[postinstall] 旧服务已删除');
+  } catch (e) {}
+  try {
+    execSync('timeout /t 2 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
+  } catch (e) {}
+
   try {
     // 使用 node-windows 注册服务（正确处理路径引号）
     const Service = require('node-windows').Service;
@@ -62,10 +75,11 @@ function installAndStartService() {
       nodeOptions: ['--harmony', '--max_old_space_size=4096'],
       env: {
         USERPROFILE: userHome,
-        HOME: userHome
+        HOME: userHome,
+        CLAW_SERVICE_HOME: userHome
       }
     });
-    console.log(`[postinstall] 服务环境变量 USERPROFILE=${userHome}`);
+    console.log(`[postinstall] 服务环境变量 USERPROFILE=${userHome}, CLAW_SERVICE_HOME=${userHome}`);
 
     svc.on('install', () => {
       console.log('[postinstall] 服务注册成功，正在启动...');

package/scripts/pre-uninstall.js

@@ -8,29 +8,65 @@ const { execSync } = require('child_process');
 const SERVICES = ['SilentNodeService', 'claw-subagent-service'];
 const DAEMON_PATH = path.join(__dirname, '..', 'service', 'daemon.js');
 
-if (process.platform === 'win32') {
-  for (const name of SERVICES) {
-    try {
-      execSync(`net stop "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
-    } catch (e) {}
-
-    // 使用 node-windows 卸载服务（删除 wrapper 文件，释放文件锁）
+function uninstallServiceSync(name) {
+  return new Promise((resolve) => {
     try {
       const Service = require('node-windows').Service;
       const svc = new Service({ name, script: DAEMON_PATH });
+
+      let resolved = false;
+      function done(result) {
+        if (!resolved) {
+          resolved = true;
+          resolve(result);
+        }
+      }
+
+      svc.on('uninstall', () => {
+        console.log(`[preuninstall] 服务 ${name} 已卸载`);
+        done(true);
+      });
+
+      svc.on('error', (err) => {
+        console.error(`[preuninstall] 卸载服务 ${name} 失败:`, err.message);
+        done(false);
+      });
+
+      // 超时兜底
+      setTimeout(() => {
+        console.log(`[preuninstall] 卸载服务 ${name} 超时`);
+        done(false);
+      }, 15000);
+
       svc.uninstall();
-    } catch (e) {}
+    } catch (e) {
+      resolve(false);
+    }
+  });
+}
+
+(async function () {
+  if (process.platform === 'win32') {
+    for (const name of SERVICES) {
+      // 1. 停止服务
+      try {
+        execSync(`net stop "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+      } catch (e) {}
+
+      // 2. 使用 node-windows 卸载（等待完成）
+      await uninstallServiceSync(name);
 
-    // 兜底 - 使用 sc.exe 删除服务
+      // 3. 兜底 - 使用 sc.exe 删除服务
+      try {
+        execSync(`sc.exe delete "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+      } catch (e) {}
+    }
+
+    // 4. 等待系统释放文件句柄
     try {
-      execSync(`sc.exe delete "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+      execSync('timeout /t 2 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
     } catch (e) {}
   }
 
-  // 等待系统释放文件句柄
-  try {
-    execSync('timeout /t 2 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
-  } catch (e) {}
-}
-
-process.exit(0);
+  process.exit(0);
+})();

package/service/modules/config.js

@@ -3,8 +3,12 @@ const path = require('path');
 const os = require('os');
 
 function loadConfig() {
+  // 优先使用 CLAW_SERVICE_HOME（服务注册时硬编码的实际用户目录）
+  // 回退到 USERPROFILE / os.homedir()
+  const homeDir = process.env.CLAW_SERVICE_HOME || process.env.USERPROFILE || os.homedir();
+
   // Read from ~/.claw-bridge/config.json
-  const clawBridgePath = path.join(os.homedir(), '.claw-bridge', 'config.json');
+  const clawBridgePath = path.join(homeDir, '.claw-bridge', 'config.json');
   let clawBridgeConfig = {};
   if (fs.existsSync(clawBridgePath)) {
     try {
@@ -13,6 +17,9 @@ function loadConfig() {
       console.error('读取 claw-bridge 配置失败:', e);
     }
   }
+  if (!fs.existsSync(clawBridgePath)) {
+    console.warn(`[CONFIG] 未找到 ${clawBridgePath} (home=${homeDir})`);
+  }
 
   // Read from local rongcloud-config.json
   const localConfigPath = path.join(__dirname, '..', '..', 'rongcloud-config.json');

package/service/modules/service-manager.js

@@ -169,7 +169,8 @@ class ServiceManager {
           nodeOptions: ['--harmony', '--max_old_space_size=4096'],
           env: {
             USERPROFILE: userHome,
-            HOME: userHome
+            HOME: userHome,
+            CLAW_SERVICE_HOME: userHome
           }
         });