@btraut/browser-bridge 0.13.0 → 0.13.2

package/dist/index.js

@@ -28,6 +28,7 @@ var import_commander = require("commander");
 
 // packages/shared/src/core-readiness.ts
 var import_promises = require("node:timers/promises");
+var import_node_net = require("node:net");
 
 // packages/shared/src/logging.ts
 var import_node_fs2 = require("node:fs");
@@ -604,6 +605,27 @@ var DEFAULT_HEALTH_RETRY_MS = 250;
 var DEFAULT_HEALTH_ATTEMPTS = 20;
 var DEFAULT_HEALTH_TIMEOUT_MS = 2e3;
 var DEFAULT_HEALTH_BUDGET_MS = 15e3;
+var DEFAULT_PORT_REACHABILITY_TIMEOUT_MS = 300;
+var isPortReachableDefault = async (runtime) => {
+  return await new Promise((resolve4) => {
+    const socket = new import_node_net.Socket();
+    let settled = false;
+    const finish = (reachable) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      socket.removeAllListeners();
+      socket.destroy();
+      resolve4(reachable);
+    };
+    socket.setTimeout(DEFAULT_PORT_REACHABILITY_TIMEOUT_MS);
+    socket.once("connect", () => finish(true));
+    socket.once("timeout", () => finish(false));
+    socket.once("error", () => finish(false));
+    socket.connect(runtime.port, runtime.host);
+  });
+};
 var resolveTimeoutMs = (timeoutMs) => {
   const candidate = timeoutMs ?? (process.env.BROWSER_BRIDGE_CORE_TIMEOUT_MS ? Number.parseInt(process.env.BROWSER_BRIDGE_CORE_TIMEOUT_MS, 10) : process.env.BROWSER_VISION_CORE_TIMEOUT_MS ? Number.parseInt(process.env.BROWSER_VISION_CORE_TIMEOUT_MS, 10) : void 0);
   if (candidate === void 0 || candidate === null) {
@@ -669,57 +691,71 @@ var createCoreReadinessController = (options = {}) => {
     baseUrl = `http://${runtime.host}:${runtime.port}`;
   };
   const checkHealth = async () => {
-    try {
-      const controller = new AbortController();
-      const timeout = setTimeout(() => controller.abort(), healthTimeoutMs);
+    for (const method of ["POST", "GET"]) {
       try {
-        let response;
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), healthTimeoutMs);
         try {
-          response = await fetchImpl(`${baseUrl}/health`, {
-            method: "POST",
-            signal: controller.signal
-          });
-        } catch (error) {
-          if (controller.signal.aborted || error instanceof Error && error.name === "AbortError") {
-            logger.warn(`${logPrefix}.health.timeout`, {
+          let response;
+          try {
+            response = await fetchImpl(`${baseUrl}/health`, {
+              method,
+              signal: controller.signal
+            });
+          } catch (error) {
+            if (controller.signal.aborted || error instanceof Error && error.name === "AbortError") {
+              logger.warn(`${logPrefix}.health.timeout`, {
+                base_url: baseUrl,
+                method,
+                timeout_ms: healthTimeoutMs
+              });
+              continue;
+            }
+            logger.warn(`${logPrefix}.health.fetch_failed`, {
               base_url: baseUrl,
-              timeout_ms: healthTimeoutMs
+              method,
+              error
             });
-            return false;
+            throw error;
+          }
+          if (!response.ok) {
+            logger.warn(`${logPrefix}.health.non_ok`, {
+              base_url: baseUrl,
+              method,
+              status: response.status
+            });
+            continue;
+          }
+          const data = await response.json().catch(() => null);
+          const ok = Boolean(data?.ok);
+          if (ok) {
+            if (method === "GET") {
+              logger.info(`${logPrefix}.health.compat_probe`, {
+                base_url: baseUrl,
+                method
+              });
+            }
+            return true;
           }
-          logger.warn(`${logPrefix}.health.fetch_failed`, {
-            base_url: baseUrl,
-            error
-          });
-          throw error;
-        }
-        if (!response.ok) {
-          logger.warn(`${logPrefix}.health.non_ok`, {
-            base_url: baseUrl,
-            status: response.status
-          });
-          return false;
-        }
-        const data = await response.json().catch(() => null);
-        const ok = Boolean(data?.ok);
-        if (!ok) {
           logger.warn(`${logPrefix}.health.not_ready`, {
-            base_url: baseUrl
+            base_url: baseUrl,
+            method
           });
+        } finally {
+          clearTimeout(timeout);
         }
-        return ok;
-      } finally {
-        clearTimeout(timeout);
+      } catch (error) {
+        logger.warn(`${logPrefix}.health.error`, {
+          base_url: baseUrl,
+          method,
+          error
+        });
       }
-    } catch (error) {
-      logger.warn(`${logPrefix}.health.error`, {
-        base_url: baseUrl,
-        error
-      });
-      return false;
     }
+    return false;
   };
   const ensureCoreRunning = async () => {
+    const portReachabilityCheck = options.portReachabilityCheck ?? isPortReachableDefault;
     refreshRuntime();
     if (await checkHealth()) {
       logger.debug(`${logPrefix}.ensure_ready.already_running`, {
@@ -760,6 +796,21 @@ var createCoreReadinessController = (options = {}) => {
       health_budget_ms: healthBudgetMs,
       health_timeout_ms: healthTimeoutMs
     });
+    let portOccupied = false;
+    try {
+      portOccupied = await portReachabilityCheck(runtime);
+    } catch (error) {
+      logger.warn(`${logPrefix}.ensure_ready.port_probe_failed`, {
+        host: runtime.host,
+        port: runtime.port,
+        error
+      });
+    }
+    if (portOccupied) {
+      throw new Error(
+        `Core daemon failed to start on ${runtime.host}:${runtime.port}. A process is already listening on this port but did not pass Browser Bridge health checks. Retry with --no-daemon to reuse it, or enable isolated mode (BROWSER_BRIDGE_ISOLATED_MODE=1) for per-worktree ports.`
+      );
+    }
     throw new Error(
       `Core daemon failed to start on ${runtime.host}:${runtime.port}.`
     );