tt-help-cli-ycl 1.4.140 → 1.4.144

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 是否存活，未存活则自动拉起（默认关闭）
  */
 

package/src/cli/tag.js

@@ -2,6 +2,7 @@ import { writeFileSync } from "fs";
 import { randomUUID } from "crypto";
 import http from "http";
 import readline from "readline";
+import os from "os";
 import {
   getBrowserMemory,
   formatMemoryWithBrowser,
@@ -14,10 +15,8 @@ import { fetchTagData, enrichVideosWithLocation } from "../lib/tag-fetcher.js";
 import { killEdgeProcesses, ensureBrowserReady } from "../lib/browser/cdp.js";
 import { getOrCreatePage, isBrowserClosedError } from "../lib/browser/page.js";
 import { TikTokScraper } from "../lib/tiktok-scraper.mjs";
-import {
-  DEFAULT_TARGET_LOCATIONS,
-  isLocationInList,
-} from "../lib/target-locations.js";
+import { isLocationInList } from "../lib/target-locations.js";
+import { getTargetLocations } from "../lib/app-config.js";
 import { delay as randomDelay } from "../lib/delay.js";
 import { discoverTags } from "../lib/tag-discover.js";
 import {
@@ -32,26 +31,10 @@ import {
   closeCaptcha,
 } from "../scraper/modules/captcha-handler.js";
 
-const ALL_COUNTRIES = DEFAULT_TARGET_LOCATIONS;
 const DEFAULT_SERVER = cfgServer || "http://127.0.0.1:3000";
-const DEFAULT_SCORE_COUNTRIES = [
-  "ES",
-  "FR",
-  "DE",
-  "PT",
-  "IT",
-  "NL",
-  "BE",
-  "AT",
-  "IE",
-  "PL",
-  "CZ",
-  "GR",
-  "HU",
-];
 
 function resolveTargetCountries(countries) {
-  return countries || DEFAULT_SCORE_COUNTRIES;
+  return countries || getTargetLocations();
 }
 
 /**
@@ -464,7 +447,7 @@ export async function handleDiscover(parsed) {
     countries.length === 1 &&
     countries[0].toUpperCase() === "ALL"
   ) {
-    countries = ALL_COUNTRIES;
+    countries = getTargetLocations();
   }
 
   if (!countries || countries.length === 0) {
@@ -1058,11 +1041,12 @@ export async function handleScoreAll(parsed) {
   let retrySameTag = false; // 是否重试同一个 tag
   let tag403Attempts = 0; // 当前 tag 已发生 403 的次数
   let bannedCount = 0; // 连续判定“被封”的次数（成功 tag 清零）
-  // 按判封次数递增的重试预算：第 1 次判封前重试 30、第 2 次 40、第 3 次及以后 50
-  const BAN_RETRY_BUDGETS = [
-    parseInt(process.env.TAG_SCOREALL_403_RETRY_1 || "30", 10) || 30,
-    parseInt(process.env.TAG_SCOREALL_403_RETRY_2 || "40", 10) || 40,
-    parseInt(process.env.TAG_SCOREALL_403_RETRY_3 || "50", 10) || 50,
+  // 403 渐退重试间隔（秒）：30/40/50s 各重试一次，仍 403 才判定“被封”一次。
+  // 与 api-interceptor 被封重试（30/40/50s 共 3 次）保持一致
+  const BAN_RETRY_WAITS = [
+    (parseInt(process.env.TAG_SCOREALL_403_RETRY_1 || "30", 10) || 30) * 1000,
+    (parseInt(process.env.TAG_SCOREALL_403_RETRY_2 || "40", 10) || 40) * 1000,
+    (parseInt(process.env.TAG_SCOREALL_403_RETRY_3 || "50", 10) || 50) * 1000,
   ];
 
   // 生成客户端 ID，用于服务端追踪
@@ -1439,26 +1423,32 @@ export async function handleScoreAll(parsed) {
           e.message &&
           (e.message.includes("验证码") || e.message.includes("captcha"));
 
-        // ── 403：重试同一 tag，预算按判封次数递增 ──
+        // ── 403：渐退等待 30/40/50s 各重试一次，仍 403 判定“被封” ──
+        // 首次被封重启浏览器（同端口换新会话），后续仍 403 只清 tab
         if (is403) {
+          const retryIndex = tag403Attempts;
           tag403Attempts++;
-          const budget =
-            BAN_RETRY_BUDGETS[
-              Math.min(bannedCount, BAN_RETRY_BUDGETS.length - 1)
-            ];
-          if (tag403Attempts <= budget) {
+          if (retryIndex < BAN_RETRY_WAITS.length) {
+            const waitMs = BAN_RETRY_WAITS[retryIndex];
             retrySameTag = true;
-            log(
-              `  🚫 HTTP 403 (${tag403Attempts}/${budget}) — 重试同一 tag #${currentTag} ...`,
-            );
-            await recyclePage();
-            await randomDelay(2000, 5000);
+            if (retryIndex === 0) {
+              log(
+                `  🚫 HTTP 403，判定被封，重启浏览器后 ${waitMs / 1000}s 第 ${tag403Attempts}/${BAN_RETRY_WAITS.length} 次重试 #${currentTag} ...`,
+              );
+              await recycleCdpSession(`首次被封`, { switchPort: false });
+            } else {
+              log(
+                `  🚫 HTTP 403，判定被封，${waitMs / 1000}s 后第 ${tag403Attempts}/${BAN_RETRY_WAITS.length} 次重试 #${currentTag} ...`,
+              );
+              await recyclePage();
+            }
+            await new Promise((r) => setTimeout(r, waitMs));
             continue;
           }
           // 重试耗尽：判定“被封”
           bannedCount++;
           log(
-            `  🚫 重试 ${tag403Attempts} 次仍 403，判定账号被封（连续判封 ${bannedCount} 次）`,
+            `  🚫 30/40/50s 重试 ${BAN_RETRY_WAITS.length} 次仍 403，判定账号被封（连续判封 ${bannedCount} 次）`,
           );
           if (bannedCount >= 2) {
             log(`  ⚠️ 连续两次判封 → 汇报服务端 + 触发 daemon fallback`);
@@ -1511,6 +1501,7 @@ export async function handleScoreAll(parsed) {
                 errorMessage: e.message,
                 stage: "tag-scoring",
                 errorStack: "",
+                hostname: os.hostname(),
               }),
             });
           } catch {}
@@ -1640,7 +1631,7 @@ export async function handleTag(parsed) {
         .split(",")
         .map((s) => s.trim().toUpperCase())
         .filter(Boolean)
-    : DEFAULT_TARGET_LOCATIONS;
+    : getTargetLocations();
 
   const autoEnrich = enrich || !!discover;
 
@@ -2120,7 +2111,7 @@ export async function handleTagRefresh(parsed) {
         }
 
         // 过滤目标国家的视频和作者
-        const targetLocations = DEFAULT_TARGET_LOCATIONS;
+        const targetLocations = getTargetLocations();
         const filteredVideos = videos.filter((v) =>
           isLocationInList(v.locationCreated, targetLocations),
         );

package/src/lib/api-client.js

@@ -1,4 +1,5 @@
 import crypto from "node:crypto";
+import os from "os";
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
 
@@ -68,13 +69,18 @@ export function createApiClient(opts = {}) {
     return withRetry(
       `POST ${url}`,
       async () => {
+        const headers = buildHeaders(
+          { "Content-Type": "application/json" },
+          clientId,
+          meta,
+        );
+        // error-report 自动带上本机 hostname，供看门狗按机器关联异常
+        if (/\/api\/error-report(\?|$)/.test(String(url))) {
+          headers["X-Client-Hostname"] = os.hostname();
+        }
         const res = await fetch(url, {
           method: "POST",
-          headers: buildHeaders(
-            { "Content-Type": "application/json" },
-            clientId,
-            meta,
-          ),
+          headers,
           body: JSON.stringify(body),
           signal: AbortSignal.timeout(30000),
         });

package/src/lib/api-interceptor.js

@@ -172,6 +172,8 @@ async function attemptItemListFetch(page, username, log, apiRequestUrlRef) {
   let responsePromise = null;
   let response = null;
   let rawBodyBytes = -1; // -1 未知（未读取到 body）；0 = 服务端空响应（封禁判定依据）
+  let httpStatus = null; // 响应 HTTP 状态码
+  let bodyText = ""; // 响应体文本（识别 ratelimit triggered 等限流文案）
 
   try {
     // 响应监听必须在 goto 之前注册：domcontentloaded 返回时首个 item_list
@@ -208,6 +210,7 @@ async function attemptItemListFetch(page, username, log, apiRequestUrlRef) {
     // JSON 解析失败（如 "Unexpected end of JSON input"）时打印原始响应，
     // 便于诊断空响应/截断响应/非 JSON 响应等异常形态
     if (response) {
+      httpStatus = response.status();
       try {
         // body 读取同样可能因页面异常而挂起，加独立超时保护
         const raw = await Promise.race([
@@ -218,6 +221,7 @@ async function attemptItemListFetch(page, username, log, apiRequestUrlRef) {
         ]);
         const text = raw.toString("utf-8");
         rawBodyBytes = raw.length;
+        bodyText = text;
         // content-length 用于区分两种 0 字节形态：
         // 声明长度 > 实际字节 = 传输被截断；声明缺失/为 0 = 服务端主动空响应
         const declared = parseInt(
@@ -247,6 +251,8 @@ async function attemptItemListFetch(page, username, log, apiRequestUrlRef) {
     data,
     interceptionError,
     rawBodyBytes,
+    httpStatus,
+    bodyText,
     elapsed: Date.now() - t0,
   };
 }
@@ -343,8 +349,14 @@ async function fetchUserVideosAPI(
 
   while (true) {
     attempt++;
-    const { data, interceptionError, rawBodyBytes, elapsed } =
-      await attemptItemListFetch(page, username, log, apiRequestUrlRef);
+    const {
+      data,
+      interceptionError,
+      rawBodyBytes,
+      httpStatus,
+      bodyText,
+      elapsed,
+    } = await attemptItemListFetch(page, username, log, apiRequestUrlRef);
 
     if (data && Array.isArray(data.itemList) && data.itemList.length > 0) {
       log(`  [API拦截] 成功，耗时 ${elapsed}ms`);
@@ -359,21 +371,27 @@ async function fetchUserVideosAPI(
       );
     }
 
-    // 0 字节空响应 = 被封（content-length 缺失/为 0 或截断，统一按封禁处理）。
-    // 不再依赖页面"出错了/很抱歉"文案判定，静默型封禁（页面正常渲染但 API 空响应）也能识别。
-    // 默认 30/40/50 秒等待重试 3 次，仍封才抛错交给上层（explore/refresh/refresh-mini 均受益）
-    if (rawBodyBytes === 0) {
+    // 判定为被封的两种形态，统一按封禁处理（默认 30/40/50 秒重试 3 次，仍封才抛错交给上层）：
+    // 1. 0 字节空响应（content-length 缺失/为 0 或截断）—— 静默型封禁（页面正常渲染但 API 空响应）
+    // 2. HTTP 429 或 body 含 ratelimit —— 服务端主动限流（ratelimit triggered）
+    // 两种都不再依赖页面"出错了/很抱歉"文案判定，explore/refresh/refresh-mini 均受益
+    const rateLimited = httpStatus === 429 || /ratelimit/i.test(bodyText || "");
+    if (rawBodyBytes === 0 || rateLimited) {
+      const reason =
+        rawBodyBytes === 0
+          ? "空响应（0 字节）"
+          : `限流（HTTP ${httpStatus}, ${bodyText.slice(0, 60)}）`;
       const retryIndex = attempt - 1;
       if (retryIndex < retryWaits.length) {
         const waitMs = retryWaits[retryIndex];
         log(
-          `  [API拦截] item_list 空响应（0 字节），判定为被封，${waitMs / 1000}s 后第 ${attempt}/${retryWaits.length} 次重试...`,
+          `  [API拦截] item_list ${reason}，判定为被封，${waitMs / 1000}s 后第 ${attempt}/${retryWaits.length} 次重试...`,
         );
         await new Promise((r) => setTimeout(r, waitMs));
         continue;
       }
       log(
-        `  [API拦截] item_list 空响应（0 字节），重试 ${retryWaits.length} 次仍被封`,
+        `  [API拦截] item_list ${reason}，重试 ${retryWaits.length} 次仍被封`,
       );
       throw new Error(`被封: ${username}`);
     }

package/src/lib/app-config.js

@@ -0,0 +1,119 @@
+/**
+ * 通用应用配置模块（key-value，落盘到 ~/.tt-help-config.json）
+ *
+ * 设计为通用命名：任意配置项以 `key` 形式存放，后续可加入其他配置。
+ * 例如当前使用 `targetLocations`，未来可扩展 `xxx` 等。
+ *
+ * 读取规则：文件存在则用文件内容，否则回退内置默认值。
+ * 写入规则：整份 JSON 落盘（原子性不强，但配置变更频率低，可接受）。
+ */
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+import { DEFAULT_TARGET_LOCATIONS } from "./target-locations.js";
+
+// 通用配置文件路径（与 ~/.tt-help.json 隔离，避免与看门狗 clientConfig 写入冲突）
+const CONFIG_FILE = join(homedir(), ".tt-help-config.json");
+
+let _cache = null;
+
+export function getConfigFilePath() {
+  return CONFIG_FILE;
+}
+
+function readConfig() {
+  if (_cache) return _cache;
+  try {
+    if (existsSync(CONFIG_FILE)) {
+      const parsed = JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
+      _cache = parsed && typeof parsed === "object" ? parsed : {};
+    } else {
+      _cache = {};
+    }
+  } catch {
+    _cache = {};
+  }
+  return _cache;
+}
+
+/**
+ * 通用读取：getConfig() 返回整份配置；getConfig(key) 返回指定项。
+ * @param {string|null} key
+ * @param {*} fallback
+ */
+export function getConfig(key = null, fallback = null) {
+  const cfg = readConfig();
+  if (key == null) return { ...cfg };
+  return cfg[key] !== undefined ? cfg[key] : fallback;
+}
+
+/**
+ * 通用写入：设置指定 key 并落盘，返回更新后的整份配置。
+ * @param {string} key
+ * @param {*} value
+ */
+export function setConfig(key, value) {
+  const cfg = readConfig();
+  cfg[key] = value;
+  _cache = cfg;
+  try {
+    writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2), "utf-8");
+  } catch {
+    // 写失败不抛出，保证调用方不至于崩溃；仅保留内存值
+  }
+  return { ...cfg };
+}
+
+/**
+ * 通用删除：移除指定 key 并落盘，返回更新后的整份配置。
+ * @param {string} key
+ */
+export function removeConfig(key) {
+  const cfg = readConfig();
+  if (key in cfg) {
+    delete cfg[key];
+    _cache = cfg;
+    try {
+      writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2), "utf-8");
+    } catch {
+      // 写失败忽略，仅保留内存值
+    }
+  }
+  return { ...cfg };
+}
+
+function normalizeLocations(locations) {
+  if (!Array.isArray(locations)) return [];
+  return [
+    ...new Set(
+      locations.map((l) => String(l).trim().toUpperCase()).filter(Boolean),
+    ),
+  ];
+}
+
+/** 读取当前目标国家，未配置则回退 DEFAULT_TARGET_LOCATIONS */
+export function getTargetLocations() {
+  const raw = getConfig("targetLocations", []);
+  const normalized = normalizeLocations(raw);
+  return normalized.length > 0 ? normalized : [...DEFAULT_TARGET_LOCATIONS];
+}
+
+/**
+ * 保存目标国家（自动去重、大写）。
+ * 传入空数组/非法值 = 移除配置项，回退到内置默认列表。
+ * 始终返回"生效后的列表"（getTargetLocations()），保证响应与读取一致。
+ */
+export function setTargetLocations(locations) {
+  const normalized = normalizeLocations(locations);
+  if (normalized.length === 0) {
+    removeConfig("targetLocations");
+  } else {
+    setConfig("targetLocations", normalized);
+  }
+  return getTargetLocations();
+}
+
+/** 清除内存缓存，强制下次读盘（配置被外部修改时调用） */
+export function reloadConfig() {
+  _cache = null;
+}

package/src/lib/args.js

@@ -1,6 +1,8 @@
 import { readFileSync } from "fs";
 import { server as defaultServer } from "./constants.js";
-import { DEFAULT_TARGET_LOCATIONS_CSV } from "./target-locations.js";
+import { getTargetLocations } from "./app-config.js";
+
+const DEFAULT_TARGET_LOCATIONS_CSV = getTargetLocations().join(",");
 
 const PRESETS = ["fast", "normal", "slow", "stealth"];
 

package/src/lib/client-error-report.js

@@ -3,6 +3,8 @@
  * 供 tag / comments 等业务命令复用，避免重复实现。
  */
 
+import os from "os";
+
 /**
  * 触发 Clash daemon 的故障切换（换出口节点），与 watchdog 的 failover 一致。
  * 复用 ../clash/ipc.js 现成的 writeCommand 接口，不改动 daemon/ipc 模块。
@@ -47,6 +49,7 @@ export async function reportClientErrorAndFailover({
       errorMessage: message,
       stage,
       errorStack: "",
+      hostname: os.hostname(), // 机器标识：看门狗按 hostname 关联本机异常
     });
   } catch {}
   await triggerClashFailover(message, log);

package/src/lib/constants.js

@@ -1,7 +1,9 @@
 import { join, dirname } from "path";
 import { readFileSync, writeFileSync, existsSync } from "fs";
 import { fileURLToPath } from "url";
-import { DEFAULT_TARGET_LOCATIONS_CSV } from "./target-locations.js";
+import { getTargetLocations } from "./app-config.js";
+
+const DEFAULT_TARGET_LOCATIONS_CSV = getTargetLocations().join(",");
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);

package/src/lib/target-locations.js

@@ -12,6 +12,7 @@ const DEFAULT_TARGET_LOCATIONS = [
   "IT",
   "IE",
   "AT",
+  "TH",
   "US",
 ];
 

package/src/scraper/core.js

@@ -11,17 +11,17 @@ import {
 import { extractCommentAuthors } from "./modules/comment-extractor.js";
 import { extractGuessVideos } from "./modules/guess-extractor.js";
 import {
-  DEFAULT_TARGET_LOCATIONS_CSV,
   isLocationInList,
   normalizeLocationList,
 } from "../lib/target-locations.js";
+import { getTargetLocations } from "../lib/app-config.js";
 
 async function scrapeSingleVideo(
   page,
   maxComments,
   maxGuess,
   log,
-  location = DEFAULT_TARGET_LOCATIONS_CSV,
+  location = getTargetLocations().join(","),
 ) {
   const config = getDelayConfig();
 

package/src/scraper/explore-core.js

@@ -5,12 +5,12 @@ import { getUserInfo, collectVideos } from "../videos/core.js";
 import { extractFollowAndFollowers } from "./modules/follow-extractor.js";
 import { extractVideoLocation, setScraperProxy } from "../lib/scrape.js";
 import {
-  DEFAULT_TARGET_LOCATIONS_CSV,
   findBestMatchingLocation,
   isLocationInList,
   normalizeLocation,
   normalizeLocationList,
 } from "../lib/target-locations.js";
+import { getTargetLocations } from "../lib/app-config.js";
 import {
   maxFollowing as globalMaxFollowing,
   maxFollowers as globalMaxFollowers,
@@ -23,7 +23,7 @@ async function processExplore(page, username, options, log) {
     loggedIn = false, // 由外部传入登录状态，避免每次调用 isLoggedIn(page)
     maxFollowing = 50,
     maxFollowers = 50,
-    location = DEFAULT_TARGET_LOCATIONS_CSV,
+    location = getTargetLocations().join(","),
     locationMode = "explore", // "explore" | "refresh"
     proxyServer = null,
     webserverUrl = null,

package/src/watch/data-store.js

@@ -19,10 +19,8 @@
 import fs from "fs";
 import path from "path";
 import Database from "better-sqlite3";
-import {
-  isLocationInList,
-  DEFAULT_TARGET_LOCATIONS,
-} from "../lib/target-locations.js";
+import { isLocationInList } from "../lib/target-locations.js";
+import { getTargetLocations } from "../lib/app-config.js";
 
 // Schema 与连接管理
 import {
@@ -665,7 +663,7 @@ function getModifiedTargetUsersOutsideLocations(targetLocations = []) {
 function getTargetRefreshStats(hours = 24) {
   if (!getDb()) return { countries: [], total: 0, refreshed: 0 };
 
-  const targetLocations = DEFAULT_TARGET_LOCATIONS;
+  const targetLocations = getTargetLocations();
   const placeholders = targetLocations.map(() => "?").join(", ");
 
   // 按国家统计总数
@@ -2226,7 +2224,7 @@ export function createStore(filePath, options = {}) {
       const now = Date.now();
       const threshold = now - maxAgeSeconds * 1000;
       const defaultTime = new Date("2016-01-01T00:00:00Z").getTime();
-      const targetLocations = locations || DEFAULT_TARGET_LOCATIONS;
+      const targetLocations = locations || getTargetLocations();
       const placeholders = targetLocations.map(() => "?").join(",");
       const row = getDb()
         .prepare(
@@ -2261,7 +2259,7 @@ export function createStore(filePath, options = {}) {
     const defaultTime = new Date("2016-01-01T00:00:00Z").getTime();
 
     // 筛选目标国家用户，按 refreshTime 升序取最远的（没有则默认 2016-01-01）
-    const targetLocations = locations || DEFAULT_TARGET_LOCATIONS;
+    const targetLocations = locations || getTargetLocations();
     const targetUsers = data.filter(
       (u) =>
         u.ttSeller &&
@@ -2405,7 +2403,7 @@ export function createStore(filePath, options = {}) {
     const now = Date.now();
     const threshold = now - intervalSeconds * 1000;
     const defaultTime = new Date("2016-01-01T00:00:00Z").getTime();
-    const targetLocations = locations || DEFAULT_TARGET_LOCATIONS;
+    const targetLocations = locations || getTargetLocations();
     const placeholders = targetLocations.map(() => "?").join(",");
 
     // SELECT 候选用户
@@ -2477,10 +2475,12 @@ export function createStore(filePath, options = {}) {
     username,
     stage,
     errorStack,
+    hostname,
   ) {
     const existing = clientErrors.get(userId);
     if (existing) {
       existing.timestamp = Date.now();
+      if (hostname) existing.hostname = hostname;
       if (errorType === "captcha") {
         existing.captchaCount = (existing.captchaCount || 0) + 1;
         if (!existing.captchaStage) existing.captchaStage = stage || "";
@@ -2498,6 +2498,7 @@ export function createStore(filePath, options = {}) {
     } else {
       clientErrors.set(userId, {
         userId,
+        hostname: hostname || "",
         errorType,
         errorMessage: errorMessage || "",
         errorStack: errorStack || "",