@xbrowser/cli 0.15.1 → 1.0.0

package/dist/{chunk-ATFTAKMN.js → chunk-IDVD44ED.js}

@@ -170,6 +170,23 @@ async function forwardChain(input, session = "default", cdpEndpoint) {
     return { success: false, steps: [], totalDuration: 0, stoppedReason: "Daemon error" };
   }
 }
+async function forwardAgentObserve(session = "default", options) {
+  const params = { session };
+  if (options?.cdpEndpoint) params.cdpEndpoint = options.cdpEndpoint;
+  if (options?.includeHidden !== void 0) params.includeHidden = options.includeHidden;
+  if (options?.limit !== void 0) params.limit = options.limit;
+  return rpcCall("agent:observe", params, 3e4);
+}
+async function forwardAgentAct(session = "default", params, cdpEndpoint) {
+  const rpcParams = { ...params, session };
+  if (cdpEndpoint) rpcParams.cdpEndpoint = cdpEndpoint;
+  return rpcCall("agent:act", rpcParams, 3e4);
+}
+async function forwardAgentWait(session = "default", params, cdpEndpoint, timeoutMs = 3e4) {
+  const rpcParams = { ...params, session };
+  if (cdpEndpoint) rpcParams.cdpEndpoint = cdpEndpoint;
+  return rpcCall("agent:wait", rpcParams, timeoutMs + 5e3);
+}
 async function forwardNetworkList(sessionName, options) {
   return rpcCall("network:list", { session: sessionName, ...options }, 3e4);
 }
@@ -244,6 +261,9 @@ export {
   forwardSessionList,
   forwardExec,
   forwardChain,
+  forwardAgentObserve,
+  forwardAgentAct,
+  forwardAgentWait,
   forwardNetworkList,
   forwardNetworkClear,
   forwardNetworkTop,

package/dist/chunk-T4J4C2NZ.js

@@ -0,0 +1,250 @@
+import {
+  __require
+} from "./chunk-3RG5ZIWI.js";
+
+// src/cdp-driver/launcher.ts
+import { spawn } from "child_process";
+import { existsSync as fsExistsSync } from "fs";
+var DEFAULT_CHROME_PATHS = {
+  darwin: [
+    "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+    "/Applications/Chromium.app/Contents/MacOS/Chromium",
+    "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+    "/Applications/Brave Browser.app/Contents/MacOS/Brave Browser"
+  ],
+  linux: [
+    "/usr/bin/google-chrome",
+    "/usr/bin/google-chrome-stable",
+    "/usr/bin/chromium",
+    "/usr/bin/chromium-browser",
+    "/usr/bin/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"
+  ]
+};
+var DEFAULT_ARGS = [
+  "--no-first-run",
+  "--no-default-browser-check",
+  "--no-sandbox",
+  "--disable-background-networking",
+  "--disable-background-timer-throttling",
+  "--disable-backgrounding-occluded-windows",
+  "--disable-breakpad",
+  "--disable-client-side-phishing-detection",
+  "--disable-default-apps",
+  "--disable-extensions",
+  "--disable-hang-monitor",
+  "--disable-ipc-flood-protection",
+  "--disable-popup-blocking",
+  "--disable-prompt-on-repost",
+  "--disable-renderer-backgrounding",
+  "--disable-sync",
+  "--disable-translate",
+  "--metrics-recording-only",
+  "--password-store=basic",
+  "--use-mock-keychain"
+];
+var ANTI_DETECT_ARGS = [
+  "--disable-blink-features=AutomationControlled",
+  "--disable-features=IsolateOrigins,site-per-process"
+];
+function findChrome() {
+  const platform = process.platform;
+  const paths = DEFAULT_CHROME_PATHS[platform] ?? [];
+  for (const p of paths) {
+    if (fsExistsSync(p)) return p;
+  }
+  return null;
+}
+async function launchChrome(options = {}) {
+  const {
+    executablePath,
+    headless = true,
+    args: extraArgs = [],
+    userDataDir,
+    timeout = 3e4,
+    env
+  } = options;
+  const chromePath = executablePath ?? findChrome();
+  if (!chromePath) {
+    throw new Error(
+      "Chrome/Chromium not found. Set executablePath or install Chrome to a default location."
+    );
+  }
+  const port = await findFreePort();
+  const allArgs = [
+    `--remote-debugging-port=${port}`,
+    "--remote-allow-origins=*",
+    "--no-sandbox",
+    "--no-first-run",
+    "--no-default-browser-check",
+    "--disable-background-timer-throttling",
+    "--disable-backgrounding-occluded-windows",
+    "--disable-renderer-backgrounding",
+    "--disable-features=Translate"
+  ];
+  if (headless) {
+    allArgs.push("--headless", "--hide-scrollbars", "--mute-audio");
+  }
+  let tmpDir;
+  if (userDataDir) {
+    allArgs.push(`--user-data-dir=${userDataDir}`);
+  } else {
+    const { mkdirSync } = await import("fs");
+    tmpDir = `/tmp/xbrowser-chrome-${process.pid}-${Date.now()}`;
+    mkdirSync(tmpDir, { recursive: true });
+    allArgs.push(`--user-data-dir=${tmpDir}`);
+  }
+  allArgs.push(...extraArgs, "about:blank");
+  const childEnv = {
+    ...process.env,
+    ...env
+  };
+  const quotedPath = chromePath.includes(" ") ? `"${chromePath}"` : chromePath;
+  const quotedArgs = allArgs.map((a) => {
+    if (a.includes(" ")) return `"${a}"`;
+    return a;
+  }).join(" ");
+  const fullCmd = `${quotedPath} ${quotedArgs}`;
+  const child = process.platform === "darwin" ? spawn("/bin/sh", ["-c", fullCmd], {
+    stdio: ["ignore", "pipe", "pipe"],
+    env: childEnv
+  }) : spawn(chromePath, allArgs, {
+    stdio: ["ignore", "pipe", "pipe"],
+    env: childEnv
+  });
+  const stderrLines = [];
+  child.stderr?.on("data", (data) => {
+    const line = data.toString().trim();
+    if (line) stderrLines.push(line);
+  });
+  child.stdout?.on("data", (data) => {
+    const line = data.toString().trim();
+    if (line) stderrLines.push(`[stdout] ${line}`);
+  });
+  child.on("error", (err) => {
+    if (!child.killed) {
+      console.error(`Chrome process error: ${err.message}`);
+    }
+  });
+  try {
+    const wsEndpoint = await waitForCDPReady(port, timeout, child);
+    return { process: child, wsEndpoint, port, tmpDir };
+  } catch (err) {
+    const stderr = stderrLines.slice(-20).join("\n");
+    const exitInfo = child.exitCode !== null ? ` (exit code: ${child.exitCode})` : " (still running)";
+    throw new Error(`${err.message}${exitInfo}
+Chrome stderr:
+${stderr || "(empty)"}`);
+  }
+}
+async function connectToCDP(rawEndpoint) {
+  if (rawEndpoint.startsWith("ws://") || rawEndpoint.startsWith("wss://")) {
+    return rawEndpoint;
+  }
+  return resolveEndpointFromHTTP(rawEndpoint);
+}
+async function findFreePort() {
+  const { createServer } = await import("net");
+  return new Promise((resolve, reject) => {
+    const srv = createServer();
+    srv.listen(0, "127.0.0.1", () => {
+      const addr = srv.address();
+      if (addr && typeof addr === "object") {
+        const port = addr.port;
+        srv.close(() => resolve(port));
+      } else {
+        srv.close();
+        reject(new Error("Failed to find free port"));
+      }
+    });
+    srv.on("error", reject);
+  });
+}
+async function waitForCDPReady(port, timeoutMs, child) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (child.exitCode !== null && child.exitCode !== 0) {
+      throw new Error(`Chrome exited with code ${child.exitCode} before CDP became ready`);
+    }
+    try {
+      const wsEndpoint = await resolveEndpointFromHTTP(`http://127.0.0.1:${port}`);
+      return wsEndpoint;
+    } catch {
+      await sleep(200);
+    }
+  }
+  throw new Error(`Chrome CDP not ready after ${timeoutMs}ms (port ${port})`);
+}
+async function resolveEndpointFromHTTP(baseURL) {
+  const url = `${baseURL}/json/version`;
+  const resp = await fetch(url, { signal: AbortSignal.timeout(3e3) });
+  if (!resp.ok) {
+    throw new Error(`CDP HTTP ${resp.status}: ${url}`);
+  }
+  const data = await resp.json();
+  if (!data.webSocketDebuggerUrl) {
+    throw new Error("No webSocketDebuggerUrl in CDP response");
+  }
+  return data.webSocketDebuggerUrl;
+}
+async function getCDPTargets(baseURL) {
+  const url = `${baseURL}/json/list`;
+  const resp = await fetch(url, { signal: AbortSignal.timeout(5e3) });
+  if (!resp.ok) {
+    throw new Error(`CDP list HTTP ${resp.status}: ${url}`);
+  }
+  const targets = await resp.json();
+  return targets;
+}
+async function killChrome(child, tmpDir) {
+  if (child.exitCode !== null) {
+    if (tmpDir) cleanupTmpDir(tmpDir);
+    return;
+  }
+  return new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+      if (tmpDir) cleanupTmpDir(tmpDir);
+      resolve();
+    }, 5e3);
+    child.once("exit", () => {
+      clearTimeout(timer);
+      if (tmpDir) cleanupTmpDir(tmpDir);
+      resolve();
+    });
+    try {
+      child.kill("SIGTERM");
+    } catch {
+      clearTimeout(timer);
+      if (tmpDir) cleanupTmpDir(tmpDir);
+      resolve();
+    }
+  });
+}
+function cleanupTmpDir(dir) {
+  try {
+    const { rmSync } = __require("fs");
+    rmSync(dir, { recursive: true, force: true });
+  } catch {
+  }
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export {
+  DEFAULT_ARGS,
+  ANTI_DETECT_ARGS,
+  findChrome,
+  launchChrome,
+  connectToCDP,
+  getCDPTargets,
+  killChrome
+};

package/dist/{chunk-RS6YYWTK.js → chunk-YKOHDEFV.js}

@@ -1,3 +1,6 @@
+import {
+  launch
+} from "./chunk-42RPMJ76.js";
 import {
   CDPInterceptorProxy
 } from "./chunk-ZZ2TFWIV.js";
@@ -7,7 +10,6 @@ import { randomUUID } from "crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync, writeFileSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
-import { chromium } from "playwright";
 
 // src/utils/cdp.ts
 async function fetchNoProxy(url) {
@@ -192,15 +194,18 @@ async function createBrowser(options) {
     const realEndpoint = await resolveCDPEndpoint(options.cdpEndpoint);
     if (options.intercept) {
       const config = typeof options.intercept === "object" ? { ...options.intercept, cdpEndpoint: realEndpoint } : { cdpEndpoint: realEndpoint };
-      const proxy = new CDPInterceptorProxy(config);
-      const proxyPort = await proxy.start();
+      _sharedCdpProxy = new CDPInterceptorProxy(config);
+      const proxyPort = await _sharedCdpProxy.start();
       console.error(`[CDP Interceptor] Proxy running on ws://localhost:${proxyPort}, forwarding to ${realEndpoint}`);
-      return await chromium.connectOverCDP(`ws://localhost:${proxyPort}`);
+      const { browser: browser3 } = await launch({ cdpEndpoint: `ws://localhost:${proxyPort}` });
+      return browser3;
     }
-    return await chromium.connectOverCDP(realEndpoint);
+    const { browser: browser2 } = await launch({ cdpEndpoint: realEndpoint });
+    return browser2;
   }
   const executablePath = options?.executablePath || process.env.XBROWSER_CHROMIUM_PATH || discoverChromiumPath();
-  return await chromium.launch({ executablePath, headless: options?.headless ?? true });
+  const { browser } = await launch({ executablePath, headless: options?.headless ?? true });
+  return browser;
 }
 async function getBrowser(options) {
   if (_sharedBrowser) return _sharedBrowser;
@@ -351,7 +356,7 @@ async function findOrRestoreSession(name, cdpEndpoint) {
 async function createEphemeralContext(options) {
   if (options?.cdpEndpoint) {
     const endpoint = await resolveCDPEndpoint(options.cdpEndpoint);
-    const b2 = await chromium.connectOverCDP(endpoint);
+    const { browser: b2 } = await launch({ cdpEndpoint: endpoint });
     const contexts = b2.contexts();
     const ctx = contexts[0] || await b2.newContext();
     const page2 = await ctx.newPage();
@@ -391,33 +396,54 @@ function getAllSessions() {
 async function installNetworkCapture(page, sessionName) {
   if (process.env.XBROWSER_DAEMON_WORKER !== "1") return;
   const { networkStore } = await import("./network-store-BN6QEZ7R.js");
-  page.on("response", async (response) => {
+  const requestData = /* @__PURE__ */ new Map();
+  const responseMeta = /* @__PURE__ */ new Map();
+  const xbPage = page;
+  xbPage.on("request", (params) => {
     try {
-      const request = response.request();
-      const url = response.url();
-      const contentType = response.headers()["content-type"] || "";
-      const headers = {};
-      for (const [k, v] of Object.entries(response.headers())) {
-        headers[k] = v;
-      }
-      const requestHeaders = {};
-      for (const [k, v] of Object.entries(request.headers())) {
-        requestHeaders[k] = v;
-      }
+      const p = params;
+      requestData.set(p.requestId, {
+        method: p.request.method,
+        headers: p.request.headers,
+        postData: p.request.postData ?? null,
+        resourceType: p.type
+      });
+    } catch {
+    }
+  });
+  xbPage.on("response", (params) => {
+    try {
+      const p = params;
+      responseMeta.set(p.requestId, {
+        status: p.response.status,
+        url: p.response.url,
+        headers: p.response.headers,
+        mimeType: p.response.mimeType,
+        type: p.type
+      });
+    } catch {
+    }
+  });
+  xbPage.on("requestfinished", async (params) => {
+    try {
+      const p = params;
+      const meta = responseMeta.get(p.requestId);
+      if (!meta) return;
+      const req = requestData.get(p.requestId);
+      const method = req?.method ?? "GET";
+      const contentType = meta.headers["content-type"] || meta.headers["Content-Type"] || "";
+      const resourceType = req?.resourceType ?? meta.type;
+      const requestHeaders = req?.headers ?? {};
       let requestBody = void 0;
-      const method = request.method();
       const isPostLike = ["POST", "PATCH", "PUT"].includes(method);
       if (isPostLike && requestHeaders["content-type"]?.includes("application/json")) {
-        try {
-          const postData = request.postData();
-          if (postData) {
-            try {
-              requestBody = JSON.parse(postData);
-            } catch {
-              requestBody = postData;
-            }
+        const postData = req?.postData;
+        if (postData) {
+          try {
+            requestBody = JSON.parse(postData);
+          } catch {
+            requestBody = postData;
           }
-        } catch {
         }
       }
       let responseBody = void 0;
@@ -425,7 +451,11 @@ async function installNetworkCapture(page, sessionName) {
       const isJsonish = contentType.includes("json") || contentType.includes("javascript") || contentType.includes("text/");
       if (isJsonish) {
         try {
-          const text = await response.text();
+          const bodyResult = await xbPage._cdpSend(
+            "Network.getResponseBody",
+            { requestId: p.requestId }
+          );
+          const text = bodyResult.body ?? "";
           size = text.length;
           if (size <= 10240) {
             try {
@@ -438,8 +468,11 @@ async function installNetworkCapture(page, sessionName) {
         }
       } else {
         try {
-          const text = await response.text();
-          size = text.length;
+          const bodyResult = await xbPage._cdpSend(
+            "Network.getResponseBody",
+            { requestId: p.requestId }
+          );
+          size = bodyResult.body?.length ?? 0;
         } catch {
           size = 0;
         }
@@ -447,17 +480,19 @@ async function installNetworkCapture(page, sessionName) {
       networkStore.add(sessionName, {
         timestamp: Date.now(),
         method,
-        url,
-        path: new URL(url).pathname,
-        status: response.status(),
+        url: meta.url,
+        path: new URL(meta.url).pathname,
+        status: meta.status,
         contentType,
         size,
-        headers,
+        headers: meta.headers,
         body: responseBody,
         requestHeaders,
         requestBody,
-        resourceType: request.resourceType()
+        resourceType
       });
+      requestData.delete(p.requestId);
+      responseMeta.delete(p.requestId);
     } catch {
     }
   });
@@ -570,7 +605,7 @@ async function closeSessionByName(name) {
       } catch {
       }
       try {
-        const { SessionRecorder } = await import("./session-recorder-XET3DNML.js");
+        const { SessionRecorder } = await import("./session-recorder-MA75PKTQ.js");
         SessionRecorder.cleanup(session.name);
       } catch {
       }