@xbrowser/cli 0.16.0 → 1.0.2

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

@@ -110,6 +110,12 @@ async function ensureDaemonRunning() {
     _ensurePromise = null;
     throw new Error("Daemon not available");
   }
+  for (let attempt = 0; attempt < 20; attempt++) {
+    const ready = await fetch(`${DAEMON_BASE}/health`, { signal: AbortSignal.timeout(1e3) }).then((r) => r.ok ? r.json() : null).then((d) => d?.status === "ok").catch(() => false);
+    if (ready) return;
+    await new Promise((r) => setTimeout(r, 200));
+  }
+  throw new Error("Daemon HTTP server not ready after 4s");
 }
 async function rpcCall(method, params = {}, timeoutMs = 1e4) {
   await ensureDaemonRunning();
@@ -120,7 +126,13 @@ async function rpcCall(method, params = {}, timeoutMs = 1e4) {
     signal: AbortSignal.timeout(timeoutMs)
   });
   if (!resp.ok) {
-    throw new Error(`Daemon error: ${resp.statusText}`);
+    let detail = resp.statusText;
+    try {
+      const body = await resp.json();
+      if (body?.error) detail = body.error;
+    } catch {
+    }
+    throw new Error(`Daemon error: ${detail}`);
   }
   return resp.json();
 }
@@ -157,8 +169,8 @@ async function forwardExec(command, params, session = "default", cdpEndpoint, ti
   if (cdpEndpoint) rpcParams.cdpEndpoint = cdpEndpoint;
   try {
     return await rpcCall("exec", rpcParams, timeoutMs);
-  } catch {
-    return { success: false, data: null, message: `Daemon error: exec failed`, duration: 0 };
+  } catch (e) {
+    return { success: false, data: null, message: e.message, duration: 0 };
   }
 }
 async function forwardChain(input, session = "default", cdpEndpoint) {
@@ -166,10 +178,27 @@ async function forwardChain(input, session = "default", cdpEndpoint) {
   if (cdpEndpoint) params.cdpEndpoint = cdpEndpoint;
   try {
     return await rpcCall("chain", params, 12e4);
-  } catch {
-    return { success: false, steps: [], totalDuration: 0, stoppedReason: "Daemon error" };
+  } catch (e) {
+    return { success: false, steps: [], totalDuration: 0, stoppedReason: e.message };
   }
 }
+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);
 }
@@ -206,8 +235,8 @@ async function forwardNetworkExport(sessionName, id, lang) {
 async function forwardNetworkInspect(sessionName, id) {
   return rpcCall("network:inspect", { session: sessionName, id }, 1e4);
 }
-async function forwardRecordStart(session, url) {
-  return rpcCall("record:start", { session, url }, 15e3);
+async function forwardRecordStart(session, url, cdpEndpoint) {
+  return rpcCall("record:start", { session, url, cdpEndpoint }, 15e3);
 }
 async function forwardRecordStop(session) {
   return rpcCall("record:stop", { session }, 1e4);
@@ -244,6 +273,9 @@ export {
   forwardSessionList,
   forwardExec,
   forwardChain,
+  forwardAgentObserve,
+  forwardAgentAct,
+  forwardAgentWait,
   forwardNetworkList,
   forwardNetworkClear,
   forwardNetworkTop,

package/dist/{chunk-F3ZWFCJJ.js → chunk-QIK2I3VQ.js}

@@ -1,9 +1,12 @@
+import {
+  launch
+} from "./chunk-PPG4D2EW.js";
+
 // src/browser.ts
 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/cdp-interceptor/proxy.ts
 import { WebSocketServer, WebSocket } from "ws";
@@ -1427,6 +1430,7 @@ async function resolveCDPEndpoint(raw) {
 }
 
 // src/browser.ts
+import { SessionStore } from "@dyyz1993/xcli-core";
 function logSessionEvent(event, details) {
   const ts = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").substring(0, 19);
   const pid = process.pid;
@@ -1439,7 +1443,7 @@ function sessionFile(name) {
 function ensureSessionDir() {
   mkdirSync(SESSION_DIR, { recursive: true });
 }
-var sessions = /* @__PURE__ */ new Map();
+var sessions = new SessionStore();
 var _sharedBrowser = null;
 var _sharedCdpProxy = null;
 var IDLE_TIMEOUT_MS = (process.env.XBROWSER_IDLE_TIMEOUT ? parseInt(process.env.XBROWSER_IDLE_TIMEOUT, 10) : 30) * 60 * 1e3;
@@ -1450,7 +1454,7 @@ function resetIdleTimer() {
     const now = Date.now();
     let allIdle = true;
     const idleSessions = [];
-    for (const [, s] of sessions) {
+    for (const s of sessions) {
       if (now - s.lastActivityAt < IDLE_TIMEOUT_MS) {
         allIdle = false;
       } else {
@@ -1473,7 +1477,7 @@ function touchSession(id) {
   resetIdleTimer();
 }
 process.on("exit", () => {
-  for (const session of sessions.values()) {
+  for (const session of sessions.list()) {
     if (session.isCDP) {
       logSessionEvent("process_exit", `Session "${session.name}": CDP connection (not closing external browser).`);
     } else {
@@ -1556,15 +1560,21 @@ 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 });
+    await browser2.discoverContexts().catch((err) => {
+      console.error(`[browser] discoverContexts failed: ${err.message}`);
+    });
+    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;
@@ -1574,10 +1584,7 @@ async function getBrowser(options) {
   return _sharedBrowser;
 }
 function findSession(name) {
-  for (const [, session] of sessions) {
-    if (session.name === name) return session;
-  }
-  return void 0;
+  return sessions.find(name);
 }
 function getSessionById(id) {
   return sessions.get(id);
@@ -1681,9 +1688,14 @@ async function findOrRestoreSession(name, cdpEndpoint) {
       return void 0;
     }
     const targetUrl = meta.conversationUrl || meta.url;
-    if (targetUrl && page.url() !== targetUrl && !page.url().includes(new URL(targetUrl).hostname)) {
-      await page.goto(targetUrl, { waitUntil: "domcontentloaded", timeout: 3e4 }).catch(() => {
-      });
+    if (targetUrl && page.url() !== targetUrl) {
+      try {
+        if (!page.url().includes(new URL(targetUrl).hostname)) {
+          await page.goto(targetUrl, { waitUntil: "domcontentloaded", timeout: 3e4 }).catch(() => {
+          });
+        }
+      } catch {
+      }
     }
     const session = {
       id: meta.id || randomUUID(),
@@ -1696,13 +1708,13 @@ async function findOrRestoreSession(name, cdpEndpoint) {
       isCDP: true,
       cdpEndpoint: ep
     };
-    for (const [existingId, existingSession] of sessions) {
+    for (const existingSession of sessions.list()) {
       if (existingSession.name === name) {
-        logSessionEvent("remove_stale", `Removing stale session name="${name}" id="${existingId}" during restore`);
-        sessions.delete(existingId);
+        logSessionEvent("remove_stale", `Removing stale session name="${name}" id="${existingSession.id}" during restore`);
+        sessions.removeById(existingSession.id);
       }
     }
-    sessions.set(session.id, session);
+    sessions.set(session);
     resetIdleTimer();
     await installNetworkCapture(page, name);
     return session;
@@ -1715,10 +1727,15 @@ 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();
+    const allPages = ctx.pages();
+    const existingPages = allPages.filter((p) => {
+      const url = p.url();
+      return url !== "about:blank" && !url.startsWith("chrome://");
+    });
+    const page2 = existingPages.length > 0 ? existingPages[0] : allPages.length > 0 ? allPages[0] : await ctx.newPage();
     resetIdleTimer();
     ephemeralConnections.set(page2, b2);
     return { context: ctx, page: page2 };
@@ -1750,38 +1767,59 @@ async function closeEphemeralContext(context) {
   }
 }
 function getAllSessions() {
-  return Array.from(sessions.values());
+  return sessions.list();
 }
 async function installNetworkCapture(page, sessionName) {
   if (process.env.XBROWSER_DAEMON_WORKER !== "1") return;
-  const { networkStore } = await import("./network-store-YAF5OIBH.js");
-  page.on("response", async (response) => {
+  const { networkStore } = await import("./network-store-XGZ25FFC.js");
+  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;
@@ -1789,7 +1827,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 {
@@ -1802,8 +1844,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;
         }
@@ -1811,17 +1856,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 {
     }
   });
@@ -1845,16 +1892,38 @@ async function createSession(name, url, options) {
     }
     context = contexts[0] || await b.newContext();
     let targetPage = null;
-    for (const ctx of contexts) {
-      const pages = ctx.pages();
-      for (const p of pages) {
-        const pUrl = p.url();
-        if (pUrl && pUrl !== "about:blank" && !pUrl.startsWith("chrome://")) {
-          targetPage = p;
-          break;
+    const targetHostname = url ? (() => {
+      try {
+        return new URL(url).hostname;
+      } catch {
+        return "";
+      }
+    })() : "";
+    if (targetHostname) {
+      for (const ctx of contexts) {
+        const pages = ctx.pages();
+        for (const p of pages) {
+          const pUrl = p.url();
+          if (pUrl && pUrl !== "about:blank" && !pUrl.startsWith("chrome://") && pUrl.includes(targetHostname)) {
+            targetPage = p;
+            break;
+          }
+        }
+        if (targetPage) break;
+      }
+    }
+    if (!targetPage) {
+      for (const ctx of contexts) {
+        const pages = ctx.pages();
+        for (const p of pages) {
+          const pUrl = p.url();
+          if (pUrl && pUrl !== "about:blank" && !pUrl.startsWith("chrome://")) {
+            targetPage = p;
+            break;
+          }
         }
+        if (targetPage) break;
       }
-      if (targetPage) break;
     }
     if (!targetPage && options?.cdpEndpoint) {
       const targets = await getCDPTargets(options.cdpEndpoint);
@@ -1895,14 +1964,14 @@ async function createSession(name, url, options) {
     isCDP,
     cdpEndpoint: options?.cdpEndpoint
   };
-  sessions.set(session.id, session);
+  sessions.set(session);
   logSessionEvent("create_session", `name="${name}" id="${session.id}" url="${url || "(no url)"}" isCDP=${isCDP} cdpEndpoint=${options?.cdpEndpoint || "(none)"}`);
   resetIdleTimer();
   await installNetworkCapture(page, name);
   return session;
 }
 async function closeSessionByName(name) {
-  for (const [id, session] of sessions) {
+  for (const session of sessions) {
     if (session.name === name || session.id === name) {
       logSessionEvent("close_session", `name="${session.name}" id="${session.id}" url="${session.page.url()}"`);
       if (session.isCDP) {
@@ -1921,20 +1990,20 @@ async function closeSessionByName(name) {
           });
         }
       }
-      sessions.delete(id);
+      sessions.removeById(session.id);
       const file2 = sessionFile(session.name);
       try {
         unlinkSync(file2);
       } catch {
       }
       try {
-        const { networkStore, commandLogStore } = await import("./network-store-YAF5OIBH.js");
+        const { networkStore, commandLogStore } = await import("./network-store-XGZ25FFC.js");
         networkStore.clear(session.name);
         commandLogStore.clear(session.name);
       } catch {
       }
       try {
-        const { SessionRecorder } = await import("./session-recorder-ILSSV2UC.js");
+        const { SessionRecorder } = await import("./session-recorder-YI7YYM36.js");
         SessionRecorder.cleanup(session.name);
       } catch {
       }
@@ -1949,9 +2018,9 @@ async function closeSessionByName(name) {
   return false;
 }
 async function closeAllSessions() {
-  const names = [...sessions.values()].map((s) => `${s.name}(${s.page.url()})`).join(", ");
+  const names = sessions.list().map((s) => `${s.name}(${s.page.url()})`).join(", ");
   if (names) logSessionEvent("close_all_sessions", `Closing ${sessions.size} sessions: ${names}`);
-  for (const [id, session] of sessions) {
+  for (const session of sessions.list()) {
     try {
       if (!session.isCDP) {
         await session.context.close();
@@ -1960,9 +2029,9 @@ async function closeAllSessions() {
         await session.browser.close().catch(() => {
         });
       }
-      sessions.delete(id);
+      sessions.removeById(session.id);
     } catch {
-      sessions.delete(id);
+      sessions.removeById(session.id);
     }
   }
 }
@@ -2000,7 +2069,7 @@ async function ensureProcessCanExit() {
     clearTimeout(idleTimer);
     idleTimer = null;
   }
-  for (const session of sessions.values()) {
+  for (const session of sessions.list()) {
     if (session.browser) {
       if (session.isCDP) {
         await session.browser.close().catch(() => {

package/dist/chunk-WJRE55TN.js

@@ -0,0 +1,83 @@
+// src/daemon/daemon.ts
+import { spawn } from "child_process";
+import { join, dirname } from "path";
+import { homedir } from "os";
+import { fileURLToPath } from "url";
+import { stopDaemon as xcliStopDaemon, isDaemonRunning, getDaemonStatus, killAllDaemon } from "@dyyz1993/xcli-core";
+var CONFIG_DIR = join(homedir(), ".xbrowser");
+var __dirname = dirname(fileURLToPath(import.meta.url));
+var WORKER_PATH = join(__dirname, "daemon-main.js");
+function getDaemonConfig() {
+  return {
+    configDir: CONFIG_DIR,
+    workerEntryPath: WORKER_PATH,
+    basePort: 9224
+  };
+}
+async function startDaemonProcess(port = 9224) {
+  const config = getDaemonConfig();
+  if (isDaemonRunning(config)) {
+    const status = getDaemonStatus(config);
+    if (status.port === port && status.pid) {
+      return { pid: status.pid, port: status.port, startedAt: (/* @__PURE__ */ new Date()).toISOString() };
+    }
+    await xcliStopDaemon(config);
+  }
+  const child = spawn("node", [WORKER_PATH], {
+    detached: true,
+    stdio: "ignore",
+    env: {
+      ...process.env,
+      XBROWSER_DAEMON_PORT: String(port)
+    }
+  });
+  child.unref();
+  return new Promise((resolve, reject) => {
+    let resolved = false;
+    const timeout = setTimeout(() => {
+      if (!resolved) {
+        resolved = true;
+        reject(new Error("Daemon start timeout after 15s"));
+      }
+    }, 15e3);
+    const checkInterval = setInterval(() => {
+      if (isDaemonRunning(config)) {
+        const s = getDaemonStatus(config);
+        if (s.port === port && s.pid) {
+          resolved = true;
+          clearTimeout(timeout);
+          clearInterval(checkInterval);
+          resolve({ pid: s.pid, port: s.port, startedAt: (/* @__PURE__ */ new Date()).toISOString() });
+        }
+      }
+    }, 200);
+    child.on("error", (err) => {
+      if (!resolved) {
+        resolved = true;
+        clearTimeout(timeout);
+        clearInterval(checkInterval);
+        reject(err);
+      }
+    });
+  });
+}
+function getDaemonProcessStatus() {
+  const config = getDaemonConfig();
+  const running = isDaemonRunning(config);
+  if (!running) {
+    return { running: false, pid: 0, port: 0, info: null };
+  }
+  const status = getDaemonStatus(config);
+  return {
+    running: true,
+    pid: status.pid,
+    port: status.port,
+    info: { pid: status.pid, port: status.port, startedAt: (/* @__PURE__ */ new Date()).toISOString() }
+  };
+}
+
+export {
+  getDaemonConfig,
+  startDaemonProcess,
+  getDaemonProcessStatus
+};