tt-help-cli-ycl 1.4.142 → 1.4.145

package/package.json

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

package/scripts/sync-raw-jobs.mjs

@@ -15,13 +15,16 @@ import Database from "better-sqlite3";
 import { initDb, getDb } from "../src/watch/db-schema.js";
 import { loadLlmConfig, reloadLlmConfig } from "../src/watch/llm-config.js";
 import { scoreJobsBatch } from "../src/watch/llm-scoring.js";
-import { DEFAULT_TARGET_LOCATIONS } from "../src/lib/target-locations.js";
+import { getTargetLocations, reloadConfig } from "../src/lib/app-config.js";
 
 // ═══════════════════════════════════════════════════════════════════
 // 常量
 // ═══════════════════════════════════════════════════════════════════
 
-const LOCATIONS = DEFAULT_TARGET_LOCATIONS;
+// 目标国家：每轮 tick 前 reloadConfig() 重读配置文件，捕捉服务端(设置页)修改
+function currentLocations() {
+  return getTargetLocations();
+}
 
 const FILTER = "video_count>6 AND follower_count>0 AND following_count>0";
 
@@ -161,7 +164,7 @@ const vals = (row, cols) => cols.map((c) => row[c] ?? null);
 const ph = (n) => Array(n).fill("?").join(", ");
 
 /** 构建 WHERE 子句（含国家过滤）。strict=true 时仅匹配明确国家，不含 NULL/空 */
-function buildWhere(locations = LOCATIONS, strict = false) {
+function buildWhere(locations = currentLocations(), strict = false) {
   const locs = [
     ...new Set(
       locations.map((l) => String(l).trim().toUpperCase()).filter(Boolean),
@@ -268,14 +271,14 @@ function countPendingByCountry() {
   const map = {};
   for (const r of rows) map[r.loc] = r.c;
   // 确保所有目标国家都有值
-  for (const loc of LOCATIONS) {
+  for (const loc of currentLocations()) {
     if (!(loc in map)) map[loc] = 0;
   }
   return map;
 }
 
 function findNeedyCountries(byCountry, threshold) {
-  return LOCATIONS.filter((loc) => (byCountry[loc] || 0) < threshold);
+  return currentLocations().filter((loc) => (byCountry[loc] || 0) < threshold);
 }
 
 // ═══════════════════════════════════════════════════════════════════
@@ -335,7 +338,7 @@ async function refillLLM(archiveDb, needyLocations) {
 
     // 2. LLM 打分
     const ts = Date.now();
-    const scores = await scoreJobsBatch(samples, LOCATIONS);
+    const scores = await scoreJobsBatch(samples, currentLocations());
     log("  ", `${loc} 打分${scores.length}条 ${Date.now() - ts}ms`);
 
     if (
@@ -406,6 +409,7 @@ async function tick(archiveDb, opts) {
   const t0 = Date.now();
 
   archiveNewUsers(archiveDb);
+  reloadConfig(); // 每轮重读目标国家配置，支持服务端(设置页)修改
   if (opts.llm) reloadLlmConfig(); // 每轮重载，支持热切换模型
 
   const byCountry = countPendingByCountry();
@@ -414,7 +418,9 @@ async function tick(archiveDb, opts) {
   if (!needy.length) {
     log(
       "--",
-      `轮${tickN} 全部充足 | ${LOCATIONS.map((l) => `${l}:${byCountry[l]}`).join(" ")}`,
+      `轮${tickN} 全部充足 | ${currentLocations()
+        .map((l) => `${l}:${byCountry[l]}`)
+        .join(" ")}`,
     );
     return;
   }

package/scripts/test-api-interceptor-429.mjs

@@ -0,0 +1,122 @@
+// 临时验证：fetchUserVideosAPI 对 HTTP 429 / ratelimit triggered 判定为"被封"
+// 运行：RM_BLOCKED_WAIT_MS=1 node scripts/test-api-interceptor-429.mjs
+import { fetchUserVideosAPI } from "../src/lib/api-interceptor.js";
+
+// 构造一个可被 waitForResponse 返回的 429 响应
+function make429Response() {
+  return {
+    url: () => "https://www.tiktok.com/api/post/item_list/?...",
+    status: () => 429,
+    headers: () => ({ "content-length": "19" }),
+    json: async () => {
+      throw new Error("Unexpected token 'r'...");
+    },
+    body: async () => Buffer.from("ratelimit triggered"),
+  };
+}
+
+// 构造一个正常响应（itemList 非空）
+function make200Response(username) {
+  const itemList = [
+    { id: "111", stats: { playCount: 1 }, isECVideo: 0, isAd: 0 },
+  ];
+  return {
+    url: () => "https://www.tiktok.com/api/post/item_list/?...",
+    status: () => 200,
+    headers: () => ({}),
+    json: async () => ({ itemList, cursor: 0, hasMore: false }),
+    body: async () => Buffer.from(JSON.stringify({ itemList })),
+    username,
+  };
+}
+
+// 构造 mock page：封禁场景时 waitForResponse 返回 429 响应
+function makePage(username, respFactory) {
+  const page = {
+    _handlers: {},
+    on(event, fn) {
+      (page._handlers[event] ||= []).push(fn);
+      return page;
+    },
+    off(event) {
+      delete page._handlers[event];
+      return page;
+    },
+    url: () => `https://www.tiktok.com/@${username}`,
+    goto: async () => {},
+    // checkCdpHealth 用 () => document.readyState（fn.length===0）→ 返回 "complete"；
+    // detectPageError 用 (patterns)=>...（fn.length===1）→ 返回 null（页面无错误文案）
+    evaluate: async (fn) => (fn.length === 1 ? null : "complete"),
+    reload: async () => {},
+    waitForFunction: async () => null,
+    waitForResponse: async (pred, opts) => {
+      const resp = respFactory();
+      if (!pred(resp)) throw new Error("response 不匹配 item_list");
+      return resp;
+    },
+  };
+  return page;
+}
+
+let pass = 0;
+let fail = 0;
+
+async function expectReject(name, fn, expectedMsg) {
+  try {
+    await fn();
+    fail++;
+    console.error(`✗ ${name}: 未抛错（期望 "${expectedMsg}"）`);
+  } catch (e) {
+    if (e.message === expectedMsg || e.message.includes(expectedMsg)) {
+      pass++;
+      console.log(`✓ ${name}: 抛错 "${e.message}"`);
+    } else {
+      fail++;
+      console.error(
+        `✗ ${name}: 抛错 "${e.message}"（期望含 "${expectedMsg}"）`,
+      );
+    }
+  }
+}
+
+async function expectResolve(name, fn) {
+  try {
+    const r = await fn();
+    if (r instanceof Map && r.size === 1) {
+      pass++;
+      console.log(`✓ ${name}: 正常返回 ${r.size} 个视频`);
+    } else {
+      fail++;
+      console.error(`✗ ${name}: 返回异常 ${JSON.stringify(r)}`);
+    }
+  } catch (e) {
+    fail++;
+    console.error(`✗ ${name}: 抛错 ${e.message}`);
+  }
+}
+
+// 用例1：429 + ratelimit triggered → 判定为"被封"
+await expectReject(
+  "HTTP 429 ratelimit triggered 判为被封",
+  () =>
+    fetchUserVideosAPI(
+      makePage("fumolbbf08o", make429Response),
+      "fumolbbf08o",
+      5,
+      () => {},
+    ),
+  "被封: fumolbbf08o",
+);
+
+// 用例2：正常 200 itemList → 不误判，正常返回视频
+await expectResolve("HTTP 200 正常 itemList 不被误伤", () =>
+  fetchUserVideosAPI(
+    makePage("fumolbbf08o", make200Response),
+    "fumolbbf08o",
+    5,
+    () => {},
+  ),
+);
+
+console.log(`\n结果: ${pass} 通过, ${fail} 失败`);
+process.exit(fail > 0 ? 1 : 0);

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)

package/src/cli/comments.js

@@ -23,10 +23,10 @@ import {
   saveUserId,
 } from "../lib/constants.js";
 import {
-  DEFAULT_TARGET_LOCATIONS,
   isLocationInList,
   normalizeLocation,
 } from "../lib/target-locations.js";
+import { getTargetLocations } from "../lib/app-config.js";
 import { createApiClient } from "../lib/api-client.js";
 import { ensureBrowserReady, killEdgeProcesses } from "../lib/browser/cdp.js";
 import { delay } from "../lib/delay.js";
@@ -562,7 +562,7 @@ async function runAutoMode(options) {
   console.error(`\n╔══════════════════════════════════════════╗`);
   console.error(`║     自动评论采集模式（CDP 连接已登录浏览器）`);
   console.error(
-    `║  目标国家: ${jobLocations || DEFAULT_TARGET_LOCATIONS.slice(0, 6).join(",") + "..."}`,
+    `║  目标国家: ${jobLocations || getTargetLocations().slice(0, 6).join(",") + "..."}`,
   );
   if (jobLocations) console.error(`║  任务过滤: ${jobLocations}`);
   console.error(`║  服务端:   ${serverUrl}`);
@@ -636,7 +636,7 @@ async function runAutoMode(options) {
             const taskNum = totalTasks() + 1;
 
             // 非目标国家 → 跳过
-            if (loc && !isLocationInList(loc, DEFAULT_TARGET_LOCATIONS)) {
+            if (loc && !isLocationInList(loc, getTargetLocations())) {
               await apiPut(`${serverUrl}/api/comment-task/${id}`);
               skippedCount++;
               console.error(
@@ -960,10 +960,10 @@ async function runManualMode(url, options) {
       // ── --save: 去重保存到服务端 ──
       if (
         guessedLocation &&
-        !isLocationInList(guessedLocation, DEFAULT_TARGET_LOCATIONS)
+        !isLocationInList(guessedLocation, getTargetLocations())
       ) {
         console.error(`\n猜测国家: ${guessedLocation}，非目标国家，跳过保存`);
-        console.error(`目标国家: ${DEFAULT_TARGET_LOCATIONS.join(", ")}`);
+        console.error(`目标国家: ${getTargetLocations().join(", ")}`);
       } else {
         console.error(`\n正在提交 ${authors.length} 个评论作者到服务端...`);
         console.error(`服务端: ${serverUrl}`);

package/src/cli/precheck.js

@@ -8,7 +8,7 @@ import {
 } from "../lib/constants.js";
 import { getMacOrUuid } from "../lib/mac-or-uuid.js";
 import { createApiClient } from "../lib/api-client.js";
-import { DEFAULT_TARGET_LOCATIONS } from "../lib/target-locations.js";
+import { getTargetLocations } from "../lib/app-config.js";
 import v8 from "node:v8";
 
 const HEAP_RESTART_RATIO = 0.72;
@@ -104,7 +104,7 @@ export async function handlePrecheck(options) {
   const locations =
     precheckCountries && precheckCountries.length > 0
       ? precheckCountries
-      : DEFAULT_TARGET_LOCATIONS;
+      : getTargetLocations();
 
   precheckLog(`[Precheck] 服务端: ${serverUrl}`);
   precheckLog(

package/src/cli/refresh-mini.js

@@ -8,7 +8,7 @@
  *   需要切换时向 clash-daemon 发 failover 命令（fire-and-forget），
  *   选节点、内容验证、失败回滚均由 daemon 完成
  *   触发条件：定时轮换（--rotate-min）/ 验证码超时 / 连续错误 ≥ 3 / CDN ≥ 3
- *   被封（0 字节空响应，api-interceptor 内部按 30/40/50s 重试 3 次）→ 仍封才触发切换
+ *   被封（0 字节空响应 / HTTP 429 限流，api-interceptor 内部按 30/40/50s 重试 3 次）→ 仍封才触发切换
  * - --ensure-daemon：启动时检查 daemon 是否存活，未存活则自动拉起（默认关闭）
  */