tt-help-cli-ycl 1.3.25 → 1.3.27

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,237 +1,237 @@
-import { exec } from 'child_process';
-import { execSync } from 'child_process';
-import fs from 'fs';
-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') {
-      if (targetDir) {
-        try {
-          const ps1Path = path.join(os.tmpdir(), `kill-edge-${Date.now()}.ps1`);
-          const escapedDir = targetDir.replace(/'/g, "''");
-          const ps1Content = `$procs = Get-CimInstance Win32_Process -Filter "Name='msedge.exe'" 2>$null; ` +
-            `$count = 0; ` +
-            `foreach ($p in $procs) { ` +
-            `  if ($p.CommandLine -and $p.CommandLine -like "*${escapedDir}*") { ` +
-            `    Stop-Process -Id $p.ProcessId -Force -ErrorAction SilentlyContinue; ` +
-            `    $count++ ` +
-            `  } ` +
-            `}; ` +
-            `Get-ChildItem "$env:LOCALAPPDATA\\Microsoft\\Edge\\Singleton*" -ErrorAction SilentlyContinue | Remove-Item -Force; ` +
-            `Write-Output $count`;
-          fs.writeFileSync(ps1Path, ps1Content);
-          const result = execSync(
-            `powershell.exe -ExecutionPolicy Bypass -File "${ps1Path}"`
-          ).toString().trim();
-          fs.unlinkSync(ps1Path);
-          command = 'exit 0';
-        } catch {
-          command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
-        }
-      } else {
-        command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
-      }
+import { exec } from 'child_process';
+import { execSync } from 'child_process';
+import fs from 'fs';
+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 {
-      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;
-}
-
-export async function switchAccount(oldAccount, newAccount) {
-  console.error(`\n[账户切换] 从端口 ${oldAccount.port} -> ${newAccount.port}`);
-
-  await killEdgeProcesses(oldAccount.userDataDir);
-  await new Promise(r => setTimeout(r, 3000));
-
-  const newCdpOptions = {};
-  newCdpOptions.port = newAccount.port;
-  newCdpOptions.userDataDir = newAccount.userDataDir;
-
-  const browser = await ensureBrowserReady(newCdpOptions);
-
-  await new Promise(r => setTimeout(r, 10000));
-
-  return browser;
-}
+      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') {
+      if (targetDir) {
+        try {
+          const ps1Path = path.join(os.tmpdir(), `kill-edge-${Date.now()}.ps1`);
+          const escapedDir = targetDir.replace(/'/g, "''");
+          const ps1Content = `$procs = Get-CimInstance Win32_Process -Filter "Name='msedge.exe'" 2>$null; ` +
+            `$count = 0; ` +
+            `foreach ($p in $procs) { ` +
+            `  if ($p.CommandLine -and $p.CommandLine -like "*${escapedDir}*") { ` +
+            `    Stop-Process -Id $p.ProcessId -Force -ErrorAction SilentlyContinue; ` +
+            `    $count++ ` +
+            `  } ` +
+            `}; ` +
+            `Get-ChildItem "$env:LOCALAPPDATA\\Microsoft\\Edge\\Singleton*" -ErrorAction SilentlyContinue | Remove-Item -Force; ` +
+            `Write-Output $count`;
+          fs.writeFileSync(ps1Path, ps1Content);
+          const result = execSync(
+            `powershell.exe -ExecutionPolicy Bypass -File "${ps1Path}"`
+          ).toString().trim();
+          fs.unlinkSync(ps1Path);
+          command = 'exit 0';
+        } catch {
+          command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
+        }
+      } else {
+        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;
+}
+
+export async function switchAccount(oldAccount, newAccount) {
+  console.error(`\n[账户切换] 从端口 ${oldAccount.port} -> ${newAccount.port}`);
+
+  await killEdgeProcesses(oldAccount.userDataDir);
+  await new Promise(r => setTimeout(r, 3000));
+
+  const newCdpOptions = {};
+  newCdpOptions.port = newAccount.port;
+  newCdpOptions.userDataDir = newAccount.userDataDir;
+
+  const browser = await ensureBrowserReady(newCdpOptions);
+
+  await new Promise(r => setTimeout(r, 10000));
+
+  return browser;
+}

package/src/lib/browser/health-checker.js

@@ -1,10 +1,11 @@
-import os from 'os';
-import path from 'path';
+import os from "os";
+import path from "path";
+import { execSync } from "child_process";
 
 const TOTAL_ACCOUNTS = 10;
 const BASE_PORT = 9222;
 const MEMORY_THRESHOLD = 0.9;
-const ROTATE_INTERVAL_MS = 2 * 60 * 60 * 1000;
+const ROTATE_INTERVAL_MS = 1 * 60 * 60 * 1000; // 1小时
 
 class HealthChecker {
   constructor() {
@@ -16,7 +17,10 @@ class HealthChecker {
         port,
         profile,
         userDataDir: path.join(
-          os.homedir(), 'Library', 'Application Support', `Microsoft Edge For Testing_${profile}`
+          os.homedir(),
+          "Library",
+          "Application Support",
+          `Microsoft Edge For Testing_${profile}`,
         ),
       });
     }
@@ -30,11 +34,47 @@ class HealthChecker {
 
   getNextAccount() {
     this.currentIndex = (this.currentIndex + 1) % TOTAL_ACCOUNTS;
+    this.startTime = Date.now(); // 切换后重置运行时间
     return this.accounts[this.currentIndex];
   }
 
   check() {
-    const memUsage = (1 - os.freemem() / os.totalmem());
+    let memUsage;
+    const platform = os.platform();
+
+    if (platform === "darwin") {
+      // macOS 上 os.freemem() 不包含 inactive 内存，导致虚高
+      // 使用 vm_stat 获取准确数据
+      try {
+        const vmStat = execSync("vm_stat", { encoding: "utf-8" });
+        const parsePages = (line) => {
+          const match = line.match(/Pages (\w+(?:\s+\w+)*):\s+(\d+)/);
+          return match ? parseInt(match[2], 10) : 0;
+        };
+        const lines = vmStat.trim().split("\n");
+        const pageSize = 16384;
+        const active = parsePages(
+          lines.find((l) => l.includes("active")) || "",
+        );
+        const wired = parsePages(
+          lines.find((l) => l.includes("wired down")) || "",
+        );
+        const compressor = parsePages(
+          lines.find((l) => l.includes("occupied by compressor")) || "",
+        );
+        const total = os.totalmem();
+        const used = (active + wired + compressor) * pageSize;
+        memUsage = used / total;
+      } catch {
+        // 降级：使用估算
+        const total = os.totalmem();
+        const free = os.freemem();
+        const inactiveEstimate = total * 0.35;
+        memUsage = 1 - (free + inactiveEstimate) / total;
+      }
+    } else {
+      memUsage = 1 - os.freemem() / os.totalmem();
+    }
     const memPercent = (memUsage * 100).toFixed(1);
 
     if (memUsage >= MEMORY_THRESHOLD) {
@@ -47,7 +87,15 @@ class HealthChecker {
       return { shouldSwitch: true, reason: `运行 ${mins} 分钟` };
     }
 
-    return { shouldSwitch: false };
+    // 计算预计切换时间
+    const remainingMs = ROTATE_INTERVAL_MS - elapsed;
+    const remainingMins = Math.round(remainingMs / 60000);
+    const memHeadroom = ((MEMORY_THRESHOLD - memUsage) * 100).toFixed(1);
+
+    return {
+      shouldSwitch: false,
+      info: `内存 ${memPercent}% (余量 ${memHeadroom}%) | 定时轮换 ${remainingMins} 分钟后`,
+    };
   }
 }