tt-help-cli-ycl 1.3.77 → 1.3.78

package/package.json

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

package/src/cli/open.js

@@ -94,8 +94,8 @@ export async function handleOpen(parsed) {
     process.on("SIGINT", async () => {
       console.error("\n正在关闭浏览器...");
       try {
-        console.error(`[SIGINT] 正在终止 Edge 进程 (userDataDir: ${userDataDir})`);
-        await killEdgeProcesses(userDataDir);
+        console.error(`[SIGINT] 正在终止 Edge 进程 (端口: ${port})`);
+        await killEdgeProcesses(userDataDir, port);
         console.error("[SIGINT] Edge 进程已终止，正在关闭浏览器连接...");
         await browser.close();
       } catch (e) {

package/src/lib/browser/cdp.js

@@ -70,7 +70,7 @@ function checkEdgeArgs() {
   });
 }
 
-function killEdgeProcesses(targetDir) {
+function killEdgeProcesses(targetDir, port) {
   return new Promise((resolve) => {
     const platform = os.platform();
     let command;
@@ -102,20 +102,16 @@ function killEdgeProcesses(targetDir) {
           'killall -9 "Microsoft Edge" 2>/dev/null; rm -f ~/Library/Caches/Microsoft\\ Edge/Singleton*; true';
       }
     } else if (platform === "win32") {
-      if (targetDir) {
+      if (port) {
+        // 用端口匹配（纯数字，无编码问题），而不是 userDataDir 路径（中文路径会乱码）
         try {
           const ps1Path = path.join(os.tmpdir(), `kill-edge-${Date.now()}.ps1`);
-          const escapedDir = targetDir.replace(/'/g, "''");
           const ps1Content =
             `$procs = Get-CimInstance Win32_Process -Filter "Name='msedge.exe'" 2>$null; ` +
-            `Write-Output "TOTAL_MSEDGE_PROCS: $($procs.Count)"; ` +
-            `foreach ($p in $procs) { ` +
-            `  Write-Output "PROC_PID=$($p.ProcessId) CMD=$($p.CommandLine)"; ` +
-            `}; ` +
             `$count = 0; ` +
             `$pids = @(); ` +
             `foreach ($p in $procs) { ` +
-            `  if ($p.CommandLine -and $p.CommandLine -like "*${escapedDir}*") { ` +
+            `  if ($p.CommandLine -and $p.CommandLine -like "*--remote-debugging-port=${port}*") { ` +
             `    $pids += $p.ProcessId; ` +
             `    Stop-Process -Id $p.ProcessId -Force -ErrorAction SilentlyContinue; ` +
             `    $count++ ` +
@@ -132,7 +128,9 @@ function killEdgeProcesses(targetDir) {
             .toString()
             .trim();
           console.error(`[killEdgeProcesses] Windows PS result: ${result}`);
-          try { fs.unlinkSync(ps1Path); } catch {}
+          try {
+            fs.unlinkSync(ps1Path);
+          } catch {}
           command = "exit 0";
         } catch (e) {
           console.error(`[killEdgeProcesses] Windows PS failed: ${e.message}`);
@@ -222,7 +220,7 @@ export async function ensureBrowserReady(options = {}) {
       const edgeArgsValid = await checkEdgeArgs();
       if (!edgeArgsValid) {
         console.error(`Edge 已运行但启动参数不完整，正在重启端口 ${port}...`);
-        await killEdgeProcesses(userDataDir);
+        await killEdgeProcesses(userDataDir, port);
         await new Promise((r) => setTimeout(r, 3000));
         needLaunch = true;
       }
@@ -238,7 +236,7 @@ export async function ensureBrowserReady(options = {}) {
       const edgeRunning = await isEdgeRunning();
       if (edgeRunning) {
         console.error(`Edge 已运行但 CDP 端口 ${port} 未启用，正在重启...`);
-        await killEdgeProcesses(userDataDir);
+        await killEdgeProcesses(userDataDir, port);
         await new Promise((r) => setTimeout(r, 3000));
       } else {
         console.error(`CDP 端口 ${port} 未就绪，正在启动 Edge 浏览器...`);
@@ -266,7 +264,7 @@ export async function switchAccount(oldAccount, newAccount, proxyServer) {
   console.error(`  [账户切换] 等待 30 秒，请完成当前操作后自动切换...`);
   await new Promise((r) => setTimeout(r, 30000));
 
-  await killEdgeProcesses(oldAccount.userDataDir);
+  await killEdgeProcesses(oldAccount.userDataDir, oldAccount.port);
   await new Promise((r) => setTimeout(r, 3000));
 
   const newCdpOptions = {};

package/src/lib/browser/page.js

@@ -31,7 +31,7 @@ export async function relaunchBrowser(cdpOptions, port) {
   console.error(`  [浏览器] 浏览器已关闭，正在重启 (端口 ${port})...`);
   const targetDir = cdpOptions.userDataDir || DEFAULT_USER_DATA_DIR;
   // kill 并清理 Singleton 锁文件，确保 Edge 能启动新实例
-  await killEdgeProcesses(targetDir);
+  await killEdgeProcesses(targetDir, port);
   await new Promise((r) => setTimeout(r, 3000));
   // 确保端口已释放后再启动
   let retries = 0;
@@ -43,7 +43,7 @@ export async function relaunchBrowser(cdpOptions, port) {
         retries++;
         console.error(`  [浏览器] CDP 连接异常，重试 ${retries}/5...`);
         await new Promise((r) => setTimeout(r, 3000));
-        await killEdgeProcesses(targetDir);
+        await killEdgeProcesses(targetDir, port);
         await new Promise((r) => setTimeout(r, 5000));
         continue;
       }