refactor: unify skill cdp and release artifacts

2026-08-07 17:33:03 +08:00 · 2026-03-11 19:38:59 -05:00
parent 00bf946403
commit 069c5dc7d7
34 changed files with 1822 additions and 1633 deletions
@@ -1,12 +1,23 @@
-import { spawnSync } from 'node:child_process';
-import fs from 'node:fs';
-import net from 'node:net';
-import os from 'node:os';
+import { execSync, spawnSync } from 'node:child_process';
 import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';

-export const CHROME_CANDIDATES = {
+import {
+  CdpConnection,
+  findChromeExecutable as findChromeExecutableBase,
+  findExistingChromeDebugPort as findExistingChromeDebugPortBase,
+  getFreePort as getFreePortBase,
+  launchChrome as launchChromeBase,
+  resolveSharedChromeProfileDir,
+  sleep,
+  waitForChromeDebugPort,
+  type PlatformCandidates,
+} from 'baoyu-chrome-cdp';
+
+export { CdpConnection, sleep, waitForChromeDebugPort };
+
+export const CHROME_CANDIDATES: PlatformCandidates = {
  darwin: [
    '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
    '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
@@ -23,183 +34,81 @@ export const CHROME_CANDIDATES = {
  ],
 };

-export function findChromeExecutable(): string | undefined {
-  const override = process.env.WEIBO_BROWSER_CHROME_PATH?.trim();
-  if (override && fs.existsSync(override)) return override;
-
-  const candidates = process.platform === 'darwin'
-    ? CHROME_CANDIDATES.darwin
-    : process.platform === 'win32'
-      ? CHROME_CANDIDATES.win32
-      : CHROME_CANDIDATES.default;
-
-  for (const candidate of candidates) {
-    if (fs.existsSync(candidate)) return candidate;
+let wslHome: string | null | undefined;
+function getWslWindowsHome(): string | null {
+  if (wslHome !== undefined) return wslHome;
+  if (!process.env.WSL_DISTRO_NAME) {
+    wslHome = null;
+    return null;
  }
-  return undefined;
+  try {
+    const raw = execSync('cmd.exe /C "echo %USERPROFILE%"', {
+      encoding: 'utf-8',
+      timeout: 5_000,
+    }).trim().replace(/\r/g, '');
+    wslHome = execSync(`wslpath -u "${raw}"`, {
+      encoding: 'utf-8',
+      timeout: 5_000,
+    }).trim() || null;
+  } catch {
+    wslHome = null;
+  }
+  return wslHome;
 }

-export function findExistingChromeDebugPort(profileDir: string): number | null {
-  try {
-    const result = spawnSync('ps', ['aux'], { encoding: 'utf-8', timeout: 5000 });
-    if (result.status !== 0 || !result.stdout) return null;
-    const lines = result.stdout.split('\n');
-    for (const line of lines) {
-      if (!line.includes('--remote-debugging-port=') || !line.includes(profileDir)) continue;
-      const portMatch = line.match(/--remote-debugging-port=(\d+)/);
-      if (portMatch) return Number(portMatch[1]);
-    }
-  } catch {}
-  return null;
+export function findChromeExecutable(chromePathOverride?: string): string | undefined {
+  if (chromePathOverride?.trim()) return chromePathOverride.trim();
+  return findChromeExecutableBase({
+    candidates: CHROME_CANDIDATES,
+    envNames: ['WEIBO_BROWSER_CHROME_PATH'],
+  });
+}
+
+export async function findExistingChromeDebugPort(profileDir: string): Promise<number | null> {
+  return await findExistingChromeDebugPortBase({ profileDir });
 }

 export function killChromeByProfile(profileDir: string): void {
  try {
-    const result = spawnSync('ps', ['aux'], { encoding: 'utf-8', timeout: 5000 });
+    const result = spawnSync('ps', ['aux'], { encoding: 'utf-8', timeout: 5_000 });
    if (result.status !== 0 || !result.stdout) return;
    for (const line of result.stdout.split('\n')) {
      if (!line.includes(profileDir) || !line.includes('--remote-debugging-port=')) continue;
-      const pidMatch = line.trim().split(/\s+/)[1];
-      if (pidMatch) {
-        try { process.kill(Number(pidMatch), 'SIGTERM'); } catch {}
+      const pid = line.trim().split(/\s+/)[1];
+      if (pid) {
+        try {
+          process.kill(Number(pid), 'SIGTERM');
+        } catch {}
      }
    }
  } catch {}
 }

 export function getDefaultProfileDir(): string {
-  const override = process.env.BAOYU_CHROME_PROFILE_DIR?.trim() || process.env.WEIBO_BROWSER_PROFILE_DIR?.trim();
-  if (override) return path.resolve(override);
-  const base = process.platform === 'darwin'
-    ? path.join(os.homedir(), 'Library', 'Application Support')
-    : process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share');
-  return path.join(base, 'baoyu-skills', 'chrome-profile');
-}
-
-export function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-export async function getFreePort(): Promise<number> {
-  const fixed = parseInt(process.env.WEIBO_BROWSER_DEBUG_PORT || '', 10);
-  if (fixed > 0) return fixed;
-  return new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.unref();
-    server.on('error', reject);
-    server.listen(0, '127.0.0.1', () => {
-      const address = server.address();
-      if (!address || typeof address === 'string') {
-        server.close(() => reject(new Error('Unable to allocate a free TCP port.')));
-        return;
-      }
-      const port = address.port;
-      server.close((err) => {
-        if (err) reject(err);
-        else resolve(port);
-      });
-    });
+  return resolveSharedChromeProfileDir({
+    envNames: ['BAOYU_CHROME_PROFILE_DIR', 'WEIBO_BROWSER_PROFILE_DIR'],
+    wslWindowsHome: getWslWindowsHome(),
  });
 }

-async function fetchJson<T = unknown>(url: string): Promise<T> {
-  const res = await fetch(url, { redirect: 'follow' });
-  if (!res.ok) throw new Error(`Request failed: ${res.status} ${res.statusText}`);
-  return (await res.json()) as T;
+export async function getFreePort(): Promise<number> {
+  return await getFreePortBase('WEIBO_BROWSER_DEBUG_PORT');
 }

-export async function waitForChromeDebugPort(port: number, timeoutMs: number): Promise<string> {
-  const start = Date.now();
-  let lastError: unknown = null;
+export async function launchChrome(url: string, profileDir: string, chromePathOverride?: string): Promise<number> {
+  const chromePath = findChromeExecutable(chromePathOverride);
+  if (!chromePath) throw new Error('Chrome not found. Set WEIBO_BROWSER_CHROME_PATH env var.');

-  while (Date.now() - start < timeoutMs) {
-    try {
-      const version = await fetchJson<{ webSocketDebuggerUrl?: string }>(`http://127.0.0.1:${port}/json/version`);
-      if (version.webSocketDebuggerUrl) return version.webSocketDebuggerUrl;
-      lastError = new Error('Missing webSocketDebuggerUrl');
-    } catch (error) {
-      lastError = error;
-    }
-    await sleep(200);
-  }
-
-  throw new Error(`Chrome debug port not ready: ${lastError instanceof Error ? lastError.message : String(lastError)}`);
-}
-
-type PendingRequest = {
-  resolve: (value: unknown) => void;
-  reject: (error: Error) => void;
-  timer: ReturnType<typeof setTimeout> | null;
-};
-
-export class CdpConnection {
-  private ws: WebSocket;
-  private nextId = 0;
-  private pending = new Map<number, PendingRequest>();
-  private defaultTimeoutMs: number;
-
-  private constructor(ws: WebSocket, options?: { defaultTimeoutMs?: number }) {
-    this.ws = ws;
-    this.defaultTimeoutMs = options?.defaultTimeoutMs ?? 15_000;
-
-    this.ws.addEventListener('message', (event) => {
-      try {
-        const data = typeof event.data === 'string' ? event.data : new TextDecoder().decode(event.data as ArrayBuffer);
-        const msg = JSON.parse(data) as { id?: number; method?: string; params?: unknown; result?: unknown; error?: { message?: string } };
-
-        if (msg.id) {
-          const pending = this.pending.get(msg.id);
-          if (pending) {
-            this.pending.delete(msg.id);
-            if (pending.timer) clearTimeout(pending.timer);
-            if (msg.error?.message) pending.reject(new Error(msg.error.message));
-            else pending.resolve(msg.result);
-          }
-        }
-      } catch {}
-    });
-
-    this.ws.addEventListener('close', () => {
-      for (const [id, pending] of this.pending.entries()) {
-        this.pending.delete(id);
-        if (pending.timer) clearTimeout(pending.timer);
-        pending.reject(new Error('CDP connection closed.'));
-      }
-    });
-  }
-
-  static async connect(url: string, timeoutMs: number, options?: { defaultTimeoutMs?: number }): Promise<CdpConnection> {
-    const ws = new WebSocket(url);
-    await new Promise<void>((resolve, reject) => {
-      const timer = setTimeout(() => reject(new Error('CDP connection timeout.')), timeoutMs);
-      ws.addEventListener('open', () => { clearTimeout(timer); resolve(); });
-      ws.addEventListener('error', () => { clearTimeout(timer); reject(new Error('CDP connection failed.')); });
-    });
-    return new CdpConnection(ws, options);
-  }
-
-  async send<T = unknown>(method: string, params?: Record<string, unknown>, options?: { sessionId?: string; timeoutMs?: number }): Promise<T> {
-    const id = ++this.nextId;
-    const message: Record<string, unknown> = { id, method };
-    if (params) message.params = params;
-    if (options?.sessionId) message.sessionId = options.sessionId;
-
-    const timeoutMs = options?.timeoutMs ?? this.defaultTimeoutMs;
-
-    const result = await new Promise<unknown>((resolve, reject) => {
-      const timer = timeoutMs > 0
-        ? setTimeout(() => { this.pending.delete(id); reject(new Error(`CDP timeout: ${method}`)); }, timeoutMs)
-        : null;
-      this.pending.set(id, { resolve, reject, timer });
-      this.ws.send(JSON.stringify(message));
-    });
-
-    return result as T;
-  }
-
-  close(): void {
-    try { this.ws.close(); } catch {}
-  }
+  const port = await getFreePort();
+  console.log(`[weibo-cdp] Launching Chrome (profile: ${profileDir})`);
+  await launchChromeBase({
+    chromePath,
+    profileDir,
+    port,
+    url,
+    extraArgs: ['--disable-blink-features=AutomationControlled', '--start-maximized'],
+  });
+  return port;
 }

 export function getScriptDir(): string {