claw-subagent-service 0.0.40 → 0.0.41

package/package.json

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

package/service/daemon.js

@@ -119,11 +119,38 @@ function freePortIfNeeded(port) {
         }
       }
     } else {
-      const out = execSync(`lsof -i :${port} -t 2>/dev/null`, { encoding: 'utf8', timeout: 5000 });
-      const pid = parseInt(out.trim(), 10);
-      if (pid && pid > 0) {
+      // Linux / macOS：优先 lsof，兜底 fuser / ss / netstat / pkill
+      let pid = 0;
+      const commands = [
+        `lsof -i :${port} -t 2>/dev/null`,
+        `fuser ${port}/tcp 2>/dev/null`,
+        `ss -tlnp 2>/dev/null | grep -oP 'pid=\\K[0-9]+'`,
+        `netstat -tlnp 2>/dev/null | grep ":${port} " | awk '{print $7}' | cut -d'/' -f1`,
+      ];
+      for (const cmd of commands) {
+        try {
+          const out = execSync(cmd, { encoding: 'utf8', timeout: 5000 }).trim();
+          const firstLine = out.split(/\r?\n/)[0];
+          const candidate = parseInt(firstLine, 10);
+          if (candidate && candidate > 0 && candidate !== currentWorkerPid && candidate !== process.pid) {
+            pid = candidate;
+            break;
+          }
+        } catch { /* 命令不可用，继续下一个兜底 */ }
+      }
+
+      if (pid) {
         log.warn(`[DAEMON] 端口 ${port} 被进程 ${pid} 占用，正在释放...`);
-        process.kill(pid, 'SIGKILL');
+        try { process.kill(pid, 'SIGKILL'); } catch (e) {
+          log.warn(`[DAEMON] 终止进程 ${pid} 失败: ${e.message}`);
+        }
+      } else {
+        // 所有命令都不可用，尝试按脚本名批量杀掉残留进程
+        try {
+          execSync('pkill -9 -f "daemon.js" 2>/dev/null || true', { timeout: 5000 });
+          execSync('pkill -9 -f "worker.js" 2>/dev/null || true', { timeout: 5000 });
+          log.warn(`[DAEMON] 已尝试按脚本名释放端口 ${port}`);
+        } catch { /* 忽略 */ }
       }
     }
   } catch { /* 端口已被释放或无法查询 */ }

package/service/rongcloud/rongcloud-client.js

@@ -128,11 +128,12 @@ class RongCloudClient {
     try {
       const msgType = message.messageType;
       let rawContent = message.content;
-      let mentionedInfo = null;
+      // 融云 SDK 中 mentionedInfo 通常在消息根级别
+      let mentionedInfo = message.mentionedInfo || null;
 
       // 自定义消息 content 可能是对象，提取文本内容并保留 mentionedInfo
       if (rawContent && typeof rawContent === 'object') {
-        mentionedInfo = rawContent.mentionedInfo || null;
+        mentionedInfo = mentionedInfo || rawContent.mentionedInfo || null;
         rawContent = rawContent.content || rawContent.text || JSON.stringify(rawContent);
       }
 

package/service/worker.js

@@ -65,8 +65,8 @@ function findPidOnPort(port) {
       for (const cmd of commands) {
         try {
           const out = execSync(cmd, { encoding: 'utf8', timeout: 5000 }).trim();
-          const pid = parseInt(out.split('\n')[0], 10);
-          if (!isNaN(pid) && pid > 0) return pid;
+          const candidate = parseInt(out.split('\n')[0], 10);
+          if (!isNaN(candidate) && candidate > 0 && candidate !== process.pid) return candidate;
         } catch { continue; }
       }
     }
@@ -95,7 +95,18 @@ function forceKill(pid) {
 function ensurePortFree(port) {
   for (let i = 0; i < 3; i++) {
     const pid = findPidOnPort(port);
-    if (!pid) return true;
+    if (!pid) {
+      // 端口查询工具都不可用但端口仍可能被占用，按脚本名兜底清理一次
+      if (i === 0 && process.platform !== 'win32') {
+        try {
+          execSync('pkill -9 -f "daemon.js" 2>/dev/null || true', { timeout: 5000 });
+          execSync('pkill -9 -f "worker.js" 2>/dev/null || true', { timeout: 5000 });
+          Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 2000);
+        } catch { /* 忽略 */ }
+        continue;
+      }
+      return true;
+    }
     log.warn(`[WORKER] 端口 ${port} 被进程 ${pid} 占用，正在释放...`);
     forceKill(pid);
     // 同步等待端口释放（最多 1.5s）
@@ -479,16 +490,23 @@ server.on('error', (err) => {
     log.error(`[WORKER] 端口 ${PORT} 被占用，尝试释放并重启监听...`);
     // 尝试杀死占用进程后重试
     const pid = findPidOnPort(PORT);
-    if (pid) {
+    if (pid && pid !== process.pid) {
       log.warn(`[WORKER] 发现占用进程 ${pid}，强制终止...`);
       forceKill(pid);
+    } else if (!pid) {
+      // 所有端口查询工具都不可用（常见于精简 Docker 镜像），按脚本名兜底清理
+      log.warn('[WORKER] 无法查询端口占用进程，尝试按脚本名清理残留...');
+      try {
+        execSync('pkill -9 -f "daemon.js" 2>/dev/null || true', { timeout: 5000 });
+        execSync('pkill -9 -f "worker.js" 2>/dev/null || true', { timeout: 5000 });
+      } catch { /* 忽略 */ }
     }
-    // 延迟 2 秒后重试
+    // 延迟 3 秒后重试，给进程退出和端口释放留出足够时间
     setTimeout(() => {
       log.info(`[WORKER] 重新尝试监听端口 ${PORT}...`);
       server.close(() => {});
       server.listen(PORT, HOST);
-    }, 2000);
+    }, 3000);
     return;
   }
   log.error(`[WORKER] HTTP 服务错误: ${err.message}`);