tt-help-cli-ycl 1.4.177 → 1.4.179

package/src/watch/public/app.js

@@ -6044,7 +6044,14 @@ function renderProxySection(c, userId) {
   if (wdSubsConfigured(userId).length > 0) {
     return renderSubsOverview(c, userId, [], []);
   }
-  return renderProxyLegacy(c, userId);
+  var legacy = renderProxyLegacy(c, userId);
+  if (legacy) return legacy;
+  // 新节点引导（2026-10-28）：无通道 + 未配置订阅 + daemon 未跑过 clash 时，原逻辑返回 ""，
+  // 后台看不到任何订阅配置入口——而 proxySettings[userId] 条目只有配置动作才会创建
+  // （注册/心跳从不建，订阅分配器对无条目直接 return null），构成死环（F-11/IB-1 都踩过）。
+  // 渲染最小引导行：配置弹窗对空条目天然兼容（手动列表 / 切自动分配均可用），
+  // 建条目后客户端下个心跳拿到订阅并自动拉起 mihomo，本区块随之变为正常视图。
+  return renderSubsBootstrap(userId);
 }
 
 /** 兼容旧版：仅主控制端（legacy clashHealth） */
@@ -6061,6 +6068,27 @@ function renderProxyLegacy(c, userId) {
   );
 }
 
+/** 新节点引导行：订阅完全未配置且 daemon 无 clash 数据时，仍保留配置入口（打破 UI 死环） */
+function renderSubsBootstrap(userId) {
+  return styled(
+    "div",
+    "margin-top:6px;padding:6px 10px;background:#111;border-radius:6px;display:flex;align-items:center;gap:8px;font-size:12px;flex-wrap:wrap",
+    styled("span", "color:#888", "🛜 订阅配置:") +
+      styled("span", "color:#6b7280", "未配置（保存后下个心跳自动下发并拉起 mihomo）") +
+      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: "配置该客户端的代理订阅地址（保存后自动热应用，无需重启）",
+        },
+        "配置 ⚙️",
+      ),
+  );
+}
+
 /** 外部代理通道（Verge 等非内置实例）：节点行 + 节点列表 + 自身订阅摘要 */
 function renderExternalChannel(ch, userId, withConfig) {
   if (!ch || !ch.node) return "";

package/src/watch/server.js

@@ -20,7 +20,10 @@ import {
   takeAccount,
   acquireAccount,
   importAccount,
+  reloginAccount,
+  prepareRelogin,
 } from "./login-pool.js";
+import { checkPoolAccounts } from "./login-health.js";
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -643,37 +646,52 @@ function serveLoginPoolPage(res) {
 <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; }
+  body { font-family: system-ui, sans-serif; margin: 0; background: #f3f4f6; color: #1f2329; }
+  .wrap { max-width: 1280px; margin: 0 auto; padding: 22px 24px 48px; }
+  h1 { font-size: 20px; margin: 0 0 2px; }
+  .sub { color: #9ca3af; font-size: 12px; margin-bottom: 14px; }
+  .bar { display: flex; gap: 8px; align-items: center; flex-wrap: wrap; margin-bottom: 12px; }
+  button { padding: 6px 14px; border: 1px solid #d0d3d9; border-radius: 8px; background: #fff; cursor: pointer; font-size: 13px; transition: all .15s; }
+  button:hover { background: #f0f2f5; border-color: #b8bdc7; }
+  button:disabled { color: #9ca3af; cursor: not-allowed; background: #f5f5f5; border-color: #e5e7eb; }
+  button.primary { background: #2563eb; border-color: #2563eb; color: #fff; font-weight: 600; }
+  button.primary:hover:not(:disabled) { background: #1d4ed8; }
+  .chips { display: inline-flex; gap: 6px; margin-left: auto; flex-wrap: wrap; }
+  .chip { background: #fff; border: 1px solid #e5e7eb; border-radius: 999px; padding: 3px 12px; font-size: 12px; color: #6b7280; }
+  .chip b { color: #1f2329; }
+  .card { background: #fff; border: 1px solid #e5e7eb; border-radius: 12px; overflow: auto; box-shadow: 0 1px 2px rgba(0,0,0,.04); }
+  table { border-collapse: collapse; width: 100%; }
+  th, td { padding: 9px 12px; font-size: 13px; text-align: left; vertical-align: top; border-bottom: 1px solid #f0f1f3; }
+  thead th { background: #f9fafb; color: #6b7280; font-weight: 600; white-space: nowrap; border-bottom: 1px solid #e5e7eb; }
+  tbody tr:hover { background: #f8faff; }
+  tbody tr:last-child td { border-bottom: none; }
+  .badge { display: inline-block; padding: 1px 9px; border-radius: 999px; 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; }
+  #msg { font-size: 13px; color: #16a34a; }
+  .spin { display: inline-block; width: 12px; height: 12px; border: 2px solid #cbd5e1; border-top-color: #2563eb; border-radius: 50%; animation: spin .8s linear infinite; vertical-align: -2px; margin-right: 6px; }
+  @keyframes spin { to { transform: rotate(360deg); } }
   details { margin-top: 2px; }
   summary { cursor: pointer; }
+  td button { padding: 3px 10px; font-size: 12px; border-radius: 6px; margin: 1px 0; }
 </style>
 </head>
 <body>
+<div class="wrap">
 <h1>账号中心 · 登录池</h1>
+<div class="sub">登录态统一存放与租借：业务取号注入 / 节点启动导入 / 巡检与重登录</div>
 <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>
+  <button onclick="addCmdDlg()" title="一键拉起本机 tt-help：弹出 Edge 登录 TikTok 后自动入池（本机需已安装 tt-help 并执行过 tt-help protocol register；未注册时自动回退为复制命令）">新增账号</button>
+  <button id="btn-check" class="primary" onclick="checkNow()" title="逐号 HTTP 探测登录态（空闲+疑似），死号自动标疑似">批量检测</button>
   <span id="msg"></span>
+  <span class="chips" id="stats"></span>
 </div>
-<div id="content">加载中…</div>
+<div id="content" class="card">加载中…</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}) : '—';
@@ -715,6 +733,10 @@ async function load() {
       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 health = a.lastHealth === 'alive' ? '<span style="color:#16a34a">✓</span>'
+        : a.lastHealth === 'dead' ? '<span class="warn">✗</span>'
+        : a.lastHealth === 'error' ? '<span class="muted">?</span>'
+        : '<span class="muted">—</span>';
       const meta = [];
       if (a.note) meta.push(esc(a.note));
       if (a.proxyHint) meta.push('出口 ' + esc(a.proxyHint));
@@ -728,6 +750,7 @@ async function load() {
         '<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 title="上次检测: ' + fmt(a.lastHealthAt) + (a.lastHealth === 'dead' ? '\\n死号已标疑似，可重登录复活' : a.lastHealth === 'alive' ? '\\n登录态存活' : '') + '">' + health + ' <span class="muted">' + rel(a.lastHealthAt) + '</span></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> ' : '') +
@@ -735,7 +758,7 @@ async function load() {
           (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>' +
+          '<button onclick="reloginDlg(\\'' + esc(a.username) + '\\')" title="一键拉起本机 tt-help 重登录：旧登录态自动复活（或人工登录），验证身份后覆盖刷新池内 cookies">重登录</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>' +
@@ -743,27 +766,90 @@ async function load() {
     }).join('');
     const nLeased = j.accounts.filter(a => a.status === 'leased').length;
     const nFree = j.accounts.filter(a => a.status === 'pool').length;
+    const nSus = j.accounts.filter(a => a.status === 'suspect').length;
+    const nRet = j.accounts.filter(a => a.status === 'retired').length;
+    document.getElementById('stats').innerHTML =
+      '<span class="chip">共 <b>' + j.total + '</b></span>' +
+      '<span class="chip">使用中 <b>' + nLeased + '</b></span>' +
+      '<span class="chip">空闲 <b>' + nFree + '</b></span>' +
+      '<span class="chip">疑似 <b>' + nSus + '</b></span>' +
+      '<span class="chip">已停用 <b>' + nRet + '</b></span>';
     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>';
+      '<table><tr><th>#</th><th>账号</th><th>状态</th><th>使用者</th><th>最近使用</th><th>次数</th><th>有效期</th><th>检测</th><th>操作</th><th>历史</th></tr>' + rows + '</table>' +
+      '<div style="padding: 10px 14px;"><p class="muted" style="margin:0">排序：使用中 → 空闲 → 疑似 → 已停用 · 每 15 秒自动刷新 · 有效期 = sessionid cookie 承诺寿命 · 检测 = 登录态探测（真实判据 = 业务出活）· cookies 明文不出服务端 · 「新增账号/重登录」一键拉起需本机装 tt-help 并执行过 <b>tt-help protocol register</b></p></div>';
   } 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); }
+function copyCmd(cmd) {
+  if (navigator.clipboard) navigator.clipboard.writeText(cmd).catch(() => {});
+  prompt('复制命令（在装有 tt-help 的机器上执行）:', cmd);
 }
-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); }
+function protoHref(action, params) {
+  const q = [];
+  for (const k in params) q.push(k + '=' + encodeURIComponent(params[k]));
+  return 'tt-help://' + action + '?' + q.join('&');
+}
+let protoBlurred = false;
+window.addEventListener('blur', () => { protoBlurred = true; });
+function launchProto(url, fallbackCmd, okMsg) {
+  protoBlurred = false;
+  location.href = url;
+  setProgress('已发起一键拉起 tt-help…');
+  setTimeout(() => {
+    if (protoBlurred) { msg(okMsg); return; }
+    const el = document.getElementById('msg');
+    el.style.color = '#d97706';
+    el.innerHTML = '未检测到协议处理器（或已在弹窗取消）。<button onclick="copyCmd(\\'' + fallbackCmd + '\\')">复制命令</button> <span class="muted">或本机执行 <b>tt-help protocol register</b> 注册后即可一键拉起</span>';
+  }, 2500);
+}
+function addCmdDlg() {
+  launchProto(protoHref('login-pool/add', { server: location.origin }),
+    'tt-help login-pool add --server ' + location.origin,
+    '已拉起 tt-help：请在弹出的窗口登录 TikTok，完成后回来点刷新');
+}
+function reloginDlg(name) {
+  launchProto(protoHref('login-pool/relogin', { server: location.origin, username: name }),
+    'tt-help login-pool relogin ' + name + ' --server ' + location.origin,
+    '已拉起 tt-help 重登录 @' + name + '：看弹出窗口（旧登录态会先试自动复活），完成后点刷新');
+}
+function setProgress(t) {
+  const el = document.getElementById('msg');
+  el.innerHTML = '<span class="spin"></span>' + esc(t);
+  el.style.color = '#2563eb';
+}
+let checking = false;
+async function checkNow() {
+  if (checking) return;
+  let targets;
+  try {
+    const j = await api('/api/login-pool');
+    targets = j.accounts.filter(a => a.status === 'pool' || a.status === 'suspect');
+  } catch (e) { msg('加载失败: ' + e.message, true); return; }
+  if (!targets.length) { msg('没有待检测账号（空闲+疑似为空，使用中的由业务自验）'); return; }
+  if (!confirm('批量检测 ' + targets.length + ' 个账号的登录态？（死号自动标疑似）')) return;
+  checking = true;
+  const btn = document.getElementById('btn-check');
+  btn.disabled = true; btn.textContent = '检测中…';
+  let done = 0, alive = 0, dead = 0, err = 0, mig = 0;
+  try {
+    for (const a of targets) {
+      setProgress('巡检中 ' + (done + 1) + '/' + targets.length + ' · 正在检测 @' + a.username + ' …');
+      let health = 'error';
+      try {
+        const r = await api('/api/login-pool/check', { ids: [a.id] });
+        const x = r.results && r.results[0];
+        if (x) { health = x.health; if (x.migrated) mig++; }
+      } catch (e) { health = 'error'; }
+      if (health === 'alive') alive++; else if (health === 'dead') dead++; else err++;
+      done++;
+      setProgress('巡检中 ' + done + '/' + targets.length + ' · 活 ' + alive + ' / 死 ' + dead + ' / 异常 ' + err);
+      load();
+      if (done < targets.length) await new Promise(r => setTimeout(r, 300));
+    }
+    msg('巡检完成: 探测 ' + done + '，活 ' + alive + ' / 死 ' + dead + ' / 异常 ' + err + (mig ? '，死号标疑似 ' + mig + ' 个' : ''));
+  } finally {
+    checking = false;
+    btn.disabled = false; btn.textContent = '批量检测';
+  }
 }
 async function assignDlg(id, name) {
   const userId = prompt('指派给节点 userId（如 F-11）:'); if (!userId) return;
@@ -795,8 +881,9 @@ async function del(id) {
   catch (e) { msg('失败: ' + e.message, true); }
 }
 load();
-setInterval(() => { if (document.getElementById('auto').checked) load(); }, 15000);
+setInterval(() => load(), 15000);
 </script>
+</div>
 </body>
 </html>`;
   res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -1616,6 +1703,28 @@ export function startWatchServer(
             );
             sendJSON(res, 200, { ok: true, dedup: imp.dedup, account: ret });
             return;
+          } else if (lpAction === "relogin") {
+            // 重登录覆盖刷新（以号为主键）：目标必须已在池；使用中拒绝；retired 复活、suspect 回池
+            const rel = reloginAccount(body);
+            ret = rel.account;
+            console.error(
+              `[登录池 ${ts}] RELOGIN: ${ret.username} ← ${body.userId}${rel.revived ? "（复活）" : rel.wasSuspect ? "（疑似→池）" : ""} (${ret.cookieCount} 条 cookies)`,
+            );
+            sendJSON(res, 200, { ok: true, revived: rel.revived, wasSuspect: rel.wasSuspect, account: ret });
+            return;
+          } else if (lpAction === "prepare") {
+            // 重登录预备：返回目标账号明文 cookies（relogin 命令注入旧登录态用；与 acquire 同级信任）
+            const prep = prepareRelogin(body);
+            sendJSON(res, 200, { ok: true, account: prep.account });
+            return;
+          } else if (lpAction === "check") {
+            // 巡检：无浏览器纯 HTTP 探测登录态（默认 pool+suspect，指定 ids 精确取）
+            const sum = await checkPoolAccounts({ ids: body.ids, proxy: body.proxy });
+            console.error(
+              `[登录池 ${ts}] CHECK: 探测 ${sum.checked}，alive ${sum.alive} / dead ${sum.dead} / error ${sum.error}，migrated ${sum.migrated}`,
+            );
+            sendJSON(res, 200, { ok: true, ...sum });
+            return;
           } else if (lpAction === "assign") {
             ret = assignAccount(body);
             console.error(`[登录池 ${ts}] ASSIGN: ${ret.username} → ${body.userId}:${body.port}`);