claw-subagent-service 0.0.19 → 0.0.21

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.21",
   "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

@@ -1,35 +1,104 @@
 /**
  * npm preuninstall 钩子
  * 在卸载旧版本前停止并删除 Windows 服务，释放文件锁
+ *
+ * 设计原则：完全同步执行，多层兜底，不依赖 node-windows 异步事件。
+ * npm 运行此脚本时会等待进程退出，因此所有操作必须阻塞完成。
  */
-const path = require('path');
 const { execSync } = require('child_process');
 
 const SERVICES = ['SilentNodeService', 'claw-subagent-service'];
-const DAEMON_PATH = path.join(__dirname, '..', 'service', 'daemon.js');
+
+/**
+ * 强制停止服务进程并删除服务注册表
+ */
+function forceCleanupService(name) {
+  console.log(`[preuninstall] 开始清理服务: ${name}`);
+
+  // 1. 发送停止指令（服务可能正在运行）
+  try {
+    execSync(`net stop "${name}" 2>nul`, { stdio: 'ignore', timeout: 15000 });
+    console.log(`[preuninstall] 服务 ${name} 已发送停止指令`);
+  } catch (e) {
+    // 服务可能未运行，忽略
+  }
+
+  // 2. 通过 sc queryex 获取服务 PID 并强制终止
+  // 这是最精确的杀进程方式，直接终止锁定文件的进程
+  try {
+    const output = execSync(`sc queryex "${name}" 2>nul`, {
+      encoding: 'utf-8',
+      timeout: 5000,
+      stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    const pidMatch = output.match(/PID\s*:\s*(\d+)/);
+    if (pidMatch) {
+      const pid = pidMatch[1];
+      console.log(`[preuninstall] 发现服务 PID=${pid}，强制终止...`);
+      try {
+        execSync(`taskkill /f /pid ${pid} 2>nul`, { stdio: 'ignore', timeout: 10000 });
+        console.log(`[preuninstall] PID ${pid} 已强制终止`);
+      } catch (e) {
+        // PID 可能已退出
+      }
+    }
+  } catch (e) {
+    // 服务不存在或未运行
+  }
+
+  // 3. 按进程名强制杀掉 wrapper 可执行文件（node-windows 生成的 .exe）
+  try {
+    execSync(`taskkill /f /im "${name}.exe" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+    console.log(`[preuninstall] ${name}.exe 已强制终止`);
+  } catch (e) {
+    // 进程可能不存在
+  }
+
+  // 4. 兜底：通过 PowerShell 按命令行路径匹配，杀掉所有包含 claw-subagent 的 node 进程
+  try {
+    execSync(
+      `powershell -NoProfile -Command "Get-Process node -ErrorAction SilentlyContinue | Where-Object {\$_.Path -like '*claw-subagent*'} | Stop-Process -Force -ErrorAction SilentlyContinue" 2>nul`,
+      { stdio: 'ignore', timeout: 15000 }
+    );
+    console.log(`[preuninstall] 相关 node 进程已清理`);
+  } catch (e) {
+    // 忽略
+  }
+
+  // 5. 使用 node-windows 卸载服务（删除 wrapper 文件）
+  try {
+    const Service = require('node-windows').Service;
+    const DAEMON_PATH = require('path').join(__dirname, '..', 'service', 'daemon.js');
+    const svc = new Service({ name, script: DAEMON_PATH });
+    svc.uninstall();
+    console.log(`[preuninstall] node-windows 卸载指令已发送`);
+  } catch (e) {
+    // node-windows 可能未安装或已卸载
+  }
+
+  // 6. 最终兜底：使用 sc.exe 直接从注册表删除服务
+  try {
+    execSync(`sc.exe delete "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
+    console.log(`[preuninstall] 服务 ${name} 已从注册表删除`);
+  } catch (e) {
+    // 服务可能已不存在
+  }
+
+  // 7. 短暂停顿，让操作系统回收文件句柄
+  try {
+    execSync('timeout /t 2 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
+  } catch (e) {}
+}
 
 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 文件，释放文件锁）
-    try {
-      const Service = require('node-windows').Service;
-      const svc = new Service({ name, script: DAEMON_PATH });
-      svc.uninstall();
-    } catch (e) {}
-
-    // 兜底 - 使用 sc.exe 删除服务
-    try {
-      execSync(`sc.exe delete "${name}" 2>nul`, { stdio: 'ignore', timeout: 10000 });
-    } catch (e) {}
+    forceCleanupService(name);
   }
 
-  // 等待系统释放文件句柄
+  // 最后再等待几秒，确保 Windows 完全释放文件锁
   try {
-    execSync('timeout /t 2 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
+    execSync('timeout /t 3 /nobreak >nul 2>&1', { stdio: 'ignore', timeout: 5000 });
+    console.log('[preuninstall] 文件锁清理完成，npm 可以继续卸载');
   } catch (e) {}
 }
 

package/service/modules/config.js

@@ -1,44 +1,79 @@
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-function loadConfig() {
-  // Read from ~/.claw-bridge/config.json
-  const clawBridgePath = path.join(os.homedir(), '.claw-bridge', 'config.json');
-  let clawBridgeConfig = {};
-  if (fs.existsSync(clawBridgePath)) {
-    try {
-      clawBridgeConfig = JSON.parse(fs.readFileSync(clawBridgePath, 'utf-8'));
-    } catch (e) {
-      console.error('读取 claw-bridge 配置失败:', e);
-    }
-  }
-
-  // Read from local rongcloud-config.json
-  const localConfigPath = path.join(__dirname, '..', '..', 'rongcloud-config.json');
-  let localConfig = {};
-  if (fs.existsSync(localConfigPath)) {
-    try {
-      localConfig = JSON.parse(fs.readFileSync(localConfigPath, 'utf-8'));
-    } catch (e) {
-      console.error('读取本地配置失败:', e);
-    }
-  }
-
-  return {
-    appKey: process.env.DM_APP_KEY || localConfig.appKey || 'bmdehs6pbyyks',
-    token: localConfig.token || clawBridgeConfig.token,
-    accountId: localConfig.accountId || clawBridgeConfig.nodeId,
-    nodeName: clawBridgeConfig.nodeName || 'cli-client',
-    secretKey: localConfig.secretKey || 'secret_key',
-    nickname: localConfig.nickname || 'CLI客户端',
-    reconnectInterval: localConfig.reconnectInterval || 60,
-    heartbeatInterval: localConfig.heartbeatInterval || 20,
-    openclawPort: localConfig.openclawPort || 18789,
-    scriptTimeout: localConfig.scriptTimeout || 180,
-    successKeyword: localConfig.successKeyword || 'Success',
-    chatTimeout: localConfig.chatTimeout || 600
-  };
-}
-
-module.exports = { loadConfig };
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+/**
+ * 获取实际用户主目录
+ * Windows 服务以 SYSTEM 运行时 os.homedir() 返回 systemprofile，
+ * 优先使用 CLAW_SERVICE_HOME / USERPROFILE 环境变量，最后扫描 C:\Users
+ */
+function getRealHomeDir() {
+  const envHome = process.env.CLAW_SERVICE_HOME || process.env.USERPROFILE || process.env.HOME;
+  if (envHome && !envHome.includes('systemprofile')) {
+    return envHome;
+  }
+  const homeDir = os.homedir();
+  if (!homeDir.includes('systemprofile')) {
+    return homeDir;
+  }
+  // SYSTEM 账户兜底：扫描 C:\Users 找包含 .claw-bridge 的实际用户目录
+  const usersDir = 'C:\\Users';
+  if (fs.existsSync(usersDir)) {
+    const entries = fs.readdirSync(usersDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory() && !['Public', 'Default', 'All Users', 'Default User'].includes(entry.name)) {
+        const candidate = path.join(usersDir, entry.name);
+        if (fs.existsSync(path.join(candidate, '.claw-bridge', 'config.json'))) {
+          return candidate;
+        }
+      }
+    }
+  }
+  return homeDir;
+}
+
+function loadConfig() {
+  const homeDir = getRealHomeDir();
+
+  // Read from ~/.claw-bridge/config.json
+  const clawBridgePath = path.join(homeDir, '.claw-bridge', 'config.json');
+  let clawBridgeConfig = {};
+  if (fs.existsSync(clawBridgePath)) {
+    try {
+      clawBridgeConfig = JSON.parse(fs.readFileSync(clawBridgePath, 'utf-8'));
+    } catch (e) {
+      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');
+  let localConfig = {};
+  if (fs.existsSync(localConfigPath)) {
+    try {
+      localConfig = JSON.parse(fs.readFileSync(localConfigPath, 'utf-8'));
+    } catch (e) {
+      console.error('读取本地配置失败:', e);
+    }
+  }
+
+  return {
+    appKey: process.env.DM_APP_KEY || localConfig.appKey || 'bmdehs6pbyyks',
+    token: localConfig.token || clawBridgeConfig.token,
+    accountId: localConfig.accountId || clawBridgeConfig.nodeId,
+    nodeName: clawBridgeConfig.nodeName || 'cli-client',
+    secretKey: localConfig.secretKey || 'secret_key',
+    nickname: localConfig.nickname || 'CLI客户端',
+    reconnectInterval: localConfig.reconnectInterval || 60,
+    heartbeatInterval: localConfig.heartbeatInterval || 20,
+    openclawPort: localConfig.openclawPort || 18789,
+    scriptTimeout: localConfig.scriptTimeout || 180,
+    successKeyword: localConfig.successKeyword || 'Success',
+    chatTimeout: localConfig.chatTimeout || 600
+  };
+}
+
+module.exports = { loadConfig, getRealHomeDir };

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
           }
         });
 

package/service/worker.js

@@ -93,10 +93,42 @@ const logTimestampValidation = (message) => {
 
 log.info(`[WORKER] 业务进程启动，PID: ${process.pid}`);
 
-const clawBridgeConfigPath = path.join(os.homedir(), '.claw-bridge', 'config.json');
 const localConfigPath = path.join(__dirname, '..', 'rongcloud-config.json');
 let rongcloudConfig = null;
 
+/**
+ * 获取实际用户主目录
+ * Windows 服务以 SYSTEM 运行时 os.homedir() 返回 systemprofile，
+ * 优先使用 CLAW_SERVICE_HOME / USERPROFILE 环境变量，最后扫描 C:\Users
+ */
+function getRealHomeDir() {
+  const envHome = process.env.CLAW_SERVICE_HOME || process.env.USERPROFILE || process.env.HOME;
+  if (envHome && !envHome.includes('systemprofile')) {
+    return envHome;
+  }
+  const homeDir = os.homedir();
+  if (!homeDir.includes('systemprofile')) {
+    return homeDir;
+  }
+  // SYSTEM 账户兜底：扫描 C:\Users 找包含 .claw-bridge 的实际用户目录
+  const usersDir = 'C:\\Users';
+  if (fs.existsSync(usersDir)) {
+    const entries = fs.readdirSync(usersDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory() && !['Public', 'Default', 'All Users', 'Default User'].includes(entry.name)) {
+        const candidate = path.join(usersDir, entry.name);
+        if (fs.existsSync(path.join(candidate, '.claw-bridge', 'config.json'))) {
+          return candidate;
+        }
+      }
+    }
+  }
+  return homeDir;
+}
+
+const homeDir = getRealHomeDir();
+const clawBridgeConfigPath = path.join(homeDir, '.claw-bridge', 'config.json');
+
 function loadRongCloudConfig() {
   let config = {};
 
@@ -108,7 +140,7 @@ function loadRongCloudConfig() {
       config.nodeName = clawConfig.nodeName;
       log.info(`[WORKER] 从 claw-bridge 加载配置: nodeId=${clawConfig.nodeId}, nodeName=${clawConfig.nodeName}`);
     } else {
-      log.warn('[WORKER] 未找到 ~/.claw-bridge/config.json');
+      log.warn(`[WORKER] 未找到 ${clawBridgeConfigPath}`);
     }
   } catch (err) {
     log.error(`[WORKER] 加载 claw-bridge 配置失败: ${err.message}`);

package/version.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.0.18",
+  "version": "0.0.20",
   "updatedAt": "2026-04-30T07:00:00.000Z"
 }