tt-help-cli-ycl 1.3.33 → 1.3.35

package/package.json

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

package/scripts/run-explore.bat

@@ -107,6 +107,10 @@ IF "%BASE_PORT%"=="" SET "BASE_PORT=9222"
 SET /P "PORT_COUNT=Port count (--port-count) [default: 10]: "
 IF "%PORT_COUNT%"=="" SET "PORT_COUNT=10"
 
+SET /P "JOB_LOCATIONS=Job locations (--job-locations) [default: none]: "
+SET "JOB_LOC_ARGS="
+IF NOT "%JOB_LOCATIONS%"=="" SET "JOB_LOC_ARGS=--job-locations %JOB_LOCATIONS%"
+
 REM ---------- 4. Get user ID from config and compose ----------
 SET "CONFIG_USER_ID=user"
 IF EXIST "%CONFIG_PATH%" (
@@ -122,6 +126,7 @@ ECHO ========================================
 CALL ECHO   User ID: %%USER_ID%%
 CALL ECHO   Base port: %%BASE_PORT%%
 CALL ECHO   Port count: %%PORT_COUNT%%
+IF NOT "%JOB_LOCATIONS%"=="" ECHO   Job locations: %JOB_LOCATIONS%
 ECHO   Speed: stealth (slowest)
 ECHO ========================================
-CALL tt-help explore stealth --user-id %%USER_ID%% --base-port %%BASE_PORT%% --port-count %%PORT_COUNT%%
+CALL tt-help explore stealth --user-id %%USER_ID%% --base-port %%BASE_PORT%% --port-count %%PORT_COUNT%% %%JOB_LOC_ARGS%%

package/scripts/run-explore.ps1

@@ -127,6 +127,9 @@ $basePort = if ($inputBasePort) { $inputBasePort } else { "9222" }
 $inputPortCount = Read-Host "端口数量 (--port-count) [默认: 10]"
 $portCount = if ($inputPortCount) { $inputPortCount } else { "10" }
 
+$inputJobLocations = Read-Host "任务国家 (--job-locations) [默认: 无，使用全部]"
+$jobLocationsArg = if ($inputJobLocations) { "--job-locations $inputJobLocations" } else { "" }
+
 # ---------- 4. 获取配置中的用户编号并拼接 ----------
 $configUserId = ""
 if (Test-Path $configPath) {
@@ -148,6 +151,7 @@ Write-Host "========================================"
 Write-Host "  用户编号: $userId"
 Write-Host "  起始端口: $basePort"
 Write-Host "  端口数量: $portCount"
+if ($inputJobLocations) { Write-Host "  任务国家: $inputJobLocations" }
 Write-Host "  速度: stealth (最慢)"
 Write-Host "========================================"
-tt-help explore stealth --user-id $userId --base-port $basePort --port-count $portCount
+tt-help explore stealth --user-id $userId --base-port $basePort --port-count $portCount $jobLocationsArg

package/scripts/run-explore.sh

@@ -91,6 +91,9 @@ printf "端口数量 (--port-count) [默认: 10]: "
 read INPUT_PORT_COUNT
 PORT_COUNT="${INPUT_PORT_COUNT:-10}"
 
+printf "任务国家 (--job-locations) [默认: 无，使用全部]: "
+read INPUT_JOB_LOCATIONS
+
 # ---------- 4. 获取配置中的用户编号并拼接 ----------
 CONFIG_USER_ID=""
 if [ -f "$CONFIG_PATH" ]; then
@@ -108,6 +111,9 @@ echo "========================================"
 echo "  用户编号: $USER_ID"
 echo "  起始端口: $BASE_PORT"
 echo "  端口数量: $PORT_COUNT"
+if [ -n "$INPUT_JOB_LOCATIONS" ]; then echo "  任务国家: $INPUT_JOB_LOCATIONS"; fi
 echo "  速度: stealth (最慢)"
 echo "========================================"
-tt-help explore stealth --user-id "$USER_ID" --base-port "$BASE_PORT" --port-count "$PORT_COUNT"
+JOB_LOC_ARGS=""
+if [ -n "$INPUT_JOB_LOCATIONS" ]; then JOB_LOC_ARGS="--job-locations $INPUT_JOB_LOCATIONS"; fi
+tt-help explore stealth --user-id "$USER_ID" --base-port "$BASE_PORT" --port-count "$PORT_COUNT" $JOB_LOC_ARGS

package/src/cli/explore.js

@@ -197,6 +197,7 @@ export async function handleExplore(options) {
     );
     lastFollowSuccessTime = Date.now(); // 切换账户后重置
     captchaCount = 0; // 重置验证码计数
+    blockedCount = 0; // 重置被封计数
     consecutiveNetworkErrors = 0; // 重置网络错误计数
   }
 
@@ -204,13 +205,14 @@ export async function handleExplore(options) {
   let errorCount = 0;
   let consecutiveNetworkErrors = 0;
   let captchaCount = 0; // 验证码累计计数
+  let blockedCount = 0; // 被封累计计数
   let lastFollowSuccessTime = Date.now(); // 最近一次成功获取关注/粉丝的时间
   const FOLLOW_BLOCK_THRESHOLD = 10 * 60 * 1000; // 10分钟
 
   while (true) {
     const jobQuery = exploreJobLocations
-      ? `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&locations=${encodeURIComponent(exploreJobLocations)}`
-      : `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`;
+      ? `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&locations=${encodeURIComponent(exploreJobLocations)}&loggedIn=${loggedIn}`
+      : `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&loggedIn=${loggedIn}`;
     const job = await apiGet(jobQuery);
     if (!job.hasJob) break;
 
@@ -385,7 +387,12 @@ export async function handleExplore(options) {
         }),
       ).catch(() => {});
       if (errorType === "被封") {
-        await handleAccountSwitch("账号被封");
+        blockedCount++;
+        console.error(`  [被封] 累计 ${blockedCount} 次`);
+        if (blockedCount >= 3) {
+          await handleAccountSwitch(`账号被封累计 ${blockedCount} 次`);
+          blockedCount = 0;
+        }
         continue;
       }
       if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {

package/src/lib/api-interceptor.js

@@ -1,14 +1,10 @@
 import { delay } from "./delay.js";
-import { retryWithBackoff } from "./retry.js";
 import { assertPageUrl } from "./browser/page.js";
 import {
   detectPageError,
   detectPageErrorWithWait,
 } from "./page-error-detector.js";
 
-/**
- * 处理 API 响应数据：提取首页视频 + 翻页
- */
 async function processAPIResponse(
   data,
   username,
@@ -18,7 +14,6 @@ async function processAPIResponse(
   apiRequestUrl,
   log,
 ) {
-  // 提取首页视频
   const firstPageItems = data.itemList || [];
   for (const item of firstPageItems) {
     if (items.length >= maxVideos) break;
@@ -26,7 +21,6 @@ async function processAPIResponse(
     items.push({ id: item.id, href });
   }
 
-  // 翻页获取后续视频
   let cursor = data.cursor;
   let hasMore = data.hasMore;
 
@@ -61,7 +55,6 @@ async function processAPIResponse(
 
   log(`  [API拦截] 共 ${items.length} 条视频`);
 
-  // 转成 Map 返回，与 collectVideos 一致
   const videoMap = new Map();
   for (const v of items) {
     if (!videoMap.has(v.id)) videoMap.set(v.id, v);
@@ -70,232 +63,80 @@ async function processAPIResponse(
   return videoMap;
 }
 
-/**
- * 单次 API 拦截尝试：注册拦截器 → 导航 → 用 waitForResponse 精确等待 API
- * @param {number} apiTimeout - API 响应超时时间（ms），默认 15000
- * @returns {{data: object|null, apiRequestUrl: string|null, elapsed: number}}
- */
-async function tryInterceptAPI(page, username, log, apiTimeout = 15000) {
-  const url = `https://www.tiktok.com/@${username}`;
+async function fetchUserVideosAPI(page, username, maxVideos, log) {
+  log(`  [API拦截] 获取 @${username} 视频 ...`);
+
   let apiRequestUrl = null;
   let sawApiRequest = false;
-  let sawApiResponse = false;
-
-  const responseHandler = async (response) => {
-    if (response.url().includes("/api/post/item_list/")) {
-      sawApiResponse = true;
-    }
-  };
 
   const requestHandler = (request) => {
-    if (request.url().includes("/api/post/item_list/") && !apiRequestUrl) {
-      sawApiRequest = true;
-      apiRequestUrl = request.url();
-    } else if (request.url().includes("/api/post/item_list/")) {
+    if (request.url().includes("/api/post/item_list/")) {
       sawApiRequest = true;
+      if (!apiRequestUrl) apiRequestUrl = request.url();
     }
   };
 
-  page.on("response", responseHandler);
   page.on("request", requestHandler);
 
   const t0 = Date.now();
+  let data = null;
+  let interceptionError = null;
 
   try {
-    await page.goto(url, { waitUntil: "domcontentloaded", timeout: 30000 });
-    await assertPageUrl(page, `@${username}`);
-
-    // 用 waitForResponse 精确等待 API 响应（超时时间可配置）
-    const response = await page.waitForResponse(
-      (res) => res.url().includes("/api/post/item_list/"),
-      { timeout: apiTimeout },
+    await page.goto(
+      `https://www.tiktok.com/@${username}`,
+      { waitUntil: "domcontentloaded", timeout: 30000 },
     );
+    await assertPageUrl(page, `@${username}`);
 
-    sawApiResponse = true;
-    const data = await response.json();
-    const elapsed = Date.now() - t0;
-    return { data, apiRequestUrl, elapsed, sawApiRequest, sawApiResponse };
-  } catch (e) {
-    const elapsed = Date.now() - t0;
-    return {
-      data: null,
-      apiRequestUrl,
-      elapsed,
-      error: e.message,
-      sawApiRequest,
-      sawApiResponse,
-    };
-  } finally {
-    page.off("response", responseHandler);
-    page.off("request", requestHandler);
-  }
-}
-
-/**
- * 软重试：不重新 goto，直接在当前页继续等待 item_list API。
- */
-async function tryWaitCurrentPageAPI(page, apiTimeout = 12000) {
-  let apiRequestUrl = null;
-  let sawApiRequest = false;
-  let sawApiResponse = false;
-
-  const requestHandler = (request) => {
-    if (request.url().includes("/api/post/item_list/") && !apiRequestUrl) {
-      sawApiRequest = true;
-      apiRequestUrl = request.url();
-    } else if (request.url().includes("/api/post/item_list/")) {
-      sawApiRequest = true;
-    }
-  };
-
-  const responseHandler = (response) => {
-    if (response.url().includes("/api/post/item_list/")) {
-      sawApiResponse = true;
-    }
-  };
-
-  const t0 = Date.now();
-  page.on("request", requestHandler);
-  page.on("response", responseHandler);
-
-  try {
     const response = await page.waitForResponse(
       (res) => res.url().includes("/api/post/item_list/"),
-      { timeout: apiTimeout },
+      { timeout: 30000 },
     );
 
-    sawApiResponse = true;
-    const data = await response.json();
-    const elapsed = Date.now() - t0;
-    return { data, apiRequestUrl, elapsed, sawApiRequest, sawApiResponse };
+    data = await response.json();
   } catch (e) {
-    const elapsed = Date.now() - t0;
-    return {
-      data: null,
-      apiRequestUrl,
-      elapsed,
-      error: e.message,
-      sawApiRequest,
-      sawApiResponse,
-    };
+    interceptionError = e.message;
   } finally {
     page.off("request", requestHandler);
-    page.off("response", responseHandler);
   }
-}
-
-/**
- * 通过拦截 TikTok 内部 API 获取用户视频列表
- * 比 DOM 滚动解析快 5-10 倍
- *
- * 弱网优化：
- * - 第 1 轮：正常 goto，等待 15s
- * - 第 1.5 轮：不重新 goto，留在当前页继续等待 12s
- * - 第 2 轮：重新 goto，等待 30s
- * - 使用 waitForResponse 精确等待 API 响应（而非固定超时）
- *
- * @param {import('playwright').Page} page - Playwright page (CDP 连接)
- * @param {string} username - TikTok 用户名
- * @param {number} maxVideos - 最大视频数
- * @param {Function} log - 日志函数
- * @returns {Map<string, {id: string, href: string}>} 与 collectVideos 返回格式一致
- * @throws {Error} API 超时或网络异常时抛出
- */
-async function fetchUserVideosAPI(page, username, maxVideos, log) {
-  const items = [];
-  const noRetryErrors = new Set([
-    "service_error",
-    "not_found",
-    "region_blocked",
-    "login_required",
-  ]);
 
-  const attempts = [
-    {
-      label: `  [API拦截] 获取 @${username} 视频 ...`,
-      mode: "goto",
-      apiTimeout: 15000,
-    },
-    {
-      label: "  [API拦截] 首轮未命中，当前页继续补等 12s ...",
-      mode: "wait",
-      apiTimeout: 12000,
-    },
-    {
-      label: "  [API拦截] 重新加载主页后重试 (超时 30s)",
-      mode: "goto",
-      apiTimeout: 30000,
-    },
-  ];
+  const elapsed = Date.now() - t0;
 
-  for (let attempt = 0; attempt < attempts.length; attempt++) {
-    const currentAttempt = attempts[attempt];
-    log(currentAttempt.label);
-
-    const {
+  if (data && Array.isArray(data.itemList) && data.itemList.length > 0) {
+    log(`  [API拦截] 成功，耗时 ${elapsed}ms`);
+    return await processAPIResponse(
       data,
+      username,
+      maxVideos,
+      [],
+      page,
       apiRequestUrl,
-      elapsed,
-      error,
-      sawApiRequest,
-      sawApiResponse,
-    } =
-      currentAttempt.mode === "goto"
-        ? await tryInterceptAPI(page, username, log, currentAttempt.apiTimeout)
-        : await tryWaitCurrentPageAPI(page, currentAttempt.apiTimeout);
-
-    if (data && Array.isArray(data.itemList) && data.itemList.length > 0) {
-      // 成功拦截且拿到了视频，处理数据
-      return await processAPIResponse(
-        data,
-        username,
-        maxVideos,
-        items,
-        page,
-        apiRequestUrl,
-        log,
-      );
-    }
-
-    // API 已返回但没有视频时，优先判定是否是确定性的页面错误。
-    let pageError = await detectPageError(page);
-
-    // service_error 经常比 API 判定晚一点渲染，补一个短等待避免漏判“被封”。
-    if (!pageError) {
-      const delayedPageError = await detectPageErrorWithWait(page, 3000);
-      if (delayedPageError) pageError = delayedPageError;
-    }
-
-    if (pageError === "service_error") {
-      throw new Error(`被封: ${username}`);
-    }
-
-    if (data && Array.isArray(data.itemList) && data.itemList.length === 0) {
-      if (noRetryErrors.has(pageError)) {
-        return new Map();
-      }
+      log,
+    );
+  }
 
-      return new Map();
-    }
+  let pageError = await detectPageError(page);
+  if (!pageError) {
+    pageError = await detectPageErrorWithWait(page, 5000);
+  }
 
-    if (noRetryErrors.has(pageError)) {
-      return new Map();
-    }
+  if (pageError === "service_error") {
+    throw new Error(`被封: ${username}`);
+  }
 
-    log(
-      `  [API拦截] 未命中: request=${sawApiRequest ? "Y" : "N"}, response=${sawApiResponse ? "Y" : "N"}, elapsed=${elapsed}ms${error ? `, error=${error}` : ""}${apiRequestUrl ? ", apiUrl=Y" : ", apiUrl=N"}`,
-    );
+  if (pageError) {
+    log(`  [API拦截] 数据为空，识别到页面错误: ${pageError}`);
+    return new Map();
+  }
 
-    // 最后一次重试也失败了
-    if (attempt === attempts.length - 1) {
-      if (!pageError) {
-        throw new Error(
-          `@${username} 页面异常（首轮 + 补等 + 重载后仍未拦截到 API）`,
-        );
-      }
-      return new Map();
-    }
+  if (interceptionError) {
+    log(`  [API拦截] 超时/拦截失败: ${interceptionError}，耗时 ${elapsed}ms`);
+    throw new Error(`@${username} 页面异常（API拦截超时，未识别到错误类型）`);
   }
+
+  log(`  [API拦截] 数据为空，未识别到错误类型，当作无视频处理`);
+  return new Map();
 }
 
-export { fetchUserVideosAPI };
+export { fetchUserVideosAPI };

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";
+  let exploreLocation = "PL,NL,BE,DE,FR,IT,ES,IE,AT";
   let exploreJobLocations = null;
   let exploreMaxUsers = 0;
   let explorePort = null;

package/src/lib/constants.js

@@ -109,16 +109,19 @@ const HELP_TEXT = [
   '    预设: fast, normal（默认）, slow, stealth',
   '    选项:',
   '      --server <URL>            服务端地址，默认 http://127.0.0.1:3001',
-  '      --location <国家代码>     国家筛选，逗号分隔，默认 PL,NL,BE,DE,FR,IT,ES,IE',
+  '      --location <国家代码>     国家筛选，逗号分隔，默认 PL,NL,BE,DE,FR,IT,ES,IE,AT',
+  '      --job-locations <国家>    任务国家筛选，逗号分隔（仅筛选服务端任务）',
   '      --max-comments <数量>     每视频最大评论数，默认 10',
   '      --max-guess <数量>        每视频最大猜你喜欢数，默认 0',
+  '      --max-videos <数量>       每用户最大视频数，默认 16',
   '      --enable-follow           启用关注/粉丝提取（默认启用）',
   '      --disable-follow          禁用关注/粉丝提取',
-  '      --max-following <数量>    最大获取关注数，默认 5',
-  '      --max-followers <数量>    最大获取粉丝数，默认 5',
+  '      --max-following <数量>    最大获取关注数，默认 50（同时设置粉丝数）',
+  '      --max-followers <数量>    最大获取粉丝数，默认 50',
   '      --max-users <数量>        最大处理用户数，默认无限制',
-  '      --port <端口号>           CDP 端口，默认 9222',
-  '      --profile <名称>          浏览器 Profile 名称',
+  '      --port <端口号>           固定 CDP 端口（调试用，关闭自动轮换）',
+  '      --base-port <端口号>      起始端口，默认 9222',
+  '      --port-count <数量>       端口数量（账户数），默认 10',
   '      --user-id <编号>          客户端编号（设备ID），默认自动生成',
   '',
   '  tt-help info <URL> [URL2 ...] [--onlyvideo]',

package/src/scraper/explore-core.js

@@ -66,19 +66,29 @@ async function processExplore(page, username, options, log) {
       return result;
     }
 
-    // 从第一个视频获取 locationCreated
+    // 从最多 5 个视频并发获取 locationCreated，取众数
+    const SAMPLE_SIZE = 5;
     let locationCreated = null;
-    if (videoArray.length > 0) {
-      const firstVideo = videoArray[0];
-      const firstVideoUrl = firstVideo.href.startsWith("http")
-        ? firstVideo.href
-        : `https://www.tiktok.com${firstVideo.href}`;
-
-      locationCreated = await extractVideoLocation(firstVideoUrl);
+    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 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) {
+          const key = loc.toUpperCase();
+          freq[key] = (freq[key] || 0) + 1;
+        }
+      }
+      const entries = Object.entries(freq).sort((a, b) => b[1] - a[1]);
+      locationCreated = entries.length > 0 ? entries[0][0] : null;
     }
 
     result.locationCreated = locationCreated || null;
-    log(`  国家: ${result.locationCreated || "未知"}`);
+    log(`  国家: ${result.locationCreated || "未知"} (众数)`);
 
     // 国家筛选
     const locationList = (location || "ES")

package/src/watch/data-store.js

@@ -414,7 +414,12 @@ export function createStore(filePath) {
     return data;
   }
 
-  function claimNextJob(userId, expireMs = 5 * 60 * 1000, locations = null) {
+  function claimNextJob(
+    userId,
+    expireMs = 5 * 60 * 1000,
+    locations = null,
+    loggedIn = true,
+  ) {
     const now = Date.now();
 
     // 0. 该客户端有未过期的任务，续期返回
@@ -452,7 +457,7 @@ export function createStore(filePath) {
       return locations.includes(loc);
     }
 
-    // 从候选列表中按优先级取第一个：pinned > 超时回收 > seed > ttSeller > follow > other
+    // 从候选列表中按优先级取第一个：pinned > 超时回收 > seed > ttSeller(仅登录) > follow > other
     function pickCandidate(candidates) {
       let next = candidates.find((u) => u.pinned);
 
@@ -479,7 +484,8 @@ export function createStore(filePath) {
         next = seed[0] || null;
       }
 
-      if (!next) {
+      // 未登录时跳过 ttSeller 优先级
+      if (!next && loggedIn) {
         const ttSeller = candidates.filter(
           (u) => u.ttSeller === true && u.verified === false,
         );
@@ -511,6 +517,10 @@ export function createStore(filePath) {
     if (locations && locations.length > 0) {
       pending = pending.filter(locationFilter);
     }
+    // 未登录客户端不能领取 ttSeller 用户
+    if (!loggedIn) {
+      pending = pending.filter((u) => u.ttSeller !== true);
+    }
     let hasVideo = pending.filter((u) => u.videoCount > 0);
     const next = pickCandidate(hasVideo) || pickCandidate(pending);