tt-help-cli-ycl 1.4.63 → 1.4.65

package/package.json

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

package/src/watchdog/process-manager.js

@@ -15,10 +15,52 @@ import { EventEmitter } from "events";
 const MAX_RESTART = 3;
 const IS_WIN = process.platform === "win32";
 
+// 引号感知的命令拆分："a b" "c d" → ["a b", "c d"]
+function splitCommand(cmdLine) {
+  const parts = [];
+  let cur = "",
+    inDq = false,
+    inSq = false;
+  for (let i = 0; i < cmdLine.length; i++) {
+    const ch = cmdLine[i];
+    if (ch === '"' && !inSq) {
+      inDq = !inDq;
+      continue;
+    }
+    if (ch === "'" && !inDq) {
+      inSq = !inSq;
+      continue;
+    }
+    if (ch === " " && !inDq && !inSq) {
+      if (cur) {
+        parts.push(cur);
+        cur = "";
+      }
+    } else {
+      cur += ch;
+    }
+  }
+  if (cur) parts.push(cur);
+  return parts;
+}
+
+// Windows: 从 cmd.exe 往下找真正的子进程 PID（跳过 conhost）
+function getChildPid(parentPid) {
+  try {
+    const out = execSync(
+      `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter 'ParentProcessId=${parentPid}' | Where-Object { $_.Name -ne 'conhost.exe' } | Select-Object -First 1 -ExpandProperty ProcessId"`,
+      { encoding: "utf-8", timeout: 3000, stdio: ["ignore", "pipe", "ignore"] },
+    ).trim();
+    return parseInt(out, 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+
 function getProcessStats(pid) {
   try {
     const cmd = IS_WIN
-      ? `tasklist /FI "PID eq ${pid}" /FO CSV /NH`
+      ? `powershell -NoProfile -Command "(Get-Process -Id ${pid} -ErrorAction SilentlyContinue).WorkingSet64"`
       : `ps -p ${pid} -o rss=,etime=`;
     const stdout = execSync(cmd, {
       encoding: "utf-8",
@@ -28,13 +70,13 @@ function getProcessStats(pid) {
     if (!stdout) return null;
 
     if (IS_WIN) {
-      // tasklist CSV: "name.exe","pid","session","session#","mem usage"
-      const cols = stdout.split(",");
-      const memStr = (cols[4] || "").replace(/[^0-9.]/g, "");
-      const memKB = parseInt(memStr, 10);
+      // PowerShell 返回字节数，运行时长从内部 startTime 计算
+      const memBytes = parseInt(stdout, 10);
       return {
-        memoryMB: isNaN(memKB) ? 0 : Math.round((memKB / 1024) * 10) / 10,
-        elapsed: "?",
+        memoryMB: isNaN(memBytes)
+          ? 0
+          : Math.round((memBytes / 1048576) * 10) / 10,
+        elapsed: null,
       };
     }
 
@@ -77,18 +119,29 @@ export class ProcessManager extends EventEmitter {
     let child;
     const startTime = Date.now();
     try {
-      // 有显式 args 则直接 spawn，否则用 shell 模式传递完整命令行（跨平台兼容）
-      if (args.length > 0) {
-        child = spawn(command, args, {
-          stdio: ["ignore", "pipe", "pipe"],
-          detached: false,
-        });
-      } else {
-        child = spawn(command, {
-          stdio: ["ignore", "pipe", "pipe"],
-          detached: false,
-          shell: true,
-        });
+      // 拆分为 program + args；Windows .cmd 需 shell 模式启动
+      if (args.length === 0) {
+        const parts = splitCommand(command);
+        command = parts[0] || command;
+        args = parts.slice(1);
+      }
+      child = spawn(command, args, {
+        stdio: ["ignore", "pipe", "pipe"],
+        detached: false,
+        shell: IS_WIN,
+      });
+
+      // Windows: cmd.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;
+            }
+          }
+        }, 2000);
       }
     } catch (e) {
       console.error(`[watchdog] 启动命令 ${id} 失败: ${e.message}`);
@@ -203,7 +256,8 @@ 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: 优先用真实子进程 PID（否则拿到的是 cmd.exe 的内存）
+      const pid = info._realPid || info.child?.pid || 0;
       const stats = pid ? getProcessStats(pid) : null;
       const uptimeSeconds = Math.round((Date.now() - info.startTime) / 1000);
 
@@ -218,7 +272,21 @@ export class ProcessManager extends EventEmitter {
           : "error",
         memoryMB: stats?.memoryMB ?? 0,
         uptimeSeconds,
-        uptimeDisplay: stats?.elapsed || `${uptimeSeconds}s`,
+        uptimeDisplay:
+          stats?.elapsed ||
+          (function (s) {
+            var m = Math.floor(s / 60);
+            var h = Math.floor(m / 60);
+            m = m % 60;
+            s = s % 60;
+            return h > 0
+              ? h +
+                  ":" +
+                  String(m).padStart(2, "0") +
+                  ":" +
+                  String(s).padStart(2, "0")
+              : m + ":" + String(s).padStart(2, "0");
+          })(uptimeSeconds),
         restartCount: info.restartCount,
         error: info.spawnError || null,
       });
@@ -296,7 +364,7 @@ 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;
+      const pid = info._realPid || info.child.pid;
 
       let reason = "";
       // 检查运行时长