@corenel/sidecar 0.1.4 → 0.1.5

package/dist/cli.js

@@ -713,10 +713,20 @@ function extractTunnelUrl(s) {
   const m = s.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/i);
   return m ? m[0] : null;
 }
+function isRegisteredLine(s) {
+  return /Registered tunnel connection/.test(s);
+}
+function isTunnelGoneLine(s) {
+  return /Unauthorized: Tunnel not found/i.test(s);
+}
+var GONE_LINE_LIMIT = 3;
 var START_TIMEOUT_MS2 = 25e3;
 function tunnelArgs(port, host = "localhost") {
   return ["tunnel", "--no-autoupdate", "--protocol", "http2", "--url", `http://${host}:${port}`];
 }
+function namedTunnelArgs(name, port, host = "localhost") {
+  return ["tunnel", "--no-autoupdate", "--protocol", "http2", "run", "--url", `http://${host}:${port}`, name];
+}
 var tail2 = (s, n = 6) => s.trim().split("\n").slice(-n).join("\n");
 function cloudflaredBins() {
   const env = process.env.CLOUDFLARED_BIN?.trim();
@@ -747,24 +757,34 @@ function stopChild2(child) {
     }
   });
 }
-function startWith2(bin, port, host, log) {
+function startWith2(bin, mode, log, onDown) {
   return new Promise((resolveHandle, reject) => {
-    const child = spawn3(bin, tunnelArgs(port, host), { stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn3(bin, mode.argv, { stdio: ["ignore", "pipe", "pipe"] });
     let out = "";
     let settled = false;
     let tailBuf = "";
+    let goneLines = 0;
+    let downFired = false;
     const finish = (fn) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
       fn();
     };
+    const fireDown = (reason) => {
+      if (downFired) return;
+      downFired = true;
+      onDown?.(reason);
+    };
     const onData = (b) => {
       const text = b.toString();
       if (!settled) {
         out += text;
-        const url = extractTunnelUrl(out);
-        if (url) finish(() => resolveHandle({ url, stop: () => stopChild2(child) }));
+        const url = mode.ready(out);
+        if (url) finish(() => resolveHandle({ url, stop: () => {
+          downFired = true;
+          return stopChild2(child);
+        } }));
         return;
       }
       tailBuf += text;
@@ -772,7 +792,20 @@ function startWith2(bin, port, host, log) {
       while ((nl = tailBuf.indexOf("\n")) >= 0) {
         const line = tailBuf.slice(0, nl).replace(/\r$/, "").trim();
         tailBuf = tailBuf.slice(nl + 1);
-        if (line) log?.(`cloudflared: ${line}`);
+        if (!line) continue;
+        log?.(`cloudflared: ${line}`);
+        if (isRegisteredLine(line)) {
+          goneLines = 0;
+          continue;
+        }
+        if (isTunnelGoneLine(line)) {
+          goneLines++;
+          if (goneLines >= GONE_LINE_LIMIT && !downFired) {
+            log?.(`cloudflared: tunnel deregistered by the edge (${goneLines}x "Tunnel not found") \u2014 it can never re-register; replacing it`);
+            void stopChild2(child);
+            fireDown("quick tunnel deregistered by the edge");
+          }
+        }
       }
     };
     child.stdout?.on("data", onData);
@@ -781,14 +814,15 @@ function startWith2(bin, port, host, log) {
     child.on("exit", (code) => {
       if (settled) {
         log?.(`cloudflared exited (code ${code}) \u2014 the tunnel is down`);
+        fireDown(`cloudflared exited (code ${code})`);
         return;
       }
-      finish(() => reject(new Error(`${bin} exited (code ${code}) before a tunnel URL appeared.
+      finish(() => reject(new Error(`${bin} exited (code ${code}) before the tunnel came up.
 ${tail2(out)}`)));
     });
     const timer = setTimeout(() => finish(() => {
       void stopChild2(child);
-      reject(new Error(`${bin} produced no tunnel URL within ${START_TIMEOUT_MS2 / 1e3}s.
+      reject(new Error(`${bin} did not come up within ${START_TIMEOUT_MS2 / 1e3}s.
 ${tail2(out)}`));
     }), START_TIMEOUT_MS2);
   });
@@ -796,8 +830,21 @@ ${tail2(out)}`));
 var cloudflaredProvider = {
   id: "cloudflared",
   aliases: ["cloudflare"],
-  description: "Cloudflare quick tunnel (needs the `cloudflared` CLI installed \u2014 https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/ \u2014 no account, no interstitial; URL is ephemeral)",
-  start({ port, host, log }) {
+  description: "Cloudflare tunnel (needs the `cloudflared` CLI installed \u2014 https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/). Default: anonymous quick tunnel (no account, ephemeral URL). With --tunnel-name + --tunnel-hostname: your own NAMED tunnel (stable URL, auto-reconnects).",
+  start({ port, host, name, hostname, log, onDown }) {
+    const origin = host || "localhost";
+    let mode;
+    if (name) {
+      if (!hostname) {
+        return Promise.reject(new Error(
+          `a named cloudflared tunnel needs --tunnel-hostname <public-host> \u2014 the DNS route you created with \`cloudflared tunnel route dns ${name} <public-host>\` (one-time setup: \`cloudflared tunnel login\` then \`cloudflared tunnel create ${name}\`).`
+        ));
+      }
+      const url = `https://${hostname.replace(/^https?:\/\//, "")}`;
+      mode = { argv: namedTunnelArgs(name, port, origin), ready: (s) => isRegisteredLine(s) ? url : null };
+    } else {
+      mode = { argv: tunnelArgs(port, origin), ready: extractTunnelUrl };
+    }
     const bins = cloudflaredBins();
     const tryAt = (i) => {
       if (i >= bins.length) {
@@ -805,7 +852,7 @@ var cloudflaredProvider = {
           `cloudflared not found (tried: ${bins.join(", ")}). Install the cloudflared CLI (https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/), or set CLOUDFLARED_BIN to the binary name/path.`
         ));
       }
-      return startWith2(bins[i], port, host || "localhost", log).catch((e) => {
+      return startWith2(bins[i], mode, log, onDown).catch((e) => {
         if (e?.code === "ENOENT") return tryAt(i + 1);
         throw e;
       });
@@ -818,6 +865,66 @@ var cloudflaredProvider = {
 registerTunnel(cloudflaredProvider);
 registerTunnel(zrokProvider);
 
+// src/tunnel/supervisor.ts
+var DEFAULT_BACKOFF = [2e3, 5e3, 1e4, 3e4];
+async function superviseTunnel(opts) {
+  const backoff = opts.backoffMs ?? DEFAULT_BACKOFF;
+  const sleep = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+  const log = opts.start.log;
+  let stopped = false;
+  let restarting = false;
+  let current = null;
+  let incarnation = 0;
+  const startOnce = () => {
+    const mine = ++incarnation;
+    return opts.provider.start({
+      ...opts.start,
+      onDown: (reason) => {
+        if (mine === incarnation) void restart(reason);
+      }
+    });
+  };
+  async function restart(reason) {
+    if (stopped || restarting) return;
+    restarting = true;
+    current = null;
+    log?.(`tunnel down (${reason}) \u2014 restarting`);
+    try {
+      for (let attempt = 0; !stopped; attempt++) {
+        await sleep(backoff[Math.min(attempt, backoff.length - 1)]);
+        if (stopped) return;
+        try {
+          const h = await startOnce();
+          if (stopped) {
+            void h.stop().catch(() => {
+            });
+            return;
+          }
+          current = h;
+          opts.onUp(h.url, true);
+          return;
+        } catch (e) {
+          log?.(`tunnel restart failed (${e instanceof Error ? e.message : String(e)}) \u2014 retrying`);
+        }
+      }
+    } finally {
+      restarting = false;
+    }
+  }
+  current = await startOnce();
+  opts.onUp(current.url, false);
+  return {
+    stop: async () => {
+      stopped = true;
+      incarnation++;
+      const c = current;
+      current = null;
+      if (c) await c.stop().catch(() => {
+      });
+    }
+  };
+}
+
 // src/cli.ts
 function parseArgs(argv) {
   const out = { port: 4858, host: "127.0.0.1", roots: [], allowOrigins: [], allowShell: false, allowLan: false, selfSigned: false, open: false, appUrl: "https://prompd.app" };
@@ -834,6 +941,7 @@ function parseArgs(argv) {
     else if (a === "--self-signed") out.selfSigned = true;
     else if (a === "--tunnel") out.tunnel = argv[++i];
     else if (a === "--tunnel-name") out.tunnelName = argv[++i];
+    else if (a === "--tunnel-hostname") out.tunnelHostname = argv[++i];
     else if (a === "--open") out.open = true;
     else if (a === "--app-url") out.appUrl = argv[++i];
     else if (a === "--sidecar" || a === "start" || a === "--") {
@@ -854,6 +962,7 @@ var KNOWN_FLAGS = [
   "--self-signed",
   "--tunnel",
   "--tunnel-name",
+  "--tunnel-hostname",
   "--open",
   "--app-url"
 ];
@@ -920,13 +1029,22 @@ async function main() {
     log: slog,
     allowLan: args.allowLan
   });
-  let tunnel = null;
+  let tunnelSup = null;
   let tunnelWss = null;
   if (tunnelProvider) {
-    process.stdout.write(`starting ${tunnelProvider.id} tunnel${args.tunnelName ? ` (reserved name "${args.tunnelName}")` : ""}\u2026
+    process.stdout.write(`starting ${tunnelProvider.id} tunnel${args.tunnelName ? ` (name "${args.tunnelName}")` : ""}\u2026
 `);
-    tunnel = await tunnelProvider.start({ port: handle.port, host: handle.host, name: args.tunnelName, log: slog });
-    tunnelWss = tunnel.url.replace(/^http/, "ws");
+    tunnelSup = await superviseTunnel({
+      provider: tunnelProvider,
+      start: { port: handle.port, host: handle.host, name: args.tunnelName, hostname: args.tunnelHostname, log: slog },
+      onUp: (url, restarted) => {
+        const wss = url.replace(/^http/, "ws");
+        const changed = tunnelWss !== null && wss !== tunnelWss;
+        tunnelWss = wss;
+        if (!restarted) return;
+        slog(changed ? `tunnel restored at a NEW URL: ${wss} \u2014 re-pair the app with this URL (the token is unchanged)` : "tunnel restored \u2014 same URL, existing pairings reconnect automatically");
+      }
+    });
   }
   const scheme = handle.secure ? "wss" : "ws";
   const exposed = handle.host !== "127.0.0.1" && handle.host !== "localhost";
@@ -955,7 +1073,7 @@ async function main() {
   }
   const shutdown = () => {
     const closeServer = () => handle.close().then(() => process.exit(0));
-    if (tunnel) void tunnel.stop().catch(() => {
+    if (tunnelSup) void tunnelSup.stop().catch(() => {
     }).then(closeServer);
     else void closeServer();
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corenel/sidecar",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "license": "Elastic-2.0",
   "description": "Prompd sidecar — a local capability server. Run it next to Prompd (prompd.app) so the browser app can reach your machine: local LLMs (Ollama/LM Studio/vLLM) without CORS, your filesystem, and (opt-in) shell.",