tt-help-cli-ycl 1.3.48 → 1.3.50

package/src/cli/refresh.js

@@ -1,288 +1,288 @@
-import {
-  getOrCreatePage,
-  isBrowserClosedError,
-  relaunchBrowser,
-} from "../lib/browser/page.js";
-import { delay, setDelayConfig } from "../scraper/modules/page-helpers.js";
-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 { processRefresh } from "../scraper/refresh-core.js";
-import path from "path";
-import os from "os";
-
-async function withRetry(fn, maxRetries = 5) {
-  for (let attempt = 1; attempt <= maxRetries; attempt++) {
-    try {
-      return await fn();
-    } catch (e) {
-      if (attempt < maxRetries) {
-        const waitTime =
-          attempt <= 2
-            ? 5000 + Math.random() * 5000
-            : attempt <= 4
-              ? 10000 + Math.random() * 10000
-              : 20000 + Math.random() * 10000;
-        console.error(
-          `  [网络] 请求失败 (${attempt}/${maxRetries})，${Math.round(waitTime / 1000)}s 后重试...`,
-        );
-        await delay(waitTime / 1000, waitTime / 1000);
-      } else {
-        throw e;
-      }
-    }
-  }
-}
-
-async function apiGet(url) {
-  const resp = await fetch(url);
-  if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${resp.statusText}`);
-  return resp.json();
-}
-
-async function apiPost(url, body) {
-  const resp = await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-  });
-  if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${resp.statusText}`);
-  return resp.json();
-}
-
-export async function handleRefresh(options) {
-  const {
-    explorePreset,
-    explorePort,
-    exploreProfile,
-    exploreUserId,
-    serverUrl,
-  } = options;
-  let browser = null;
-  let shuttingDown = false;
-
-  const shutdown = async (signal) => {
-    if (shuttingDown) return;
-    shuttingDown = true;
-    console.error(`\n[Refresh] 收到 ${signal}，正在关闭浏览器...`);
-    await browser?.close().catch(() => {});
-    console.error("[Refresh] 已退出");
-    process.exit(0);
-  };
-
-  const onSigint = () => {
-    void shutdown("SIGINT");
-  };
-  const onSigterm = () => {
-    void shutdown("SIGTERM");
-  };
-
-  process.once("SIGINT", onSigint);
-  process.once("SIGTERM", onSigterm);
-
-  try {
-    let userId = exploreUserId || configuredUserId;
-    if (!userId) {
-      userId = await getMacOrUuid();
-      saveUserId(userId);
-      console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
-    }
-
-    setDelayConfig(explorePreset);
-
-    console.error(`\n=== Refresh 模式 ===`);
-    console.error(`服务器: ${serverUrl}`);
-    console.error(`CDP 端口: ${explorePort || 9222}, 用户编号: ${userId}`);
-    if (exploreProfile) console.error(`浏览器配置: ${exploreProfile}`);
-    console.error(`刷新: 视频 100 + 关注 100 + 粉丝 100`);
-    console.error(`新用户探索: 评论 + 猜你喜欢 + 关注/粉丝`);
-
-    const cdpOptions = {};
-    if (explorePort) cdpOptions.port = explorePort;
-    if (exploreProfile) {
-      cdpOptions.userDataDir = path.join(
-        os.homedir(),
-        "Library",
-        "Application Support",
-        `Microsoft Edge For Testing_${exploreProfile}`,
-      );
-    }
-
-    browser = await ensureBrowserReadyCDP(cdpOptions);
-    const page = await getOrCreatePage(browser);
-
-    let processedCount = 0;
-    let errorCount = 0;
-    let consecutiveNetworkErrors = 0;
-
-    console.error(`\n开始循环刷新任务...\n`);
-
-    while (!shuttingDown) {
-      try {
-        const jobData = await withRetry(() =>
-          apiGet(`${serverUrl}/api/redo-job?userId=${userId}`),
-        );
-
-        if (!jobData.hasJob) {
-          console.error(`\n[空闲] 暂无 redo 任务，30s 后重试...`);
-          await delay(30000, 30000);
-          continue;
-        }
-
-        const { uniqueId, nickname } = jobData.user;
-        consecutiveNetworkErrors = 0;
-        processedCount++;
-
-        console.error(
-          `\n[${processedCount}] 刷新 @${uniqueId} (${nickname || "未知"})...`,
-        );
-
-        const result = await processRefresh(
-          page,
-          uniqueId,
-          serverUrl,
-          {
-            maxFollowing: 100,
-            maxFollowers: 100,
-            maxVideos: 100,
-          },
-          console.error,
-        );
-
-        if (result.restricted) {
-          console.error(`  @${uniqueId} 页面受限，跳过`);
-          await apiPost(`${serverUrl}/api/redo-job/${uniqueId}`, {
-            restricted: true,
-            userInfo: result.userInfo || {},
-          });
-          continue;
-        }
-
-        if (result.error) {
-          // 浏览器关闭检测
-          if (isBrowserClosedError(new Error(result.error))) {
-            const newBrowser = await relaunchBrowser(
-              cdpOptions,
-              explorePort || 9222,
-            );
-            browser = newBrowser;
-            const newPage = await getOrCreatePage(browser);
-            Object.assign(page, newPage);
-            // 重试当前用户
-            const retryResult = await processRefresh(
-              page,
-              uniqueId,
-              serverUrl,
-              {
-                maxFollowing: 100,
-                maxFollowers: 100,
-                maxVideos: 100,
-              },
-              console.error,
-            );
-            Object.assign(result, retryResult);
-            // 继续下方逻辑，检查重试后的 result
-          } else {
-            consecutiveNetworkErrors++;
-            errorCount++;
-            console.error(`  [错误] ${result.error}`);
-
-            if (consecutiveNetworkErrors >= 3) {
-              console.error(
-                `  [警告] 连续 ${consecutiveNetworkErrors} 次错误，等待 60s 后重试...`,
-              );
-              await delay(60000, 60000);
-              consecutiveNetworkErrors = 0;
-            }
-
-            await apiPost(`${serverUrl}/api/redo-job/${uniqueId}`, {
-              error: result.error,
-              userInfo: result.userInfo || {},
-            });
-            const errorType =
-              consecutiveNetworkErrors > 1 ? "network" : "other";
-            apiPost(`${serverUrl}/api/error-report`, {
-              userId,
-              username: uniqueId,
-              errorType,
-              errorMessage: result.error,
-              stage: "process",
-              errorStack: result.errorStack || "",
-            }).catch(() => {});
-            continue;
-          }
-        }
-
-        if (result.captchaDetected) {
-          await apiPost(`${serverUrl}/api/error-report`, {
-            userId,
-            username: uniqueId,
-            errorType: "captcha",
-            errorMessage: result.captchaMessage || "页面出现验证码",
-            stage: result.captchaStage || "video-page",
-            errorStack: "",
-          });
-        }
-
-        consecutiveNetworkErrors = 0;
-
-        const guessedLocation = result.locationCreated || null;
-
-        await apiPost(`${serverUrl}/api/redo-job/${uniqueId}`, {
-          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,
-          })),
-          newUsersAdded: result.newUsersAdded || 0,
-          collectedVideos: result.collectedVideos || 0,
-        });
-
-        console.error(
-          `  [完成] 视频: ${result.collectedVideos}, 评论作者: ${result.discoveredCommentAuthors?.length || 0}, 关注: ${result.discoveredFollowing?.length || 0}, 粉丝: ${result.discoveredFollowers?.length || 0}, 新增用户: ${result.newUsersAdded}`,
-        );
-
-        await delay(3000, 5000);
-      } catch (e) {
-        consecutiveNetworkErrors++;
-        errorCount++;
-        console.error(`\n[错误] ${e.message}`);
-
-        if (consecutiveNetworkErrors >= 3) {
-          console.error(
-            `[警告] 连续 ${consecutiveNetworkErrors} 次网络异常，等待 60s 后重试...`,
-          );
-          await delay(60000, 60000);
-          consecutiveNetworkErrors = 0;
-        } else {
-          const waitTime =
-            consecutiveNetworkErrors <= 2
-              ? 5000 + Math.random() * 5000
-              : 10000 + Math.random() * 10000;
-          console.error(`  等待 ${Math.round(waitTime / 1000)}s 后重试...`);
-          await delay(waitTime / 1000, waitTime / 1000);
-        }
-      }
-    }
-  } finally {
-    process.removeListener("SIGINT", onSigint);
-    process.removeListener("SIGTERM", onSigterm);
-    await browser?.close().catch(() => {});
-  }
-}
+import {
+  getOrCreatePage,
+  isBrowserClosedError,
+  relaunchBrowser,
+} from "../lib/browser/page.js";
+import { delay, setDelayConfig } from "../scraper/modules/page-helpers.js";
+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 { processRefresh } from "../scraper/refresh-core.js";
+import path from "path";
+import os from "os";
+
+async function withRetry(fn, maxRetries = 5) {
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (e) {
+      if (attempt < maxRetries) {
+        const waitTime =
+          attempt <= 2
+            ? 5000 + Math.random() * 5000
+            : attempt <= 4
+              ? 10000 + Math.random() * 10000
+              : 20000 + Math.random() * 10000;
+        console.error(
+          `  [网络] 请求失败 (${attempt}/${maxRetries})，${Math.round(waitTime / 1000)}s 后重试...`,
+        );
+        await delay(waitTime / 1000, waitTime / 1000);
+      } else {
+        throw e;
+      }
+    }
+  }
+}
+
+async function apiGet(url) {
+  const resp = await fetch(url);
+  if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${resp.statusText}`);
+  return resp.json();
+}
+
+async function apiPost(url, body) {
+  const resp = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+  });
+  if (!resp.ok) throw new Error(`HTTP ${resp.status}: ${resp.statusText}`);
+  return resp.json();
+}
+
+export async function handleRefresh(options) {
+  const {
+    explorePreset,
+    explorePort,
+    exploreProfile,
+    exploreUserId,
+    serverUrl,
+  } = options;
+  let browser = null;
+  let shuttingDown = false;
+
+  const shutdown = async (signal) => {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    console.error(`\n[Refresh] 收到 ${signal}，正在关闭浏览器...`);
+    await browser?.close().catch(() => {});
+    console.error("[Refresh] 已退出");
+    process.exit(0);
+  };
+
+  const onSigint = () => {
+    void shutdown("SIGINT");
+  };
+  const onSigterm = () => {
+    void shutdown("SIGTERM");
+  };
+
+  process.once("SIGINT", onSigint);
+  process.once("SIGTERM", onSigterm);
+
+  try {
+    let userId = exploreUserId || configuredUserId;
+    if (!userId) {
+      userId = await getMacOrUuid();
+      saveUserId(userId);
+      console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
+    }
+
+    setDelayConfig(explorePreset);
+
+    console.error(`\n=== Refresh 模式 ===`);
+    console.error(`服务器: ${serverUrl}`);
+    console.error(`CDP 端口: ${explorePort || 9222}, 用户编号: ${userId}`);
+    if (exploreProfile) console.error(`浏览器配置: ${exploreProfile}`);
+    console.error(`刷新: 视频 100 + 关注 100 + 粉丝 100`);
+    console.error(`新用户探索: 评论 + 猜你喜欢 + 关注/粉丝`);
+
+    const cdpOptions = {};
+    if (explorePort) cdpOptions.port = explorePort;
+    if (exploreProfile) {
+      cdpOptions.userDataDir = path.join(
+        os.homedir(),
+        "Library",
+        "Application Support",
+        `Microsoft Edge For Testing_${exploreProfile}`,
+      );
+    }
+
+    browser = await ensureBrowserReadyCDP(cdpOptions);
+    const page = await getOrCreatePage(browser);
+
+    let processedCount = 0;
+    let errorCount = 0;
+    let consecutiveNetworkErrors = 0;
+
+    console.error(`\n开始循环刷新任务...\n`);
+
+    while (!shuttingDown) {
+      try {
+        const jobData = await withRetry(() =>
+          apiGet(`${serverUrl}/api/redo-job?userId=${userId}`),
+        );
+
+        if (!jobData.hasJob) {
+          console.error(`\n[空闲] 暂无 redo 任务，30s 后重试...`);
+          await delay(30000, 30000);
+          continue;
+        }
+
+        const { uniqueId, nickname } = jobData.user;
+        consecutiveNetworkErrors = 0;
+        processedCount++;
+
+        console.error(
+          `\n[${processedCount}] 刷新 @${uniqueId} (${nickname || "未知"})...`,
+        );
+
+        const result = await processRefresh(
+          page,
+          uniqueId,
+          serverUrl,
+          {
+            maxFollowing: 100,
+            maxFollowers: 100,
+            maxVideos: 100,
+          },
+          console.error,
+        );
+
+        if (result.restricted) {
+          console.error(`  @${uniqueId} 页面受限，跳过`);
+          await apiPost(`${serverUrl}/api/redo-job/${uniqueId}`, {
+            restricted: true,
+            userInfo: result.userInfo || {},
+          });
+          continue;
+        }
+
+        if (result.error) {
+          // 浏览器关闭检测
+          if (isBrowserClosedError(new Error(result.error))) {
+            const newBrowser = await relaunchBrowser(
+              cdpOptions,
+              explorePort || 9222,
+            );
+            browser = newBrowser;
+            const newPage = await getOrCreatePage(browser);
+            Object.assign(page, newPage);
+            // 重试当前用户
+            const retryResult = await processRefresh(
+              page,
+              uniqueId,
+              serverUrl,
+              {
+                maxFollowing: 100,
+                maxFollowers: 100,
+                maxVideos: 100,
+              },
+              console.error,
+            );
+            Object.assign(result, retryResult);
+            // 继续下方逻辑，检查重试后的 result
+          } else {
+            consecutiveNetworkErrors++;
+            errorCount++;
+            console.error(`  [错误] ${result.error}`);
+
+            if (consecutiveNetworkErrors >= 3) {
+              console.error(
+                `  [警告] 连续 ${consecutiveNetworkErrors} 次错误，等待 60s 后重试...`,
+              );
+              await delay(60000, 60000);
+              consecutiveNetworkErrors = 0;
+            }
+
+            await apiPost(`${serverUrl}/api/redo-job/${uniqueId}`, {
+              error: result.error,
+              userInfo: result.userInfo || {},
+            });
+            const errorType =
+              consecutiveNetworkErrors > 1 ? "network" : "other";
+            apiPost(`${serverUrl}/api/error-report`, {
+              userId,
+              username: uniqueId,
+              errorType,
+              errorMessage: result.error,
+              stage: "process",
+              errorStack: result.errorStack || "",
+            }).catch(() => {});
+            continue;
+          }
+        }
+
+        if (result.captchaDetected) {
+          await apiPost(`${serverUrl}/api/error-report`, {
+            userId,
+            username: uniqueId,
+            errorType: "captcha",
+            errorMessage: result.captchaMessage || "页面出现验证码",
+            stage: result.captchaStage || "video-page",
+            errorStack: "",
+          });
+        }
+
+        consecutiveNetworkErrors = 0;
+
+        const guessedLocation = result.locationCreated || null;
+
+        await apiPost(`${serverUrl}/api/redo-job/${uniqueId}`, {
+          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,
+          })),
+          newUsersAdded: result.newUsersAdded || 0,
+          collectedVideos: result.collectedVideos || 0,
+        });
+
+        console.error(
+          `  [完成] 视频: ${result.collectedVideos}, 评论作者: ${result.discoveredCommentAuthors?.length || 0}, 关注: ${result.discoveredFollowing?.length || 0}, 粉丝: ${result.discoveredFollowers?.length || 0}, 新增用户: ${result.newUsersAdded}`,
+        );
+
+        await delay(3000, 5000);
+      } catch (e) {
+        consecutiveNetworkErrors++;
+        errorCount++;
+        console.error(`\n[错误] ${e.message}`);
+
+        if (consecutiveNetworkErrors >= 3) {
+          console.error(
+            `[警告] 连续 ${consecutiveNetworkErrors} 次网络异常，等待 60s 后重试...`,
+          );
+          await delay(60000, 60000);
+          consecutiveNetworkErrors = 0;
+        } else {
+          const waitTime =
+            consecutiveNetworkErrors <= 2
+              ? 5000 + Math.random() * 5000
+              : 10000 + Math.random() * 10000;
+          console.error(`  等待 ${Math.round(waitTime / 1000)}s 后重试...`);
+          await delay(waitTime / 1000, waitTime / 1000);
+        }
+      }
+    }
+  } finally {
+    process.removeListener("SIGINT", onSigint);
+    process.removeListener("SIGTERM", onSigterm);
+    await browser?.close().catch(() => {});
+  }
+}

package/src/cli/scrape.js

@@ -1,47 +1,47 @@
-import { writeFileSync } from 'fs';
-
-export async function handleScrape(options) {
-  const { scrapeUrl, scrapePreset, scrapeMaxVideos, scrapeMaxComments, scrapeMaxGuess, scrapeSwitchDelay, scrapeCommentDelay, outputFile } = options;
-
-  if (!scrapeUrl) {
-    console.error('用法: tt-help scrape <视频URL> [preset] [最大视频数] [最大评论数] [-o 输出路径]');
-    console.error('预设: fast, normal, slow, stealth');
-    console.error('选项: -o, --output <路径>     输出到文件（默认输出到 stdout）');
-    console.error('      --switch-delay <ms>     视频切换延迟（毫秒）');
-    console.error('      --comment-delay <ms>    评论滚动延迟（毫秒）');
-    process.exit(1);
-  }
-
-  const { runScrape } = await import('../scraper/core.js');
-
-  let browser;
-  try {
-    const { output, browser: b } = await runScrape({
-      videoUrl: scrapeUrl,
-      maxVideos: scrapeMaxVideos,
-      maxComments: scrapeMaxComments,
-      maxGuess: scrapeMaxGuess,
-      preset: scrapePreset,
-      switchMax: scrapeSwitchDelay,
-      commentMax: scrapeCommentDelay,
-      log: console.error,
-    });
-    browser = b;
-
-    const json = JSON.stringify(output, null, 2);
-    if (outputFile) {
-      writeFileSync(outputFile, json, 'utf-8');
-      console.error(`结果已写入: ${outputFile}`);
-    } else {
-      process.stdout.write(json + '\n');
-    }
-
-    const stats = output.stats;
-    console.error(`\n共 ${stats.totalVideos} 个视频, ${stats.uniqueVideoAuthors} 个视频作者, ${stats.uniqueCommentAuthors} 个评论作者, ${stats.uniqueGuessAuthors} 个猜你喜欢作者`);
-  } catch (err) {
-    console.error(`浏览器抓取失败: ${err.message}`);
-    process.exit(1);
-  } finally {
-    if (browser) await browser.close().catch(() => {});
-  }
-}
+import { writeFileSync } from 'fs';
+
+export async function handleScrape(options) {
+  const { scrapeUrl, scrapePreset, scrapeMaxVideos, scrapeMaxComments, scrapeMaxGuess, scrapeSwitchDelay, scrapeCommentDelay, outputFile } = options;
+
+  if (!scrapeUrl) {
+    console.error('用法: tt-help scrape <视频URL> [preset] [最大视频数] [最大评论数] [-o 输出路径]');
+    console.error('预设: fast, normal, slow, stealth');
+    console.error('选项: -o, --output <路径>     输出到文件（默认输出到 stdout）');
+    console.error('      --switch-delay <ms>     视频切换延迟（毫秒）');
+    console.error('      --comment-delay <ms>    评论滚动延迟（毫秒）');
+    process.exit(1);
+  }
+
+  const { runScrape } = await import('../scraper/core.js');
+
+  let browser;
+  try {
+    const { output, browser: b } = await runScrape({
+      videoUrl: scrapeUrl,
+      maxVideos: scrapeMaxVideos,
+      maxComments: scrapeMaxComments,
+      maxGuess: scrapeMaxGuess,
+      preset: scrapePreset,
+      switchMax: scrapeSwitchDelay,
+      commentMax: scrapeCommentDelay,
+      log: console.error,
+    });
+    browser = b;
+
+    const json = JSON.stringify(output, null, 2);
+    if (outputFile) {
+      writeFileSync(outputFile, json, 'utf-8');
+      console.error(`结果已写入: ${outputFile}`);
+    } else {
+      process.stdout.write(json + '\n');
+    }
+
+    const stats = output.stats;
+    console.error(`\n共 ${stats.totalVideos} 个视频, ${stats.uniqueVideoAuthors} 个视频作者, ${stats.uniqueCommentAuthors} 个评论作者, ${stats.uniqueGuessAuthors} 个猜你喜欢作者`);
+  } catch (err) {
+    console.error(`浏览器抓取失败: ${err.message}`);
+    process.exit(1);
+  } finally {
+    if (browser) await browser.close().catch(() => {});
+  }
+}