tt-help-cli-ycl 1.3.35 → 1.3.36

package/src/cli/auto.js

@@ -57,184 +57,209 @@ export async function handleAuto(options) {
     autoMaxFollowing,
     autoMaxFollowers,
   } = options;
+  let browser = null;
+  let shuttingDown = false;
 
-  let userId = configuredUserId;
-  if (!userId) {
-    userId = await getMacOrUuid();
-    saveUserId(userId);
-    console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
-  }
+  const shutdown = async (signal) => {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    console.error(`\n[Auto] 收到 ${signal}，正在关闭浏览器...`);
+    await browser?.close().catch(() => {});
+    console.error("[Auto] 已退出");
+    process.exit(0);
+  };
 
-  const runOptions = {
-    collectMax: autoCollectMax,
-    scrapeDepth: autoScrapeDepth,
-    maxComments: autoMaxComments,
-    maxGuess: autoMaxGuess,
-    preset: autoPreset,
-    switchMax: autoSwitchDelay,
-    commentMax: autoCommentDelay,
-    enableFollow: autoEnableFollow,
-    maxFollowing: autoMaxFollowing,
-    maxFollowers: autoMaxFollowers,
-    userId,
+  const onSigint = () => {
+    void shutdown("SIGINT");
+  };
+  const onSigterm = () => {
+    void shutdown("SIGTERM");
   };
 
-  await apiGet(`${serverUrl}/api/stats`);
+  process.once("SIGINT", onSigint);
+  process.once("SIGTERM", onSigterm);
 
-  if (autoUsernames.length > 0) {
-    const { added, skipped } = await apiPost(`${serverUrl}/api/users`, {
-      usernames: autoUsernames,
-    });
-    console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
-  }
+  try {
+    let userId = configuredUserId;
+    if (!userId) {
+      userId = await getMacOrUuid();
+      saveUserId(userId);
+      console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
+    }
 
-  console.error(`服务器: ${serverUrl}（断开会自动重连）`);
+    const runOptions = {
+      collectMax: autoCollectMax,
+      scrapeDepth: autoScrapeDepth,
+      maxComments: autoMaxComments,
+      maxGuess: autoMaxGuess,
+      preset: autoPreset,
+      switchMax: autoSwitchDelay,
+      commentMax: autoCommentDelay,
+      enableFollow: autoEnableFollow,
+      maxFollowing: autoMaxFollowing,
+      maxFollowers: autoMaxFollowers,
+      userId,
+    };
 
-  const { ensureBrowserReady, processUser } =
-    await import("../scraper/auto-core.js");
-  let browser = await ensureBrowserReady();
+    await apiGet(`${serverUrl}/api/stats`);
 
-  const page = await getOrCreatePage(browser);
+    if (autoUsernames.length > 0) {
+      const { added, skipped } = await apiPost(`${serverUrl}/api/users`, {
+        usernames: autoUsernames,
+      });
+      console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
+    }
 
-  let processedCount = 0;
-  let errorCount = 0;
-  let consecutiveNetworkErrors = 0;
-  let captchaCount = 0; // 验证码累计计数
+    console.error(`服务器: ${serverUrl}（断开会自动重连）`);
 
-  while (true) {
-    const job = await apiGet(
-      `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`,
-    );
-    if (!job.hasJob) break;
-
-    const username = job.user.uniqueId;
-    processedCount++;
-
-    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 { ensureBrowserReady, processUser } =
+      await import("../scraper/auto-core.js");
+    browser = await ensureBrowserReady();
 
-    console.error(`\n[${processedCount}] 处理 @${username}...`);
+    const page = await getOrCreatePage(browser);
 
-    const result = await processUser(
-      page,
-      username,
-      { ...runOptions, browser },
-      console.error,
-    );
+    let processedCount = 0;
+    let errorCount = 0;
+    let consecutiveNetworkErrors = 0;
+    let captchaCount = 0; // 验证码累计计数
 
-    if (result.restricted) {
-      consecutiveNetworkErrors = 0;
-      await apiPost(`${serverUrl}/api/job/${username}`, result);
-      continue;
-    }
+    while (!shuttingDown) {
+      const job = await apiGet(
+        `${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`,
+      );
+      if (!job.hasJob) break;
+
+      const username = job.user.uniqueId;
+      processedCount++;
+
+      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}...`);
 
-    if (result.error) {
-      // 浏览器关闭检测
-      if (isBrowserClosedError(new Error(result.error))) {
-        const newBrowser = await relaunchBrowser({}, 9222);
-        browser = newBrowser;
-        const newPage = await getOrCreatePage(browser);
-        Object.assign(page, newPage);
-        // 重试当前用户
-        const retryResult = await processUser(
-          page,
-          username,
-          { ...runOptions, browser },
-          console.error,
-        );
-        Object.assign(result, retryResult);
-        // 继续下方逻辑
-      } else {
-        consecutiveNetworkErrors++;
-        errorCount++;
+      const result = await processUser(
+        page,
+        username,
+        { ...runOptions, browser },
+        console.error,
+      );
+
+      if (result.restricted) {
+        consecutiveNetworkErrors = 0;
         await apiPost(`${serverUrl}/api/job/${username}`, result);
-        const errorType = consecutiveNetworkErrors > 1 ? "network" : "other";
-        await withRetry("report error", () =>
+        continue;
+      }
+
+      if (result.error) {
+        // 浏览器关闭检测
+        if (isBrowserClosedError(new Error(result.error))) {
+          const newBrowser = await relaunchBrowser({}, 9222);
+          browser = newBrowser;
+          const newPage = await getOrCreatePage(browser);
+          Object.assign(page, newPage);
+          // 重试当前用户
+          const retryResult = await processUser(
+            page,
+            username,
+            { ...runOptions, browser },
+            console.error,
+          );
+          Object.assign(result, retryResult);
+          // 继续下方逻辑
+        } else {
+          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,
+              stage: "process",
+              errorStack: result.errorStack || "",
+            }),
+          ).catch(() => {});
+          continue;
+        }
+      }
+
+      if (result.captchaDetected) {
+        captchaCount++;
+        console.error(`  [验证码] 累计 ${captchaCount} 次`);
+
+        await withRetry("report captcha", () =>
           apiPost(`${serverUrl}/api/error-report`, {
             userId,
             username,
-            errorType,
-            errorMessage: result.error,
-            stage: "process",
-            errorStack: result.errorStack || "",
+            errorType: "captcha",
+            errorMessage: result.captchaMessage || "页面出现验证码",
+            stage: result.captchaStage || "video-page",
+            errorStack: "",
           }),
         ).catch(() => {});
-        continue;
-      }
-    }
 
-    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次验证码，标记异常（auto模式暂不支持账户切换）
-      if (captchaCount >= 2) {
-        console.error(
-          `  [警告] 验证码累计 ${captchaCount} 次，建议检查账户状态`,
-        );
-        captchaCount = 0;
+        // 累计2次验证码，标记异常（auto模式暂不支持账户切换）
+        if (captchaCount >= 2) {
+          console.error(
+            `  [警告] 验证码累计 ${captchaCount} 次，建议检查账户状态`,
+          );
+          captchaCount = 0;
+        }
       }
-    }
 
-    consecutiveNetworkErrors = 0;
-
-    const guessedLocation = result.locationCreated || null;
-
-    const payload = {
-      userInfo: result.userInfo || {},
-      discoveredVideoAuthors: (result.discoveredVideoAuthors || []).map(
-        (item) =>
-          typeof item === "object" ? { ...item, guessedLocation } : item,
-      ),
-      discoveredCommentAuthors: (result.discoveredCommentAuthors || []).map(
-        (author) => ({ author, guessedLocation }),
-      ),
-      discoveredGuessAuthors: (result.discoveredGuessAuthors || []).map(
-        (author) => ({ author, guessedLocation }),
-      ),
-      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,
-      })),
-    };
-    await apiPost(`${serverUrl}/api/job/${username}`, payload);
-    console.error("  已提交");
-  }
+      consecutiveNetworkErrors = 0;
+
+      const guessedLocation = result.locationCreated || null;
 
-  const stats = await apiGet(`${serverUrl}/api/stats`);
-  console.error(`\n完成: ${processedCount} 个用户处理, ${errorCount} 个出错`);
-  console.error(
-    `  总用户: ${stats.totalUsers}, 已完成: ${stats.processedUsers}, 待处理: ${stats.pendingUsers}, 错误: ${stats.errorUsers}`,
-  );
+      const payload = {
+        userInfo: result.userInfo || {},
+        discoveredVideoAuthors: (result.discoveredVideoAuthors || []).map(
+          (item) =>
+            typeof item === "object" ? { ...item, guessedLocation } : item,
+        ),
+        discoveredCommentAuthors: (result.discoveredCommentAuthors || []).map(
+          (author) => ({ author, guessedLocation }),
+        ),
+        discoveredGuessAuthors: (result.discoveredGuessAuthors || []).map(
+          (author) => ({ author, guessedLocation }),
+        ),
+        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,
+        })),
+      };
+      await apiPost(`${serverUrl}/api/job/${username}`, payload);
+      console.error("  已提交");
+    }
 
-  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(() => {});
+  }
 }