tt-help-cli-ycl 1.3.12 → 1.3.13

package/src/lib/browser/anti-detect.js

@@ -1,23 +1,23 @@
-export function getAntiDetectScript() {
-  return () => {
-    Object.defineProperty(navigator, 'webdriver', { get: () => false });
-
-    if (!window.chrome) {
-      window.chrome = { runtime: {} };
-    }
-
-    const originalQuery = window.navigator.permissions.query;
-    window.navigator.permissions.query = (params) =>
-      params.name === 'notifications'
-        ? Promise.resolve({ state: Notification.permission })
-        : originalQuery(params);
-
-    Object.defineProperty(navigator, 'languages', {
-      get: () => ['en-US', 'en'],
-    });
-
-    Object.defineProperty(navigator, 'plugins', {
-      get: () => [1, 2, 3, 4, 5],
-    });
-  };
-}
+export function getAntiDetectScript() {
+  return () => {
+    Object.defineProperty(navigator, 'webdriver', { get: () => false });
+
+    if (!window.chrome) {
+      window.chrome = { runtime: {} };
+    }
+
+    const originalQuery = window.navigator.permissions.query;
+    window.navigator.permissions.query = (params) =>
+      params.name === 'notifications'
+        ? Promise.resolve({ state: Notification.permission })
+        : originalQuery(params);
+
+    Object.defineProperty(navigator, 'languages', {
+      get: () => ['en-US', 'en'],
+    });
+
+    Object.defineProperty(navigator, 'plugins', {
+      get: () => [1, 2, 3, 4, 5],
+    });
+  };
+}

package/src/lib/browser/cdp.js

@@ -1,4 +1,5 @@
 import { exec } from 'child_process';
+import { execSync } from 'child_process';
 import http from 'http';
 import os from 'os';
 import path from 'path';
@@ -55,16 +56,40 @@ function checkEdgeArgs() {
   });
 }
 
-function killEdgeProcesses() {
+function killEdgeProcesses(targetDir) {
   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';
+      if (targetDir) {
+        let pids = '';
+        try {
+          // ps aux 输出中 --user-data-dir= 后面没有引号
+          // 用路径精确匹配，结尾加空格或行尾避免子串误杀
+          const escapedDir = targetDir.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+          pids = execSync(
+            `ps aux | grep "[M]icrosoft Edge" | grep -v "Helper\\|crashpad" | grep -E -- '--user-data-dir=${escapedDir}($|[^A-Za-z0-9_])' | awk '{print $2}'`
+          ).toString().trim();
+        } catch (e) {
+          pids = '';
+        }
+        if (pids) {
+          command = `kill -9 ${pids} 2>/dev/null; rm -f ~/Library/Caches/Microsoft\\ Edge/Singleton*; true`;
+        } else {
+          command = 'true';
+        }
+      } else {
+        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';
+      if (targetDir) {
+        const escapedDir = targetDir.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+        command = `ps aux | grep msedge | grep -v Helper | grep -E -- '--user-data-dir=${escapedDir}($|[^A-Za-z0-9_])' | awk '{print $2}' | xargs -r kill -9 2>/dev/null; true`;
+      } else {
+        command = 'pkill -9 -f msedge 2>/dev/null; true';
+      }
     }
     exec(command, () => resolve());
   });
@@ -76,12 +101,27 @@ function launchEdgeWithCDP(port, userDataDir) {
     const edgePath = getEdgePath();
     let command;
 
+    const extraArgs = [
+      `--remote-debugging-port=${port}`,
+      `--user-data-dir="${userDataDir}"`,
+      '--disable-blink-features=AutomationControlled',
+      '--no-first-run',
+      '--no-default-browser-check',
+      '--password-store=basic',
+      '--disable-background-mode',
+      '--disable-component-update',
+      '--disable-crash-reporter',
+      '--disable-breakpad',
+      '--disable-background-networking',
+      '--disable-sync',
+    ].join(' ');
+
     if (platform === 'darwin') {
-      command = `open -a ${edgePath} --args --remote-debugging-port=${port} --user-data-dir="${userDataDir}"`;
+      command = `open -a ${edgePath} --new --args ${extraArgs}`;
     } else if (platform === 'win32') {
-      command = `start msedge --remote-debugging-port=${port} --user-data-dir="${userDataDir}"`;
+      command = `start msedge ${extraArgs}`;
     } else {
-      command = `msedge --remote-debugging-port=${port} --user-data-dir="${userDataDir}" &`;
+      command = `msedge ${extraArgs} &`;
     }
 
     exec(command, (err) => {
@@ -101,6 +141,8 @@ async function waitForCDP(port, timeout = 30000, interval = 1000) {
   return false;
 }
 
+export { killEdgeProcesses };
+
 export async function ensureBrowserReady(options = {}) {
   const port = options.port || DEFAULT_CDP_PORT;
   const userDataDir = options.userDataDir || DEFAULT_USER_DATA_DIR;
@@ -113,8 +155,8 @@ export async function ensureBrowserReady(options = {}) {
     if (!isCustom) {
       const edgeArgsValid = await checkEdgeArgs();
       if (!edgeArgsValid) {
-        console.error('Edge 已运行但启动参数不完整，正在重启...');
-        await killEdgeProcesses();
+        console.error(`Edge 已运行但启动参数不完整，正在重启端口 ${port}...`);
+        await killEdgeProcesses(userDataDir);
         await new Promise(r => setTimeout(r, 3000));
         needLaunch = true;
       }
@@ -128,7 +170,7 @@ export async function ensureBrowserReady(options = {}) {
       const edgeRunning = await isEdgeRunning();
       if (edgeRunning) {
         console.error(`Edge 已运行但 CDP 端口 ${port} 未启用，正在重启...`);
-        await killEdgeProcesses();
+        await killEdgeProcesses(userDataDir);
         await new Promise(r => setTimeout(r, 3000));
       } else {
         console.error(`CDP 端口 ${port} 未就绪，正在启动 Edge 浏览器...`);
@@ -141,7 +183,7 @@ export async function ensureBrowserReady(options = {}) {
     if (!launched) {
       throw new Error(
         `等待 CDP 端口 ${port} 超时。请确认 Edge 浏览器已安装，\n` +
-        `或手动启动: Microsoft Edge --remote-debugging-port=${port}`
+        `或手动启动: Microsoft Edge --remote-debugging-port=${port} [参见 cdp.js extraArgs]`
       );
     }
     console.error('浏览器启动成功');

package/src/lib/browser/launch.js

@@ -1,43 +1,43 @@
-import { accessSync } from 'fs';
-
-export function detectBrowser() {
-  const isMac = process.platform === 'darwin';
-  const isWin = process.platform === 'win32';
-  const isLinux = process.platform === 'linux';
-
-  const paths = [];
-
-  if (isMac) {
-    paths.push(
-      '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-      '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
-      '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
-      '/Applications/Brave Browser.app/Contents/MacOS/Brave Browser',
-    );
-  } else if (isWin) {
-    const localAppData = process.env.LOCALAPPDATA || '';
-    const programFiles = process.env.PROGRAMFILES || '';
-    const programFilesX86 = process.env['PROGRAMFILES(X86)'] || '';
-    paths.push(
-      `${programFiles}\\Google\\Chrome\\Application\\chrome.exe`,
-      `${programFilesX86}\\Google\\Chrome\\Application\\chrome.exe`,
-      `${localAppData}\\Google\\Chrome\\Application\\chrome.exe`,
-      `${programFiles}\\Microsoft\\Edge\\Application\\msedge.exe`,
-      `${programFilesX86}\\Microsoft\\Edge\\Application\\msedge.exe`,
-    );
-  } else if (isLinux) {
-    paths.push(
-      '/usr/bin/google-chrome',
-      '/usr/bin/google-chrome-stable',
-      '/usr/bin/chromium-browser',
-      '/usr/bin/chromium',
-      '/snap/bin/chromium',
-      '/usr/bin/microsoft-edge',
-    );
-  }
-
-  for (const p of paths) {
-    try { accessSync(p); return p; } catch { /* not found */ }
-  }
-  return null;
-}
+import { accessSync } from 'fs';
+
+export function detectBrowser() {
+  const isMac = process.platform === 'darwin';
+  const isWin = process.platform === 'win32';
+  const isLinux = process.platform === 'linux';
+
+  const paths = [];
+
+  if (isMac) {
+    paths.push(
+      '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+      '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
+      '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
+      '/Applications/Brave Browser.app/Contents/MacOS/Brave Browser',
+    );
+  } else if (isWin) {
+    const localAppData = process.env.LOCALAPPDATA || '';
+    const programFiles = process.env.PROGRAMFILES || '';
+    const programFilesX86 = process.env['PROGRAMFILES(X86)'] || '';
+    paths.push(
+      `${programFiles}\\Google\\Chrome\\Application\\chrome.exe`,
+      `${programFilesX86}\\Google\\Chrome\\Application\\chrome.exe`,
+      `${localAppData}\\Google\\Chrome\\Application\\chrome.exe`,
+      `${programFiles}\\Microsoft\\Edge\\Application\\msedge.exe`,
+      `${programFilesX86}\\Microsoft\\Edge\\Application\\msedge.exe`,
+    );
+  } else if (isLinux) {
+    paths.push(
+      '/usr/bin/google-chrome',
+      '/usr/bin/google-chrome-stable',
+      '/usr/bin/chromium-browser',
+      '/usr/bin/chromium',
+      '/snap/bin/chromium',
+      '/usr/bin/microsoft-edge',
+    );
+  }
+
+  for (const p of paths) {
+    try { accessSync(p); return p; } catch { /* not found */ }
+  }
+  return null;
+}

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