tt-help-cli-ycl 1.4.63 → 1.4.64

package/package.json

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

package/src/watchdog/process-manager.js

@@ -18,7 +18,7 @@ const IS_WIN = process.platform === "win32";
 function getProcessStats(pid) {
   try {
     const cmd = IS_WIN
-      ? `tasklist /FI "PID eq ${pid}" /FO CSV /NH`
+      ? `powershell -NoProfile -Command "(Get-Process -Id ${pid} -ErrorAction SilentlyContinue).WorkingSet64"`
       : `ps -p ${pid} -o rss=,etime=`;
     const stdout = execSync(cmd, {
       encoding: "utf-8",
@@ -28,13 +28,13 @@ function getProcessStats(pid) {
     if (!stdout) return null;
 
     if (IS_WIN) {
-      // tasklist CSV: "name.exe","pid","session","session#","mem usage"
-      const cols = stdout.split(",");
-      const memStr = (cols[4] || "").replace(/[^0-9.]/g, "");
-      const memKB = parseInt(memStr, 10);
+      // PowerShell 返回字节数，运行时长从内部 startTime 计算
+      const memBytes = parseInt(stdout, 10);
       return {
-        memoryMB: isNaN(memKB) ? 0 : Math.round((memKB / 1024) * 10) / 10,
-        elapsed: "?",
+        memoryMB: isNaN(memBytes)
+          ? 0
+          : Math.round((memBytes / 1048576) * 10) / 10,
+        elapsed: null,
       };
     }
 
@@ -218,7 +218,21 @@ export class ProcessManager extends EventEmitter {
           : "error",
         memoryMB: stats?.memoryMB ?? 0,
         uptimeSeconds,
-        uptimeDisplay: stats?.elapsed || `${uptimeSeconds}s`,
+        uptimeDisplay:
+          stats?.elapsed ||
+          (function (s) {
+            var m = Math.floor(s / 60);
+            var h = Math.floor(m / 60);
+            m = m % 60;
+            s = s % 60;
+            return h > 0
+              ? h +
+                  ":" +
+                  String(m).padStart(2, "0") +
+                  ":" +
+                  String(s).padStart(2, "0")
+              : m + ":" + String(s).padStart(2, "0");
+          })(uptimeSeconds),
         restartCount: info.restartCount,
         error: info.spawnError || null,
       });