tt-help-cli-ycl 1.4.140 → 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,6 +3651,8 @@ function renderOfflineCard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   var cmdCount = cmds ? cmds.length : 0;
   return tag(
@@ -3654,10 +3664,10 @@ function renderOfflineCard(
     },
     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",
           {
@@ -3696,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(
@@ -3718,6 +3728,8 @@ function renderOfflineCard(
       ) +
       renderCountrySection({}, userId, clashCountries) +
       renderErrorTriggerSection({}, userId, errorTriggers) +
+      renderSwitchRestartSection({}, userId, switchRestarts) +
+      renderAutoUpgradeSection({}, userId, autoUpgrades) +
       renderLoginSection({}, userId, loginPorts) +
       renderCmdRows(cmds || [], userId, [], false),
   );
@@ -3759,6 +3771,8 @@ function renderClientCard(
   clashCountries,
   errorTriggers,
   loginPorts,
+  switchRestarts,
+  autoUpgrades,
 ) {
   var os = c.osInfo || {},
     cfg = c.config || {},
@@ -3787,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";
@@ -3795,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",
         {
@@ -3858,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",
@@ -3891,6 +3914,8 @@ function renderClientCard(
       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),
@@ -4290,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 = "";

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/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 {

package/src/watch/watchdog-server.js

@@ -258,6 +258,46 @@ function getAllErrorTriggers() {
   return cfg.errorTriggers || {};
 }
 
+// ── 代理切换重启配置管理（per agent，默认不启用：切换后不重启，后端下发开启才重启） ──
+
+function getSwitchRestartStored(userId) {
+  if (!userId) return null;
+  const cfg = loadConfig();
+  return (cfg.switchRestarts && cfg.switchRestarts[userId]) || null;
+}
+
+function setSwitchRestartStored(userId, config) {
+  const cfg = loadConfig();
+  if (!cfg.switchRestarts) cfg.switchRestarts = {};
+  cfg.switchRestarts[userId] = config;
+  saveConfig(cfg);
+}
+
+function getAllSwitchRestarts() {
+  const cfg = loadConfig();
+  return cfg.switchRestarts || {};
+}
+
+// ── 自动升级开关配置管理（per agent，默认开启：未配置或 enabled=true 均开启，后端显式关闭才停用） ──
+
+function getAutoUpgradeStored(userId) {
+  if (!userId) return null;
+  const cfg = loadConfig();
+  return (cfg.autoUpgrades && cfg.autoUpgrades[userId]) || null;
+}
+
+function setAutoUpgradeStored(userId, config) {
+  const cfg = loadConfig();
+  if (!cfg.autoUpgrades) cfg.autoUpgrades = {};
+  cfg.autoUpgrades[userId] = config;
+  saveConfig(cfg);
+}
+
+function getAllAutoUpgrades() {
+  const cfg = loadConfig();
+  return cfg.autoUpgrades || {};
+}
+
 // ── 登录端口检测配置管理（per agent，后端配置要检查的 CDP 端口列表） ──
 
 function getLoginPortsStored(userId) {
@@ -438,6 +478,8 @@ async function handleHeartbeat(params, body, res) {
     logRequests: pendingLogs.length > 0 ? pendingLogs : undefined,
     clientConfig: getClientConfigStored(userId),
     errorTrigger: getErrorTriggerStored(userId),
+    switchRestart: getSwitchRestartStored(userId),
+    autoUpgrade: getAutoUpgradeStored(userId),
     loginPorts: getLoginPortsStored(userId),
     serverTime: Date.now(),
   });
@@ -452,6 +494,8 @@ async function handleGetClients(params, body, res) {
     clashCountries: getAllClientCountries(),
     supportedCountries: SUPPORTED_COUNTRIES,
     errorTriggers: getAllErrorTriggers(),
+    switchRestarts: getAllSwitchRestarts(),
+    autoUpgrades: getAllAutoUpgrades(),
     loginPorts: getAllLoginPorts(),
     configPath: WATCHDOG_CONFIG_PATH,
   });
@@ -605,6 +649,8 @@ async function handleDeleteClient(params, body, res) {
   if (cfg.clientConfigs) delete cfg.clientConfigs[userId];
   if (cfg.clashCountries) delete cfg.clashCountries[userId];
   if (cfg.errorTriggers) delete cfg.errorTriggers[userId];
+  if (cfg.switchRestarts) delete cfg.switchRestarts[userId];
+  if (cfg.autoUpgrades) delete cfg.autoUpgrades[userId];
   if (cfg.loginPorts) delete cfg.loginPorts[userId];
   saveConfig(cfg);
   lastSentCountries.delete(userId);
@@ -725,6 +771,52 @@ async function handleSetErrorTrigger(params, body, res) {
   sendJSON(res, 200, { ok: true, config: cleaned });
 }
 
+/** 配置某 agent 的代理切换重启（代理切换后强制重启全部命令；默认不启用） */
+async function handleSetSwitchRestart(params, body, res) {
+  const { userId, config } = body || {};
+  if (!userId) {
+    sendJSON(res, 400, { error: "缺少 userId" });
+    return;
+  }
+  if (!config || typeof config !== "object") {
+    sendJSON(res, 400, { error: "缺少 config 对象" });
+    return;
+  }
+  const cleaned = {
+    enabled: !!config.enabled,
+    updatedAt: new Date().toISOString(),
+  };
+  setSwitchRestartStored(userId, cleaned);
+  const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
+  console.error(
+    `[watchdog ${ts}] ${userId} 代理切换重启配置已更新: ${JSON.stringify(cleaned)}`,
+  );
+  sendJSON(res, 200, { ok: true, config: cleaned });
+}
+
+/** 配置某 agent 的自动升级开关（默认开启；后端显式关闭才停用自动升级检测） */
+async function handleSetAutoUpgrade(params, body, res) {
+  const { userId, config } = body || {};
+  if (!userId) {
+    sendJSON(res, 400, { error: "缺少 userId" });
+    return;
+  }
+  if (!config || typeof config !== "object") {
+    sendJSON(res, 400, { error: "缺少 config 对象" });
+    return;
+  }
+  const cleaned = {
+    enabled: !!config.enabled,
+    updatedAt: new Date().toISOString(),
+  };
+  setAutoUpgradeStored(userId, cleaned);
+  const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
+  console.error(
+    `[watchdog ${ts}] ${userId} 自动升级配置已更新: ${JSON.stringify(cleaned)}`,
+  );
+  sendJSON(res, 200, { ok: true, config: cleaned });
+}
+
 /** 配置某 agent 要检测登录状态的 CDP 端口列表（逗号分隔或数组） */
 async function handleSetLoginPorts(params, body, res) {
   const { userId, ports } = body || {};
@@ -833,6 +925,14 @@ export async function tryHandleWatchdogRoute(
     await handleSetErrorTrigger(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/set-switch-restart") {
+    await handleSetSwitchRestart(params, body, res);
+    return true;
+  }
+  if (method === "POST" && routePath === "/api/watchdog/set-auto-upgrade") {
+    await handleSetAutoUpgrade(params, body, res);
+    return true;
+  }
   if (method === "POST" && routePath === "/api/watchdog/login-ports") {
     await handleSetLoginPorts(params, body, res);
     return true;