tt-help-cli-ycl 1.3.12 → 1.3.14

package/src/cli/auto.js

@@ -1,157 +1,186 @@
-import { getOrCreatePage } from '../lib/browser/page.js';
-import { userId as configuredUserId, saveUserId } from '../lib/constants.js';
-import { getMacOrUuid } from '../lib/mac-or-uuid.js';
-
-const MAX_RETRY_WAIT = 5 * 60 * 1000;
-
-async function withRetry(label, fn) {
-  let backoff = 1000;
-  while (true) {
-    try {
-      return await fn();
-    } catch (err) {
-      console.error(`[连接] ${label} 失败: ${err.message}，${backoff / 1000}秒后重试...`);
-      await new Promise(r => setTimeout(r, backoff));
-      if (backoff < MAX_RETRY_WAIT) backoff *= 2;
-    }
-  }
-}
-
-async function apiPost(url, body) {
-  return withRetry(`POST ${url}`, async () => {
-    const res = await fetch(url, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-    });
-    return res.json();
-  });
-}
-
-async function apiGet(url) {
-  return withRetry(`GET ${url}`, async () => {
-    const res = await fetch(url);
-    return res.json();
-  });
-}
-
-export async function handleAuto(options) {
-  const { autoUsernames, autoCollectMax, autoScrapeDepth, autoMaxComments, autoMaxGuess,
-    autoPreset, autoSwitchDelay, autoCommentDelay, serverUrl,
-    autoEnableFollow, autoMaxFollowing, autoMaxFollowers } = options;
-
-  let userId = configuredUserId;
-  if (!userId) {
-    userId = await getMacOrUuid();
-    saveUserId(userId);
-    console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
-  }
-
-  const runOptions = {
-    collectMax: autoCollectMax,
-    scrapeDepth: autoScrapeDepth,
-    maxComments: autoMaxComments,
-    maxGuess: autoMaxGuess,
-    preset: autoPreset,
-    switchMax: autoSwitchDelay,
-    commentMax: autoCommentDelay,
-    enableFollow: autoEnableFollow,
-    maxFollowing: autoMaxFollowing,
-    maxFollowers: autoMaxFollowers,
-    userId,
-  };
-
-  await apiGet(`${serverUrl}/api/stats`);
-
-  if (autoUsernames.length > 0) {
-    const { added, skipped } = await apiPost(`${serverUrl}/api/users`, { usernames: autoUsernames });
-    console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
-  }
-
-  console.error(`服务器: ${serverUrl}（断开会自动重连）`);
-
-  const { ensureBrowserReady, processUser } = await import('../scraper/auto-core.js');
-  const browser = await ensureBrowserReady();
-
-  const page = await getOrCreatePage(browser);
-
-  let processedCount = 0;
-  let errorCount = 0;
-  let consecutiveNetworkErrors = 0;
-
-  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));
-      }
-    }
-
-    console.error(`\n[${processedCount}] 处理 @${username}...`);
-
-    const result = await processUser(page, username, { ...runOptions, browser }, console.error);
-
-    if (result.restricted) {
-      consecutiveNetworkErrors = 0;
-      await apiPost(`${serverUrl}/api/job/${username}`, result);
-      continue;
-    }
-
-    if (result.error) {
-      consecutiveNetworkErrors++;
-      errorCount++;
-      await apiPost(`${serverUrl}/api/job/${username}`, result);
-      const errorType = consecutiveNetworkErrors > 1 ? 'network' : 'other';
-      await withRetry('report error', () =>
-        apiPost(`${serverUrl}/api/error-report`, {
-          userId,
-          username,
-          errorType,
-          errorMessage: result.error,
-        })
-      ).catch(() => {});
-      continue;
-    }
-
-    if (result.captchaDetected) {
-      await withRetry('report captcha', () =>
-        apiPost(`${serverUrl}/api/error-report`, {
-          userId,
-          username,
-          errorType: 'captcha',
-          errorMessage: '页面出现验证码',
-        })
-      ).catch(() => {});
-    }
-
-    consecutiveNetworkErrors = 0;
-
-    const payload = {
-      userInfo: result.userInfo || {},
-      discoveredVideoAuthors: result.discoveredVideoAuthors || [],
-      discoveredCommentAuthors: result.discoveredCommentAuthors || [],
-      discoveredGuessAuthors: result.discoveredGuessAuthors || [],
-      discoveredFollowing: result.discoveredFollowing || [],
-      discoveredFollowers: result.discoveredFollowers || [],
-    };
-    await apiPost(`${serverUrl}/api/job/${username}`, payload);
-    console.error('  已提交');
-  }
-
-  const stats = await apiGet(`${serverUrl}/api/stats`);
-  console.error(`\n完成: ${processedCount} 个用户处理, ${errorCount} 个出错`);
-  console.error(`  总用户: ${stats.totalUsers}, 已完成: ${stats.processedUsers}, 待处理: ${stats.pendingUsers}, 错误: ${stats.errorUsers}`);
-
-  await browser.close().catch(() => {});
-}
+import { getOrCreatePage, isBrowserClosedError, relaunchBrowser } from '../lib/browser/page.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';
+
+const MAX_RETRY_WAIT = 5 * 60 * 1000;
+
+async function withRetry(label, fn) {
+  let backoff = 1000;
+  while (true) {
+    try {
+      return await fn();
+    } catch (err) {
+      console.error(`[连接] ${label} 失败: ${err.message}，${backoff / 1000}秒后重试...`);
+      await new Promise(r => setTimeout(r, backoff));
+      if (backoff < MAX_RETRY_WAIT) backoff *= 2;
+    }
+  }
+}
+
+async function apiPost(url, body) {
+  return withRetry(`POST ${url}`, async () => {
+    const res = await fetch(url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    });
+    return res.json();
+  });
+}
+
+async function apiGet(url) {
+  return withRetry(`GET ${url}`, async () => {
+    const res = await fetch(url);
+    return res.json();
+  });
+}
+
+export async function handleAuto(options) {
+  const { autoUsernames, autoCollectMax, autoScrapeDepth, autoMaxComments, autoMaxGuess,
+    autoPreset, autoSwitchDelay, autoCommentDelay, serverUrl,
+    autoEnableFollow, autoMaxFollowing, autoMaxFollowers } = options;
+
+  let userId = configuredUserId;
+  if (!userId) {
+    userId = await getMacOrUuid();
+    saveUserId(userId);
+    console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
+  }
+
+  const runOptions = {
+    collectMax: autoCollectMax,
+    scrapeDepth: autoScrapeDepth,
+    maxComments: autoMaxComments,
+    maxGuess: autoMaxGuess,
+    preset: autoPreset,
+    switchMax: autoSwitchDelay,
+    commentMax: autoCommentDelay,
+    enableFollow: autoEnableFollow,
+    maxFollowing: autoMaxFollowing,
+    maxFollowers: autoMaxFollowers,
+    userId,
+  };
+
+  await apiGet(`${serverUrl}/api/stats`);
+
+  if (autoUsernames.length > 0) {
+    const { added, skipped } = await apiPost(`${serverUrl}/api/users`, { usernames: autoUsernames });
+    console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
+  }
+
+  console.error(`服务器: ${serverUrl}（断开会自动重连）`);
+
+  const { ensureBrowserReady, processUser } = await import('../scraper/auto-core.js');
+  let browser = await ensureBrowserReady();
+
+  const page = await getOrCreatePage(browser);
+
+  let processedCount = 0;
+  let errorCount = 0;
+  let consecutiveNetworkErrors = 0;
+
+  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));
+      }
+    }
+
+    console.error(`\n[${processedCount}] 处理 @${username}...`);
+
+    const result = await processUser(page, username, { ...runOptions, browser }, console.error);
+
+    if (result.restricted) {
+      consecutiveNetworkErrors = 0;
+      await apiPost(`${serverUrl}/api/job/${username}`, result);
+      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) {
+      await withRetry('report captcha', () =>
+        apiPost(`${serverUrl}/api/error-report`, {
+          userId,
+          username,
+          errorType: 'captcha',
+          errorMessage: result.captchaMessage || '页面出现验证码',
+          stage: result.captchaStage || 'video-page',
+          errorStack: '',
+        })
+      ).catch(() => {});
+    }
+
+    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('  已提交');
+  }
+
+  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(() => {});
+}

package/src/cli/config.js

@@ -1,4 +1,4 @@
-import { HELP_TEXT, configPath, saveBrowser, saveUserId, getConfigText } from '../lib/constants.js';
+import { HELP_TEXT, configPath, saveBrowser, saveUserId, saveMaxFollowing, saveMaxFollowers, saveMaxVideos, saveMaxComments, getConfigText } from '../lib/constants.js';
 import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
@@ -34,7 +34,7 @@ function handleConfig(action, key, value) {
     case 'set': {
       if (!key) {
         console.error('用法: tt-help config set <key> <value>');
-        console.error('  可用 key: proxy, server, browser, userId');
+        console.error('  可用 key: proxy, server, browser, userId, maxFollowing, maxFollowers, maxVideos, maxComments');
         return;
       }
 
@@ -78,9 +78,45 @@ function handleConfig(action, key, value) {
           console.error(`用户号已更新: ${value}`);
           break;
 
+        case 'maxFollowing':
+          if (!value) {
+            console.error('请提供 maxFollowing 的值');
+            return;
+          }
+          saveMaxFollowing(value);
+          console.error(`商家关注采集数已更新: ${value}`);
+          break;
+
+        case 'maxFollowers':
+          if (!value) {
+            console.error('请提供 maxFollowers 的值');
+            return;
+          }
+          saveMaxFollowers(value);
+          console.error(`粉丝采集数已更新: ${value}`);
+          break;
+
+        case 'maxVideos':
+          if (!value) {
+            console.error('请提供 maxVideos 的值');
+            return;
+          }
+          saveMaxVideos(value);
+          console.error(`视频采集数已更新: ${value}`);
+          break;
+
+        case 'maxComments':
+          if (!value) {
+            console.error('请提供 maxComments 的值');
+            return;
+          }
+          saveMaxComments(value);
+          console.error(`评论采集数已更新: ${value}`);
+          break;
+
         default:
           console.error(`未知配置项: ${key}`);
-          console.error('  可用 key: proxy, server, browser, userId');
+          console.error('  可用 key: proxy, server, browser, userId, maxFollowing, maxFollowers, maxVideos, maxComments');
       }
       break;
     }