tt-help-cli-ycl 1.4.72 → 1.4.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.72",
+  "version": "1.4.73",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/watch/public/app.js

@@ -3448,6 +3448,7 @@ function styled(el, style, content) {
 function cmdObj(cmd) {
   if (typeof cmd === "string")
     return {
+      id: "",
       name: "",
       cmd: cmd,
       enabled: true,
@@ -3455,6 +3456,7 @@ function cmdObj(cmd) {
       maxMemoryMB: 0,
     };
   return {
+    id: cmd.id || "",
     name: cmd.name || "",
     cmd: cmd.cmd || "",
     enabled: cmd.enabled !== false,
@@ -3594,43 +3596,32 @@ function renderOfflineCard(userId, cmds) {
   );
 }
 
-// 匹配进程到命令（按命令行前缀匹配）
+// 匹配进程到命令（按唯一 ID 精确匹配）
 function matchProcsToCmds(myCmds, procs) {
   var matched = {}; // cmdIdx -> proc
   var unmatchedProcs = [];
+  // 建 ID → 命令索引 映射
+  var idToIdx = {};
+  myCmds.forEach(function (cmd, i) {
+    var c = cmdObj(cmd);
+    if (c.id) idToIdx[c.id] = i;
+  });
   procs.forEach(function (p) {
     var found = false;
-    for (var i = 0; i < myCmds.length; i++) {
-      var c = cmdObj(myCmds[i]);
-      var pName = p.name || p.cmdId || "";
-      if (
-        c.cmd &&
-        pName &&
-        (c.cmd.indexOf(pName.substring(0, 30)) === 0 ||
-          pName.indexOf(c.cmd.substring(0, 30)) === 0)
-      ) {
-        matched[i] = p;
-        found = true;
-        break;
-      }
+    if (p.cmdId && idToIdx[p.cmdId] !== undefined) {
+      matched[idToIdx[p.cmdId]] = p;
+      found = true;
     }
     if (!found) unmatchedProcs.push(p);
   });
   return { matched: matched, unmatched: unmatchedProcs };
 }
 
-// 根据命令行匹配 LLM 分析结果
-function findAnalysis(llmAnalysis, cmdLine) {
-  if (!llmAnalysis || !cmdLine) return null;
+// 按命令 ID 匹配 LLM 分析结果
+function findAnalysis(llmAnalysis, cmdId) {
+  if (!llmAnalysis || !cmdId) return null;
   for (var i = 0; i < llmAnalysis.length; i++) {
-    var a = llmAnalysis[i];
-    if (
-      a.cmdId &&
-      (a.cmdId.indexOf(cmdLine.substring(0, 30)) === 0 ||
-        cmdLine.indexOf(a.cmdId.substring(0, 30)) === 0)
-    ) {
-      return a;
-    }
+    if (llmAnalysis[i].cmdId === cmdId) return llmAnalysis[i];
   }
   return null;
 }
@@ -3848,7 +3839,7 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis) {
     );
 
     // AI 分析结果
-    var ai = findAnalysis(llmAnalysis, c.cmd);
+    var ai = findAnalysis(llmAnalysis, c.id);
     if (ai) {
       var sevColor =
         ai.severity === "error"
@@ -3956,19 +3947,22 @@ function wdModalSave() {
   var myCmds = (allCmds[_wdModalUserId] || []).slice();
 
   if (_wdModalEditIdx >= 0) {
-    // 编辑模式
+    // 编辑模式：保留已有 ID
     if (_wdModalEditIdx < myCmds.length) {
+      var oldObj = cmdObj(myCmds[_wdModalEditIdx]);
       myCmds[_wdModalEditIdx] = {
+        id: oldObj.id,
         name: name,
         cmd: cmd,
-        enabled: cmdObj(myCmds[_wdModalEditIdx]).enabled,
+        enabled: oldObj.enabled,
         maxUptimeSeconds: maxUp,
         maxMemoryMB: maxMem,
       };
     }
   } else {
-    // 添加模式
+    // 添加模式：生成新 ID
     myCmds.push({
+      id: String(Date.now()),
       name: name,
       cmd: cmd,
       enabled: true,
@@ -4059,6 +4053,7 @@ function wdToggleClientCmd(userId, idx) {
   var cmd = myCmds[idx];
   if (typeof cmd === "string") {
     myCmds[idx] = {
+      id: String(Date.now()),
       cmd: cmd,
       enabled: false,
       maxUptimeSeconds: 0,

package/src/watch/watchdog-server.js

@@ -84,12 +84,14 @@ function getOnlineClients() {
 function normalizeCmd(c) {
   if (typeof c === "string")
     return {
+      id: "",
       cmd: c.replace(/^[▶\n\r\s]+/, "").trim(),
       enabled: true,
       maxUptimeSeconds: 0,
       maxMemoryMB: 0,
     };
   return {
+    id: c.id || "",
     cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim(),
     enabled: c.enabled !== false,
     maxUptimeSeconds: c.maxUptimeSeconds || 0,
@@ -105,6 +107,7 @@ function getClientCommands(userId) {
     .map(normalizeCmd)
     .filter((c) => c.enabled && c.cmd)
     .map((c) => ({
+      id: c.id,
       cmd: c.cmd,
       maxUptimeSeconds: c.maxUptimeSeconds,
       maxMemoryMB: c.maxMemoryMB,
@@ -113,10 +116,21 @@ function getClientCommands(userId) {
 
 function setClientCommands(userId, commands) {
   if (!Array.isArray(commands)) return;
-  // 清洗每个命令中的非法前缀
-  const cleaned = commands.map((c) => {
-    if (typeof c === "string") return c.replace(/^[▶\n\r\s]+/, "").trim();
-    return { ...c, cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim() };
+  let nextId = 1;
+  const cleaned = commands.map((c, idx) => {
+    if (typeof c === "string") {
+      const id = String(Date.now() + idx);
+      return {
+        id,
+        cmd: c.replace(/^[▶\n\r\s]+/, "").trim(),
+        enabled: true,
+        maxUptimeSeconds: 0,
+        maxMemoryMB: 0,
+      };
+    }
+    const obj = { ...c, cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim() };
+    if (!obj.id) obj.id = String(Date.now() + nextId++);
+    return obj;
   });
   const cfg = loadConfig();
   if (!cfg.clientCommands) cfg.clientCommands = {};
@@ -274,6 +288,29 @@ async function handleAnalyzeLogs(params, body, res) {
 export function registerWatchdogRoutes(httpServer) {
   console.error("[watchdog] 看门狗服务端模块已加载");
   console.error(`[watchdog] 配置文件: ${WATCHDOG_CONFIG_PATH}`);
+  // 自动迁移：为已有命令补充唯一 ID
+  migrateCommandIds();
+}
+
+// 为现有命令中未分配 ID 的自动补充 ID
+function migrateCommandIds() {
+  const cfg = loadConfig();
+  if (!cfg.clientCommands) return;
+  let migrated = 0;
+  for (const userId of Object.keys(cfg.clientCommands)) {
+    const cmds = cfg.clientCommands[userId];
+    if (!Array.isArray(cmds)) continue;
+    for (const c of cmds) {
+      if (typeof c === "object" && !c.id) {
+        c.id = String(Date.now() + migrated);
+        migrated++;
+      }
+    }
+  }
+  if (migrated > 0) {
+    saveConfig(cfg);
+    console.error(`[watchdog] 已为 ${migrated} 条旧命令补充 ID`);
+  }
 }
 
 export async function tryHandleWatchdogRoute(

package/src/watchdog/process-manager.js

@@ -114,6 +114,19 @@ function getProcessStats(pid) {
   }
 }
 
+// Windows: 从 cmd.exe 往下找真正的 node.exe PID（shell:true 时 cmd.exe 是中间层）
+function getChildPid(parentPid) {
+  try {
+    const out = execSync(
+      `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter 'ParentProcessId=${parentPid}' | Where-Object { $_.Name -notlike 'conhost*' } | Select-Object -First 1 -ExpandProperty ProcessId"`,
+      { encoding: "utf-8", timeout: 3000, stdio: ["ignore", "pipe", "ignore"] },
+    ).trim();
+    return parseInt(out, 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+
 export class ProcessManager extends EventEmitter {
   constructor() {
     super();
@@ -158,6 +171,19 @@ export class ProcessManager extends EventEmitter {
             stdio: ["ignore", "pipe", "pipe"],
             detached: false,
           });
+
+      // Windows: shell:true → child.pid 是 cmd.exe，延迟获取真实 node.exe PID（用于内存读取）
+      if (IS_WIN) {
+        setTimeout(() => {
+          const realPid = getChildPid(child.pid);
+          if (realPid > 0) {
+            const info = this.processes.get(id);
+            if (info && info.child === child) {
+              info._realPid = realPid;
+            }
+          }
+        }, 3000);
+      }
     } catch (e) {
       console.error(`[watchdog] 启动命令 ${id} 失败: ${e.message}`);
       this.processes.set(id, {
@@ -295,7 +321,10 @@ export class ProcessManager extends EventEmitter {
     const result = [];
     for (const [cmdId, info] of this.processes) {
       if (info.stopped) continue;
-      const pid = info.child?.pid || 0;
+      // Windows: 壳是 cmd.exe，真实业务进程是 node.exe（_realPid）
+      const pid = IS_WIN
+        ? info._realPid || info.child?.pid || 0
+        : info.child?.pid || 0;
       const stats = pid ? getProcessStats(pid) : null;
       const uptimeSeconds = Math.round((Date.now() - info.startTime) / 1000);
 
@@ -361,16 +390,16 @@ export class ProcessManager extends EventEmitter {
   syncCommands(expectedCmds) {
     if (!Array.isArray(expectedCmds)) return;
 
-    // 标准化：{cmd, maxUptimeSeconds, maxMemoryMB} → {id, name, command, args, enabled, thresholds}
+    // 标准化：使用服务端分配的 id，无 id 时用命令行截断兜底
     const normalized = expectedCmds
       .map((c) => {
         if (typeof c === "string")
           c = { cmd: c, maxUptimeSeconds: 0, maxMemoryMB: 0 };
-        // 清洗：去除可能混入的控制字符、状态图标等
         const cmdLine = (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim();
         if (!cmdLine) return null;
         const id =
-          cmdLine.length > 60 ? cmdLine.substring(0, 60) + "..." : cmdLine;
+          c.id ||
+          (cmdLine.length > 60 ? cmdLine.substring(0, 60) + "..." : cmdLine);
         return {
           id,
           name: id,
@@ -422,7 +451,8 @@ export class ProcessManager extends EventEmitter {
       if (info.stopped || !info.child) continue;
       const thresholds = info.thresholds || {};
       const uptimeSeconds = Math.round((now - info.startTime) / 1000);
-      const pid = info.child.pid;
+      // Windows: 用真实 node.exe PID 读内存
+      const pid = IS_WIN ? info._realPid || info.child.pid : info.child.pid;
 
       let reason = "";
       // 检查运行时长