tt-help-cli-ycl 1.4.62 → 1.4.64

package/package.json

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

package/src/cli/watchdog.js

@@ -21,8 +21,14 @@ export async function handleWatchdog(options) {
   const serverUrl =
     watchdogServer || clientConfig.server || "http://127.0.0.1:3001";
 
-  // 客户端 ID
-  const clientId = watchdogClientId || os.hostname() || `node-${process.pid}`;
+  // 客户端 ID：优先 --client-id，其次 userId@hostname，最后 hostname+pid
+  const userId = clientConfig.userId || "";
+  const hostname = os.hostname() || "";
+  const clientId =
+    watchdogClientId ||
+    (userId && hostname ? `${userId}@${hostname}` : null) ||
+    hostname ||
+    `node-${process.pid}`;
 
   // 心跳间隔
   const intervalSec = Math.max(5, parseInt(watchdogInterval) || 15);

package/src/watch/public/app.js

@@ -3475,7 +3475,10 @@ function esc(s) {
 
 // ── 渲染主函数 ──
 
+var _wdLastRendered = "";
+
 function renderWatchdogDashboard(clients, clientCommands) {
+  // 顶栏统计始终更新（textContent 不闪烁）
   var onlineCount = clients.filter(function (c) {
     return c.online;
   }).length;
@@ -3484,27 +3487,48 @@ function renderWatchdogDashboard(clients, clientCommands) {
   }, 0);
   var cmdCount = 0;
   for (var k in clientCommands) cmdCount += clientCommands[k].length;
-
   document.getElementById("wdOnlineCount").textContent = onlineCount;
   document.getElementById("wdProcessCount").textContent = procCount;
   document.getElementById("wdCmdCount").textContent = cmdCount;
 
   var el = document.getElementById("wdClientsList");
 
-  if (clients.length === 0) {
-    el.innerHTML = styled(
+  // 空状态：无客户端且无配置的命令
+  if (clients.length === 0 && cmdCount === 0) {
+    var emptyHtml = styled(
       "div",
       "color:#666;padding:30px;text-align:center",
       "暂无客户端连接，等待看门狗上线...（每10秒自动刷新）",
     );
+    if (_wdLastRendered !== emptyHtml) {
+      _wdLastRendered = emptyHtml;
+      el.innerHTML = emptyHtml;
+    }
     return;
   }
 
-  var cards = clients
-    .map(function (c) {
-      return renderClientCard(c, clientCommands);
-    })
-    .join("");
+  // 构建 userId → 在线客户端 映射
+  var userClients = {};
+  clients.forEach(function (c) {
+    var uid = (c.config && c.config.userId) || "";
+    if (uid) userClients[uid] = c;
+  });
+
+  // 收集所有卡片：在线客户端 + 离线但有命令配置的 userId
+  var allCards = [];
+  clients.forEach(function (c) {
+    allCards.push(renderClientCard(c, clientCommands));
+  });
+  for (var uid in clientCommands) {
+    if (!userClients[uid]) {
+      allCards.push(renderOfflineCard(uid, clientCommands[uid]));
+    }
+  }
+
+  // 数据指纹：只有变化时才重建卡片 HTML
+  var fingerprint = JSON.stringify(allCards);
+  if (fingerprint === _wdLastRendered) return;
+  _wdLastRendered = fingerprint;
 
   el.innerHTML = styled(
     "div",
@@ -3512,7 +3536,41 @@ function renderWatchdogDashboard(clients, clientCommands) {
       style:
         "display:grid;grid-template-columns:repeat(auto-fill,minmax(440px,1fr));gap:16px",
     },
-    cards,
+    allCards.join(""),
+  );
+}
+
+function renderOfflineCard(userId, cmds) {
+  var cmdCount = cmds ? cmds.length : 0;
+  return styled(
+    "div",
+    "background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:16px;opacity:0.7",
+    styled(
+      "div",
+      "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
+      styled(
+        "div",
+        "",
+        styled("strong", "color:#666;font-size:14px", userId) +
+          styled(
+            "span",
+            "color:#555;font-size:11px;margin-left:8px",
+            "(未上线)",
+          ),
+      ) +
+        styled(
+          "div",
+          "display:flex;gap:10px;align-items:center",
+          styled("span", "color:#f87171", "● 离线") +
+            styled("span", "color:#555;font-size:10px", "—"),
+        ),
+    ) +
+      styled(
+        "div",
+        "color:#555;font-size:10px",
+        "该机器尚未连接看门狗，配置了 " + cmdCount + " 条命令",
+      ) +
+      renderCmdList(cmds || [], userId),
   );
 }
 

package/src/watch/public/index.html

@@ -506,6 +506,10 @@
         <div class="label">命令池</div>
         <div class="value slate" id="wdCmdCount">0</div>
       </div>
+      <div class="stat-card clickable" onclick="fetchWatchdogData()" style="background:rgba(96,165,250,0.05)">
+        <div class="label" style="font-size:18px">🔄</div>
+        <div class="value" style="font-size:11px;color:#60a5fa">刷新</div>
+      </div>
     </div>
     <div id="wdClientsList" style="color:#666;font-size:12px">加载中...</div>
   </div>

package/src/watch/watchdog-server.js

@@ -83,7 +83,12 @@ function getOnlineClients() {
 
 function normalizeCmd(c) {
   if (typeof c === "string")
-    return { cmd: c.replace(/^[▶\n\r\s]+/, "").trim(), enabled: true, maxUptimeSeconds: 0, maxMemoryMB: 0 };
+    return {
+      cmd: c.replace(/^[▶\n\r\s]+/, "").trim(),
+      enabled: true,
+      maxUptimeSeconds: 0,
+      maxMemoryMB: 0,
+    };
   return {
     cmd: (c.cmd || "").replace(/^[▶\n\r\s]+/, "").trim(),
     enabled: c.enabled !== false,

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,
       });