tt-help-cli-ycl 1.3.44 → 1.3.46

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

@@ -1,114 +1,114 @@
-import os from "os";
-import path from "path";
-import { execSync } from "child_process";
-
-const DEFAULT_BASE_PORT = 9222;
-const DEFAULT_TOTAL_ACCOUNTS = 10;
-const MEMORY_THRESHOLD = 0.95;
-const ROTATE_INTERVAL_MS = 0.8 * 60 * 60 * 1000;
-
-class HealthChecker {
-  constructor(options = {}) {
-    const basePort = options.basePort ?? DEFAULT_BASE_PORT;
-    const totalAccounts = options.totalAccounts ?? DEFAULT_TOTAL_ACCOUNTS;
-
-    this.accounts = [];
-    for (let i = 0; i < totalAccounts; i++) {
-      const port = basePort + i;
-      const profile = `p${port}`;
-      this.accounts.push({
-        port,
-        profile,
-        userDataDir: path.join(
-          os.homedir(),
-          "Library",
-          "Application Support",
-          `Microsoft Edge For Testing_${profile}`,
-        ),
-      });
-    }
-    this.currentIndex = 0;
-    this.startTime = Date.now();
-  }
-
-  getCurrentAccount() {
-    return this.accounts[this.currentIndex];
-  }
-
-  getNextAccount() {
-    this.currentIndex = (this.currentIndex + 1) % this.accounts.length;
-    this.startTime = Date.now(); // 切换后重置运行时间
-    return this.accounts[this.currentIndex];
-  }
-
-  check() {
-    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) {
-      const currentPort = this.accounts[this.currentIndex].port;
-      return {
-        shouldSwitch: true,
-        reason: `端口 ${currentPort} | 系统内存 ${memPercent}%`,
-      };
-    }
-
-    const elapsed = Date.now() - this.startTime;
-    if (elapsed >= ROTATE_INTERVAL_MS) {
-      const mins = Math.round(elapsed / 60000);
-      const currentPort = this.accounts[this.currentIndex].port;
-      return {
-        shouldSwitch: true,
-        reason: `端口 ${currentPort} | 运行 ${mins} 分钟`,
-      };
-    }
-
-    // 计算预计切换时间
-    const remainingMs = ROTATE_INTERVAL_MS - elapsed;
-    const remainingMins = Math.round(remainingMs / 60000);
-    const memHeadroom = ((MEMORY_THRESHOLD - memUsage) * 100).toFixed(1);
-    const currentPort = this.accounts[this.currentIndex].port;
-
-    return {
-      shouldSwitch: false,
-      info: `端口 ${currentPort} | 内存 ${memPercent}% (余量 ${memHeadroom}%) | 定时轮换 ${remainingMins} 分钟后`,
-    };
-  }
-}
-
-export { HealthChecker };
+import os from "os";
+import path from "path";
+import { execSync } from "child_process";
+
+const DEFAULT_BASE_PORT = 9222;
+const DEFAULT_TOTAL_ACCOUNTS = 10;
+const MEMORY_THRESHOLD = 0.95;
+const ROTATE_INTERVAL_MS = 0.8 * 60 * 60 * 1000;
+
+class HealthChecker {
+  constructor(options = {}) {
+    const basePort = options.basePort ?? DEFAULT_BASE_PORT;
+    const totalAccounts = options.totalAccounts ?? DEFAULT_TOTAL_ACCOUNTS;
+
+    this.accounts = [];
+    for (let i = 0; i < totalAccounts; i++) {
+      const port = basePort + i;
+      const profile = `p${port}`;
+      this.accounts.push({
+        port,
+        profile,
+        userDataDir: path.join(
+          os.homedir(),
+          "Library",
+          "Application Support",
+          `Microsoft Edge For Testing_${profile}`,
+        ),
+      });
+    }
+    this.currentIndex = 0;
+    this.startTime = Date.now();
+  }
+
+  getCurrentAccount() {
+    return this.accounts[this.currentIndex];
+  }
+
+  getNextAccount() {
+    this.currentIndex = (this.currentIndex + 1) % this.accounts.length;
+    this.startTime = Date.now(); // 切换后重置运行时间
+    return this.accounts[this.currentIndex];
+  }
+
+  check() {
+    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) {
+      const currentPort = this.accounts[this.currentIndex].port;
+      return {
+        shouldSwitch: true,
+        reason: `端口 ${currentPort} | 系统内存 ${memPercent}%`,
+      };
+    }
+
+    const elapsed = Date.now() - this.startTime;
+    if (elapsed >= ROTATE_INTERVAL_MS) {
+      const mins = Math.round(elapsed / 60000);
+      const currentPort = this.accounts[this.currentIndex].port;
+      return {
+        shouldSwitch: true,
+        reason: `端口 ${currentPort} | 运行 ${mins} 分钟`,
+      };
+    }
+
+    // 计算预计切换时间
+    const remainingMs = ROTATE_INTERVAL_MS - elapsed;
+    const remainingMins = Math.round(remainingMs / 60000);
+    const memHeadroom = ((MEMORY_THRESHOLD - memUsage) * 100).toFixed(1);
+    const currentPort = this.accounts[this.currentIndex].port;
+
+    return {
+      shouldSwitch: false,
+      info: `端口 ${currentPort} | 内存 ${memPercent}% (余量 ${memHeadroom}%) | 定时轮换 ${remainingMins} 分钟后`,
+    };
+  }
+}
+
+export { HealthChecker };

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