tt-help-cli-ycl 1.3.35 → 1.3.36

package/src/cli/explore.js

@@ -79,87 +79,100 @@ export async function handleExplore(options) {
   } = options;
 
   let userId = exploreUserId || configuredUserId;
-  if (!userId) {
-    userId = await getMacOrUuid();
-    saveUserId(userId);
-    console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
-  }
+  let browser = null;
+  let shuttingDown = false;
+
+  const shutdown = async (signal) => {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    console.error(`\n[Explore] 收到 ${signal}，正在关闭浏览器...`);
+    await browser?.close().catch(() => {});
+    console.error("[Explore] 已退出");
+    process.exit(0);
+  };
+
+  const onSigint = () => {
+    void shutdown("SIGINT");
+  };
+  const onSigterm = () => {
+    void shutdown("SIGTERM");
+  };
+
+  process.once("SIGINT", onSigint);
+  process.once("SIGTERM", onSigterm);
+
+  try {
+    if (!userId) {
+      userId = await getMacOrUuid();
+      saveUserId(userId);
+      console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
+    }
 
-  setDelayConfig(explorePreset);
+    setDelayConfig(explorePreset);
 
-  await apiGet(`${serverUrl}/api/stats`);
+    await apiGet(`${serverUrl}/api/stats`);
 
-  if (exploreUsernames && exploreUsernames.length > 0) {
-    const { added, skipped } = await apiPost(`${serverUrl}/api/users`, {
-      usernames: exploreUsernames,
-    });
-    console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
-  }
+    if (exploreUsernames && exploreUsernames.length > 0) {
+      const { added, skipped } = await apiPost(`${serverUrl}/api/users`, {
+        usernames: exploreUsernames,
+      });
+      console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
+    }
 
-  console.error(`\n国家筛选: ${exploreLocation}`);
-  if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
-  console.error(`视频采集: ${exploreMaxVideos || 1}`);
-  console.error(`关注/粉丝: ${exploreEnableFollow ? "启用" : "禁用"}`);
-  console.error(`服务器: ${serverUrl}（断开会自动重连）`);
-  if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);
+    console.error(`\n国家筛选: ${exploreLocation}`);
+    if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
+    console.error(`视频采集: ${exploreMaxVideos || 1}`);
+    console.error(`关注/粉丝: ${exploreEnableFollow ? "启用" : "禁用"}`);
+    console.error(`服务器: ${serverUrl}（断开会自动重连）`);
+    if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);
 
-  const healthChecker = new HealthChecker({
-    basePort: exploreBasePort,
-    totalAccounts: explorePortCount,
-  });
-  let currentAccount = healthChecker.getCurrentAccount();
-
-  const cdpOptions = {};
-  if (explorePort) {
-    // 固定端口模式（调试用，关闭自动轮换）
-    cdpOptions.port = explorePort;
-    cdpOptions.userDataDir = path.join(
-      os.homedir(),
-      "Library",
-      "Application Support",
-      `Microsoft Edge For Testing_p${explorePort}`,
-    );
-  } else {
-    cdpOptions.port = currentAccount.port;
-    cdpOptions.userDataDir = currentAccount.userDataDir;
-  }
-
-  console.error(`CDP 端口: ${cdpOptions.port}, 用户编号: ${userId}`);
-  console.error(`浏览器配置: ${path.basename(cdpOptions.userDataDir)}`);
-  if (!explorePort) {
-    const portRange = `${currentAccount.port}-${currentAccount.port + healthChecker.accounts.length - 1}`;
-    console.error(
-      `端口轮换范围: ${portRange}（共 ${healthChecker.accounts.length} 个）`,
-    );
-  }
+    const healthChecker = new HealthChecker({
+      basePort: exploreBasePort,
+      totalAccounts: explorePortCount,
+    });
+    let currentAccount = healthChecker.getCurrentAccount();
+
+    const cdpOptions = {};
+    if (explorePort) {
+      // 固定端口模式（调试用，关闭自动轮换）
+      cdpOptions.port = explorePort;
+      cdpOptions.userDataDir = path.join(
+        os.homedir(),
+        "Library",
+        "Application Support",
+        `Microsoft Edge For Testing_p${explorePort}`,
+      );
+    } else {
+      cdpOptions.port = currentAccount.port;
+      cdpOptions.userDataDir = currentAccount.userDataDir;
+    }
 
-  let browser = await ensureBrowserReadyCDP(cdpOptions);
-  const { processExplore } = await import("../scraper/explore-core.js");
-  const { isLoggedIn } = await import("../lib/browser/page.js");
+    console.error(`CDP 端口: ${cdpOptions.port}, 用户编号: ${userId}`);
+    console.error(`浏览器配置: ${path.basename(cdpOptions.userDataDir)}`);
+    if (!explorePort) {
+      const portRange = `${currentAccount.port}-${currentAccount.port + healthChecker.accounts.length - 1}`;
+      console.error(
+        `端口轮换范围: ${portRange}（共 ${healthChecker.accounts.length} 个）`,
+      );
+    }
 
-  const page = await getOrCreatePage(browser);
+    browser = await ensureBrowserReadyCDP(cdpOptions);
+    const { processExplore } = await import("../scraper/explore-core.js");
+    const { isLoggedIn } = await import("../lib/browser/page.js");
 
-  // 先导航到 TikTok 首页，再检测登录状态
-  await page.goto("https://www.tiktok.com", { waitUntil: "domcontentloaded" });
+    const page = await getOrCreatePage(browser);
 
-  // 检测登录状态（启动时只检测一次）
-  let loggedIn = await isLoggedIn(page);
-  console.error(`登录状态: ${loggedIn ? "已登录" : "未登录"}`);
+    // 先导航到 TikTok 首页，再检测登录状态
+    await page.goto("https://www.tiktok.com", {
+      waitUntil: "domcontentloaded",
+    });
 
-  // 全局拦截图片资源，减少内存占用和加载时间
-  await page.route("**/*", (route) => {
-    const resourceType = route.request().resourceType();
-    if (resourceType === "image" || resourceType === "stylesheet") {
-      route.abort();
-    } else {
-      route.continue();
-    }
-  });
+    // 检测登录状态（启动时只检测一次）
+    let loggedIn = await isLoggedIn(page);
+    console.error(`登录状态: ${loggedIn ? "已登录" : "未登录"}`);
 
-  // 账户切换后，重新初始化 page
-  async function setupNewPage(newBrowser) {
-    const newPage = await getOrCreatePage(newBrowser);
-    await newPage.route("**/*", (route) => {
+    // 全局拦截图片资源，减少内存占用和加载时间
+    await page.route("**/*", (route) => {
       const resourceType = route.request().resourceType();
       if (resourceType === "image" || resourceType === "stylesheet") {
         route.abort();
@@ -167,182 +180,169 @@ export async function handleExplore(options) {
         route.continue();
       }
     });
-    return newPage;
-  }
-
-  async function handleAccountSwitch(reason) {
-    console.error(`\n[健康检查] ${reason}，切换到下一个账户...`);
-    const oldAccount = currentAccount;
-    const nextAccount = healthChecker.getNextAccount();
-    currentAccount = nextAccount;
-    const newBrowser = await switchAccount(
-      { port: oldAccount.port, userDataDir: oldAccount.userDataDir },
-      { port: nextAccount.port, userDataDir: nextAccount.userDataDir },
-    );
-    browser = newBrowser;
-    const newPage = await setupNewPage(browser);
-    Object.assign(page, newPage);
-    Object.assign(cdpOptions, {
-      port: nextAccount.port,
-      userDataDir: nextAccount.userDataDir,
-    });
-    console.error(`[健康检查] 已切换到端口 ${nextAccount.port}`);
-    // 切换账户后先导航到 TikTok，再重新检测登录状态
-    await page.goto("https://www.tiktok.com", {
-      waitUntil: "domcontentloaded",
-    });
-    loggedIn = await isLoggedIn(page);
-    console.error(
-      `[健康检查] 新账户登录状态: ${loggedIn ? "已登录" : "未登录"}`,
-    );
-    lastFollowSuccessTime = Date.now(); // 切换账户后重置
-    captchaCount = 0; // 重置验证码计数
-    blockedCount = 0; // 重置被封计数
-    consecutiveNetworkErrors = 0; // 重置网络错误计数
-  }
-
-  let processedCount = 0;
-  let errorCount = 0;
-  let consecutiveNetworkErrors = 0;
-  let captchaCount = 0; // 验证码累计计数
-  let blockedCount = 0; // 被封累计计数
-  let lastFollowSuccessTime = Date.now(); // 最近一次成功获取关注/粉丝的时间
-  const FOLLOW_BLOCK_THRESHOLD = 10 * 60 * 1000; // 10分钟
 
-  while (true) {
-    const jobQuery = exploreJobLocations
-      ? `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&locations=${encodeURIComponent(exploreJobLocations)}&loggedIn=${loggedIn}`
-      : `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&loggedIn=${loggedIn}`;
-    const job = await apiGet(jobQuery);
-    if (!job.hasJob) break;
-
-    const username = job.user.uniqueId;
-    processedCount++;
+    // 账户切换后，重新初始化 page
+    async function setupNewPage(newBrowser) {
+      const newPage = await getOrCreatePage(newBrowser);
+      await newPage.route("**/*", (route) => {
+        const resourceType = route.request().resourceType();
+        if (resourceType === "image" || resourceType === "stylesheet") {
+          route.abort();
+        } else {
+          route.continue();
+        }
+      });
+      return newPage;
+    }
 
-    if (processedCount % 10 === 0) {
-      showResourceUsage();
+    async function handleAccountSwitch(reason) {
+      console.error(`\n[健康检查] ${reason}，切换到下一个账户...`);
+      const oldAccount = currentAccount;
+      const nextAccount = healthChecker.getNextAccount();
+      currentAccount = nextAccount;
+      const newBrowser = await switchAccount(
+        { port: oldAccount.port, userDataDir: oldAccount.userDataDir },
+        { port: nextAccount.port, userDataDir: nextAccount.userDataDir },
+      );
+      browser = newBrowser;
+      const newPage = await setupNewPage(browser);
+      Object.assign(page, newPage);
+      Object.assign(cdpOptions, {
+        port: nextAccount.port,
+        userDataDir: nextAccount.userDataDir,
+      });
+      console.error(`[健康检查] 已切换到端口 ${nextAccount.port}`);
+      // 切换账户后先导航到 TikTok，再重新检测登录状态
+      await page.goto("https://www.tiktok.com", {
+        waitUntil: "domcontentloaded",
+      });
+      loggedIn = await isLoggedIn(page);
+      console.error(
+        `[健康检查] 新账户登录状态: ${loggedIn ? "已登录" : "未登录"}`,
+      );
+      lastFollowSuccessTime = Date.now(); // 切换账户后重置
+      captchaCount = 0; // 重置验证码计数
+      blockedCount = 0; // 重置被封计数
+      consecutiveNetworkErrors = 0; // 重置网络错误计数
     }
 
-    const checkResult = healthChecker.check();
-    if (checkResult.shouldSwitch) {
-      await handleAccountSwitch(checkResult.reason);
-    } else if (checkResult.info && processedCount % 10 === 0) {
-      // 关注/粉丝封禁检测状态（仅登录状态）
-      let followStatus = "";
-      if (loggedIn && exploreEnableFollow) {
-        const followElapsed = Math.round(
-          (Date.now() - lastFollowSuccessTime) / 60000,
-        );
-        const followRemaining = Math.max(
-          0,
-          Math.round(FOLLOW_BLOCK_THRESHOLD / 60000) - followElapsed,
-        );
-        followStatus = ` | 关注/粉丝上次成功 ${followElapsed} 分钟前 | 封禁检测 ${followRemaining} 分钟后`;
+    let processedCount = 0;
+    let errorCount = 0;
+    let consecutiveNetworkErrors = 0;
+    let captchaCount = 0; // 验证码累计计数
+    let blockedCount = 0; // 被封累计计数
+    let lastFollowSuccessTime = Date.now(); // 最近一次成功获取关注/粉丝的时间
+    const FOLLOW_BLOCK_THRESHOLD = 10 * 60 * 1000; // 10分钟
+
+    while (!shuttingDown) {
+      const jobQuery = exploreJobLocations
+        ? `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&locations=${encodeURIComponent(exploreJobLocations)}&loggedIn=${loggedIn}`
+        : `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}&loggedIn=${loggedIn}`;
+      const job = await apiGet(jobQuery);
+      if (!job.hasJob) break;
+
+      const username = job.user.uniqueId;
+      processedCount++;
+
+      if (processedCount % 10 === 0) {
+        showResourceUsage();
       }
-      console.error(`\n[健康检查] ${checkResult.info}${followStatus}`);
-    }
 
-    // 切换任务前检测验证码
-    const switchCaptcha = await detectCaptcha(page);
-    if (switchCaptcha && switchCaptcha.visible) {
-      console.error(`\n[验证码] 切换任务前检测到验证码，等待3分钟...`);
-      captchaCount++;
-      console.error(`  [验证码] 累计 ${captchaCount} 次`);
+      const checkResult = healthChecker.check();
+      if (checkResult.shouldSwitch) {
+        await handleAccountSwitch(checkResult.reason);
+      } else if (checkResult.info && processedCount % 10 === 0) {
+        // 关注/粉丝封禁检测状态（仅登录状态）
+        let followStatus = "";
+        if (loggedIn && exploreEnableFollow) {
+          const followElapsed = Math.round(
+            (Date.now() - lastFollowSuccessTime) / 60000,
+          );
+          const followRemaining = Math.max(
+            0,
+            Math.round(FOLLOW_BLOCK_THRESHOLD / 60000) - followElapsed,
+          );
+          followStatus = ` | 关注/粉丝上次成功 ${followElapsed} 分钟前 | 封禁检测 ${followRemaining} 分钟后`;
+        }
+        console.error(`\n[健康检查] ${checkResult.info}${followStatus}`);
+      }
 
-      // 等待3分钟
-      await new Promise((r) => setTimeout(r, 3 * 60 * 1000));
+      // 切换任务前检测验证码
+      const switchCaptcha = await detectCaptcha(page);
+      if (switchCaptcha && switchCaptcha.visible) {
+        console.error(`\n[验证码] 切换任务前检测到验证码，等待3分钟...`);
+        captchaCount++;
+        console.error(`  [验证码] 累计 ${captchaCount} 次`);
+
+        // 等待3分钟
+        await new Promise((r) => setTimeout(r, 3 * 60 * 1000));
+
+        // 尝试关闭
+        const closeResult = await closeCaptcha(page);
+        if (closeResult.success) {
+          console.error(`  [验证码] 已关闭`);
+        } else {
+          console.error(`  [验证码] 关闭失败: ${closeResult.reason}`);
+        }
 
-      // 尝试关闭
-      const closeResult = await closeCaptcha(page);
-      if (closeResult.success) {
-        console.error(`  [验证码] 已关闭`);
-      } else {
-        console.error(`  [验证码] 关闭失败: ${closeResult.reason}`);
+        // 上报
+        await withRetry("report captcha", () =>
+          apiPost(`${serverUrl}/api/error-report`, {
+            userId,
+            username: "unknown",
+            errorType: "captcha",
+            errorMessage: "切换任务前检测到验证码",
+            stage: "between-tasks",
+            errorStack: "",
+          }),
+        ).catch(() => {});
+
+        // 累计2次切换账户
+        if (captchaCount >= 2) {
+          await handleAccountSwitch(`验证码累计 ${captchaCount} 次`);
+          captchaCount = 0;
+        }
       }
 
-      // 上报
-      await withRetry("report captcha", () =>
-        apiPost(`${serverUrl}/api/error-report`, {
-          userId,
-          username: "unknown",
-          errorType: "captcha",
-          errorMessage: "切换任务前检测到验证码",
-          stage: "between-tasks",
-          errorStack: "",
-        }),
-      ).catch(() => {});
-
-      // 累计2次切换账户
-      if (captchaCount >= 2) {
-        await handleAccountSwitch(`验证码累计 ${captchaCount} 次`);
-        captchaCount = 0;
+      // 关注/粉丝封禁检测移到健康检查中（仅登录状态下）
+      if (loggedIn && exploreEnableFollow) {
+        const followElapsed = Date.now() - lastFollowSuccessTime;
+        if (followElapsed > FOLLOW_BLOCK_THRESHOLD) {
+          const minutes = Math.round(followElapsed / 60000);
+          console.error(
+            `\n[封禁检测] 关注/粉丝功能已 ${minutes} 分钟未成功获取，切换到下一个账户...`,
+          );
+          await handleAccountSwitch(`关注/粉丝功能被封`);
+        }
       }
-    }
 
-    // 关注/粉丝封禁检测移到健康检查中（仅登录状态下）
-    if (loggedIn && exploreEnableFollow) {
-      const followElapsed = Date.now() - lastFollowSuccessTime;
-      if (followElapsed > FOLLOW_BLOCK_THRESHOLD) {
-        const minutes = Math.round(followElapsed / 60000);
-        console.error(
-          `\n[封禁检测] 关注/粉丝功能已 ${minutes} 分钟未成功获取，切换到下一个账户...`,
-        );
-        await handleAccountSwitch(`关注/粉丝功能被封`);
+      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 (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));
-      }
-    }
+      console.error(`\n[${processedCount}] 探索 @${username}...`);
 
-    console.error(`\n[${processedCount}] 探索 @${username}...`);
-
-    const { switchMax } = getDelayConfig();
-    await delay(switchMax, switchMax * 3);
-
-    let result = await processExplore(
-      page,
-      username,
-      {
-        maxVideos: exploreMaxVideos,
-        enableFollow: exploreEnableFollow,
-        loggedIn, // 传入登录状态，避免每次调用 isLoggedIn(page)
-        maxFollowing: exploreMaxFollowing,
-        maxFollowers: exploreMaxFollowers,
-        location: exploreLocation,
-        browser,
-      },
-      console.error,
-    );
+      const { switchMax } = getDelayConfig();
+      await delay(switchMax, switchMax * 3);
 
-    // 浏览器关闭检测：processExplore 内部 catch 了异常，需要从 result.error 判断
-    if (result.error && isBrowserClosedError(new Error(result.error))) {
-      const newBrowser = await relaunchBrowser(
-        cdpOptions,
-        cdpOptions.port || 9222,
-      );
-      browser = newBrowser;
-      const newPage = await setupNewPage(browser);
-      Object.assign(page, newPage);
-      // 重试当前用户
-      result = await processExplore(
+      let result = await processExplore(
         page,
         username,
         {
           maxVideos: exploreMaxVideos,
           enableFollow: exploreEnableFollow,
-          loggedIn, // 传入登录状态
+          loggedIn, // 传入登录状态，避免每次调用 isLoggedIn(page)
           maxFollowing: exploreMaxFollowing,
           maxFollowers: exploreMaxFollowers,
           location: exploreLocation,
@@ -350,139 +350,170 @@ export async function handleExplore(options) {
         },
         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;
+      // 浏览器关闭检测：processExplore 内部 catch 了异常，需要从 result.error 判断
+      if (result.error && isBrowserClosedError(new Error(result.error))) {
+        const newBrowser = await relaunchBrowser(
+          cdpOptions,
+          cdpOptions.port || 9222,
+        );
+        browser = newBrowser;
+        const newPage = await setupNewPage(browser);
+        Object.assign(page, newPage);
+        // 重试当前用户
+        result = await processExplore(
+          page,
+          username,
+          {
+            maxVideos: exploreMaxVideos,
+            enableFollow: exploreEnableFollow,
+            loggedIn, // 传入登录状态
+            maxFollowing: exploreMaxFollowing,
+            maxFollowers: exploreMaxFollowers,
+            location: exploreLocation,
+            browser,
+          },
+          console.error,
+        );
       }
-      continue;
-    }
 
-    if (result.error) {
-      consecutiveNetworkErrors++;
-      errorCount++;
-      await apiPost(`${serverUrl}/api/job/${username}`, {
-        error: result.error,
-      });
-      const errorType = result.error.startsWith("被封:")
-        ? "被封"
-        : consecutiveNetworkErrors > 1
-          ? "network"
-          : "other";
-      await withRetry("report error", () =>
-        apiPost(`${serverUrl}/api/error-report`, {
-          userId,
-          username,
-          errorType,
-          errorMessage: result.error,
-          stage: "process",
-          errorStack: result.errorStack || "",
-        }),
-      ).catch(() => {});
-      if (errorType === "被封") {
-        blockedCount++;
-        console.error(`  [被封] 累计 ${blockedCount} 次`);
-        if (blockedCount >= 3) {
-          await handleAccountSwitch(`账号被封累计 ${blockedCount} 次`);
-          blockedCount = 0;
+      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 (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
-        console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
-        break;
-      }
-      continue;
-    }
 
-    if (result.captchaDetected) {
-      captchaCount++;
-      console.error(`  [验证码] 累计 ${captchaCount} 次`);
+      if (result.error) {
+        consecutiveNetworkErrors++;
+        errorCount++;
+        await apiPost(`${serverUrl}/api/job/${username}`, {
+          error: result.error,
+        });
+        const errorType = result.error.startsWith("被封:")
+          ? "被封"
+          : consecutiveNetworkErrors > 1
+            ? "network"
+            : "other";
+        await withRetry("report error", () =>
+          apiPost(`${serverUrl}/api/error-report`, {
+            userId,
+            username,
+            errorType,
+            errorMessage: result.error,
+            stage: "process",
+            errorStack: result.errorStack || "",
+          }),
+        ).catch(() => {});
+        if (errorType === "被封") {
+          blockedCount++;
+          console.error(`  [被封] 累计 ${blockedCount} 次`);
+          if (blockedCount >= 3) {
+            await handleAccountSwitch(`账号被封累计 ${blockedCount} 次`);
+            blockedCount = 0;
+          }
+          continue;
+        }
+        if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
+          console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
+          break;
+        }
+        continue;
+      }
 
-      await withRetry("report captcha", () =>
-        apiPost(`${serverUrl}/api/error-report`, {
-          userId,
-          username,
-          errorType: "captcha",
-          errorMessage: result.captchaMessage || "页面出现验证码",
-          stage: result.captchaStage || "video-page",
-          errorStack: "",
-        }),
-      ).catch(() => {});
-
-      // 累计2次验证码，切换账户
-      if (captchaCount >= 2) {
-        await handleAccountSwitch(`验证码累计 ${captchaCount} 次`);
-        captchaCount = 0;
+      if (result.captchaDetected) {
+        captchaCount++;
+        console.error(`  [验证码] 累计 ${captchaCount} 次`);
+
+        await withRetry("report captcha", () =>
+          apiPost(`${serverUrl}/api/error-report`, {
+            userId,
+            username,
+            errorType: "captcha",
+            errorMessage: result.captchaMessage || "页面出现验证码",
+            stage: result.captchaStage || "video-page",
+            errorStack: "",
+          }),
+        ).catch(() => {});
+
+        // 累计2次验证码，切换账户
+        if (captchaCount >= 2) {
+          await handleAccountSwitch(`验证码累计 ${captchaCount} 次`);
+          captchaCount = 0;
+        }
       }
-    }
 
-    consecutiveNetworkErrors = 0;
+      consecutiveNetworkErrors = 0;
 
-    // 更新关注/粉丝成功时间（仅登录状态下）
-    if (result.hasFollowData && result.keepFollow) {
-      const totalFollows =
-        (result.discoveredFollowing || []).length +
-        (result.discoveredFollowers || []).length;
-      if (totalFollows > 0) {
-        lastFollowSuccessTime = Date.now();
+      // 更新关注/粉丝成功时间（仅登录状态下）
+      if (result.hasFollowData && result.keepFollow) {
+        const totalFollows =
+          (result.discoveredFollowing || []).length +
+          (result.discoveredFollowers || []).length;
+        if (totalFollows > 0) {
+          lastFollowSuccessTime = Date.now();
+        }
       }
-    }
 
-    const guessedLocation = result.locationCreated || null;
-
-    const payload = {
-      userInfo: result.userInfo || {},
-      discoveredFollowing: (result.discoveredFollowing || []).map((f) => ({
-        handle: Array.isArray(f) ? f[0] : f,
-        displayName: Array.isArray(f) ? f[1] : null,
-        guessedLocation,
-      })),
-      discoveredFollowers: (result.discoveredFollowers || []).map((f) => ({
-        handle: Array.isArray(f) ? f[0] : f,
-        displayName: Array.isArray(f) ? f[1] : null,
-        guessedLocation,
-      })),
-      processed: result.processed,
-      hasFollowData: result.hasFollowData,
-      keepFollow: result.keepFollow,
-      locationCreated: result.locationCreated,
-      noVideo: result.noVideo,
-      collectedVideos: result.collectedVideos,
-    };
-    await apiPost(`${serverUrl}/api/job/${username}`, payload);
-
-    // 视频登记
-    if (result.videoList && result.videoList.length > 0) {
-      const { registered, skipped } = await apiPost(`${serverUrl}/api/videos`, {
-        sourceUser: username,
-        videoList: result.videoList,
+      const guessedLocation = result.locationCreated || null;
+
+      const payload = {
+        userInfo: result.userInfo || {},
+        discoveredFollowing: (result.discoveredFollowing || []).map((f) => ({
+          handle: Array.isArray(f) ? f[0] : f,
+          displayName: Array.isArray(f) ? f[1] : null,
+          guessedLocation,
+        })),
+        discoveredFollowers: (result.discoveredFollowers || []).map((f) => ({
+          handle: Array.isArray(f) ? f[0] : f,
+          displayName: Array.isArray(f) ? f[1] : null,
+          guessedLocation,
+        })),
+        processed: result.processed,
+        hasFollowData: result.hasFollowData,
+        keepFollow: result.keepFollow,
         locationCreated: result.locationCreated,
-        ttSeller: result.userInfo?.ttSeller || false,
-      });
-      console.error(`  视频登记: ${registered} 条新增, ${skipped} 条已存在`);
-    }
+        noVideo: result.noVideo,
+        collectedVideos: result.collectedVideos,
+      };
+      await apiPost(`${serverUrl}/api/job/${username}`, payload);
+
+      // 视频登记
+      if (result.videoList && result.videoList.length > 0) {
+        const { registered, skipped } = await apiPost(
+          `${serverUrl}/api/videos`,
+          {
+            sourceUser: username,
+            videoList: result.videoList,
+            locationCreated: result.locationCreated,
+            ttSeller: result.userInfo?.ttSeller || false,
+          },
+        );
+        console.error(`  视频登记: ${registered} 条新增, ${skipped} 条已存在`);
+      }
 
-    console.error("  已提交");
+      console.error("  已提交");
 
-    if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
-      console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
-      break;
+      if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
+        console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);
+        break;
+      }
     }
-  }
-
-  const stats = await apiGet(`${serverUrl}/api/stats`);
-  console.error(`\n完成: ${processedCount} 个用户处理, ${errorCount} 个出错`);
-  console.error(
-    `  总用户: ${stats.totalUsers}, 已完成: ${stats.processedUsers}, 待处理: ${stats.pendingUsers}, 错误: ${stats.errorUsers}`,
-  );
 
-  await browser.close().catch(() => {});
+    const stats = await apiGet(`${serverUrl}/api/stats`);
+    console.error(`\n完成: ${processedCount} 个用户处理, ${errorCount} 个出错`);
+    console.error(
+      `  总用户: ${stats.totalUsers}, 已完成: ${stats.processedUsers}, 待处理: ${stats.pendingUsers}, 错误: ${stats.errorUsers}`,
+    );
+  } finally {
+    process.removeListener("SIGINT", onSigint);
+    process.removeListener("SIGTERM", onSigterm);
+    await browser?.close().catch(() => {});
+  }
 }