refactor: unify skill cdp and release artifacts

skills/baoyu-danger-x-to-markdown/scripts/bun.lock

@@ -0,0 +1,14 @@
+{
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "baoyu-danger-x-to-markdown-scripts",
+      "dependencies": {
+        "baoyu-chrome-cdp": "file:../../../packages/baoyu-chrome-cdp",
+      },
+    },
+  },
+  "packages": {
+    "baoyu-chrome-cdp": ["baoyu-chrome-cdp@file:../../../packages/baoyu-chrome-cdp", {}],
+  }
+}

skills/baoyu-danger-x-to-markdown/scripts/cookies.ts

@@ -1,7 +1,16 @@
-import { spawn, type ChildProcess } from "node:child_process";
-import fs from "node:fs";
-import { mkdir } from "node:fs/promises";
-import net from "node:net";
+import {
+  CdpConnection,
+  findChromeExecutable as findChromeExecutableBase,
+  findExistingChromeDebugPort,
+  getFreePort,
+  killChrome,
+  launchChrome as launchChromeBase,
+  openPageSession,
+  sleep,
+  waitForChromeDebugPort,
+  type PlatformCandidates,
+} from "baoyu-chrome-cdp";
+
 import process from "node:process";
 
 import { read_cookie_file, write_cookie_file } from "./cookie-file.js";
@@ -9,201 +18,47 @@ import { resolveXToMarkdownCookiePath } from "./paths.js";
 import { X_COOKIE_NAMES, X_REQUIRED_COOKIES, X_LOGIN_URL, X_USER_DATA_DIR } from "./constants.js";
 import type { CookieLike } from "./types.js";
 
-type CdpSendOptions = { sessionId?: string; timeoutMs?: number };
-
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-async function fetchWithTimeout(
-  url: string,
-  init: RequestInit & { timeoutMs?: number } = {}
-): Promise<Response> {
-  const { timeoutMs, ...rest } = init;
-  if (!timeoutMs || timeoutMs <= 0) return fetch(url, rest);
-
-  const ctl = new AbortController();
-  const t = setTimeout(() => ctl.abort(), timeoutMs);
-  try {
-    return await fetch(url, { ...rest, signal: ctl.signal });
-  } finally {
-    clearTimeout(t);
-  }
-}
-
-class CdpConnection {
-  private ws: WebSocket;
-  private nextId = 0;
-  private pending = new Map<
-    number,
-    { resolve: (v: unknown) => void; reject: (e: Error) => void; timer: ReturnType<typeof setTimeout> | null }
-  >();
-
-  private constructor(ws: WebSocket) {
-    this.ws = ws;
-    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; result?: unknown; error?: { message?: string } };
-        if (msg.id) {
-          const p = this.pending.get(msg.id);
-          if (p) {
-            this.pending.delete(msg.id);
-            if (p.timer) clearTimeout(p.timer);
-            if (msg.error?.message) p.reject(new Error(msg.error.message));
-            else p.resolve(msg.result);
-          }
-        }
-      } catch {}
-    });
-    this.ws.addEventListener("close", () => {
-      for (const [id, p] of this.pending.entries()) {
-        this.pending.delete(id);
-        if (p.timer) clearTimeout(p.timer);
-        p.reject(new Error("CDP connection closed."));
-      }
-    });
-  }
-
-  static async connect(url: string, timeoutMs: number): Promise<CdpConnection> {
-    const ws = new WebSocket(url);
-    await new Promise<void>((resolve, reject) => {
-      const t = setTimeout(() => reject(new Error("CDP connection timeout.")), timeoutMs);
-      ws.addEventListener("open", () => {
-        clearTimeout(t);
-        resolve();
-      });
-      ws.addEventListener("error", () => {
-        clearTimeout(t);
-        reject(new Error("CDP connection failed."));
-      });
-    });
-    return new CdpConnection(ws);
-  }
-
-  async send<T = unknown>(
-    method: string,
-    params?: Record<string, unknown>,
-    opts?: CdpSendOptions
-  ): Promise<T> {
-    const id = ++this.nextId;
-    const msg: Record<string, unknown> = { id, method };
-    if (params) msg.params = params;
-    if (opts?.sessionId) msg.sessionId = opts.sessionId;
-
-    const timeoutMs = opts?.timeoutMs ?? 15_000;
-    const out = await new Promise<unknown>((resolve, reject) => {
-      const t =
-        timeoutMs > 0
-          ? setTimeout(() => {
-              this.pending.delete(id);
-              reject(new Error(`CDP timeout: ${method}`));
-            }, timeoutMs)
-          : null;
-      this.pending.set(id, { resolve, reject, timer: t });
-      this.ws.send(JSON.stringify(msg));
-    });
-    return out as T;
-  }
-
-  close(): void {
-    try {
-      this.ws.close();
-    } catch {}
-  }
-}
-
-async function getFreePort(): Promise<number> {
-  const fixed = parseInt(process.env.X_DEBUG_PORT || "", 10);
-  if (fixed > 0) return fixed;
-  return await new Promise((resolve, reject) => {
-    const srv = net.createServer();
-    srv.unref();
-    srv.on("error", reject);
-    srv.listen(0, "127.0.0.1", () => {
-      const addr = srv.address();
-      if (!addr || typeof addr === "string") {
-        srv.close(() => reject(new Error("Unable to allocate a free TCP port.")));
-        return;
-      }
-      const port = addr.port;
-      srv.close((err) => (err ? reject(err) : resolve(port)));
-    });
-  });
-}
+const CHROME_CANDIDATES_FULL: PlatformCandidates = {
+  darwin: [
+    "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+    "/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary",
+    "/Applications/Google Chrome Beta.app/Contents/MacOS/Google Chrome Beta",
+    "/Applications/Chromium.app/Contents/MacOS/Chromium",
+    "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+  ],
+  win32: [
+    "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe",
+    "C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe",
+    "C:\\Program Files\\Microsoft\\Edge\\Application\\msedge.exe",
+    "C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe",
+  ],
+  default: [
+    "/usr/bin/google-chrome",
+    "/usr/bin/google-chrome-stable",
+    "/usr/bin/chromium",
+    "/usr/bin/chromium-browser",
+    "/snap/bin/chromium",
+    "/usr/bin/microsoft-edge",
+  ],
+};
 
 function findChromeExecutable(): string | null {
-  const override = process.env.X_CHROME_PATH?.trim();
-  if (override && fs.existsSync(override)) return override;
-
-  const candidates: string[] = [];
-  switch (process.platform) {
-    case "darwin":
-      candidates.push(
-        "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
-        "/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary",
-        "/Applications/Google Chrome Beta.app/Contents/MacOS/Google Chrome Beta",
-        "/Applications/Chromium.app/Contents/MacOS/Chromium",
-        "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
-      );
-      break;
-    case "win32":
-      candidates.push(
-        "C:\\\\Program Files\\\\Google\\\\Chrome\\\\Application\\\\chrome.exe",
-        "C:\\\\Program Files (x86)\\\\Google\\\\Chrome\\\\Application\\\\chrome.exe",
-        "C:\\\\Program Files\\\\Microsoft\\\\Edge\\\\Application\\\\msedge.exe",
-        "C:\\\\Program Files (x86)\\\\Microsoft\\\\Edge\\\\Application\\\\msedge.exe"
-      );
-      break;
-    default:
-      candidates.push(
-        "/usr/bin/google-chrome",
-        "/usr/bin/google-chrome-stable",
-        "/usr/bin/chromium",
-        "/usr/bin/chromium-browser",
-        "/snap/bin/chromium",
-        "/usr/bin/microsoft-edge"
-      );
-      break;
-  }
-
-  for (const p of candidates) {
-    if (fs.existsSync(p)) return p;
-  }
-  return null;
+  return findChromeExecutableBase({
+    candidates: CHROME_CANDIDATES_FULL,
+    envNames: ["X_CHROME_PATH"],
+  }) ?? null;
 }
 
-async function waitForChromeDebugPort(port: number, timeoutMs: number): Promise<string> {
-  const start = Date.now();
-  while (Date.now() - start < timeoutMs) {
-    try {
-      const res = await fetchWithTimeout(`http://127.0.0.1:${port}/json/version`, { timeoutMs: 5_000 });
-      if (!res.ok) throw new Error(`status=${res.status}`);
-      const j = (await res.json()) as { webSocketDebuggerUrl?: string };
-      if (j.webSocketDebuggerUrl) return j.webSocketDebuggerUrl;
-    } catch {}
-    await sleep(200);
-  }
-  throw new Error("Chrome debug port not ready");
-}
-
-async function launchChrome(profileDir: string, port: number): Promise<ChildProcess> {
-  const chrome = findChromeExecutable();
-  if (!chrome) throw new Error("Chrome executable not found.");
-
-  const args = [
-    `--remote-debugging-port=${port}`,
-    `--user-data-dir=${profileDir}`,
-    "--no-first-run",
-    "--no-default-browser-check",
-    "--disable-popup-blocking",
-    X_LOGIN_URL,
-  ];
-
-  return spawn(chrome, args, { stdio: "ignore" });
+async function launchChrome(profileDir: string, port: number) {
+  const chromePath = findChromeExecutable();
+  if (!chromePath) throw new Error("Chrome executable not found.");
+  return await launchChromeBase({
+    chromePath,
+    profileDir,
+    port,
+    url: X_LOGIN_URL,
+    extraArgs: ["--disable-popup-blocking"],
+  });
 }
 
 async function fetchXCookiesViaCdp(
@@ -212,25 +67,33 @@ async function fetchXCookiesViaCdp(
   verbose: boolean,
   log?: (message: string) => void
 ): Promise<Record<string, string>> {
-  await mkdir(profileDir, { recursive: true });
-
-  const port = await getFreePort();
-  const chrome = await launchChrome(profileDir, port);
+  const existingPort = await findExistingChromeDebugPort({ profileDir });
+  const reusing = existingPort !== null;
+  const port = existingPort ?? await getFreePort("X_DEBUG_PORT");
+  const chrome = reusing ? null : await launchChrome(profileDir, port);
 
   let cdp: CdpConnection | null = null;
+  let targetId: string | null = null;
   try {
-    const wsUrl = await waitForChromeDebugPort(port, 30_000);
+    const wsUrl = await waitForChromeDebugPort(port, 30_000, { includeLastError: true });
     cdp = await CdpConnection.connect(wsUrl, 15_000);
 
-    const { targetId } = await cdp.send<{ targetId: string }>("Target.createTarget", {
+    const page = await openPageSession({
+      cdp,
+      reusing,
       url: X_LOGIN_URL,
-      newWindow: true,
+      matchTarget: (target) => target.type === "page" && (
+        target.url.includes("x.com") || target.url.includes("twitter.com")
+      ),
+      enableNetwork: true,
     });
-    const { sessionId } = await cdp.send<{ sessionId: string }>("Target.attachToTarget", { targetId, flatten: true });
-    await cdp.send("Network.enable", {}, { sessionId });
+    const { sessionId } = page;
+    targetId = page.targetId;
 
     if (verbose) {
-      log?.("[x-cookies] Chrome opened. If needed, complete X login in the window. Waiting for cookies...");
+      log?.(reusing
+        ? `[x-cookies] Reusing existing Chrome on port ${port}. Waiting for cookies...`
+        : "[x-cookies] Chrome opened. If needed, complete X login in the window. Waiting for cookies...");
     }
 
     const start = Date.now();
@@ -255,22 +118,19 @@ async function fetchXCookiesViaCdp(
     throw new Error(`Timed out waiting for X cookies. Last keys: ${Object.keys(last).join(", ")}`);
   } finally {
     if (cdp) {
-      try {
-        await cdp.send("Browser.close", {}, { timeoutMs: 5_000 });
-      } catch {}
+      if (reusing && targetId) {
+        try {
+          await cdp.send("Target.closeTarget", { targetId }, { timeoutMs: 5_000 });
+        } catch {}
+      } else {
+        try {
+          await cdp.send("Browser.close", {}, { timeoutMs: 5_000 });
+        } catch {}
+      }
       cdp.close();
     }
 
-    try {
-      chrome.kill("SIGTERM");
-    } catch {}
-    setTimeout(() => {
-      if (!chrome.killed) {
-        try {
-          chrome.kill("SIGKILL");
-        } catch {}
-      }
-    }, 2_000).unref?.();
+    if (chrome) killChrome(chrome);
   }
 }
 

skills/baoyu-danger-x-to-markdown/scripts/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "baoyu-danger-x-to-markdown-scripts",
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    "baoyu-chrome-cdp": "file:../../../packages/baoyu-chrome-cdp"
+  }
+}