tt-help-cli-ycl 1.4.67 → 1.4.68

package/package.json

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

package/src/watchdog/process-manager.js

@@ -112,10 +112,17 @@ export class ProcessManager extends EventEmitter {
         command = parts[0] || command;
         args = parts.slice(1);
       }
-      child = spawn(command, args, {
-        stdio: ["ignore", "pipe", "pipe"],
-        detached: false,
-      });
+      // Windows .cmd 文件必须 shell:true，macOS/Linux 直接 spawn
+      child = IS_WIN
+        ? spawn(command, args, {
+            stdio: ["ignore", "pipe", "pipe"],
+            detached: false,
+            shell: true,
+          })
+        : spawn(command, args, {
+            stdio: ["ignore", "pipe", "pipe"],
+            detached: false,
+          });
     } catch (e) {
       console.error(`[watchdog] 启动命令 ${id} 失败: ${e.message}`);
       this.processes.set(id, {
@@ -203,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}`);
       }