tt-help-cli-ycl 1.3.74 → 1.3.76

package/package.json

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

package/src/cli/open.js

@@ -94,10 +94,12 @@ 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 进程已终止，正在关闭浏览器连接...");
         await browser.close();
-      } catch {
-        /* ignore */
+      } catch (e) {
+        console.error(`[SIGINT] 关闭浏览器时出错: ${e.message}`);
       }
       console.error("浏览器已关闭");
       process.exit(0);

package/src/lib/browser/cdp.js

@@ -109,12 +109,16 @@ function killEdgeProcesses(targetDir) {
           const ps1Content =
             `$procs = Get-CimInstance Win32_Process -Filter "Name='msedge.exe'" 2>$null; ` +
             `$count = 0; ` +
+            `$pids = @(); ` +
             `foreach ($p in $procs) { ` +
             `  if ($p.CommandLine -and $p.CommandLine -like "*${escapedDir}*") { ` +
+            `    $pids += $p.ProcessId; ` +
             `    Stop-Process -Id $p.ProcessId -Force -ErrorAction SilentlyContinue; ` +
             `    $count++ ` +
             `  } ` +
             `}; ` +
+            `Write-Output "KILLED_PIDS: $($pids -join ',')"; ` +
+            `Start-Sleep -Milliseconds 500; ` +
             `Get-ChildItem "$env:LOCALAPPDATA\\Microsoft\\Edge\\Singleton*" -ErrorAction SilentlyContinue | Remove-Item -Force; ` +
             `Write-Output $count`;
           fs.writeFileSync(ps1Path, ps1Content);
@@ -123,9 +127,11 @@ function killEdgeProcesses(targetDir) {
           )
             .toString()
             .trim();
-          fs.unlinkSync(ps1Path);
+          console.error(`[killEdgeProcesses] Windows PS result: ${result}`);
+          try { fs.unlinkSync(ps1Path); } catch {}
           command = "exit 0";
-        } catch {
+        } catch (e) {
+          console.error(`[killEdgeProcesses] Windows PS failed: ${e.message}`);
           command = "taskkill /F /IM msedge.exe 2>nul || exit 0";
         }
       } else {