tt-help-cli-ycl 1.3.32 → 1.3.33

package/package.json

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

package/scripts/run-explore copy.bat

@@ -1,8 +1,40 @@
 @ECHO OFF
-SETLOCAL
+SETLOCAL EnableDelayedExpansion
 
 SET "PACKAGENAME=tt-help-cli-ycl"
 SET "TARGET_SERVER=http://117.71.53.99:17301"
+SET "LOCAL_IP="
+SET "GET_IP_PS1=%TEMP%\tt_get_local_ip.ps1"
+>"%GET_IP_PS1%" ECHO $ip = $null
+>>"%GET_IP_PS1%" ECHO try {
+>>"%GET_IP_PS1%" ECHO   $ip = Get-WmiObject Win32_NetworkAdapterConfiguration ^| Where-Object { $_.IPEnabled -eq $true } ^| ForEach-Object { $_.IPAddress } ^| Where-Object { $_ -match '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' -and $_ -ne '127.0.0.1' -and $_ -notlike '169.254.*' } ^| Select-Object -First 1
+>>"%GET_IP_PS1%" ECHO } catch {}
+>>"%GET_IP_PS1%" ECHO if (-not $ip) {
+>>"%GET_IP_PS1%" ECHO   try {
+>>"%GET_IP_PS1%" ECHO     $ip = Get-NetIPAddress -AddressFamily IPv4 -ErrorAction Stop ^| Where-Object { $_.IPAddress -ne '127.0.0.1' -and $_.IPAddress -notlike '169.254.*' } ^| Select-Object -First 1 -ExpandProperty IPAddress
+>>"%GET_IP_PS1%" ECHO   } catch {}
+>>"%GET_IP_PS1%" ECHO }
+>>"%GET_IP_PS1%" ECHO if (-not $ip) {
+>>"%GET_IP_PS1%" ECHO   try {
+>>"%GET_IP_PS1%" ECHO     $ip = [System.Net.Dns]::GetHostAddresses([System.Net.Dns]::GetHostName()) ^| Where-Object { $_.AddressFamily -eq [System.Net.Sockets.AddressFamily]::InterNetwork -and $_.IPAddressToString -ne '127.0.0.1' -and $_.IPAddressToString -notlike '169.254.*' } ^| Select-Object -First 1 -ExpandProperty IPAddressToString
+>>"%GET_IP_PS1%" ECHO   } catch {}
+>>"%GET_IP_PS1%" ECHO }
+>>"%GET_IP_PS1%" ECHO if ($ip) { [Console]::Write($ip) }
+FOR /F "usebackq delims=" %%I IN (`powershell -NoProfile -ExecutionPolicy Bypass -File "%GET_IP_PS1%"`) DO (
+    SET "LOCAL_IP=%%I"
+)
+
+ECHO [INFO] Local IP: %LOCAL_IP%
+
+IF DEFINED LOCAL_IP IF "%LOCAL_IP:~0,11%"=="172.18.154." SET "TARGET_SERVER=http://172.18.154.201:3001"
+
+IF NOT DEFINED LOCAL_IP (
+    ECHO [INFO] No local IPv4 detected, using public server
+) ELSE IF "%LOCAL_IP:~0,11%"=="172.18.154." (
+    ECHO [INFO] Intranet IP detected, using intranet server
+) ELSE (
+    ECHO [INFO] No intranet IP detected, using public server
+)
 SET "CONFIG_PATH=%USERPROFILE%\.tt-help.json"
 
 ECHO ========================================
@@ -44,7 +76,7 @@ IF NOT DEFINED INSTALLED_VERSION (
 REM ---------- 2. Check/set server config ----------
 SET "CURRENT_SERVER="
 IF EXIST "%CONFIG_PATH%" (
-    FOR /F "delims=" %%S IN ('node -e "try{const c=JSON.parse(require('fs').readFileSync('%CONFIG_PATH%','utf-8'));console.log(c.server||'')}catch(e){}" 2^>nul') DO SET "CURRENT_SERVER=%%S"
+    FOR /F "usebackq delims=" %%S IN (`powershell -NoProfile -Command "$p=$env:CONFIG_PATH; if (Test-Path $p) { try { $cfg = Get-Content $p -Raw | ConvertFrom-Json; if ($null -ne $cfg.server) { [Console]::Write($cfg.server) } } catch {} }"`) DO SET "CURRENT_SERVER=%%S"
 )
 
 IF "%CURRENT_SERVER%"=="%TARGET_SERVER%" (
@@ -66,3 +98,4 @@ ECHO ========================================
 ECHO   Starting tt-help explore
 ECHO ========================================
 tt-help explore --port 9223 --profile p9223
+DEL "%GET_IP_PS1%" 2>NUL

package/scripts/run-explore.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-SETLOCAL
+SETLOCAL EnableDelayedExpansion
 
 SET "PACKAGENAME=tt-help-cli-ycl"
 SET "CONFIG_PATH=%USERPROFILE%\.tt-help.json"
@@ -11,16 +11,38 @@ ECHO ========================================
 REM ---------- 0. Auto-select server based on local IP ----------
 SET "TARGET_SERVER=http://117.71.53.99:17301"
 SET "LOCAL_IP="
-FOR /F "delims=" %%I IN ('cmd /c "ipconfig ^| findstr /R /C:"172\.18\.154\.[0-9]+""') DO (
+SET "GET_IP_PS1=%TEMP%\tt_get_local_ip.ps1"
+>"%GET_IP_PS1%" ECHO $ip = $null
+>>"%GET_IP_PS1%" ECHO try {
+>>"%GET_IP_PS1%" ECHO   $ip = Get-WmiObject Win32_NetworkAdapterConfiguration ^| Where-Object { $_.IPEnabled -eq $true } ^| ForEach-Object { $_.IPAddress } ^| Where-Object { $_ -match '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' -and $_ -ne '127.0.0.1' -and $_ -notlike '169.254.*' } ^| Select-Object -First 1
+>>"%GET_IP_PS1%" ECHO } catch {}
+>>"%GET_IP_PS1%" ECHO if (-not $ip) {
+>>"%GET_IP_PS1%" ECHO   try {
+>>"%GET_IP_PS1%" ECHO     $ip = Get-NetIPAddress -AddressFamily IPv4 -ErrorAction Stop ^| Where-Object { $_.IPAddress -ne '127.0.0.1' -and $_.IPAddress -notlike '169.254.*' } ^| Select-Object -First 1 -ExpandProperty IPAddress
+>>"%GET_IP_PS1%" ECHO   } catch {}
+>>"%GET_IP_PS1%" ECHO }
+>>"%GET_IP_PS1%" ECHO if (-not $ip) {
+>>"%GET_IP_PS1%" ECHO   try {
+>>"%GET_IP_PS1%" ECHO     $ip = [System.Net.Dns]::GetHostAddresses([System.Net.Dns]::GetHostName()) ^| Where-Object { $_.AddressFamily -eq [System.Net.Sockets.AddressFamily]::InterNetwork -and $_.IPAddressToString -ne '127.0.0.1' -and $_.IPAddressToString -notlike '169.254.*' } ^| Select-Object -First 1 -ExpandProperty IPAddressToString
+>>"%GET_IP_PS1%" ECHO   } catch {}
+>>"%GET_IP_PS1%" ECHO }
+>>"%GET_IP_PS1%" ECHO if ($ip) { [Console]::Write($ip) }
+FOR /F "usebackq delims=" %%I IN (`powershell -NoProfile -ExecutionPolicy Bypass -File "%GET_IP_PS1%"`) DO (
     SET "LOCAL_IP=%%I"
-    SET "TARGET_SERVER=http://172.18.154.201:3001"
 )
 
+ECHO [INFO] Local IP: %LOCAL_IP%
+
+IF DEFINED LOCAL_IP IF "%LOCAL_IP:~0,11%"=="172.18.154." SET "TARGET_SERVER=http://172.18.154.201:3001"
+
 IF NOT DEFINED LOCAL_IP (
-    ECHO [INFO] No intranet IP detected, using public server
-) ELSE (
+    ECHO [INFO] No local IPv4 detected, using public server
+) ELSE IF "%LOCAL_IP:~0,11%"=="172.18.154." (
     ECHO [INFO] Intranet IP detected, using intranet server
+) ELSE (
+    ECHO [INFO] No intranet IP detected, using public server
 )
+DEL "%GET_IP_PS1%" 2>NUL
 
 REM ---------- 1. Check/install latest version ----------
 FOR /F "delims=" %%V IN ('npm view %PACKAGENAME% version 2^>nul') DO SET "LATEST_VERSION=%%V"
@@ -57,7 +79,7 @@ IF NOT DEFINED INSTALLED_VERSION (
 REM ---------- 2. Check/set server config ----------
 SET "CURRENT_SERVER="
 IF EXIST "%CONFIG_PATH%" (
-    FOR /F "delims=" %%S IN ('node -e "try{const c=JSON.parse(require('fs').readFileSync('%CONFIG_PATH%','utf-8'));console.log(c.server||'')}catch(e){}" 2^>nul') DO SET "CURRENT_SERVER=%%S"
+    FOR /F "usebackq delims=" %%S IN (`powershell -NoProfile -Command "$p=$env:CONFIG_PATH; if (Test-Path $p) { try { $cfg = Get-Content $p -Raw | ConvertFrom-Json; if ($null -ne $cfg.server) { [Console]::Write($cfg.server) } } catch {} }"`) DO SET "CURRENT_SERVER=%%S"
 )
 
 IF "%CURRENT_SERVER%"=="%TARGET_SERVER%" (
@@ -85,13 +107,21 @@ IF "%BASE_PORT%"=="" SET "BASE_PORT=9222"
 SET /P "PORT_COUNT=Port count (--port-count) [default: 10]: "
 IF "%PORT_COUNT%"=="" SET "PORT_COUNT=10"
 
-REM ---------- 4. Start tt-help explore ----------
+REM ---------- 4. Get user ID from config and compose ----------
+SET "CONFIG_USER_ID=user"
+IF EXIST "%CONFIG_PATH%" (
+    FOR /F "usebackq delims=" %%S IN (`powershell -NoProfile -Command "$p=$env:CONFIG_PATH; if (Test-Path $p) { try { $cfg = Get-Content $p -Raw | ConvertFrom-Json; if ($null -ne $cfg.userId) { [Console]::Write($cfg.userId) } } catch {} }"`) DO SET "CONFIG_USER_ID=%%S"
+)
+CALL SET "USER_ID=%%CONFIG_USER_ID%%_%%BASE_PORT%%_%%PORT_COUNT%%"
+
+REM ---------- 5. Start tt-help explore ----------
 ECHO.
 ECHO ========================================
 ECHO   Starting tt-help explore
 ECHO ========================================
-ECHO   Base port: %BASE_PORT%
-ECHO   Port count: %PORT_COUNT%
+CALL ECHO   User ID: %%USER_ID%%
+CALL ECHO   Base port: %%BASE_PORT%%
+CALL ECHO   Port count: %%PORT_COUNT%%
 ECHO   Speed: stealth (slowest)
 ECHO ========================================
-tt-help explore stealth --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%%

package/scripts/run-explore.ps1

@@ -6,8 +6,41 @@ Write-Host "  tt-help-cli-ycl 一键启动脚本 (Windows)"
 Write-Host "========================================"
 
 # ---------- 0. 根据本机 IP 自动选择 server ----------
-$localIp = (Get-NetIPAddress -AddressFamily IPv4 | Where-Object { $_.IPAddress -match '^172\.18\.154\.' }).IPAddress
-if ($localIp) {
+$localIp = $null
+try {
+    $localIp = Get-WmiObject Win32_NetworkAdapterConfiguration |
+        Where-Object { $_.IPEnabled -eq $true } |
+        ForEach-Object { $_.IPAddress } |
+        Where-Object {
+            $_ -match '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' -and
+            $_ -ne '127.0.0.1' -and
+            $_ -notlike '169.254.*'
+        } |
+        Select-Object -First 1
+} catch {
+}
+if (-not $localIp) {
+    try {
+        $localIp = Get-NetIPAddress -AddressFamily IPv4 -ErrorAction Stop |
+            Where-Object { $_.IPAddress -ne '127.0.0.1' -and $_.IPAddress -notlike '169.254.*' } |
+            Select-Object -First 1 -ExpandProperty IPAddress
+    } catch {
+    }
+}
+if (-not $localIp) {
+    try {
+        $localIp = [System.Net.Dns]::GetHostAddresses([System.Net.Dns]::GetHostName()) |
+            Where-Object {
+                $_.AddressFamily -eq [System.Net.Sockets.AddressFamily]::InterNetwork -and
+                $_.IPAddressToString -ne '127.0.0.1' -and
+                $_.IPAddressToString -notlike '169.254.*'
+            } |
+            Select-Object -First 1 -ExpandProperty IPAddressToString
+    } catch {
+    }
+}
+Write-Host "[提示] 本机 IP: $(if ($localIp) { $localIp } else { '未检测到' })"
+if ($localIp -and $localIp -match '^172\.18\.154\.') {
     $targetServer = "http://172.18.154.201:3001"
     Write-Host "[提示] 检测到内网 IP: $localIp，使用内网 server"
 } else {
@@ -94,14 +127,27 @@ $basePort = if ($inputBasePort) { $inputBasePort } else { "9222" }
 $inputPortCount = Read-Host "端口数量 (--port-count) [默认: 10]"
 $portCount = if ($inputPortCount) { $inputPortCount } else { "10" }
 
-# ---------- 4. 启动 tt-help explore ----------
+# ---------- 4. 获取配置中的用户编号并拼接 ----------
+$configUserId = ""
+if (Test-Path $configPath) {
+    try {
+        $config = Get-Content $configPath -Raw | ConvertFrom-Json
+        $configUserId = $config.userId
+    } catch {
+        $configUserId = ""
+    }
+}
+if (-not $configUserId) { $configUserId = "user" }
+$userId = "${configUserId}_${basePort}_${portCount}"
+
+# ---------- 5. 启动 tt-help explore ----------
 Write-Host ""
 Write-Host "========================================"
 Write-Host "  启动 tt-help explore"
 Write-Host "========================================"
+Write-Host "  用户编号: $userId"
 Write-Host "  起始端口: $basePort"
 Write-Host "  端口数量: $portCount"
 Write-Host "  速度: stealth (最慢)"
 Write-Host "========================================"
-tt-help explore stealth --base-port $basePort --port-count $portCount
-tt-help explore
+tt-help explore stealth --user-id $userId --base-port $basePort --port-count $portCount

package/scripts/run-explore.sh

@@ -8,9 +8,11 @@ echo "  tt-help-cli-ycl 一键启动脚本 (macOS)"
 echo "========================================"
 
 # ---------- 0. 根据本机 IP 自动选择 server ----------
-LOCAL_IP=$(ifconfig | grep -oE 'inet (172\.18\.154\.[0-9]+)' | head -1 | awk '{print $2}')
+LOCAL_IP=$(ifconfig | awk '/inet / && $2 != "127.0.0.1" { print $2; exit }')
 
-if [ -n "$LOCAL_IP" ]; then
+echo "[提示] 本机 IP: ${LOCAL_IP:-未检测到}"
+
+if [[ "$LOCAL_IP" =~ ^172\.18\.154\.[0-9]+$ ]]; then
   TARGET_SERVER="http://172.18.154.201:3001"
   echo "[提示] 检测到内网 IP: $LOCAL_IP，使用内网 server"
 else
@@ -81,18 +83,31 @@ echo "========================================"
 echo "  参数配置"
 echo "========================================"
 
-read -p "起始端口 (--base-port) [默认: 9222]: " INPUT_BASE_PORT
+printf "起始端口 (--base-port) [默认: 9222]: "
+read INPUT_BASE_PORT
 BASE_PORT="${INPUT_BASE_PORT:-9222}"
 
-read -p "端口数量 (--port-count) [默认: 10]: " INPUT_PORT_COUNT
+printf "端口数量 (--port-count) [默认: 10]: "
+read INPUT_PORT_COUNT
 PORT_COUNT="${INPUT_PORT_COUNT:-10}"
 
+# ---------- 4. 获取配置中的用户编号并拼接 ----------
+CONFIG_USER_ID=""
+if [ -f "$CONFIG_PATH" ]; then
+  CONFIG_USER_ID=$(node -e "try{const c=JSON.parse(require('fs').readFileSync('$CONFIG_PATH','utf-8'));console.log(c.userId||'')}catch(e){}" 2>/dev/null)
+fi
+if [ -z "$CONFIG_USER_ID" ]; then
+  CONFIG_USER_ID="user"
+fi
+USER_ID="${CONFIG_USER_ID}_${BASE_PORT}_${PORT_COUNT}"
+
 echo ""
 echo "========================================"
 echo "  启动 tt-help explore"
 echo "========================================"
+echo "  用户编号: $USER_ID"
 echo "  起始端口: $BASE_PORT"
 echo "  端口数量: $PORT_COUNT"
 echo "  速度: stealth (最慢)"
 echo "========================================"
-tt-help explore stealth --base-port "$BASE_PORT" --port-count "$PORT_COUNT"
+tt-help explore stealth --user-id "$USER_ID" --base-port "$BASE_PORT" --port-count "$PORT_COUNT"

package/src/cli/explore.js

@@ -68,6 +68,7 @@ export async function handleExplore(options) {
     exploreMaxFollowing,
     exploreMaxFollowers,
     exploreLocation,
+    exploreJobLocations,
     exploreMaxUsers,
     serverUrl,
     explorePort,
@@ -96,6 +97,7 @@ export async function handleExplore(options) {
   }
 
   console.error(`\n国家筛选: ${exploreLocation}`);
+  if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
   console.error(`视频采集: ${exploreMaxVideos || 1}`);
   console.error(`关注/粉丝: ${exploreEnableFollow ? "启用" : "禁用"}`);
   console.error(`服务器: ${serverUrl}（断开会自动重连）`);
@@ -206,9 +208,10 @@ export async function handleExplore(options) {
   const FOLLOW_BLOCK_THRESHOLD = 10 * 60 * 1000; // 10分钟
 
   while (true) {
-    const job = await apiGet(
-      `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`,
-    );
+    const jobQuery = exploreJobLocations
+      ? `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&locations=${encodeURIComponent(exploreJobLocations)}`
+      : `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`;
+    const job = await apiGet(jobQuery);
     if (!job.hasJob) break;
 
     const username = job.user.uniqueId;

package/src/lib/api-interceptor.js

@@ -78,16 +78,21 @@ async function processAPIResponse(
 async function tryInterceptAPI(page, username, log, apiTimeout = 15000) {
   const url = `https://www.tiktok.com/@${username}`;
   let apiRequestUrl = null;
+  let sawApiRequest = false;
+  let sawApiResponse = false;
 
   const responseHandler = async (response) => {
     if (response.url().includes("/api/post/item_list/")) {
-      // 只记录 URL，数据通过 waitForResponse 获取
+      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/")) {
+      sawApiRequest = true;
     }
   };
 
@@ -106,29 +111,88 @@ async function tryInterceptAPI(page, username, log, apiTimeout = 15000) {
       { timeout: apiTimeout },
     );
 
+    sawApiResponse = true;
     const data = await response.json();
     const elapsed = Date.now() - t0;
-    return { data, apiRequestUrl, elapsed };
+    return { data, apiRequestUrl, elapsed, sawApiRequest, sawApiResponse };
   } catch (e) {
     const elapsed = Date.now() - t0;
-    return { data: null, apiRequestUrl, elapsed, error: e.message };
+    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 },
+    );
+
+    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("request", requestHandler);
+    page.off("response", responseHandler);
+  }
+}
+
 /**
  * 通过拦截 TikTok 内部 API 获取用户视频列表
  * 比 DOM 滚动解析快 5-10 倍
  *
  * 弱网优化：
+ * - 第 1 轮：正常 goto，等待 15s
+ * - 第 1.5 轮：不重新 goto，留在当前页继续等待 12s
+ * - 第 2 轮：重新 goto，等待 30s
  * - 使用 waitForResponse 精确等待 API 响应（而非固定超时）
- * - 最多重试 3 次，递增等待 + 递增超时：
- *   - 第 1 次：等待 0s，   超时 15s  → 正常尝试
- *   - 第 2 次：等待 3s，   超时 20s  → 短暂波动恢复
- *   - 第 3 次：等待 10s，  超时 30s  → 网络缓慢给更多时间
- * - 每次重试前清理拦截器
  *
  * @param {import('playwright').Page} page - Playwright page (CDP 连接)
  * @param {string} username - TikTok 用户名
@@ -139,13 +203,6 @@ async function tryInterceptAPI(page, username, log, apiTimeout = 15000) {
  */
 async function fetchUserVideosAPI(page, username, maxVideos, log) {
   const items = [];
-  const maxRetries = 3;
-  // 重试策略：[等待时间(ms), API超时(ms)]
-  const retryStrategy = [
-    [0, 15000], // 第 1 次：不等待，15s 超时
-    [3000, 20000], // 第 2 次：等 3s，20s 超时（短暂波动）
-    [10000, 30000], // 第 3 次：等 10s，30s 超时（网络缓慢）
-  ];
   const noRetryErrors = new Set([
     "service_error",
     "not_found",
@@ -153,22 +210,39 @@ async function fetchUserVideosAPI(page, username, maxVideos, log) {
     "login_required",
   ]);
 
-  for (let attempt = 1; attempt <= maxRetries; attempt++) {
-    const [, apiTimeout] = retryStrategy[attempt - 1];
-    if (attempt > 1) {
-      log(
-        `  [API拦截] 重试 ${attempt}/${maxRetries} (超时 ${apiTimeout / 1000}s)`,
-      );
-    } else {
-      log(`  [API拦截] 获取 @${username} 视频 ...`);
-    }
+  const attempts = [
+    {
+      label: `  [API拦截] 获取 @${username} 视频 ...`,
+      mode: "goto",
+      apiTimeout: 15000,
+    },
+    {
+      label: "  [API拦截] 首轮未命中，当前页继续补等 12s ...",
+      mode: "wait",
+      apiTimeout: 12000,
+    },
+    {
+      label: "  [API拦截] 重新加载主页后重试 (超时 30s)",
+      mode: "goto",
+      apiTimeout: 30000,
+    },
+  ];
 
-    const { data, apiRequestUrl, elapsed, error } = await tryInterceptAPI(
-      page,
-      username,
-      log,
-      apiTimeout,
-    );
+  for (let attempt = 0; attempt < attempts.length; attempt++) {
+    const currentAttempt = attempts[attempt];
+    log(currentAttempt.label);
+
+    const {
+      data,
+      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) {
       // 成功拦截且拿到了视频，处理数据
@@ -208,20 +282,19 @@ async function fetchUserVideosAPI(page, username, maxVideos, log) {
       return new Map();
     }
 
+    log(
+      `  [API拦截] 未命中: request=${sawApiRequest ? "Y" : "N"}, response=${sawApiResponse ? "Y" : "N"}, elapsed=${elapsed}ms${error ? `, error=${error}` : ""}${apiRequestUrl ? ", apiUrl=Y" : ", apiUrl=N"}`,
+    );
+
     // 最后一次重试也失败了
-    if (attempt === maxRetries) {
+    if (attempt === attempts.length - 1) {
       if (!pageError) {
         throw new Error(
-          `@${username} 页面异常（${maxRetries} 次重试均未拦截到 API）`,
+          `@${username} 页面异常（首轮 + 补等 + 重载后仍未拦截到 API）`,
         );
       }
       return new Map();
     }
-
-    // 还有重试次数，等待后重试
-    const [waitTime] = retryStrategy[attempt - 1];
-    log(`  [API拦截] 失败，${waitTime / 1000}s 后重试...`);
-    await new Promise((r) => setTimeout(r, waitTime));
   }
 }
 

package/src/lib/args.js

@@ -171,6 +171,7 @@ function parseExploreArgs(args) {
   let exploreMaxFollowing = 50;
   let exploreMaxFollowers = 50;
   let exploreLocation = "PL,NL,BE,DE,FR,IT,ES,IE";
+  let exploreJobLocations = null;
   let exploreMaxUsers = 0;
   let explorePort = null;
   let exploreBasePort = null;
@@ -191,6 +192,8 @@ function parseExploreArgs(args) {
       exploreMaxGuess = parseInt(args[++i]) || 0;
     } else if (arg === "--location") {
       exploreLocation = args[++i];
+    } else if (arg === "--job-locations") {
+      exploreJobLocations = args[++i];
     } else if (arg === "--enable-follow") {
       exploreEnableFollow = true;
     } else if (arg === "--disable-follow") {
@@ -242,6 +245,7 @@ function parseExploreArgs(args) {
     exploreMaxFollowing,
     exploreMaxFollowers,
     exploreLocation,
+    exploreJobLocations,
     serverUrl,
     exploreMaxUsers,
     explorePort,

package/src/scraper/modules/follow-extractor.js

@@ -3,6 +3,36 @@ import { scrollAndCollect } from "./scroll-collector.js";
 
 const FILTER_WORDS = ["主页", "已关注", "粉丝", "推荐"];
 
+const FOLLOW_TRIGGER_SELECTORS = [
+  "[data-e2e=following]",
+  'a[href$="/following"]',
+  'a[href*="/following"]',
+  '[data-e2e*="following"]',
+];
+
+async function waitForFollowTrigger(page, timeout = 15000) {
+  await page
+    .waitForFunction(
+      (selectors) => {
+        for (const selector of selectors) {
+          if (document.querySelector(selector)) return true;
+        }
+
+        const textMatchers = [/^关注$/, /^Following$/i, /^已关注$/];
+        const nodes = document.querySelectorAll("a,button,div,span");
+        for (const node of nodes) {
+          const text = (node.textContent || "").trim();
+          if (textMatchers.some((matcher) => matcher.test(text))) return true;
+        }
+
+        return false;
+      },
+      FOLLOW_TRIGGER_SELECTORS,
+      { timeout },
+    )
+    .catch(() => {});
+}
+
 async function waitForListContent(page, minChildren = 1, timeout = 15000) {
   await page
     .waitForFunction(
@@ -19,14 +49,58 @@ async function waitForListContent(page, minChildren = 1, timeout = 15000) {
 }
 
 async function openFollowModal(page) {
-  const el = await page.$("[data-e2e=following]");
-  if (!el) {
+  const tryOpen = async () =>
+    page.evaluate((selectors) => {
+      const clickTarget = (node) => {
+        if (!node) return false;
+        const clickable =
+          node.closest('a,button,[role="button"]') ||
+          node.parentElement ||
+          node;
+        clickable.click();
+        return true;
+      };
+
+      for (const selector of selectors) {
+        const node = document.querySelector(selector);
+        if (clickTarget(node)) return selector;
+      }
+
+      const textMatchers = [/^关注$/, /^Following$/i, /^已关注$/];
+      const nodes = Array.from(document.querySelectorAll("a,button,div,span"));
+      for (const node of nodes) {
+        const text = (node.textContent || "").trim();
+        if (!text) continue;
+        if (textMatchers.some((matcher) => matcher.test(text))) {
+          if (clickTarget(node)) return `text:${text}`;
+        }
+      }
+
+      return null;
+    }, FOLLOW_TRIGGER_SELECTORS);
+
+  let opened = null;
+  for (let attempt = 1; attempt <= 3; attempt++) {
+    await waitForFollowTrigger(page, attempt === 1 ? 15000 : 8000);
+    opened = await tryOpen();
+    if (opened) break;
+
+    await page
+      .evaluate(() => {
+        window.scrollTo({ top: 0, behavior: "instant" });
+      })
+      .catch(() => {});
+    await delay(800, 1500);
+  }
+
+  if (!opened) {
     throw new Error(
-      "未找到 [data-e2e=following] 元素，请确认当前页面为用户主页",
+      "未找到关注入口元素，请确认当前页面为用户主页或页面结构已变化",
     );
   }
-  await el.evaluate((el) => el.parentElement.click());
-  await page.waitForSelector("[class*=DivUserListContainer]", { timeout: 30000 });
+  await page.waitForSelector("[class*=DivUserListContainer]", {
+    timeout: 30000,
+  });
   await waitForListContent(page, 1, 5000);
 }
 
@@ -41,7 +115,9 @@ async function switchToFollowersTab(page) {
     }
     throw new Error("未找到粉丝 Tab");
   });
-  await page.waitForSelector("[class*=DivUserListContainer]", { timeout: 30000 });
+  await page.waitForSelector("[class*=DivUserListContainer]", {
+    timeout: 30000,
+  });
   await waitForListContent(page, 1, 5000);
 }