claw-subagent-service 0.0.26 → 0.0.27

package/package.json

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

package/service/rongcloud/openclaw-client.js

@@ -33,6 +33,66 @@ function getRealHomeDir() {
   return homeDir;
 }
 
+/**
+ * 构建 OpenClaw 需要的完整环境变量
+ * Windows SYSTEM 账户下必须设置 HOMEDRIVE/HOMEPATH/APPDATA 等
+ * 策略：从现有环境变量中推断正确路径，避免硬编码任何用户名或目录结构
+ */
+function getOpenClawEnv(baseEnv = process.env) {
+  const realHome = getRealHomeDir();
+  const env = { ...baseEnv };
+  const systemHome = os.homedir();
+
+  // 基础 home 目录变量
+  env.USERPROFILE = realHome;
+  env.HOME = realHome;
+
+  if (process.platform === 'win32') {
+    // 从 realHome 推断 HOMEDRIVE / HOMEPATH（匹配盘符 + 路径）
+    const match = realHome.match(/^([A-Za-z]:)(.*)$/);
+    if (match) {
+      env.HOMEDRIVE = match[1];
+      env.HOMEPATH = match[2];
+    }
+
+    /**
+     * 修复路径：把现有环境变量中的 systemprofile home 路径替换为真实用户 home 路径
+     * 这样能处理 Roaming Profiles、AppData 重定向、非标准安装等各种情况
+     */
+    const fixPath = (originalPath) => {
+      if (!originalPath) return null;
+      const lowerOriginal = originalPath.toLowerCase();
+      const lowerSystemHome = systemHome.toLowerCase();
+      if (lowerOriginal.includes(lowerSystemHome)) {
+        const idx = lowerOriginal.indexOf(lowerSystemHome);
+        return originalPath.substring(0, idx) + realHome + originalPath.substring(idx + systemHome.length);
+      }
+      return null;
+    };
+
+    // APPDATA：优先从现有变量推断，保留原始目录结构
+    if (baseEnv.APPDATA) {
+      const fixed = fixPath(baseEnv.APPDATA);
+      if (fixed) env.APPDATA = fixed;
+    }
+    // 兜底：按标准结构拼接（仅在无法推断时使用）
+    if (!env.APPDATA) {
+      env.APPDATA = path.join(realHome, 'AppData', 'Roaming');
+    }
+
+    // LOCALAPPDATA：同上
+    if (baseEnv.LOCALAPPDATA) {
+      const fixed = fixPath(baseEnv.LOCALAPPDATA);
+      if (fixed) env.LOCALAPPDATA = fixed;
+    }
+    if (!env.LOCALAPPDATA) {
+      env.LOCALAPPDATA = path.join(realHome, 'AppData', 'Local');
+    }
+  }
+
+  return env;
+}
+
 /**
  * 检测端口是否监听
  */
@@ -68,24 +128,21 @@ function startOpenClawGateway(log) {
       windowsHide: true,
       detached: true,
       stdio: 'ignore',
-      env: {
-        ...process.env,
-        USERPROFILE: getRealHomeDir(),
-        HOME: getRealHomeDir(),
-      },
+      env: getOpenClawEnv(),
     });
 
     child.unref();
 
-    // 等待 gateway 启动（最多 15 秒）
+    // 等待 gateway 启动（最多 20 秒）
     let attempts = 0;
-    const maxAttempts = 15;
+    const maxAttempts = 20;
     const interval = setInterval(async () => {
       attempts++;
-      const isRunning = await checkPort(18789);
-      if (isRunning) {
+      const gatewayRunning = await checkPort(18789);
+      const apiRunning = await checkPort(5678);
+      if (gatewayRunning) {
         clearInterval(interval);
-        log?.info('[OpenClawClient] OpenClaw gateway 启动成功');
+        log?.info(`[OpenClawClient] OpenClaw gateway 启动成功 (18789)，API 状态: ${apiRunning ? '就绪' : '未就绪'}`);
         resolve(true);
       } else if (attempts >= maxAttempts) {
         clearInterval(interval);
@@ -115,18 +172,36 @@ class OpenClawClient {
   async ensureGatewayRunning() {
     if (this.gatewayStarted) return true;
 
-    const isRunning = await checkPort(18789);
-    if (isRunning) {
-      this.log?.info('[OpenClawClient] OpenClaw gateway 已在运行');
+    const gatewayRunning = await checkPort(18789);
+    const apiRunning = await checkPort(5678);
+
+    if (gatewayRunning && apiRunning) {
+      this.log?.info('[OpenClawClient] OpenClaw gateway 和 API 均已就绪');
       this.gatewayStarted = true;
       return true;
     }
 
+    if (gatewayRunning && !apiRunning) {
+      this.log?.info('[OpenClawClient] gateway 已运行 (18789)，但 API (5678) 未就绪，继续等待...');
+      // 等待最多 10 秒让 API 就绪
+      for (let i = 0; i < 10; i++) {
+        await new Promise(r => setTimeout(r, 1000));
+        if (await checkPort(5678)) {
+          this.log?.info('[OpenClawClient] API (5678) 已就绪');
+          this.gatewayStarted = true;
+          return true;
+        }
+      }
+      this.log?.warn('[OpenClawClient] API (5678) 等待超时，gateway 可能未完全初始化');
+      // gateway 在运行但 API 没好，仍然允许继续，让 HTTP fallback 到 CLI
+      return true;
+    }
+
     // 避免并发启动
     if (this.gatewayStarting) {
       this.log?.info('[OpenClawClient] gateway 正在启动中，等待...');
-      // 等待最多 20 秒
-      for (let i = 0; i < 20; i++) {
+      // 等待最多 25 秒
+      for (let i = 0; i < 25; i++) {
         await new Promise(r => setTimeout(r, 1000));
         if (await checkPort(18789)) {
           this.gatewayStarted = true;
@@ -225,25 +300,29 @@ class OpenClawClient {
         shell: true,
         windowsHide: true,
         env: {
-          ...process.env,
+          ...getOpenClawEnv(),
           OPENCLAW_GATEWAY_URL: gatewayUrl,
-          USERPROFILE: realHome,
-          HOME: realHome,
         },
       });
 
+      this.log?.info(`[OpenClawClient] CLI 子进程 PID=${child.pid}`);
+
       child.stdout.on('data', (chunk) => {
         stdout += chunk.toString();
       });
       child.stderr.on('data', (chunk) => {
-        stderr += chunk.toString();
+        const text = chunk.toString();
+        stderr += text;
+        // 实时记录 stderr，方便调试卡死问题
+        this.log?.info(`[OpenClawClient] CLI stderr: ${text.trim().substring(0, 200)}`);
       });
 
+      // 超时兜底（2 分钟）
       const timeout = setTimeout(() => {
         killed = true;
         child.kill('SIGTERM');
-        this.log?.error('[OpenClawClient] CLI 执行超时，强制终止');
-      }, 1200000);
+        this.log?.error('[OpenClawClient] CLI 执行超时（2分钟），强制终止');
+      }, 120000);
 
       child.on('error', (err) => {
         clearTimeout(timeout);