tt-help-cli-ycl 1.4.124 → 1.4.125

package/package.json

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

package/src/cli/open.js

@@ -93,14 +93,20 @@ export async function handleOpen(parsed) {
     // Ctrl+C 关闭浏览器
     process.on("SIGINT", async () => {
       console.error("\n正在关闭浏览器...");
+      // 先优雅断开 CDP 连接（带 3s 超时保护）：进程已被强杀时 close() 会挂起等 close 事件
       try {
-        console.error(`[SIGINT] 正在终止 Edge 进程 (端口: ${port})`);
-        await killEdgeProcesses(userDataDir, port);
-        console.error("[SIGINT] Edge 进程已终止，正在关闭浏览器连接...");
-        await browser.close();
+        await Promise.race([
+          browser.close(),
+          new Promise((r) => setTimeout(r, 3000)),
+        ]);
       } catch (e) {
-        console.error(`[SIGINT] 关闭浏览器时出错: ${e.message}`);
+        console.error(`[SIGINT] 断开浏览器连接时出错: ${e.message}`);
       }
+      // 再强杀 Edge 进程兜底（优雅关闭不保证退出浏览器进程）
+      console.error(`[SIGINT] 正在终止 Edge 进程 (端口: ${port})`);
+      await killEdgeProcesses(userDataDir, port).catch((e) => {
+        console.error(`[SIGINT] 终止 Edge 进程失败: ${e.message}`);
+      });
       console.error("浏览器已关闭");
       process.exit(0);
     });

package/src/lib/browser/cdp.js

@@ -150,8 +150,9 @@ function killEdgeProcesses(targetDir, port) {
           });
           const pids = parseNetstatListeningPids(netstatOut, port);
           if (pids.length > 0) {
+            // 不重定向 stderr：taskkill 的错误信息（拒绝访问/找不到进程）需要可见
             killCmds = pids
-              .map((pid) => `taskkill /F /T /PID ${pid} 2>nul`)
+              .map((pid) => `taskkill /F /T /PID ${pid}`)
               .join(" & ");
             console.error(
               `[killEdgeProcesses] 端口 ${port} 监听进程 PID: ${pids.join(", ")}`,
@@ -160,10 +161,27 @@ function killEdgeProcesses(targetDir, port) {
         } catch (e) {
           console.error(`[killEdgeProcesses] netstat 查询失败: ${e.message}`);
         }
+        if (killCmds) {
+          // 同步执行并打印结果：taskkill 失败（权限/会话不匹配等）必须可见，不能静默吞掉
+          const killCmd = `(${killCmds})`;
+          try {
+            const out = execSync(killCmd, {
+              encoding: "utf-8",
+              timeout: 15000,
+              windowsHide: true,
+            });
+            const lines = out.trim().split(/\r?\n/).filter(Boolean);
+            console.error(
+              `[killEdgeProcesses] taskkill 结果: ${lines.join(" | ") || "(无输出)"}`,
+            );
+          } catch (e) {
+            console.error(`[killEdgeProcesses] taskkill 失败: ${e.message}`);
+            const detail = `${e.stdout || ""}${e.stderr || ""}`.trim();
+            if (detail) console.error(`[killEdgeProcesses] 详情: ${detail}`);
+          }
+        }
         // 找不到监听进程 = 浏览器可能已退出，不做按进程名的兜底（避免误杀其他端口实例）
-        command = killCmds
-          ? `(${killCmds}); del /f /q "%LOCALAPPDATA%\\Microsoft\\Edge\\Singleton*" 2>nul; exit 0`
-          : "exit 0";
+        command = `del /f /q "%LOCALAPPDATA%\\Microsoft\\Edge\\Singleton*" 2>nul; exit 0`;
       } else {
         command = "taskkill /F /IM msedge.exe 2>nul || exit 0";
       }

package/src/watchdog/upgrader.js

@@ -467,7 +467,9 @@ async function listWatchdogPids() {
       .map((s) => parseInt(s.trim(), 10))
       .filter((n) => n > 0);
   } catch (e) {
-    console.error(`[upgrader] 枚举 watchdog 进程失败（WMI 不可用？）: ${e.message}`);
+    console.error(
+      `[upgrader] 枚举 watchdog 进程失败（WMI 不可用？）: ${e.message}`,
+    );
     return [];
   }
 }