bb-browser 0.11.0 → 0.11.2

package/dist/daemon.js

@@ -3,7 +3,7 @@ import {
   COMMAND_TIMEOUT,
   DAEMON_HOST,
   DAEMON_PORT
-} from "./chunk-5WGFUZLM.js";
+} from "./chunk-H2VEQBAU.js";
 import "./chunk-D4HDZEJT.js";
 
 // packages/daemon/src/index.ts
@@ -35,16 +35,13 @@ function loadBuildDomTreeScript() {
   if (cachedBuildDomTreeScript) return cachedBuildDomTreeScript;
   const currentDir = path.dirname(fileURLToPath(import.meta.url));
   const candidates = [
-    path.resolve(currentDir, "./extension/buildDomTree.js"),
-    path.resolve(currentDir, "../extension/buildDomTree.js"),
-    path.resolve(currentDir, "../extension/dist/buildDomTree.js"),
-    path.resolve(currentDir, "../packages/extension/public/buildDomTree.js"),
-    path.resolve(currentDir, "../packages/extension/dist/buildDomTree.js"),
-    path.resolve(currentDir, "../../../extension/buildDomTree.js"),
-    path.resolve(currentDir, "../../../extension/dist/buildDomTree.js"),
-    path.resolve(currentDir, "../../extension/buildDomTree.js"),
-    path.resolve(currentDir, "../../../packages/extension/dist/buildDomTree.js"),
-    path.resolve(currentDir, "../../../packages/extension/public/buildDomTree.js")
+    // Built dist: dist/daemon.js → ../packages/shared/buildDomTree.js
+    path.resolve(currentDir, "../packages/shared/buildDomTree.js"),
+    // Dev mode: packages/daemon/src/ → ../../shared/buildDomTree.js
+    path.resolve(currentDir, "../../shared/buildDomTree.js"),
+    // npm installed: dist/daemon.js → same level
+    path.resolve(currentDir, "./buildDomTree.js"),
+    path.resolve(currentDir, "../buildDomTree.js")
   ];
   for (const candidate of candidates) {
     try {
@@ -1021,11 +1018,15 @@ var HttpServer = class {
               (_, reject) => setTimeout(() => reject(new Error("CDP connection timeout")), COMMAND_TIMEOUT)
             )
           ]);
-        } catch (error) {
+        } catch {
+          const cdpTarget = `${this.cdp.host}:${this.cdp.port}`;
+          const reason = this.cdp.lastError || "unknown";
           this.sendJson(res, 503, {
             id: request.id,
             success: false,
-            error: error instanceof Error ? error.message : "CDP not ready"
+            error: `Chrome not connected (CDP at ${cdpTarget})`,
+            reason,
+            hint: "Make sure Chrome is running. Try: bb-browser daemon shutdown && bb-browser tab list"
           });
           return;
         }
@@ -1151,6 +1152,8 @@ var CdpConnection = class {
   currentTargetId;
   connectionPromise = null;
   _connected = false;
+  /** Last connection error (for diagnostics in 503 responses). */
+  lastError = null;
   /** Resolvers for commands queued before CDP is ready. */
   readyWaiters = [];
   constructor(host, port, tabManager) {
@@ -1174,6 +1177,15 @@ var CdpConnection = class {
     this.connectionPromise = this.doConnect();
     try {
       await this.connectionPromise;
+      this.lastError = null;
+    } catch (err) {
+      this.lastError = err instanceof Error ? err.message : String(err);
+      const connErr = new Error(this.lastError);
+      for (const waiter of this.readyWaiters) {
+        waiter.reject(connErr);
+      }
+      this.readyWaiters = [];
+      throw err;
     } finally {
       this.connectionPromise = null;
     }
@@ -1205,6 +1217,7 @@ var CdpConnection = class {
   /** Wait until CDP connection is established (for two-phase startup). */
   waitUntilReady() {
     if (this._connected) return Promise.resolve();
+    if (this.lastError) return Promise.reject(new Error(this.lastError));
     return new Promise((resolve, reject) => {
       this.readyWaiters.push({ resolve, reject });
     });
@@ -1311,10 +1324,16 @@ var CdpConnection = class {
     ws.on("close", () => {
       this._connected = false;
       this.socket = null;
+      this.lastError = "CDP WebSocket closed unexpectedly";
       for (const p of this.pending.values()) {
         p.reject(new Error("CDP connection closed"));
       }
       this.pending.clear();
+      const closeErr = new Error(this.lastError);
+      for (const waiter of this.readyWaiters) {
+        waiter.reject(closeErr);
+      }
+      this.readyWaiters = [];
     });
     ws.on("error", () => {
     });
@@ -1822,9 +1841,8 @@ var TabStateManager = class {
 };
 
 // packages/daemon/src/index.ts
-var PID_FILE_PATH = "/tmp/bb-browser.pid";
-var DAEMON_DIR = path2.join(os.homedir(), ".bb-browser");
-var TOKEN_FILE = path2.join(DAEMON_DIR, "daemon.token");
+var DAEMON_DIR = process.env.BB_BROWSER_HOME || path2.join(os.homedir(), ".bb-browser");
+var DAEMON_JSON = path2.join(DAEMON_DIR, "daemon.json");
 var DEFAULT_CDP_PORT = 19825;
 function parseOptions() {
   const { values } = parseArgs({
@@ -1893,28 +1911,17 @@ Endpoints:
     token
   };
 }
-function writePidFile() {
-  writeFileSync(PID_FILE_PATH, String(process.pid), "utf-8");
-}
-function cleanupPidFile() {
-  if (existsSync(PID_FILE_PATH)) {
-    try {
-      unlinkSync(PID_FILE_PATH);
-    } catch {
-    }
-  }
-}
-function writeTokenFile(token) {
+function writeDaemonJson(info) {
   try {
     mkdirSync(DAEMON_DIR, { recursive: true });
-    writeFileSync(TOKEN_FILE, token, { mode: 384 });
+    writeFileSync(DAEMON_JSON, JSON.stringify(info), { mode: 384 });
   } catch {
   }
 }
-function cleanupTokenFile() {
-  if (existsSync(TOKEN_FILE)) {
+function cleanupDaemonJson() {
+  if (existsSync(DAEMON_JSON)) {
     try {
-      unlinkSync(TOKEN_FILE);
+      unlinkSync(DAEMON_JSON);
     } catch {
     }
   }
@@ -1935,7 +1942,7 @@ async function discoverCdpPort(host, port) {
     }
   } catch {
   }
-  const managedPortFile = path2.join(os.homedir(), ".bb-browser", "browser", "cdp-port");
+  const managedPortFile = path2.join(DAEMON_DIR, "browser", "cdp-port");
   try {
     const rawPort = readFileSync2(managedPortFile, "utf8").trim();
     const managedPort = parseInt(rawPort, 10);
@@ -1982,8 +1989,7 @@ async function main() {
     console.error("[Daemon] Shutting down...");
     cdp.disconnect();
     await httpServer.stop();
-    cleanupPidFile();
-    cleanupTokenFile();
+    cleanupDaemonJson();
     process.exit(0);
   };
   const httpServer = new HttpServer({
@@ -1996,8 +2002,12 @@ async function main() {
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
   await httpServer.start();
-  writePidFile();
-  writeTokenFile(options.token);
+  writeDaemonJson({
+    pid: process.pid,
+    host: options.host,
+    port: options.port,
+    token: options.token
+  });
   console.error(
     `[Daemon] HTTP server listening on http://${options.host}:${options.port}`
   );
@@ -2020,8 +2030,7 @@ async function main() {
 }
 main().catch((error) => {
   console.error("[Daemon] Fatal error:", error);
-  cleanupPidFile();
-  cleanupTokenFile();
+  cleanupDaemonJson();
   process.exit(1);
 });
 //# sourceMappingURL=daemon.js.map