tt-help-cli-ycl 1.3.20 → 1.3.22

package/package.json

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

package/src/cli/explore.js

@@ -3,6 +3,7 @@ import { delay, getDelayConfig, setDelayConfig } from '../scraper/modules/page-h
 import { userId as configuredUserId, saveUserId } from '../lib/constants.js';
 import { getMacOrUuid } from '../lib/mac-or-uuid.js';
 import { ensureBrowserReady as ensureBrowserReadyCDP } from '../lib/browser/cdp.js';
+import { showResourceUsage } from '../utils/index.js';
 import path from 'path';
 import os from 'os';
 
@@ -83,6 +84,16 @@ export async function handleExplore(options) {
 
   const page = await getOrCreatePage(browser);
 
+  // 全局拦截图片资源，减少内存占用和加载时间
+  await page.route("**/*", (route) => {
+    const resourceType = route.request().resourceType();
+    if (resourceType === 'image' || resourceType === 'stylesheet') {
+      route.abort();
+    } else {
+      route.continue();
+    }
+  });
+
   let processedCount = 0;
   let errorCount = 0;
   let consecutiveNetworkErrors = 0;
@@ -94,6 +105,10 @@ export async function handleExplore(options) {
     const username = job.user.uniqueId;
     processedCount++;
 
+    if (processedCount % 10 === 0) {
+      showResourceUsage();
+    }
+
     if (consecutiveNetworkErrors > 0) {
       const waitTime = consecutiveNetworkErrors <= 2
         ? 0
@@ -151,7 +166,7 @@ export async function handleExplore(options) {
       consecutiveNetworkErrors++;
       errorCount++;
       await apiPost(`${serverUrl}/api/job/${username}`, { error: result.error });
-      const errorType = consecutiveNetworkErrors > 1 ? 'network' : 'other';
+      const errorType = result.error.startsWith('被封:') ? '被封' : (consecutiveNetworkErrors > 1 ? 'network' : 'other');
       await withRetry('report error', () =>
         apiPost(`${serverUrl}/api/error-report`, {
           userId,
@@ -162,6 +177,10 @@ export async function handleExplore(options) {
           errorStack: result.errorStack || '',
         })
       ).catch(() => {});
+      if (errorType === '被封') {
+        console.error(`\n账号被封，停止处理`);
+        break;
+      }
       if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
         console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
         break;

package/src/lib/api-interceptor.js

@@ -1,4 +1,6 @@
 import { delay } from './delay.js';
+import { retryWithBackoff } from './retry.js';
+import { assertPageUrl } from './browser/page.js';
 
 /**
  * 通过拦截 TikTok 内部 API 获取用户视频列表
@@ -44,7 +46,10 @@ async function fetchUserVideosAPI(page, username, maxVideos, log) {
     log('  [API拦截] 导航到用户页，等待 /api/post/item_list/ ...');
     const t0 = Date.now();
 
-    await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 30000 });
+    await retryWithBackoff(async () => {
+      await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 30000 });
+      await assertPageUrl(page, `@${username}`);
+    }, { maxRetries: 3, baseDelay: 3000, log });
 
     const data = await Promise.race([
       apiPromise,

package/src/lib/browser/page.js

@@ -62,16 +62,26 @@ export async function withBrowserRecovery(fn, browser, page, cdpOptions, port) {
 }
 
 export async function isLoggedIn(page) {
+  // 先等客户端渲染完成：登录态元素或登录按钮，哪个先出现就停止等待
+  const loginOrLoggedInSelector = [
+    '[class*="DivProfileContainer"]',
+    '[class*="DivUserContainer"]',
+    '[class*="UserMenu"]',
+    '[class*="CurrentUserInfo"]',
+    'button:has-text("登录")',
+    'button:has-text("Log in")',
+    'button:has-text("Sign in")',
+  ].join(', ');
+
+  await page.waitForSelector(loginOrLoggedInSelector, { timeout: 10000 }).catch(() => {});
+
   return page.evaluate(() => {
-    // 已登录时会出现在个人主页区域的元素
     const hasProfileContainer = !!document.querySelector(
       '[class*="DivProfileContainer"], [class*="DivUserContainer"]'
     );
-    // 已登录时顶部导航栏有用户相关菜单
     const hasUserMenu = !!document.querySelector(
       '[class*="UserMenu"], [class*="user-menu"], [class*="CurrentUserInfo"]'
     );
-    // 有登录按钮说明未登录
     const hasLoginButton = Array.from(document.querySelectorAll('button, [role="button"]'))
       .some(el => /^(登录|Log in|Sign in)$/i.test(el.textContent.trim()));
 

package/src/lib/constants.js

@@ -15,8 +15,8 @@ let server = 'http://127.0.0.1:3001';
 let configFile = null;
 let browser = null;
 let userId = null;
-let maxFollowing = 5;
-let maxFollowers = 5;
+let maxFollowing = 50;
+let maxFollowers = 50;
 let maxVideos = 16;
 let maxComments = 10;
 

package/src/lib/page-error-detector.js

@@ -50,6 +50,7 @@ const PATTERNS = {
     "发起对话",
     "0 条评论",
   ],
+  service_error: ["出错了", "很抱歉"],
 };
 
 export async function detectPageError(page) {

package/src/scraper/explore-core.js

@@ -1,25 +1,26 @@
 import {
-  delay,
   ensureBrowserReady,
-  retryWithBackoff,
   detectPageError,
   isLoggedIn,
-  assertPageUrl,
-} from './modules/page-helpers.js';
-import { detectCaptcha } from './modules/captcha-handler.js';
+  delay,
+} from "./modules/page-helpers.js";
+import { detectCaptcha } from "./modules/captcha-handler.js";
 export { ensureBrowserReady };
-import { getUserInfo, collectVideos } from '../videos/core.js';
-import { extractFollowAndFollowers } from './modules/follow-extractor.js';
-import { extractVideoLocation } from '../lib/scrape.js';
-import { maxFollowing as globalMaxFollowing, maxFollowers as globalMaxFollowers, maxVideos as globalMaxVideos } from '../lib/constants.js';
+import { getUserInfo, collectVideos } from "../videos/core.js";
+import { extractFollowAndFollowers } from "./modules/follow-extractor.js";
+import { extractVideoLocation } from "../lib/scrape.js";
+import {
+  maxFollowing as globalMaxFollowing,
+  maxFollowers as globalMaxFollowers,
+} from "../lib/constants.js";
 
 async function processExplore(page, username, options, log) {
   const {
     maxVideos = 16,
     enableFollow = true,
-    maxFollowing = 5,
-    maxFollowers = 5,
-    location = 'PL,NL,BE,DE,FR,IT,ES,IE',
+    maxFollowing = 50,
+    maxFollowers = 50,
+    location = "PL,NL,BE,DE,FR,IT,ES,IE",
   } = options;
 
   const result = {
@@ -40,43 +41,53 @@ async function processExplore(page, username, 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 delay(1000, 2000);
-
-    log('  获取用户信息...');
+    const videoList = await collectVideos(page, username, maxVideos, 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 || "视频页出现验证码";
     }
-
-    const isSeller = result.userInfo?.ttSeller === true;
-    const effectiveMaxVideos = isSeller ? globalMaxVideos : maxVideos;
-    if (isSeller) log(`  商家用户，视频采集数: ${effectiveMaxVideos}`);
-    const videoList = await collectVideos(page, username, effectiveMaxVideos, log);
     const videoArray = videoList ? [...videoList.values()] : [];
     result.collectedVideos = videoArray.length;
 
     if (videoArray.length <= 0) {
       result.processed = true;
       result.noVideo = true;
-      const pageError = await detectPageError(page);
-      if (pageError) {
-        result.restricted = true;
-        log(`  @${username} 页面受限（${pageError}），标记跳过`);
+      const hasErrorPage = await page.waitForFunction(
+        (keywords) => {
+          const text = document.body.innerText;
+          return keywords.some(k => text.includes(k));
+        },
+        ["出错了", "很抱歉"],
+        { timeout: 5000 }
+      ).then(() => true).catch(() => false);
+
+      if (hasErrorPage) {
+        const pageError = await detectPageError(page);
+        if (pageError === 'service_error') {
+          result.error = `被封: ${username}`;
+          result.errorStack = '';
+          result.processed = false;
+          result.noVideo = false;
+          log(`  @${username} 服务异常（service_error），标记错误`);
+        } else if (pageError) {
+          result.restricted = true;
+          log(`  @${username} 页面受限（${pageError}），标记跳过`);
+        } else {
+          log(`  @${username} 没有视频，标记已处理`);
+        }
       } else {
         log(`  @${username} 没有视频，标记已处理`);
       }
@@ -87,23 +98,23 @@ async function processExplore(page, username, options, log) {
     let locationCreated = null;
     if (videoArray.length > 0) {
       const firstVideo = videoArray[0];
-      const firstVideoUrl = firstVideo.href.startsWith('http')
+      const firstVideoUrl = firstVideo.href.startsWith("http")
         ? firstVideo.href
         : `https://www.tiktok.com${firstVideo.href}`;
 
-      try {
-        locationCreated = await extractVideoLocation(firstVideoUrl);
-      } catch (e) {
-        log(`  获取视频国家失败: ${e.message}`);
-      }
+      locationCreated = await extractVideoLocation(firstVideoUrl);
     }
 
     result.locationCreated = locationCreated || null;
-    log(`  国家: ${result.locationCreated || '未知'}`);
+    log(`  国家: ${result.locationCreated || "未知"}`);
 
     // 国家筛选
-    const locationList = (location || 'ES').split(',').map(s => s.trim().toUpperCase());
-    const isTargetLocation = locationList.includes(result.locationCreated?.toUpperCase?.() || result.locationCreated);
+    const locationList = (location || "ES")
+      .split(",")
+      .map((s) => s.trim().toUpperCase());
+    const isTargetLocation = locationList.includes(
+      result.locationCreated?.toUpperCase?.() || result.locationCreated,
+    );
 
     if (isTargetLocation) {
       result.keepFollow = true;
@@ -112,23 +123,39 @@ async function processExplore(page, username, options, log) {
       // 提取关注/粉丝
       if (enableFollow) {
         const loggedIn = await isLoggedIn(page);
+        await delay(100, 1000);
         if (!loggedIn) {
-          log('  [跳过] 获取关注/粉丝：未登录，请先登录 TikTok');
+          log("  [跳过] 获取关注/粉丝：未登录，请先登录 TikTok");
           result.hasFollowData = false;
           result.discoveredFollowing = [];
           result.discoveredFollowers = [];
         } else {
           try {
-            const effectiveMaxFollowing = isSeller ? globalMaxFollowing : maxFollowing;
-            const effectiveMaxFollowers = isSeller ? globalMaxFollowers : maxFollowers;
-            if (isSeller) log(`  商家用户，关注采集: ${effectiveMaxFollowing}, 粉丝采集: ${effectiveMaxFollowers}`);
+            const isSeller = result.userInfo?.ttSeller === true;
+            const effectiveMaxFollowing = isSeller
+              ? globalMaxFollowing
+              : maxFollowing;
+            const effectiveMaxFollowers = isSeller
+              ? globalMaxFollowers
+              : maxFollowers;
+            if (isSeller)
+              log(
+                `  商家用户，关注采集: ${effectiveMaxFollowing}, 粉丝采集: ${effectiveMaxFollowers}`,
+              );
             const { following, followers } = await extractFollowAndFollowers(
-              page, { maxFollowing: effectiveMaxFollowing, maxFollowers: effectiveMaxFollowers, log }
+              page,
+              {
+                maxFollowing: effectiveMaxFollowing,
+                maxFollowers: effectiveMaxFollowers,
+                log,
+              },
             );
             result.discoveredFollowing = following || [];
             result.discoveredFollowers = followers || [];
             result.hasFollowData = true;
-            log(`  关注: ${result.discoveredFollowing.length}, 粉丝: ${result.discoveredFollowers.length}`);
+            log(
+              `  关注: ${result.discoveredFollowing.length}, 粉丝: ${result.discoveredFollowers.length}`,
+            );
           } catch (e) {
             log(`  关注/粉丝提取失败: ${e.message}`);
             result.hasFollowData = false;
@@ -152,7 +179,7 @@ async function processExplore(page, username, options, log) {
     result.processed = true;
   } catch (e) {
     result.error = e.message;
-    result.errorStack = e.stack || '';
+    result.errorStack = e.stack || "";
     log(`  [错误] ${e.message}`);
   }
 

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

@@ -26,11 +26,7 @@ async function openFollowModal(page) {
     );
   }
   await el.evaluate((el) => el.parentElement.click());
-  await page
-    .waitForSelector("[class*=DivUserListContainer]", { timeout: 5000 })
-    .catch(() => {
-      throw new Error("关注弹窗未出现 DivUserListContainer");
-    });
+  await page.waitForSelector("[class*=DivUserListContainer]", { timeout: 15000 });
   await waitForListContent(page, 1, 3000);
 }
 
@@ -45,6 +41,7 @@ async function switchToFollowersTab(page) {
     }
     throw new Error("未找到粉丝 Tab");
   });
+  await page.waitForSelector("[class*=DivUserListContainer]", { timeout: 15000 });
   await waitForListContent(page, 1, 3000);
 }
 

package/src/utils/index.js

@@ -0,0 +1,31 @@
+/**
+ * 显示当前进程的内存和 CPU 使用情况
+ *
+ * @param {Function} log - 日志函数
+ * @returns {string} 格式化的状态字符串
+ */
+export function showResourceUsage(log = console.error) {
+  const mem = process.memoryUsage();
+  const memMB = (mem.rss / 1024 / 1024).toFixed(1);
+  const heapUsedMB = (mem.heapUsed / 1024 / 1024).toFixed(1);
+  const heapTotalMB = (mem.heapTotal / 1024 / 1024).toFixed(1);
+
+  // CPU 使用率需要两次采样
+  const cpuStart = process.cpuUsage();
+  const now = new Date().toISOString().substring(11, 23);
+
+  const msg = `[${now}] 内存 RSS: ${memMB}MB | Heap: ${heapUsedMB}/${heapTotalMB}MB`;
+  log(msg);
+  return msg;
+}
+
+/**
+ * 启动周期性资源监控，每隔 intervalMs 打印一次
+ *
+ * @param {number} intervalMs - 间隔毫秒，默认 30000
+ * @param {Function} log - 日志函数
+ * @returns {NodeJS.Timeout} 定时器句柄， clearInterval 可停止
+ */
+export function startResourceMonitor(intervalMs, log) {
+  return setInterval(() => showResourceUsage(log), intervalMs);
+}

package/src/watch/data-store.js

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import { promises as fsPromises } from 'fs';
 import path from 'path';
 
 function inferStatus(u) {
@@ -37,6 +38,7 @@ export function createStore(filePath) {
 
   function markStatsDirty() {
     statsDirty = true;
+    groupsDirty = true;
   }
 
   function computeStatsInternal() {
@@ -57,6 +59,63 @@ export function createStore(filePath) {
     return statsCache;
   }
 
+  // 按 status 的分组索引，避免每次请求全量遍历
+  let statusGroups = null;
+  let groupsDirty = true;
+
+  const tier1LocSet = new Set(['PL', 'NL', 'BE']);
+  const tier2LocSet = new Set(['DE', 'FR', 'IT', 'IE', 'ES']);
+  function locationTier(u) {
+    const loc = (u.guessedLocation || '').toUpperCase();
+    if (tier1LocSet.has(loc)) return 0;
+    if (tier2LocSet.has(loc)) return 1;
+    return 2;
+  }
+
+  function sortGroup(key, arr) {
+    if (key === 'done') arr.sort((a, b) => (b.processedAt || 0) - (a.processedAt || 0));
+    else if (key === 'pending') arr.sort((a, b) => {
+      const aSeller = a.ttSeller === true && a.verified === false ? 0 : 1;
+      const bSeller = b.ttSeller === true && b.verified === false ? 0 : 1;
+      if (aSeller !== bSeller) return aSeller - bSeller;
+      const la = locationTier(a), lb = locationTier(b);
+      if (la !== lb) return la - lb;
+      return (b.followerCount || 0) - (a.followerCount || 0);
+    });
+    else arr.sort((a, b) => (b.followerCount || 0) - (a.followerCount || 0));
+    // 置顶冒泡到组首
+    const pinned = arr.filter(u => u.pinned);
+    const unpinned = arr.filter(u => !u.pinned);
+    return pinned.concat(unpinned);
+  }
+
+  function rebuildStatusGroups() {
+    statusGroups = { pending: [], processing: [], done: [], error: [], restricted: [] };
+    for (const u of data) {
+      const key = u.status || 'pending';
+      if (statusGroups[key]) statusGroups[key].push(u);
+      else statusGroups[key] = [u];
+    }
+    // done 归档单独处理
+    if (doneArchive.length > 0) {
+      statusGroups.done = statusGroups.done.concat(doneArchive);
+    }
+    // 各组内排序
+    for (const key of Object.keys(statusGroups)) {
+      statusGroups[key] = sortGroup(key, statusGroups[key]);
+    }
+    groupsDirty = false;
+  }
+
+  function getStatusGroups() {
+    if (groupsDirty) rebuildStatusGroups();
+    return statusGroups;
+  }
+
+  function markGroupsDirty() {
+    groupsDirty = true;
+  }
+
   // 视频存储（独立 JSON 文件）
   let videos = [];
   let videoFilePath = null;
@@ -138,7 +197,21 @@ export function createStore(filePath) {
     }
   }
 
-  function save() {
+  let saveTimer = null;
+  let savePending = false;
+
+  function scheduleSave() {
+    if (saveTimer) return;
+    savePending = true;
+    saveTimer = setTimeout(() => {
+      saveTimer = null;
+      savePending = false;
+      doSave();
+    }, 2000);
+    saveTimer.unref();
+  }
+
+  function doSave() {
     if (!filePath) return;
     const resolved = path.resolve(filePath);
 
@@ -167,22 +240,91 @@ export function createStore(filePath) {
 
     const json = JSON.stringify(data);
     const tmpPath = resolved + '.tmp';
-    fs.writeFileSync(tmpPath, json, 'utf-8');
-    fs.renameSync(tmpPath, resolved);
-
-    // 写 done 归档
-    if (doneArchivePath && doneArchive.length > 0) {
-      const doneJson = JSON.stringify(doneArchive);
-      const doneTmp = doneArchivePath + '.tmp';
-      fs.writeFileSync(doneTmp, doneJson, 'utf-8');
-      fs.renameSync(doneTmp, doneArchivePath);
-    }
+    fsPromises.writeFile(tmpPath, json, 'utf-8')
+      .then(() => fsPromises.rename(tmpPath, resolved))
+      .then(() => {
+        if (doneArchivePath && doneArchive.length > 0) {
+          const doneJson = JSON.stringify(doneArchive);
+          const doneTmp = doneArchivePath + '.tmp';
+          return fsPromises.writeFile(doneTmp, doneJson, 'utf-8')
+            .then(() => fsPromises.rename(doneTmp, doneArchivePath));
+        }
+      })
+      .catch(err => {
+        console.error(`[data-store] save 写入失败: ${err.message}`);
+      });
+  }
+
+  function save() {
+    scheduleSave();
   }
 
+  function flushSave() {
+    return new Promise(resolve => {
+      if (saveTimer) {
+        clearTimeout(saveTimer);
+        saveTimer = null;
+        savePending = false;
+      }
+      if (!filePath) { resolve(); return; }
+      const resolved = path.resolve(filePath);
+
+      // 将 done 用户归档到独立文件
+      if (doneArchivePath && data.length > 1000) {
+        const active = [];
+        const toArchive = [];
+        for (const u of data) {
+          if (u.status === 'done') {
+            toArchive.push(u);
+          } else {
+            active.push(u);
+          }
+        }
+        if (toArchive.length > 0) {
+          doneArchive = doneArchive.concat(toArchive);
+          data = active;
+          rebuildIndex();
+          doneUidIndex = new Map();
+          for (let i = 0; i < doneArchive.length; i++) {
+            doneUidIndex.set(doneArchive[i].uniqueId, i);
+          }
+        }
+      }
+
+      const json = JSON.stringify(data);
+      const tmpPath = resolved + '.tmp';
+      fsPromises.writeFile(tmpPath, json, 'utf-8')
+        .then(() => fsPromises.rename(tmpPath, resolved))
+        .then(() => {
+          if (doneArchivePath && doneArchive.length > 0) {
+            const doneJson = JSON.stringify(doneArchive);
+            const doneTmp = doneArchivePath + '.tmp';
+            return fsPromises.writeFile(doneTmp, doneJson, 'utf-8')
+              .then(() => fsPromises.rename(doneTmp, doneArchivePath));
+          }
+          resolve();
+        })
+        .catch(err => {
+          console.error(`[data-store] flushSave 写入失败: ${err.message}`);
+          resolve();
+        });
+    });
+  }
+
+  let videosSaveTimer = null;
+
   function saveVideos() {
     if (!videoFilePath) return;
-    const json = JSON.stringify(videos, null, 2);
-    fs.writeFileSync(videoFilePath, json, 'utf-8');
+    if (videosSaveTimer) return;
+    videosSaveTimer = setTimeout(() => {
+      videosSaveTimer = null;
+      const json = JSON.stringify(videos, null, 2);
+      fsPromises.writeFile(videoFilePath, json, 'utf-8')
+        .catch(err => {
+          console.error(`[data-store] saveVideos 写入失败: ${err.message}`);
+        });
+    }, 2000);
+    videosSaveTimer.unref();
   }
 
   function stopBackup() {
@@ -259,7 +401,7 @@ export function createStore(filePath) {
       return { uniqueId: ongoing.uniqueId, nickname: ongoing.nickname, claimedAt: ongoing.claimedAt, claimedBy: userId };
     }
 
-    // 按猜测国家梯队排序：第一梯队优先，无国家排最后
+    // 按猜测国家梯队排序
     const tier1 = new Set(['PL', 'NL', 'BE']);
     const tier2 = new Set(['DE', 'FR', 'IT', 'IE', 'ES']);
     function locationTier(u) {
@@ -269,48 +411,53 @@ export function createStore(filePath) {
       return 2;
     }
 
-    function pickFirst(sorted) {
-      return sorted.length > 0 ? sorted[0] : null;
-    }
+    // 从候选列表中按优先级取第一个：pinned > 超时回收 > seed > ttSeller > follow > other
+    function pickCandidate(candidates) {
+      let next = candidates.find(u => u.pinned);
+
+      if (!next) {
+        const expired = data.find(u =>
+          u.status === 'processing' && u.claimedAt && (now - u.claimedAt) > expireMs
+        );
+        if (expired) {
+          expired.status = 'pending';
+          markStatsDirty();
+          delete expired.claimedAt;
+          next = expired;
+        }
+      }
 
-    let next = data.find(u => u.status === 'pending' && u.pinned);
-
-    if (!next) {
-      const expired = data.find(u =>
-        u.status === 'processing' && u.claimedAt && (now - u.claimedAt) > expireMs
-      );
-      if (expired) {
-        expired.status = 'pending';
-        markStatsDirty();
-        delete expired.claimedAt;
-        next = expired;
+      if (!next) {
+        const seed = candidates.filter(u => u.sources && u.sources.includes('seed'));
+        seed.sort((a, b) => locationTier(a) - locationTier(b));
+        next = seed[0] || null;
       }
-    }
 
-    if (!next) {
-      const seed = data.filter(u => u.status === 'pending' && u.sources && u.sources.includes('seed'));
-      seed.sort((a, b) => locationTier(a) - locationTier(b));
-      next = pickFirst(seed);
-    }
+      if (!next) {
+        const ttSeller = candidates.filter(u => u.ttSeller === true && u.verified === false);
+        ttSeller.sort((a, b) => locationTier(a) - locationTier(b));
+        next = ttSeller[0] || null;
+      }
 
-    if (!next) {
-      const ttSeller = data.filter(u => u.status === 'pending' && u.ttSeller === true && u.verified === false);
-      ttSeller.sort((a, b) => locationTier(a) - locationTier(b));
-      next = pickFirst(ttSeller);
-    }
+      if (!next) {
+        const follow = candidates.filter(u => u.sources && (u.sources.includes('following') || u.sources.includes('follower')));
+        follow.sort((a, b) => locationTier(a) - locationTier(b));
+        next = follow[0] || null;
+      }
 
-    if (!next) {
-      const follow = data.filter(u => u.status === 'pending' && u.sources && (u.sources.includes('following') || u.sources.includes('follower')));
-      follow.sort((a, b) => locationTier(a) - locationTier(b));
-      next = pickFirst(follow);
-    }
+      if (!next) {
+        candidates.sort((a, b) => locationTier(a) - locationTier(b));
+        next = candidates[0] || null;
+      }
 
-    if (!next) {
-      const all = data.filter(u => u.status === 'pending');
-      all.sort((a, b) => locationTier(a) - locationTier(b));
-      next = pickFirst(all);
+      return next;
     }
 
+    // 先在有视频的 pending 用户中找；找不到再用全部 pending 用户兜底
+    const pending = data.filter(u => u.status === 'pending');
+    const hasVideo = pending.filter(u => u.videoCount > 0);
+    const next = pickCandidate(hasVideo) || pickCandidate(pending);
+
     if (next) {
       next.status = 'processing';
       markStatsDirty();
@@ -667,8 +814,9 @@ export function createStore(filePath) {
   }
 
   return {
-    save, getUser, hasUser, userExists, addUser,
+    save, flushSave, getUser, hasUser, userExists, addUser,
     getPendingUsers, getProcessedUsers, getAllUsers, getStats,
+    getStatusGroups, markGroupsDirty,
     claimNextJob, commitJob, commitNewExplore, resetJob, togglePin,
     getNextRedoJob, commitRedoJob,
     getPendingUserUpdateTasks, updateUserInfo, batchUpdateUserInfo,

package/src/watch/public/index.html

@@ -156,6 +156,7 @@
   <div class="stat-card"><div class="label">待处理</div><div class="value pending" id="statPending">0</div></div>
   <div class="stat-card"><div class="label">错误</div><div class="value error" id="statError">0</div></div>
   <div class="stat-card"><div class="label">受限</div><div class="value error" id="statRestricted">0</div></div>
+  <div class="stat-card"><div class="label">预处理任务</div><div class="value target" id="statUserUpdateTasks">0</div></div>
   <div class="stat-card clickable" id="statTargetCard"><div class="label">目标用户(EU商家)</div><div class="value target" id="statTarget">0</div></div>
 </div>
 <div class="client-errors-section" id="clientErrorsSection" style="display:none">
@@ -205,6 +206,9 @@
     <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">目标用户(EU)</button>
+    <select id="targetLocationFilter" onchange="onTargetLocationChange()" style="padding:6px 10px;border:1px solid #7c3aed;border-radius:6px;background:#2a2a3a;color:#ccc;font-size:12px;cursor:pointer;outline:none;display:none">
+      <option value="">全部目标国家</option>
+    </select>
     <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>
@@ -225,6 +229,7 @@ let currentFilter = 'all';
 let currentStats = null;
 let currentUsers = [];
 let currentLocation = '';
+let currentTargetLocation = '';
 let prevStatValues = {};
 let prevUserMap = {};
 
@@ -244,6 +249,7 @@ async function fetchUsers() {
     const params = new URLSearchParams();
     if (currentFilter === 'target') {
       params.set('target', '1');
+      if (currentTargetLocation) params.set('targetLocation', currentTargetLocation);
     } else if (currentFilter !== 'all') {
       params.set('status', currentFilter);
     }
@@ -278,7 +284,7 @@ async function fetchClientErrors() {
     }
     section.style.display = '';
     badge.textContent = clients.length;
-    const typeMap = { captcha: ['验证码', 'error-type-captcha'], network: ['网络', 'error-type-network'], other: ['其他', 'error-type-other'] };
+    const typeMap = { captcha: ['验证码', 'error-type-captcha'], network: ['网络', 'error-type-network'], other: ['其他', 'error-type-other'], '被封': ['被封', 'error-type-captcha'] };
     const stageMap = { 'video-page': '视频页', 'comment': '评论', 'follow': '关注/粉丝', 'scrape': 'scrape', 'process': '处理' };
     tbody.innerHTML = clients.map(c => {
       const [typeText, typeClass] = typeMap[c.errorType] || ['未知', ''];
@@ -332,11 +338,21 @@ function renderStats() {
   flashEl('statError', d.errorUsers);
   flashEl('statRestricted', d.restrictedUsers);
   flashEl('statTarget', d.targetUsers);
+  flashEl('statUserUpdateTasks', d.userUpdateTasks || 0);
   document.getElementById('lastUpdate').textContent = '\u66f4\u65b0\u4e8e ' + new Date().toLocaleTimeString();
   document.getElementById('fileMeta').textContent = (d.processingUsers || 0) + ' \u5904\u7406\u4e2d, ' + d.totalUsers + ' \u4e2a\u7528\u6237';
 
   renderCountryChart(d.countryStats);
   renderSourceChart(d.sourceStats);
+  renderTargetLocationFilter(d.targetCountryStats);
+}
+
+function renderTargetLocationFilter(targetCountryStats) {
+  const sel = document.getElementById('targetLocationFilter');
+  if (!sel) return;
+  const val = sel.value;
+  sel.innerHTML = '<option value="">全部目标国家</option>' +
+    (targetCountryStats || []).map(c => `<option value="${c.country}"${val === c.country ? ' selected' : ''}>${c.country} (${c.count})</option>`).join('');
 }
 
 function renderCountryChart(countries) {
@@ -440,6 +456,13 @@ function setFilter(f) {
   });
   const btn = document.getElementById('batchResetBtn');
   btn.style.display = f === 'error' ? '' : 'none';
+  const targetLocSel = document.getElementById('targetLocationFilter');
+  if (f === 'target') {
+    targetLocSel.style.display = '';
+  } else {
+    targetLocSel.style.display = 'none';
+    currentTargetLocation = '';
+  }
   fetchUsers();
 }
 
@@ -459,8 +482,16 @@ function onLocationChange() {
   fetchUsers();
 }
 
-document.getElementById('searchInput').addEventListener('input', () => {
+function onTargetLocationChange() {
+  const sel = document.getElementById('targetLocationFilter');
+  currentTargetLocation = sel.value;
   fetchUsers();
+}
+
+let searchTimer = null;
+document.getElementById('searchInput').addEventListener('input', () => {
+  if (searchTimer) clearTimeout(searchTimer);
+  searchTimer = setTimeout(fetchUsers, 300);
 });
 
 function parseUsernames(raw) {

package/src/watch/server.js

@@ -86,6 +86,72 @@ function computeStats(users) {
   };
 }
 
+function computeStatsIncremental(st) {
+  const quick = st.getStats();
+  const all = st.getAllUsers();
+  const total = all.length;
+  const statusCounts = quick.statusCounts;
+
+  const countryMap = {};
+  const sourceCounts = { seed: 0, video: 0, comment: 0, guess: 0, following: 0, follower: 0, processed: 0, restricted: 0, error: 0, noVideo: 0 };
+  let targetUsers = 0;
+  let userUpdateTasks = 0;
+  const targetCountryMap = {};
+
+  for (const u of all) {
+    // 国家统计
+    if (u.status === 'done') {
+      const loc = u.locationCreated || '未知';
+      countryMap[loc] = (countryMap[loc] || 0) + 1;
+    }
+    // 预处理任务统计（与 /api/user-update-tasks 条件一致，不做 continue 跳过）
+    const ttSellerEmpty = u.ttSeller === null || u.ttSeller === undefined || u.ttSeller === '';
+    const updateCountNotSet = u.userUpdateCount === null || u.userUpdateCount === undefined || u.userUpdateCount <= 0;
+    if (ttSellerEmpty && updateCountNotSet) userUpdateTasks++;
+
+    // 目标用户统计（按国家分组）
+    if (u.ttSeller && u.verified === false && TARGET_LOCATIONS.includes(u.locationCreated)) {
+      targetUsers++;
+      const loc = u.locationCreated;
+      targetCountryMap[loc] = (targetCountryMap[loc] || 0) + 1;
+    }
+
+    // 来源统计（restricted/error 跳过后续统计）
+    if (u.status === 'restricted') { sourceCounts.restricted++; continue; }
+    if (u.status === 'error') { sourceCounts.error++; continue; }
+    if (u.noVideo) sourceCounts.noVideo++;
+    const sources = u.sources || [];
+    if (u.status === 'done') sourceCounts.processed++;
+    if (sources.includes('video') && u.status !== 'done') sourceCounts.video++;
+    if (sources.includes('comment') && u.status !== 'done') sourceCounts.comment++;
+    if (sources.includes('guess') && u.status !== 'done') sourceCounts.guess++;
+    if (sources.includes('following') && u.status !== 'done') sourceCounts.following++;
+    if (sources.includes('follower') && u.status !== 'done') sourceCounts.follower++;
+    if (!sources.includes('video') && !sources.includes('comment') && !sources.includes('guess') &&
+        !sources.includes('following') && !sources.includes('follower') && u.status !== 'done') sourceCounts.seed++;
+  }
+  const countryStats = Object.entries(countryMap)
+    .map(([country, count]) => ({ country, count }))
+    .sort((a, b) => b.count - a.count);
+  const targetCountryStats = Object.entries(targetCountryMap)
+    .map(([country, count]) => ({ country, count }))
+    .sort((a, b) => b.count - a.count);
+
+  return {
+    totalUsers: total,
+    processedUsers: statusCounts.done,
+    pendingUsers: statusCounts.pending,
+    processingUsers: statusCounts.processing,
+    restrictedUsers: statusCounts.restricted,
+    errorUsers: statusCounts.error,
+    targetUsers,
+    userUpdateTasks,
+    targetCountryStats,
+    countryStats,
+    sourceStats: sourceCounts,
+  };
+}
+
 function readBody(req) {
   return new Promise((resolve, reject) => {
     let body = '';
@@ -279,9 +345,7 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
       }
 
       if (req.method === 'GET' && routePath === '/api/stats') {
-        const stats = computeStats(store.getAllUsers());
-        const quick = store.getStats();
-        if (quick) stats.quickStats = quick;
+        const stats = computeStatsIncremental(store);
         sendJSON(res, 200, stats);
         return;
       }
@@ -435,8 +499,37 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
 
       if (req.method === 'GET' && routePath === '/api/users') {
         const all = store.getAllUsers();
-        let filtered = [...all];
+        const limit = parseInt(params.limit) || 50;
+        const offset = parseInt(params.offset) || 0;
+
+        // 简单筛选：直接用预分组索引（已排序，免全量遍历）
+        if (!params.search && !params.target && !params.location && !params.targetLocation) {
+          const groups = store.getStatusGroups();
+          if (params.status && params.status !== 'all') {
+            // 单状态快路径：直接取已排序的组
+            const group = groups[params.status] || [];
+            const paged = group.slice(offset, offset + limit);
+            sendJSON(res, 200, { total: group.length, users: paged });
+            return;
+          }
+          // status=all 快路径：按分组顺序 early-exit（各组已排序）
+          const sOrder = { processing: 0, pending: 1, done: 2, error: 3, restricted: 4 };
+          const sortedKeys = Object.keys(groups).sort((a, b) => (sOrder[a] ?? 9) - (sOrder[b] ?? 9));
+          let totalCount = 0;
+          for (const key of sortedKeys) totalCount += groups[key].length;
+          const result = [];
+          outer: for (const key of sortedKeys) {
+            for (const u of groups[key]) {
+              result.push(u);
+              if (result.length >= offset + limit) break outer;
+            }
+          }
+          const paged = result.slice(offset, offset + limit);
+          sendJSON(res, 200, { total: totalCount, users: paged });
+          return;
+        }
 
+        let filtered = all;
         if (params.status && params.status !== 'all') {
           filtered = filtered.filter(u => u.status === params.status);
         }
@@ -455,7 +548,13 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
         if (params.location) {
           filtered = filtered.filter(u => u.locationCreated === params.location);
         }
+        if (params.targetLocation) {
+          filtered = filtered.filter(u =>
+            u.ttSeller && u.verified === false && u.locationCreated === params.targetLocation
+          );
+        }
 
+        const needCount = offset + limit;
         const statusOrder = { processing: 0, pending: 1, done: 2, error: 3, restricted: 4 };
         const tier1Loc = new Set(['PL', 'NL', 'BE']);
         const tier2Loc = new Set(['DE', 'FR', 'IT', 'IE', 'ES']);
@@ -465,29 +564,60 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
           if (tier2Loc.has(loc)) return 1;
           return 2;
         }
-        filtered.sort((a, b) => {
-          // 置顶优先
-          if (a.pinned && !b.pinned) return -1;
-          if (!a.pinned && b.pinned) return 1;
-          const sa = statusOrder[a.status] ?? 9;
-          const sb = statusOrder[b.status] ?? 9;
-          if (sa !== sb) return sa - sb;
-          if (a.status === 'done' && b.status === 'done') return (b.processedAt || 0) - (a.processedAt || 0);
-          if (a.status === 'pending' && b.status === 'pending') {
-            const aSeller = a.ttSeller === true && a.verified === false ? 0 : 1;
-            const bSeller = b.ttSeller === true && b.verified === false ? 0 : 1;
-            if (aSeller !== bSeller) return aSeller - bSeller;
-            const la = locationTier(a), lb = locationTier(b);
-            if (la !== lb) return la - lb;
+
+        let sorted;
+        if (filtered.length > needCount * 3) {
+          const groups = {};
+          for (const u of filtered) {
+            const key = u.status || 'pending';
+            if (!groups[key]) groups[key] = [];
+            groups[key].push(u);
+          }
+          const sortedKeys = Object.keys(groups).sort((a, b) => (statusOrder[a] ?? 9) - (statusOrder[b] ?? 9));
+          for (const key of sortedKeys) {
+            const g = groups[key];
+            if (key === 'done') g.sort((a, b) => (b.processedAt || 0) - (a.processedAt || 0));
+            else if (key === 'pending') g.sort((a, b) => {
+              const aSeller = a.ttSeller === true && a.verified === false ? 0 : 1;
+              const bSeller = b.ttSeller === true && b.verified === false ? 0 : 1;
+              if (aSeller !== bSeller) return aSeller - bSeller;
+              const la = locationTier(a), lb = locationTier(b);
+              if (la !== lb) return la - lb;
+              return (b.followerCount || 0) - (a.followerCount || 0);
+            });
+            else g.sort((a, b) => (b.followerCount || 0) - (a.followerCount || 0));
+            const pinned = g.filter(u => u.pinned);
+            const unpinned = g.filter(u => !u.pinned);
+            groups[key] = pinned.concat(unpinned);
           }
-          return (b.followerCount || 0) - (a.followerCount || 0);
-        });
+          sorted = [];
+          outer: for (const key of sortedKeys) {
+            for (const u of groups[key]) {
+              sorted.push(u);
+              if (sorted.length >= needCount) break outer;
+            }
+          }
+        } else {
+          sorted = filtered.slice().sort((a, b) => {
+            if (a.pinned && !b.pinned) return -1;
+            if (!a.pinned && b.pinned) return 1;
+            const sa = statusOrder[a.status] ?? 9;
+            const sb = statusOrder[b.status] ?? 9;
+            if (sa !== sb) return sa - sb;
+            if (a.status === 'done' && b.status === 'done') return (b.processedAt || 0) - (a.processedAt || 0);
+            if (a.status === 'pending' && b.status === 'pending') {
+              const aSeller = a.ttSeller === true && a.verified === false ? 0 : 1;
+              const bSeller = b.ttSeller === true && b.verified === false ? 0 : 1;
+              if (aSeller !== bSeller) return aSeller - bSeller;
+              const la = locationTier(a), lb = locationTier(b);
+              if (la !== lb) return la - lb;
+            }
+            return (b.followerCount || 0) - (a.followerCount || 0);
+          });
+        }
 
-        const limit = parseInt(params.limit) || 50;
-        const offset = parseInt(params.offset) || 0;
-        let paged = filtered.slice(offset, offset + limit);
+        let paged = sorted.slice(offset, offset + limit);
 
-        // 字段裁剪：轻量视图只返回必要字段
         if (params.view === 'light') {
           paged = paged.map(u => ({
             uniqueId: u.uniqueId,
@@ -553,6 +683,19 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
       console.error(`  局域网访问: http://${localIP}:${port}`);
       _resolve({ server, port });
     });
+
+    async function gracefulShutdown(signal) {
+      console.error(`\n[server] 收到 ${signal}，正在保存数据...`);
+      server.close(() => {
+        console.error('[server] HTTP 服务已关闭');
+      });
+      await store.flushSave();
+      console.error('[server] 数据已保存，退出');
+      process.exit(0);
+    }
+
+    process.on('SIGINT', () => gracefulShutdown('SIGINT'));
+    process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
   });
 }