@xbrowser/cli 1.9.8 → 1.9.9

package/dist/{chunk-PBDID7SE.js → chunk-RZM5CNIY.js}

@@ -1,6 +1,6 @@
 import {
   launch
-} from "./chunk-GM3HWQ5U.js";
+} from "./chunk-RRBXV7KE.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
@@ -134,7 +134,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 {
@@ -142,7 +142,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 {
@@ -628,10 +628,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(() => {
           });
@@ -656,7 +652,7 @@ async function closeSessionByName(name) {
       } catch {
       }
       try {
-        const { SessionRecorder } = await import("./session-recorder-AG6CH6EI.js");
+        const { SessionRecorder } = await import("./session-recorder-QRZMKFVL.js");
         SessionRecorder.cleanup(session.name);
       } catch {
       }
@@ -675,12 +671,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 {
@@ -689,7 +690,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;
@@ -725,8 +726,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/{human-interaction-HJTXFVQS.js → chunk-SQHSZENE.js}

@@ -1,7 +1,6 @@
 import {
   ScreencastCapturer
-} from "./chunk-7ZDWM6T2.js";
-import "./chunk-KFQGP6VL.js";
+} from "./chunk-BNO7OKO4.js";
 
 // src/human-interaction.ts
 import { execSync } from "child_process";
@@ -307,6 +306,7 @@ var HumanInteractionManager = class {
     });
   }
 };
+
 export {
   HumanInteractionManager
 };

package/dist/chunk-TZPKFUBT.js

@@ -0,0 +1,20 @@
+import {
+  getDaemonConfig,
+  getDaemonProcessStatus
+} from "./chunk-CG3D3CHY.js";
+
+// src/utils/viewer-url.ts
+function buildViewerUrl(sessionName = "default") {
+  try {
+    const status = getDaemonProcessStatus();
+    if (!status.running) return void 0;
+    const port = status.port || getDaemonConfig().basePort;
+    return `http://localhost:${port}/preview/${encodeURIComponent(sessionName)}`;
+  } catch {
+    return void 0;
+  }
+}
+
+export {
+  buildViewerUrl
+};

package/dist/{chunk-YAUG3NSI.js → chunk-YMUSHPU4.js}

@@ -1,128 +1,11 @@
+import {
+  startDaemonProcess,
+  stopDaemonProcess
+} from "./chunk-Q2DFJQGS.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
 
-// 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() }
-  };
-}
-
 // src/version.ts
 import { createRequire } from "module";
 var require2 = createRequire(import.meta.url);
@@ -201,7 +84,7 @@ async function rpcCall(method, params = {}, timeoutMs = 1e4) {
   }
   return resp.json();
 }
-async function isDaemonRunning2() {
+async function isDaemonRunning() {
   try {
     const resp = await fetch(`${DAEMON_BASE}/health`, { signal: AbortSignal.timeout(2e3) });
     if (!resp.ok) return false;
@@ -238,6 +121,15 @@ async function forwardExec(command, params, session = "default", cdpEndpoint, ti
     return { success: false, data: null, message: errMsg(e), duration: 0 };
   }
 }
+async function forwardPluginExec(command, params, session = "default", cdpEndpoint, timeoutMs = 12e4) {
+  const rpcParams = { command, params, session };
+  if (cdpEndpoint) rpcParams.cdpEndpoint = cdpEndpoint;
+  try {
+    return await rpcCall("plugin:exec", rpcParams, timeoutMs);
+  } catch (e) {
+    return { success: false, data: null, message: errMsg(e), duration: 0 };
+  }
+}
 async function forwardChain(input, session = "default", cdpEndpoint) {
   const params = { chain: input, session };
   if (cdpEndpoint) params.cdpEndpoint = cdpEndpoint;
@@ -329,17 +221,13 @@ async function forwardViewerCheckSelector(name, selector) {
 
 export {
   version,
-  getDaemonConfig,
-  startDaemonProcess,
-  stopDaemonProcess,
-  killAllDaemonProcesses,
-  getDaemonProcessStatus,
-  isDaemonRunning2 as isDaemonRunning,
+  isDaemonRunning,
   daemonPing,
   forwardSessionCreate,
   forwardSessionClose,
   forwardSessionList,
   forwardExec,
+  forwardPluginExec,
   forwardChain,
   forwardAgentObserve,
   forwardAgentAct,

package/dist/cli.js

@@ -21,16 +21,21 @@ import {
   forwardSessionClose,
   forwardSessionList,
   forwardViewerCheckSelector,
+  version
+} from "./chunk-YMUSHPU4.js";
+import {
+  buildViewerUrl
+} from "./chunk-3OD76SUE.js";
+import {
   getDaemonConfig,
   getDaemonProcessStatus,
   killAllDaemonProcesses,
   startDaemonProcess,
-  stopDaemonProcess,
-  version
-} from "./chunk-YAUG3NSI.js";
+  stopDaemonProcess
+} from "./chunk-Q2DFJQGS.js";
 import {
   SessionRecorder
-} from "./chunk-C3LIGO4V.js";
+} from "./chunk-4452SPFI.js";
 import {
   addKnownIssue,
   getKnowledgePath,
@@ -54,7 +59,7 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-A4YHJW3Z.js";
+} from "./chunk-GUTBIYFW.js";
 import "./chunk-TNEN6VQ2.js";
 import {
   errMsg
@@ -62,7 +67,7 @@ import {
 import {
   detectAntiBot,
   formatDetectionMessage
-} from "./chunk-DPJNCMLC.js";
+} from "./chunk-INTQPBYF.js";
 import {
   NPM_REGISTRY_URL,
   NPM_SCOPE,
@@ -5866,7 +5871,7 @@ function describeSelector(strategy, value, name) {
 // src/context.ts
 function attachDetectAntiBot(ctx) {
   ctx.detectAntiBot = async (page, config) => {
-    const { detectAntiBot: detectAntiBot2 } = await import("./anti-bot-MCVM6IFB.js");
+    const { detectAntiBot: detectAntiBot2 } = await import("./anti-bot-DR56Y63V.js");
     return detectAntiBot2(page, config);
   };
 }
@@ -6313,18 +6318,6 @@ async function getPluginLoader() {
   return pluginLoader;
 }
 
-// src/utils/viewer-url.ts
-function buildViewerUrl(sessionName = "default") {
-  try {
-    const status = getDaemonProcessStatus();
-    if (!status.running) return void 0;
-    const port = status.port || getDaemonConfig().basePort;
-    return `http://localhost:${port}/preview/${encodeURIComponent(sessionName)}`;
-  } catch {
-    return void 0;
-  }
-}
-
 // src/plugin/login-guard.ts
 async function checkPluginLoginRequired(options) {
   const { site, command, commandName, ctx, page, sessionName } = options;
@@ -7058,7 +7051,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
   }
   let targetPageOverride = null;
   if (_target && extraOpts?.cdpEndpoint) {
-    const { findTargetPage } = await import("./browser-GT4BMX6X.js");
+    const { findTargetPage } = await import("./browser-FFYPFTBV.js");
     targetPageOverride = await findTargetPage(extraOpts.cdpEndpoint, _target);
     if (!targetPageOverride) {
       return errorResult(`Target "${_target}" not found. Use 'xbrowser targets --cdp ${extraOpts.cdpEndpoint}' to list available pages.`);
@@ -7075,7 +7068,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     params = result.data;
   }
   if (command.scope !== "cli" && !process.env.XBROWSER_DAEMON_WORKER) {
-    const { forwardExec } = await import("./daemon-client-CMRAWXTN.js");
+    const { forwardExec } = await import("./daemon-client-O6BYVRXV.js");
     const result = await forwardExec(commandName, params, sessionName, extraOpts?.cdpEndpoint);
     if (result) return result;
   }
@@ -7263,6 +7256,26 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     const end = Date.now();
     const duration = end - start;
     const errorMessage = errMsg(err);
+    if (session?.page && process.env.XBROWSER_RECOVERY && !extraOpts?._recoveryAttempted) {
+      try {
+        const { attemptRecovery } = await import("./recovery-J2ISVGUL.js");
+        const recovery = await attemptRecovery(
+          session.page,
+          sessionName,
+          commandName,
+          errorMessage
+        );
+        if (recovery.recovered) {
+          const retry = await executeCommand(commandName, params, sessionName, {
+            ...extraOpts,
+            skipCleanup: true,
+            _recoveryAttempted: true
+          });
+          return retry;
+        }
+      } catch {
+      }
+    }
     if (session) {
       streamCommandEvent(session.id, {
         sessionId: session.id,
@@ -10551,7 +10564,7 @@ async function handlePlugin(args, options, mode) {
       } catch {
       }
       try {
-        const { daemonPing } = await import("./daemon-client-CMRAWXTN.js");
+        const { daemonPing } = await import("./daemon-client-O6BYVRXV.js");
         if (await daemonPing()) {
           await fetch("http://localhost:9224/rpc", {
             method: "POST",
@@ -11117,7 +11130,7 @@ async function handleFilter(args, _mode, options) {
   }
 }
 async function handleGeneratePlugin(sessionName, pluginName, outputDir) {
-  const { SessionRecorder: SessionRecorder2 } = await import("./session-recorder-AG6CH6EI.js");
+  const { SessionRecorder: SessionRecorder2 } = await import("./session-recorder-QRZMKFVL.js");
   const { readSiteKnowledge: readSiteKnowledge2, toMarkdown } = await import("./site-knowledge-SYC6VCDB.js");
   const { mkdirSync: mkdirSync10, writeFileSync: writeFileSync12 } = await import("fs");
   const { join: join13 } = await import("path");
@@ -11354,7 +11367,7 @@ async function handleRun(filePath, options) {
 
 // src/cli/viewer-routes.ts
 async function handleViewer(_args, options, mode, _cdpEndpoint) {
-  const name = options.name || process.env.XBROWSER_SESSION || "default";
+  const name = options.session || process.env.XBROWSER_SESSION || "default";
   const selector = options.selector;
   const userPort = options.port ? Number(options.port) : void 0;
   let status = getDaemonProcessStatus();
@@ -13054,9 +13067,9 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
           }
           const needsBrowser = cmdEntry.scope === "page" || cmdEntry.scope === "browser";
           if (needsBrowser && !process.env.XBROWSER_DAEMON_WORKER) {
-            const { forwardExec } = await import("./daemon-client-CMRAWXTN.js");
+            const { forwardPluginExec } = await import("./daemon-client-O6BYVRXV.js");
             const userTimeout = typeof params.timeout === "number" && params.timeout > 0 ? params.timeout * 1e3 + 3e4 : void 0;
-            const result = await forwardExec(`${command}.${subCommand}`, params, sessionName, cdpEndpoint, userTimeout);
+            const result = await forwardPluginExec(`${command}.${subCommand}`, params, sessionName, cdpEndpoint, userTimeout);
             const resultData = result && typeof result === "object" && "data" in result ? result.data : void 0;
             if (result && result.success === false && resultData?.code === "LOGIN_REQUIRED") {
               process.exitCode = 1;
@@ -13094,7 +13107,7 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
               const targetPage = pages[cmdTabIndex];
               await targetPage.bringToFront().catch(() => {
               });
-              const { setActivePage: setActivePage2 } = await import("./browser-GT4BMX6X.js");
+              const { setActivePage: setActivePage2 } = await import("./browser-FFYPFTBV.js");
               setActivePage2(session, targetPage);
             }
           }
@@ -13370,7 +13383,7 @@ async function main() {
     const command = process.argv[2];
     const isLongRunning = command === "preview" || command === "serve";
     if (!isLongRunning) {
-      const { ensureProcessCanExit } = await import("./browser-GT4BMX6X.js");
+      const { ensureProcessCanExit } = await import("./browser-FFYPFTBV.js");
       await ensureProcessCanExit().catch(() => {
       });
       process.exit(process.exitCode || exitCode);

package/dist/{daemon-client-4HJENICO.js → daemon-client-GKEPT4NY.js}

@@ -1,8 +1,10 @@
 import {
-  startDaemonProcess,
-  stopDaemonProcess,
   version
-} from "./chunk-24SY6PE5.js";
+} from "./chunk-43TEMG4U.js";
+import {
+  startDaemonProcess,
+  stopDaemonProcess
+} from "./chunk-CG3D3CHY.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
@@ -117,6 +119,15 @@ async function forwardExec(command, params, session = "default", cdpEndpoint, ti
     return { success: false, data: null, message: errMsg(e), duration: 0 };
   }
 }
+async function forwardPluginExec(command, params, session = "default", cdpEndpoint, timeoutMs = 12e4) {
+  const rpcParams = { command, params, session };
+  if (cdpEndpoint) rpcParams.cdpEndpoint = cdpEndpoint;
+  try {
+    return await rpcCall("plugin:exec", rpcParams, timeoutMs);
+  } catch (e) {
+    return { success: false, data: null, message: errMsg(e), duration: 0 };
+  }
+}
 async function forwardChain(input, session = "default", cdpEndpoint) {
   const params = { chain: input, session };
   if (cdpEndpoint) params.cdpEndpoint = cdpEndpoint;
@@ -224,6 +235,7 @@ export {
   forwardNetworkList,
   forwardNetworkReplay,
   forwardNetworkTop,
+  forwardPluginExec,
   forwardRecordCheckpoint,
   forwardRecordStart,
   forwardRecordStatus,

package/dist/{daemon-client-CMRAWXTN.js → daemon-client-O6BYVRXV.js}

@@ -17,6 +17,7 @@ import {
   forwardNetworkList,
   forwardNetworkReplay,
   forwardNetworkTop,
+  forwardPluginExec,
   forwardRecordCheckpoint,
   forwardRecordStart,
   forwardRecordStatus,
@@ -29,7 +30,8 @@ import {
   forwardSessionList,
   forwardViewerCheckSelector,
   isDaemonRunning
-} from "./chunk-YAUG3NSI.js";
+} from "./chunk-YMUSHPU4.js";
+import "./chunk-Q2DFJQGS.js";
 import "./chunk-GDKLH7ZY.js";
 import "./chunk-KFQGP6VL.js";
 export {
@@ -51,6 +53,7 @@ export {
   forwardNetworkList,
   forwardNetworkReplay,
   forwardNetworkTop,
+  forwardPluginExec,
   forwardRecordCheckpoint,
   forwardRecordStart,
   forwardRecordStatus,