tt-help-cli-ycl 1.4.85 → 1.4.87

package/src/watch/public/app.js

@@ -3432,6 +3432,8 @@ async function fetchWatchdogData() {
     renderWatchdogDashboard(
       _wdData.clients || [],
       _wdData.clientCommands || {},
+      _wdData.clashCountries || {},
+      _wdData.errorTriggers || {},
     );
   } catch (e) {
     document.getElementById("wdClientsList").textContent =
@@ -3479,7 +3481,12 @@ function esc(s) {
 
 var _wdLastRendered = "";
 
-function renderWatchdogDashboard(clients, clientCommands) {
+function renderWatchdogDashboard(
+  clients,
+  clientCommands,
+  clashCountries,
+  errorTriggers,
+) {
   // 顶栏统计始终更新（textContent 不闪烁）
   var onlineCount = clients.filter(function (c) {
     return c.online;
@@ -3536,7 +3543,9 @@ function renderWatchdogDashboard(clients, clientCommands) {
   // 收集所有卡片：全部注册客户端 + 未上线但有命令配置的 userId
   var allCards = [];
   sortedClients.forEach(function (c) {
-    allCards.push(renderClientCard(c, clientCommands));
+    allCards.push(
+      renderClientCard(c, clientCommands, clashCountries, errorTriggers),
+    );
   });
   // 离线卡也按名称排序
   var offlineUids = [];
@@ -3553,7 +3562,14 @@ function renderWatchdogDashboard(clients, clientCommands) {
     return a.toLowerCase().localeCompare(b.toLowerCase());
   });
   offlineUids.forEach(function (uid) {
-    allCards.push(renderOfflineCard(uid, clientCommands[uid]));
+    allCards.push(
+      renderOfflineCard(
+        uid,
+        clientCommands[uid],
+        clashCountries,
+        errorTriggers,
+      ),
+    );
   });
 
   // 数据指纹：只有变化时才重建卡片 HTML
@@ -3597,7 +3613,7 @@ function renderWatchdogDashboard(clients, clientCommands) {
   }
 }
 
-function renderOfflineCard(userId, cmds) {
+function renderOfflineCard(userId, cmds, clashCountries, errorTriggers) {
   var cmdCount = cmds ? cmds.length : 0;
   return styled(
     "div",
@@ -3666,6 +3682,8 @@ function renderOfflineCard(userId, cmds) {
         "color:#555;font-size:12px",
         "该机器尚未连接看门狗，配置了 " + cmdCount + " 条命令",
       ) +
+      renderCountrySection({}, userId, clashCountries) +
+      renderErrorTriggerSection({}, userId, errorTriggers) +
       renderCmdRows(cmds || [], userId, [], false),
   );
 }
@@ -3700,7 +3718,7 @@ function findAnalysis(llmAnalysis, cmdId) {
   return null;
 }
 
-function renderClientCard(c, clientCommands) {
+function renderClientCard(c, clientCommands, clashCountries, errorTriggers) {
   var os = c.osInfo || {},
     cfg = c.config || {},
     procs = c.processes || [];
@@ -3811,11 +3829,230 @@ function renderClientCard(c, clientCommands) {
     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) +
       renderProxySection(c, userId) +
       renderCmdRows(myCmds, userId, procs, online, c.llmAnalysis),
   );
 }
 
+// ── 节点国家配置区域（看门狗面板中每个客户端卡片） ──
+
+function fmtCountriesArr(v) {
+  if (!v) return "无";
+  var arr = Array.isArray(v) ? v : [v];
+  return arr.length ? arr.join(",") : "无";
+}
+
+function renderCountrySection(c, userId, clashCountries) {
+  if (!userId) return "";
+  var cfgEntry = (clashCountries && clashCountries[userId]) || {};
+  var configured =
+    cfgEntry.countries && cfgEntry.countries.length
+      ? cfgEntry.countries
+      : ["US"];
+  var h = c.clashHealth || {};
+  var meta = h.meta || {};
+  var activeStr = fmtCountriesArr(meta.countryFilter);
+  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: "wdShowCountryModal('" + esc(userId) + "')",
+          style:
+            "padding:2px 8px;font-size:11px;background:#333;color:#fbbf24;" +
+            "border:1px solid #444;border-radius:3px;cursor:pointer",
+          title: "配置此客户端的节点国家（多选，未配置默认 US）",
+        },
+        fmtCountriesArr(configured) + " ⚙️",
+      ) +
+      styled(
+        "span",
+        "color:#666;margin-left:auto",
+        "生效: " + (activeStr !== "无" ? activeStr : "—"),
+      ),
+  );
+}
+
+// ── 节点国家配置弹窗 ──
+
+var _wdCountryUserId = "";
+
+function wdShowCountryModal(userId) {
+  _wdCountryUserId = userId;
+  document.getElementById("wdCountryUserId").textContent = userId;
+  // 预填当前配置
+  var configured = ["US"];
+  if (_wdData && _wdData.clashCountries && _wdData.clashCountries[userId]) {
+    var entry = _wdData.clashCountries[userId];
+    if (entry.countries && entry.countries.length) configured = entry.countries;
+  }
+  var supported = (_wdData && _wdData.supportedCountries) || [
+    "US",
+    "GB",
+    "DE",
+    "FR",
+    "JP",
+    "KR",
+    "SG",
+    "HK",
+    "TW",
+    "RU",
+    "NL",
+    "IN",
+    "CA",
+    "AU",
+    "MY",
+  ];
+  var html = "";
+  for (var i = 0; i < supported.length; i++) {
+    var cc = supported[i];
+    var checked = configured.indexOf(cc) >= 0 ? "checked" : "";
+    html +=
+      '<label style="display:inline-flex;align-items:center;gap:4px;' +
+      "margin:4px;padding:4px 8px;background:#111;border:1px solid #333;" +
+      'border-radius:6px;cursor:pointer;font-size:12px;color:#e0e0e0">' +
+      '<input type="checkbox" class="wd-country-cb" value="' +
+      cc +
+      '" ' +
+      checked +
+      "/> " +
+      cc +
+      "</label>";
+  }
+  document.getElementById("wdCountryList").innerHTML = html;
+  document.getElementById("wdCountryModal").style.display = "flex";
+}
+
+async function wdSetCountries() {
+  var cbs = document.querySelectorAll(".wd-country-cb:checked");
+  var countries = [];
+  for (var i = 0; i < cbs.length; i++) countries.push(cbs[i].value);
+  if (countries.length === 0) {
+    alert("请至少选择一个国家");
+    return;
+  }
+  try {
+    var res = await fetch("/api/watchdog/set-country-filter", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: _wdCountryUserId, countries: countries }),
+    });
+    var d = await res.json();
+    document.getElementById("wdCountryModal").style.display = "none";
+    if (d.ok) {
+      alert(
+        "已配置: " +
+          d.countries.join(",") +
+          "\n\n客户端将在下次心跳时生效（约15秒内）。",
+      );
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
+// ── 错误自动切节点配置区域（看门狗面板中每个客户端卡片） ──
+
+function renderErrorTriggerSection(c, userId, errorTriggers) {
+  if (!userId) return "";
+  var entry = (errorTriggers && errorTriggers[userId]) || null;
+  var enabled = entry ? !!entry.enabled : false;
+  var label = entry
+    ? (enabled ? "已启用" : "已禁用") +
+      " · " +
+      (entry.triggerCount || 10) +
+      "次/" +
+      (entry.minMinutes || 5) +
+      "min"
+    : "未配置（默认禁用）";
+  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: "wdShowErrorTriggerModal('" + 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 _wdErrUserId = "";
+
+function wdShowErrorTriggerModal(userId) {
+  _wdErrUserId = userId;
+  document.getElementById("wdErrUserId").textContent = userId;
+  var entry =
+    _wdData && _wdData.errorTriggers && _wdData.errorTriggers[userId]
+      ? _wdData.errorTriggers[userId]
+      : null;
+  document.getElementById("wdErrEnabled").checked = entry
+    ? !!entry.enabled
+    : false;
+  document.getElementById("wdErrCount").value =
+    (entry && entry.triggerCount) || 10;
+  document.getElementById("wdErrMin").value = (entry && entry.minMinutes) || 5;
+  document.getElementById("wdErrBreak").value =
+    (entry && entry.breakSeconds) || 120;
+  document.getElementById("wdErrorTriggerModal").style.display = "flex";
+}
+
+async function wdSetErrorTrigger() {
+  var config = {
+    enabled: document.getElementById("wdErrEnabled").checked,
+    triggerCount: parseInt(document.getElementById("wdErrCount").value) || 10,
+    minMinutes: parseInt(document.getElementById("wdErrMin").value) || 5,
+    breakSeconds: parseInt(document.getElementById("wdErrBreak").value) || 120,
+  };
+  try {
+    var res = await fetch("/api/watchdog/set-error-trigger", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: _wdErrUserId, config: config }),
+    });
+    var d = await res.json();
+    document.getElementById("wdErrorTriggerModal").style.display = "none";
+    if (d.ok) {
+      alert(
+        config.enabled
+          ? "已开启错误自动切节点\n连续 " +
+              config.triggerCount +
+              " 次 / " +
+              config.minMinutes +
+              " min\n\n客户端将在下次心跳时生效（约15秒内）。"
+          : "已关闭错误自动切节点\n\n客户端将在下次心跳时生效（约15秒内）。",
+      );
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
 // ── 代理节点区域（看门狗面板中每个客户端卡片） ──
 
 function renderProxySection(c, userId) {

package/src/watch/public/index.html

@@ -612,7 +612,62 @@
     </div>
   </div>
 
-  <script src="app.js?v=20260808c"></script>
+  <!-- 节点国家配置弹窗 -->
+  <div id="wdCountryModal"
+    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:520px">
+      <div style="font-size:16px;color:#fbbf24;margin-bottom:4px">🌍 节点国家配置 — <span id="wdCountryUserId"></span></div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">选择该客户端可用的代理节点国家（可多选）。<br>未配置时默认使用 <b
+          style="color:#fbbf24">US</b>。修改后客户端将在下次心跳时生效。</div>
+      <div id="wdCountryList"
+        style="padding:10px;background:#16161e;border:1px solid #333;border-radius:8px;min-height:120px">加载中...</div>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="document.getElementById('wdCountryModal').style.display='none'"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSetCountries()"
+          style="padding:8px 16px;background:#fbbf24;color:#000;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">保存并下发</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- 错误自动切节点配置弹窗 -->
+  <div id="wdErrorTriggerModal"
+    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:#f87171;margin-bottom:4px">🚨 错误自动切节点 — <span id="wdErrUserId"></span></div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">业务程序（explore/auto/refresh 等）连续报错（CDN限流 / 网络异常 / net:: /
+        被封 等）时，自动切换出口节点。<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="wdErrEnabled" style="width:16px;height:16px"> 启用（开启后连续错误达标自动切节点）
+      </label>
+      <div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:8px">
+        <div>
+          <label style="display:block;color:#888;font-size:10px;margin-bottom:2px">连续次数</label>
+          <input id="wdErrCount" type="number" min="1"
+            style="width:100%;padding:6px;background:#111;border:1px solid #333;color:#e0e0e0;border-radius:4px;font-size:11px;box-sizing:border-box">
+        </div>
+        <div>
+          <label style="display:block;color:#888;font-size:10px;margin-bottom:2px">最小分钟</label>
+          <input id="wdErrMin" type="number" min="1"
+            style="width:100%;padding:6px;background:#111;border:1px solid #333;color:#e0e0e0;border-radius:4px;font-size:11px;box-sizing:border-box">
+        </div>
+        <div>
+          <label style="display:block;color:#888;font-size:10px;margin-bottom:2px">中断秒数</label>
+          <input id="wdErrBreak" type="number" min="1"
+            style="width:100%;padding:6px;background:#111;border:1px solid #333;color:#e0e0e0;border-radius:4px;font-size:11px;box-sizing:border-box">
+        </div>
+      </div>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="document.getElementById('wdErrorTriggerModal').style.display='none'"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSetErrorTrigger()"
+          style="padding:8px 16px;background:#f87171;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:12px;font-weight:600">保存并下发</button>
+      </div>
+    </div>
+  </div>
+
+  <script src="app.js?v=20260811b"></script>
 </body>
 
 </html>

package/src/watch/watchdog-server.js

@@ -30,6 +30,29 @@ const LLM_CACHE_TTL = 15 * 60 * 1000; // 15 分钟过期
 // 看门狗客户端下次心跳时取走，取走后清空
 const clashCmdQueue = new Map();
 
+// 国家过滤配置幂等下发记录：userId → JSON.stringify(countries)
+// 仅当配置变化时才入队，避免每次心跳都触发 daemon 刷新候选集
+const lastSentCountries = new Map();
+
+// 支持的节点国家（与 src/clash/checker.js COUNTRY_PATTERNS 保持一致）
+const SUPPORTED_COUNTRIES = [
+  "US",
+  "GB",
+  "DE",
+  "FR",
+  "JP",
+  "KR",
+  "SG",
+  "HK",
+  "TW",
+  "RU",
+  "NL",
+  "IN",
+  "CA",
+  "AU",
+  "MY",
+];
+
 // ── 配置文件读写 ──
 
 function loadConfig() {
@@ -199,6 +222,61 @@ function setClientConfigStored(userId, config) {
   saveConfig(cfg);
 }
 
+// ── 错误触发切换配置管理（per agent，默认不启用，后端下发控制） ──
+
+function getErrorTriggerStored(userId) {
+  if (!userId) return null;
+  const cfg = loadConfig();
+  return (cfg.errorTriggers && cfg.errorTriggers[userId]) || null;
+}
+
+function setErrorTriggerStored(userId, config) {
+  const cfg = loadConfig();
+  if (!cfg.errorTriggers) cfg.errorTriggers = {};
+  cfg.errorTriggers[userId] = config;
+  saveConfig(cfg);
+}
+
+function getAllErrorTriggers() {
+  const cfg = loadConfig();
+  return cfg.errorTriggers || {};
+}
+
+// ── 节点国家配置管理（per agent，默认 US，幂等下发） ──
+
+/** 读取某 agent 的国家配置，未配置时默认 ["US"] */
+function getClientCountries(userId) {
+  if (!userId) return ["US"];
+  const cfg = loadConfig();
+  const entry = cfg.clashCountries && cfg.clashCountries[userId];
+  if (entry && Array.isArray(entry.countries) && entry.countries.length > 0) {
+    return entry.countries;
+  }
+  return ["US"];
+}
+
+/** 设置某 agent 的国家配置（去重、转大写、仅保留白名单） */
+function setClientCountries(userId, countries) {
+  const cleaned = [
+    ...new Set(countries.map((c) => String(c).trim().toUpperCase())),
+  ].filter((c) => SUPPORTED_COUNTRIES.includes(c));
+  if (cleaned.length === 0) cleaned.push("US");
+  const cfg = loadConfig();
+  if (!cfg.clashCountries) cfg.clashCountries = {};
+  cfg.clashCountries[userId] = {
+    countries: cleaned,
+    updatedAt: new Date().toISOString(),
+  };
+  saveConfig(cfg);
+  return cleaned;
+}
+
+/** 返回全部国家配置（供前端展示） */
+function getAllClientCountries() {
+  const cfg = loadConfig();
+  return cfg.clashCountries || {};
+}
+
 // ── 工具函数 ──
 
 function readBody(req) {
@@ -252,8 +330,17 @@ async function handleHeartbeat(params, body, res) {
   const userId = (body.config && body.config.userId) || "";
   const commands = getClientCommands(userId);
 
+  // 幂等下发节点国家配置（默认 US；配置变化时才入队，daemon 端相同则忽略）
+  const countries = getClientCountries(userId);
+  const countryKey = JSON.stringify(countries);
+  const pending = clashCmdQueue.get(userId) || [];
+  if (countryKey !== lastSentCountries.get(userId)) {
+    pending.push({ action: "setCountryFilter", countries });
+    lastSentCountries.set(userId, countryKey);
+  }
+
   // 取出待下发的 Clash 命令（一次性，取走即清空）
-  const clashCommands = clashCmdQueue.get(userId) || [];
+  const clashCommands = pending;
   if (clashCommands.length > 0) {
     clashCmdQueue.delete(userId);
   }
@@ -268,6 +355,7 @@ async function handleHeartbeat(params, body, res) {
     commands,
     clashCommands: clashCommands.length > 0 ? clashCommands : undefined,
     clientConfig: getClientConfigStored(userId),
+    errorTrigger: getErrorTriggerStored(userId),
     serverTime: Date.now(),
   });
 }
@@ -278,6 +366,9 @@ async function handleGetClients(params, body, res) {
   sendJSON(res, 200, {
     clients: onlineClients,
     clientCommands: allCmds,
+    clashCountries: getAllClientCountries(),
+    supportedCountries: SUPPORTED_COUNTRIES,
+    errorTriggers: getAllErrorTriggers(),
     configPath: WATCHDOG_CONFIG_PATH,
   });
 }
@@ -346,7 +437,11 @@ async function handleDeleteClient(params, body, res) {
   const cfg = loadConfig();
   if (cfg.clientCommands) delete cfg.clientCommands[userId];
   if (cfg.clientConfigs) delete cfg.clientConfigs[userId];
+  if (cfg.clashCountries) delete cfg.clashCountries[userId];
+  if (cfg.errorTriggers) delete cfg.errorTriggers[userId];
   saveConfig(cfg);
+  lastSentCountries.delete(userId);
+  clashCmdQueue.delete(userId);
   // 2. 从内存客户端列表中移除所有匹配的客户端
   let removed = 0;
   for (const [clientId, info] of clients) {
@@ -404,6 +499,59 @@ async function handleSwitchNode(params, body, res) {
   sendJSON(res, 200, { ok: true, message: `将在下次心跳时切换到 ${node}` });
 }
 
+/** 配置某 agent 的节点国家过滤（持久化 + 立即入队下发） */
+async function handleSetCountryFilter(params, body, res) {
+  const { userId, countries } = body || {};
+  if (!userId) {
+    sendJSON(res, 400, { error: "缺少 userId" });
+    return;
+  }
+  if (!Array.isArray(countries) || countries.length === 0) {
+    sendJSON(res, 400, { error: 'countries 必须是非空数组，例如 ["US","DE"]' });
+    return;
+  }
+  const cleaned = setClientCountries(userId, countries);
+  // 立即入队下发，并同步幂等记录（避免下次心跳重复补发）
+  const queue = clashCmdQueue.get(userId) || [];
+  queue.push({ action: "setCountryFilter", countries: cleaned });
+  clashCmdQueue.set(userId, queue);
+  lastSentCountries.set(userId, JSON.stringify(cleaned));
+  const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
+  console.error(
+    `[watchdog ${ts}] ${userId} 国家配置已更新: ${cleaned.join(",")}（已入队下发）`,
+  );
+  sendJSON(res, 200, {
+    ok: true,
+    countries: cleaned,
+    message: `已配置 ${cleaned.join(",")}，客户端将在下次心跳时生效`,
+  });
+}
+
+/** 配置某 agent 的错误触发切换（业务日志连续错误达标时自动切节点；默认不启用） */
+async function handleSetErrorTrigger(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,
+    triggerCount: parseInt(config.triggerCount) || 10,
+    minMinutes: parseInt(config.minMinutes) || 5,
+    breakSeconds: parseInt(config.breakSeconds) || 120,
+  };
+  setErrorTriggerStored(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 });
+}
+
 // ── 公开 ──
 
 export function registerWatchdogRoutes(httpServer) {
@@ -473,5 +621,13 @@ export async function tryHandleWatchdogRoute(
     await handleSwitchNode(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/set-country-filter") {
+    await handleSetCountryFilter(params, body, res);
+    return true;
+  }
+  if (method === "POST" && routePath === "/api/watchdog/set-error-trigger") {
+    await handleSetErrorTrigger(params, body, res);
+    return true;
+  }
   return false;
 }