tt-help-cli-ycl 1.4.69 → 1.4.70

package/package.json

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

package/src/watchdog/process-manager.js

@@ -11,10 +11,23 @@
 
 import { spawn, execSync } from "child_process";
 import { EventEmitter } from "events";
+import { killEdgeProcesses } from "../lib/browser/cdp.js";
 
 const MAX_RESTART = 3;
 const IS_WIN = process.platform === "win32";
 
+// 从命令行中提取 CDP 端口列表（解析 --base-port 和 --port-count）
+function extractCdpPorts(cmdLine) {
+  const match = cmdLine.match(/--base-port\s+(\d+)/);
+  if (!match) return [];
+  const base = parseInt(match[1], 10);
+  const countMatch = cmdLine.match(/--port-count\s+(\d+)/);
+  const count = countMatch ? parseInt(countMatch[1], 10) : 1;
+  const ports = [];
+  for (let i = 0; i < count; i++) ports.push(base + i);
+  return ports;
+}
+
 // 引号感知的命令拆分："a b" "c d" → ["a b", "c d"]
 function splitCommand(cmdLine) {
   const parts = [];
@@ -112,9 +125,9 @@ export class ProcessManager extends EventEmitter {
         command = parts[0] || command;
         args = parts.slice(1);
       }
-      // Windows .cmd 文件必须 shell:true，macOS/Linux 直接 spawn
+      // Windows .cmd 必须 shell:true；为免 DEP0190 警告，传完整命令行字符串
       child = IS_WIN
-        ? spawn(command, args, {
+        ? spawn([command, ...args].join(" "), {
             stdio: ["ignore", "pipe", "pipe"],
             detached: false,
             shell: true,
@@ -210,6 +223,10 @@ export class ProcessManager extends EventEmitter {
 
     if (info.child) {
       try {
+        // 先从命令行提取 CDP 端口，用于关闭脱离进程树的浏览器
+        const cmdLine = info.cmdDef?.command || "";
+        const ports = extractCdpPorts(cmdLine);
+
         if (IS_WIN) {
           // Windows: shell:true 产生 cmd.exe 中间层，必须杀整个进程树
           execSync(`taskkill /PID ${info.child.pid} /T /F`, {
@@ -227,6 +244,11 @@ export class ProcessManager extends EventEmitter {
             } catch {}
           }, 2000);
         }
+
+        // 全平台：关闭脱离进程树的浏览器（open -a / start msedge 启动的）
+        for (const port of ports) {
+          killEdgeProcesses(null, port);
+        }
       } catch (e) {
         console.error(`[watchdog] 停止命令 ${cmdId} 失败: ${e.message}`);
       }