tt-help-cli-ycl 1.4.172 → 1.4.176

package/src/watch/public/app.js

@@ -4394,6 +4394,17 @@ function renderOfflineCard(
 ) {
   var cmdCount = cmds ? cmds.length : 0;
   var expanded = wdCardIsExpanded(userId);
+  // 第二行摘要：离线卡最关心的就是配置了多少命令，整行可点展开/收起
+  var summaryLine = tag(
+    "div",
+    {
+      style:
+        "display:flex;gap:12px;align-items:center;flex-wrap:wrap;font-size:12px;margin-top:4px;cursor:pointer",
+      onclick: "wdToggleCardBody('" + esc(userId) + "')",
+      title: "点击展开/收起卡片",
+    },
+    styled("span", "color:#f59e0b", "配置 " + cmdCount + " 条命令"),
+  );
   var toggleBtn = tag(
     "button",
     {
@@ -4472,18 +4483,14 @@ function renderOfflineCard(
             toggleBtn,
         ),
     ) +
+      summaryLine +
       tag(
         "div",
         {
           id: "wdCardBody-" + wdEscId(userId),
           style: expanded ? "" : "display:none",
         },
-        styled(
-          "div",
-          "color:#555;font-size:12px",
-          "该机器尚未连接看门狗，配置了 " + cmdCount + " 条命令",
-        ) +
-          renderCountrySection({}, userId, clashCountries) +
+        renderCountrySection({}, userId, clashCountries) +
           renderErrorTriggerSection({}, userId, errorTriggers) +
           renderSwitchRestartSection({}, userId, switchRestarts) +
           renderAutoUpgradeSection({}, userId, autoUpgrades) +
@@ -4539,6 +4546,64 @@ function renderClientCard(
   var myCmds = userId && clientCommands[userId] ? clientCommands[userId] : [];
   var online = c.online;
 
+  var uptimeStr = os.uptime != null ? Math.round(os.uptime / 3600) + "h" : "?";
+  // 第二行巡检摘要：版本/进程/登录/国家（异常项高亮），整行可点展开/收起
+  var procRun = procs.filter(function (p) {
+    return p.status === "running";
+  }).length;
+  var procColor = procRun < procs.length ? "#f87171" : "#888";
+  var procTxt =
+    "进程 " + procRun + "/" + procs.length + (procRun < procs.length ? " ⚠" : "");
+
+  var loginTxt = "登录 —";
+  var loginColor = "#555";
+  var rep = c.loginReport;
+  if (rep && rep.error) {
+    loginTxt = "登录 检测失败";
+    loginColor = "#f87171";
+  } else if (rep && Array.isArray(rep.ports) && rep.ports.length) {
+    var loginOk = rep.ports.filter(function (r) {
+      return r.status === "logged_in";
+    }).length;
+    loginTxt =
+      "登录 " +
+      loginOk +
+      "/" +
+      rep.ports.length +
+      (loginOk === rep.ports.length ? " ✓" : " ⚠");
+    loginColor = loginOk === rep.ports.length ? "#4ade80" : "#fbbf24";
+  }
+
+  var ccEntry = (clashCountries && clashCountries[userId]) || {};
+  var ccCfg =
+    ccEntry.countries && ccEntry.countries.length ? ccEntry.countries : ["US"];
+  var ccActive = c.clashHealth && c.clashHealth.meta
+    ? c.clashHealth.meta.countryFilter
+    : null;
+  var ccActiveStr = Array.isArray(ccActive) ? ccActive.join(",") : ccActive;
+  var ccCfgStr = ccCfg.join(",");
+  var ccColor = "#888";
+  var ccTxt = "🌍 " + ccCfgStr;
+  if (ccActiveStr && ccActiveStr !== ccCfgStr) {
+    ccTxt = "🌍 " + ccCfgStr + "≠" + ccActiveStr + " ⚠";
+    ccColor = "#fbbf24";
+  }
+
+  var summaryLine = tag(
+    "div",
+    {
+      style:
+        "display:flex;gap:12px;align-items:center;flex-wrap:wrap;font-size:12px;margin-top:4px;cursor:pointer",
+      onclick: "wdToggleCardBody('" + esc(userId) + "')",
+      title: "点击展开/收起卡片",
+    },
+    styled("span", "color:#60a5fa", "v" + (c.ttHelpVersion || "?")) +
+      styled("span", "color:" + procColor, procTxt) +
+      styled("span", "color:" + loginColor, loginTxt) +
+      styled("span", "color:" + ccColor, ccTxt) +
+      styled("span", "color:#888", "运行 " + uptimeStr),
+  );
+
   // 折叠状态：默认只显示头部，点展开按钮看全部（需在 header 组装前定义）
   var expanded = wdCardIsExpanded(userId);
   var toggleBtn = tag(
@@ -4688,6 +4753,7 @@ function renderClientCard(
         ";border-radius:12px;padding:16px",
     },
     header +
+      summaryLine +
       tag(
         "div",
         {
@@ -5167,6 +5233,14 @@ function wdSubRefsCell(s) {
     .replace("<span", '<span title="' + escHtml(names) + '"');
 }
 
+function wdSubWeightCell(s) {
+  var w = parseInt(s.weight, 10);
+  if (!Number.isFinite(w) || w <= 1)
+    return styled("span", "color:#555;font-size:11px", "×1");
+  return styled("span", "color:#4ade80;font-weight:700;font-size:11px;cursor:help", "×" + w)
+    .replace("<span", '<span title="自动分配权重：占比≈权重比（修改后下次心跳生效）"');
+}
+
 function wdSubSourceCell(s) {
   if (s.source === "probe") {
     var p = s.lastProbe || {};
@@ -5282,6 +5356,7 @@ function renderSubscriptionsCenter(subs) {
         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:0 0 48px;text-align:center;", wdSubWeightCell(s)) +
         styled("div", "flex:1;overflow:hidden", wdSubSourceCell(s)) +
         styled("div", "display:flex;gap:6px;flex:0 0 auto", actions));
     });
@@ -5305,6 +5380,7 @@ function wdSubShowAddModal() {
   document.getElementById("wdSubName").value = "";
   document.getElementById("wdSubUrl").value = "";
   document.getElementById("wdSubNote").value = "";
+  document.getElementById("wdSubWeight").value = 1;
   document.getElementById("wdSubModal").style.display = "flex";
 }
 
@@ -5321,6 +5397,7 @@ function wdSubShowEditModal(id) {
   document.getElementById("wdSubName").value = s.name || "";
   document.getElementById("wdSubUrl").value = s.url || "";
   document.getElementById("wdSubNote").value = s.note || "";
+  document.getElementById("wdSubWeight").value = parseInt(s.weight, 10) || 1;
   document.getElementById("wdSubModal").style.display = "flex";
 }
 
@@ -5329,10 +5406,14 @@ function wdSubCloseModal() {
 }
 
 async function wdSubSave() {
+  var w = parseInt(document.getElementById("wdSubWeight").value, 10);
+  if (!Number.isFinite(w)) w = 1;
+  w = Math.max(1, Math.min(10, w));
   var payload = {
     name: document.getElementById("wdSubName").value.trim(),
     url: document.getElementById("wdSubUrl").value.trim(),
     note: document.getElementById("wdSubNote").value.trim(),
+    weight: w,
   };
   if (!payload.url) {
     alert("请填写订阅地址");
@@ -5482,33 +5563,16 @@ function renderLoginSection(c, userId, loginPorts) {
         "padding:2px 8px;font-size:11px;background:#333;color:#4ade80;" +
         "border:1px solid #444;border-radius:3px;cursor:pointer",
       title:
-        "配置要定期检测登录状态的 CDP 端口（逗号分隔，留空清空）\n当前: " +
+        "配置启动时导入登录态的 CDP 端口（逗号分隔，留空清空）\n当前: " +
         (configured.length ? configured.join(",") : "无"),
     },
     (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: "立即重检上次未通过的端口（全部已登录则跳过；结果随心跳自动刷新）",
-      },
-      "重检",
-    );
-  }
-
   var head =
     styled("span", "font-size:14px", "🔑") +
-    styled("span", "color:#888", "登录检测:") +
-    cfgBtn +
-    recheckBtn;
+    styled("span", "color:#888", "导入端口:") +
+    cfgBtn;
 
   var wrapStyle =
     "margin-top:6px;padding:6px 8px;background:#111;border-radius:6px;" +
@@ -5691,24 +5755,6 @@ 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);
-  }
-}
 
 // ── 错误自动切节点配置区域（看门狗面板中每个客户端卡片） ──
 

package/src/watch/public/index.html

@@ -668,10 +668,18 @@
       </div>
       <div id="wdSubsList" style="color:#666;font-size:12px">加载中...</div>
     </div>
+    <!-- 账号中心入口（独立页 /login-pool，同登录门禁） -->
+    <div style="margin-bottom:16px;border:1px solid #2a2a3d;border-radius:10px;background:#16161f;padding:12px;display:flex;align-items:center;justify-content:space-between">
+      <div>
+        <span style="font-size:14px;color:#34d399">🧑‍💼 账户中心（登录池）</span>
+        <span style="color:#666;font-size:11px;margin-left:8px">账号在用状态 / 使用者 / 使用次数 / 停用启用</span>
+      </div>
+      <a href="/login-pool" target="_blank"
+        style="padding:5px 14px;font-size:12px;background:#34d399;color:#000;border-radius:6px;font-weight:600;text-decoration:none">打开账号中心 →</a>
+    </div>
     <div id="wdClientsList" style="color:#666;font-size:12px">加载中...</div>
   </div>
 
-  <!-- 订阅中心 新增/编辑弹窗 -->
   <div id="wdSubModal"
     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">
@@ -692,6 +700,12 @@
         <input id="wdSubNote" placeholder="如：每月1号重置流量"
           style="width:100%;box-sizing:border-box;padding:8px 10px;background:#16161e;border:1px solid #333;border-radius:8px;color:#e0e0e0;font-size:12px">
       </div>
+      <div style="margin-bottom:10px">
+        <div style="color:#94a3b8;font-size:12px;margin-bottom:4px">自动分配权重（1-10，默认 1）</div>
+        <input id="wdSubWeight" type="number" min="1" max="10" step="1" value="1"
+          style="width:120px;box-sizing:border-box;padding:8px 10px;background:#16161e;border:1px solid #333;border-radius:8px;color:#e0e0e0;font-size:12px">
+        <div style="color:#666;font-size:11px;margin-top:4px">仅对「⚡自动分配」的节点生效：占比 ≈ 权重比，如设 2 则用量 ≈ 普通订阅的 2 倍；全部为 1 时平均摊开。修改后下次心跳生效。</div>
+      </div>
       <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">
         <button onclick="wdSubCloseModal()"
           style="padding:8px 16px;background:#333;color:#ccc;border:none;border-radius:6px;cursor:pointer;font-size:12px">取消</button>
@@ -974,9 +988,9 @@
   <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">
     <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="wdLoginPortsUserId"></span>
+      <div style="font-size:16px;color:#4ade80;margin-bottom:4px">🔑 导入端口 — <span id="wdLoginPortsUserId"></span>
       </div>
-      <div style="color:#888;font-size:12px;margin-bottom:12px">配置该客户端要定期检测登录状态的 CDP 端口（逗号分隔，如 <b
+      <div style="color:#888;font-size:12px;margin-bottom:12px">配置该客户端启动时导入登录态的 CDP 端口（逗号分隔，如 <b
           style="color:#4ade80">9222,9223,9225</b>）。<br>客户端每隔一段时间自动检测并上报结果，留空保存可清空配置。</div>
       <input id="wdLoginPortsInput" placeholder="9222,9223,9225"
         style="width:100%;padding:8px;background:#111;border:1px solid #333;color:#e0e0e0;border-radius:6px;font-size:13px;box-sizing:border-box">

package/src/watch/server.js

@@ -10,6 +10,17 @@ import { createStore } from "./data-store.js";
 import { getTagDb } from "./db-schema.js";
 import { getTargetLocations } from "../lib/app-config.js";
 import { tryHandleWatchdogRoute } from "./watchdog-server.js";
+import {
+  getLoginPoolView,
+  addAccount,
+  updateAccount,
+  deleteAccount,
+  assignAccount,
+  releaseAccount,
+  takeAccount,
+  acquireAccount,
+  importAccount,
+} from "./login-pool.js";
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -624,6 +635,174 @@ ${err}
   res.end(html);
 }
 
+/** 账号中心（登录池）页面：自包含，无外部依赖，脱敏展示 + 基础管理动作 */
+function serveLoginPoolPage(res) {
+  const html = `<!DOCTYPE html>
+<html><head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>账号中心 · 登录池</title>
+<style>
+  body { font-family: system-ui, sans-serif; margin: 20px; background: #f7f8fa; color: #1f2329; }
+  h1 { font-size: 20px; }
+  .bar { margin: 12px 0; display: flex; gap: 8px; align-items: center; flex-wrap: wrap; }
+  button { padding: 4px 10px; border: 1px solid #d0d3d9; border-radius: 6px; background: #fff; cursor: pointer; font-size: 12px; }
+  button:hover { background: #f0f2f5; }
+  button:disabled { color: #c0c4cc; cursor: not-allowed; background: #fafafa; }
+  table { border-collapse: collapse; width: 100%; background: #fff; }
+  th, td { border: 1px solid #e5e7eb; padding: 6px 10px; font-size: 13px; text-align: left; vertical-align: top; }
+  th { background: #f2f3f5; white-space: nowrap; }
+  .badge { display: inline-block; padding: 1px 8px; border-radius: 10px; font-size: 12px; font-weight: 600; }
+  .b-leased { background: #dbeafe; color: #2563eb; }
+  .b-pool { background: #dcfce7; color: #16a34a; }
+  .b-suspect { background: #fef3c7; color: #d97706; }
+  .b-retired { background: #e5e7eb; color: #6b7280; }
+  .muted { color: #9ca3af; font-size: 12px; }
+  .warn { color: #dc2626; }
+  #msg { margin: 0 8px; }
+  details { margin-top: 2px; }
+  summary { cursor: pointer; }
+</style>
+</head>
+<body>
+<h1>账号中心 · 登录池</h1>
+<div class="bar">
+  <button onclick="load()">刷新</button>
+  <label><input type="checkbox" id="auto" checked> 自动刷新(15s)</label>
+  <button onclick="addDlg()">入池</button>
+  <button onclick="takeDlg()" title="调试：走命令队列的 take（watchdog 注入流）">模拟取号</button>
+  <span id="msg"></span>
+</div>
+<div id="content">加载中…</div>
+<script>
+const esc = s => String(s ?? '').replace(/[&<>"']/g, c => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;','\\'':'&#39;'}[c]));
+const fmt = t => t ? new Date(t).toLocaleString('zh-CN', {hour12:false}) : '—';
+const day = t => t ? new Date(t).toLocaleDateString('zh-CN') : '—';
+const ST = { leased: ['使用中','b-leased'], pool: ['空闲','b-pool'], suspect: ['疑似异常','b-suspect'], retired: ['已停用','b-retired'] };
+const ORDER = { leased: 0, pool: 1, suspect: 2, retired: 3 };
+const rel = t => {
+  if (!t) return '—';
+  const d = Date.now() - t;
+  if (d < 60000) return '刚刚';
+  if (d < 3600000) return Math.floor(d / 60000) + '分钟前';
+  if (d < 86400000) return Math.floor(d / 3600000) + '小时前';
+  return Math.floor(d / 86400000) + '天前';
+};
+async function api(p, body) {
+  const r = await fetch(p, body ? {method:'POST', headers:{'Content-Type':'application/json'}, body: JSON.stringify(body)} : undefined);
+  const j = await r.json().catch(() => ({}));
+  if (!r.ok) throw new Error(j.error || ('HTTP ' + r.status));
+  return j;
+}
+function msg(t, err) { const el = document.getElementById('msg'); el.textContent = t; el.style.color = err ? '#dc2626' : '#16a34a'; }
+const openHist = new Set(); // 展开了历史明细的账号 id（跨自动刷新保留）
+function onHistToggle(el) {
+  const id = el.dataset.acc;
+  if (el.open) openHist.add(id);
+  else openHist.delete(id);
+}
+async function load() {
+  try {
+    const j = await api('/api/login-pool');
+    const list = j.accounts.slice().sort((a, b) =>
+      ((ORDER[a.status] ?? 9) - (ORDER[b.status] ?? 9)) ||
+      ((b.lastUsedAt || b.createdAt || 0) - (a.lastUsedAt || a.createdAt || 0)));
+    const rows = list.map((a, idx) => {
+      const l = a.lease;
+      const biz = a.lastBusinessOkAt ? fmt(a.lastBusinessOkAt) : '无记录';
+      const expired = a.sessionExpiresAt && a.sessionExpiresAt < Date.now();
+      const st = ST[a.status] || [a.status, ''];
+      const who = l
+        ? esc(l.userId) + (l.port ? ':' + esc(l.port) : '') + (l.appName ? ' <span class="muted">· ' + esc(l.appName) + '</span>' : '')
+        : '<span class="muted">—</span>';
+      const meta = [];
+      if (a.note) meta.push(esc(a.note));
+      if (a.proxyHint) meta.push('出口 ' + esc(a.proxyHint));
+      if (a.cookieCount) meta.push('cookies ' + a.cookieCount + ' 条');
+      return '<tr>' +
+        '<td class="muted">' + (idx + 1) + '</td>' +
+        '<td><b>' + esc(a.username) + '</b>' +
+          (meta.length ? '<div class="muted">' + meta.join(' · ') + '</div>' : '') + '</td>' +
+        '<td><span class="badge ' + st[1] + '">' + st[0] + '</span></td>' +
+        '<td>' + who + '</td>' +
+        '<td title="最后使用: ' + fmt(a.lastUsedAt) + '\\n最后出活: ' + biz + '">' + rel(a.lastUsedAt) + '</td>' +
+        '<td>' + (a.useCount || 0) + '</td>' +
+        '<td' + (expired ? ' class="warn"' : '') + ' title="sessionid 到期: ' + fmt(a.sessionExpiresAt) + '（cookie 承诺寿命，非实时有效性）">' + day(a.sessionExpiresAt) + (expired ? '（已过）' : '') + '</td>' +
+        '<td>' +
+          (a.status === 'leased' ? '<button onclick="releaseDlg(\\'' + a.id + '\\',\\'' + esc(a.username) + '\\')">释放</button> ' : '') +
+          (a.status === 'pool' ? '<button onclick="assignDlg(\\'' + a.id + '\\',\\'' + esc(a.username) + '\\')" title="手动指派给节点端口（watchdog 注入流）">指派</button> ' : '') +
+          (a.status === 'suspect' ? '<button onclick="enable(\\'' + a.id + '\\',\\'' + esc(a.username) + '\\',true)">启用</button> ' : '') +
+          (a.status === 'retired' ? '<button onclick="enable(\\'' + a.id + '\\',\\'' + esc(a.username) + '\\',false)">启用</button> ' : '') +
+          (a.status !== 'retired' ? '<button onclick="disable(\\'' + a.id + '\\',\\'' + esc(a.username) + '\\',' + (a.status === 'leased') + ')">停用</button> ' : '') +
+          (a.status === 'retired' ? '<button onclick="del(\\'' + a.id + '\\')">删除</button> ' : '') +
+          '<button disabled title="开发中：引导重新登录并更新池内登录态">重登录</button>' +
+        '</td>' +
+        '<td><details data-acc="' + esc(a.id) + '" ' + (openHist.has(a.id) ? 'open' : '') + ' ontoggle="onHistToggle(this)"><summary class="muted">' + (a.history ? a.history.length : 0) + ' 条</summary>' +
+          (a.history || []).slice(0, 8).map(h => '<div class="muted">' + fmt(h.at) + ' ' + esc(h.event) + ' ' + esc(h.detail) + '</div>').join('') + '</details></td>' +
+      '</tr>';
+    }).join('');
+    const nLeased = j.accounts.filter(a => a.status === 'leased').length;
+    const nFree = j.accounts.filter(a => a.status === 'pool').length;
+    document.getElementById('content').innerHTML =
+      '<table><tr><th>#</th><th>账号</th><th>状态</th><th>使用者</th><th>最近使用</th><th>次数</th><th>有效期</th><th>操作</th><th>历史</th></tr>' + rows + '</table>' +
+      '<p class="muted">共 ' + j.total + ' 个 · 使用中 ' + nLeased + ' · 空闲 ' + nFree + ' · 排序：使用中 → 空闲 → 疑似 → 已停用 · 有效期 = sessionid cookie 承诺寿命（非实时有效性，真实判据 = 业务出活）· cookies 明文不出服务端</p>';
+  } catch (e) { msg('加载失败: ' + e.message, true); }
+}
+async function addDlg() {
+  const username = prompt('账号名(uniqueId，可留空自动从 cookies 提取):'); if (username === null) return;
+  const cookiesRaw = prompt('cookies JSON 数组（可直接粘 export.mjs 导出的整个 JSON，会自动取 cookies 字段）:'); if (!cookiesRaw) return;
+  try {
+    let cookies = JSON.parse(cookiesRaw);
+    if (cookies && !Array.isArray(cookies) && Array.isArray(cookies.cookies)) cookies = cookies.cookies;
+    const note = prompt('备注(可空，如来源 F-11:9223):');
+    await api('/api/login-pool/add', { username: username || undefined, cookies, note: note || undefined });
+    msg('入池成功'); load();
+  } catch (e) { msg('入池失败: ' + e.message, true); }
+}
+async function takeDlg() {
+  const userId = prompt('节点 userId（如 F-11）:'); if (!userId) return;
+  const port = prompt('端口:'); if (!port) return;
+  try { const j = await api('/api/login-pool/take', { userId, port: Number(port) }); msg('已取号: ' + j.account.username); load(); }
+  catch (e) { msg('取号失败: ' + e.message, true); }
+}
+async function assignDlg(id, name) {
+  const userId = prompt('指派给节点 userId（如 F-11）:'); if (!userId) return;
+  const port = prompt('端口:'); if (!port) return;
+  try { await api('/api/login-pool/assign', { id, userId, port: Number(port) }); msg('已指派 ' + name); load(); }
+  catch (e) { msg('指派失败: ' + e.message, true); }
+}
+async function releaseDlg(id, name) {
+  const clearOnNode = confirm('释放 ' + name + '。\\n确定 = 同时下发 clearLogin 清理节点登录态；取消 = 仅释放租约（节点保留当前登录态）');
+  try { await api('/api/login-pool/release', { id, clearOnNode }); msg('已释放 ' + name); load(); }
+  catch (e) { msg('释放失败: ' + e.message, true); }
+}
+async function enable(id, name, suspect) {
+  if (suspect && !confirm(name + ' 为疑似异常状态，确认启用回池？')) return;
+  try { await api('/api/login-pool/update', { id, status: 'pool' }); msg('已启用 ' + name); load(); }
+  catch (e) { msg('失败: ' + e.message, true); }
+}
+async function disable(id, name, leased) {
+  const q = leased
+    ? name + ' 使用中：停用将同时释放租约（节点本地登录态保留）。确认停用？'
+    : '确认停用 ' + name + '？停用后不参与自动取号';
+  if (!confirm(q)) return;
+  try { await api('/api/login-pool/update', { id, status: 'retired' }); msg('已停用 ' + name); load(); }
+  catch (e) { msg('失败: ' + e.message, true); }
+}
+async function del(id) {
+  if (!confirm('确认删除该账号？不可恢复')) return;
+  try { await api('/api/login-pool/delete', { id }); msg('已删除'); load(); }
+  catch (e) { msg('失败: ' + e.message, true); }
+}
+load();
+setInterval(() => { if (document.getElementById('auto').checked) load(); }, 15000);
+</script>
+</body>
+</html>`;
+  res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+  res.end(html);
+}
+
 export function startWatchServer(
   dataAnchor,
   port = 3000,
@@ -1405,6 +1584,61 @@ export function startWatchServer(
         return;
       }
 
+      // ── 登录池（账号中心）端点：输出一律脱敏，cookies 明文仅存服务端/心跳下发通道 ──
+      if (req.method === "GET" && routePath === "/api/login-pool") {
+        sendJSON(res, 200, getLoginPoolView());
+        return;
+      }
+      if (req.method === "POST" && routePath.startsWith("/api/login-pool/")) {
+        const lpAction = routePath.slice("/api/login-pool/".length);
+        const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
+        try {
+          const body = await readBody(req);
+          let ret;
+          if (lpAction === "add") {
+            ret = addAccount(body);
+            console.error(`[登录池 ${ts}] ADD: ${ret.username} (${ret.cookieCount} 条 cookies)`);
+          } else if (lpAction === "take") {
+            ret = takeAccount(body);
+            console.error(`[登录池 ${ts}] TAKE: ${ret.username} → ${body.userId}:${body.port}`);
+          } else if (lpAction === "acquire") {
+            // Phase 2 直取（以号为主键）：响应含明文 cookies（业务进程自注入，不经心跳命令队列）
+            ret = acquireAccount(body);
+            console.error(
+              `[登录池 ${ts}] ACQUIRE: ${ret.username} → ${body.userId}${body.port ? ":" + body.port : ""} (${ret.cookieCount} 条 cookies)`,
+            );
+          } else if (lpAction === "import") {
+            // 节点登录态导入（以号为主键，导入=入池登记为空闲，不自动租）：按 username 去重
+            const imp = importAccount(body);
+            ret = imp.account;
+            console.error(
+              `[登录池 ${ts}] IMPORT: ${ret.username} ← ${body.userId}${body.port ? ":" + body.port : ""}${imp.dedup ? "（已在池，幂等跳过）" : "（新入池·空闲）"} (${ret.cookieCount} 条 cookies)`,
+            );
+            sendJSON(res, 200, { ok: true, dedup: imp.dedup, account: ret });
+            return;
+          } else if (lpAction === "assign") {
+            ret = assignAccount(body);
+            console.error(`[登录池 ${ts}] ASSIGN: ${ret.username} → ${body.userId}:${body.port}`);
+          } else if (lpAction === "release") {
+            ret = releaseAccount(body);
+            console.error(`[登录池 ${ts}] RELEASE: ${ret.username} → pool`);
+          } else if (lpAction === "update") {
+            ret = updateAccount(body);
+            console.error(`[登录池 ${ts}] UPDATE: ${ret.username} status=${ret.status}`);
+          } else if (lpAction === "delete") {
+            ret = deleteAccount(body.id);
+            console.error(`[登录池 ${ts}] DELETE: ${ret.username}`);
+          } else {
+            sendJSON(res, 404, { error: `未知登录池操作: ${lpAction}` });
+            return;
+          }
+          sendJSON(res, 200, { ok: true, account: ret });
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
       // ── recheck-jobs 端点 ──
       if (req.method === "GET" && routePath === "/api/recheck-jobs") {
         const limit = params.limit;
@@ -3100,6 +3334,24 @@ export function startWatchServer(
         return;
       }
 
+      // ── 账号中心（登录池）独立页面：与主页同一登录门禁 ──
+      if (req.method === "GET" && routePath === "/login-pool") {
+        if (PASSWORD_ENABLED) {
+          const token = parseAuthToken(req, params);
+          const valid =
+            token &&
+            authSessions.has(token) &&
+            authSessions.get(token) > Date.now();
+          if (!valid) {
+            serveLoginPage(res);
+            return;
+          }
+          authSessions.set(token, Date.now() + AUTH_MAX_AGE * 1000);
+        }
+        serveLoginPoolPage(res);
+        return;
+      }
+
       // ====== 静态资源（HTML 页面需登录） ======
 
       if (

package/src/watch/subscription-allocator.js

@@ -14,13 +14,18 @@
  *   3 粘性     槽位原位保留——订阅还活着就不挪窝（端口 = 槽位序）；
  *              不在池子的存量 URL 状态未知，同样视为可用（迁移无感）
  *   4 节点内摊开 同一机器槽位尽量用不同订阅；count > 可用去重数才回绕
- *   5 跨机器错开 补槽时优先选全集群占用数最少的可用订阅
- *              （占用数 = 该订阅在所有机器 alloc 里出现的次数）
+ *   5 跨机器错开 补槽时优先选全集群「加权占用」最小的可用订阅
+ *              （占用数 = 该订阅在所有机器 alloc 里出现的次数；
+ *              加权占用 = 占用数 / weight，weight 缺省 1 → 退化为大家 1:1:1:1 摊开，与无权重时代数完全一致）
  *   6 重复合法  回绕重复按池子顺序取
  *   7 空保护   可用集为空 → alloc 原地不动 + 标黄，绝不下发空列表
  *   8 决定性   纯函数 + 池子顺序决胜；心跳重跑输入不变则结果恒等，天然粘性
  *
- * 选槽打分（取最小）: (本节点其它槽位已用 ? 1 : 0) → 全局占用数升序 → 池子顺序。
+ * 权重语义: weight 只影响跨机器份额，不破坏粘性——存量槽照旧占位计数，
+ * 份额超了后续新槽自然不再选它，平滑收敛到 weight 比例；
+ * 节点内摊开（规则4）不受权重影响，机器内部仍优先用不同订阅。
+ *
+ * 选槽打分（取最小）: (本节点其它槽位已用 ? 1 : 0) → 全局占用数/weight 升序 → 池子顺序。
  * 全局占用数每次现算（遍历所有节点 alloc，几十个节点毫秒级）；分配时机 = 心跳惰性计算，
  * 结果与存量不同才写回配置（下一行 sendJSON 读到的即是新 alloc，同一个心跳就下发）。
  *
@@ -86,11 +91,16 @@ function scoreLess(a, b) {
  * @returns {{ alloc: Array<{name,url}>, warn: string|null }}
  *          warn: "pool-empty" 可用集为空且存在补不上的槽（规则 #7）
  */
-export function allocateSubscriptions({ available, count, prevAlloc, usage, isAvailUrl }) {
+export function allocateSubscriptions({ available, count, prevAlloc, usage, weights, isAvailUrl }) {
   const prev = Array.isArray(prevAlloc) ? prevAlloc.map(normEntry) : [];
   const n = Math.max(1, Math.min(ALLOC_MAX_INSTANCES, parseInt(count, 10) || 1));
   const avail = Array.isArray(available) ? available : [];
   const use = usage && typeof usage === "object" ? usage : {};
+  const wt = weights && typeof weights === "object" ? weights : {};
+  const weightOf = (url) => {
+    const w = parseInt(wt[url], 10);
+    return Number.isFinite(w) && w > 0 ? w : 1; // 非法/缺省一律按 1，行为与无权重版一致
+  };
 
   const nodeUsed = new Map(); // 本节点新 alloc 内的占用（含粘性保留槽，跨节点占用走 usage）
   const globalUsed = (url) => (use[url] || 0) + (nodeUsed.get(url) || 0);
@@ -120,7 +130,7 @@ export function allocateSubscriptions({ available, count, prevAlloc, usage, isAv
     for (let k = 0; k < avail.length; k++) {
       const s = avail[k];
       const inNode = (nodeUsed.get(s.url) || 0) > 0;
-      const score = [inNode ? 1 : 0, globalUsed(s.url), k];
+      const score = [inNode ? 1 : 0, globalUsed(s.url) / weightOf(s.url), k];
       if (!bestScore || scoreLess(score, bestScore)) {
         best = s;
         bestScore = score;
@@ -199,6 +209,8 @@ export function reconcileAutoAlloc(userId) {
   const views = getSubscriptionView();
   const viewByUrl = new Map(views.map((v) => [v.url, v]));
   const available = views.filter(isSubAvailable);
+  const weights = {};
+  for (const v of views) weights[v.url] = v.weight;
 
   // 全局占用数现算：其它节点 alloc 里该 URL 出现的次数（本节点走分配内计数）
   const usage = {};
@@ -220,6 +232,7 @@ export function reconcileAutoAlloc(userId) {
     count,
     prevAlloc,
     usage,
+    weights,
     isAvailUrl: (u) => isAllocUrlAvailable(u, viewByUrl),
   });