tt-help-cli-ycl 1.4.168 → 1.4.171

package/src/watch/public/app.js

@@ -710,20 +710,28 @@ const DEFAULT_LOCATION_OPTIONS = [
 ];
 let locationOptions = [...DEFAULT_LOCATION_OPTIONS];
 
-async function openLocationModal(uniqueId, currentLocation) {
-  let overlay = document.getElementById("locationModalOverlay");
-  if (overlay) return;
-  // 优先使用服务端配置的目标国家作为候选，失败则回退默认
+/** 从服务端拉取动态目标国家，刷新 locationOptions（失败回退默认） */
+async function refreshLocationOptions() {
   try {
     const res = await fetch("/api/settings/target-locations");
     const data = await res.json();
     const locs = (data.locations || []).filter(Boolean);
     if (locs.length) {
       locationOptions = [...new Set([...locs, ...DEFAULT_LOCATION_OPTIONS])];
+    } else {
+      locationOptions = [...DEFAULT_LOCATION_OPTIONS];
     }
   } catch {
     locationOptions = [...DEFAULT_LOCATION_OPTIONS];
   }
+  return locationOptions;
+}
+
+async function openLocationModal(uniqueId, currentLocation) {
+  let overlay = document.getElementById("locationModalOverlay");
+  if (overlay) return;
+  // 优先使用服务端配置的目标国家作为候选，失败则回退默认
+  await refreshLocationOptions();
   overlay = document.createElement("div");
   overlay.id = "locationModalOverlay";
   overlay.className = "modal-overlay";
@@ -1920,7 +1928,7 @@ async function saveLlmConfig() {
 
 // ========== 添加关键词弹窗 ==========
 
-function openAddTagModal() {
+async function openAddTagModal() {
   let overlay = document.getElementById("addTagModalOverlay");
   if (overlay) return;
   overlay = document.createElement("div");
@@ -1948,9 +1956,12 @@ function openAddTagModal() {
     if (e.target === overlay) closeAddTagModal();
   });
 
-  // 渲染国家复选框（使用动态目标国家列表，含 TH/US，失败回退默认）
+  // 渲染国家复选框（每次打开都拉取动态目标国家列表，失败回退默认）
   const countryGrid = document.getElementById("addTagCountryCheckboxes");
-  countryGrid.innerHTML = locationOptions
+  countryGrid.innerHTML =
+    '<span style="color:#888;font-size:12px">加载国家列表...</span>';
+  const options = await refreshLocationOptions();
+  countryGrid.innerHTML = options
     .map(
       (c) =>
         `<label class="checkbox-label"><input type="checkbox" value="${c}" checked> ${c}</label>`,
@@ -4078,6 +4089,7 @@ async function fetchWatchdogData() {
     const res = await fetch("/api/watchdog/clients");
     _wdData = await res.json();
     updateWatchdogBadge(_wdData.clients || [], _wdData.clientCommands || {});
+    renderSubscriptionsCenter(_wdData.subscriptions || []);
     renderWatchdogDashboard(
       _wdData.clients || [],
       _wdData.clientCommands || {},
@@ -4753,20 +4765,193 @@ async function wdSetCountries() {
 
 var _wdProxyUserId = "";
 
+/** 读取某节点的 proxySettings 配置项 */
+function wdGetProxyEntry(userId) {
+  return (_wdData && _wdData.proxySettings && _wdData.proxySettings[userId]) || null;
+}
+
+/** 节点列表用模式徽标: auto=⚡自动N条（告警标色）；manual/无配置返回空串 */
+function wdProxyModeBadge(userId) {
+  var e = wdGetProxyEntry(userId);
+  if (!e || e.mode !== "auto") return "";
+  var color = e.allocWarn === "pool-empty" ? "#fbbf24" : e.allocWarn === "count-capped" ? "#f87171" : "#4ade80";
+  var tip = e.allocWarn === "pool-empty"
+    ? "订阅池可用为空，分配保持现状（补池后自动恢复）"
+    : e.allocWarn === "count-capped"
+      ? "数量超上限 8，已截断"
+      : "自动分配（订阅池换血/摊开全自动）";
+  return styled(
+    "span",
+    "display:inline-block;padding:1px 6px;border-radius:8px;font-size:10px;white-space:nowrap;" +
+      "background:" + color + "22;color:" + color + ";border:1px solid " + color + "55;cursor:help",
+    "⚡自动×" + (e.count != null ? e.count : (e.subscriptions || []).length),
+  ).replace("<span", '<span title="' + tip + '"');
+}
+
 function wdShowProxyModal(userId) {
   _wdProxyUserId = userId;
   document.getElementById("wdProxyUserId").textContent = userId;
-  var ta = document.getElementById("wdProxySubsText");
-  var configured = [];
-  if (_wdData && _wdData.proxySettings && _wdData.proxySettings[userId]) {
-    configured = (_wdData.proxySettings[userId].subscriptions || []).map(function (s) {
-      return typeof s === "string" ? s : s.url;
-    });
+  var entry = wdGetProxyEntry(userId);
+  var isAuto = !!(entry && entry.mode === "auto");
+  document.getElementById("wdProxyAutoView").style.display = isAuto ? "block" : "none";
+  document.getElementById("wdProxyManualHint").style.display = isAuto ? "none" : "";
+  document.getElementById("wdProxySubsText").style.display = isAuto ? "none" : "";
+  document.getElementById("wdProxySwitchAutoBtn").style.display = isAuto ? "none" : "";
+  document.getElementById("wdProxySwitchManualBtn").style.display = isAuto ? "" : "none";
+  document.getElementById("wdProxySaveManualBtn").style.display = isAuto ? "none" : "";
+  document.getElementById("wdProxySaveAutoBtn").style.display = isAuto ? "" : "none";
+  var badgeEl = document.getElementById("wdProxyModeBadge");
+  badgeEl.innerHTML = isAuto ? wdProxyModeBadge(userId) : styled("span", "color:#666;font-size:10px", "手动模式");
+  if (isAuto) {
+    wdRenderProxyAutoView(userId);
+  } else {
+    var ta = document.getElementById("wdProxySubsText");
+    var configured = [];
+    if (entry) {
+      configured = (entry.subscriptions || []).map(function (s) {
+        return typeof s === "string" ? s : s.url;
+      });
+    }
+    ta.value = configured.join("\n");
   }
-  ta.value = configured.join("\n");
   document.getElementById("wdProxyModal").style.display = "flex";
 }
 
+/** 订阅池视图按 URL 索引（自动分配表格展示状态用） */
+function wdSubViewByUrl(url) {
+  if (!_wdData || !Array.isArray(_wdData.subscriptions)) return null;
+  for (var i = 0; i < _wdData.subscriptions.length; i++) {
+    if (_wdData.subscriptions[i].url === url) return _wdData.subscriptions[i];
+  }
+  return null;
+}
+
+/** 自动分配视图: 数量输入 + 告警横幅 + alloc 端口映射只读表 */
+function wdRenderProxyAutoView(userId) {
+  var entry = wdGetProxyEntry(userId) || {};
+  var alloc = entry.subscriptions || [];
+  document.getElementById("wdProxyCountInput").value = entry.count != null ? entry.count : alloc.length;
+  var warnEl = document.getElementById("wdProxyAllocWarn");
+  if (entry.allocWarn === "pool-empty") {
+    warnEl.innerHTML = styled("div",
+      "padding:6px 10px;margin-bottom:8px;border-radius:6px;font-size:12px;background:#fbbf2422;color:#fbbf24;border:1px solid #fbbf2455",
+      "⚠️ 订阅池可用订阅为空（全部禁用/到期/耗尽），分配保持现状；往池子补可用订阅后下次心跳自动补齐");
+  } else if (entry.allocWarn === "count-capped") {
+    warnEl.innerHTML = styled("div",
+      "padding:6px 10px;margin-bottom:8px;border-radius:6px;font-size:12px;background:#f8717122;color:#f87171;border:1px solid #f8717155",
+      "⚠️ 实例数量超上限 8，已截断（实例端口段 9097-9104 仅 8 个）");
+  } else {
+    warnEl.innerHTML = "";
+  }
+  var rows = "";
+  if (!alloc.length) {
+    rows = styled("div", "color:#666;font-size:12px;padding:6px", "暂无分配（等待下次心跳从订阅池自动补齐）");
+  }
+  for (var i = 0; i < alloc.length; i++) {
+    var it = alloc[i] || {};
+    var url = it.url || "";
+    var sv = wdSubViewByUrl(url);
+    var name = it.name || (sv && sv.name) || "sub-" + (i + 1);
+    var host = url.replace(/^https?:\/\//, "").split("/")[0];
+    var statusHtml;
+    if (!sv) {
+      statusHtml = styled("span", "color:#6b7280;font-size:11px", "未入池（存量保留）");
+    } else {
+      var st = sv.status || {};
+      statusHtml = styled("span",
+        "display:inline-block;padding:1px 6px;border-radius:8px;font-size:10px;white-space:nowrap;" +
+          "background:" + (st.color || "#6b7280") + "22;color:" + (st.color || "#6b7280") + ";border:1px solid " + (st.color || "#6b7280") + "55",
+        escHtml(st.label || "未知"));
+    }
+    rows += styled("div",
+      "display:flex;align-items:center;gap:10px;padding:4px 2px;border-bottom:1px solid #2a2a3a;font-size:12px;flex-wrap:wrap",
+      styled("span", "color:#94a3b8;width:44px", "实例" + (i + 1)) +
+        styled("span", "color:#6b7280;width:150px;font-family:monospace", ":" + (7897 + i) + " / :" + (9097 + i)) +
+        styled("span", "color:#e0e0e0;font-weight:bold", escHtml(name)) +
+        styled("span", "color:#555;font-size:11px", escHtml(host)) +
+        statusHtml);
+  }
+  document.getElementById("wdProxyAllocTable").innerHTML = rows;
+}
+
+/** 保存实例数量（auto 模式）；count 超限由服务端截断并标红 */
+async function wdSaveProxyCount() {
+  var userId = _wdProxyUserId;
+  var count = parseInt(document.getElementById("wdProxyCountInput").value, 10);
+  if (!Number.isInteger(count) || count <= 0) {
+    alert("请输入正整数实例数量（1～8）");
+    return;
+  }
+  try {
+    var res = await fetch("/api/watchdog/set-proxy-auto", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: userId, count: count }),
+    });
+    var d = await res.json();
+    if (!res.ok || !d.ok) throw new Error(d.error || "HTTP " + res.status);
+    if (_wdData) {
+      _wdData.proxySettings = _wdData.proxySettings || {};
+      _wdData.proxySettings[userId] = d.proxySettings;
+    }
+    wdShowProxyModal(userId); // 留在弹窗内刷新 alloc 表
+    alert(
+      "实例数量已更新为 " +
+        (d.proxySettings && d.proxySettings.count ? d.proxySettings.count : count) +
+        "\n\n服务端已按「粘性槽位 + 摊开」重算分配，客户端下次心跳（约 15 秒）自动热应用。",
+    );
+    fetchWatchdogData();
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
+/** 手动 → 自动（迁移方案 A）: 现有列表原样转 alloc，count=当前条数，切换无感 */
+async function wdSwitchProxyAuto() {
+  var userId = _wdProxyUserId;
+  if (!confirm("切换为自动分配？\n\n· 当前订阅列表原样保留（切换瞬间节点无感）\n· 之后由服务端订阅池自动换血/跨机器摊开\n· 实例数量 = 当前列表条数，可随时修改")) return;
+  try {
+    var res = await fetch("/api/watchdog/set-proxy-auto", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: userId }),
+    });
+    var d = await res.json();
+    if (!res.ok || !d.ok) throw new Error(d.error || "HTTP " + res.status);
+    if (_wdData) {
+      _wdData.proxySettings = _wdData.proxySettings || {};
+      _wdData.proxySettings[userId] = d.proxySettings;
+    }
+    wdShowProxyModal(userId);
+    fetchWatchdogData();
+  } catch (e) {
+    alert("切换失败: " + e.message);
+  }
+}
+
+/** 自动 → 手动: 当前 alloc 原样转手动列表，分配器不再触碰 */
+async function wdSwitchProxyManual() {
+  var userId = _wdProxyUserId;
+  if (!confirm("切回手动模式？\n\n当前分配结果原样转为手动列表（客户端不动），之后订阅池变化不再自动换血。")) return;
+  try {
+    var res = await fetch("/api/watchdog/set-proxy-manual", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: userId }),
+    });
+    var d = await res.json();
+    if (!res.ok || !d.ok) throw new Error(d.error || "HTTP " + res.status);
+    if (_wdData) {
+      _wdData.proxySettings = _wdData.proxySettings || {};
+      _wdData.proxySettings[userId] = d.proxySettings;
+    }
+    wdShowProxyModal(userId);
+    fetchWatchdogData();
+  } catch (e) {
+    alert("切换失败: " + e.message);
+  }
+}
+
 function wdCloseProxyModal() {
   document.getElementById("wdProxyModal").style.display = "none";
 }
@@ -4806,6 +4991,354 @@ async function wdSaveProxySettings() {
   }
 }
 
+// ── 订阅中心（Phase 1: 服务端订阅池 + 到期/流量探测，只读展示节点引用，不改节点行为） ──
+
+var _wdSubEditId = "";
+var _wdLastSubsRendered = "";
+
+/** HTML 转义（订阅名/备注是自由文本，防注入） */
+function escHtml(s) {
+  return String(s == null ? "" : s)
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#39;");
+}
+
+function wdSubTimeAgo(ts) {
+  if (!ts) return "";
+  var diff = Date.now() - ts;
+  if (diff < 60000) return "刚刚";
+  if (diff < 3600000) return Math.floor(diff / 60000) + "分钟前";
+  if (diff < 86400000) return Math.floor(diff / 3600000) + "小时前";
+  return Math.floor(diff / 86400000) + "天前";
+}
+
+function wdSubStatusBadge(st) {
+  var c = st && st.color ? st.color : "#6b7280";
+  return styled(
+    "span",
+    "display:inline-block;padding:2px 8px;border-radius:10px;font-size:11px;white-space:nowrap;" +
+      "background:" + c + "22;color:" + c + ";border:1px solid " + c + "55",
+    escHtml((st && st.label) || "未知"),
+  );
+}
+
+function wdSubTrafficCell(s) {
+  if (!(s.total > 0))
+    return styled("div", "font-size:11px;color:#666;white-space:nowrap", "用量未知");
+  var pct = Math.min(100, Math.round((s.usedRatio || 0) * 100));
+  var barColor = pct >= 90 ? "#f87171" : pct >= 80 ? "#fbbf24" : "#4ade80";
+  return (
+    styled("div", "width:150px;background:#0a0a12;border-radius:4px;height:8px;overflow:hidden",
+      styled("div", "width:" + pct + "%;height:100%;background:" + barColor, "")) +
+    styled("div", "font-size:10px;color:#888;margin-top:2px;white-space:nowrap",
+      "已用 " + fmtGB(s.used) + " / " + fmtGB(s.total) + "（" + pct + "%）")
+  );
+}
+
+function wdSubExpireCell(s) {
+  if (!(s.expireAt > 0))
+    return styled("span", "color:#666;font-size:11px", "长期");
+  var daysLeft = Math.ceil((s.expireAt - Date.now()) / 86400000);
+  var color = daysLeft < 7 ? "#f87171" : daysLeft < 30 ? "#fbbf24" : "#94a3b8";
+  return styled("span", "color:" + color + ";font-size:11px;white-space:nowrap",
+    new Date(s.expireAt).toLocaleDateString() +
+    (daysLeft <= 0 ? "（已到期）" : "（剩" + daysLeft + "天）"));
+}
+
+function wdSubRefsCell(s) {
+  if (!s.refs || !s.refs.length)
+    return styled("span", "color:#555;font-size:11px", "未引用");
+  var total = 0;
+  s.refs.forEach(function (r) {
+    total += r.count || 0;
+  });
+  var names = s.refs.map(function (r) {
+    return r.userId + "（" + r.count + "处）";
+  }).join("、");
+  return styled("span",
+    "color:#94a3b8;font-size:11px;cursor:help;white-space:nowrap",
+    total + " 处引用")
+    .replace("<span", '<span title="' + escHtml(names) + '"');
+}
+
+function wdSubSourceCell(s) {
+  if (s.source === "probe") {
+    var p = s.lastProbe || {};
+    var txt = "🔍 探测 " + wdSubTimeAgo(s.dataAt);
+    if (p.ok === false) txt += "（" + escHtml(p.error || "失败") + "）";
+    return styled("span", "color:#94a3b8;font-size:11px;white-space:nowrap", txt);
+  }
+  if (s.source === "node") {
+    var r = s.lastNodeReport || {};
+    return styled("span", "color:#94a3b8;font-size:11px;white-space:nowrap",
+      "📡 节点代报 " + wdSubTimeAgo(s.dataAt) + (r.by ? "（" + escHtml(r.by) + "）" : ""));
+  }
+  return styled("span", "color:#555;font-size:11px", "无数据");
+}
+
+function wdSubRowBtn(label, fn, color, title) {
+  return tag("button", {
+    onclick: fn,
+    title: title || "",
+    style: "padding:2px 8px;font-size:11px;background:#333;color:" + (color || "#ccc") +
+      ";border:1px solid #444;border-radius:3px;cursor:pointer;white-space:nowrap",
+  }, label);
+}
+
+// 折叠状态（localStorage 记忆，跨刷新保持；页面每 10s 重渲染，不记就会被合上）
+var _wdSubsExpanded = false;
+try {
+  _wdSubsExpanded = localStorage.getItem("wdSubsExpanded") === "1";
+} catch (e) {}
+
+function wdSubsToggle() {
+  _wdSubsExpanded = !_wdSubsExpanded;
+  try {
+    localStorage.setItem("wdSubsExpanded", _wdSubsExpanded ? "1" : "0");
+  } catch (e) {}
+  _wdLastSubsRendered = ""; // 强制下一轮重绘
+  renderSubscriptionsCenter((_wdData && _wdData.subscriptions) || []);
+}
+
+function renderSubscriptionsCenter(subs) {
+  var el = document.getElementById("wdSubsList");
+  if (!el) return;
+  subs = subs || [];
+  // 汇总统计（折叠态的唯一信息源，始终计算）
+  var summaryEl = document.getElementById("wdSubsSummary");
+  var sectionEl = document.getElementById("wdSubsSection");
+  var arrowEl = document.getElementById("wdSubsArrow");
+  var cnt = { ok: 0, warn: 0, bad: 0, off: 0 };
+  subs.forEach(function (s) {
+    var c = s.status && s.status.code;
+    if (c === "ok") cnt.ok++;
+    else if (c === "expiring" || c === "quota-critical") cnt.warn++;
+    else if (c === "expired" || c === "exhausted") cnt.bad++;
+    else if (c === "disabled") cnt.off++;
+  });
+  if (summaryEl) {
+    summaryEl.textContent =
+      "共 " + subs.length + " 条 · 正常 " + cnt.ok +
+      (cnt.warn ? " · 临期/告急 " + cnt.warn : "") +
+      (cnt.bad ? " · 到期/耗尽 " + cnt.bad : "") +
+      (cnt.off ? " · 禁用 " + cnt.off : "");
+    // 汇总行报警色：到期/耗尽红、临期/告急黄（折叠态的异常可见性全靠它）
+    summaryEl.style.color = cnt.bad > 0 ? "#f87171" : cnt.warn > 0 ? "#fbbf24" : "#666";
+  }
+  if (sectionEl) {
+    sectionEl.style.background = cnt.bad > 0 ? "#241519" : cnt.warn > 0 ? "#221d12" : "#16161f";
+  }
+  if (arrowEl) {
+    arrowEl.textContent = subs.length ? (_wdSubsExpanded ? "▾ 收起" : "▸ 展开") : "";
+  }
+  var html;
+  if (!subs.length) {
+    html = styled("div", "padding:14px;text-align:center;color:#555",
+      "订阅池为空：点右上角「＋ 新增订阅」把订阅地址集中录入，服务端每 6 小时自动探测一次到期/流量（不影响任何节点）");
+  } else {
+    // 排序: 异常优先（到期/耗尽 > 临期/告急 > 探测失败 > 正常 > 禁用），同级按名称
+    var rank = { expired: 0, exhausted: 0, expiring: 1, "quota-critical": 1, "probe-failed": 2, unknown: 3, ok: 4, disabled: 5 };
+    var sorted = subs.slice().sort(function (a, b) {
+      var ra = rank[a.status && a.status.code] != null ? rank[a.status.code] : 3;
+      var rb = rank[b.status && b.status.code] != null ? rank[b.status.code] : 3;
+      if (ra !== rb) return ra - rb;
+      return String(a.name).localeCompare(String(b.name));
+    });
+    var rows = "";
+    sorted.forEach(function (s) {
+      var disabled = s.enabled === false;
+      var rowBg = disabled ? "opacity:0.45;" : "";
+      var warnBg = !disabled && s.status && (s.status.code === "expired" || s.status.code === "exhausted")
+        ? ";background:#3b1d1d;border-radius:6px"
+        : "";
+      var nameCell =
+        styled("div", "color:#e0e0e0;font-size:12px;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:180px",
+          escHtml(s.name)) +
+        (s.note
+          ? styled("div", "color:#666;font-size:10px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:180px",
+              escHtml(s.note))
+          : "") +
+        (s.resetsCount > 0
+          ? styled("div", "color:#888;font-size:10px", "🔄 已检测到重置 " + s.resetsCount + " 次" +
+              (s.lastResetAt ? "（" + wdSubTimeAgo(s.lastResetAt) + "）" : ""))
+          : "");
+      var actions =
+        wdSubRowBtn(disabled ? "▶ 启用" : "⏸ 禁用",
+          "wdSubToggle('" + s.id + "')", disabled ? "#4ade80" : "#fbbf24",
+          disabled ? "重新启用该订阅" : "禁用后不再自动探测（不改节点行为）") +
+        wdSubRowBtn("🔍 检测", "wdSubProbe(this, '" + s.id + "')", "#60a5fa", "立即探测一次（剩余流量/到期时间）") +
+        wdSubRowBtn("✏️ 编辑", "wdSubShowEditModal('" + s.id + "')", "#ccc") +
+        wdSubRowBtn("🗑", "wdSubDelete('" + s.id + "')", "#f87171", "从订阅池删除");
+      rows += styled("div",
+        "display:flex;align-items:center;gap:12px;padding:7px 8px;border-bottom:1px solid #22222f;font-size:12px;" + rowBg + warnBg,
+        wdSubStatusBadge(s.status) +
+        styled("div", "flex:0 0 180px", nameCell) +
+        styled("div", "flex:0 0 160px", wdSubTrafficCell(s)) +
+        styled("div", "flex:0 0 130px", wdSubExpireCell(s)) +
+        styled("div", "flex:0 0 80px;text-align:center", wdSubRefsCell(s)) +
+        styled("div", "flex:1;overflow:hidden", wdSubSourceCell(s)) +
+        styled("div", "display:flex;gap:6px;flex:0 0 auto", actions));
+    });
+    html = rows;
+  }
+  if (!_wdSubsExpanded && subs.length) {
+    // 折叠态：只留汇总条（空池不折叠，保持新增入口可发现）
+    if (el.innerHTML !== "") {
+      el.innerHTML = "";
+      _wdLastSubsRendered = "";
+    }
+  } else if (_wdLastSubsRendered !== html) {
+    _wdLastSubsRendered = html;
+    el.innerHTML = html;
+  }
+}
+
+function wdSubShowAddModal() {
+  _wdSubEditId = "";
+  document.getElementById("wdSubModalTitle").textContent = "＋ 新增订阅";
+  document.getElementById("wdSubName").value = "";
+  document.getElementById("wdSubUrl").value = "";
+  document.getElementById("wdSubNote").value = "";
+  document.getElementById("wdSubModal").style.display = "flex";
+}
+
+function wdSubShowEditModal(id) {
+  var s = ((_wdData && _wdData.subscriptions) || []).find(function (x) {
+    return x.id === id;
+  });
+  if (!s) {
+    alert("订阅不存在（可能已被删除）");
+    return;
+  }
+  _wdSubEditId = id;
+  document.getElementById("wdSubModalTitle").textContent = "✏️ 编辑订阅 — " + s.name;
+  document.getElementById("wdSubName").value = s.name || "";
+  document.getElementById("wdSubUrl").value = s.url || "";
+  document.getElementById("wdSubNote").value = s.note || "";
+  document.getElementById("wdSubModal").style.display = "flex";
+}
+
+function wdSubCloseModal() {
+  document.getElementById("wdSubModal").style.display = "none";
+}
+
+async function wdSubSave() {
+  var payload = {
+    name: document.getElementById("wdSubName").value.trim(),
+    url: document.getElementById("wdSubUrl").value.trim(),
+    note: document.getElementById("wdSubNote").value.trim(),
+  };
+  if (!payload.url) {
+    alert("请填写订阅地址");
+    return;
+  }
+  var isEdit = !!_wdSubEditId;
+  try {
+    var res = await fetch(
+      isEdit ? "/api/watchdog/subscriptions/update" : "/api/watchdog/subscriptions",
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(isEdit ? Object.assign({ id: _wdSubEditId }, payload) : payload),
+      },
+    );
+    var d = await res.json();
+    if (!res.ok || !d.ok) throw new Error(d.error || "HTTP " + res.status);
+    wdSubCloseModal();
+    var justId = isEdit ? _wdSubEditId : d.entry && d.entry.id;
+    _wdSubEditId = "";
+    await fetchWatchdogData();
+    // 新增/改地址后立即探测一次，让用户马上看到到期/流量
+    if (justId) wdSubProbe(null, justId, true);
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
+async function wdSubDelete(id) {
+  var s = ((_wdData && _wdData.subscriptions) || []).find(function (x) {
+    return x.id === id;
+  });
+  var refs = (s && s.refs) || [];
+  var msg = "确定删除订阅「" + ((s && s.name) || id) + "」吗？";
+  if (refs.length) {
+    msg +=
+      "\n\n⚠️ 该订阅仍被 " + refs.length + " 个节点配置引用：\n" +
+      refs.map(function (r) { return "· " + r.userId + "（" + r.count + " 处）"; }).join("\n") +
+      "\n删除后这些节点下次手动改配置时将无法从池中对照（不影响节点现有运行）。";
+  }
+  if (!confirm(msg)) return;
+  try {
+    var res = await fetch("/api/watchdog/subscriptions/delete", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ id: id, force: refs.length > 0 }),
+    });
+    var d = await res.json();
+    if (!res.ok || !d.ok) throw new Error(d.error || "HTTP " + res.status);
+    fetchWatchdogData();
+  } catch (e) {
+    alert("删除失败: " + e.message);
+  }
+}
+
+async function wdSubToggle(id) {
+  var s = ((_wdData && _wdData.subscriptions) || []).find(function (x) {
+    return x.id === id;
+  });
+  if (!s) return;
+  try {
+    var res = await fetch("/api/watchdog/subscriptions/update", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ id: id, enabled: s.enabled === false }),
+    });
+    var d = await res.json();
+    if (!res.ok || !d.ok) throw new Error(d.error || "HTTP " + res.status);
+    fetchWatchdogData();
+  } catch (e) {
+    alert("操作失败: " + e.message);
+  }
+}
+
+async function wdSubProbe(btn, id, silent) {
+  if (btn) {
+    btn.disabled = true;
+    btn.textContent = "⏳";
+  }
+  try {
+    var res = await fetch("/api/watchdog/subscriptions/probe", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ id: id }),
+    });
+    var d = await res.json();
+    if (!res.ok || !d.ok) throw new Error(d.error || "HTTP " + res.status);
+    var s = d.subscription || {};
+    if (!silent) {
+      var lines = ["「" + (s.name || id) + "」探测完成"];
+      if (s.total > 0) {
+        lines.push("已用 " + fmtGB(s.used) + " / " + fmtGB(s.total) +
+          "，剩余 " + fmtGB(s.remain) +
+          (s.usedRatio != null ? "（已用 " + Math.round(s.usedRatio * 100) + "%）" : ""));
+      } else {
+        lines.push("用量未知");
+      }
+      lines.push(s.expireAt > 0
+        ? "到期: " + new Date(s.expireAt).toLocaleDateString() +
+          (s.status && s.status.label ? "（" + s.status.label + "）" : "")
+        : "长期有效");
+      alert(lines.join("\n"));
+    }
+  } catch (e) {
+    if (!silent) alert("探测失败: " + e.message);
+  }
+  fetchWatchdogData();
+}
+
 // ── 登录检测端口配置区域（看门狗面板中每个客户端卡片） ──
 
 // userId -> 详情展开状态（跨刷新保留）
@@ -4852,10 +5385,27 @@ function renderLoginSection(c, userId, loginPorts) {
     (configured.length ? configured.length + "端口" : "未配置") + " ⚙️",
   );
 
+  // 重检按钮：仅已配置端口的在线客户端显示（手动触发立即检测，结果随心跳自动刷新）
+  var recheckBtn = "";
+  if (configured.length && c.clientId) {
+    recheckBtn = tag(
+      "button",
+      {
+        onclick: "wdRecheckLogin('" + esc(c.clientId) + "')",
+        style:
+          "padding:2px 8px;font-size:11px;background:#333;color:#4ade80;" +
+          "border:1px solid #444;border-radius:3px;cursor:pointer",
+        title: "立即重检一次登录状态（绕过 2h 周期，结果随心跳自动刷新）",
+      },
+      "重检",
+    );
+  }
+
   var head =
     styled("span", "font-size:14px", "🔑") +
     styled("span", "color:#888", "登录检测:") +
-    cfgBtn;
+    cfgBtn +
+    recheckBtn;
 
   var wrapStyle =
     "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
@@ -5038,6 +5588,25 @@ async function wdSetLoginPorts() {
   }
 }
 
+// 手动下发登录重检：服务端一次性队列随心跳通知客户端，下一跳立即检测
+async function wdRecheckLogin(clientId) {
+  try {
+    var res = await fetch("/api/watchdog/recheck-login", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ clientId: clientId }),
+    });
+    var d = await res.json();
+    if (d.ok) {
+      alert("已下发重检，结果随心跳自动刷新");
+    } else {
+      alert("失败: " + (d.error || "未知错误"));
+    }
+  } catch (e) {
+    alert("下发失败: " + e.message);
+  }
+}
+
 // ── 错误自动切节点配置区域（看门狗面板中每个客户端卡片） ──
 
 function renderErrorTriggerSection(c, userId, errorTriggers) {
@@ -5422,6 +5991,7 @@ function renderSubsOverview(c, userId, builtinChannels, allChannels) {
     styled("span", "font-size:14px", "🛜") +
       styled("span", "color:#e0e0e0;font-weight:bold", "代理订阅") +
       styled("span", "color:#94a3b8", count + " 条") +
+      wdProxyModeBadge(userId) +
       tag(
         "button",
         {
@@ -5707,6 +6277,7 @@ function renderSubscriptions(proxy, userId, withConfig) {
       "margin-top:4px;padding:5px 8px;background:#111;border-radius:6px;display:flex;align-items:center;gap:8px;font-size:12px",
       styled("span", "color:#888", "🛜 订阅配置:") +
         styled("span", "color:#e0e0e0", cfgSummary) +
+        wdProxyModeBadge(userId) +
         tag(
           "button",
           {