tt-help-cli-ycl 1.3.11 → 1.3.13

package/src/lib/browser/page.js

@@ -1,87 +1,146 @@
-import { delay } from '../delay.js';
-import { retryWithBackoff } from '../retry.js';
-import { getDelayConfig } from '../delay.js';
-
-export async function isLoggedIn(page) {
-  return page.evaluate(() => {
-    // 已登录时会出现在个人主页区域的元素
-    const hasProfileContainer = !!document.querySelector(
-      '[class*="DivProfileContainer"], [class*="DivUserContainer"]'
-    );
-    // 已登录时顶部导航栏有用户相关菜单
-    const hasUserMenu = !!document.querySelector(
-      '[class*="UserMenu"], [class*="user-menu"], [class*="CurrentUserInfo"]'
-    );
-    // 有登录按钮说明未登录
-    const hasLoginButton = Array.from(document.querySelectorAll('button, [role="button"]'))
-      .some(el => /^(登录|Log in|Sign in)$/i.test(el.textContent.trim()));
-
-    return (hasProfileContainer || hasUserMenu) && !hasLoginButton;
-  });
-}
-
-export async function closeCommentPanel(page) {
-  await page.evaluate(() => {
-    const rightPanel = document.querySelector('[class*="RightPanelContainer"]');
-    if (rightPanel) {
-      const tabContainer = rightPanel.querySelector('[class*="TabContainer"]');
-      if (tabContainer) {
-        const closeOverlay = tabContainer.querySelector('div:last-child');
-        if (closeOverlay) closeOverlay.click();
-      }
-    }
-  });
-}
-
-export async function ensureTikTokPage(browser, url) {
-  const contexts = browser.contexts();
-  let page = null;
-
-  for (const ctx of contexts) {
-    for (const p of ctx.pages()) {
-      if (p.url().includes('tiktok.com')) {
-        page = p;
-        break;
-      }
-    }
-    if (page) break;
-  }
-
-  if (!page) {
-    console.error('未找到 TikTok 页面，正在打开...');
-    const defaultCtx = browser.contexts()[0];
-    page = await defaultCtx.newPage();
-    await retryWithBackoff(() => page.goto(url, { waitUntil: 'load', timeout: 30000 }));
-    const config = getDelayConfig();
-    await delay(Math.round(config.switchMax * 0.5), config.switchMax);
-    console.error('TikTok 页面已打开');
-  }
-
-  return page;
-}
-
-export async function findTikTokPage(browser) {
-  const contexts = browser.contexts();
-  for (const ctx of contexts) {
-    for (const p of ctx.pages()) {
-      if (p.url().includes('tiktok.com')) return p;
-    }
-  }
-  return null;
-}
-
-export async function getOrCreatePage(browser) {
-  let page = await findTikTokPage(browser);
-  if (!page) {
-    const defaultCtx = browser.contexts()[0] || await browser.newContext();
-    page = await defaultCtx.newPage();
-  }
-  return page;
-}
-
-export function assertPageUrl(page, expectedPath) {
-  const actual = page.url();
-  if (!actual.includes(expectedPath)) {
-    throw new Error(`[代理错误] 预期访问 ${expectedPath}，实际跳转到了 ${actual}`);
-  }
-}
+import os from 'os';
+import path from 'path';
+import { delay } from '../delay.js';
+import { retryWithBackoff } from '../retry.js';
+import { getDelayConfig } from '../delay.js';
+import { ensureBrowserReady, killEdgeProcesses } from './cdp.js';
+
+const DEFAULT_USER_DATA_DIR = path.join(os.homedir(), 'Library', 'Application Support', 'Microsoft Edge For Testing');
+
+const BROWSER_CLOSED_PATTERNS = [
+  'Target page, context or browser has been closed',
+  'Target closed',
+  'Browser has been closed',
+  'Protocol error',
+  'Connection closed',
+  'net::ERR_CONNECTION',
+];
+
+export function isBrowserClosedError(error) {
+  if (!error) return false;
+  const msg = error.message || error.toString() || '';
+  return BROWSER_CLOSED_PATTERNS.some(p => msg.includes(p));
+}
+
+export async function relaunchBrowser(cdpOptions, port) {
+  console.error(`  [浏览器] 浏览器已关闭，正在重启 (端口 ${port})...`);
+  const targetDir = cdpOptions.userDataDir || DEFAULT_USER_DATA_DIR;
+  // kill 并清理 Singleton 锁文件，确保 Edge 能启动新实例
+  await killEdgeProcesses(targetDir);
+  await new Promise(r => setTimeout(r, 3000));
+  // 确保端口已释放后再启动
+  let retries = 0;
+  while (retries < 5) {
+    try {
+      return await ensureBrowserReady(cdpOptions);
+    } catch (e) {
+      if (e.message && e.message.includes('setDownloadBehavior')) {
+        retries++;
+        console.error(`  [浏览器] CDP 连接异常，重试 ${retries}/5...`);
+        await new Promise(r => setTimeout(r, 3000));
+        await killEdgeProcesses(targetDir);
+        await new Promise(r => setTimeout(r, 5000));
+        continue;
+      }
+      throw e;
+    }
+  }
+  throw new Error('浏览器重启失败，CDP 连接异常');
+}
+
+export async function withBrowserRecovery(fn, browser, page, cdpOptions, port) {
+  try {
+    return await fn();
+  } catch (e) {
+    if (isBrowserClosedError(e)) {
+      const newBrowser = await relaunchBrowser(cdpOptions, port);
+      const newPage = await getOrCreatePage(newBrowser);
+      return await fn(newBrowser, newPage);
+    }
+    throw e;
+  }
+}
+
+export async function isLoggedIn(page) {
+  return page.evaluate(() => {
+    // 已登录时会出现在个人主页区域的元素
+    const hasProfileContainer = !!document.querySelector(
+      '[class*="DivProfileContainer"], [class*="DivUserContainer"]'
+    );
+    // 已登录时顶部导航栏有用户相关菜单
+    const hasUserMenu = !!document.querySelector(
+      '[class*="UserMenu"], [class*="user-menu"], [class*="CurrentUserInfo"]'
+    );
+    // 有登录按钮说明未登录
+    const hasLoginButton = Array.from(document.querySelectorAll('button, [role="button"]'))
+      .some(el => /^(登录|Log in|Sign in)$/i.test(el.textContent.trim()));
+
+    return (hasProfileContainer || hasUserMenu) && !hasLoginButton;
+  });
+}
+
+export async function closeCommentPanel(page) {
+  await page.evaluate(() => {
+    const rightPanel = document.querySelector('[class*="RightPanelContainer"]');
+    if (rightPanel) {
+      const tabContainer = rightPanel.querySelector('[class*="TabContainer"]');
+      if (tabContainer) {
+        const closeOverlay = tabContainer.querySelector('div:last-child');
+        if (closeOverlay) closeOverlay.click();
+      }
+    }
+  });
+}
+
+export async function ensureTikTokPage(browser, url) {
+  const contexts = browser.contexts();
+  let page = null;
+
+  for (const ctx of contexts) {
+    for (const p of ctx.pages()) {
+      if (p.url().includes('tiktok.com')) {
+        page = p;
+        break;
+      }
+    }
+    if (page) break;
+  }
+
+  if (!page) {
+    console.error('未找到 TikTok 页面，正在打开...');
+    const defaultCtx = browser.contexts()[0];
+    page = await defaultCtx.newPage();
+    await retryWithBackoff(() => page.goto(url, { waitUntil: 'load', timeout: 30000 }));
+    const config = getDelayConfig();
+    await delay(Math.round(config.switchMax * 0.5), config.switchMax);
+    console.error('TikTok 页面已打开');
+  }
+
+  return page;
+}
+
+export async function findTikTokPage(browser) {
+  const contexts = browser.contexts();
+  for (const ctx of contexts) {
+    for (const p of ctx.pages()) {
+      if (p.url().includes('tiktok.com')) return p;
+    }
+  }
+  return null;
+}
+
+export async function getOrCreatePage(browser) {
+  let page = await findTikTokPage(browser);
+  if (!page) {
+    const defaultCtx = browser.contexts()[0] || await browser.newContext();
+    page = await defaultCtx.newPage();
+  }
+  return page;
+}
+
+export function assertPageUrl(page, expectedPath) {
+  const actual = page.url();
+  if (!actual.includes(expectedPath)) {
+    throw new Error(`[代理错误] 预期访问 ${expectedPath}，实际跳转到了 ${actual}`);
+  }
+}

package/src/lib/constants.js

@@ -1,119 +1,119 @@
-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 server = 'http://127.0.0.1:3001';
-let configFile = null;
-let browser = null;
-let userId = null;
-
-try {
-  if (existsSync(configPath)) {
-    const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
-    if (cfg.proxy) {
-      proxy = cfg.proxy;
-    }
-    if (cfg.server) {
-      server = cfg.server;
-    }
-    if (cfg.browser) {
-      browser = cfg.browser;
-    }
-    if (cfg.userId) {
-      userId = cfg.userId;
-    }
-    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;
-}
-
-function saveUserId(id) {
-  const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
-  cfg.userId = id;
-  writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-  userId = id;
-  configFile = configPath;
-}
-
-const HELP_TEXT = [
-  '用法: tt-help explore <用户名> [preset] [选项]',
-  '',
-  '  支持多个用户名: tt-help explore @user1 @user2 --server http://127.0.0.1:3001',
-  '  预设: fast, normal（默认）, slow, stealth',
-  '  选项:',
-  '    --server <URL>            服务端地址，默认 http://127.0.0.1:3001',
-  '    --location <国家代码>     国家筛选，默认 ES',
-  '    --max-comments <数量>     每视频最大评论数，默认 10',
-  '    --max-guess <数量>        每视频最大猜你喜欢数，默认 0',
-  '    --enable-follow           启用关注/粉丝提取（默认启用）',
-  '    --disable-follow          禁用关注/粉丝提取',
-  '    --max-following <数量>    最大获取关注数，默认 5',
-  '    --max-followers <数量>    最大获取粉丝数，默认 5',
-  '    --max-users <数量>        最大处理用户数，默认无限制',
-  '  全局选项:',
-  '    config                    查看当前配置',
-  '    config set <key> <value>  设置配置（key: proxy, server, browser, userId）',
-  '    config reset              重置所有配置为默认',
-  '    -h, --help                显示帮助',
-  '    --version                 显示版本号',
-  '',
-  '  示例: tt-help explore qiqi23280 fast --location ES --max-comments 50',
-  '        tt-help config set server http://127.0.0.1:3001',
-];
-
-function getConfigText() {
-  let currentUserId = userId;
-  if (!currentUserId && existsSync(configPath)) {
-    try {
-      const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
-      if (cfg.userId) currentUserId = cfg.userId;
-    } catch {}
-  }
-  return [
-    'tt-help v1.0.1',
-    '',
-    '配置:',
-    `  代理: ${proxy}`,
-    `  服务端: ${server}`,
-    `  浏览器: ${browser || '未配置（将自动探测或回退）'}`,
-    `  用户号: ${currentUserId || '未设置（首次运行 auto 自动创建）'}`,
-    `  输出格式: json`,
-    `  默认输出: ${DEFAULT_OUTPUT}`,
-    `  配置文件: ${configFile || '无（使用默认值）'}`,
-  ];
-}
-
-export {
-  proxy,
-  server,
-  configFile,
-  configPath,
-  DEFAULT_PROXY,
-  DEFAULT_OUTPUT,
-  USER_SECTION_SIZE,
-  HELP_TEXT,
-  browser,
-  userId,
-  saveBrowser,
-  saveUserId,
-  getConfigText,
-};
+import { join, dirname } from 'path';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+
+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 server = 'http://127.0.0.1:3001';
+let configFile = null;
+let browser = null;
+let userId = null;
+
+try {
+  if (existsSync(configPath)) {
+    const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
+    if (cfg.proxy) {
+      proxy = cfg.proxy;
+    }
+    if (cfg.server) {
+      server = cfg.server;
+    }
+    if (cfg.browser) {
+      browser = cfg.browser;
+    }
+    if (cfg.userId) {
+      userId = cfg.userId;
+    }
+    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;
+}
+
+function saveUserId(id) {
+  const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
+  cfg.userId = id;
+  writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+  userId = id;
+  configFile = configPath;
+}
+
+const HELP_TEXT = [
+  '用法: tt-help explore <用户名> [preset] [选项]',
+  '',
+  '  支持多个用户名: tt-help explore @user1 @user2 --server http://127.0.0.1:3001',
+  '  预设: fast, normal（默认）, slow, stealth',
+  '  选项:',
+  '    --server <URL>            服务端地址，默认 http://127.0.0.1:3001',
+  '    --location <国家代码>     国家筛选，逗号分隔，默认 PL,NL,BE,DE,FR,IT,ES,IE',
+  '    --max-comments <数量>     每视频最大评论数，默认 10',
+  '    --max-guess <数量>        每视频最大猜你喜欢数，默认 0',
+  '    --enable-follow           启用关注/粉丝提取（默认启用）',
+  '    --disable-follow          禁用关注/粉丝提取',
+  '    --max-following <数量>    最大获取关注数，默认 5',
+  '    --max-followers <数量>    最大获取粉丝数，默认 5',
+  '    --max-users <数量>        最大处理用户数，默认无限制',
+  '    --port <端口号>           CDP 端口，默认 9222',
+  '    --profile <名称>          浏览器 Profile 名称',
+  '    --user-id <编号>          客户端编号（设备ID），默认自动生成',
+  '  全局选项:',
+  '    config                    查看当前配置',
+  '    config set <key> <value>  设置配置（key: proxy, server, browser, userId）',
+  '    config reset              重置所有配置为默认',
+  '    -h, --help                显示帮助',
+  '    --version                 显示版本号',
+  '',
+  '  示例: tt-help explore qiqi23280 fast --location ES --max-comments 50',
+  '        tt-help explore @user1 --user-id my-device-001 --port 9333',
+  '        tt-help config set server http://127.0.0.1:3001',
+];
+
+function getConfigText() {
+  let currentUserId = userId;
+  if (!currentUserId && existsSync(configPath)) {
+    try {
+      const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
+      if (cfg.userId) currentUserId = cfg.userId;
+    } catch {}
+  }
+  return [
+    'tt-help v1.0.1',
+    '',
+    '配置:',
+    `  代理: ${proxy}`,
+    `  服务端: ${server}`,
+    `  浏览器: ${browser || '未配置（将自动探测或回退）'}`,
+    `  用户号: ${currentUserId || '未设置（首次运行 auto 自动创建）'}`,
+    `  输出格式: json`,
+    `  默认输出: ${DEFAULT_OUTPUT}`,
+    `  配置文件: ${configFile || '无（使用默认值）'}`,
+  ];
+}
+
+export {
+  proxy,
+  server,
+  configPath,
+  DEFAULT_PROXY,
+  HELP_TEXT,
+  browser,
+  userId,
+  saveBrowser,
+  saveUserId,
+  getConfigText,
+};

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);
+}