tt-help-cli-ycl 1.4.66 → 1.4.68

package/package.json

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

package/src/watch/public/app.js

@@ -3562,7 +3562,17 @@ function renderOfflineCard(userId, cmds) {
           "div",
           "display:flex;gap:10px;align-items:center",
           styled("span", "color:#f87171", "● 离线") +
-            styled("span", "color:#555;font-size:10px", "—"),
+            styled("span", "color:#555;font-size:10px", "—") +
+            tag(
+              "button",
+              {
+                onclick: "wdDeleteClient('" + esc(userId) + "')",
+                style:
+                  "padding:2px 8px;font-size:10px;background:#991b1b;color:#fff;border:none;border-radius:3px;cursor:pointer",
+                title: "删除此客户端配置",
+              },
+              "删除",
+            ),
         ),
     ) +
       styled(
@@ -3623,7 +3633,19 @@ function renderClientCard(c, clientCommands) {
         "display:flex;gap:10px;align-items:center",
         styled("span", "color:#888;font-size:11px", c.ip) +
           onlineBadge +
-          styled("span", "color:#666;font-size:10px", lastSeen),
+          styled("span", "color:#666;font-size:10px", lastSeen) +
+          (!c.online && userId
+            ? tag(
+                "button",
+                {
+                  onclick: "wdDeleteClient('" + esc(userId) + "')",
+                  style:
+                    "padding:2px 8px;font-size:10px;background:#991b1b;color:#fff;border:none;border-radius:3px;cursor:pointer;margin-left:6px",
+                  title: "删除此客户端配置",
+                },
+                "删除",
+              )
+            : ""),
       ),
   );
 
@@ -3889,3 +3911,15 @@ async function wdSaveClientCmds(userId, commands) {
     alert("保存失败: " + e.message);
   }
 }
+
+function wdDeleteClient(userId) {
+  if (
+    !confirm(
+      "确定删除 " +
+        userId +
+        " 的所有命令配置？\n\n删除后该客户端将不再出现在列表中。",
+    )
+  )
+    return;
+  wdSaveClientCmds(userId, []);
+}

package/src/watchdog/process-manager.js

@@ -44,19 +44,6 @@ function splitCommand(cmdLine) {
   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
@@ -119,15 +106,15 @@ export class ProcessManager extends EventEmitter {
     let child;
     const startTime = Date.now();
     try {
-      // 拆分为 program + args；Windows .cmd 需 shell，用完整命令行
+      // 拆分为 program + args（引号感知）
       if (args.length === 0) {
         const parts = splitCommand(command);
         command = parts[0] || command;
         args = parts.slice(1);
       }
-      const fullCmd = [command, ...args].join(" ");
+      // Windows .cmd 文件必须 shell:true，macOS/Linux 直接 spawn
       child = IS_WIN
-        ? spawn(fullCmd, {
+        ? spawn(command, args, {
             stdio: ["ignore", "pipe", "pipe"],
             detached: false,
             shell: true,
@@ -136,19 +123,6 @@ export class ProcessManager extends EventEmitter {
             stdio: ["ignore", "pipe", "pipe"],
             detached: false,
           });
-
-      // 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}`);
       this.processes.set(id, {
@@ -236,16 +210,23 @@ export class ProcessManager extends EventEmitter {
 
     if (info.child) {
       try {
-        // 尝试优雅终止
-        info.child.kill("SIGTERM");
-        // 2 秒后强制 kill
-        setTimeout(() => {
-          try {
-            if (info.child && info.child.exitCode === null) {
-              info.child.kill("SIGKILL");
-            }
-          } catch {}
-        }, 2000);
+        if (IS_WIN) {
+          // Windows: shell:true 产生 cmd.exe 中间层，必须杀整个进程树
+          execSync(`taskkill /PID ${info.child.pid} /T /F`, {
+            stdio: ["ignore", "ignore", "ignore"],
+            timeout: 5000,
+          });
+        } else {
+          // macOS/Linux: 优雅终止，2 秒后强制 kill
+          info.child.kill("SIGTERM");
+          setTimeout(() => {
+            try {
+              if (info.child && info.child.exitCode === null) {
+                info.child.kill("SIGKILL");
+              }
+            } catch {}
+          }, 2000);
+        }
       } catch (e) {
         console.error(`[watchdog] 停止命令 ${cmdId} 失败: ${e.message}`);
       }
@@ -262,8 +243,7 @@ export class ProcessManager extends EventEmitter {
     const result = [];
     for (const [cmdId, info] of this.processes) {
       if (info.stopped) continue;
-      // Windows: 优先用真实子进程 PID（否则拿到的是 cmd.exe 的内存）
-      const pid = info._realPid || info.child?.pid || 0;
+      const pid = info.child?.pid || 0;
       const stats = pid ? getProcessStats(pid) : null;
       const uptimeSeconds = Math.round((Date.now() - info.startTime) / 1000);
 
@@ -370,7 +350,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._realPid || info.child.pid;
+      const pid = info.child.pid;
 
       let reason = "";
       // 检查运行时长