tt-help-cli-ycl 1.4.5 → 1.4.6

package/package.json

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

package/src/cli/tag.js

@@ -66,12 +66,28 @@ 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）
+      // 按端口筛选时匹配命令行参数 --remote-debugging-port=PORT
+      if (port) {
+        cmd = `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter 'Name LIKE \\\"msedge%\\\"' | Where-Object { $_.CommandLine -match 'remote-debugging-port=${port}' } | ForEach-Object { $_.WorkingSet64 } | Measure-Object -Sum | Select-Object -ExpandProperty Sum"`;
+      } else {
+        cmd = `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter 'Name LIKE \\\"msedge%\\\"' | ForEach-Object { $_.WorkingSet64 } | Measure-Object -Sum | Select-Object -ExpandProperty Sum"`;
+      }
     } else {
       return null;
     }
-    const result = execSync(cmd, { timeout: 3000 }).toString().trim();
-    const mb = parseInt(result, 10);
-    return mb > 0 ? mb : null;
+    const result = execSync(cmd, { timeout: 5000 }).toString().trim();
+    if (platform === "win32") {
+      // PowerShell 返回 WorkingSet64（字节），需除以 1048576 得 MB
+      const bytes = parseInt(result, 10);
+      const mb = bytes > 0 ? Math.round(bytes / 1048576) : 0;
+      return mb > 0 ? mb : null;
+    } else {
+      // macOS/Linux: ps RSS 是 KB，awk 已除以 1024 得 MB
+      const mb = parseInt(result, 10);
+      return mb > 0 ? mb : null;
+    }
   } catch {
     return null;
   }

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";
       }