tt-help-cli-ycl 1.3.11 → 1.3.12

package/src/lib/browser/cdp.js

@@ -1,142 +1,152 @@
-import { exec } from 'child_process';
-import http from 'http';
-import os from 'os';
-import path from 'path';
-import { chromium } from 'playwright';
-
-export const CDP_PORT = 9222;
-
-function getEdgePath() {
-  const platform = os.platform();
-  if (platform === 'darwin') return '"Microsoft Edge"';
-  if (platform === 'win32') return 'msedge.exe';
-  return 'msedge';
-}
-
-function isEdgeRunning() {
-  return new Promise(resolve => {
-    const platform = os.platform();
-    let command;
-    if (platform === 'darwin') {
-      command = 'ps aux | grep -q "[M]icrosoft Edge.app/Contents/MacOS/Microsoft Edge" 2>/dev/null';
-    } else if (platform === 'win32') {
-      command = 'tasklist /FI "IMAGENAME eq msedge.exe" 2>nul | findstr /I msedge';
-    } else {
-      command = 'pgrep -f msedge > /dev/null 2>&1';
-    }
-    exec(command, (err) => resolve(!err));
-  });
-}
-
-function checkCDPPort() {
-  return new Promise(resolve => {
-    const req = http.get(`http://127.0.0.1:${CDP_PORT}/json`, res => {
-      res.on('data', () => {});
-      res.on('end', () => resolve(res.statusCode === 200));
-    });
-    req.on('error', () => resolve(false));
-    req.setTimeout(3000, () => { resolve(false); req.destroy(); });
-  });
-}
-
-function checkEdgeArgs() {
-  return new Promise(resolve => {
-    const platform = os.platform();
-    let command;
-    if (platform === 'darwin') {
-      command = 'ps aux | grep "[M]icrosoft Edge" | grep -v "Helper\\|crashpad" | grep "user-data-dir"';
-    } else if (platform === 'win32') {
-      command = 'wmic process where "name like \\"%msedge%\\"" get commandline | findstr "user-data-dir"';
-    } else {
-      command = 'ps aux | grep "[m]sedge" | grep -v "Helper\\|crashpad" | grep "user-data-dir"';
-    }
-    exec(command, (err, stdout) => resolve(!err && stdout.trim().length > 0));
-  });
-}
-
-function killEdgeProcesses() {
-  return new Promise(resolve => {
-    const platform = os.platform();
-    let command;
-    if (platform === 'darwin') {
-      command = 'killall -9 "Microsoft Edge" 2>/dev/null; rm -f ~/Library/Caches/Microsoft\\ Edge/Singleton*; true';
-    } else if (platform === 'win32') {
-      command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
-    } else {
-      command = 'pkill -9 -f msedge 2>/dev/null; true';
-    }
-    exec(command, () => resolve());
-  });
-}
-
-function launchEdgeWithCDP() {
-  return new Promise((resolve, reject) => {
-    const platform = os.platform();
-    const edgePath = getEdgePath();
-    const userDataDir = path.join(os.homedir(), 'Library', 'Application Support', 'Microsoft Edge For Testing');
-    let command;
-
-    if (platform === 'darwin') {
-      command = `open -a ${edgePath} --args --remote-debugging-port=${CDP_PORT} --user-data-dir="${userDataDir}"`;
-    } else if (platform === 'win32') {
-      command = `start msedge --remote-debugging-port=${CDP_PORT} --user-data-dir="${userDataDir}"`;
-    } else {
-      command = `msedge --remote-debugging-port=${CDP_PORT} --user-data-dir="${userDataDir}" &`;
-    }
-
-    exec(command, (err) => {
-      if (err) reject(new Error(`启动 Edge 浏览器失败: ${err.message}`));
-      else resolve();
-    });
-  });
-}
-
-async function waitForCDP(timeout = 30000, interval = 1000) {
-  const start = Date.now();
-  while (Date.now() - start < timeout) {
-    const ready = await checkCDPPort();
-    if (ready) return true;
-    await new Promise(r => setTimeout(r, interval));
-  }
-  return false;
-}
-
-export async function ensureBrowserReady() {
-  const isReady = await checkCDPPort();
-  let needLaunch = !isReady;
-
-  if (!needLaunch) {
-    const edgeArgsValid = await checkEdgeArgs();
-    if (!edgeArgsValid) {
-      console.error('Edge 已运行但启动参数不完整，正在重启...');
-      await killEdgeProcesses();
-      await new Promise(r => setTimeout(r, 3000));
-      needLaunch = true;
-    }
-  }
-
-  if (needLaunch) {
-    const edgeRunning = await isEdgeRunning();
-    if (edgeRunning) {
-      console.error(`Edge 已运行但 CDP 端口 ${CDP_PORT} 未启用，正在重启...`);
-      await killEdgeProcesses();
-      await new Promise(r => setTimeout(r, 3000));
-    } else {
-      console.error(`CDP 端口 ${CDP_PORT} 未就绪，正在启动 Edge 浏览器...`);
-    }
-    await launchEdgeWithCDP();
-
-    console.error('等待浏览器启动...');
-    const launched = await waitForCDP();
-    if (!launched) {
-      throw new Error(
-        `等待 CDP 端口 ${CDP_PORT} 超时。请确认 Edge 浏览器已安装，\n` +
-        '或手动启动: Microsoft Edge --remote-debugging-port=9222'
-      );
-    }
-    console.error('浏览器启动成功');
-  }
-
-  const browser = await chromium.connectOverCDP(`http://127.0.0.1:${CDP_PORT}`);
-  return browser;
-}
+import { exec } from 'child_process';
+import http from 'http';
+import os from 'os';
+import path from 'path';
+import { chromium } from 'playwright';
+
+const DEFAULT_CDP_PORT = 9222;
+const DEFAULT_USER_DATA_DIR = path.join(os.homedir(), 'Library', 'Application Support', 'Microsoft Edge For Testing');
+
+function getEdgePath() {
+  const platform = os.platform();
+  if (platform === 'darwin') return '"Microsoft Edge"';
+  if (platform === 'win32') return 'msedge.exe';
+  return 'msedge';
+}
+
+function isEdgeRunning() {
+  return new Promise(resolve => {
+    const platform = os.platform();
+    let command;
+    if (platform === 'darwin') {
+      command = 'ps aux | grep -q "[M]icrosoft Edge.app/Contents/MacOS/Microsoft Edge" 2>/dev/null';
+    } else if (platform === 'win32') {
+      command = 'tasklist /FI "IMAGENAME eq msedge.exe" 2>nul | findstr /I msedge';
+    } else {
+      command = 'pgrep -f msedge > /dev/null 2>&1';
+    }
+    exec(command, (err) => resolve(!err));
+  });
+}
+
+function checkCDPPort(port) {
+  return new Promise(resolve => {
+    const req = http.get(`http://127.0.0.1:${port}/json`, res => {
+      res.on('data', () => {});
+      res.on('end', () => resolve(res.statusCode === 200));
+    });
+    req.on('error', () => resolve(false));
+    req.setTimeout(3000, () => { resolve(false); req.destroy(); });
+  });
+}
+
+function checkEdgeArgs() {
+  return new Promise(resolve => {
+    const platform = os.platform();
+    let command;
+    if (platform === 'darwin') {
+      command = 'ps aux | grep "[M]icrosoft Edge" | grep -v "Helper\\|crashpad" | grep "user-data-dir"';
+    } else if (platform === 'win32') {
+      command = 'wmic process where "name like \\"%msedge%\\"" get commandline | findstr "user-data-dir"';
+    } else {
+      command = 'ps aux | grep "[m]sedge" | grep -v "Helper\\|crashpad" | grep "user-data-dir"';
+    }
+    exec(command, (err, stdout) => resolve(!err && stdout.trim().length > 0));
+  });
+}
+
+function killEdgeProcesses() {
+  return new Promise(resolve => {
+    const platform = os.platform();
+    let command;
+    if (platform === 'darwin') {
+      command = 'killall -9 "Microsoft Edge" 2>/dev/null; rm -f ~/Library/Caches/Microsoft\\ Edge/Singleton*; true';
+    } else if (platform === 'win32') {
+      command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
+    } else {
+      command = 'pkill -9 -f msedge 2>/dev/null; true';
+    }
+    exec(command, () => resolve());
+  });
+}
+
+function launchEdgeWithCDP(port, userDataDir) {
+  return new Promise((resolve, reject) => {
+    const platform = os.platform();
+    const edgePath = getEdgePath();
+    let command;
+
+    if (platform === 'darwin') {
+      command = `open -a ${edgePath} --args --remote-debugging-port=${port} --user-data-dir="${userDataDir}"`;
+    } else if (platform === 'win32') {
+      command = `start msedge --remote-debugging-port=${port} --user-data-dir="${userDataDir}"`;
+    } else {
+      command = `msedge --remote-debugging-port=${port} --user-data-dir="${userDataDir}" &`;
+    }
+
+    exec(command, (err) => {
+      if (err) reject(new Error(`启动 Edge 浏览器失败: ${err.message}`));
+      else resolve();
+    });
+  });
+}
+
+async function waitForCDP(port, timeout = 30000, interval = 1000) {
+  const start = Date.now();
+  while (Date.now() - start < timeout) {
+    const ready = await checkCDPPort(port);
+    if (ready) return true;
+    await new Promise(r => setTimeout(r, interval));
+  }
+  return false;
+}
+
+export async function ensureBrowserReady(options = {}) {
+  const port = options.port || DEFAULT_CDP_PORT;
+  const userDataDir = options.userDataDir || DEFAULT_USER_DATA_DIR;
+  const isCustom = port !== DEFAULT_CDP_PORT || !!options.userDataDir;
+
+  const isReady = await checkCDPPort(port);
+  let needLaunch = !isReady;
+
+  if (!needLaunch) {
+    if (!isCustom) {
+      const edgeArgsValid = await checkEdgeArgs();
+      if (!edgeArgsValid) {
+        console.error('Edge 已运行但启动参数不完整，正在重启...');
+        await killEdgeProcesses();
+        await new Promise(r => setTimeout(r, 3000));
+        needLaunch = true;
+      }
+    }
+  }
+
+  if (needLaunch) {
+    if (isCustom) {
+      console.error(`CDP 端口 ${port} 未就绪，正在启动 Edge 浏览器...`);
+    } else {
+      const edgeRunning = await isEdgeRunning();
+      if (edgeRunning) {
+        console.error(`Edge 已运行但 CDP 端口 ${port} 未启用，正在重启...`);
+        await killEdgeProcesses();
+        await new Promise(r => setTimeout(r, 3000));
+      } else {
+        console.error(`CDP 端口 ${port} 未就绪，正在启动 Edge 浏览器...`);
+      }
+    }
+    await launchEdgeWithCDP(port, userDataDir);
+
+    console.error('等待浏览器启动...');
+    const launched = await waitForCDP(port);
+    if (!launched) {
+      throw new Error(
+        `等待 CDP 端口 ${port} 超时。请确认 Edge 浏览器已安装，\n` +
+        `或手动启动: Microsoft Edge --remote-debugging-port=${port}`
+      );
+    }
+    console.error('浏览器启动成功');
+  }
+
+  const browser = await chromium.connectOverCDP(`http://127.0.0.1:${port}`);
+  return browser;
+}

package/src/lib/constants.js

@@ -1,7 +1,6 @@
 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);
@@ -105,11 +104,8 @@ function getConfigText() {
 export {
   proxy,
   server,
-  configFile,
   configPath,
   DEFAULT_PROXY,
-  DEFAULT_OUTPUT,
-  USER_SECTION_SIZE,
   HELP_TEXT,
   browser,
   userId,

package/src/lib/explore-fetch.js

@@ -3,7 +3,7 @@ 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';
+import { scrollAndCollect } from './scroll-collector.js';
 
 const EXPLORE_URL = 'https://www.tiktok.com/explore';
 

package/src/{scraper/modules/page-error-detector.mjs → lib/page-error-detector.js}

@@ -1,70 +1,70 @@
-const PATTERNS = {
-  login_required: [
-    "登录 TikTok",
-    "登录后查看",
-    "查看需登录",
-    "Log in to TikTok",
-    "Login to TikTok",
-    "观众管理功能",
-    "Viewer management",
-    "私密账号",
-    "私密状态",
-  ],
-  captcha: [
-    "captcha",
-    "verify",
-    "验证码",
-    "点击下一步",
-    "Press and hold",
-    "slide to verify",
-    "滑动验证",
-    "人机验证",
-    "安全验证",
-  ],
-  rate_limited: [
-    "访问过于频繁",
-    "操作过于频繁",
-    "too many requests",
-    "rate limit",
-    "稍后再试",
-    "try again later",
-    "请稍后再来",
-  ],
-  region_blocked: [
-    "地区限制",
-    "not available in your",
-    "此内容不可用",
-    "content not available",
-    "currently unavailable",
-    "抱歉，此内容",
-    "此页面不可用",
-  ],
-  not_found: [
-    "页面不存在",
-    "page not found",
-    "找不到",
-    "Couldn't find this",
-    "nothing here",
-    "此页面不存在",
-    "没有内容",
-    "发起对话",
-    "0 条评论",
-  ],
-};
-
-export async function detectPageError(page) {
-  return page.evaluate((patterns) => {
-    const bodyText = document.body.innerText;
-    const lower = bodyText.toLowerCase();
-
-    for (const [type, phrases] of Object.entries(patterns)) {
-      for (const phrase of phrases) {
-        if (lower.includes(phrase.toLowerCase())) {
-          return type;
-        }
-      }
-    }
-
-    return null;
-  }, PATTERNS);
-}
+const PATTERNS = {
+  login_required: [
+    "登录 TikTok",
+    "登录后查看",
+    "查看需登录",
+    "Log in to TikTok",
+    "Login to TikTok",
+    "观众管理功能",
+    "Viewer management",
+    "私密账号",
+    "私密状态",
+  ],
+  captcha: [
+    "captcha",
+    "verify",
+    "验证码",
+    "点击下一步",
+    "Press and hold",
+    "slide to verify",
+    "滑动验证",
+    "人机验证",
+    "安全验证",
+  ],
+  rate_limited: [
+    "访问过于频繁",
+    "操作过于频繁",
+    "too many requests",
+    "rate limit",
+    "稍后再试",
+    "try again later",
+    "请稍后再来",
+  ],
+  region_blocked: [
+    "地区限制",
+    "not available in your",
+    "此内容不可用",
+    "content not available",
+    "currently unavailable",
+    "抱歉，此内容",
+    "此页面不可用",
+  ],
+  not_found: [
+    "页面不存在",
+    "page not found",
+    "找不到",
+    "Couldn't find this",
+    "nothing here",
+    "此页面不存在",
+    "没有内容",
+    "发起对话",
+    "0 条评论",
+  ],
+};
+
+export async function detectPageError(page) {
+  return page.evaluate((patterns) => {
+    const bodyText = document.body.innerText;
+    const lower = bodyText.toLowerCase();
+
+    for (const [type, phrases] of Object.entries(patterns)) {
+      for (const phrase of phrases) {
+        if (lower.includes(phrase.toLowerCase())) {
+          return type;
+        }
+      }
+    }
+
+    return null;
+  }, PATTERNS);
+}