tt-help-cli-ycl 1.4.139 → 1.4.142

package/src/watch/public/app.js

@@ -3450,6 +3450,8 @@ async function fetchWatchdogData() {
       _wdData.clashCountries || {},
       _wdData.errorTriggers || {},
       _wdData.loginPorts || {},
+      _wdData.switchRestarts || {},
+      _wdData.autoUpgrades || {},
     );
   } catch (e) {
     document.getElementById("wdClientsList").textContent =
@@ -3503,6 +3505,8 @@ function renderWatchdogDashboard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   // 顶栏统计始终更新（textContent 不闪烁）
   var onlineCount = clients.filter(function (c) {
@@ -3567,6 +3571,8 @@ function renderWatchdogDashboard(
         clashCountries,
         errorTriggers,
         loginPorts,
+        switchRestarts,
+        autoUpgrades,
       ),
     );
   });
@@ -3592,6 +3598,8 @@ function renderWatchdogDashboard(
         clashCountries,
         errorTriggers,
         loginPorts,
+        switchRestarts,
+        autoUpgrades,
       ),
     );
   });
@@ -3643,17 +3651,23 @@ function renderOfflineCard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   var cmdCount = cmds ? cmds.length : 0;
-  return styled(
+  return tag(
     "div",
-    "background:#1e1e2e;border:2px solid #f87171;border-radius:12px;padding:16px;opacity:0.9",
+    {
+      class: "wd-client-card",
+      style:
+        "background:#1e1e2e;border:2px solid #f87171;border-radius:12px;padding:16px;opacity:0.9",
+    },
     styled(
       "div",
-      "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
+      "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;flex-wrap:wrap;gap:8px",
       styled(
         "div",
-        "",
+        "display:flex;align-items:center;flex-wrap:wrap;min-width:0;flex:1",
         tag(
           "span",
           {
@@ -3692,7 +3706,7 @@ function renderOfflineCard(
       ) +
         styled(
           "div",
-          "display:flex;gap:10px;align-items:center",
+          "display:flex;gap:10px;align-items:center;flex-wrap:wrap;flex-shrink:0",
           styled("span", "color:#f87171;font-size:13px", "● 离线") +
             styled("span", "color:#555;font-size:12px", "—") +
             tag(
@@ -3714,6 +3728,8 @@ function renderOfflineCard(
       ) +
       renderCountrySection({}, userId, clashCountries) +
       renderErrorTriggerSection({}, userId, errorTriggers) +
+      renderSwitchRestartSection({}, userId, switchRestarts) +
+      renderAutoUpgradeSection({}, userId, autoUpgrades) +
       renderLoginSection({}, userId, loginPorts) +
       renderCmdRows(cmds || [], userId, [], false),
   );
@@ -3755,6 +3771,8 @@ function renderClientCard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   var os = c.osInfo || {},
     cfg = c.config || {},
@@ -3783,7 +3801,10 @@ function renderClientCard(
   var onlineBadge = online
     ? styled("span", "color:#4ade80", "● 在线")
     : styled("span", "color:#f87171", "● 离线");
-  var lastSeen = new Date(c.lastHeartbeat).toLocaleTimeString("zh-CN");
+  // 完整日期时间：跨天离线也能看出最后心跳是哪天
+  var lastSeen = c.lastHeartbeat
+    ? new Date(c.lastHeartbeat).toLocaleString("zh-CN", { hour12: false })
+    : "?";
 
   // 离线时标题和边框变红
   var titleColor = online ? "#60a5fa" : "#f87171";
@@ -3791,10 +3812,10 @@ function renderClientCard(
 
   var header = styled(
     "div",
-    "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px",
+    "display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;flex-wrap:wrap;gap:8px",
     styled(
       "div",
-      "",
+      "display:flex;align-items:center;flex-wrap:wrap;min-width:0;flex:1",
       tag(
         "span",
         {
@@ -3854,10 +3875,16 @@ function renderClientCard(
     ) +
       styled(
         "div",
-        "display:flex;gap:10px;align-items:center",
+        "display:flex;gap:10px;align-items:center;flex-wrap:wrap;flex-shrink:0",
         styled("span", "color:#888;font-size:13px", c.ip) +
           onlineBadge +
-          styled("span", "color:#666;font-size:12px", lastSeen) +
+          styled(
+            "span",
+            online
+              ? "color:#666;font-size:12px"
+              : "color:#fca5a5;font-size:12px",
+            "最后心跳 " + lastSeen,
+          ) +
           (!online && userId
             ? tag(
                 "button",
@@ -3873,16 +3900,22 @@ function renderClientCard(
       ),
   );
 
-  return styled(
+  return tag(
     "div",
-    "background:#1e1e2e;border:2px solid " +
-      borderColor +
-      ";border-radius:12px;padding:16px",
+    {
+      class: "wd-client-card",
+      style:
+        "background:#1e1e2e;border:2px solid " +
+        borderColor +
+        ";border-radius:12px;padding:16px",
+    },
     header +
       styled("div", "color:#888;font-size:12px", osStr) +
       styled("div", "color:#888;font-size:12px;margin-bottom:6px", infoLine) +
       renderCountrySection(c, userId, clashCountries) +
       renderErrorTriggerSection(c, userId, errorTriggers) +
+      renderSwitchRestartSection(c, userId, switchRestarts) +
+      renderAutoUpgradeSection(c, userId, autoUpgrades) +
       renderLoginSection(c, userId, loginPorts) +
       renderProxySection(c, userId) +
       renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis, c.clientId),
@@ -4282,6 +4315,155 @@ function renderErrorTriggerSection(c, userId, errorTriggers) {
   );
 }
 
+// ── 代理切换重启配置区域（看门狗面板中每个客户端卡片） ──
+
+function renderSwitchRestartSection(c, userId, switchRestarts) {
+  if (!userId) return "";
+  var entry = (switchRestarts && switchRestarts[userId]) || null;
+  var enabled = entry ? !!entry.enabled : false;
+  var label = entry ? (enabled ? "已启用" : "已禁用") : "未配置（默认禁用）";
+  var btnColor = enabled ? "#4ade80" : "#888";
+  return styled(
+    "div",
+    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
+      "display:flex;align-items:center;gap:8px;font-size:12px",
+    styled("span", "font-size:14px", "🔁") +
+      styled("span", "color:#888", "切换重启:") +
+      tag(
+        "button",
+        {
+          onclick: "wdShowSwitchRestartModal('" + esc(userId) + "')",
+          style:
+            "padding:2px 8px;font-size:11px;background:#333;color:" +
+            btnColor +
+            ";border:1px solid #444;border-radius:3px;cursor:pointer",
+          title: "代理切换后强制重启全部命令（默认关闭）",
+        },
+        (enabled ? "开 " : "关 ") + "⚙️",
+      ) +
+      styled("span", "color:#666;margin-left:auto", label),
+  );
+}
+
+// ── 代理切换重启配置弹窗 ──
+
+var _wdSwitchUserId = "";
+
+function wdShowSwitchRestartModal(userId) {
+  _wdSwitchUserId = userId;
+  document.getElementById("wdSwitchUserId").textContent = userId;
+  var entry =
+    _wdData && _wdData.switchRestarts && _wdData.switchRestarts[userId]
+      ? _wdData.switchRestarts[userId]
+      : null;
+  document.getElementById("wdSwitchEnabled").checked = entry
+    ? !!entry.enabled
+    : false;
+  document.getElementById("wdSwitchRestartModal").style.display = "flex";
+}
+
+async function wdSetSwitchRestart() {
+  var config = {
+    enabled: document.getElementById("wdSwitchEnabled").checked,
+  };
+  try {
+    var res = await fetch("/api/watchdog/set-switch-restart", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: _wdSwitchUserId, config: config }),
+    });
+    var d = await res.json();
+    document.getElementById("wdSwitchRestartModal").style.display = "none";
+    if (d.ok) {
+      alert(
+        config.enabled
+          ? "已开启代理切换重启\n\n代理节点切换后，客户端将强制重启全部命令。\n客户端将在下次心跳时生效（约15秒内）。"
+          : "已关闭代理切换重启\n\n客户端将在下次心跳时生效（约15秒内）。",
+      );
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
+// ── 自动升级开关（默认开启，后端可下发关闭） ──
+
+function renderAutoUpgradeSection(c, userId, autoUpgrades) {
+  if (!userId) return "";
+  var entry = (autoUpgrades && autoUpgrades[userId]) || null;
+  var enabled = entry ? !!entry.enabled : true; // 未配置默认开启
+  var label = enabled ? "已开启" : "已关闭";
+  var btnColor = enabled ? "#4ade80" : "#f87171";
+  return styled(
+    "div",
+    "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
+      "display:flex;align-items:center;gap:8px;font-size:12px",
+    styled("span", "font-size:14px", "🚀") +
+      styled("span", "color:#888", "自动升级:") +
+      tag(
+        "button",
+        {
+          onclick: "wdShowAutoUpgradeModal('" + esc(userId) + "')",
+          style:
+            "padding:2px 8px;font-size:11px;background:#333;color:" +
+            btnColor +
+            ";border:1px solid #444;border-radius:3px;cursor:pointer",
+          title: "看门狗客户端检测到新版本时自动升级（默认开启）",
+        },
+        (enabled ? "开 " : "关 ") + "⚙️",
+      ) +
+      styled("span", "color:#666;margin-left:auto", label),
+  );
+}
+
+// ── 自动升级开关弹窗 ──
+
+var _wdAutoUpgradeUserId = "";
+
+function wdShowAutoUpgradeModal(userId) {
+  _wdAutoUpgradeUserId = userId;
+  document.getElementById("wdAutoUpgradeUserId").textContent = userId;
+  var entry =
+    _wdData && _wdData.autoUpgrades && _wdData.autoUpgrades[userId]
+      ? _wdData.autoUpgrades[userId]
+      : null;
+  // 未配置 = 默认开启
+  document.getElementById("wdAutoUpgradeEnabled").checked = entry
+    ? !!entry.enabled
+    : true;
+  document.getElementById("wdAutoUpgradeModal").style.display = "flex";
+}
+
+async function wdSetAutoUpgrade() {
+  var config = {
+    enabled: document.getElementById("wdAutoUpgradeEnabled").checked,
+  };
+  try {
+    var res = await fetch("/api/watchdog/set-auto-upgrade", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: _wdAutoUpgradeUserId, config: config }),
+    });
+    var d = await res.json();
+    document.getElementById("wdAutoUpgradeModal").style.display = "none";
+    if (d.ok) {
+      alert(
+        config.enabled
+          ? "已开启自动升级\n\n客户端检测到新版本时会自动升级。\n客户端将在下次心跳时生效（约15秒内）。"
+          : "已关闭自动升级\n\n该客户端将不再自动升级新版本（仍可手动升级）。\n客户端将在下次心跳时生效（约15秒内）。",
+      );
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
 // ── 错误自动切节点配置弹窗 ──
 
 var _wdErrUserId = "";
@@ -4353,10 +4535,11 @@ function renderProxySection(c, userId) {
   var h = c.clashHealth;
   if (!h || !h.node) return "";
   var nodes = (h.meta && h.meta.healthyNodes) || [];
+  var delays = (h.meta && h.meta.healthyNodeDelays) || {};
   var hasNodes = nodes.length > 0;
   return (
     renderProxyLine(h, nodes, userId, 0, hasNodes) +
-    renderNodeList(nodes, h.node, userId, 0)
+    renderNodeList(nodes, h.node, userId, 0, delays)
   );
 }
 
@@ -4364,10 +4547,11 @@ function renderProxySection(c, userId) {
 function renderProxyChannel(ch, userId) {
   if (!ch || !ch.node) return "";
   var nodes = (ch.meta && ch.meta.healthyNodes) || [];
+  var delays = (ch.meta && ch.meta.healthyNodeDelays) || {};
   var hasNodes = nodes.length > 0;
   return (
     renderProxyLine(ch, nodes, userId, ch.port || 0, hasNodes) +
-    renderNodeList(nodes, ch.node, userId, ch.port || 0)
+    renderNodeList(nodes, ch.node, userId, ch.port || 0, delays)
   );
 }
 
@@ -4417,31 +4601,49 @@ function renderProxyLine(h, nodes, userId, port, hasNodes) {
 }
 
 /** 节点列表面板（默认隐藏） */
-function renderNodeList(nodes, currentNode, userId, port) {
+function renderNodeList(nodes, currentNode, userId, port, delays) {
   if (!nodes || !nodes.length) return "";
+  delays = delays || {};
 
   var items = "";
   for (var i = 0; i < nodes.length; i++) {
-    items += renderNodeItem(nodes[i], nodes[i] === currentNode, userId, port);
+    items += renderNodeItem(
+      nodes[i],
+      nodes[i] === currentNode,
+      userId,
+      port,
+      delays[nodes[i]],
+    );
   }
 
   var id = "wdNodes-" + wdEscId(userId) + "-" + port;
+  var expanded = _wdExpandedNodes[wdEscId(userId) + "-" + (port || 0)];
   return (
     '<div id="' +
     id +
     '" style="margin-top:4px;border:1px solid #2a2a3a;' +
-    'border-radius:6px;overflow:hidden;display:none">' +
+    "border-radius:6px;overflow:hidden;display:" +
+    (expanded ? "block" : "none") +
+    '">' +
     items +
     "</div>"
   );
 }
 
 /** 单个节点行 */
-function renderNodeItem(name, isActive, userId, port) {
+function renderNodeItem(name, isActive, userId, port, delay) {
   var color = isActive ? "#4ade80" : "#888";
   var bg = isActive ? "background:#1a3a2a;" : "";
   var dot = isActive ? "●" : "○";
   var textColor = isActive ? "#4ade80" : "#aaa";
+  var delayTag =
+    typeof delay === "number" && delay > 0
+      ? '<span style="color:' +
+        (isActive ? "#6ee7a0" : "#777") +
+        ';font-size:10px">' +
+        Math.round(delay) +
+        "ms</span>"
+      : "";
   var action = isActive
     ? '<span style="margin-left:auto;color:#555;font-size:10px">当前</span>'
     : "<button onclick=\"wdSwitchNode('" +
@@ -4455,7 +4657,7 @@ function renderNodeItem(name, isActive, userId, port) {
       'color:#fff;border:none;border-radius:2px;cursor:pointer">切换</button>';
 
   return (
-    '<div style="padding:3px 8px;display:flex;align-items:center;gap:6px;font-size:11px;' +
+    '<div class="wd-hover-row" style="padding:3px 8px;display:flex;align-items:center;gap:6px;font-size:11px;' +
     bg +
     '">' +
     '<span style="color:' +
@@ -4468,6 +4670,7 @@ function renderNodeItem(name, isActive, userId, port) {
     '">' +
     name +
     "</span>" +
+    delayTag +
     action +
     "</div>"
   );
@@ -4475,16 +4678,24 @@ function renderNodeItem(name, isActive, userId, port) {
 
 // ── 交互函数 ──
 
+// 节点列表面板展开状态（key: userId-port → true），自动刷新重渲染时保持展开
+var _wdExpandedNodes = {};
+
 function wdEscId(s) {
   return (s || "").replace(/[^a-zA-Z0-9_-]/g, "_");
 }
 
 function wdToggleNodes(userId, port) {
-  var el = document.getElementById(
-    "wdNodes-" + wdEscId(userId) + "-" + (port || 0),
-  );
+  var key = wdEscId(userId) + "-" + (port || 0);
+  var el = document.getElementById("wdNodes-" + key);
   if (!el) return;
-  el.style.display = el.style.display === "none" ? "block" : "none";
+  var nowHidden = el.style.display === "none";
+  el.style.display = nowHidden ? "block" : "none";
+  if (nowHidden) {
+    _wdExpandedNodes[key] = true;
+  } else {
+    delete _wdExpandedNodes[key];
+  }
 }
 
 function wdSwitchNode(userId, node, port) {
@@ -4578,9 +4789,13 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis, clientId) {
     var restart = p && p.restartCount > 0 ? String(p.restartCount) : "0";
 
     var prefix = "wd-" + esc(userId) + "-" + idx;
-    html += styled(
+    html += tag(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a",
+      {
+        class: "wd-hover-row",
+        style:
+          "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a",
+      },
       styled(
         "span",
         "color:" +
@@ -4710,9 +4925,13 @@ function renderCmdRows(myCmds, userId, procs, isOnline, llmAnalysis, clientId) {
     var sc = p.status === "running" ? "#4ade80" : "#f87171";
     var oid = p.pid || p.cmdId || "?";
     var opre = "wd-" + esc(userId) + "-orphan-" + esc(String(oid));
-    html += styled(
+    html += tag(
       "div",
-      "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a;opacity:0.5",
+      {
+        class: "wd-hover-row",
+        style:
+          "display:grid;grid-template-columns:1fr 50px 55px 55px 50px 80px 40px;gap:4px;padding:4px 0;align-items:center;font-size:12px;border-top:1px solid #1a1a2a;opacity:0.5",
+      },
       styled(
         "span",
         "color:#666;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:monospace",
@@ -4795,8 +5014,7 @@ function wdShowLogsModal(clientId, cmdId, title) {
   _wdLogs.deadline = Date.now() + 90000;
   _wdLogs.gotFirst = false;
   document.getElementById("wdLogsTitle").textContent = "📄 " + title;
-  document.getElementById("wdLogsStatus").textContent =
-    "⏳ 已请求客户端回传…";
+  document.getElementById("wdLogsStatus").textContent = "⏳ 已请求客户端回传…";
   document.getElementById("wdLogsContent").textContent =
     "等待客户端心跳回传日志…\n（心跳周期 ≤15s，最长等待 90s；拿到后会实时刷新）";
   document.getElementById("wdLogsModal").style.display = "flex";

package/src/watch/public/index.html

@@ -667,6 +667,46 @@
     </div>
   </div>
 
+  <!-- 代理切换重启配置弹窗 -->
+  <div id="wdSwitchRestartModal"
+    style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
+    <div style="background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:24px;width:90%;max-width:480px">
+      <div style="font-size:16px;color:#4ade80;margin-bottom:4px">🔁 代理切换重启 — <span id="wdSwitchUserId"></span></div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">代理节点发生切换后，客户端强制重启全部被监控命令（错峰停止 + 错峰启动）。<br><b
+          style="color:#f87171">默认关闭</b>，需手动开启。</div>
+      <label
+        style="display:flex;align-items:center;gap:8px;margin-bottom:12px;color:#e0e0e0;font-size:13px;cursor:pointer">
+        <input type="checkbox" id="wdSwitchEnabled" style="width:16px;height:16px"> 启用（切换后强制重启全部命令）
+      </label>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="document.getElementById('wdSwitchRestartModal').style.display='none'"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSetSwitchRestart()"
+          style="padding:8px 16px;background:#4ade80;color:#000;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">保存并下发</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- 自动升级开关弹窗 -->
+  <div id="wdAutoUpgradeModal"
+    style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
+    <div style="background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:24px;width:90%;max-width:480px">
+      <div style="font-size:16px;color:#4ade80;margin-bottom:4px">🚀 自动升级 — <span id="wdAutoUpgradeUserId"></span></div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">客户端看门狗定期检测新版本并自动升级。<br><b
+          style="color:#4ade80">默认开启</b>，关闭后该客户端不再自动升级（仍可手动升级）。</div>
+      <label
+        style="display:flex;align-items:center;gap:8px;margin-bottom:12px;color:#e0e0e0;font-size:13px;cursor:pointer">
+        <input type="checkbox" id="wdAutoUpgradeEnabled" style="width:16px;height:16px"> 启用（检测到新版本自动升级）
+      </label>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="document.getElementById('wdAutoUpgradeModal').style.display='none'"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSetAutoUpgrade()"
+          style="padding:8px 16px;background:#4ade80;color:#000;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">保存并下发</button>
+      </div>
+    </div>
+  </div>
+
   <!-- 登录检测端口配置弹窗 -->
   <div id="wdLoginPortsModal"
     style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
@@ -704,7 +744,7 @@
     </div>
   </div>
 
-  <script src="app.js?v=20260826"></script>
+  <script src="app.js?v=20260828c"></script>
 </body>
 
 </html>

package/src/watch/public/style.css

@@ -118,6 +118,24 @@ body {
   margin-top: 2px;
 }
 
+/* 看门狗面板：列表行 hover 高亮（内联背景用 !important 覆盖，移开后自动恢复） */
+.wd-hover-row {
+  transition: background 0.08s ease;
+}
+
+.wd-hover-row:hover {
+  background: rgba(96, 165, 250, 0.12) !important;
+}
+
+/* 看门狗面板：客户端卡片 hover 微亮（不改边框，保留离线红色警示） */
+.wd-client-card {
+  transition: background 0.15s ease;
+}
+
+.wd-client-card:hover {
+  background: #232338 !important;
+}
+
 .stat-card.clickable {
   cursor: pointer;
 }

package/src/watch/server.js

@@ -1915,6 +1915,7 @@ export function startWatchServer(
             body.username || "",
             body.stage || "",
             body.errorStack || "",
+            body.hostname || req.headers["x-client-hostname"] || "",
           );
           sendJSON(res, 200, { ok: true });
         } else {