crawlio-browser 1.4.7 → 1.5.0

package/dist/mcp-server/{chunk-RA3LVVKH.js → chunk-GJH6PLST.js}

@@ -1,9 +1,11 @@
 // src/shared/constants.ts
 import { homedir } from "os";
 import { join } from "path";
-var PKG_VERSION = "1.4.7";
+var PKG_VERSION = "1.5.0";
 var WS_PORT = 9333;
+var WS_PORT_MAX = 9342;
 var WS_HOST = "127.0.0.1";
+var BRIDGE_DIR = join(homedir(), ".crawlio", "bridges");
 var CRAWLIO_PORT_FILE = join(
   homedir(),
   "Library",
@@ -30,7 +32,9 @@ var WS_RECONNECT_GRACE = 5e3;
 export {
   PKG_VERSION,
   WS_PORT,
+  WS_PORT_MAX,
   WS_HOST,
+  BRIDGE_DIR,
   CRAWLIO_PORT_FILE,
   TIMEOUTS,
   WS_HEARTBEAT_INTERVAL,

package/dist/mcp-server/index.js

@@ -1,13 +1,15 @@
 import {
+  BRIDGE_DIR,
   CRAWLIO_PORT_FILE,
   PKG_VERSION,
   TIMEOUTS,
   WS_HEARTBEAT_INTERVAL,
   WS_HOST,
   WS_PORT,
+  WS_PORT_MAX,
   WS_RECONNECT_GRACE,
   WS_STALE_THRESHOLD
-} from "./chunk-RA3LVVKH.js";
+} from "./chunk-GJH6PLST.js";
 
 // src/mcp-server/index.ts
 import { randomBytes as randomBytes2 } from "crypto";
@@ -25,7 +27,8 @@ import { WebSocketServer, WebSocket } from "ws";
 import { createServer } from "http";
 import { randomUUID } from "crypto";
 import { fileURLToPath } from "url";
-import { dirname, resolve } from "path";
+import { dirname, join, resolve } from "path";
+import { mkdirSync, writeFileSync, unlinkSync, readdirSync, readFileSync } from "fs";
 function resolveIndexPath() {
   if (process.argv[1] && process.argv[1].includes("dist")) {
     return process.argv[1];
@@ -219,6 +222,66 @@ var MessageQueue = class {
 };
 var HEARTBEAT_INTERVAL = WS_HEARTBEAT_INTERVAL;
 var STALE_THRESHOLD = WS_STALE_THRESHOLD;
+async function findAvailablePort(start) {
+  for (let port = start; port <= WS_PORT_MAX; port++) {
+    try {
+      const res = await fetch(`http://${WS_HOST}:${port}/health`, {
+        signal: AbortSignal.timeout(300)
+      });
+      const body = await res.json();
+      if (body.service === "crawlio-mcp" && body.pid === process.pid) {
+        return port;
+      }
+    } catch {
+      return port;
+    }
+  }
+  throw new Error(`All ports ${WS_PORT}-${WS_PORT_MAX} in use by crawlio-mcp instances`);
+}
+function cleanStaleBridgeFiles() {
+  try {
+    const files = readdirSync(BRIDGE_DIR);
+    for (const file of files) {
+      if (!file.endsWith(".json")) continue;
+      try {
+        const data = JSON.parse(readFileSync(join(BRIDGE_DIR, file), "utf-8"));
+        if (data.pid && data.pid !== process.pid) {
+          try {
+            process.kill(data.pid, 0);
+          } catch {
+            try {
+              unlinkSync(join(BRIDGE_DIR, file));
+            } catch {
+            }
+          }
+        }
+      } catch {
+        try {
+          unlinkSync(join(BRIDGE_DIR, file));
+        } catch {
+        }
+      }
+    }
+  } catch {
+  }
+}
+function writeBridgeFile(port) {
+  mkdirSync(BRIDGE_DIR, { recursive: true });
+  const bridgeFile = join(BRIDGE_DIR, `${process.pid}.json`);
+  writeFileSync(bridgeFile, JSON.stringify({
+    port,
+    pid: process.pid,
+    cwd: process.cwd(),
+    startedAt: Date.now()
+  }));
+  return bridgeFile;
+}
+function removeBridgeFile() {
+  try {
+    unlinkSync(join(BRIDGE_DIR, `${process.pid}.json`));
+  } catch {
+  }
+}
 var WebSocketBridge = class {
   wss = null;
   httpServer = null;
@@ -233,8 +296,12 @@ var WebSocketBridge = class {
   connectTime = 0;
   reconnectCount = -1;
   // first connection is not a "reconnect"
+  actualPort = WS_PORT;
   onClientConnected;
   onPortRefreshRequested;
+  get port() {
+    return this.actualPort;
+  }
   startHeartbeat() {
     this.stopHeartbeat();
     this.heartbeatTimer = setInterval(() => {
@@ -283,7 +350,7 @@ var WebSocketBridge = class {
           "Cache-Control": "no-store",
           "Access-Control-Allow-Origin": "*"
         });
-        res.end(JSON.stringify({ service: "crawlio-mcp", ...this.getHealth() }));
+        res.end(JSON.stringify({ service: "crawlio-mcp", pid: process.pid, port: this.actualPort, ...this.getHealth() }));
         return;
       }
       if (req.method === "OPTIONS") {
@@ -424,34 +491,36 @@ var WebSocketBridge = class {
       console.error("[Bridge] WebSocket handshake error:", err.message);
       socket.destroy();
     });
-    try {
-      const probe = await fetch(`http://${WS_HOST}:${WS_PORT}/health`, { signal: AbortSignal.timeout(500) });
-      const body = await probe.json();
-      if (body.service === "crawlio-mcp") {
-        const { execFileSync } = await import("child_process");
-        const pid = execFileSync("lsof", ["-ti", `:${WS_PORT}`, "-sTCP:LISTEN"]).toString().trim().split("\n")[0];
-        if (pid && Number(pid) !== process.pid) {
-          console.error(`[Bridge] Killing stale crawlio-mcp on port ${WS_PORT} (PID ${pid})`);
-          process.kill(Number(pid), "SIGTERM");
-          for (let i = 0; i < 8; i++) {
-            await new Promise((r) => setTimeout(r, 250));
-            try {
-              execFileSync("lsof", ["-ti", `:${WS_PORT}`, "-sTCP:LISTEN"]);
-            } catch {
-              break;
-            }
-          }
-        }
-      }
-    } catch {
-    }
+    cleanStaleBridgeFiles();
+    const requestedPort = parseInt(process.env.CRAWLIO_PORT || "", 10);
+    const startPort = requestedPort >= WS_PORT && requestedPort <= WS_PORT_MAX ? requestedPort : WS_PORT;
+    this.actualPort = await findAvailablePort(startPort);
     await new Promise((resolve2, reject) => {
-      this.httpServer.once("error", (err) => reject(err));
-      this.httpServer.listen(WS_PORT, WS_HOST, () => {
-        console.error(`[Bridge] WebSocket server listening on ws://${WS_HOST}:${WS_PORT}`);
-        resolve2();
-      });
+      let attempts = 0;
+      const tryListen = () => {
+        const onError = (err) => {
+          if (err.code === "EADDRINUSE" && attempts < 3) {
+            attempts++;
+            console.error(`[Bridge] Port ${this.actualPort} still in use, retry ${attempts}/3...`);
+            setTimeout(tryListen, 1e3 * attempts);
+          } else {
+            reject(err);
+          }
+        };
+        this.httpServer.once("error", onError);
+        this.httpServer.listen(this.actualPort, WS_HOST, () => {
+          this.httpServer.removeListener("error", onError);
+          console.error(`[Bridge] WebSocket server listening on ws://${WS_HOST}:${this.actualPort}`);
+          resolve2();
+        });
+      };
+      tryListen();
     });
+    writeBridgeFile(this.actualPort);
+    const cleanup = () => removeBridgeFile();
+    process.on("SIGTERM", cleanup);
+    process.on("SIGINT", cleanup);
+    process.on("beforeExit", cleanup);
   }
   get isConnected() {
     return this.client?.readyState === WebSocket.OPEN;
@@ -536,6 +605,7 @@ var WebSocketBridge = class {
     this.client?.close();
     this.wss?.close();
     this.httpServer?.close();
+    removeBridgeFile();
   }
 };
 
@@ -710,7 +780,7 @@ import { z } from "zod";
 import { execFile } from "child_process";
 import { writeFile, unlink } from "fs/promises";
 import { tmpdir } from "os";
-import { join as join2, dirname as dirname3 } from "path";
+import { join as join3, dirname as dirname3 } from "path";
 import { randomBytes } from "crypto";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { promisify } from "util";
@@ -1078,8 +1148,8 @@ function escapeString(s) {
 }
 
 // src/mcp-server/semantic-search.ts
-import { readFileSync } from "fs";
-import { join, dirname as dirname2 } from "path";
+import { readFileSync as readFileSync2 } from "fs";
+import { join as join2, dirname as dirname2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function cosineSimilarity(a, b) {
   if (a.length !== b.length || a.length === 0) return 0;
@@ -1099,8 +1169,8 @@ function loadEmbeddings() {
   const map = /* @__PURE__ */ new Map();
   try {
     const thisDir = dirname2(fileURLToPath2(import.meta.url));
-    const assetPath = join(thisDir, "tool-embeddings.json");
-    const raw = readFileSync(assetPath, "utf-8");
+    const assetPath = join2(thisDir, "tool-embeddings.json");
+    const raw = readFileSync2(assetPath, "utf-8");
     const asset = JSON.parse(raw);
     if (!asset.embeddings || typeof asset.embeddings !== "object") return map;
     for (const [name, vec] of Object.entries(asset.embeddings)) {
@@ -1429,7 +1499,7 @@ function createTools(bridge2, crawlio2) {
     // --- AI orchestration tools ---
     {
       name: "connect_tab",
-      description: "Connect to a browser tab for capture and interaction. Three modes: (1) provide a URL to find or create a tab, (2) provide a tabId to connect to a specific tab, (3) no args to connect to the active tab. Starts CDP capture automatically.",
+      description: "Pin a specific browser tab for all subsequent commands. Optional \u2014 without this, tools auto-connect to the active tab. Three modes: (1) provide a URL to find or create a tab, (2) provide a tabId to connect to a specific tab, (3) no args to pin the active tab. Starts CDP capture automatically.",
       inputSchema: {
         type: "object",
         properties: {
@@ -3604,9 +3674,9 @@ function createTools(bridge2, crawlio2) {
           if (!data?.data) {
             return toolError("Screenshot capture failed \u2014 no image data returned");
           }
-          tmpPath = join2(tmpdir(), `crawlio-ocr-${randomBytes(6).toString("hex")}.png`);
+          tmpPath = join3(tmpdir(), `crawlio-ocr-${randomBytes(6).toString("hex")}.png`);
           await writeFile(tmpPath, Buffer.from(data.data, "base64"));
-          const shimPath = join2(dirname3(fileURLToPath3(import.meta.url)), "..", "..", "bin", "ocr-shim.swift");
+          const shimPath = join3(dirname3(fileURLToPath3(import.meta.url)), "..", "..", "bin", "ocr-shim.swift");
           const { stdout, stderr } = await execFileAsync("swift", [shimPath, tmpPath], { timeout: 25e3 });
           if (!stdout.trim()) {
             return toolError(`OCR produced no output${stderr ? `: ${stderr.trim()}` : ""}`);
@@ -4042,7 +4112,7 @@ function createCodeModeTools(bridge2, crawlio2) {
 process.title = "Crawlio Agent";
 var initMode = process.argv.includes("init") || process.argv.includes("--setup") || process.argv.includes("setup");
 if (initMode) {
-  const { runInit } = await import("./init-4D3LCB7J.js");
+  const { runInit } = await import("./init-CG5XREFD.js");
   await runInit(process.argv.slice(2));
   process.exit(0);
 }

package/dist/mcp-server/{init-4D3LCB7J.js → init-CG5XREFD.js}

@@ -1,6 +1,6 @@
 import {
   PKG_VERSION
-} from "./chunk-RA3LVVKH.js";
+} from "./chunk-GJH6PLST.js";
 
 // src/mcp-server/init.ts
 import { execFileSync, spawn } from "child_process";
@@ -830,21 +830,11 @@ async function configureMetaMcp(found, options) {
   }
   const conflicts = findConflictingConfigs();
   if (conflicts.length > 0) {
-    console.log(`    ${yellow("!")} crawlio-browser already configured in:`);
+    console.log(`    ${dim("i")} crawlio-browser also configured in:`);
     for (const c of conflicts) {
       console.log(`      ${dim("\u2192")} ${c}`);
     }
-    console.log(`    ${yellow("!")} Adding a second entry would cause a port collision (port 9333)`);
-    if (!options.yes) {
-      const proceed = await confirm("Add anyway? (not recommended)", false);
-      if (!proceed) {
-        console.log(`    ${dim("Skipped \u2014 using existing configuration")}`);
-        return;
-      }
-    } else {
-      console.log(`    ${dim("Skipped \u2014 existing configuration takes priority")}`);
-      return;
-    }
+    console.log(`    ${dim("  Multi-instance supported \u2014 each server gets its own port (9333-9342)")}`);
   }
   if (!options.yes) {
     const proceed = await confirm("Add crawlio-browser to this config?");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crawlio-browser",
-  "version": "1.4.7",
+  "version": "1.5.0",
   "description": "MCP server with 96 CDP-backed tools for browser automation — screenshots, DOM, network capture, framework detection, cookies, storage, session recording, performance metrics via Chrome",
   "type": "module",
   "main": "dist/mcp-server/index.js",