tt-help-cli-ycl 1.4.155 → 1.4.157

package/src/cli/comments.js

@@ -22,6 +22,7 @@ import {
 } from "../lib/target-locations.js";
 import { getTargetLocations } from "../lib/app-config.js";
 import { createApiClient } from "../lib/api-client.js";
+import { syncTargetLocationsFromServer } from "../lib/client-locations.js";
 import { ensureBrowserReady, killEdgeProcesses } from "../lib/browser/cdp.js";
 import { delay } from "../lib/delay.js";
 import {
@@ -248,6 +249,9 @@ async function runAutoMode(options) {
     locations,
   } = options;
 
+  // 目标国家以服务端配置为准（单一事实来源；拉取失败沿用本地列表）
+  await syncTargetLocationsFromServer(serverUrl);
+
   const actualParallel = Math.max(1, parallel || CFG.parallel);
   const actualInterval = interval || CFG.interval;
   const actualMaxComments = maxComments || CFG.maxComments;
@@ -434,6 +438,9 @@ async function runAutoMode(options) {
   // ════════════════════════════════════════
   try {
     while (!shuttingDown) {
+      // 周期性同步服务端目标国家（内部节流，几乎零开销）
+      await syncTargetLocationsFromServer(serverUrl);
+
       // 浏览器窗口被手动关闭（CDP 断开）→ 自动退出
       if (isBrowserDisconnected(browser)) {
         console.error("🚪 检测到浏览器窗口已关闭，自动退出");

package/src/cli/explore.js

@@ -19,6 +19,7 @@ import {
   proxy as configuredProxy,
 } from "../lib/constants.js";
 import { getMacOrUuid } from "../lib/mac-or-uuid.js";
+import { syncTargetLocationsFromServer } from "../lib/client-locations.js";
 import {
   ensureBrowserReady as ensureBrowserReadyCDP,
   killEdgeProcesses,
@@ -62,7 +63,6 @@ export async function handleExplore(options) {
     exploreEnableFollow,
     exploreMaxFollowing,
     exploreMaxFollowers,
-    exploreLocation,
     exploreJobLocations,
     exploreMaxUsers,
     serverUrl,
@@ -127,6 +127,12 @@ export async function handleExplore(options) {
       );
     }
 
+    // 未显式传 --location 时，以服务端目标国家为准（周期同步，失败回退本地）
+    let exploreLocation = options.exploreLocation;
+    if (!options.locationExplicit) {
+      const synced = await syncTargetLocationsFromServer(serverUrl);
+      if (synced) exploreLocation = synced.join(",");
+    }
     console.error(`\n国家筛选: ${exploreLocation}`);
     if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
     console.error(`视频采集: ${exploreMaxVideos || 1}`);
@@ -401,6 +407,11 @@ export async function handleExplore(options) {
 
     while (!shuttingDown) {
       try {
+        // 周期性同步服务端目标国家（内部节流，几乎零开销）
+        if (!options.locationExplicit) {
+          const synced = await syncTargetLocationsFromServer(serverUrl);
+          if (synced) exploreLocation = synced.join(",");
+        }
         const jobQuery = exploreJobLocations
           ? `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&locations=${encodeURIComponent(exploreJobLocations)}&loggedIn=${loggedIn}`
           : `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&loggedIn=${loggedIn}`;

package/src/cli/refresh-mini.js

@@ -32,6 +32,7 @@ import {
   saveUserId,
 } from "../lib/constants.js";
 import { getMacOrUuid } from "../lib/mac-or-uuid.js";
+import { syncTargetLocationsFromServer } from "../lib/client-locations.js";
 import {
   ensureBrowserReady as ensureBrowserReadyCDP,
   killEdgeProcesses,
@@ -138,7 +139,6 @@ export async function handleRefreshMini(options) {
   const {
     explorePreset,
     exploreInterval,
-    exploreLocation,
     exploreJobLocations,
     exploreMaxUsers,
     explorePort,
@@ -210,6 +210,12 @@ export async function handleRefreshMini(options) {
     console.error(`CDP 端口: ${explorePort || DEFAULT_PORT}（固定）`);
     console.error(`采集范围: mini（仅视频及视频相关信息）`);
     console.error(`视频采集: ${exploreMaxVideos || 16}`);
+    // 未显式传 --location 时，以服务端目标国家为准（周期同步，失败回退本地）
+    let exploreLocation = options.exploreLocation;
+    if (!options.locationExplicit) {
+      const synced = await syncTargetLocationsFromServer(serverUrl);
+      if (synced) exploreLocation = synced.join(",");
+    }
     console.error(`国家筛选: ${exploreLocation}`);
     if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
     console.error(`空闲间隔: ${exploreInterval || 30} 秒`);
@@ -468,6 +474,12 @@ export async function handleRefreshMini(options) {
     while (true) {
       if (shuttingDown) break;
 
+      // 周期性同步服务端目标国家（内部节流，几乎零开销）
+      if (!options.locationExplicit) {
+        const synced = await syncTargetLocationsFromServer(serverUrl);
+        if (synced) exploreLocation = synced.join(",");
+      }
+
       // 定时轮换（任务间隙，预防性换 IP，等回执后再继续）
       if (rotateMin > 0) {
         const elapsedMin = (Date.now() - lastProxyTriggerTime) / 60000;

package/src/cli/refresh.js

@@ -28,6 +28,7 @@ import { createApiClient } from "../lib/api-client.js";
 import { createCDNHandler } from "../lib/cdn-handler.js";
 import { proxyPortOf, triggerProxySwitch } from "../clash/proxy-switch.js";
 import path from "path";
+import { syncTargetLocationsFromServer } from "../lib/client-locations.js";
 import os from "os";
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
@@ -57,7 +58,6 @@ export async function handleRefresh(options) {
     exploreEnableFollow,
     exploreMaxFollowing,
     exploreMaxFollowers,
-    exploreLocation,
     exploreJobLocations,
     exploreMaxUsers,
     serverUrl,
@@ -142,6 +142,12 @@ export async function handleRefresh(options) {
     console.error(
       `关注/粉丝: ${followEnabled ? "启用" : "禁用"} (${exploreMaxFollowing}/${exploreMaxFollowers})`,
     );
+    // 未显式传 --location 时，以服务端目标国家为准（周期同步，失败回退本地）
+    let exploreLocation = options.exploreLocation;
+    if (!options.locationExplicit) {
+      const synced = await syncTargetLocationsFromServer(serverUrl);
+      if (synced) exploreLocation = synced.join(",");
+    }
     console.error(`国家筛选: ${exploreLocation}`);
     if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
     console.error(`空闲间隔: ${exploreInterval || 30} 秒`);
@@ -379,6 +385,12 @@ export async function handleRefresh(options) {
     while (true) {
       if (shuttingDown) break;
 
+      // 周期性同步服务端目标国家（内部节流，几乎零开销）
+      if (!options.locationExplicit) {
+        const synced = await syncTargetLocationsFromServer(serverUrl);
+        if (synced) exploreLocation = synced.join(",");
+      }
+
       // 健康检查
       const checkResult = healthChecker.check();
       if (checkResult.shouldSwitch) {

package/src/lib/app-config.js

@@ -20,6 +20,29 @@ const CONFIG_FILE = join(homedir(), ".tt-help-config.json");
 
 let _cache = null;
 
+// 服务端同步的运行时目标国家覆盖（优先于本地文件与内置默认，不落盘）
+let _runtimeTargetLocations = null;
+
+/**
+ * 设置运行时目标国家（通常来自 Watch 服务端同步）。
+ * 传空/非法值 = 清除覆盖，回退本地配置。
+ * 返回生效后的列表。
+ */
+export function setRuntimeTargetLocations(locations) {
+  const normalized = Array.isArray(locations)
+    ? [
+        ...new Set(
+          locations
+            .map((l) => String(l).trim().toUpperCase())
+            .filter(Boolean),
+        ),
+      ]
+    : [];
+  _runtimeTargetLocations =
+    normalized.length > 0 ? [...normalized] : null;
+  return getTargetLocations();
+}
+
 export function getConfigFilePath() {
   return CONFIG_FILE;
 }
@@ -94,8 +117,9 @@ function normalizeLocations(locations) {
   ];
 }
 
-/** 读取当前目标国家，未配置则回退 DEFAULT_TARGET_LOCATIONS */
+/** 读取当前目标国家：服务端同步覆盖 > 配置文件 > 内置默认 */
 export function getTargetLocations() {
+  if (_runtimeTargetLocations) return [..._runtimeTargetLocations];
   const raw = getConfig("targetLocations", []);
   const normalized = normalizeLocations(raw);
   return normalized.length > 0 ? normalized : [...DEFAULT_TARGET_LOCATIONS];

package/src/lib/args.js

@@ -175,6 +175,7 @@ function parseExploreArgs(args) {
   let exploreMaxFollowing = 50;
   let exploreMaxFollowers = 50;
   let exploreLocation = DEFAULT_TARGET_LOCATIONS_CSV;
+  let locationExplicit = false; // 是否显式传了 --location（显式时跳过服务端同步）
   let exploreJobLocations = null;
   let exploreMaxUsers = 0;
   let explorePort = null;
@@ -204,6 +205,7 @@ function parseExploreArgs(args) {
       exploreMaxGuess = parseInt(args[++i]) || 0;
     } else if (arg === "--location") {
       exploreLocation = args[++i];
+      locationExplicit = true;
     } else if (arg === "--job-locations") {
       exploreJobLocations = args[++i];
     } else if (arg === "--enable-follow") {
@@ -275,6 +277,7 @@ function parseExploreArgs(args) {
     exploreMaxFollowing,
     exploreMaxFollowers,
     exploreLocation,
+    locationExplicit,
     exploreJobLocations,
     serverUrl,
     exploreMaxUsers,
@@ -543,6 +546,7 @@ function parseRefreshArgs(args) {
   let exploreMaxFollowing = 100;
   let exploreMaxFollowers = 100;
   let exploreLocation = DEFAULT_TARGET_LOCATIONS_CSV;
+  let locationExplicit = false; // 是否显式传了 --location（显式时跳过服务端同步）
   let exploreMaxUsers = 0;
   let explorePort = null;
   let exploreBasePort = null;
@@ -599,6 +603,7 @@ function parseRefreshArgs(args) {
       exploreNoProduct = true;
     } else if (arg === "--location") {
       exploreLocation = args[++i];
+      locationExplicit = true;
     } else if (arg === "--job-locations") {
       exploreJobLocations = args[++i];
     } else if (arg === "--enable-follow") {
@@ -620,6 +625,7 @@ function parseRefreshArgs(args) {
     exploreMaxFollowing,
     exploreMaxFollowers,
     exploreLocation,
+    locationExplicit,
     exploreJobLocations,
     exploreMaxUsers,
     explorePort,
@@ -652,6 +658,7 @@ function parseRefreshMiniArgs(args) {
   let explorePreset = "normal";
   let exploreInterval = 30;
   let exploreLocation = DEFAULT_TARGET_LOCATIONS_CSV;
+  let locationExplicit = false; // 是否显式传了 --location（显式时跳过服务端同步）
   let exploreMaxUsers = 0;
   let explorePort = 4222;
   let exploreUserId = null;
@@ -689,6 +696,7 @@ function parseRefreshMiniArgs(args) {
       exploreProxy = args[++i];
     } else if (arg === "--location") {
       exploreLocation = args[++i];
+      locationExplicit = true;
     } else if (arg === "--job-locations") {
       exploreJobLocations = args[++i];
     } else if (arg === "--max-users") {
@@ -709,6 +717,7 @@ function parseRefreshMiniArgs(args) {
     exploreCommentDelay,
     exploreInterval,
     exploreLocation,
+    locationExplicit,
     exploreJobLocations,
     exploreMaxUsers,
     explorePort,

package/src/lib/client-locations.js

@@ -0,0 +1,70 @@
+/**
+ * 客户端目标国家同步：以 Watch 服务端 /api/settings/target-locations 为单一事实来源。
+ *
+ * 设计：
+ * - 采集客户端（explore / refresh / refresh-mini / comments）启动时及任务循环中调用，
+ *   成功后覆盖运行时 getTargetLocations()（含 locationRank 等派生逻辑，不写本地盘）
+ * - 内部节流：成功后 SYNC_INTERVAL_MS 内直接返回缓存，循环里每轮调用也几乎零开销
+ * - 失败回退：拉取失败时沿用本地配置/内置默认，不中断采集
+ * - 显式传 --location 的客户端不调用本模块，用户参数始终优先
+ */
+import { setRuntimeTargetLocations } from "./app-config.js";
+
+const SYNC_INTERVAL_MS = 10 * 60 * 1000; // 同步成功后 10 分钟内复用缓存
+const FETCH_TIMEOUT_MS = 8000;
+
+let _lastSyncAt = 0;
+let _lastList = null; // 最近一次同步成功的列表
+
+/**
+ * 从服务端同步目标国家（节流）。
+ * @param {string} serverUrl Watch 服务端地址
+ * @param {{force?: boolean}} options force=true 跳过节流
+ * @returns {Promise<string[]|null>} 成功返回国家数组；失败返回 null（调用方沿用本地列表）
+ */
+export async function syncTargetLocationsFromServer(
+  serverUrl,
+  { force = false } = {},
+) {
+  if (!serverUrl) return _lastList;
+  const now = Date.now();
+  if (
+    !force &&
+    _lastList &&
+    now - _lastSyncAt < SYNC_INTERVAL_MS
+  ) {
+    return _lastList;
+  }
+  try {
+    const base = String(serverUrl).replace(/\/+$/, "");
+    const res = await fetch(`${base}/api/settings/target-locations`, {
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
+    });
+    if (!res.ok) throw new Error(`HTTP ${res.status}`);
+    const data = await res.json();
+    const list = Array.isArray(data.locations) ? data.locations : [];
+    const normalized = [
+      ...new Set(
+        list.map((l) => String(l).trim().toUpperCase()).filter(Boolean),
+      ),
+    ];
+    if (normalized.length === 0) throw new Error("服务端返回空列表");
+
+    const changed =
+      !_lastList || normalized.join(",") !== _lastList.join(",");
+    setRuntimeTargetLocations(normalized);
+    _lastSyncAt = now;
+    _lastList = [...normalized];
+    if (changed) {
+      console.error(
+        `[locations] 已同步服务端目标国家(${normalized.length}): ${normalized.join(",")}`,
+      );
+    }
+    return _lastList;
+  } catch (e) {
+    console.error(
+      `[locations] 同步服务端目标国家失败(${e.message})，沿用本地列表`,
+    );
+    return null;
+  }
+}

package/src/watch/public/app.js

@@ -4749,6 +4749,59 @@ async function wdSetCountries() {
   }
 }
 
+// ── 代理订阅配置弹窗（保存后心跳下发 → daemon 热应用） ──
+
+var _wdProxyUserId = "";
+
+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;
+    });
+  }
+  ta.value = configured.join("\n");
+  document.getElementById("wdProxyModal").style.display = "flex";
+}
+
+function wdCloseProxyModal() {
+  document.getElementById("wdProxyModal").style.display = "none";
+}
+
+async function wdSaveProxySettings() {
+  var userId = _wdProxyUserId;
+  var lines = (document.getElementById("wdProxySubsText").value || "")
+    .split("\n")
+    .map(function (s) {
+      return s.trim();
+    })
+    .filter(Boolean);
+  try {
+    var res = await fetch("/api/watchdog/set-proxy-settings", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userId: userId, subscriptions: lines }),
+    });
+    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] = { subscriptions: d.subscriptions || [] };
+    }
+    wdCloseProxyModal();
+    alert(
+      "已保存 " +
+        (d.subscriptions ? d.subscriptions.length : lines.length) +
+        " 条订阅\n\n客户端将在下次心跳时热应用（无需重启，约 15～30 秒后刷新页面可见订阅用量）。",
+    );
+  } catch (e) {
+    alert("保存失败: " + e.message);
+  }
+}
+
 // ── 登录检测端口配置区域（看门狗面板中每个客户端卡片） ──
 
 // userId -> 详情展开状态（跨刷新保留）
@@ -5242,7 +5295,8 @@ function renderProxySection(c, userId) {
   var hasNodes = nodes.length > 0;
   return (
     renderProxyLine(h, nodes, userId, 0, hasNodes) +
-    renderNodeList(nodes, h.node, userId, 0, delays)
+    renderNodeList(nodes, h.node, userId, 0, delays) +
+    renderSubscriptions(h.meta && h.meta.proxy, userId)
   );
 }
 
@@ -5254,10 +5308,117 @@ function renderProxyChannel(ch, userId) {
   var hasNodes = nodes.length > 0;
   return (
     renderProxyLine(ch, nodes, userId, ch.port || 0, hasNodes) +
-    renderNodeList(nodes, ch.node, userId, ch.port || 0, delays)
+    renderNodeList(nodes, ch.node, userId, ch.port || 0, delays) +
+    renderSubscriptions(ch.meta && ch.meta.proxy, userId)
   );
 }
 
+function fmtGB(bytes) {
+  if (!bytes || bytes <= 0) return "0";
+  var gb = bytes / 1073741824;
+  return gb >= 1024 ? (gb / 1024).toFixed(2) + " TB" : gb.toFixed(1) + " GB";
+}
+
+function fmtSpeed(bytesPerSec) {
+  if (!bytesPerSec || bytesPerSec <= 0) return "0 KB/s";
+  if (bytesPerSec >= 1048576) return (bytesPerSec / 1048576).toFixed(1) + " MB/s";
+  return (bytesPerSec / 1024).toFixed(0) + " KB/s";
+}
+
+/**
+ * 订阅用量/到期 + 实时速率 + 订阅配置入口（数据: clashHealth.meta.proxy）
+ * 临期（<7天）或超量（剩余<10%）标红
+ */
+function renderSubscriptions(proxy, userId) {
+  proxy = proxy || {};
+  var subs = proxy.subscriptions || [];
+  var rows = "";
+  // 订阅应用结果（daemon 最近一次 setSubscription 执行反馈；随下次应用/daemon 重启刷新）
+  var ar = proxy.applyResult;
+  if (ar && ar.at) {
+    if (ar.ok === false) {
+      rows +=
+        styled(
+          "div",
+          "font-size:11px;margin:2px 0 4px;padding:4px 6px;background:#3b1d1d;border:1px solid #7f1d1d;border-radius:4px;color:#f87171;line-height:1.4",
+          "❌ 订阅应用失败: " + esc(ar.error || "未知错误") +
+            styled("span", "color:#94a3b8;margin-left:6px;font-size:10px", new Date(ar.at).toLocaleTimeString()),
+        );
+    } else if (ar.changed) {
+      rows +=
+        styled(
+          "div",
+          "font-size:11px;margin:2px 0 4px;color:#4ade80",
+          "✓ 订阅应用成功 (" + (ar.count || "?") + " 条，" + new Date(ar.at).toLocaleTimeString() + ")",
+        );
+    }
+  }
+  // 实时速率
+  var t = proxy.traffic;
+  if (t && (t.downRate > 0 || t.upRate > 0)) {
+    rows +=
+      styled(
+        "div",
+        "font-size:11px;color:#94a3b8;margin:2px 0 4px",
+        "⚡ 速率: ↓" + fmtSpeed(t.downRate) + " / ↑" + fmtSpeed(t.upRate),
+      );
+  }
+  for (var i = 0; i < subs.length; i++) {
+    var s = subs[i];
+    var used = (s.upload || 0) + (s.download || 0);
+    var total = s.total || 0;
+    var remain = total > 0 ? total - used : 0;
+    var pct = total > 0 ? Math.round((remain / total) * 100) : null;
+    var daysLeft = s.expire ? Math.round((s.expire * 1000 - Date.now()) / 86400000) : null;
+    var danger = (pct !== null && pct < 10) || (daysLeft !== null && daysLeft < 7);
+    var color = danger ? "#f87171" : "#94a3b8";
+    var parts = [
+      s.name + "(" + (s.proxies || 0) + "节点)",
+      total > 0 ? "剩余 " + fmtGB(remain) + (pct !== null ? " (" + pct + "%)" : "") : "用量未知",
+      s.expire ?
+        "到期 " + new Date(s.expire * 1000).toLocaleDateString() +
+        (daysLeft !== null ? "（剩 " + daysLeft + " 天）" : "")
+        : "无到期",
+    ];
+    rows +=
+      styled(
+        "div",
+        "font-size:11px;margin:2px 0" + (danger ? ";background:#3b1d1d;border-radius:4px;padding:3px 6px" : ""),
+        styled("span", "color:" + color, "📡 " + parts.join(" | ")) +
+          (danger ? styled("span", "color:#f87171;margin-left:6px", "⚠️") : ""),
+      );
+  }
+  // 配置入口（摘要双来源: 后台配置优先，回退 daemon 实际生效快照；显示条数+订阅名）
+  var configured = (window._wdData && _wdData.proxySettings && _wdData.proxySettings[userId] && _wdData.proxySettings[userId].subscriptions) || proxy.subscriptions || [];
+  var cfgNames = configured
+    .map(function (s) {
+      return s.name || String(s.url || "").replace(/^https?:\/\//, "").split("/")[0];
+    })
+    .filter(Boolean);
+  var cfgSummary = configured.length
+    ? configured.length + " 条" + (cfgNames.length ? "（" + cfgNames.slice(0, 3).join("、") + (cfgNames.length > 3 ? " 等" : "") + "）" : "")
+    : "未配置";
+  rows +=
+    styled(
+      "div",
+      "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) +
+        tag(
+          "button",
+          {
+            onclick: "wdShowProxyModal('" + esc(userId) + "')",
+            style:
+              "padding:2px 8px;font-size:11px;background:#333;color:#fbbf24;" +
+              "border:1px solid #444;border-radius:3px;cursor:pointer",
+            title: "配置该客户端的代理订阅地址（保存后自动热应用，无需重启）",
+          },
+          "配置 ⚙️",
+        ),
+    );
+  return rows;
+}
+
 /** 代理状态行：当前节点 + 健康状态 + 展开按钮 */
 function renderProxyLine(h, nodes, userId, port, hasNodes) {
   var dot = h.healthy ? "#4ade80" : "#f87171";

package/src/watch/public/index.html

@@ -781,6 +781,23 @@
     </div>
   </div>
 
+  <!-- 代理订阅配置弹窗 -->
+  <div id="wdProxyModal"
+    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:560px">
+      <div style="font-size:16px;color:#fbbf24;margin-bottom:4px">🛜 代理订阅配置 — <span id="wdProxyUserId"></span></div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">每行一个订阅地址（http/https）。保存后客户端下次心跳时自动热应用（无需重启 mihomo），<br>应用成功后此处可看到剩余流量与到期时间；临期（&lt;7天）或超量（剩余&lt;10%）会标红。</div>
+      <textarea id="wdProxySubsText" rows="6" placeholder="https://example.com/api/v1/client/subscribe?token=xxxx\nhttps://another-airport.com/sub?token=yyyy"
+        style="width:100%;box-sizing:border-box;padding:10px;background:#16161e;border:1px solid #333;border-radius:8px;color:#e0e0e0;font-size:12px;font-family:monospace;resize:vertical"></textarea>
+      <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
+        <button onclick="wdCloseProxyModal()"
+          style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
+        <button onclick="wdSaveProxySettings()"
+          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="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">

package/src/watch/watchdog-server.js

@@ -315,6 +315,26 @@ function getAllSwitchRestarts() {
   return cfg.switchRestarts || {};
 }
 
+// ── 代理订阅配置管理（per agent；页面改动 → 心跳下发 → daemon 热应用） ──
+
+function getProxySettingsStored(userId) {
+  if (!userId) return null;
+  const cfg = loadConfig();
+  return (cfg.proxySettings && cfg.proxySettings[userId]) || null;
+}
+
+function setProxySettingsStored(userId, config) {
+  const cfg = loadConfig();
+  if (!cfg.proxySettings) cfg.proxySettings = {};
+  cfg.proxySettings[userId] = config;
+  saveConfig(cfg);
+}
+
+function getAllProxySettings() {
+  const cfg = loadConfig();
+  return cfg.proxySettings || {};
+}
+
 // ── 自动升级开关配置管理（per agent，默认开启：未配置或 enabled=true 均开启，后端显式关闭才停用） ──
 
 function getAutoUpgradeStored(userId) {
@@ -517,6 +537,7 @@ async function handleHeartbeat(params, body, res) {
     clientConfig: getClientConfigStored(userId),
     errorTrigger: getErrorTriggerStored(userId),
     switchRestart: getSwitchRestartStored(userId),
+    proxySettings: getProxySettingsStored(userId),
     autoUpgrade: getAutoUpgradeStored(userId),
     loginPorts: getLoginPortsStored(userId),
     serverTime: Date.now(),
@@ -533,6 +554,7 @@ async function handleGetClients(params, body, res) {
     supportedCountries: SUPPORTED_COUNTRIES,
     errorTriggers: getAllErrorTriggers(),
     switchRestarts: getAllSwitchRestarts(),
+    proxySettings: getAllProxySettings(),
     autoUpgrades: getAllAutoUpgrades(),
     loginPorts: getAllLoginPorts(),
     configPath: WATCHDOG_CONFIG_PATH,
@@ -809,6 +831,33 @@ async function handleSetErrorTrigger(params, body, res) {
   sendJSON(res, 200, { ok: true, config: cleaned });
 }
 
+/** 配置某 agent 的代理订阅（心跳下发 → daemon 热应用；空列表表示清空） */
+async function handleSetProxySettings(params, body, res) {
+  const { userId, subscriptions } = body || {};
+  if (!userId) {
+    sendJSON(res, 400, { error: "缺少 userId" });
+    return;
+  }
+  if (!Array.isArray(subscriptions)) {
+    sendJSON(res, 400, { error: "subscriptions 须为数组" });
+    return;
+  }
+  // 归一化: 字符串或 {name,url}，去重去空
+  const seen = new Set();
+  const cleaned = [];
+  for (const it of subscriptions) {
+    const url = typeof it === "string" ? it.trim() : it && String(it.url || "").trim();
+    if (!url || !/^https?:\/\//.test(url) || seen.has(url)) continue;
+    seen.add(url);
+    const name = typeof it === "object" && it.name ? String(it.name).trim() : "";
+    cleaned.push({ name, url });
+  }
+  setProxySettingsStored(userId, { subscriptions: cleaned });
+  const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
+  console.error(`[watchdog ${ts}] ${userId} 代理订阅配置已更新: ${cleaned.length} 条`);
+  sendJSON(res, 200, { ok: true, subscriptions: cleaned });
+}
+
 /** 配置某 agent 的代理切换重启（代理切换后强制重启全部命令；默认不启用） */
 async function handleSetSwitchRestart(params, body, res) {
   const { userId, config } = body || {};
@@ -967,6 +1016,10 @@ export async function tryHandleWatchdogRoute(
     await handleSetSwitchRestart(params, body, res);
     return true;
   }
+  if (method === "POST" && routePath === "/api/watchdog/set-proxy-settings") {
+    await handleSetProxySettings(params, body, res);
+    return true;
+  }
   if (method === "POST" && routePath === "/api/watchdog/set-auto-upgrade") {
     await handleSetAutoUpgrade(params, body, res);
     return true;