@xbrowser/cli 1.0.8 → 1.0.9

package/dist/{chunk-WJRE55TN.js → chunk-O3FLVCUU.js}

@@ -3,6 +3,7 @@ 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));
@@ -23,6 +24,30 @@ async function startDaemonProcess(port = 9224) {
     }
     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",
@@ -37,6 +62,10 @@ async function startDaemonProcess(port = 9224) {
     const timeout = setTimeout(() => {
       if (!resolved) {
         resolved = true;
+        try {
+          unlinkSync(lockFile);
+        } catch {
+        }
         reject(new Error("Daemon start timeout after 15s"));
       }
     }, 15e3);
@@ -47,6 +76,10 @@ async function startDaemonProcess(port = 9224) {
           resolved = true;
           clearTimeout(timeout);
           clearInterval(checkInterval);
+          try {
+            unlinkSync(lockFile);
+          } catch {
+          }
           resolve({ pid: s.pid, port: s.port, startedAt: (/* @__PURE__ */ new Date()).toISOString() });
         }
       }
@@ -56,6 +89,10 @@ async function startDaemonProcess(port = 9224) {
         resolved = true;
         clearTimeout(timeout);
         clearInterval(checkInterval);
+        try {
+          unlinkSync(lockFile);
+        } catch {
+        }
         reject(err);
       }
     });

package/dist/{chunk-6WOSXSCQ.js → chunk-XYXCS7JW.js}

@@ -7,6 +7,7 @@ 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));
@@ -27,6 +28,30 @@ async function startDaemonProcess(port = 9224) {
     }
     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",
@@ -41,6 +66,10 @@ async function startDaemonProcess(port = 9224) {
     const timeout = setTimeout(() => {
       if (!resolved) {
         resolved = true;
+        try {
+          unlinkSync(lockFile);
+        } catch {
+        }
         reject(new Error("Daemon start timeout after 15s"));
       }
     }, 15e3);
@@ -51,6 +80,10 @@ async function startDaemonProcess(port = 9224) {
           resolved = true;
           clearTimeout(timeout);
           clearInterval(checkInterval);
+          try {
+            unlinkSync(lockFile);
+          } catch {
+          }
           resolve({ pid: s.pid, port: s.port, startedAt: (/* @__PURE__ */ new Date()).toISOString() });
         }
       }
@@ -60,6 +93,10 @@ async function startDaemonProcess(port = 9224) {
         resolved = true;
         clearTimeout(timeout);
         clearInterval(checkInterval);
+        try {
+          unlinkSync(lockFile);
+        } catch {
+        }
         reject(err);
       }
     });

package/dist/cli.js

@@ -54,7 +54,7 @@ import {
   killAllDaemonProcesses,
   startDaemonProcess,
   stopDaemonProcess
-} from "./chunk-6WOSXSCQ.js";
+} from "./chunk-XYXCS7JW.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
@@ -6984,7 +6984,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-3JOKX2L2.js");
+    const { forwardExec } = await import("./daemon-client-ZHO6NG36.js");
     const result = await forwardExec(commandName, params, sessionName, extraOpts?.cdpEndpoint);
     if (result) return result;
   }
@@ -12421,7 +12421,7 @@ 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-3JOKX2L2.js");
+            const { forwardExec } = await import("./daemon-client-ZHO6NG36.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 resultData = result && typeof result === "object" && "data" in result ? result.data : void 0;

package/dist/{daemon-client-DIEHGP5B.js → daemon-client-R4QWHD7V.js}

@@ -1,6 +1,6 @@
 import {
   startDaemonProcess
-} from "./chunk-WJRE55TN.js";
+} from "./chunk-O3FLVCUU.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";

package/dist/{daemon-client-3JOKX2L2.js → daemon-client-ZHO6NG36.js}

@@ -29,7 +29,7 @@ import {
   forwardSessionList,
   forwardViewerCheckSelector,
   isDaemonRunning
-} from "./chunk-6WOSXSCQ.js";
+} from "./chunk-XYXCS7JW.js";
 import "./chunk-GDKLH7ZY.js";
 import "./chunk-KFQGP6VL.js";
 export {

package/dist/daemon-main.js

@@ -27,14 +27,14 @@ import "./chunk-TNEN6VQ2.js";
 import {
   getDaemonConfig,
   getDaemonProcessStatus
-} from "./chunk-WJRE55TN.js";
+} from "./chunk-O3FLVCUU.js";
 import {
   errMsg
 } from "./chunk-GDKLH7ZY.js";
 import "./chunk-KFQGP6VL.js";
 
 // src/daemon/daemon-main.ts
-import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync7, appendFileSync } from "fs";
+import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync7, appendFileSync, unlinkSync } from "fs";
 import { join as join9 } from "path";
 import { homedir as homedir9 } from "os";
 import { startHttpServer } from "@dyyz1993/xcli-core";
@@ -6942,7 +6942,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-DIEHGP5B.js");
+    const { forwardExec } = await import("./daemon-client-R4QWHD7V.js");
     const result = await forwardExec(commandName, params, sessionName, extraOpts?.cdpEndpoint);
     if (result) return result;
   }
@@ -11406,6 +11406,18 @@ async function main() {
       }
     ]
   });
+  server.on("error", (err) => {
+    if (err.code === "EADDRINUSE") {
+      log(`Port ${daemonPort} already in use \u2014 another daemon instance likely won the startup race. Exiting gracefully.`);
+      try {
+        unlinkSync(join9(CONFIG_DIR4, "daemon.json"));
+      } catch {
+      }
+      process.exit(0);
+    }
+    log(`Server error: ${err.message}`);
+    process.exit(1);
+  });
   const originalListeners = server.listeners("request").slice();
   server.removeAllListeners("request");
   server.on("request", (req, res) => {

package/dist/index.js

@@ -25,7 +25,7 @@ import {
   killAllDaemonProcesses,
   startDaemonProcess,
   stopDaemonProcess
-} from "./chunk-6WOSXSCQ.js";
+} from "./chunk-XYXCS7JW.js";
 import {
   CaptchaDetector,
   HumanInteractionManager,
@@ -7304,7 +7304,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-3JOKX2L2.js");
+    const { forwardExec } = await import("./daemon-client-ZHO6NG36.js");
     const result = await forwardExec(commandName, params, sessionName, extraOpts?.cdpEndpoint);
     if (result) return result;
   }
@@ -12761,7 +12761,7 @@ 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-3JOKX2L2.js");
+            const { forwardExec } = await import("./daemon-client-ZHO6NG36.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 resultData = result && typeof result === "object" && "data" in result ? result.data : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbrowser/cli",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Browser automation CLI for web scraping, headless browsing, SEO analysis, and AI agent workflows. A command-line alternative to Playwright, Puppeteer, and Selenium.",
   "type": "module",
   "bin": {