@xbrowser/cli 1.9.7 → 1.9.9

package/dist/{chunk-37SHZSUR.js → chunk-6OZWKXSW.js}

@@ -1,6 +1,6 @@
 import {
   launch
-} from "./chunk-VJNMAWPZ.js";
+} from "./chunk-RRBXV7KE.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
@@ -1499,7 +1499,7 @@ process.on("exit", () => {
     if (session.isCDP) {
       logSessionEvent("process_exit", `Session "${session.name}": CDP connection (not closing external browser).`);
     } else {
-      logSessionEvent("process_exit", `Session "${session.name}": Closing browser.`);
+      logSessionEvent("process_exit", `Session "${session.name}": Closing self-launched browser.`);
       try {
         session.browser?.close();
       } catch {
@@ -1507,7 +1507,7 @@ process.on("exit", () => {
     }
   }
   if (_sharedBrowser) {
-    logSessionEvent("process_exit", "Closing shared browser.");
+    logSessionEvent("process_exit", "Closing shared browser (self-launched only, external CDP is safe).");
     try {
       _sharedBrowser.close();
     } catch {
@@ -1993,10 +1993,6 @@ async function closeSessionByName(name) {
     if (session.name === name || session.id === name) {
       logSessionEvent("close_session", `name="${session.name}" id="${session.id}" url="${session.page.url()}"`);
       if (session.isCDP) {
-        try {
-          await session.page.close();
-        } catch {
-        }
         if (session.browser) {
           await session.browser.close().catch(() => {
           });
@@ -2021,7 +2017,7 @@ async function closeSessionByName(name) {
       } catch {
       }
       try {
-        const { SessionRecorder } = await import("./session-recorder-7GXI42FO.js");
+        const { SessionRecorder } = await import("./session-recorder-H3KEYU26.js");
         SessionRecorder.cleanup(session.name);
       } catch {
       }
@@ -2040,12 +2036,17 @@ async function closeAllSessions() {
   if (names) logSessionEvent("close_all_sessions", `Closing ${sessions.size} sessions: ${names}`);
   for (const session of sessions.list()) {
     try {
-      if (!session.isCDP) {
+      if (session.isCDP) {
+        if (session.browser) {
+          await session.browser.close().catch(() => {
+          });
+        }
+      } else {
         await session.context.close();
-      }
-      if (session.browser) {
-        await session.browser.close().catch(() => {
-        });
+        if (session.browser) {
+          await session.browser.close().catch(() => {
+          });
+        }
       }
       sessions.removeById(session.id);
     } catch {
@@ -2054,7 +2055,7 @@ async function closeAllSessions() {
   }
 }
 async function destroyBrowser() {
-  logSessionEvent("destroy_browser", `Sessions count: ${sessions.size}. Clearing idle timer and closing all browsers.`);
+  logSessionEvent("destroy_browser", `Sessions count: ${sessions.size}. Clearing idle timer and closing all sessions.`);
   if (idleTimer) {
     clearTimeout(idleTimer);
     idleTimer = null;
@@ -2090,8 +2091,6 @@ async function ensureProcessCanExit() {
   for (const session of sessions.list()) {
     if (session.browser) {
       if (session.isCDP) {
-        await session.browser.close().catch(() => {
-        });
       } else {
         await session.browser.close().catch(() => {
         });

package/dist/{chunk-7ZDWM6T2.js → chunk-BNO7OKO4.js}

@@ -36,16 +36,15 @@ var ScreencastCapturer = class {
       const cdp = await page.context().newCDPSession(page);
       this.cdpSession = cdp;
       cdp.on("Page.screencastFrame", async (params) => {
-        if (!this.frameCallback) return;
-        try {
-          await cdp.send("Page.screencastFrameAck", { sessionId: params.sessionId });
-        } catch {
-        }
+        const cb = this.frameCallback;
+        if (!cb) return;
+        cdp.send("Page.screencastFrameAck", { sessionId: params.sessionId }).catch(() => {
+        });
         const viewport = {
           width: params.metadata?.deviceWidth || this.maxWidth,
           height: params.metadata?.deviceHeight || this.maxHeight
         };
-        this.frameCallback({
+        cb({
           id: crypto.randomUUID(),
           sessionId: this.sessionId,
           timestamp: Date.now(),

package/dist/{chunk-24SY6PE5.js → chunk-CG3D3CHY.js}

@@ -116,16 +116,9 @@ function getDaemonProcessStatus() {
   };
 }
 
-// src/version.ts
-import { createRequire } from "module";
-var require2 = createRequire(import.meta.url);
-var pkg = require2("../package.json");
-var version = pkg.version;
-
 export {
   getDaemonConfig,
   startDaemonProcess,
   stopDaemonProcess,
-  getDaemonProcessStatus,
-  version
+  getDaemonProcessStatus
 };

package/dist/{chunk-ZJHQPMCY.js → chunk-DWDXEGVK.js}

@@ -39,16 +39,15 @@ var ScreencastCapturer = class {
       const cdp = await page.context().newCDPSession(page);
       this.cdpSession = cdp;
       cdp.on("Page.screencastFrame", async (params) => {
-        if (!this.frameCallback) return;
-        try {
-          await cdp.send("Page.screencastFrameAck", { sessionId: params.sessionId });
-        } catch {
-        }
+        const cb = this.frameCallback;
+        if (!cb) return;
+        cdp.send("Page.screencastFrameAck", { sessionId: params.sessionId }).catch(() => {
+        });
         const viewport = {
           width: params.metadata?.deviceWidth || this.maxWidth,
           height: params.metadata?.deviceHeight || this.maxHeight
         };
-        this.frameCallback({
+        cb({
           id: crypto.randomUUID(),
           sessionId: this.sessionId,
           timestamp: Date.now(),

package/dist/{chunk-74S7UUI2.js → chunk-GUTBIYFW.js}

@@ -294,6 +294,36 @@ function queryJS(selector) {
     const xpath = JSON.stringify(selector.slice(6));
     return `document.evaluate(${xpath}, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue`;
   }
+  if (selector.startsWith("text=")) {
+    const raw = selector.slice(5);
+    const exact = raw.startsWith('"') && raw.endsWith('"');
+    const text = exact ? raw.slice(1, -1) : raw;
+    return `(() => {
+      const target = ${JSON.stringify(text)};
+      const exact = ${exact};
+      const els = [...document.querySelectorAll('*')].filter(e => {
+        if (e.children.length > 0) return false;
+        if (e.offsetParent === null) return false;
+        const t = (e.textContent || '').trim();
+        if (!t) return false;
+        return exact ? t === target : t.toLowerCase().includes(target.toLowerCase());
+      });
+      return els[0] || null;
+    })()`;
+  }
+  if (selector.startsWith("popup-text=")) {
+    const text = selector.slice("popup-text=".length);
+    return `(() => {
+      const target = ${JSON.stringify(text)};
+      const els = [...document.querySelectorAll('*')].filter(e => {
+        if (e.children.length > 0) return false;
+        if (e.offsetParent === null) return false;
+        if ((e.textContent || '').trim() !== target) return false;
+        return true;
+      });
+      return els[0] || null;
+    })()`;
+  }
   return `document.querySelector(${JSON.stringify(selector)})`;
 }
 function queryAllJS(selector) {
@@ -301,6 +331,9 @@ function queryAllJS(selector) {
     const xpath = JSON.stringify(selector.slice(6));
     return `(() => { const it = document.evaluate(${xpath}, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); const r=[]; for(let i=0;i<it.snapshotLength;i++) r.push(it.snapshotItem(i)); return r; })()`;
   }
+  if (selector.startsWith("text=") || selector.startsWith("popup-text=")) {
+    return `(() => { const el = ${queryJS(selector)}; return el ? [el] : []; })()`;
+  }
   return `document.querySelectorAll(${JSON.stringify(selector)})`;
 }
 
@@ -1338,7 +1371,22 @@ Last error: ${lastError.message}` : "";
     return this._url;
   }
   async title() {
-    this._title = await this.evaluate("document.title");
+    for (let i = 0; i < 20; i++) {
+      try {
+        this._title = await this.evaluate("document.title");
+        if (this._title) return this._title;
+      } catch {
+      }
+      await new Promise((r) => setTimeout(r, 50));
+    }
+    try {
+      const info = await this._cdpSend("Target.getTargetInfo", { targetId: this._targetId });
+      if (info?.title) {
+        this._title = info.title;
+        return this._title;
+      }
+    } catch {
+    }
     return this._title;
   }
   async content() {
@@ -2748,11 +2796,52 @@ var CDPConnection = class extends EventEmitter4 {
     this.setMaxListeners(0);
     this.defaultSessionId = sessionId;
     if (typeof wsOrUrl === "string") {
-      this.ws = new WebSocket(wsOrUrl);
+      const wsOptions = /^wss:\/\/\d+\.\d+\.\d+\.\d+/.test(wsOrUrl) ? { rejectUnauthorized: false } : void 0;
+      this.ws = new WebSocket(wsOrUrl, wsOptions);
     } else {
       this.ws = wsOrUrl;
     }
     this.bindWebSocket();
+    this.startKeepalive();
+  }
+  /** Send periodic WS pings to prevent idle-timeout disconnects (e.g. CF's 100s).
+   *  Also detects dead connections: if a pong isn't received within 10s of a
+   *  ping, the connection is considered dead and forcibly closed. */
+  keepaliveTimer = null;
+  pongTimer = null;
+  startKeepalive() {
+    this.ws.on("pong", () => {
+      if (this.pongTimer) {
+        clearTimeout(this.pongTimer);
+        this.pongTimer = null;
+      }
+    });
+    this.keepaliveTimer = setInterval(() => {
+      if (this.ws.readyState === WebSocket.OPEN) {
+        if (!this.pongTimer) {
+          this.pongTimer = setTimeout(() => {
+            if (!this.closed) {
+              this.closed = true;
+              this.closeReason = "keepalive timeout (no pong in 10s)";
+              try {
+                this.ws.terminate();
+              } catch {
+              }
+              for (const [, pending] of this.pending) {
+                clearTimeout(pending.timeout);
+                pending.reject(new Error("Connection dead: keepalive timeout"));
+              }
+              this.pending.clear();
+              this.emit("disconnect");
+            }
+          }, 1e4);
+        }
+        this.ws.ping?.();
+      } else if (this.closed) {
+        if (this.keepaliveTimer) clearInterval(this.keepaliveTimer);
+        this.keepaliveTimer = null;
+      }
+    }, 3e4);
   }
   /** Wait for the connection to be fully open */
   async ready() {
@@ -2861,6 +2950,14 @@ var CDPConnection = class extends EventEmitter4 {
     if (this.closed) return;
     this.closed = true;
     this.closeReason = "closed by caller";
+    if (this.keepaliveTimer) {
+      clearInterval(this.keepaliveTimer);
+      this.keepaliveTimer = null;
+    }
+    if (this.pongTimer) {
+      clearTimeout(this.pongTimer);
+      this.pongTimer = null;
+    }
     for (const [id, pending] of this.pending) {
       clearTimeout(pending.timeout);
       pending.reject(new Error(`Connection closed: ${pending.method}`));
@@ -2902,6 +2999,10 @@ var CDPConnection = class extends EventEmitter4 {
       if (this.closed) return;
       this.closed = true;
       this.closeReason = `WebSocket closed: ${code} ${reason?.toString() ?? ""}`.trim();
+      if (this.keepaliveTimer) {
+        clearInterval(this.keepaliveTimer);
+        this.keepaliveTimer = null;
+      }
       for (const [id, pending] of this.pending) {
         clearTimeout(pending.timeout);
         pending.reject(new Error(`Connection closed: ${pending.method}`));
@@ -4443,7 +4544,7 @@ process.on("exit", () => {
     if (session.isCDP) {
       logSessionEvent("process_exit", `Session "${session.name}": CDP connection (not closing external browser).`);
     } else {
-      logSessionEvent("process_exit", `Session "${session.name}": Closing browser.`);
+      logSessionEvent("process_exit", `Session "${session.name}": Closing self-launched browser.`);
       try {
         session.browser?.close();
       } catch {
@@ -4451,7 +4552,7 @@ process.on("exit", () => {
     }
   }
   if (_sharedBrowser) {
-    logSessionEvent("process_exit", "Closing shared browser.");
+    logSessionEvent("process_exit", "Closing shared browser (self-launched only, external CDP is safe).");
     try {
       _sharedBrowser.close();
     } catch {
@@ -4937,10 +5038,6 @@ async function closeSessionByName(name) {
     if (session.name === name || session.id === name) {
       logSessionEvent("close_session", `name="${session.name}" id="${session.id}" url="${session.page.url()}"`);
       if (session.isCDP) {
-        try {
-          await session.page.close();
-        } catch {
-        }
         if (session.browser) {
           await session.browser.close().catch(() => {
           });
@@ -4965,7 +5062,7 @@ async function closeSessionByName(name) {
       } catch {
       }
       try {
-        const { SessionRecorder } = await import("./session-recorder-RFOPX4SF.js");
+        const { SessionRecorder } = await import("./session-recorder-QRZMKFVL.js");
         SessionRecorder.cleanup(session.name);
       } catch {
       }
@@ -4984,12 +5081,17 @@ async function closeAllSessions() {
   if (names) logSessionEvent("close_all_sessions", `Closing ${sessions.size} sessions: ${names}`);
   for (const session of sessions.list()) {
     try {
-      if (!session.isCDP) {
+      if (session.isCDP) {
+        if (session.browser) {
+          await session.browser.close().catch(() => {
+          });
+        }
+      } else {
         await session.context.close();
-      }
-      if (session.browser) {
-        await session.browser.close().catch(() => {
-        });
+        if (session.browser) {
+          await session.browser.close().catch(() => {
+          });
+        }
       }
       sessions.removeById(session.id);
     } catch {
@@ -4998,7 +5100,7 @@ async function closeAllSessions() {
   }
 }
 async function destroyBrowser() {
-  logSessionEvent("destroy_browser", `Sessions count: ${sessions.size}. Clearing idle timer and closing all browsers.`);
+  logSessionEvent("destroy_browser", `Sessions count: ${sessions.size}. Clearing idle timer and closing all sessions.`);
   if (idleTimer) {
     clearTimeout(idleTimer);
     idleTimer = null;
@@ -5034,8 +5136,6 @@ async function ensureProcessCanExit() {
   for (const session of sessions.list()) {
     if (session.browser) {
       if (session.isCDP) {
-        await session.browser.close().catch(() => {
-        });
       } else {
         await session.browser.close().catch(() => {
         });

package/dist/{chunk-DPJNCMLC.js → chunk-INTQPBYF.js}

@@ -98,6 +98,13 @@ async function detectCaptcha(page) {
     for (const selector of captchaSelectors) {
       const element = await page.$(selector).catch(() => null);
       if (element) {
+        const visible = await element.isVisible().catch(() => false);
+        if (!visible) continue;
+        try {
+          const box = await element.boundingBox();
+          if (box && (box.y < -1e3 || box.x < -1e3)) continue;
+        } catch {
+        }
         return {
           detected: true,
           type: "captcha",

package/dist/{human-interaction-OU7LZ6OZ.js → chunk-MWFHZUIY.js}

@@ -1,7 +1,6 @@
 import {
   getCaptchaConfig
 } from "./chunk-IIM5GOD7.js";
-import "./chunk-KFQGP6VL.js";
 
 // src/human-interaction.ts
 import { execSync } from "child_process";
@@ -44,16 +43,15 @@ var ScreencastCapturer = class {
       const cdp = await page.context().newCDPSession(page);
       this.cdpSession = cdp;
       cdp.on("Page.screencastFrame", async (params) => {
-        if (!this.frameCallback) return;
-        try {
-          await cdp.send("Page.screencastFrameAck", { sessionId: params.sessionId });
-        } catch {
-        }
+        const cb = this.frameCallback;
+        if (!cb) return;
+        cdp.send("Page.screencastFrameAck", { sessionId: params.sessionId }).catch(() => {
+        });
         const viewport = {
           width: params.metadata?.deviceWidth || this.maxWidth,
           height: params.metadata?.deviceHeight || this.maxHeight
         };
-        this.frameCallback({
+        cb({
           id: crypto.randomUUID(),
           sessionId: this.sessionId,
           timestamp: Date.now(),
@@ -429,6 +427,7 @@ var HumanInteractionManager = class {
     });
   }
 };
+
 export {
   HumanInteractionManager
 };

package/dist/chunk-Q2DFJQGS.js

@@ -0,0 +1,128 @@
+// src/daemon/daemon.ts
+import { spawn } from "child_process";
+import { join, dirname } from "path";
+import { homedir } from "os";
+import { fileURLToPath } from "url";
+import { writeFileSync, unlinkSync, mkdirSync } from "fs";
+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 lockFile = join(CONFIG_DIR, "daemon.lock");
+  try {
+    mkdirSync(CONFIG_DIR, { recursive: true });
+    writeFileSync(lockFile, String(process.pid), { flag: "wx" });
+  } catch {
+    console.error("Another process is starting the daemon, waiting...");
+    for (let i = 0; i < 50; i++) {
+      await new Promise((r) => setTimeout(r, 200));
+      if (isDaemonRunning(config)) {
+        const s = getDaemonStatus(config);
+        if (s.port === port && s.pid) {
+          return { pid: s.pid, port: s.port, startedAt: (/* @__PURE__ */ new Date()).toISOString() };
+        }
+      }
+    }
+    try {
+      unlinkSync(lockFile);
+    } catch {
+    }
+    try {
+      writeFileSync(lockFile, String(process.pid), { flag: "wx" });
+    } catch {
+    }
+  }
+  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;
+        try {
+          unlinkSync(lockFile);
+        } catch {
+        }
+        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);
+          try {
+            unlinkSync(lockFile);
+          } catch {
+          }
+          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);
+        try {
+          unlinkSync(lockFile);
+        } catch {
+        }
+        reject(err);
+      }
+    });
+  });
+}
+async function stopDaemonProcess() {
+  await xcliStopDaemon(getDaemonConfig());
+}
+async function killAllDaemonProcesses() {
+  await killAllDaemon(getDaemonConfig());
+}
+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,
+  stopDaemonProcess,
+  killAllDaemonProcesses,
+  getDaemonProcessStatus
+};