tt-help-cli-ycl 1.4.60 → 1.4.62

package/package.json

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

package/src/watch/watchdog-server.js

@@ -83,9 +83,9 @@ function getOnlineClients() {
 
 function normalizeCmd(c) {
   if (typeof c === "string")
-    return { cmd: c, enabled: true, maxUptimeSeconds: 0, maxMemoryMB: 0 };
+    return { cmd: c.replace(/^[▶\n\r\s]+/, "").trim(), enabled: true, maxUptimeSeconds: 0, maxMemoryMB: 0 };
   return {
-    cmd: c.cmd || "",
+    cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim(),
     enabled: c.enabled !== false,
     maxUptimeSeconds: c.maxUptimeSeconds || 0,
     maxMemoryMB: c.maxMemoryMB || 0,
@@ -108,9 +108,14 @@ function getClientCommands(userId) {
 
 function setClientCommands(userId, commands) {
   if (!Array.isArray(commands)) return;
+  // 清洗每个命令中的非法前缀
+  const cleaned = commands.map((c) => {
+    if (typeof c === "string") return c.replace(/^[▶\n\r\s]+/, "").trim();
+    return { ...c, cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim() };
+  });
   const cfg = loadConfig();
   if (!cfg.clientCommands) cfg.clientCommands = {};
-  cfg.clientCommands[userId] = commands;
+  cfg.clientCommands[userId] = cleaned;
   saveConfig(cfg);
 }
 

package/src/watchdog/process-manager.js

@@ -13,14 +13,31 @@ import { spawn, execSync } from "child_process";
 import { EventEmitter } from "events";
 
 const MAX_RESTART = 3;
+const IS_WIN = process.platform === "win32";
 
 function getProcessStats(pid) {
   try {
-    const stdout = execSync(`ps -p ${pid} -o rss=,etime=`, {
+    const cmd = IS_WIN
+      ? `tasklist /FI "PID eq ${pid}" /FO CSV /NH`
+      : `ps -p ${pid} -o rss=,etime=`;
+    const stdout = execSync(cmd, {
       encoding: "utf-8",
       timeout: 3000,
+      stdio: ["ignore", "pipe", "ignore"],
     }).trim();
     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);
+      return {
+        memoryMB: isNaN(memKB) ? 0 : Math.round((memKB / 1024) * 10) / 10,
+        elapsed: "?",
+      };
+    }
+
     const parts = stdout.split(/\s+/);
     const rssKB = parseInt(parts[0], 10);
     const elapsed = parts.slice(1).join(" ") || "0";
@@ -223,7 +240,8 @@ export class ProcessManager extends EventEmitter {
       .map((c) => {
         if (typeof c === "string")
           c = { cmd: c, maxUptimeSeconds: 0, maxMemoryMB: 0 };
-        const cmdLine = (c.cmd || "").trim();
+        // 清洗：去除可能混入的控制字符、状态图标等
+        const cmdLine = (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim();
         if (!cmdLine) return null;
         const id =
           cmdLine.length > 60 ? cmdLine.substring(0, 60) + "..." : cmdLine;