tt-help-cli-ycl 1.3.36 → 1.3.39

package/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import { fileURLToPath } from 'url';
-import { dirname, resolve } from 'path';
+import { fileURLToPath } from "url";
+import { dirname, resolve } from "path";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-const mainPath = resolve(__dirname, 'src', 'main.js');
+const mainPath = resolve(__dirname, "src", "npm-main.js");
 await import(`file://${mainPath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.3.36",
+  "version": "1.3.39",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {
@@ -41,9 +41,12 @@
   "homepage": "https://github.com/jsjhycl/tt-help-cli#readme",
   "dependencies": {
     "axios": "^1.16.1",
-    "better-sqlite3": "^12.10.0",
     "https-proxy-agent": "^9.0.0",
     "playwright": "^1.59.1",
+    "tt-help-cli-ycl": "^1.3.36",
     "undici": "^8.1.0"
+  },
+  "devDependencies": {
+    "better-sqlite3": "^12.10.0"
   }
 }

package/src/cli/comments.js

@@ -3,7 +3,21 @@ import { fetchUserCommentsAPI } from "../lib/api-interceptor-comment.js";
 import { closeCommentPanel } from "../lib/browser/page.js";
 import { server as defaultServer } from "../lib/constants.js";
 
-const TARGET_LOCATIONS = ["ES", "PL", "NL", "BE", "DE", "FR", "IT", "IE", "AT"];
+const TARGET_LOCATIONS = [
+  "CZ",
+  "GR",
+  "HU",
+  "PT",
+  "ES",
+  "PL",
+  "NL",
+  "BE",
+  "DE",
+  "FR",
+  "IT",
+  "IE",
+  "AT",
+];
 
 async function waitForPageReady(page, timeout = 30000) {
   const startTime = Date.now();

package/src/cli/config.js

@@ -28,8 +28,8 @@ function showConfig(urls, outputFile) {
   console.error(configLines.join("\n"));
 }
 
-function showUsage() {
-  console.error(HELP_TEXT.join("\n"));
+function showUsage(helpText = HELP_TEXT) {
+  console.error(helpText.join("\n"));
   process.exit(0);
 }
 

package/src/lib/api-interceptor.js

@@ -31,10 +31,29 @@ async function processAPIResponse(
     const newUrl = reqUrl.replace(/cursor=\d+/, `cursor=${cursor}`);
 
     try {
-      const pageData = await page.evaluate(async (u) => {
-        const res = await fetch(u);
-        return await res.json();
-      }, newUrl);
+      const pageData = await (() => {
+        // 重试包装：处理页面导航导致的执行上下文销毁
+        const tryEval = async (retries = 3) => {
+          for (let i = 0; i < retries; i++) {
+            try {
+              return await page.evaluate(async (u) => {
+                const res = await fetch(u);
+                return await res.json();
+              }, newUrl);
+            } catch (e) {
+              if (
+                e.message.includes('Execution context was destroyed') &&
+                i < retries - 1
+              ) {
+                await delay(500 * (i + 1), 500 * (i + 1));
+              } else {
+                throw e;
+              }
+            }
+          }
+        };
+        return tryEval();
+      })();
 
       if (pageData && pageData.itemList) {
         for (const item of pageData.itemList) {

package/src/lib/args.js

@@ -170,7 +170,7 @@ function parseExploreArgs(args) {
   let exploreEnableFollow = true;
   let exploreMaxFollowing = 50;
   let exploreMaxFollowers = 50;
-  let exploreLocation = "PL,NL,BE,DE,FR,IT,ES,IE,AT";
+  let exploreLocation = "CZ,GR,HU,PT,PL,NL,BE,DE,FR,IT,ES,IE,AT";
   let exploreJobLocations = null;
   let exploreMaxUsers = 0;
   let explorePort = null;

package/src/lib/constants.js

@@ -121,7 +121,7 @@ const HELP_TEXT = [
   "    预设: fast, normal（默认）, slow, stealth",
   "    选项:",
   "      --server <URL>            服务端地址，默认 http://127.0.0.1:3001",
-  "      --location <国家代码>     国家筛选，逗号分隔，默认 PL,NL,BE,DE,FR,IT,ES,IE,AT",
+  "      --location <国家代码>     国家筛选，逗号分隔，默认 CZ,GR,HU,PT,PL,NL,BE,DE,FR,IT,ES,IE,AT",
   "      --job-locations <国家>    任务国家筛选，逗号分隔（仅筛选服务端任务）",
   "      --max-comments <数量>     每视频最大评论数，默认 10",
   "      --max-guess <数量>        每视频最大猜你喜欢数，默认 0",
@@ -190,6 +190,50 @@ const HELP_TEXT = [
   "        tt-help videostats data/result.db -p 3",
 ];
 
+const PUBLIC_HELP_HIDDEN_HEADERS = new Set([
+  "  tt-help watch -o <db路径> [-p 端口]",
+  "  videostats  <db路径> -p <并发数>",
+  "  db-import  --db <db路径> [--users users.json] [--done done.json] [--videos videos.json]",
+]);
+
+const PUBLIC_HELP_HIDDEN_LINES = new Set([
+  "        tt-help watch -o data/result.db",
+  "        tt-help videostats data/result.db -p 3",
+]);
+
+function removeHelpSections(lines, hiddenHeaders, hiddenLines = new Set()) {
+  const result = [];
+  let skipping = false;
+
+  for (const line of lines) {
+    if (hiddenHeaders.has(line)) {
+      skipping = true;
+      continue;
+    }
+
+    if (skipping) {
+      if (line === "") {
+        skipping = false;
+      }
+      continue;
+    }
+
+    if (hiddenLines.has(line)) {
+      continue;
+    }
+
+    result.push(line);
+  }
+
+  return result;
+}
+
+const PUBLIC_HELP_TEXT = removeHelpSections(
+  HELP_TEXT,
+  PUBLIC_HELP_HIDDEN_HEADERS,
+  PUBLIC_HELP_HIDDEN_LINES,
+);
+
 function getConfigText() {
   let currentUserId = userId;
   if (!currentUserId && existsSync(configPath)) {
@@ -222,6 +266,7 @@ export {
   configPath,
   DEFAULT_PROXY,
   HELP_TEXT,
+  PUBLIC_HELP_TEXT,
   browser,
   userId,
   maxFollowing,

package/src/npm-main.js

@@ -0,0 +1,69 @@
+import { parseArgs } from "./lib/args.js";
+import { PUBLIC_HELP_TEXT } from "./lib/constants.js";
+import { handleInfo } from "./cli/info.js";
+import { handleExplore } from "./cli/explore.js";
+import { handleAttach } from "./cli/attach.js";
+import { handleConfig, showConfig, showUsage, version } from "./cli/config.js";
+import { handleOpen } from "./cli/open.js";
+import { handleComments } from "./cli/comments.js";
+
+function exitUnsupportedCommand(command) {
+  console.error(
+    `[${command}] 当前 npm 发布包不包含该命令；如需使用，请在仓库源码环境中运行 node src/main.js ${command} ...`,
+  );
+  process.exit(1);
+}
+
+async function main() {
+  const parsed = parseArgs();
+
+  switch (parsed.subcommand) {
+    case "explore":
+      return handleExplore(parsed);
+    case "info":
+      return handleInfo(parsed);
+    case "attach":
+      return handleAttach(parsed);
+    case "watch":
+    case "videostats":
+    case "db-import":
+      return exitUnsupportedCommand(parsed.subcommand);
+    case "open":
+      return handleOpen(parsed);
+    case "comments":
+      return handleComments(parsed);
+  }
+
+  const {
+    urls,
+    outputFile,
+    exploreCount,
+    showConfig: showCfg,
+    showHelp,
+    showVersion,
+    configAction,
+    configKey,
+    configValue,
+  } = parsed;
+
+  if (showVersion) {
+    console.log(version);
+    process.exit(0);
+  }
+  if (showHelp) return showUsage(PUBLIC_HELP_TEXT);
+  if (configAction) return handleConfig(configAction, configKey, configValue);
+  if (showCfg) return showConfig(urls, outputFile);
+  if (urls.length === 0 && exploreCount === 0)
+    return showUsage(PUBLIC_HELP_TEXT);
+
+  if (exploreCount > 0) {
+    return handleExplore({ ...parsed, subcommand: "explore" });
+  }
+
+  return handleInfo(parsed);
+}
+
+main().catch((err) => {
+  console.error(`错误: ${err.message}`);
+  process.exit(1);
+});

package/src/scraper/core.js

@@ -7,14 +7,22 @@ import {
   getDelayConfig,
   retryWithBackoff,
   assertPageUrl,
-} from './modules/page-helpers.js';
-import { extractCommentAuthors } from './modules/comment-extractor.js';
-import { extractGuessVideos } from './modules/guess-extractor.js';
+} from "./modules/page-helpers.js";
+import { extractCommentAuthors } from "./modules/comment-extractor.js";
+import { extractGuessVideos } from "./modules/guess-extractor.js";
 
-async function scrapeSingleVideo(page, maxComments, maxGuess, log, location = 'PL,NL,BE,DE,FR,IT,ES,IE') {
+async function scrapeSingleVideo(
+  page,
+  maxComments,
+  maxGuess,
+  log,
+  location = "CZ,GR,HU,PT,PL,NL,BE,DE,FR,IT,ES,IE",
+) {
   const config = getDelayConfig();
 
-  await page.waitForSelector('[class*="VideoMeta"]', { timeout: 10000 }).catch(() => {});
+  await page
+    .waitForSelector('[class*="VideoMeta"]', { timeout: 10000 })
+    .catch(() => {});
   await delay(Math.round(config.commentMax * 0.3), config.commentMax);
 
   const userData = await page.evaluate(() => {
@@ -23,8 +31,8 @@ async function scrapeSingleVideo(page, maxComments, maxGuess, log, location = 'P
     if (m) result.uniqueId = m[1];
     const authorEls = document.querySelectorAll('[class*="Author"]');
     for (const el of authorEls) {
-      const text = (el.textContent || '').trim();
-      if (text && !text.includes('TikTok') && !text.includes('Share')) {
+      const text = (el.textContent || "").trim();
+      if (text && !text.includes("TikTok") && !text.includes("Share")) {
         result.nickname = text;
         break;
       }
@@ -35,34 +43,40 @@ async function scrapeSingleVideo(page, maxComments, maxGuess, log, location = 'P
     return result;
   });
 
-  const videoAuthor = userData.uniqueId ? '@' + userData.uniqueId : null;
-  if (!videoAuthor) throw new Error('无法获取视频作者');
+  const videoAuthor = userData.uniqueId ? "@" + userData.uniqueId : null;
+  if (!videoAuthor) throw new Error("无法获取视频作者");
 
-    let guessVideos = [];
-    let commentUsers = [];
-    let captchaDetected = false;
-    let captchaStage = '';
-    let captchaMessage = '';
+  let guessVideos = [];
+  let commentUsers = [];
+  let captchaDetected = false;
+  let captchaStage = "";
+  let captchaMessage = "";
 
-    const locationList = (location || 'ES').split(',').map(s => s.trim().toUpperCase());
-    if (locationList.includes(userData.locationCreated?.toUpperCase?.() || userData.locationCreated)) {
-      if (maxGuess > 0) {
-        guessVideos = await extractGuessVideos(page, maxGuess);
-      }
-      if (maxComments > 0) {
-        const commentResult = await extractCommentAuthors(page, maxComments);
-        commentUsers = commentResult.authors || [];
-        if (commentResult.captchaDetected) {
-          captchaDetected = true;
-          captchaStage = 'comment';
-          captchaMessage = '评论阶段出现验证码';
-        }
-      }
-      await closeCommentPanel(page);
-      if (maxGuess > 0 || maxComments > 0) {
-        await delay(Math.round(config.commentMax * 0.3), config.commentMax);
+  const locationList = (location || "ES")
+    .split(",")
+    .map((s) => s.trim().toUpperCase());
+  if (
+    locationList.includes(
+      userData.locationCreated?.toUpperCase?.() || userData.locationCreated,
+    )
+  ) {
+    if (maxGuess > 0) {
+      guessVideos = await extractGuessVideos(page, maxGuess);
+    }
+    if (maxComments > 0) {
+      const commentResult = await extractCommentAuthors(page, maxComments);
+      commentUsers = commentResult.authors || [];
+      if (commentResult.captchaDetected) {
+        captchaDetected = true;
+        captchaStage = "comment";
+        captchaMessage = "评论阶段出现验证码";
       }
     }
+    await closeCommentPanel(page);
+    if (maxGuess > 0 || maxComments > 0) {
+      await delay(Math.round(config.commentMax * 0.3), config.commentMax);
+    }
+  }
 
   return {
     videoAuthor,
@@ -79,16 +93,25 @@ async function scrapeSingleVideo(page, maxComments, maxGuess, log, location = 'P
 
 async function runScrape(options) {
   const {
-    videoUrl, maxVideos = 20, maxComments = 999, maxGuess = 10,
-    preset = null, switchMax = null, commentMax = null,
+    videoUrl,
+    maxVideos = 20,
+    maxComments = 999,
+    maxGuess = 10,
+    preset = null,
+    switchMax = null,
+    commentMax = null,
     log = console.error,
-    browser: externalBrowser = null, page: externalPage = null,
+    browser: externalBrowser = null,
+    page: externalPage = null,
   } = options;
 
   if (preset) {
     setDelayConfig(preset);
   } else if (switchMax || commentMax) {
-    setDelayConfig({ switchMax: switchMax || 5000, commentMax: commentMax || 3000 });
+    setDelayConfig({
+      switchMax: switchMax || 5000,
+      commentMax: commentMax || 3000,
+    });
   }
 
   const config = getDelayConfig();
@@ -97,7 +120,9 @@ async function runScrape(options) {
 
   if (!isExternal) {
     log(`视频地址: ${videoUrl}`);
-    log(`视频数: ${maxVideos}, 评论数: ${maxComments}, 猜你喜欢: ${maxGuess}, 切换延迟: ${config.switchMax}ms, 评论延迟: ${config.commentMax}ms`);
+    log(
+      `视频数: ${maxVideos}, 评论数: ${maxComments}, 猜你喜欢: ${maxGuess}, 切换延迟: ${config.switchMax}ms, 评论延迟: ${config.commentMax}ms`,
+    );
   }
 
   if (isExternal) {
@@ -113,16 +138,19 @@ async function runScrape(options) {
     }
   }
 
-  await retryWithBackoff(() => page.goto(videoUrl, { waitUntil: 'load', timeout: 30000 }), { log });
-  assertPageUrl(page, videoUrl.split('/video/')[0]);
+  await retryWithBackoff(
+    () => page.goto(videoUrl, { waitUntil: "load", timeout: 30000 }),
+    { log },
+  );
+  assertPageUrl(page, videoUrl.split("/video/")[0]);
   await delay(Math.round(config.switchMax * 0.5), config.switchMax);
   await closeCommentPanel(page);
   await delay(Math.round(config.commentMax * 0.5), config.commentMax);
 
   const allResults = [];
   let anyCaptchaDetected = false;
-  let anyCaptchaStage = '';
-  let anyCaptchaMessage = '';
+  let anyCaptchaStage = "";
+  let anyCaptchaMessage = "";
   const videoAuthors = new Set();
   const commentUsers = new Set();
   const allCommentAuthorsList = [];
@@ -139,7 +167,9 @@ async function runScrape(options) {
       log(`[${i + 1}/${maxVideos}] 跳过: ${e.message}`);
       if (i < maxVideos - 1) {
         await page.evaluate(() => {
-          const container = document.querySelector('[class*="ColumnListContainer"]');
+          const container = document.querySelector(
+            '[class*="ColumnListContainer"]',
+          );
           if (container) container.scrollTop += 700;
           else window.scrollBy(0, 700);
         });
@@ -151,31 +181,39 @@ async function runScrape(options) {
     allResults.push(result);
     if (result.captchaDetected) {
       anyCaptchaDetected = true;
-      anyCaptchaStage = result.captchaStage || '';
-      anyCaptchaMessage = result.captchaMessage || '';
+      anyCaptchaStage = result.captchaStage || "";
+      anyCaptchaMessage = result.captchaMessage || "";
     }
     videoAuthors.add(result.videoAuthor);
-    result.commentUsers.forEach(u => commentUsers.add(u));
+    result.commentUsers.forEach((u) => commentUsers.add(u));
     allCommentAuthorsList.push(...result.commentUsers);
     if (result.guessVideos) {
       allGuessVideos.push(...result.guessVideos);
-      result.guessVideos.forEach(v => { if (v.author) allGuessAuthors.add(v.author); });
+      result.guessVideos.forEach((v) => {
+        if (v.author) allGuessAuthors.add(v.author);
+      });
     }
 
     if ((i + 1) % 5 === 0 || i === 0) {
-      log(`[${i + 1}/${maxVideos}] ${result.videoAuthor} | 昵称: ${result.nickname || '-'} | 评论用户: ${result.commentUsers.length} | 猜你喜欢: ${result.guessVideos ? result.guessVideos.length : 0}`);
+      log(
+        `[${i + 1}/${maxVideos}] ${result.videoAuthor} | 昵称: ${result.nickname || "-"} | 评论用户: ${result.commentUsers.length} | 猜你喜欢: ${result.guessVideos ? result.guessVideos.length : 0}`,
+      );
     }
 
     if (i < maxVideos - 1) {
       await page.evaluate(() => {
-        const container = document.querySelector('[class*="ColumnListContainer"]');
+        const container = document.querySelector(
+          '[class*="ColumnListContainer"]',
+        );
         if (container) container.scrollTop += 700;
       });
       await delay(2000, config.switchMax);
     }
   }
 
-  log(`\n结果: 视频作者 ${videoAuthors.size} | 评论用户 ${commentUsers.size} | 总评论 ${allCommentAuthorsList.length} | 猜你喜欢作者 ${allGuessAuthors.size} | 总猜中视频 ${allGuessVideos.length}`);
+  log(
+    `\n结果: 视频作者 ${videoAuthors.size} | 评论用户 ${commentUsers.size} | 总评论 ${allCommentAuthorsList.length} | 猜你喜欢作者 ${allGuessAuthors.size} | 总猜中视频 ${allGuessVideos.length}`,
+  );
 
   const videoDetails = {};
   for (const r of allResults) {
@@ -205,7 +243,14 @@ async function runScrape(options) {
     },
   };
 
-  return { output, browser, isExternal, captchaDetected: anyCaptchaDetected, captchaStage: anyCaptchaStage, captchaMessage: anyCaptchaMessage };
+  return {
+    output,
+    browser,
+    isExternal,
+    captchaDetected: anyCaptchaDetected,
+    captchaStage: anyCaptchaStage,
+    captchaMessage: anyCaptchaMessage,
+  };
 }
 
 export { scrapeSingleVideo, runScrape };

package/src/scraper/explore-core.js

@@ -16,7 +16,7 @@ async function processExplore(page, username, options, log) {
     loggedIn = false, // 由外部传入登录状态，避免每次调用 isLoggedIn(page)
     maxFollowing = 50,
     maxFollowers = 50,
-    location = "PL,NL,BE,DE,FR,IT,ES,IE",
+    location = "CZ,GR,HU,PT,PL,NL,BE,DE,FR,IT,ES,IE",
   } = options;
 
   const result = {
@@ -71,11 +71,15 @@ async function processExplore(page, username, options, log) {
     let locationCreated = null;
     const sampleVideos = videoArray.slice(0, SAMPLE_SIZE);
     if (sampleVideos.length > 0) {
-      const sampleUrls = sampleVideos.map(v =>
-        v.href.startsWith("http") ? v.href : `https://www.tiktok.com${v.href}`
+      const sampleUrls = sampleVideos.map((v) =>
+        v.href.startsWith("http") ? v.href : `https://www.tiktok.com${v.href}`,
+      );
+      const locations = await Promise.all(
+        sampleUrls.map((url) => extractVideoLocation(url)),
+      );
+      log(
+        `  国家采样(${locations.length}个): [${locations.filter(Boolean).join(", ") || "无数据"}]`,
       );
-      const locations = await Promise.all(sampleUrls.map(url => extractVideoLocation(url)));
-      log(`  国家采样(${locations.length}个): [${locations.filter(Boolean).join(", ") || "无数据"}]`);
       const freq = {};
       for (const loc of locations) {
         if (loc) {

package/src/scraper/refresh-core.js

@@ -3,21 +3,14 @@ import {
   retryWithBackoff,
   detectPageError,
   assertPageUrl,
-} from './modules/page-helpers.js';
-import { detectCaptcha } from './modules/captcha-handler.js';
-import {
-  getUserInfo,
-  collectVideos,
-} from '../videos/core.js';
-import { extractFollowAndFollowers } from './modules/follow-extractor.js';
-import { processExplore } from './explore-core.js';
+} from "./modules/page-helpers.js";
+import { detectCaptcha } from "./modules/captcha-handler.js";
+import { getUserInfo, collectVideos } from "../videos/core.js";
+import { extractFollowAndFollowers } from "./modules/follow-extractor.js";
+import { processExplore } from "./explore-core.js";
 
 export async function processRefresh(page, username, serverUrl, options, log) {
-  const {
-    maxFollowing = 100,
-    maxFollowers = 100,
-    maxVideos = 100,
-  } = options;
+  const { maxFollowing = 100, maxFollowers = 100, maxVideos = 100 } = options;
 
   const result = {
     userInfo: null,
@@ -32,26 +25,36 @@ export async function processRefresh(page, username, serverUrl, options, log) {
   try {
     log(`  访问 @${username} 主页...`);
     const homeUrl = `https://www.tiktok.com/@${username}`;
-    await retryWithBackoff(async () => {
-      await page.goto(homeUrl, { waitUntil: 'domcontentloaded', timeout: 30000 });
-      assertPageUrl(page, `@${username}`);
-    }, { log });
-    await page.waitForSelector('[class*="DivVideoList"]', { timeout: 10000 }).catch(() => {});
+    await retryWithBackoff(
+      async () => {
+        await page.goto(homeUrl, {
+          waitUntil: "domcontentloaded",
+          timeout: 30000,
+        });
+        assertPageUrl(page, `@${username}`);
+      },
+      { log },
+    );
+    await page
+      .waitForSelector('[class*="DivVideoList"]', { timeout: 10000 })
+      .catch(() => {});
     await delay(1000, 2000);
 
-    log('  获取用户信息...');
+    log("  获取用户信息...");
     const info = await getUserInfo(page);
     if (info) {
       result.userInfo = info;
-      log(`  用户: ${info.nickname || username} | 粉丝: ${info.followerCount || '-'} | 视频: ${info.videoCount || '-'}`);
+      log(
+        `  用户: ${info.nickname || username} | 粉丝: ${info.followerCount || "-"} | 视频: ${info.videoCount || "-"}`,
+      );
     }
 
     const captcha = await detectCaptcha(page);
     if (captcha && captcha.visible) {
       log(`[验证码] @${username} 页面出现验证码`);
       result.captchaDetected = true;
-      result.captchaStage = result.captchaStage || 'video-page';
-      result.captchaMessage = result.captchaMessage || '视频页出现验证码';
+      result.captchaStage = result.captchaStage || "video-page";
+      result.captchaMessage = result.captchaMessage || "视频页出现验证码";
     }
 
     // 采集视频
@@ -59,7 +62,7 @@ export async function processRefresh(page, username, serverUrl, options, log) {
     const videoList = await collectVideos(page, username, maxVideos, log);
     const videoArray = videoList ? [...videoList.values()] : [];
     result.collectedVideos = videoArray.length;
-    result.discoveredVideoAuthors = videoArray.map(v => v.author);
+    result.discoveredVideoAuthors = videoArray.map((v) => v.author);
 
     if (videoArray.length <= 0) {
       result.noVideo = true;
@@ -80,7 +83,9 @@ export async function processRefresh(page, username, serverUrl, options, log) {
       });
       result.discoveredFollowing = followResult.following || [];
       result.discoveredFollowers = followResult.followers || [];
-      log(`  关注: ${result.discoveredFollowing.length}, 粉丝: ${result.discoveredFollowers.length}`);
+      log(
+        `  关注: ${result.discoveredFollowing.length}, 粉丝: ${result.discoveredFollowers.length}`,
+      );
     } catch (e) {
       log(`  [关注/粉丝采集失败] ${e.message}`);
       result.discoveredFollowing = [];
@@ -90,15 +95,23 @@ export async function processRefresh(page, username, serverUrl, options, log) {
     // 处理新发现的用户（关注 + 粉丝），循环执行完整 explore
     // follow-extractor 返回 [handle, displayName] 数组
     const allDiscovered = [
-      ...result.discoveredFollowing.map(h => ({ handle: Array.isArray(h) ? h[0] : h, source: 'refresh-following' })),
-      ...result.discoveredFollowers.map(h => ({ handle: Array.isArray(h) ? h[0] : h, source: 'refresh-follower' })),
+      ...result.discoveredFollowing.map((h) => ({
+        handle: Array.isArray(h) ? h[0] : h,
+        source: "refresh-following",
+      })),
+      ...result.discoveredFollowers.map((h) => ({
+        handle: Array.isArray(h) ? h[0] : h,
+        source: "refresh-follower",
+      })),
     ];
 
     for (const { handle, source } of allDiscovered) {
-      const uniqueId = handle.replace('@', '');
+      const uniqueId = handle.replace("@", "");
 
       // 检查用户是否已存在
-      const existsResp = await fetch(`${serverUrl}/api/user-exists/${encodeURIComponent(uniqueId)}`);
+      const existsResp = await fetch(
+        `${serverUrl}/api/user-exists/${encodeURIComponent(uniqueId)}`,
+      );
       const existsData = await existsResp.json();
 
       if (existsData.exists) {
@@ -109,14 +122,19 @@ export async function processRefresh(page, username, serverUrl, options, log) {
       await delay(1000, 2000);
 
       // 对新用户做完整 explore（与 explore 命令逻辑一致）
-      const exploreResult = await processExplore(page, uniqueId, {
-        maxComments: 10,
-        maxGuess: 0,
-        enableFollow: true,
-        maxFollowing: 5,
-        maxFollowers: 5,
-        location: 'PL,NL,BE,DE,FR,IT,ES,IE',
-      }, log);
+      const exploreResult = await processExplore(
+        page,
+        uniqueId,
+        {
+          maxComments: 10,
+          maxGuess: 0,
+          enableFollow: true,
+          maxFollowing: 5,
+          maxFollowers: 5,
+          location: "CZ,GR,HU,PT,PL,NL,BE,DE,FR,IT,ES,IE",
+        },
+        log,
+      );
 
       // 提交 explore 结果到服务端（和 explore 命令的 commitJob 一致）
       if (exploreResult.userInfo) {
@@ -124,21 +142,31 @@ export async function processRefresh(page, username, serverUrl, options, log) {
 
         const payload = {
           userInfo: exploreResult.userInfo || {},
-          discoveredVideoAuthors: (exploreResult.discoveredVideoAuthors || []).map(item =>
-            typeof item === 'object' ? { ...item, guessedLocation } : item
+          discoveredVideoAuthors: (
+            exploreResult.discoveredVideoAuthors || []
+          ).map((item) =>
+            typeof item === "object" ? { ...item, guessedLocation } : item,
+          ),
+          discoveredCommentAuthors: (
+            exploreResult.discoveredCommentAuthors || []
+          ).map((author) => ({ author, guessedLocation })),
+          discoveredGuessAuthors: (
+            exploreResult.discoveredGuessAuthors || []
+          ).map((author) => ({ author, guessedLocation })),
+          discoveredFollowing: (exploreResult.discoveredFollowing || []).map(
+            (f) => ({
+              handle: Array.isArray(f) ? f[0] : f,
+              displayName: Array.isArray(f) ? f[1] : null,
+              guessedLocation,
+            }),
+          ),
+          discoveredFollowers: (exploreResult.discoveredFollowers || []).map(
+            (f) => ({
+              handle: Array.isArray(f) ? f[0] : f,
+              displayName: Array.isArray(f) ? f[1] : null,
+              guessedLocation,
+            }),
           ),
-          discoveredCommentAuthors: (exploreResult.discoveredCommentAuthors || []).map(author => ({ author, guessedLocation })),
-          discoveredGuessAuthors: (exploreResult.discoveredGuessAuthors || []).map(author => ({ author, guessedLocation })),
-          discoveredFollowing: (exploreResult.discoveredFollowing || []).map(f => ({
-            handle: Array.isArray(f) ? f[0] : f,
-            displayName: Array.isArray(f) ? f[1] : null,
-            guessedLocation,
-          })),
-          discoveredFollowers: (exploreResult.discoveredFollowers || []).map(f => ({
-            handle: Array.isArray(f) ? f[0] : f,
-            displayName: Array.isArray(f) ? f[1] : null,
-            guessedLocation,
-          })),
           processed: exploreResult.processed,
           hasFollowData: exploreResult.hasFollowData,
           keepFollow: exploreResult.keepFollow,
@@ -148,11 +176,14 @@ export async function processRefresh(page, username, serverUrl, options, log) {
           error: exploreResult.error,
         };
 
-        const addResp = await fetch(`${serverUrl}/api/explore-new/${uniqueId}`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(payload),
-        });
+        const addResp = await fetch(
+          `${serverUrl}/api/explore-new/${uniqueId}`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(payload),
+          },
+        );
         const addResult = await addResp.json();
 
         if (!addResult.saved) {
@@ -164,7 +195,9 @@ export async function processRefresh(page, username, serverUrl, options, log) {
         if (exploreResult.captchaDetected) {
           result.captchaDetected = true;
         }
-        log(`  [已提交] @${uniqueId} ${addResult.created ? '(新用户)' : '(已存在)'} | 发现: ${addResult.newUsers?.length || 0} 个`);
+        log(
+          `  [已提交] @${uniqueId} ${addResult.created ? "(新用户)" : "(已存在)"} | 发现: ${addResult.newUsers?.length || 0} 个`,
+        );
       }
 
       await delay(2000, 4000);
@@ -172,7 +205,7 @@ export async function processRefresh(page, username, serverUrl, options, log) {
   } catch (e) {
     log(`  [错误] ${e.message}`);
     result.error = e.message;
-    result.errorStack = e.stack || '';
+    result.errorStack = e.stack || "";
   }
 
   return result;

package/src/videos/core.js

@@ -7,7 +7,25 @@ import {
 import { fetchUserVideosAPI } from "../lib/api-interceptor.js";
 
 async function getUserInfo(page) {
-  return await page.evaluate(() => {
+  // 重试包装：处理页面导航导致的执行上下文销毁
+  const evaluateWithRetry = async (fn, retries = 3) => {
+    for (let i = 0; i < retries; i++) {
+      try {
+        return await page.evaluate(fn);
+      } catch (e) {
+        if (
+          e.message.includes('Execution context was destroyed') &&
+          i < retries - 1
+        ) {
+          await new Promise((r) => setTimeout(r, 500 * (i + 1)));
+        } else {
+          throw e;
+        }
+      }
+    }
+  };
+
+  return await evaluateWithRetry(() => {
     const html = document.documentElement.outerHTML;
     const result = {};
 

package/src/watch/data-store.js

@@ -1854,7 +1854,20 @@ export function createStore(filePath) {
     if (db) {
       const now = Date.now();
       const defaultTime = new Date("2016-01-01T00:00:00Z").getTime();
-      const targetLocations = ["ES", "PL", "NL", "BE", "DE", "FR", "IT", "IE"];
+      const targetLocations = [
+        "CZ",
+        "GR",
+        "HU",
+        "PT",
+        "ES",
+        "PL",
+        "NL",
+        "BE",
+        "DE",
+        "FR",
+        "IT",
+        "IE",
+      ];
       const placeholders = targetLocations.map(() => "?").join(",");
       const row = db
         .prepare(
@@ -1884,7 +1897,20 @@ export function createStore(filePath) {
     const defaultTime = new Date("2016-01-01T00:00:00Z").getTime();
 
     // 筛选目标国家用户，按 refreshTime 升序取最远的（没有则默认 2016-01-01）
-    const targetLocations = ["ES", "PL", "NL", "BE", "DE", "FR", "IT", "IE"];
+    const targetLocations = [
+      "CZ",
+      "GR",
+      "HU",
+      "PT",
+      "ES",
+      "PL",
+      "NL",
+      "BE",
+      "DE",
+      "FR",
+      "IT",
+      "IE",
+    ];
     const targetUsers = data.filter(
       (u) =>
         u.ttSeller &&

package/src/watch/public/index.html

@@ -187,6 +187,17 @@
       flex-shrink: 0;
     }
 
+    .bar-row.is-target {
+      background: rgba(167, 139, 250, 0.08);
+      border-radius: 4px;
+      padding: 2px 0;
+    }
+
+    .bar-row.is-target .name {
+      color: #a78bfa;
+      font-weight: 600;
+    }
+
     .source-row {
       display: flex;
       align-items: center;
@@ -1094,14 +1105,16 @@
       if (!filtered.length) { el.innerHTML = '<span style="color:#666;font-size:12px">\u6682\u65e0\u6570\u636e</span>'; return; }
       const max = filtered[0].count;
       const top = filtered.slice(0, 15);
+      const targetLocations = currentStats?.targetLocations || [];
       el.innerHTML = top.map((c, i) => {
+        const isTarget = targetLocations.includes(c.country);
         const targetBadge = c.targetCount > 0
           ? `<span class="target-badge">🎯 ${c.targetCount}</span>`
           : `<span class="target-badge" style="visibility:hidden"> </span>`;
         return `
-    <div class="bar-row">
+    <div class="bar-row${isTarget ? ' is-target' : ''}">
       <span class="name">${c.country}</span>
-      <div class="bar-bg"><div class="bar-fill" style="width:${(c.count / max * 100)}%;background:${COLORS[i % COLORS.length]}">${c.count}</div></div>
+      <div class="bar-bg"><div class="bar-fill" style="width:${(c.count / max * 100)}%;background:${isTarget ? '#a78bfa' : COLORS[i % COLORS.length]}">${c.count}</div></div>
       ${targetBadge}
       <span class="count">${(currentStats ? (c.count / currentStats.totalUsers * 100).toFixed(1) : 0)}%</span>
     </div>

package/src/watch/server.js

@@ -7,7 +7,21 @@ import { fileURLToPath } from "url";
 import { spawn } from "child_process";
 import { createStore } from "./data-store.js";
 
-const TARGET_LOCATIONS = ["ES", "PL", "NL", "BE", "DE", "FR", "IT", "IE", "AT"];
+const TARGET_LOCATIONS = [
+  "CZ",
+  "GR",
+  "HU",
+  "PT",
+  "ES",
+  "PL",
+  "NL",
+  "BE",
+  "DE",
+  "FR",
+  "IT",
+  "IE",
+  "AT",
+];
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -314,6 +328,7 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
 
       if (req.method === "GET" && routePath === "/api/stats") {
         const stats = computeStatsIncremental(store);
+        stats.targetLocations = TARGET_LOCATIONS;
         sendJSON(res, 200, stats);
         return;
       }