tt-help-cli-ycl 1.3.11 → 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,142 +1,194 @@
-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 { execSync } 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(targetDir) {
+  return new Promise(resolve => {
+    const platform = os.platform();
+    let command;
+    if (platform === 'darwin') {
+      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 {
+      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());
+  });
+}
+
+function launchEdgeWithCDP(port, userDataDir) {
+  return new Promise((resolve, reject) => {
+    const platform = os.platform();
+    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} --new --args ${extraArgs}`;
+    } else if (platform === 'win32') {
+      command = `start msedge ${extraArgs}`;
+    } else {
+      command = `msedge ${extraArgs} &`;
+    }
+
+    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 { killEdgeProcesses };
+
+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 已运行但启动参数不完整，正在重启端口 ${port}...`);
+        await killEdgeProcesses(userDataDir);
+        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(userDataDir);
+        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} [参见 cdp.js extraArgs]`
+      );
+    }
+    console.error('浏览器启动成功');
+  }
+
+  const browser = await chromium.connectOverCDP(`http://127.0.0.1:${port}`);
+  return browser;
+}

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