tt-help-cli-ycl 1.4.5 → 1.4.7

package/package.json

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

package/src/cli/tag.js

@@ -1,7 +1,8 @@
-import { writeFileSync } from "fs";
+import { writeFileSync, unlinkSync } from "fs";
 import { randomUUID } from "crypto";
 import { execSync } from "child_process";
 import os from "os";
+import path from "path";
 import readline from "readline";
 import { fetchTagData, enrichVideosWithLocation } from "../lib/tag-fetcher.js";
 import { killEdgeProcesses, ensureBrowserReady } from "../lib/browser/cdp.js";
@@ -66,10 +67,50 @@ function getBrowserMemory(port = null) {
         cmd =
           'ps aux | grep "[m]sedge" | awk \'{sum += $6} END {printf "%d", sum/1024}\'';
       }
+    } else if (platform === "win32") {
+      // Windows: 用 PowerShell 查 msedge 进程内存（WorkingSet64 → MB）
+      // 用临时 .ps1 文件避免命令行转义问题
+      const ps1Path = path.join(os.tmpdir(), `edge-mem-${Date.now()}.ps1`);
+      try {
+        let ps1Content;
+        if (port) {
+          ps1Content =
+            `$procs = Get-CimInstance Win32_Process -Filter "Name LIKE 'msedge%'" -ErrorAction SilentlyContinue; ` +
+            `$sum = 0; ` +
+            `foreach ($p in $procs) { ` +
+            `  if ($p.CommandLine -and $p.CommandLine -like "*--remote-debugging-port=${port}*") { ` +
+            `    $sum += $p.WorkingSetSize ` +
+            `  } ` +
+            `}; ` +
+            `Write-Output $sum`;
+        } else {
+          ps1Content =
+            `$procs = Get-CimInstance Win32_Process -Filter "Name LIKE 'msedge%'" -ErrorAction SilentlyContinue; ` +
+            `$sum = 0; ` +
+            `foreach ($p in $procs) { $sum += $p.WorkingSetSize }; ` +
+            `Write-Output $sum`;
+        }
+        writeFileSync(ps1Path, ps1Content);
+        cmd = `powershell.exe -NoProfile -ExecutionPolicy Bypass -File "${ps1Path}"`;
+        const result = execSync(cmd, { timeout: 5000 }).toString().trim();
+        try {
+          unlinkSync(ps1Path);
+        } catch {}
+        // PowerShell 返回 WorkingSetSize（字节），需除以 1048576 得 MB
+        const bytes = parseInt(result, 10);
+        const mb = bytes > 0 ? Math.round(bytes / 1048576) : 0;
+        return mb > 0 ? mb : null;
+      } catch {
+        try {
+          unlinkSync(ps1Path);
+        } catch {}
+        return null;
+      }
     } else {
       return null;
     }
-    const result = execSync(cmd, { timeout: 3000 }).toString().trim();
+    // macOS/Linux: ps RSS 是 KB，awk 已除以 1024 得 MB
+    const result = execSync(cmd, { timeout: 5000 }).toString().trim();
     const mb = parseInt(result, 10);
     return mb > 0 ? mb : null;
   } catch {

package/src/lib/browser/cdp.js

@@ -97,6 +97,23 @@ function killEdgeProcesses(targetDir, port) {
         } else {
           command = "true";
         }
+      } else if (port) {
+        // 仅按端口筛选，不误杀其他端口的 Edge 实例
+        let pids = "";
+        try {
+          pids = execSync(
+            `ps aux | grep "[M]icrosoft Edge" | grep -v "Helper\\|crashpad" | grep "remote-debugging-port=${port}" | awk '{print $2}'`,
+          )
+            .toString()
+            .trim();
+        } catch (e) {
+          pids = "";
+        }
+        if (pids) {
+          command = `kill -9 ${pids} 2>/dev/null; rm -f ~/Library/Caches/Microsoft\\ Edge/Singleton*; true`;
+        } else {
+          command = "true";
+        }
       } else {
         command =
           'killall -9 "Microsoft Edge" 2>/dev/null; rm -f ~/Library/Caches/Microsoft\\ Edge/Singleton*; true';
@@ -143,6 +160,8 @@ function killEdgeProcesses(targetDir, port) {
       if (targetDir) {
         const escapedDir = targetDir.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
         command = `ps aux | grep msedge | grep -v Helper | grep -E -- '--user-data-dir=${escapedDir}($|[^A-Za-z0-9_])' | awk '{print $2}' | xargs -r kill -9 2>/dev/null; true`;
+      } else if (port) {
+        command = `ps aux | grep msedge | grep -v Helper | grep "remote-debugging-port=${port}" | awk '{print $2}' | xargs -r kill -9 2>/dev/null; true`;
       } else {
         command = "pkill -9 -f msedge 2>/dev/null; true";
       }