@xbrowser/cli 1.0.0 → 1.0.3

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

@@ -1,9 +1,12 @@
 import {
   launch
-} from "./chunk-42RPMJ76.js";
+} from "./chunk-N2JFPWMI.js";
+import {
+  errMsg
+} from "./chunk-GDKLH7ZY.js";
 import {
   CDPInterceptorProxy
-} from "./chunk-ZZ2TFWIV.js";
+} from "./chunk-ABXMBNQ6.js";
 
 // src/browser.ts
 import { randomUUID } from "crypto";
@@ -65,6 +68,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;
@@ -77,7 +81,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;
@@ -88,7 +92,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 {
@@ -111,7 +115,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 {
@@ -201,6 +205,9 @@ async function createBrowser(options) {
       return browser3;
     }
     const { browser: browser2 } = await launch({ cdpEndpoint: realEndpoint });
+    await browser2.discoverContexts().catch((err) => {
+      console.error(`[browser] discoverContexts failed: ${errMsg(err)}`);
+    });
     return browser2;
   }
   const executablePath = options?.executablePath || process.env.XBROWSER_CHROMIUM_PATH || discoverChromiumPath();
@@ -215,10 +222,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);
@@ -322,9 +326,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(),
@@ -337,18 +346,18 @@ 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;
   } catch (e) {
-    console.error(`[Session Restore] Failed for "${name}":`, e.message);
+    console.error(`[Session Restore] Failed for "${name}":`, errMsg(e));
     deleteSessionDiskMeta(name);
     return void 0;
   }
@@ -359,7 +368,12 @@ async function createEphemeralContext(options) {
     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 };
@@ -391,11 +405,11 @@ 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-BN6QEZ7R.js");
+  const { networkStore } = await import("./network-store-YVDNUREI.js");
   const requestData = /* @__PURE__ */ new Map();
   const responseMeta = /* @__PURE__ */ new Map();
   const xbPage = page;
@@ -516,16 +530,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);
@@ -566,14 +602,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) {
@@ -592,20 +628,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-BN6QEZ7R.js");
+        const { networkStore, commandLogStore } = await import("./network-store-YVDNUREI.js");
         networkStore.clear(session.name);
         commandLogStore.clear(session.name);
       } catch {
       }
       try {
-        const { SessionRecorder } = await import("./session-recorder-MA75PKTQ.js");
+        const { SessionRecorder } = await import("./session-recorder-RTDGURIJ.js");
         SessionRecorder.cleanup(session.name);
       } catch {
       }
@@ -620,9 +656,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();
@@ -631,9 +667,9 @@ async function closeAllSessions() {
         await session.browser.close().catch(() => {
         });
       }
-      sessions.delete(id);
+      sessions.removeById(session.id);
     } catch {
-      sessions.delete(id);
+      sessions.removeById(session.id);
     }
   }
 }
@@ -671,7 +707,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
+};