tt-help-cli-ycl 1.4.168 → 1.4.171

package/scripts/test-client-error-monitor.mjs

@@ -1,261 +0,0 @@
-/**
- * 客户端异常监控单测（2026-08-28，2026-09-28 增补验证码路径，
- * 2026-09-29 改为 clientId 本机关联 —— 克隆机 hostname 撞名修复）
- *
- * 验证：
- *   - detectClientError 检测函数：
- *     A. reportCount > 8 且最近一次上报在 2 分钟内
- *     B. captchaCount ≥ 3（webserver 验证码上报，10 分钟过期窗口内累计）
- *   - 按 clientId 过滤本机条目（每台唯一）；hostname 撞名的兄弟机条目、
- *     无 clientId 的旧条目均不参与关联
- *   - 命中 → onAlert 收到本机全部条目与命中列表；未命中 → 不回调
- *   - removeErrors 逐条 DELETE 并计数
- *
- * 运行: node --test scripts/test-client-error-monitor.mjs
- */
-import { test, mock } from "node:test";
-import assert from "node:assert/strict";
-import {
-  detectClientError,
-  ClientErrorMonitor,
-} from "../src/watchdog/client-error-monitor.js";
-
-// 模拟克隆机群：hostname 全部相同（事故现场），clientId 每台唯一
-const CLONED_HOST = "WIN-AADJ1HTCCAQ";
-const CLIENT_ID = `F-9@${CLONED_HOST}`;
-const BROTHER_CLIENT_ID = `F-10@${CLONED_HOST}`;
-
-function makeErr(overrides = {}) {
-  return {
-    userId: "u1",
-    hostname: CLONED_HOST,
-    clientId: CLIENT_ID,
-    errorType: "consecutive_blocked",
-    reportCount: 10,
-    timestamp: Date.now() - 30_000,
-    ...overrides,
-  };
-}
-
-function makeMonitor(opts = {}) {
-  let received = null;
-  let alerted = false;
-  const m = new ClientErrorMonitor({
-    serverUrl: "http://127.0.0.1:3000",
-    hostname: CLONED_HOST, // 仅展示用；关联只认 clientId
-    clientId: CLIENT_ID,
-    onAlert: async (mine, hit) => {
-      alerted = true;
-      received = { mine, hit };
-    },
-    ...opts,
-  });
-  return { m, isAlerted: () => alerted, getReceived: () => received };
-}
-
-// ── 检测函数 ──
-
-test("D1 detectClientError：累计>8 且 2 分钟内 → 命中", () => {
-  assert.equal(
-    detectClientError(makeErr({ reportCount: 9 }), Date.now()),
-    true,
-  );
-});
-
-test("D2 detectClientError：reportCount=8 不命中（阈值是 >8）", () => {
-  assert.equal(
-    detectClientError(makeErr({ reportCount: 8 }), Date.now()),
-    false,
-  );
-});
-
-test("D3 detectClientError：最近上报超过 2 分钟 → 不命中", () => {
-  assert.equal(
-    detectClientError(
-      makeErr({ timestamp: Date.now() - 2 * 60_000 - 1 }),
-      Date.now(),
-    ),
-    false,
-  );
-});
-
-test("D4 detectClientError：缺 reportCount → 不命中", () => {
-  assert.equal(detectClientError({ timestamp: Date.now() }, Date.now()), false);
-});
-
-// ── 验证码路径（captchaCount ≥ 3） ──
-
-test("C1 detectClientError：captchaCount=3 → 命中", () => {
-  assert.equal(
-    detectClientError(makeErr({ reportCount: 0, captchaCount: 3 }), Date.now()),
-    true,
-  );
-});
-
-test("C2 detectClientError：captchaCount=2 不命中（阈值是 ≥3）", () => {
-  assert.equal(
-    detectClientError(makeErr({ reportCount: 0, captchaCount: 2 }), Date.now()),
-    false,
-  );
-});
-
-test("C3 detectClientError：captchaCount=3 但最近上报超 2 分钟 → 不命中", () => {
-  assert.equal(
-    detectClientError(
-      makeErr({
-        reportCount: 0,
-        captchaCount: 3,
-        timestamp: Date.now() - 2 * 60_000 - 1,
-      }),
-      Date.now(),
-    ),
-    false,
-  );
-});
-
-test("C4 detectClientError：reportCount 未达标 + captchaCount 达标 → 命中", () => {
-  assert.equal(
-    detectClientError(makeErr({ reportCount: 1, captchaCount: 5 }), Date.now()),
-    true,
-  );
-});
-
-test("C5 监控器：验证码条目命中 → onAlert 收到命中列表", async () => {
-  const captchaHit = makeErr({
-    userId: "webserver-host",
-    reportCount: 0,
-    captchaCount: 3,
-  });
-  const businessMiss = makeErr({ userId: "u-task", reportCount: 2 });
-  mock.method(globalThis, "fetch", async () => ({
-    ok: true,
-    json: async () => ({ clients: [captchaHit, businessMiss] }),
-  }));
-  const { m, getReceived } = makeMonitor();
-  const hit = await m._poll();
-  assert.equal(hit.length, 1, "仅验证码条目命中");
-  assert.equal(hit[0].userId, "webserver-host");
-  assert.equal(getReceived().hit.length, 1);
-  assert.equal(getReceived().mine.length, 2, "回调同时携带本机未命中条目");
-  mock.restoreAll();
-});
-
-// ── 监控器：本机关联（clientId） ──
-
-test("M1 按 clientId 过滤：撞名兄弟机条目不触发本机回调", async () => {
-  // 克隆机事故回归：F-10 与 F-9 hostname 完全相同，仅 clientId 不同
-  mock.method(globalThis, "fetch", async () => ({
-    ok: true,
-    json: async () => ({
-      clients: [
-        makeErr({
-          userId: "F-10-8222-1",
-          clientId: BROTHER_CLIENT_ID,
-          captchaCount: 3,
-          reportCount: 0,
-        }),
-      ],
-    }),
-  }));
-  const { m, isAlerted } = makeMonitor();
-  const hit = await m._poll();
-  assert.equal(isAlerted(), false, "兄弟机异常不应触发本机回调/强切");
-  assert.equal(hit, null, "无本机条目应返回 null");
-  mock.restoreAll();
-});
-
-test("M2 命中：onAlert 收到本机全部条目（含未命中条目）", async () => {
-  const mineHit = makeErr({ userId: "u-hit", reportCount: 10 });
-  const mineMiss = makeErr({ userId: "u-miss", reportCount: 2 });
-  const other = makeErr({
-    userId: "u-other",
-    clientId: BROTHER_CLIENT_ID, // hostname 相同，clientId 不同
-  });
-  mock.method(globalThis, "fetch", async () => ({
-    ok: true,
-    json: async () => ({ clients: [mineHit, mineMiss, other] }),
-  }));
-  const { m, getReceived } = makeMonitor();
-  const hit = await m._poll();
-  assert.equal(hit.length, 1, "命中 1 条");
-  assert.equal(hit[0].userId, "u-hit");
-  assert.equal(getReceived().mine.length, 2, "回调收到本机全部 2 条");
-  assert.deepEqual(
-    getReceived()
-      .mine.map((e) => e.userId)
-      .sort(),
-    ["u-hit", "u-miss"],
-    "回调含命中与未命中的本机条目",
-  );
-  mock.restoreAll();
-});
-
-test("M3 无 clientId 的旧条目不参与本机关联（宁漏不误）", async () => {
-  mock.method(globalThis, "fetch", async () => ({
-    ok: true,
-    json: async () => ({
-      clients: [makeErr({ clientId: "", reportCount: 99 })],
-    }),
-  }));
-  const { m, isAlerted } = makeMonitor();
-  const hit = await m._poll();
-  assert.equal(isAlerted(), false, "旧版上报条目不应触发强切");
-  assert.equal(hit, null);
-  mock.restoreAll();
-});
-
-test("M4 未配置 clientId 的监控器：不匹配任何条目", async () => {
-  mock.method(globalThis, "fetch", async () => ({
-    ok: true,
-    json: async () => ({ clients: [makeErr({ reportCount: 99 })] }),
-  }));
-  let alerted = false;
-  const m = new ClientErrorMonitor({
-    serverUrl: "http://127.0.0.1:3000",
-    onAlert: async () => {
-      alerted = true;
-    },
-  });
-  const hit = await m._poll();
-  assert.equal(alerted, false, "clientId 未配置时监控不生效");
-  assert.equal(hit, null);
-  mock.restoreAll();
-});
-
-test("M5 removeErrors：逐条 DELETE 并计数", async () => {
-  const deleted = [];
-  mock.method(globalThis, "fetch", async (url, opts) => {
-    if (opts && opts.method === "DELETE") {
-      deleted.push(String(url));
-      return { ok: true };
-    }
-    return { ok: true, json: async () => ({ clients: [] }) };
-  });
-  const m = new ClientErrorMonitor({ serverUrl: "http://127.0.0.1:3000" });
-  const removed = await m.removeErrors([
-    { userId: "a" },
-    { userId: "b" },
-    { userId: "" },
-    null,
-  ]);
-  assert.equal(removed, 2, "有效 userId 各删一条");
-  assert.equal(deleted.length, 2, "共 2 次 DELETE");
-  assert.ok(
-    deleted.every((u) =>
-      ["a", "b"].some((id) => u.endsWith(`/api/client-error/${id}`)),
-    ),
-    "DELETE 路径正确",
-  );
-  mock.restoreAll();
-});
-
-test("M6 拉取失败静默：fetch 抛错不回调不崩溃", async () => {
-  mock.method(globalThis, "fetch", async () => {
-    throw new Error("ECONNREFUSED");
-  });
-  const { m, isAlerted } = makeMonitor();
-  const hit = await m._poll();
-  assert.equal(isAlerted(), false);
-  assert.equal(hit, null);
-  mock.restoreAll();
-});

package/scripts/test-country-fix.mjs

@@ -1,341 +0,0 @@
-#!/usr/bin/env node
-/**
- * 回归测试：节点国家配置收敛修复（2026-08-12）
- *
- * 背景：daemon 启动硬编码 --country US，且服务端幂等基准是"是否下发过"，
- * 导致 daemon 重启（崩溃自愈/升级/机器重启）回退 US 后服务端不补发 → 一直用美国节点。
- *
- * 运行方式（务必用隔离 TMPDIR，避免污染真实 clash-*.json / 服务端配置）：
- *   TMPDIR=$(mktemp -d) node scripts/test-country-fix.mjs
- *
- * 覆盖：
- *   A. 服务端幂等基准 = 客户端实际生效国家（核心修复）
- *      - daemon 重启回退 US 后，服务端补发 JP
- *      - daemon 已生效 JP 时，幂等不重复下发
- *      - daemon 未上报时，下发
- *      - 多国配置且已生效时，幂等不重复下发
- *   B. daemon 逗号分隔多国 --country 参数解析
- *   C. checker normalizeCountries / filterNodesByCountry 回归
- *      + 内置策略/机场信息节点过滤（isUsableProxyNode，2026-09-03 剩余流量 GB 修复）
- *   D. 客户端 daemon 启动兜底：读 clash-health.json 上次生效国家 → join(",")
- */
-
-import { mkdtempSync, writeFileSync } from "fs";
-import { tmpdir } from "os";
-import { join } from "path";
-
-let passed = 0;
-let failed = 0;
-function ok(cond, name, extra = "") {
-  if (cond) {
-    passed++;
-    console.log(`  ✅ ${name}`);
-  } else {
-    failed++;
-    console.log(`  ❌ ${name}  ${extra}`);
-  }
-}
-
-// ── 隔离 HOME：避免读写真实服务端配置 ~/.tt-help-watchdog.json ──
-const fakeHome = mkdtempSync(join(tmpdir(), "tt-wd-home-"));
-process.env.HOME = fakeHome;
-process.env.USERPROFILE = fakeHome;
-
-function fakeRes() {
-  return {
-    status: 0,
-    body: null,
-    writeHead(code) {
-      this.status = code;
-    },
-    end(b) {
-      this.body = b;
-    },
-  };
-}
-async function wdCall(mod, path, method, params, body) {
-  const res = fakeRes();
-  await mod.tryHandleWatchdogRoute(path, method, params, body, res);
-  return { status: res.status, data: res.body ? JSON.parse(res.body) : null };
-}
-
-console.log("\n═══ A. 服务端幂等基准 = 客户端实际生效国家 ═══");
-const wd = await import("../src/watch/watchdog-server.js");
-
-// A1 配置 T1 → JP
-let r = await wdCall(
-  wd,
-  "/api/watchdog/set-country-filter",
-  "POST",
-  {},
-  {
-    userId: "T1",
-    countries: ["JP"],
-  },
-);
-ok(
-  r.status === 200 && JSON.stringify(r.data.countries) === '["JP"]',
-  "A1 配置 T1 → JP",
-  JSON.stringify(r.data),
-);
-
-// A2 心跳：daemon 回退 US（重启后）→ 服务端应补发 JP（核心修复点，旧逻辑因 lastSent 幂等不会下发）
-r = await wdCall(
-  wd,
-  "/api/watchdog/heartbeat",
-  "POST",
-  { clientId: "c1" },
-  {
-    config: { userId: "T1" },
-    clashHealth: { meta: { countryFilter: ["US"] } },
-  },
-);
-let cmds = (r.data && r.data.clashCommands) || [];
-ok(
-  cmds.some(
-    (c) =>
-      c.action === "setCountryFilter" &&
-      JSON.stringify(c.countries) === '["JP"]',
-  ),
-  "A2 daemon 生效 US(重启回退) → 补发 setCountryFilter JP",
-  JSON.stringify(cmds),
-);
-
-// A3 心跳：daemon 已生效 JP → 幂等不重复下发
-r = await wdCall(
-  wd,
-  "/api/watchdog/heartbeat",
-  "POST",
-  { clientId: "c1" },
-  {
-    config: { userId: "T1" },
-    clashHealth: { meta: { countryFilter: ["JP"] } },
-  },
-);
-cmds = (r.data && r.data.clashCommands) || [];
-ok(
-  !cmds.some((c) => c.action === "setCountryFilter"),
-  "A3 daemon 生效 JP → 幂等不下发",
-  JSON.stringify(cmds),
-);
-
-// A4 心跳：daemon 未上报 clashHealth → 下发
-r = await wdCall(
-  wd,
-  "/api/watchdog/heartbeat",
-  "POST",
-  { clientId: "c1" },
-  {
-    config: { userId: "T1" },
-    clashHealth: null,
-  },
-);
-cmds = (r.data && r.data.clashCommands) || [];
-ok(
-  cmds.some(
-    (c) =>
-      c.action === "setCountryFilter" &&
-      JSON.stringify(c.countries) === '["JP"]',
-  ),
-  "A4 daemon 未上报 → 下发 setCountryFilter JP",
-  JSON.stringify(cmds),
-);
-
-// A5 多国配置 US+JP 且 daemon 已生效 US+JP → 幂等不下发
-// 注：配置动作本身会立即入队一次下发（配置后本该生效一次），首轮心跳取走后再验证幂等
-await wdCall(
-  wd,
-  "/api/watchdog/set-country-filter",
-  "POST",
-  {},
-  {
-    userId: "T2",
-    countries: ["US", "JP"],
-  },
-);
-r = await wdCall(
-  wd,
-  "/api/watchdog/heartbeat",
-  "POST",
-  { clientId: "c2" },
-  {
-    config: { userId: "T2" },
-    clashHealth: { meta: { countryFilter: ["US", "JP"] } },
-  },
-);
-cmds = (r.data && r.data.clashCommands) || [];
-ok(
-  cmds.some(
-    (c) =>
-      c.action === "setCountryFilter" &&
-      JSON.stringify(c.countries) === '["US","JP"]',
-  ),
-  "A5a 配置后首次心跳取走命令",
-  JSON.stringify(cmds),
-);
-r = await wdCall(
-  wd,
-  "/api/watchdog/heartbeat",
-  "POST",
-  { clientId: "c2" },
-  {
-    config: { userId: "T2" },
-    clashHealth: { meta: { countryFilter: ["US", "JP"] } },
-  },
-);
-cmds = (r.data && r.data.clashCommands) || [];
-ok(
-  !cmds.some((c) => c.action === "setCountryFilter"),
-  "A5 多国且已生效 → 幂等不下发",
-  JSON.stringify(cmds),
-);
-
-console.log("\n═══ B. daemon 逗号分隔多国 --country 解析 ═══");
-const { ClashDaemon } = await import("../src/clash/daemon.js");
-const checker = await import("../src/clash/checker.js");
-
-const cases = [
-  ["US,JP", ["US", "JP"], "US,JP 逗号分隔 → 多国并集"],
-  ["JP", ["JP"], "JP 单国"],
-  ["us, jp", ["US", "JP"], "小写+空格归一"],
-  [undefined, null, "未传 country → 不过滤"],
-];
-for (const [input, expect, name] of cases) {
-  checker.CONFIG.nodeCountryFilter = null;
-  new ClashDaemon({ country: input });
-  const got = checker.CONFIG.nodeCountryFilter;
-  ok(JSON.stringify(got) === JSON.stringify(expect), name, JSON.stringify(got));
-}
-checker.CONFIG.nodeCountryFilter = null;
-
-console.log("\n═══ C. checker 国家过滤回归 ═══");
-ok(
-  JSON.stringify(checker.normalizeCountries(["us", " JP", "US"])) ===
-    '["US","JP"]',
-  "C1 数组去重大写",
-);
-ok(
-  JSON.stringify(checker.normalizeCountries("jp")) === '["JP"]',
-  "C2 字符串大写",
-);
-ok(checker.normalizeCountries(null).length === 0, "C3 null → 空");
-ok(checker.normalizeCountries("").length === 0, "C4 空串 → 空");
-// 注意：checker.normalizeCountries 不拆分逗号（拆分在 daemon constructor），单字符串"US,JP"保持为一个元素
-ok(
-  JSON.stringify(checker.normalizeCountries("US,JP")) === '["US,JP"]',
-  "C5 单字符串逗号不拆分（保持向后兼容）",
-);
-const nodes = ["🇺🇸美国A", "🇯🇵日本A", "🇩🇪德国A", "无旗帜节点"];
-let fr = checker.filterNodesByCountry(nodes, ["US", "JP"]);
-ok(
-  fr.filtered.length === 2 && fr.excluded === 2,
-  "C6 多国并集过滤（US+JP 命中 2）",
-  JSON.stringify(fr),
-);
-fr = checker.filterNodesByCountry(nodes, ["ZZ"]);
-ok(
-  fr.filtered.length === 4 && fr.excluded === 0,
-  "C7 未知国家向后兼容返回全部",
-);
-fr = checker.filterNodesByCountry(nodes, null);
-ok(fr.filtered.length === 4 && fr.excluded === 0, "C8 null 不过滤");
-
-// ── C9-C14 信息节点/内置策略过滤（2026-09-03：剩余流量 GB 混入候选集修复） ──
-fr = checker.filterNodesByCountry(["剩余流量：5319.72 GB"], ["US", "GB", "JP"]);
-ok(
-  fr.filtered.length === 0,
-  "C9 GB 模式不再命中流量单位（剩余流量：xxx GB）",
-  JSON.stringify(fr),
-);
-fr = checker.filterNodesByCountry(
-  ["🇬🇧英国HY1-1000M专线", "🇬🇧英国trojan1", "UK Premium"],
-  ["GB"],
-);
-ok(
-  fr.filtered.length === 3,
-  "C10 英国节点仍正常命中（英国/UK）",
-  JSON.stringify(fr),
-);
-const junkNodes = [
-  "DIRECT",
-  "REJECT",
-  "REJECT-DROP",
-  "GLOBAL",
-  "剩余流量：5319.72 GB",
-  "剩余流量：1862.27 MB",
-  "官网：example.com",
-  "套餐到期：2099-12-31",
-  "1.5TB",
-];
-ok(
-  junkNodes.every((n) => !checker.isUsableProxyNode(n)),
-  "C11 内置策略+信息节点全部被 isUsableProxyNode 拒绝",
-  JSON.stringify(junkNodes.filter((n) => checker.isUsableProxyNode(n))),
-);
-const goodNodes = [
-  "🇺🇸美国HY1轻量",
-  "🇬🇧英国HY1-1000M专线",
-  "🇯🇵日本Trojan1",
-  "🇹🇼台湾trojan直连AI",
-];
-ok(
-  goodNodes.every((n) => checker.isUsableProxyNode(n)),
-  "C12 正常业务节点全部通过 isUsableProxyNode",
-  JSON.stringify(goodNodes.filter((n) => !checker.isUsableProxyNode(n))),
-);
-// 读口兜底：已持久化的脏候选文件在读取时被过滤
-writeFileSync(
-  join(tmpdir(), "clash-healthy-nodes.json"),
-  JSON.stringify({
-    updated: new Date().toISOString(),
-    nodes: ["🇺🇸美国A", "剩余流量：5319.72 GB", "DIRECT", "🇯🇵日本A"],
-    delays: {},
-  }),
-);
-const hl = checker.loadHealthyList();
-ok(
-  hl.nodes.length === 2 &&
-    !hl.nodes.some((n) => checker.isUsableProxyNode(n) === false),
-  "C13 loadHealthyList 读口剔除已持久化的脏候选",
-  JSON.stringify(hl.nodes),
-);
-
-console.log("\n═══ D. 客户端 daemon 启动兜底（读上次生效国家）═══");
-const { getClashHealth } = await import("../src/watchdog/reporter.js");
-const healthPath = join(tmpdir(), "clash-health.json");
-
-writeFileSync(
-  healthPath,
-  JSON.stringify({
-    meta: { countryFilter: ["JP"] },
-    lastCheck: new Date().toISOString(),
-  }),
-);
-let prev = getClashHealth()?.meta?.countryFilter;
-ok(
-  Array.isArray(prev) && JSON.stringify(prev) === '["JP"]',
-  "D1 读到上次生效国家 JP",
-  JSON.stringify(prev),
-);
-let countryArg = Array.isArray(prev) && prev.length ? prev.join(",") : "US";
-ok(countryArg === "JP", "D2 单国 join → 'JP'", countryArg);
-
-writeFileSync(
-  healthPath,
-  JSON.stringify({
-    meta: { countryFilter: ["US", "JP"] },
-    lastCheck: new Date().toISOString(),
-  }),
-);
-prev = getClashHealth()?.meta?.countryFilter;
-countryArg = Array.isArray(prev) && prev.length ? prev.join(",") : "US";
-ok(countryArg === "US,JP", "D3 多国 join → 'US,JP'", countryArg);
-
-// 无上次生效记录（clashHealth 缺失）→ 兜底 US
-const nonePrev = null?.meta?.countryFilter;
-const noneArg =
-  Array.isArray(nonePrev) && nonePrev.length ? nonePrev.join(",") : "US";
-ok(noneArg === "US", "D4 无记录 → 兜底 US");
-
-console.log(`\n结果: ${passed} 通过, ${failed} 失败`);
-process.exit(failed ? 1 : 0);