tt-help-cli-ycl 1.3.8 → 1.3.10

package/bat/run-explore.bat

@@ -0,0 +1,68 @@
+@ECHO OFF
+SETLOCAL
+
+SET "PACKAGENAME=tt-help-cli-ycl"
+SET "TARGET_SERVER=http://117.71.53.99:17301"
+SET "CONFIG_PATH=%USERPROFILE%\.tt-help.json"
+
+ECHO ========================================
+ECHO   tt-help-cli-ycl one-click launcher (Windows CMD)
+ECHO ========================================
+
+REM ---------- 1. Check/install latest version ----------
+FOR /F "delims=" %%V IN ('npm view %PACKAGENAME% version 2^>nul') DO SET "LATEST_VERSION=%%V"
+
+IF NOT DEFINED LATEST_VERSION (
+    ECHO [ERROR] Cannot get latest version from npm
+    EXIT /B 1
+)
+
+FOR /F "tokens=2 delims=@" %%V IN ('npm list -g %PACKAGENAME% --depth=0 2^>nul ^| findstr /i "%PACKAGENAME%"') DO SET "INSTALLED_VERSION=%%V"
+
+IF NOT DEFINED INSTALLED_VERSION (
+    ECHO [INFO] %PACKAGENAME% not installed, installing latest...
+    CALL npm install -g %PACKAGENAME%
+    IF %ERRORLEVEL% EQU 0 (
+        ECHO [OK] Installed: %LATEST_VERSION%
+    ) ELSE (
+        ECHO [ERROR] Install failed, run manually: npm install -g %PACKAGENAME%
+        EXIT /B 1
+    )
+) ELSE IF "%INSTALLED_VERSION%"=="%LATEST_VERSION%" (
+    ECHO [OK] %PACKAGENAME% is up to date: %LATEST_VERSION%
+) ELSE (
+    ECHO [INFO] Current: %INSTALLED_VERSION%, Latest: %LATEST_VERSION%
+    ECHO [INFO] Upgrading to latest...
+    CALL npm install -g %PACKAGENAME%
+    IF %ERRORLEVEL% EQU 0 (
+        ECHO [OK] Upgraded: %LATEST_VERSION%
+    ) ELSE (
+        ECHO [WARN] Upgrade failed, run manually: npm install -g %PACKAGENAME%
+    )
+)
+
+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"
+)
+
+IF "%CURRENT_SERVER%"=="%TARGET_SERVER%" (
+    ECHO [OK] Server config is correct: %TARGET_SERVER%
+) ELSE (
+    IF "%CURRENT_SERVER%"=="" (
+        ECHO [INFO] Current server: not set, target: %TARGET_SERVER%
+    ) ELSE (
+        ECHO [INFO] Current server: %CURRENT_SERVER%, target: %TARGET_SERVER%
+    )
+    ECHO [INFO] Setting server config...
+    node -e "const fs=require('fs'),path=require('path');const p=path.join(require('os').homedir(),'.tt-help.json');let c={};try{c=JSON.parse(fs.readFileSync(p,'utf-8'))}catch(e){}c.server='%TARGET_SERVER%';fs.writeFileSync(p,JSON.stringify(c,null,2),'utf-8');console.log('  Written to: '+p);"
+    ECHO [OK] Server config set
+)
+
+REM ---------- 3. Start tt-help explore ----------
+ECHO.
+ECHO ========================================
+ECHO   Starting tt-help explore
+ECHO ========================================
+tt-help explore

package/bat/run-explore.ps1

@@ -0,0 +1,81 @@
+$packageName = "tt-help-cli-ycl"
+$targetServer = "http://117.71.53.99:17301"
+$configPath = Join-Path $env:USERPROFILE ".tt-help.json"
+
+Write-Host "========================================"
+Write-Host "  tt-help-cli-ycl 一键启动脚本 (Windows)"
+Write-Host "========================================"
+
+# ---------- 1. 检查/安装最新版本 ----------
+$latestVersion = npm view $packageName version 2>$null
+
+if (-not $latestVersion) {
+    Write-Host "[错误] 无法从 npm 获取最新版本信息"
+    exit 1
+}
+
+$installedVersion = ""
+$output = npm list -g $packageName --depth=0 2>$null
+if ($output -match "$packageName@([\d.]+)") {
+    $installedVersion = $matches[1]
+}
+
+if (-not $installedVersion) {
+    Write-Host "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
+    npm install -g $packageName 2>$null
+    if ($LASTEXITCODE -eq 0) {
+        Write-Host "[OK] 安装完成: $latestVersion"
+    } else {
+        Write-Host "[错误] 安装失败，请手动执行: npm install -g $packageName"
+        exit 1
+    }
+} elseif ($installedVersion -eq $latestVersion) {
+    Write-Host "[OK] tt-help-cli-ycl 已是最新版本: $latestVersion"
+} else {
+    Write-Host "[提示] 当前版本: $installedVersion, 最新版本: $latestVersion"
+    Write-Host "[执行] 正在升级最新版本..."
+    npm install -g $packageName 2>$null
+    if ($LASTEXITCODE -eq 0) {
+        Write-Host "[OK] 升级完成: $latestVersion"
+    } else {
+        Write-Host "[警告] 升级失败，请手动执行: npm install -g $packageName"
+    }
+}
+
+# ---------- 2. 检查/设置 server 配置 ----------
+$currentServer = ""
+if (Test-Path $configPath) {
+    try {
+        $config = Get-Content $configPath -Raw | ConvertFrom-Json
+        $currentServer = $config.server
+    } catch {
+        $currentServer = ""
+    }
+}
+
+if ($currentServer -eq $targetServer) {
+    Write-Host "[OK] Server 配置正确: $targetServer"
+} else {
+    $currentDisplay = if ($currentServer) { $currentServer } else { "未设置" }
+    Write-Host "[提示] 当前 server: $currentDisplay, 目标: $targetServer"
+    Write-Host "[执行] 正在设置 server 配置..."
+
+    node -e "
+const fs = require('fs');
+const path = require('path');
+const configPath = path.join(require('os').homedir(), '.tt-help.json');
+let cfg = {};
+try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
+cfg.server = '$targetServer';
+fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+console.log('  已写入: ' + configPath);
+"
+    Write-Host "[OK] Server 配置已设置"
+}
+
+# ---------- 3. 启动 tt-help explore ----------
+Write-Host ""
+Write-Host "========================================"
+Write-Host "  启动 tt-help explore"
+Write-Host "========================================"
+tt-help explore

package/bat/run-explore.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+PACKAGENAME="tt-help-cli-ycl"
+TARGET_SERVER="http://117.71.53.99:17301"
+CONFIG_PATH="$HOME/.tt-help.json"
+
+echo "========================================"
+echo "  tt-help-cli-ycl 一键启动脚本 (macOS)"
+echo "========================================"
+
+# ---------- 1. 检查/安装最新版本 ----------
+LATEST_VERSION=$(npm view "$PACKAGENAME" version 2>/dev/null)
+
+if [ -z "$LATEST_VERSION" ]; then
+  echo "[错误] 无法从 npm 获取最新版本信息"
+  exit 1
+fi
+
+INSTALLED_VERSION=$(npm list -g "$PACKAGENAME" --depth=0 2>/dev/null | grep "$PACKAGENAME@" | head -1 | sed 's/.*@//' | sed 's/[) ].*//')
+
+if [ -z "$INSTALLED_VERSION" ]; then
+  echo "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
+  npm install -g "$PACKAGENAME"
+  if [ $? -eq 0 ]; then
+    echo "[OK] 安装完成: $LATEST_VERSION"
+  else
+    echo "[错误] 安装失败，请手动执行: npm install -g $PACKAGENAME"
+    exit 1
+  fi
+elif [ "$INSTALLED_VERSION" = "$LATEST_VERSION" ]; then
+  echo "[OK] tt-help-cli-ycl 已是最新版本: $LATEST_VERSION"
+else
+  echo "[提示] 当前版本: $INSTALLED_VERSION, 最新版本: $LATEST_VERSION"
+  echo "[执行] 正在升级最新版本..."
+  npm install -g "$PACKAGENAME" 2>/dev/null
+  if [ $? -eq 0 ]; then
+    echo "[OK] 安装完成: $LATEST_VERSION"
+  else
+    echo "[警告] 自动安装失败，尝试手动更新..."
+    npm update -g "$PACKAGENAME"
+  fi
+fi
+
+# ---------- 2. 检查/设置 server 配置 ----------
+CURRENT_SERVER=""
+if [ -f "$CONFIG_PATH" ]; then
+  CURRENT_SERVER=$(node -e "try{const c=JSON.parse(require('fs').readFileSync('$CONFIG_PATH','utf-8'));console.log(c.server||'')}catch(e){}" 2>/dev/null)
+fi
+
+if [ "$CURRENT_SERVER" = "$TARGET_SERVER" ]; then
+  echo "[OK] Server 配置正确: $TARGET_SERVER"
+else
+  echo "[提示] 当前 server: ${CURRENT_SERVER:-未设置}, 目标: $TARGET_SERVER"
+  echo "[执行] 正在设置 server 配置..."
+  node -e "
+const fs = require('fs');
+const path = require('path');
+const configPath = path.join(require('os').homedir(), '.tt-help.json');
+let cfg = {};
+try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
+cfg.server = '$TARGET_SERVER';
+fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+console.log('  已写入: ' + configPath);
+"
+  echo "[OK] Server 配置已设置"
+fi
+
+# ---------- 3. 启动 tt-help explore ----------
+echo ""
+echo "========================================"
+echo "  启动 tt-help explore"
+echo "========================================"
+tt-help explore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {
@@ -9,7 +9,8 @@
   "main": "src/main.mjs",
   "files": [
     "cli.js",
-    "src/"
+    "src/",
+    "bat/"
   ],
   "scripts": {
     "start": "node src/main.mjs"

package/src/cli/auto.js

@@ -77,6 +77,7 @@ export async function handleAuto(options) {
 
   let processedCount = 0;
   let errorCount = 0;
+  let consecutiveNetworkErrors = 0;
 
   while (true) {
     const job = await apiGet(`${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`);
@@ -84,43 +85,68 @@ export async function handleAuto(options) {
 
     const username = job.user.uniqueId;
     processedCount++;
-    let proxyRetry = 0;
 
-    while (true) {
-      console.error(`\n[${processedCount}] 处理 @${username}...${proxyRetry > 0 ? ` (代理重试 ${proxyRetry})` : ''}`);
+    if (consecutiveNetworkErrors > 0) {
+      const waitTime = consecutiveNetworkErrors <= 2
+        ? 0
+        : consecutiveNetworkErrors <= 5
+          ? 30000
+          : 300000;
+      if (waitTime > 0) {
+        console.error(`  [网络] 连续 ${consecutiveNetworkErrors} 次网络异常，等待 ${waitTime / 1000}s 后重试...`);
+        await new Promise(r => setTimeout(r, waitTime));
+      }
+    }
 
-      const result = await processUser(page, username, { ...runOptions, browser }, console.error);
+    console.error(`\n[${processedCount}] 处理 @${username}...`);
 
-      if (result.restricted) {
-        await apiPost(`${serverUrl}/api/job/${username}`, result);
-        break;
-      }
+    const result = await processUser(page, username, { ...runOptions, browser }, console.error);
 
-      if (result.error && result.error.includes('代理错误')) {
-        proxyRetry++;
-        console.error(`  [代理错误] ${result.error}，等待 10s 后重试...`);
-        await new Promise(r => setTimeout(r, 10000));
-        continue;
-      }
+    if (result.restricted) {
+      consecutiveNetworkErrors = 0;
+      await apiPost(`${serverUrl}/api/job/${username}`, result);
+      continue;
+    }
 
-      if (result.error) {
-        errorCount++;
-        await apiPost(`${serverUrl}/api/job/${username}`, result);
-        break;
-      }
+    if (result.error) {
+      consecutiveNetworkErrors++;
+      errorCount++;
+      await apiPost(`${serverUrl}/api/job/${username}`, result);
+      const errorType = consecutiveNetworkErrors > 1 ? 'network' : 'other';
+      await withRetry('report error', () =>
+        apiPost(`${serverUrl}/api/error-report`, {
+          userId,
+          username,
+          errorType,
+          errorMessage: result.error,
+        })
+      ).catch(() => {});
+      continue;
+    }
 
-      const payload = {
-        userInfo: result.userInfo || {},
-        discoveredVideoAuthors: result.discoveredVideoAuthors || [],
-        discoveredCommentAuthors: result.discoveredCommentAuthors || [],
-        discoveredGuessAuthors: result.discoveredGuessAuthors || [],
-        discoveredFollowing: result.discoveredFollowing || [],
-        discoveredFollowers: result.discoveredFollowers || [],
-      };
-      await apiPost(`${serverUrl}/api/job/${username}`, payload);
-      console.error('  已提交');
-      break;
+    if (result.captchaDetected) {
+      await withRetry('report captcha', () =>
+        apiPost(`${serverUrl}/api/error-report`, {
+          userId,
+          username,
+          errorType: 'captcha',
+          errorMessage: '页面出现验证码',
+        })
+      ).catch(() => {});
     }
+
+    consecutiveNetworkErrors = 0;
+
+    const payload = {
+      userInfo: result.userInfo || {},
+      discoveredVideoAuthors: result.discoveredVideoAuthors || [],
+      discoveredCommentAuthors: result.discoveredCommentAuthors || [],
+      discoveredGuessAuthors: result.discoveredGuessAuthors || [],
+      discoveredFollowing: result.discoveredFollowing || [],
+      discoveredFollowers: result.discoveredFollowers || [],
+    };
+    await apiPost(`${serverUrl}/api/job/${username}`, payload);
+    console.error('  已提交');
   }
 
   const stats = await apiGet(`${serverUrl}/api/stats`);

package/src/cli/explore.js

@@ -72,6 +72,7 @@ export async function handleExplore(options) {
 
   let processedCount = 0;
   let errorCount = 0;
+  let consecutiveNetworkErrors = 0;
 
   while (true) {
     const job = await apiGet(`${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`);
@@ -79,60 +80,93 @@ export async function handleExplore(options) {
 
     const username = job.user.uniqueId;
     processedCount++;
-    let proxyRetry = 0;
-
-    while (true) {
-      console.error(`\n[${processedCount}] 探索 @${username}...${proxyRetry > 0 ? ` (代理重试 ${proxyRetry})` : ''}`);
-
-      const { switchMax } = getDelayConfig();
-      await delay(switchMax, switchMax * 3);
-
-      const result = await processExplore(page, username, {
-        maxComments: exploreMaxComments,
-        maxGuess: exploreMaxGuess,
-        enableFollow: exploreEnableFollow,
-        maxFollowing: exploreMaxFollowing,
-        maxFollowers: exploreMaxFollowers,
-        location: exploreLocation,
-        browser,
-      }, console.error);
-
-      if (result.restricted) {
-        await apiPost(`${serverUrl}/api/job/${username}`, { restricted: true, userInfo: result.userInfo || {} });
-        break;
+
+    if (consecutiveNetworkErrors > 0) {
+      const waitTime = consecutiveNetworkErrors <= 2
+        ? 0
+        : consecutiveNetworkErrors <= 5
+          ? 30000
+          : 300000;
+      if (waitTime > 0) {
+        console.error(`  [网络] 连续 ${consecutiveNetworkErrors} 次网络异常，等待 ${waitTime / 1000}s 后重试...`);
+        await new Promise(r => setTimeout(r, waitTime));
       }
+    }
 
-      if (result.error && result.error.includes('代理错误')) {
-        proxyRetry++;
-        console.error(`  [代理错误] ${result.error}，等待 10s 后重试...`);
-        await new Promise(r => setTimeout(r, 10000));
-        continue;
+    console.error(`\n[${processedCount}] 探索 @${username}...`);
+
+    const { switchMax } = getDelayConfig();
+    await delay(switchMax, switchMax * 3);
+
+    const result = await processExplore(page, username, {
+      maxComments: exploreMaxComments,
+      maxGuess: exploreMaxGuess,
+      enableFollow: exploreEnableFollow,
+      maxFollowing: exploreMaxFollowing,
+      maxFollowers: exploreMaxFollowers,
+      location: exploreLocation,
+      browser,
+    }, console.error);
+
+    if (result.restricted) {
+      consecutiveNetworkErrors = 0;
+      await apiPost(`${serverUrl}/api/job/${username}`, { restricted: true, userInfo: result.userInfo || {} });
+      if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
+        console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
+        break;
       }
+      continue;
+    }
 
-      if (result.error) {
-        errorCount++;
-        await apiPost(`${serverUrl}/api/job/${username}`, { error: result.error });
+    if (result.error) {
+      consecutiveNetworkErrors++;
+      errorCount++;
+      await apiPost(`${serverUrl}/api/job/${username}`, { error: result.error });
+      const errorType = consecutiveNetworkErrors > 1 ? 'network' : 'other';
+      await withRetry('report error', () =>
+        apiPost(`${serverUrl}/api/error-report`, {
+          userId,
+          username,
+          errorType,
+          errorMessage: result.error,
+        })
+      ).catch(() => {});
+      if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
+        console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
         break;
       }
+      continue;
+    }
 
-      const payload = {
-        userInfo: result.userInfo || {},
-        discoveredVideoAuthors: result.discoveredVideoAuthors || [],
-        discoveredCommentAuthors: result.discoveredCommentAuthors || [],
-        discoveredGuessAuthors: result.discoveredGuessAuthors || [],
-        discoveredFollowing: result.discoveredFollowing || [],
-        discoveredFollowers: result.discoveredFollowers || [],
-        processed: result.processed,
-        hasFollowData: result.hasFollowData,
-        keepFollow: result.keepFollow,
-        locationCreated: result.locationCreated,
-        noVideo: result.noVideo,
-      };
-      await apiPost(`${serverUrl}/api/job/${username}`, payload);
-      console.error('  已提交');
-      break;
+    if (result.captchaDetected) {
+      await withRetry('report captcha', () =>
+        apiPost(`${serverUrl}/api/error-report`, {
+          userId,
+          username,
+          errorType: 'captcha',
+          errorMessage: '页面出现验证码',
+        })
+      ).catch(() => {});
     }
 
+    consecutiveNetworkErrors = 0;
+
+    const payload = {
+      userInfo: result.userInfo || {},
+      discoveredVideoAuthors: result.discoveredVideoAuthors || [],
+      discoveredCommentAuthors: result.discoveredCommentAuthors || [],
+      discoveredGuessAuthors: result.discoveredGuessAuthors || [],
+      discoveredFollowing: result.discoveredFollowing || [],
+      discoveredFollowers: result.discoveredFollowers || [],
+      processed: result.processed,
+      hasFollowData: result.hasFollowData,
+      keepFollow: result.keepFollow,
+      locationCreated: result.locationCreated,
+      noVideo: result.noVideo,
+    };
+    await apiPost(`${serverUrl}/api/job/${username}`, payload);
+    console.error('  已提交');
+
     if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
       console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
       break;

package/src/lib/constants.js

@@ -71,8 +71,8 @@ const HELP_TEXT = [
   '    --max-users <数量>        最大处理用户数，默认无限制',
   '  全局选项:',
   '    config                    查看当前配置',
-  '    config set <key> <value>  设置配置（key: proxy, server, browser）',
-  '    config reset              重置代理为默认',
+  '    config set <key> <value>  设置配置（key: proxy, server, browser, userId）',
+  '    config reset              重置所有配置为默认',
   '    -h, --help                显示帮助',
   '    --version                 显示版本号',
   '',
@@ -80,17 +80,27 @@ const HELP_TEXT = [
   '        tt-help config set server http://127.0.0.1:3001',
 ];
 
-const CONFIG_TEXT = [
-  'tt-help v1.0.1',
-  '',
-  '配置:',
-  `  代理: ${proxy}`,
-  `  服务端: ${server}`,
-  `  浏览器: ${browser || '未配置（将自动探测或回退）'}`,
-  `  输出格式: json`,
-  `  默认输出: ${DEFAULT_OUTPUT}`,
-  `  配置文件: ${configFile || '无（使用默认值）'}`,
-];
+function getConfigText() {
+  let currentUserId = userId;
+  if (!currentUserId && existsSync(configPath)) {
+    try {
+      const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
+      if (cfg.userId) currentUserId = cfg.userId;
+    } catch {}
+  }
+  return [
+    'tt-help v1.0.1',
+    '',
+    '配置:',
+    `  代理: ${proxy}`,
+    `  服务端: ${server}`,
+    `  浏览器: ${browser || '未配置（将自动探测或回退）'}`,
+    `  用户号: ${currentUserId || '未设置（首次运行 auto 自动创建）'}`,
+    `  输出格式: json`,
+    `  默认输出: ${DEFAULT_OUTPUT}`,
+    `  配置文件: ${configFile || '无（使用默认值）'}`,
+  ];
+}
 
 export {
   proxy,
@@ -101,9 +111,9 @@ export {
   DEFAULT_OUTPUT,
   USER_SECTION_SIZE,
   HELP_TEXT,
-  CONFIG_TEXT,
   browser,
   userId,
   saveBrowser,
   saveUserId,
+  getConfigText,
 };

package/src/lib/retry.js

@@ -14,11 +14,12 @@ const RETRYABLE_PATTERNS = [
   'failed.*navigate',
   'target.*closed',
   'crash',
+  '代理错误',
 ];
 
 export function isRetryableError(error) {
   if (!error) return false;
-  const msg = (error.message || error.toString() || '').toLowerCase();
+  const msg = error.message || error.toString() || '';
   return RETRYABLE_PATTERNS.some(p => new RegExp(p, 'i').test(msg));
 }
 

package/src/main.mjs

@@ -1,5 +1,5 @@
 import { parseArgs } from './lib/args.js';
-import { HELP_TEXT, CONFIG_TEXT, proxy, configFile, configPath, DEFAULT_PROXY, saveBrowser } from './lib/constants.js';
+import { HELP_TEXT, proxy, configFile, configPath, DEFAULT_PROXY, saveBrowser, saveUserId, getConfigText } from './lib/constants.js';
 import { parseFilter, applyFilter, formatFilterDescription } from './lib/filter.js';
 import { writeFileSync, readFileSync, existsSync } from 'fs';
 import { handleScrape } from './cli/scrape.js';
@@ -17,7 +17,7 @@ const pkgPath = join(__dirname, '..', 'package.json');
 const { version } = JSON.parse(readFileSync(pkgPath, 'utf-8'));
 
 function showConfig(urls, outputFile) {
-  const lines = [...CONFIG_TEXT];
+  const lines = getConfigText();
   if (outputFile) lines.push(`  输出文件: ${outputFile}`);
   if (urls.length > 0) lines.push(`  待处理URL: ${urls.length}`);
   lines.push('', '参数:', '  -c, --config   显示当前配置', '  -h, --help     显示帮助');
@@ -37,7 +37,7 @@ function handleConfig(action, key, value) {
   if (action === 'set' || action === 'set-proxy') {
     if (!key) {
       console.error('用法: tt-help config set <key> <value>');
-      console.error('  可用 key: proxy, server, browser');
+      console.error('  可用 key: proxy, server, browser, userId');
       process.exit(1);
     }
     if (!value && key.startsWith('http://')) {
@@ -57,9 +57,15 @@ function handleConfig(action, key, value) {
     if (key === 'proxy') cfg.proxy = value;
     else if (key === 'server') cfg.server = value;
     else if (key === 'browser') cfg.browser = value;
+    else if (key === 'userId') {
+      saveUserId(value);
+      console.log(`userId 已设置为: ${value}`);
+      console.log(`配置文件: ${configPath}`);
+      return;
+    }
     else {
       console.error(`未知配置项: ${key}`);
-      console.error('  可用 key: proxy, server, browser');
+      console.error('  可用 key: proxy, server, browser, userId');
       process.exit(1);
     }
     writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
@@ -90,16 +96,23 @@ function handleConfig(action, key, value) {
     if (existsSync(configPath)) {
       const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
       cfg.proxy = DEFAULT_PROXY;
+      cfg.server = 'http://127.0.0.1:3001';
+      delete cfg.browser;
+      delete cfg.userId;
       writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-      console.log(`已恢复默认代理: ${DEFAULT_PROXY}`);
+      console.log('已重置所有配置:');
+      console.log(`  代理: ${DEFAULT_PROXY}`);
+      console.log(`  服务端: http://127.0.0.1:3001`);
+      console.log('  浏览器: 已清空（自动探测）');
+      console.log('  用户号: 已清空（下次运行 auto 自动创建）');
       console.log(`配置文件: ${configPath}`);
     } else {
-      console.log('当前使用默认代理，无需重置');
+      console.log('当前使用默认配置，无需重置');
     }
     return;
   }
   console.error(`未知配置命令: ${action}`);
-  console.error('用法: tt-help config [show|set|set-browser|reset]');
+  console.error('用法: tt-help config [show|set|reset]');
   process.exit(1);
 }
 

package/src/scraper/auto-core.mjs

@@ -10,13 +10,14 @@ import {
   isLoggedIn,
   assertPageUrl,
 } from './modules/page-helpers.mjs';
+import { detectCaptcha } from './modules/captcha-handler.mjs';
 export { ensureBrowserReady };
 import {
   getUserInfo,
   collectVideos,
 } from '../videos/core.mjs';
 import { runScrape } from './core.mjs';
-import { extractFollowAndFollowers } from './modules/follow-extractor.mjs';
+import { extractFollowAndFollowers } from './modules/follow-extractor.mjs';
 
 function mergeUserInfo(existing, incoming, source) {
   const merged = { ...existing };
@@ -64,10 +65,12 @@ async function processUser(page, username, options, log) {
 
   try {
     log(`\n[processUser] 访问 @${username}...`);
-    await retryWithBackoff(() => page.goto(`https://www.tiktok.com/@${username}`, {
-      waitUntil: 'load', timeout: 30000,
-    }), { log });
-    assertPageUrl(page, `@${username}`);
+    await retryWithBackoff(async () => {
+      await page.goto(`https://www.tiktok.com/@${username}`, {
+        waitUntil: 'load', timeout: 30000,
+      });
+      assertPageUrl(page, `@${username}`);
+    }, { log });
     await page.waitForSelector('[class*="DivVideoList"]', { timeout: 10000 }).catch(() => {});
     await delay(1000, 2000);
 
@@ -101,6 +104,12 @@ async function processUser(page, username, options, log) {
       }
     }
 
+    const captcha = await detectCaptcha(page);
+    if (captcha && captcha.visible) {
+      log(`[验证码] @${username} 页面出现验证码`);
+      result.captchaDetected = true;
+    }
+
     const videos = await collectVideos(page, username, collectMax, log);
     const videoList = Array.from(videos.values()).slice(0, collectMax);
     result.collectedVideos = videoList.map(v => ({

package/src/scraper/explore-core.mjs

@@ -8,11 +8,12 @@ import {
   isLoggedIn,
   assertPageUrl,
 } from './modules/page-helpers.mjs';
+import { detectCaptcha } from './modules/captcha-handler.mjs';
 export { ensureBrowserReady };
 import {
   getUserInfo,
   collectVideos,
-} from '../videos/core.mjs';
+} from '../videos/core.mjs';
 import { scrapeSingleVideo } from './core.mjs';
 import { extractFollowAndFollowers } from './modules/follow-extractor.mjs';
 import { extractCommentAuthors } from './modules/comment-extractor.mjs';
@@ -47,8 +48,10 @@ async function processExplore(page, username, options, log) {
   try {
     log(`  访问 @${username} 主页...`);
     const homeUrl = `https://www.tiktok.com/@${username}`;
-    await retryWithBackoff(() => page.goto(homeUrl, { waitUntil: 'domcontentloaded', timeout: 30000 }), { log });
-    assertPageUrl(page, `@${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 delay(1000, 2000);
 
@@ -59,6 +62,12 @@ async function processExplore(page, username, options, log) {
       log(`  用户: ${info.nickname || username} | 粉丝: ${info.followerCount || '-'} | 视频: ${info.videoCount || '-'}`);
     }
 
+    const captcha = await detectCaptcha(page);
+    if (captcha && captcha.visible) {
+      log(`[验证码] @${username} 页面出现验证码`);
+      result.captchaDetected = true;
+    }
+
     const videoList = await collectVideos(page, username, 1, log);
     const videoArray = videoList ? [...videoList.values()] : [];
     result.collectedVideos = videoArray.length;

package/src/watch/data-store.mjs

@@ -10,6 +10,7 @@ function inferStatus(u) {
 
 export function createStore(filePath) {
   let data = [];
+  let clientErrors = new Map();
 
   let backupTimer = null;
 
@@ -248,10 +249,25 @@ export function createStore(filePath) {
     return { saved: true, pinned: user.pinned };
   }
 
+  function reportClientError(userId, errorType, errorMessage, username) {
+    clientErrors.set(userId, {
+      userId,
+      errorType,
+      errorMessage,
+      username,
+      timestamp: Date.now(),
+    });
+  }
+
+  function getClientErrors() {
+    return Array.from(clientErrors.values());
+  }
+
   return {
     save, getUser, hasUser, addUser,
     getPendingUsers, getProcessedUsers, getAllUsers,
     claimNextJob, commitJob, resetJob, togglePin,
+    reportClientError, getClientErrors,
     stopBackup,
     data,
   };

package/src/watch/public/index.html

@@ -95,6 +95,19 @@
   ::-webkit-scrollbar { width: 6px; }
   ::-webkit-scrollbar-track { background: #1a1a24; }
   ::-webkit-scrollbar-thumb { background: #333; border-radius: 3px; }
+  .client-errors-section { margin-bottom: 16px; }
+  .section-header { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
+  .section-header h3 { font-size: 14px; color: #e0e0e0; }
+  .error-badge { background: #991b1b; color: #fff; font-size: 11px; padding: 2px 8px; border-radius: 10px; font-weight: 600; }
+  .client-errors-table { width: 100%; border-collapse: collapse; background: #1a1a24; border-radius: 8px; overflow: hidden; font-size: 13px; }
+  .client-errors-table thead tr { background: #22222e; }
+  .client-errors-table th { padding: 10px 12px; text-align: left; color: #888; font-weight: 600; font-size: 12px; border-bottom: 1px solid #2a2a3a; }
+  .client-errors-table td { padding: 8px 12px; border-bottom: 1px solid #1f1f2e; }
+  .client-errors-table tbody tr:last-child td { border-bottom: none; }
+  .client-errors-table tbody tr:hover { background: #22222e; }
+  .error-type-captcha { color: #f59e0b; }
+  .error-type-network { color: #f87171; }
+  .error-type-other { color: #a78bfa; }
   @media (max-width: 768px) {
     body { padding: 8px; }
     .header { flex-direction: column; gap: 6px; align-items: flex-start; }
@@ -108,6 +121,7 @@
     .controls { flex-wrap: wrap; gap: 6px; }
     .controls input { flex: 0 0 100%; width: 100%; }
     .controls button { flex: 0 0 calc(33.33% - 4px); min-width: 0; text-align: center; white-space: nowrap; font-size: 11px; padding: 8px 4px; }
+    #batchResetBtn { flex: 0 0 100% !important; font-size: 12px !important; padding: 8px 12px !important; }
     .controls select { flex: 0 0 100%; width: 100%; }
     .table-scroll { max-height: none; overflow: visible; }
     table, thead, tbody, th, td, tr { display: block; }
@@ -144,6 +158,23 @@
   <div class="stat-card"><div class="label">受限</div><div class="value error" id="statRestricted">0</div></div>
   <div class="stat-card clickable" id="statTargetCard"><div class="label">目标用户(ES商家)</div><div class="value target" id="statTarget">0</div></div>
 </div>
+<div class="client-errors-section" id="clientErrorsSection" style="display:none">
+  <div class="section-header">
+    <h3>客户端异常</h3>
+    <span class="error-badge" id="clientErrorsBadge">0</span>
+  </div>
+  <table class="client-errors-table">
+    <thead>
+      <tr>
+        <th>客户端</th>
+        <th>错误类型</th>
+        <th>当时处理的 TikTok 用户</th>
+        <th>时间</th>
+      </tr>
+    </thead>
+    <tbody id="clientErrorsBody"></tbody>
+  </table>
+</div>
 <div class="charts">
   <div class="chart-box">
     <h3>国家统计</h3>
@@ -169,6 +200,7 @@
     <button data-filter="error" onclick="setFilter('error')">错误</button>
     <button data-filter="restricted" onclick="setFilter('restricted')">受限</button>
     <button data-filter="target" onclick="setFilter('target')" style="background:#7c3aed;color:#fff">目标用户</button>
+    <button id="batchResetBtn" onclick="batchResetErrors()" style="display:none;padding:6px 10px;border:1px solid #f87171;border-radius:6px;background:transparent;color:#f87171;font-size:12px;cursor:pointer;font-weight:600;transition:all 0.2s;white-space:nowrap;">&#x21bb; 批量重新处理 (<span id="batchResetCount">0</span>)</button>
     <select id="locationFilter" onchange="onLocationChange()" style="padding:6px 10px;border:1px solid #333;border-radius:6px;background:#2a2a3a;color:#ccc;font-size:12px;cursor:pointer;outline:none;">
       <option value="">全部国家</option>
     </select>
@@ -221,6 +253,39 @@ async function fetchUsers() {
   } catch (e) {}
 }
 
+function escapeHtml(str) {
+  const div = document.createElement('div');
+  div.textContent = str;
+  return div.innerHTML;
+}
+
+async function fetchClientErrors() {
+  try {
+    const res = await fetch('/api/client-errors');
+    const data = await res.json();
+    const clients = data.clients || [];
+    const section = document.getElementById('clientErrorsSection');
+    const badge = document.getElementById('clientErrorsBadge');
+    const tbody = document.getElementById('clientErrorsBody');
+    if (clients.length === 0) {
+      section.style.display = 'none';
+      return;
+    }
+    section.style.display = '';
+    badge.textContent = clients.length;
+    const typeMap = { captcha: ['验证码', 'error-type-captcha'], network: ['网络', 'error-type-network'], other: ['其他', 'error-type-other'] };
+    tbody.innerHTML = clients.map(c => {
+      const [typeText, typeClass] = typeMap[c.errorType] || ['未知', ''];
+      return `<tr>
+        <td style="font-family:monospace;font-weight:600;color:#60a5fa">${escapeHtml(c.userId)}</td>
+        <td class="${typeClass}">${typeText}</td>
+        <td style="color:#60a5fa">@${escapeHtml(c.username || '-')}</td>
+        <td style="color:#888;font-size:12px">${new Date(c.timestamp).toLocaleTimeString()}</td>
+      </tr>`;
+    }).join('');
+  } catch (e) {}
+}
+
 function flashEl(id, value) {
   const el = document.getElementById(id);
   if (!el) return;
@@ -324,6 +389,10 @@ function renderTable(users) {
     </tr>`;
   }).join('');
 
+  const errorCount = users.filter(u => u.status === 'error').length;
+  const countEl = document.getElementById('batchResetCount');
+  if (countEl) countEl.textContent = errorCount;
+
   prevUserMap = newUserMap;
 }
 
@@ -344,6 +413,8 @@ function setFilter(f) {
   document.querySelectorAll('.controls button').forEach(b => {
     b.classList.toggle('active', b.dataset.filter === f);
   });
+  const btn = document.getElementById('batchResetBtn');
+  btn.style.display = f === 'error' ? '' : 'none';
   fetchUsers();
 }
 
@@ -548,6 +619,43 @@ async function resetJob(uniqueId) {
   }
 }
 
+async function batchResetErrors() {
+  const btn = document.getElementById('batchResetBtn');
+  const errorUsers = currentUsers.filter(u => u.status === 'error');
+  if (errorUsers.length === 0) {
+    showToast('\u6ca1\u6709\u9700\u8981\u91cd\u7f6e\u7684\u9519\u8bef\u7528\u6237', true);
+    return;
+  }
+  const userIds = errorUsers.map(u => u.uniqueId);
+  const origText = btn.innerHTML;
+  btn.disabled = true;
+  btn.style.opacity = '0.6';
+  btn.style.cursor = 'not-allowed';
+  btn.innerHTML = '&#x21bb; 处理中...';
+  try {
+    const res = await fetch('/api/jobs/batch-reset', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ userIds })
+    });
+    const data = await res.json();
+    if (data.error) {
+      showToast(data.error, true);
+      return;
+    }
+    showToast(`\u5df2\u91cd\u7f6e ${data.reset} / ${data.total} \u4e2a\u7528\u6237`);
+    fetchUsers();
+    fetchStats();
+  } catch (e) {
+    showToast('\u6279\u91cf\u91cd\u7f6e\u5931\u8d25: ' + e.message, true);
+  } finally {
+    btn.disabled = false;
+    btn.style.opacity = '1';
+    btn.style.cursor = 'pointer';
+    btn.innerHTML = origText;
+  }
+}
+
 document.getElementById('statTargetCard').addEventListener('click', async () => {
   try {
     const res = await fetch('/api/target-users');
@@ -575,8 +683,10 @@ document.getElementById('statTargetCard').addEventListener('click', async () =>
 
 fetchStats();
 fetchUsers();
-setInterval(fetchStats, 1000);
-setInterval(fetchUsers, 2000);
+fetchClientErrors();
+setInterval(fetchStats, 10000);
+setInterval(fetchUsers, 10000);
+setInterval(fetchClientErrors, 10000);
 </script>
 </body>
 </html>

package/src/watch/server.mjs

@@ -187,6 +187,22 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
         return;
       }
 
+      if (req.method === 'POST' && routePath === '/api/jobs/batch-reset') {
+        const body = await readBody(req);
+        const ids = Array.isArray(body.userIds) ? body.userIds : [];
+        if (ids.length === 0) {
+          sendJSON(res, 400, { error: 'userIds 不能为空' });
+          return;
+        }
+        let count = 0;
+        for (const uid of ids) {
+          const ret = store.resetJob(uid);
+          if (ret.saved) count++;
+        }
+        sendJSON(res, 200, { reset: count, total: ids.length });
+        return;
+      }
+
       const jobPinMatch = routePath.match(/^\/api\/job\/([^/]+)\/pin$/);
       if (req.method === 'POST' && jobPinMatch) {
         const uniqueId = jobPinMatch[1];
@@ -214,6 +230,27 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
         return;
       }
 
+      if (req.method === 'GET' && routePath === '/api/client-errors') {
+        sendJSON(res, 200, { clients: store.getClientErrors() });
+        return;
+      }
+
+      if (req.method === 'POST' && routePath === '/api/error-report') {
+        const body = await readBody(req);
+        if (body && body.userId) {
+          store.reportClientError(
+            body.userId,
+            body.errorType || 'other',
+            body.errorMessage || '',
+            body.username || ''
+          );
+          sendJSON(res, 200, { ok: true });
+        } else {
+          sendJSON(res, 400, { error: 'missing userId' });
+        }
+        return;
+      }
+
       if (req.method === 'GET' && routePath === '/api/users') {
         const all = store.getAllUsers();
         let filtered = [...all];