tt-help-cli-ycl 1.3.6 → 1.3.8

package/src/cli/explore.js

@@ -1,138 +1,147 @@
-import { getOrCreatePage } from '../lib/browser/page.js';
-import { delay, getDelayConfig, setDelayConfig } from '../scraper/modules/page-helpers.mjs';
-
-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 handleExplore(options) {
-  const {
-    exploreUsernames, explorePreset, exploreMaxComments, exploreMaxGuess,
-    exploreEnableFollow, exploreMaxFollowing, exploreMaxFollowers,
-    exploreLocation, exploreMaxUsers, serverUrl,
-  } = options;
-
-  setDelayConfig(explorePreset);
-
-  await apiGet(`${serverUrl}/api/stats`);
-
-  if (exploreUsernames && exploreUsernames.length > 0) {
-    const { added, skipped } = await apiPost(`${serverUrl}/api/users`, { usernames: exploreUsernames });
-    console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
-  }
-
-  console.error(`\n国家筛选: ${exploreLocation}`);
-  console.error(`评论: ${exploreMaxComments}, 猜你喜欢: ${exploreMaxGuess}`);
-  console.error(`关注/粉丝: ${exploreEnableFollow ? '启用' : '禁用'}`);
-  console.error(`服务器: ${serverUrl}（断开会自动重连）`);
-  if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);
-
-  const { ensureBrowserReady, processExplore } = await import('../scraper/explore-core.mjs');
-  const browser = await ensureBrowserReady();
-
-  const page = await getOrCreatePage(browser);
-
-  let processedCount = 0;
-  let errorCount = 0;
-
-  while (true) {
-    const job = await apiGet(`${serverUrl}/api/job`);
-    if (!job.hasJob) break;
-
-    const username = job.user.uniqueId;
-    processedCount++;
-    let proxyRetry = 0;
-
-    while (true) {
-      console.error(`\n[${processedCount}] 探索 @${username}...${proxyRetry > 0 ? ` (代理重试 ${proxyRetry})` : ''}`);
-
-      const { switchMax } = getDelayConfig();
-      await delay(switchMax, switchMax * 3);
-
-      const result = await processExplore(page, username, {
-        maxComments: exploreMaxComments,
-        maxGuess: exploreMaxGuess,
-        enableFollow: exploreEnableFollow,
-        maxFollowing: exploreMaxFollowing,
-        maxFollowers: exploreMaxFollowers,
-        location: exploreLocation,
-        browser,
-      }, console.error);
-
-      if (result.restricted) {
-        await apiPost(`${serverUrl}/api/job/${username}`, { restricted: true, userInfo: result.userInfo || {} });
-        break;
-      }
-
-      if (result.error && result.error.includes('代理错误')) {
-        proxyRetry++;
-        console.error(`  [代理错误] ${result.error}，等待 10s 后重试...`);
-        await new Promise(r => setTimeout(r, 10000));
-        continue;
-      }
-
-      if (result.error) {
-        errorCount++;
-        await apiPost(`${serverUrl}/api/job/${username}`, { error: result.error });
-        break;
-      }
-
-      const payload = {
-        userInfo: result.userInfo || {},
-        discoveredVideoAuthors: result.discoveredVideoAuthors || [],
-        discoveredCommentAuthors: result.discoveredCommentAuthors || [],
-        discoveredGuessAuthors: result.discoveredGuessAuthors || [],
-        discoveredFollowing: result.discoveredFollowing || [],
-        discoveredFollowers: result.discoveredFollowers || [],
-        processed: result.processed,
-        hasFollowData: result.hasFollowData,
-        keepFollow: result.keepFollow,
-        locationCreated: result.locationCreated,
-        noVideo: result.noVideo,
-      };
-      await apiPost(`${serverUrl}/api/job/${username}`, payload);
-      console.error('  已提交');
-      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(() => {});
-}
+import { getOrCreatePage } from '../lib/browser/page.js';
+import { delay, getDelayConfig, setDelayConfig } from '../scraper/modules/page-helpers.mjs';
+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 handleExplore(options) {
+  const {
+    exploreUsernames, explorePreset, exploreMaxComments, exploreMaxGuess,
+    exploreEnableFollow, exploreMaxFollowing, exploreMaxFollowers,
+    exploreLocation, exploreMaxUsers, serverUrl,
+  } = options;
+
+  let userId = configuredUserId;
+  if (!userId) {
+    userId = await getMacOrUuid();
+    saveUserId(userId);
+    console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
+  }
+
+  setDelayConfig(explorePreset);
+
+  await apiGet(`${serverUrl}/api/stats`);
+
+  if (exploreUsernames && exploreUsernames.length > 0) {
+    const { added, skipped } = await apiPost(`${serverUrl}/api/users`, { usernames: exploreUsernames });
+    console.error(`种子用户: ${added} 个新增, ${skipped} 个已存在`);
+  }
+
+  console.error(`\n国家筛选: ${exploreLocation}`);
+  console.error(`评论: ${exploreMaxComments}, 猜你喜欢: ${exploreMaxGuess}`);
+  console.error(`关注/粉丝: ${exploreEnableFollow ? '启用' : '禁用'}`);
+  console.error(`服务器: ${serverUrl}（断开会自动重连）`);
+  if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);
+
+  const { ensureBrowserReady, processExplore } = await import('../scraper/explore-core.mjs');
+  const browser = await ensureBrowserReady();
+
+  const page = await getOrCreatePage(browser);
+
+  let processedCount = 0;
+  let errorCount = 0;
+
+  while (true) {
+    const job = await apiGet(`${serverUrl}/api/job?userId=${encodeURIComponent(userId)}`);
+    if (!job.hasJob) break;
+
+    const username = job.user.uniqueId;
+    processedCount++;
+    let proxyRetry = 0;
+
+    while (true) {
+      console.error(`\n[${processedCount}] 探索 @${username}...${proxyRetry > 0 ? ` (代理重试 ${proxyRetry})` : ''}`);
+
+      const { switchMax } = getDelayConfig();
+      await delay(switchMax, switchMax * 3);
+
+      const result = await processExplore(page, username, {
+        maxComments: exploreMaxComments,
+        maxGuess: exploreMaxGuess,
+        enableFollow: exploreEnableFollow,
+        maxFollowing: exploreMaxFollowing,
+        maxFollowers: exploreMaxFollowers,
+        location: exploreLocation,
+        browser,
+      }, console.error);
+
+      if (result.restricted) {
+        await apiPost(`${serverUrl}/api/job/${username}`, { restricted: true, userInfo: result.userInfo || {} });
+        break;
+      }
+
+      if (result.error && result.error.includes('代理错误')) {
+        proxyRetry++;
+        console.error(`  [代理错误] ${result.error}，等待 10s 后重试...`);
+        await new Promise(r => setTimeout(r, 10000));
+        continue;
+      }
+
+      if (result.error) {
+        errorCount++;
+        await apiPost(`${serverUrl}/api/job/${username}`, { error: result.error });
+        break;
+      }
+
+      const payload = {
+        userInfo: result.userInfo || {},
+        discoveredVideoAuthors: result.discoveredVideoAuthors || [],
+        discoveredCommentAuthors: result.discoveredCommentAuthors || [],
+        discoveredGuessAuthors: result.discoveredGuessAuthors || [],
+        discoveredFollowing: result.discoveredFollowing || [],
+        discoveredFollowers: result.discoveredFollowers || [],
+        processed: result.processed,
+        hasFollowData: result.hasFollowData,
+        keepFollow: result.keepFollow,
+        locationCreated: result.locationCreated,
+        noVideo: result.noVideo,
+      };
+      await apiPost(`${serverUrl}/api/job/${username}`, payload);
+      console.error('  已提交');
+      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(() => {});
+}

package/src/cli/progress.js

@@ -1,111 +1,111 @@
-import { writeFileSync } from 'fs';
-import { formatOutput } from '../lib/output.js';
-import { deduplicate } from '../lib/output.js';
-import { applyFilter, formatFilterDescription } from '../lib/filter.js';
-import { calculateConcurrency, createMultiProgressBars, renderMultiProgressBars, clearProgressBars } from '../lib/io.js';
-import { randomDelay } from '../lib/delay.js';
-
-export async function processUrlsWithProgress({
-  urls,
-  proxyUrl,
-  outputFile,
-  outputFormat,
-  filter,
-  processFn,
-  label = '数据',
-}) {
-  const allResults = [];
-  const errors = [];
-
-  if (urls.length === 0) {
-    console.error('\n未获取到数据');
-    if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
-    return;
-  }
-
-  const concurrency = calculateConcurrency(urls.length);
-  const bars = createMultiProgressBars(concurrency);
-
-  const slots = Array.from({ length: concurrency }, () => []);
-  urls.forEach((url, i) => slots[i % concurrency].push(url));
-
-  bars.forEach((bar, i) => {
-    bar.total = slots[i].length;
-    bar.status = slots[i].length > 0 ? 'running' : 'done';
-  });
-
-  renderMultiProgressBars(bars);
-
-  const workers = slots.map(async (slotUrls, slotIndex) => {
-    for (const url of slotUrls) {
-      bars[slotIndex].url = url;
-      renderMultiProgressBars(bars);
-
-      await randomDelay();
-
-      try {
-        const results = await processFn(url, proxyUrl);
-        allResults.push(...results);
-        bars[slotIndex].current++;
-        bars[slotIndex].status = 'running';
-      } catch (err) {
-        errors.push({ url, message: err.message });
-        bars[slotIndex].current++;
-        bars[slotIndex].status = 'error';
-      }
-
-      renderMultiProgressBars(bars);
-    }
-    bars[slotIndex].status = bars[slotIndex].current === bars[slotIndex].total ? 'done' : 'error';
-    renderMultiProgressBars(bars);
-  });
-
-  await Promise.all(workers);
-  clearProgressBars();
-
-  const uniqueResults = deduplicate(allResults);
-  const filteredResults = applyFilter(uniqueResults, filter);
-
-  if (errors.length > 0) {
-    const firstMsg = errors[0].message;
-    const isProxyError = ['不可用', '连接被拒绝', '连接中断', '超时', '无法解析']
-      .some(kw => firstMsg.includes(kw));
-
-    if (filteredResults.length === 0) {
-      if (isProxyError) {
-        console.error(`  所有请求失败，请检查代理: ${proxyUrl}\n`);
-      } else {
-        const show = errors.slice(0, 5);
-        for (const e of show) console.error(`  ✗ ${e.url}: ${e.message}\n`);
-        if (errors.length > 5) console.error(`  ... 还有 ${errors.length - 5} 个失败\n`);
-      }
-      console.error('未获取到数据');
-      if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
-      return;
-    } else {
-      if (isProxyError) {
-        console.error(`  ${errors.length} 个请求失败，请检查代理: ${proxyUrl}\n`);
-      } else {
-        console.error(`  ${errors.length} 个失败:`);
-        const show = errors.slice(0, 5);
-        for (const e of show) console.error(`    ✗ ${e.url}: ${e.message}`);
-        if (errors.length > 5) console.error(`    ... 还有 ${errors.length - 5} 个`);
-      }
-    }
-  }
-
-  const output = formatOutput(filteredResults, outputFormat);
-
-  if (outputFile) {
-    writeFileSync(outputFile, output, 'utf-8');
-    console.log(`\n结果已写入: ${outputFile}`);
-  } else {
-    process.stdout.write(output + '\n');
-  }
-
-  if (filter) {
-    console.log(`\n共 ${uniqueResults.length} 个${label}，过滤后 ${filteredResults.length} 个（过滤条件: ${formatFilterDescription(filter)}）`);
-  } else {
-    console.log(`\n共 ${filteredResults.length} 个${label}`);
-  }
-}
+import { writeFileSync } from 'fs';
+import { formatOutput } from '../lib/output.js';
+import { deduplicate } from '../lib/output.js';
+import { applyFilter, formatFilterDescription } from '../lib/filter.js';
+import { calculateConcurrency, createMultiProgressBars, renderMultiProgressBars, clearProgressBars } from '../lib/io.js';
+import { randomDelay } from '../lib/delay.js';
+
+export async function processUrlsWithProgress({
+  urls,
+  proxyUrl,
+  outputFile,
+  outputFormat,
+  filter,
+  processFn,
+  label = '数据',
+}) {
+  const allResults = [];
+  const errors = [];
+
+  if (urls.length === 0) {
+    console.error('\n未获取到数据');
+    if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
+    return;
+  }
+
+  const concurrency = calculateConcurrency(urls.length);
+  const bars = createMultiProgressBars(concurrency);
+
+  const slots = Array.from({ length: concurrency }, () => []);
+  urls.forEach((url, i) => slots[i % concurrency].push(url));
+
+  bars.forEach((bar, i) => {
+    bar.total = slots[i].length;
+    bar.status = slots[i].length > 0 ? 'running' : 'done';
+  });
+
+  renderMultiProgressBars(bars);
+
+  const workers = slots.map(async (slotUrls, slotIndex) => {
+    for (const url of slotUrls) {
+      bars[slotIndex].url = url;
+      renderMultiProgressBars(bars);
+
+      await randomDelay();
+
+      try {
+        const results = await processFn(url, proxyUrl);
+        allResults.push(...results);
+        bars[slotIndex].current++;
+        bars[slotIndex].status = 'running';
+      } catch (err) {
+        errors.push({ url, message: err.message });
+        bars[slotIndex].current++;
+        bars[slotIndex].status = 'error';
+      }
+
+      renderMultiProgressBars(bars);
+    }
+    bars[slotIndex].status = bars[slotIndex].current === bars[slotIndex].total ? 'done' : 'error';
+    renderMultiProgressBars(bars);
+  });
+
+  await Promise.all(workers);
+  clearProgressBars();
+
+  const uniqueResults = deduplicate(allResults);
+  const filteredResults = applyFilter(uniqueResults, filter);
+
+  if (errors.length > 0) {
+    const firstMsg = errors[0].message;
+    const isProxyError = ['不可用', '连接被拒绝', '连接中断', '超时', '无法解析']
+      .some(kw => firstMsg.includes(kw));
+
+    if (filteredResults.length === 0) {
+      if (isProxyError) {
+        console.error(`  所有请求失败，请检查代理: ${proxyUrl}\n`);
+      } else {
+        const show = errors.slice(0, 5);
+        for (const e of show) console.error(`  ✗ ${e.url}: ${e.message}\n`);
+        if (errors.length > 5) console.error(`  ... 还有 ${errors.length - 5} 个失败\n`);
+      }
+      console.error('未获取到数据');
+      if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
+      return;
+    } else {
+      if (isProxyError) {
+        console.error(`  ${errors.length} 个请求失败，请检查代理: ${proxyUrl}\n`);
+      } else {
+        console.error(`  ${errors.length} 个失败:`);
+        const show = errors.slice(0, 5);
+        for (const e of show) console.error(`    ✗ ${e.url}: ${e.message}`);
+        if (errors.length > 5) console.error(`    ... 还有 ${errors.length - 5} 个`);
+      }
+    }
+  }
+
+  const output = formatOutput(filteredResults, outputFormat);
+
+  if (outputFile) {
+    writeFileSync(outputFile, output, 'utf-8');
+    console.log(`\n结果已写入: ${outputFile}`);
+  } else {
+    process.stdout.write(output + '\n');
+  }
+
+  if (filter) {
+    console.log(`\n共 ${uniqueResults.length} 个${label}，过滤后 ${filteredResults.length} 个（过滤条件: ${formatFilterDescription(filter)}）`);
+  } else {
+    console.log(`\n共 ${filteredResults.length} 个${label}`);
+  }
+}

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.mjs');
-
-  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.mjs');
+
+  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(() => {});
+  }
+}

package/src/cli/utils.js

@@ -1,18 +1,18 @@
-import { writeFileSync } from 'fs';
-
-export function cleanError(msg) {
-  return msg
-    .replace(/\x1b\[[0-9;]*m/g, '')
-    .replace(/\s*- navigating to.*/s, '')
-    .replace(/\s*Call log:/s, '')
-    .trim();
-}
-
-export function writeJson(data, outputFile) {
-  const json = JSON.stringify(data, null, 2);
-  if (outputFile) {
-    writeFileSync(outputFile, json, 'utf-8');
-  } else {
-    process.stdout.write(json + '\n');
-  }
-}
+import { writeFileSync } from 'fs';
+
+export function cleanError(msg) {
+  return msg
+    .replace(/\x1b\[[0-9;]*m/g, '')
+    .replace(/\s*- navigating to.*/s, '')
+    .replace(/\s*Call log:/s, '')
+    .trim();
+}
+
+export function writeJson(data, outputFile) {
+  const json = JSON.stringify(data, null, 2);
+  if (outputFile) {
+    writeFileSync(outputFile, json, 'utf-8');
+  } else {
+    process.stdout.write(json + '\n');
+  }
+}