tt-help-cli-ycl 1.4.144 → 1.4.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.144",
+  "version": "1.4.145",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/scripts/test-daemon-failover.mjs

@@ -32,6 +32,12 @@ const state = {
   closes: 0, // closeAllConnections（全断）调用次数
   idleCloses: 0, // closeIdleConnections（优雅断连）调用次数
   failIdleClose: false, // 模拟优雅断连失败
+  // 订阅切换感知（巡检开头候选集存在性校验）相关
+  proxyMap: { "🇭🇰 香港01": {}, "🇲🇾 马来02": {} }, // 当前 /proxies 中的代理名
+  pruneResult: { kept: 2, removed: 0, allGone: false },
+  pruneCalls: 0,
+  probeCalls: 0,
+  failProxies: false,
 };
 
 function resetState() {
@@ -50,6 +56,11 @@ function resetState() {
   state.closes = 0;
   state.idleCloses = 0;
   state.failIdleClose = false;
+  state.proxyMap = { "🇭🇰 香港01": {}, "🇲🇾 马来02": {} };
+  state.pruneResult = { kept: 2, removed: 0, allGone: false };
+  state.pruneCalls = 0;
+  state.probeCalls = 0;
+  state.failProxies = false;
 }
 
 // ── 注册模块 mock（必须在 import daemon.js 之前） ──
@@ -73,16 +84,28 @@ before(async () => {
         return true;
       },
       applyDiscovered: () => {},
-      runDelayProbe: async () => ({
-        nodes: [...state.nodes],
-        total: state.nodes.length,
-      }),
+      checkClashAlive: () => true,
+      pruneHealthyListByCurrentProxies: () => {
+        state.pruneCalls += 1;
+        return { ...state.pruneResult };
+      },
+      runDelayProbe: async () => {
+        state.probeCalls += 1;
+        return {
+          nodes: [...state.nodes],
+          total: state.nodes.length,
+        };
+      },
       saveHealthyList: () => {},
     },
   });
   mock.module("../src/clash/api.js", {
     namedExports: {
       configure: () => {},
+      getProxies: async () => {
+        if (state.failProxies) throw new Error("mock /proxies 不可达");
+        return { proxies: { ...state.proxyMap } };
+      },
       getCurrentNode: async () => state.currentNode,
       closeAllConnections: async () => {
         state.closes += 1;
@@ -242,3 +265,37 @@ test("F10 强切（force）：冷却期内探针健康仍强制轮换", async ()
     "强切后应更新锚点（给新节点观察期）",
   );
 });
+
+// ── 订阅切换感知：巡检开头候选集存在性校验（2026-08-29） ──
+
+test("S1 候选集全部失效：当前节点健康也立即触发 delay 初测", async () => {
+  resetState();
+  const { d, c } = makeCtx();
+  state.health = { ...state.health, healthy: true }; // 当前节点健康
+  state.pruneResult = { kept: 0, removed: 2, allGone: true };
+  await d._healthCheckController(c);
+  assert.equal(state.pruneCalls, 1, "巡检应执行候选集校验");
+  // 初测经串行锁排队执行，等队列清空后断言
+  await d._withLock(() => {});
+  assert.equal(state.probeCalls, 1, "全失效应立即触发 delay 初测");
+});
+
+test("S2 候选集部分失效：剔除后不触发初测，巡检正常", async () => {
+  resetState();
+  const { d, c } = makeCtx();
+  state.pruneResult = { kept: 1, removed: 1, allGone: false };
+  await d._healthCheckController(c);
+  await d._withLock(() => {});
+  assert.equal(state.pruneCalls, 1, "应执行候选集校验");
+  assert.equal(state.probeCalls, 0, "部分失效不应触发初测");
+});
+
+test("S3 /proxies 拉取失败：静默跳过校验，不阻断巡检", async () => {
+  resetState();
+  const { d, c } = makeCtx();
+  state.failProxies = true;
+  await d._healthCheckController(c);
+  await d._withLock(() => {});
+  assert.equal(state.pruneCalls, 0, "API 失败不应执行校验");
+  assert.equal(state.probeCalls, 0, "API 失败不应触发初测");
+});

package/src/clash/checker.js

@@ -441,6 +441,47 @@ export function saveHealthyList(nodes, delays = {}) {
   }
 }
 
+/**
+ * 剔除候选集中已不在当前内核配置中的节点（订阅切换 / 订阅更新场景）
+ *
+ * 基于原始全量列表过滤（不做国家过滤），避免把"国家过滤后的子集"写回文件造成数据丢失。
+ * 仅在确有剔除时写回文件。
+ *
+ * @param {Set<string>|string[]} validNames - 当前 /proxies 中的代理名集合
+ * @returns {{kept: number, removed: number, allGone: boolean}}
+ *   allGone: 原列表非空且过滤后为空（判定"订阅已切换"）
+ */
+export function pruneHealthyListByCurrentProxies(validNames) {
+  try {
+    if (!existsSync(_healthyFile)) {
+      return { kept: 0, removed: 0, allGone: false };
+    }
+    const d = JSON.parse(readFileSync(_healthyFile, "utf-8"));
+    const allNodes = Array.isArray(d.nodes) ? d.nodes : [];
+    const allDelays = d.delays && typeof d.delays === "object" ? d.delays : {};
+    const valid = new Set(validNames);
+    const keptNodes = allNodes.filter((n) => valid.has(n));
+    const removed = allNodes.length - keptNodes.length;
+    if (removed === 0) {
+      return { kept: keptNodes.length, removed: 0, allGone: false };
+    }
+    const keptDelays = {};
+    for (const n of keptNodes) {
+      const v = allDelays[n];
+      if (typeof v === "number" && v > 0) keptDelays[n] = v;
+    }
+    saveHealthyList(keptNodes, keptDelays);
+    return {
+      kept: keptNodes.length,
+      removed,
+      allGone: keptNodes.length === 0 && allNodes.length > 0,
+    };
+  } catch (e) {
+    console.error(`[checker] 剔除失效候选节点失败: ${e.message}`);
+    return { kept: 0, removed: 0, allGone: false };
+  }
+}
+
 function _emptyList() {
   return {
     updated: "",

package/src/clash/daemon.js

@@ -370,6 +370,32 @@ export class ClashDaemon {
         title: h.title,
       });
 
+      // 订阅切换感知：候选集节点若已不在当前内核配置中，旧候选集无意义
+      // —— 全失效立即触发 delay 初测刷新，部分失效剔除写回。
+      // /proxies 拉取失败时静默跳过，不阻断巡检。
+      try {
+        const proxies = await api.getProxies();
+        const valid = new Set(Object.keys(proxies?.proxies || {}));
+        const pruned = checker.pruneHealthyListByCurrentProxies(valid);
+        if (pruned.removed > 0) {
+          if (pruned.allGone) {
+            this._log(
+              `🔁 [${c.proxyPort}] 候选集 ${pruned.removed} 个节点全部失效（疑似订阅已切换），立即触发 delay 初测`,
+            );
+            // 初测经串行锁排队执行；本轮巡检直接返回，避免长时间占用锁饿死其它控制端
+            this._withLock(() => this._runDelayProbeController(c)).catch(
+              () => {},
+            );
+            return;
+          }
+          this._log(
+            `🧹 [${c.proxyPort}] 候选集剔除 ${pruned.removed} 个失效节点，剩余 ${pruned.kept} 个`,
+          );
+        }
+      } catch {
+        // 忽略：校验仅作兜底，失败不影响巡检
+      }
+
       if (h.healthy) {
         c._apiFailCount = 0;
         if (Math.random() < 0.17)