tt-help-cli-ycl 1.4.68 → 1.4.70

package/package.json

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

package/src/cli/auto.js

@@ -5,7 +5,10 @@ import {
 } from "../lib/browser/page.js";
 import { userId as configuredUserId, saveUserId } from "../lib/constants.js";
 import { getMacOrUuid } from "../lib/mac-or-uuid.js";
-import { ensureBrowserReady as ensureBrowserReadyCDP } from "../lib/browser/cdp.js";
+import {
+  ensureBrowserReady as ensureBrowserReadyCDP,
+  killEdgeProcesses,
+} from "../lib/browser/cdp.js";
 import { createApiClient } from "../lib/api-client.js";
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
@@ -47,6 +50,8 @@ export async function handleAuto(options) {
     if (shuttingDown) return;
     shuttingDown = true;
     console.error(`\n[Auto] 收到 ${signal}，正在关闭浏览器...`);
+    // 先杀死 Edge 进程（CDP 模式下 browser.close() 只断开连接，不杀进程）
+    await killEdgeProcesses();
     await browser?.close().catch(() => {});
     console.error("[Auto] 已退出");
     process.exit(0);

package/src/cli/explore.js

@@ -20,6 +20,7 @@ import {
 import { getMacOrUuid } from "../lib/mac-or-uuid.js";
 import {
   ensureBrowserReady as ensureBrowserReadyCDP,
+  killEdgeProcesses,
   switchAccount,
 } from "../lib/browser/cdp.js";
 import { showResourceUsage } from "../utils/index.js";
@@ -73,12 +74,17 @@ export async function handleExplore(options) {
 
   let userId = exploreUserId || configuredUserId;
   let browser = null;
+  let cdpOptions = null;
   let shuttingDown = false;
 
   const shutdown = async (signal) => {
     if (shuttingDown) return;
     shuttingDown = true;
     console.error(`\n[Explore] 收到 ${signal}，正在关闭浏览器...`);
+    // 先杀死 Edge 进程（CDP 模式下 browser.close() 只断开连接，不杀进程）
+    if (cdpOptions) {
+      await killEdgeProcesses(cdpOptions.userDataDir, cdpOptions.port);
+    }
     await browser?.close().catch(() => {});
     console.error("[Explore] 已退出");
     process.exit(0);
@@ -117,7 +123,7 @@ export async function handleExplore(options) {
     });
     let currentAccount = healthChecker.getCurrentAccount();
 
-    const cdpOptions = {};
+    cdpOptions = {};
     if (explorePort) {
       // 固定端口模式（调试用，关闭自动轮换）
       cdpOptions.port = explorePort;

package/src/cli/refresh.js

@@ -20,6 +20,7 @@ import {
 import { getMacOrUuid } from "../lib/mac-or-uuid.js";
 import {
   ensureBrowserReady as ensureBrowserReadyCDP,
+  killEdgeProcesses,
   switchAccount,
 } from "../lib/browser/cdp.js";
 import { HealthChecker } from "../lib/browser/health-checker.js";
@@ -72,12 +73,17 @@ export async function handleRefresh(options) {
 
   let userId = exploreUserId || configuredUserId;
   let browser = null;
+  let cdpOptions = null;
   let shuttingDown = false;
 
   const shutdown = async (signal) => {
     if (shuttingDown) return;
     shuttingDown = true;
     console.error(`\n[Refresh] 收到 ${signal}，正在关闭浏览器...`);
+    // 先杀死 Edge 进程（CDP 模式下 browser.close() 只断开连接，不杀进程）
+    if (cdpOptions) {
+      await killEdgeProcesses(cdpOptions.userDataDir, cdpOptions.port);
+    }
     await browser?.close().catch(() => {});
     console.error("[Refresh] 已退出");
     process.exit(0);
@@ -124,7 +130,7 @@ export async function handleRefresh(options) {
     });
     let currentAccount = healthChecker.getCurrentAccount();
 
-    const cdpOptions = {};
+    cdpOptions = {};
     if (explorePort) {
       cdpOptions.port = explorePort;
       cdpOptions.userDataDir = path.join(

package/src/watch/public/app.js

@@ -1344,6 +1344,11 @@ function showMainPage() {
   document.getElementById("targetPage").classList.remove("active");
   document.getElementById("tagsPage").classList.remove("active");
   document.getElementById("settingsPage").classList.remove("active");
+  document.getElementById("watchdogPage").classList.remove("active");
+  if (_wdRefreshTimer) {
+    clearInterval(_wdRefreshTimer);
+    _wdRefreshTimer = null;
+  }
 }
 
 function navigateToTarget() {
@@ -3816,7 +3821,7 @@ function renderCmdList(myCmds, userId) {
     );
   });
 
-  return html + "</div>";
+  return html;
 }
 
 // ── 命令管理操作 ──
@@ -3896,6 +3901,13 @@ function wdToggleClientCmd(userId, idx) {
   } else {
     cmd.enabled = !cmd.enabled;
   }
+  // 立即更新按钮为 loading 状态
+  var btn = event.target;
+  if (btn && btn.tagName === "BUTTON") {
+    btn.textContent = "⏳";
+    btn.style.pointerEvents = "none";
+    btn.style.opacity = "0.5";
+  }
   wdSaveClientCmds(userId, myCmds);
 }
 
@@ -3909,6 +3921,8 @@ async function wdSaveClientCmds(userId, commands) {
     fetchWatchdogData();
   } catch (e) {
     alert("保存失败: " + e.message);
+    // 失败时立即刷新恢复按钮状态
+    fetchWatchdogData();
   }
 }
 

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}`);
       }