tt-help-cli-ycl 1.3.1 → 1.3.2

package/src/lib/constants.js

@@ -1,86 +1,85 @@
-import { join, dirname } from 'path';
-import { readFileSync, writeFileSync, existsSync } from 'fs';
-import { fileURLToPath } from 'url';
-import { USER_SECTION_SIZE } from './parser.js';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const homeDir = process.env.HOME || process.env.USERPROFILE || '';
-const configPath = join(homeDir, '.tt-help.json');
-
-const DEFAULT_PROXY = 'http://127.0.0.1:7897';
-const DEFAULT_OUTPUT = 'tiktok_data.json';
-
-let proxy = DEFAULT_PROXY;
-let configFile = null;
-let browser = null;
-
-try {
-  if (existsSync(configPath)) {
-    const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
-    if (cfg.proxy) {
-      proxy = cfg.proxy;
-    }
-    if (cfg.browser) {
-      browser = cfg.browser;
-    }
-    configFile = configPath;
-  }
-} catch {
-  // no config file
-}
-
-function saveBrowser(path) {
-  const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
-  cfg.browser = path;
-  writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-  browser = path;
-  configFile = configPath;
-}
-
-const HELP_TEXT = [
-  '用法: tt-help explore <用户名> [preset] [选项]',
-  '',
-  '  支持多个用户名: tt-help explore @user1 @user2 --server http://127.0.0.1:3000',
-  '  预设: fast, normal（默认）, slow, stealth',
-  '  选项:',
-  '    --server <URL>            服务端地址，默认 http://127.0.0.1:3000',
-  '    --location <国家代码>     国家筛选，默认 ES',
-  '    --max-comments <数量>     每视频最大评论数，默认 10',
-  '    --max-guess <数量>        每视频最大猜你喜欢数，默认 0',
-  '    --enable-follow           启用关注/粉丝提取（默认启用）',
-  '    --disable-follow          禁用关注/粉丝提取',
-  '    --max-following <数量>    最大获取关注数，默认 5',
-  '    --max-followers <数量>    最大获取粉丝数，默认 5',
-  '    --max-users <数量>        最大处理用户数，默认无限制',
-  '    --proxy <地址>            临时指定代理地址',
-  '    -o, --output <file>       指定输出文件（默认: tiktok_data.json）',
-  '    -h, --help                显示帮助',
-  '    --version                 显示版本号',
-  '',
-  '  示例: tt-help explore qiqi23280 fast --location ES --max-comments 50',
+import { join, dirname } from 'path';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { USER_SECTION_SIZE } from './parser.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const homeDir = process.env.HOME || process.env.USERPROFILE || '';
+const configPath = join(homeDir, '.tt-help.json');
+
+const DEFAULT_PROXY = 'http://127.0.0.1:7897';
+const DEFAULT_OUTPUT = 'tiktok_data.json';
+
+let proxy = DEFAULT_PROXY;
+let configFile = null;
+let browser = null;
+
+try {
+  if (existsSync(configPath)) {
+    const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
+    if (cfg.proxy) {
+      proxy = cfg.proxy;
+    }
+    if (cfg.browser) {
+      browser = cfg.browser;
+    }
+    configFile = configPath;
+  }
+} catch {
+  // no config file
+}
+
+function saveBrowser(path) {
+  const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
+  cfg.browser = path;
+  writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+  browser = path;
+  configFile = configPath;
+}
+
+const HELP_TEXT = [
+  '用法: tt-help explore <用户名> [preset] [选项]',
+  '',
+  '  支持多个用户名: tt-help explore @user1 @user2 --server http://127.0.0.1:3000',
+  '  预设: fast, normal（默认）, slow, stealth',
+  '  选项:',
+  '    --server <URL>            服务端地址，默认 http://127.0.0.1:3000',
+  '    --location <国家代码>     国家筛选，默认 ES',
+  '    --max-comments <数量>     每视频最大评论数，默认 10',
+  '    --max-guess <数量>        每视频最大猜你喜欢数，默认 0',
+  '    --enable-follow           启用关注/粉丝提取（默认启用）',
+  '    --disable-follow          禁用关注/粉丝提取',
+  '    --max-following <数量>    最大获取关注数，默认 5',
+  '    --max-followers <数量>    最大获取粉丝数，默认 5',
+  '    --max-users <数量>        最大处理用户数，默认无限制',
+  '  全局选项:',
+  '    -h, --help                显示帮助',
+  '    --version                 显示版本号',
+  '',
+  '  示例: tt-help explore qiqi23280 fast --location ES --max-comments 50',
 ];
-
-const CONFIG_TEXT = [
-  'tt-help v1.0.1',
-  '',
-  '配置:',
-  `  代理: ${proxy}`,
-  `  浏览器: ${browser || '未配置（将自动探测或回退）'}`,
-  `  输出格式: json`,
-  `  默认输出: ${DEFAULT_OUTPUT}`,
-  `  配置文件: ${configFile || '无（使用默认值）'}`,
-];
-
-export {
-  proxy,
-  configFile,
-  configPath,
-  DEFAULT_PROXY,
-  DEFAULT_OUTPUT,
-  USER_SECTION_SIZE,
-  HELP_TEXT,
-  CONFIG_TEXT,
-  browser,
-  saveBrowser,
-};
+
+const CONFIG_TEXT = [
+  'tt-help v1.0.1',
+  '',
+  '配置:',
+  `  代理: ${proxy}`,
+  `  浏览器: ${browser || '未配置（将自动探测或回退）'}`,
+  `  输出格式: json`,
+  `  默认输出: ${DEFAULT_OUTPUT}`,
+  `  配置文件: ${configFile || '无（使用默认值）'}`,
+];
+
+export {
+  proxy,
+  configFile,
+  configPath,
+  DEFAULT_PROXY,
+  DEFAULT_OUTPUT,
+  USER_SECTION_SIZE,
+  HELP_TEXT,
+  CONFIG_TEXT,
+  browser,
+  saveBrowser,
+};

package/src/lib/delay.js

@@ -1,54 +1,54 @@
-export const DELAY_PRESETS = {
-  fast:    { switchMax: 300, commentMax: 200, fast: true },
-  normal:  { switchMax: 1500, commentMax: 800 },
-  slow:    { switchMax: 3000, commentMax: 2000 },
-  stealth: { switchMax: 5000, commentMax: 3500 },
-};
-
-const delayConfig = {
-  switchMax: 2500,
-  commentMax: 1500,
-  fast: false,
-};
-
-export function setDelayConfig(config) {
-  if (typeof config === 'string') {
-    const preset = DELAY_PRESETS[config.toLowerCase()];
-    if (!preset) {
-      throw new Error(
-        `未知的延迟预设: ${config}\n可用预设: ${Object.keys(DELAY_PRESETS).join(', ')}`
-      );
-    }
-    delayConfig.switchMax = preset.switchMax;
-    delayConfig.commentMax = preset.commentMax;
-    delayConfig.fast = preset.fast || false;
-  } else if (typeof config === 'object') {
-    if (config.switchMax) delayConfig.switchMax = config.switchMax;
-    if (config.commentMax) delayConfig.commentMax = config.commentMax;
-    delayConfig.fast = config.fast || false;
-  }
-}
-
-export function getDelayConfig() {
-  return { ...delayConfig };
-}
-
-export function listDelayPresets() {
-  return DELAY_PRESETS;
-}
-
-export function delay(min, max) {
-  const lo = Math.min(min, max);
-  const hi = Math.max(min, max);
-  let ms;
-  if (delayConfig.fast) {
-    ms = 0;
-  } else {
-    ms = Math.floor(Math.random() * (hi - lo + 1)) + lo;
-  }
-  return new Promise(r => setTimeout(r, ms));
-}
-
-export function randomDelay(min = 200, max = 600) {
-  return delay(min, max);
-}
+export const DELAY_PRESETS = {
+  fast:    { switchMax: 300, commentMax: 200, fast: true },
+  normal:  { switchMax: 1500, commentMax: 800 },
+  slow:    { switchMax: 3000, commentMax: 2000 },
+  stealth: { switchMax: 5000, commentMax: 3500 },
+};
+
+const delayConfig = {
+  switchMax: 2500,
+  commentMax: 1500,
+  fast: false,
+};
+
+export function setDelayConfig(config) {
+  if (typeof config === 'string') {
+    const preset = DELAY_PRESETS[config.toLowerCase()];
+    if (!preset) {
+      throw new Error(
+        `未知的延迟预设: ${config}\n可用预设: ${Object.keys(DELAY_PRESETS).join(', ')}`
+      );
+    }
+    delayConfig.switchMax = preset.switchMax;
+    delayConfig.commentMax = preset.commentMax;
+    delayConfig.fast = preset.fast || false;
+  } else if (typeof config === 'object') {
+    if (config.switchMax) delayConfig.switchMax = config.switchMax;
+    if (config.commentMax) delayConfig.commentMax = config.commentMax;
+    delayConfig.fast = config.fast || false;
+  }
+}
+
+export function getDelayConfig() {
+  return { ...delayConfig };
+}
+
+export function listDelayPresets() {
+  return DELAY_PRESETS;
+}
+
+export function delay(min, max) {
+  const lo = Math.min(min, max);
+  const hi = Math.max(min, max);
+  let ms;
+  if (delayConfig.fast) {
+    ms = 0;
+  } else {
+    ms = Math.floor(Math.random() * (hi - lo + 1)) + lo;
+  }
+  return new Promise(r => setTimeout(r, ms));
+}
+
+export function randomDelay(min = 200, max = 600) {
+  return delay(min, max);
+}

package/src/lib/{explore.js → explore-fetch.js}

@@ -1,118 +1,118 @@
-import { chromium } from 'playwright';
-import { browser, saveBrowser, configPath } from './constants.js';
-import { detectBrowser } from './browser/launch.js';
-import { getAntiDetectScript } from './browser/anti-detect.js';
-import { retryWithBackoff } from './retry.js';
-import { scrollAndCollect } from '../scraper/modules/scroll-collector.mjs';
-
-const EXPLORE_URL = 'https://www.tiktok.com/explore';
-
-function sleep(ms) {
-  return new Promise(r => setTimeout(r, ms));
-}
-
-export async function fetchExplore(count = 100) {
-  let browserPath = browser;
-  let browserSource = '配置';
-
-  if (!browserPath) {
-    console.log('  [0/6] 未配置浏览器，正在自动探测...');
-    const detected = detectBrowser();
-    if (detected) {
-      browserPath = detected;
-      browserSource = '自动探测';
-      try {
-        saveBrowser(browserPath);
-        console.log(`  [0/6] 已保存浏览器路径到配置: ${configPath}`);
-      } catch (err) {
-        console.log(`  [0/6] 保存配置失败: ${err.message}`);
-      }
-    }
-  }
-
-  const launchOptions = {
-    headless: true,
-    args: [
-      '--no-sandbox',
-      '--disable-setuid-sandbox',
-      '--disable-blink-features=AutomationControlled',
-      '--disable-dev-shm-usage',
-    ],
-  };
-
-  if (browserPath) {
-    console.log(`  [0/6] 使用${browserSource}浏览器: ${browserPath}`);
-    launchOptions.executablePath = browserPath;
-  }
-
-  let instance;
-  try {
-    instance = await chromium.launch(launchOptions);
-  } catch (err) {
-    if (browserPath) {
-      console.log(`  [0/6] 浏览器启动失败 (${err.message})，回退到 Playwright Chromium...`);
-    }
-    instance = await chromium.launch({
-      headless: true,
-      args: launchOptions.args,
-    });
-  }
-
-  try {
-    const context = await instance.newContext({
-      viewport: { width: 1280, height: 900 },
-      userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-      locale: 'en-US',
-    });
-
-    await context.addInitScript(getAntiDetectScript());
-
-    const page = await context.newPage();
-    await retryWithBackoff(() => page.goto(EXPLORE_URL, { waitUntil: 'load', timeout: 30000 }));
-    console.log('  [1/6] 页面已加载');
-
-    await sleep(5000);
-
-    const allUrls = await scrollAndCollect(page, {
-      container: null,
-      collectFn: () => ({
-        items: Array.from(document.querySelectorAll('a'))
-          .filter(a => /\/video\/\d{16,20}/.test(a.href))
-          .map(a => a.href),
-      }),
-      maxItems: count * 2,
-      delayRange: [1500, 2500],
-      staleThreshold: 5,
-      onRound: (round, items, allItems) => {
-        if ((round + 1) % 10 === 0) {
-          const uniqueCount = [...new Set(allItems)].length;
-          console.log(`  [2/6] 滚动 ${round + 1}，当前 ${uniqueCount} 个视频`);
-        }
-      },
-    });
-
-    await sleep(3000);
-
-    const unique = [...new Set(allUrls)];
-    console.log(`  [4/6] 共检测到 ${unique.length} 个不重复视频`);
-
-    const results = [];
-    const seen = new Set();
-    for (const url of unique) {
-      if (results.length >= count) break;
-      const videoId = url.match(/video\/(\d{16,20})$/)?.[1];
-      if (videoId && !seen.has(videoId)) {
-        seen.add(videoId);
-        const user = url.match(/\/@([^/]+)/)?.[1];
-        if (user) {
-          results.push({ user, id: videoId, url });
-        }
-      }
-    }
-
-    console.log(`  [5/6] 去重后 ${results.length} 个`);
-    return results;
-  } finally {
-    await instance.close();
-  }
-}
+import { chromium } from 'playwright';
+import { browser, saveBrowser, configPath } from './constants.js';
+import { detectBrowser } from './browser/launch.js';
+import { getAntiDetectScript } from './browser/anti-detect.js';
+import { retryWithBackoff } from './retry.js';
+import { scrollAndCollect } from '../scraper/modules/scroll-collector.mjs';
+
+const EXPLORE_URL = 'https://www.tiktok.com/explore';
+
+function sleep(ms) {
+  return new Promise(r => setTimeout(r, ms));
+}
+
+export async function fetchExplore(count = 100) {
+  let browserPath = browser;
+  let browserSource = '配置';
+
+  if (!browserPath) {
+    console.log('  [0/6] 未配置浏览器，正在自动探测...');
+    const detected = detectBrowser();
+    if (detected) {
+      browserPath = detected;
+      browserSource = '自动探测';
+      try {
+        saveBrowser(browserPath);
+        console.log(`  [0/6] 已保存浏览器路径到配置: ${configPath}`);
+      } catch (err) {
+        console.log(`  [0/6] 保存配置失败: ${err.message}`);
+      }
+    }
+  }
+
+  const launchOptions = {
+    headless: true,
+    args: [
+      '--no-sandbox',
+      '--disable-setuid-sandbox',
+      '--disable-blink-features=AutomationControlled',
+      '--disable-dev-shm-usage',
+    ],
+  };
+
+  if (browserPath) {
+    console.log(`  [0/6] 使用${browserSource}浏览器: ${browserPath}`);
+    launchOptions.executablePath = browserPath;
+  }
+
+  let instance;
+  try {
+    instance = await chromium.launch(launchOptions);
+  } catch (err) {
+    if (browserPath) {
+      console.log(`  [0/6] 浏览器启动失败 (${err.message})，回退到 Playwright Chromium...`);
+    }
+    instance = await chromium.launch({
+      headless: true,
+      args: launchOptions.args,
+    });
+  }
+
+  try {
+    const context = await instance.newContext({
+      viewport: { width: 1280, height: 900 },
+      userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+      locale: 'en-US',
+    });
+
+    await context.addInitScript(getAntiDetectScript());
+
+    const page = await context.newPage();
+    await retryWithBackoff(() => page.goto(EXPLORE_URL, { waitUntil: 'load', timeout: 30000 }));
+    console.log('  [1/6] 页面已加载');
+
+    await sleep(5000);
+
+    const allUrls = await scrollAndCollect(page, {
+      container: null,
+      collectFn: () => ({
+        items: Array.from(document.querySelectorAll('a'))
+          .filter(a => /\/video\/\d{16,20}/.test(a.href))
+          .map(a => a.href),
+      }),
+      maxItems: count * 2,
+      delayRange: [1500, 2500],
+      staleThreshold: 5,
+      onRound: (round, items, allItems) => {
+        if ((round + 1) % 10 === 0) {
+          const uniqueCount = [...new Set(allItems)].length;
+          console.log(`  [2/6] 滚动 ${round + 1}，当前 ${uniqueCount} 个视频`);
+        }
+      },
+    });
+
+    await sleep(3000);
+
+    const unique = [...new Set(allUrls)];
+    console.log(`  [4/6] 共检测到 ${unique.length} 个不重复视频`);
+
+    const results = [];
+    const seen = new Set();
+    for (const url of unique) {
+      if (results.length >= count) break;
+      const videoId = url.match(/video\/(\d{16,20})$/)?.[1];
+      if (videoId && !seen.has(videoId)) {
+        seen.add(videoId);
+        const user = url.match(/\/@([^/]+)/)?.[1];
+        if (user) {
+          results.push({ user, id: videoId, url });
+        }
+      }
+    }
+
+    console.log(`  [5/6] 去重后 ${results.length} 个`);
+    return results;
+  } finally {
+    await instance.close();
+  }
+}

package/src/lib/fetcher.js

@@ -1,45 +1,45 @@
-import { fetch, ProxyAgent } from 'undici';
-import { DEFAULT_PROXY } from './constants.js';
-import { isProfileUrl } from './url.js';
-
-const HEADERS = {
-  'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-  'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8',
-  'Accept-Language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7',
-  'Accept-Encoding': 'gzip, deflate, br',
-  'Connection': 'keep-alive',
-  'Upgrade-Insecure-Requests': '1',
-  'Sec-Fetch-Dest': 'document',
-  'Sec-Fetch-Mode': 'navigate',
-  'Sec-Fetch-Site': 'none',
-  'Sec-Fetch-User': '?1',
-  'Cache-Control': 'max-age=0',
-};
-
-export { isProfileUrl } from './url.js';
-
-export async function fetchHtml(url, proxyUrl) {
-  const p = proxyUrl || DEFAULT_PROXY;
-  const agent = new ProxyAgent(p);
-  let lastError;
-
-  for (let attempt = 1; attempt <= 3; attempt++) {
-    try {
-      const res = await fetch(url, {
-        headers: HEADERS,
-        dispatcher: agent,
-        redirect: 'follow',
-      });
-      const html = await res.text();
-      return html;
-    } catch (err) {
-      lastError = err;
-      if (attempt < 3) {
-        const waitMs = Math.pow(2, attempt - 1) * 3000 + Math.random() * 2000;
-        await new Promise(r => setTimeout(r, waitMs));
-      }
-    }
-  }
-
-  throw new Error(`请求 ${url} 失败（已重试 3 次），代理 ${p} 不可用`);
-}
+import { fetch, ProxyAgent } from 'undici';
+import { DEFAULT_PROXY } from './constants.js';
+import { isProfileUrl } from './url.js';
+
+const HEADERS = {
+  'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+  'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8',
+  'Accept-Language': 'en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7',
+  'Accept-Encoding': 'gzip, deflate, br',
+  'Connection': 'keep-alive',
+  'Upgrade-Insecure-Requests': '1',
+  'Sec-Fetch-Dest': 'document',
+  'Sec-Fetch-Mode': 'navigate',
+  'Sec-Fetch-Site': 'none',
+  'Sec-Fetch-User': '?1',
+  'Cache-Control': 'max-age=0',
+};
+
+export { isProfileUrl } from './url.js';
+
+export async function fetchHtml(url, proxyUrl) {
+  const p = proxyUrl || DEFAULT_PROXY;
+  const agent = new ProxyAgent(p);
+  let lastError;
+
+  for (let attempt = 1; attempt <= 3; attempt++) {
+    try {
+      const res = await fetch(url, {
+        headers: HEADERS,
+        dispatcher: agent,
+        redirect: 'follow',
+      });
+      const html = await res.text();
+      return html;
+    } catch (err) {
+      lastError = err;
+      if (attempt < 3) {
+        const waitMs = Math.pow(2, attempt - 1) * 3000 + Math.random() * 2000;
+        await new Promise(r => setTimeout(r, waitMs));
+      }
+    }
+  }
+
+  throw new Error(`请求 ${url} 失败（已重试 3 次），代理 ${p} 不可用`);
+}