@shipers-dev/multi 0.12.1 → 0.13.0

package/dist/index.js

@@ -16272,7 +16272,7 @@ import { join as join4, dirname as dirname3 } from "path";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.12.1",
+  version: "0.13.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -16715,7 +16715,7 @@ async function cmdConnect(apiUrl, config2) {
   try {
     writeFileSync4(PORT_PATH, String(port));
   } catch {}
-  let tunnel = await startTunnel(port);
+  let tunnel = await startTunnel(port, log);
   if (!tunnel) {
     log("\u274C cloudflared did not emit a tunnel URL \u2014 is `cloudflared` installed? (`brew install cloudflared`)");
     try {
@@ -16785,7 +16785,7 @@ async function cmdConnect(apiUrl, config2) {
         old?.child.kill();
       } catch {}
       for (let attempt = 1;alive; attempt++) {
-        const next = await startTunnel(port);
+        const next = await startTunnel(port, log);
         if (next) {
           tunnel = next;
           log(`\u2601\uFE0F  Tunnel up: ${tunnel.url}`);
@@ -16854,21 +16854,77 @@ async function cmdConnect(apiUrl, config2) {
     }
   }
 }
-async function startTunnel(port) {
+async function startTunnel(port, log2 = () => {}) {
+  const named = process.env.MULTI_TUNNEL_NAME?.trim();
+  const hostname3 = process.env.MULTI_TUNNEL_HOSTNAME?.trim();
+  if (named) {
+    if (!hostname3) {
+      log2("\u274C MULTI_TUNNEL_NAME set but MULTI_TUNNEL_HOSTNAME missing \u2014 set the public hostname routed to this tunnel");
+      return null;
+    }
+    const args = ["tunnel", "--no-autoupdate", "--url", `http://127.0.0.1:${port}`, "run", named];
+    const child2 = Bun.spawn(["cloudflared", ...args], { stdout: "pipe", stderr: "pipe", stdin: "ignore" });
+    const ok = await waitNamedTunnelReady(child2.stderr);
+    if (!ok.ready) {
+      try {
+        child2.kill();
+      } catch {}
+      if (ok.tail) {
+        const lines = ok.tail.split(`
+`).filter(Boolean).slice(-6);
+        for (const l of lines)
+          log2(`   cloudflared: ${l}`);
+      }
+      return null;
+    }
+    const url3 = hostname3.startsWith("http") ? hostname3.replace(/\/+$/, "") : `https://${hostname3}`;
+    return { child: child2, url: url3 };
+  }
   const child = Bun.spawn(["cloudflared", "tunnel", "--no-autoupdate", "--url", `http://127.0.0.1:${port}`], {
     stdout: "pipe",
     stderr: "pipe",
     stdin: "ignore"
   });
-  const url2 = await parseTunnelUrl(child.stderr);
+  const { url: url2, tail } = await parseTunnelUrl(child.stderr);
   if (!url2) {
     try {
       child.kill();
     } catch {}
+    if (tail) {
+      const lines = tail.split(`
+`).filter(Boolean).slice(-6);
+      for (const l of lines)
+        log2(`   cloudflared: ${l}`);
+    }
     return null;
   }
   return { child, url: url2 };
 }
+async function waitNamedTunnelReady(stream2) {
+  const reader = stream2.getReader();
+  const dec = new TextDecoder;
+  const deadline = Date.now() + 30000;
+  let buf = "";
+  while (Date.now() < deadline) {
+    const { value, done } = await reader.read();
+    if (done)
+      break;
+    buf += dec.decode(value, { stream: true });
+    if (/Registered tunnel connection|Connection [a-z0-9-]+ registered/i.test(buf)) {
+      (async () => {
+        try {
+          while (true) {
+            const { done: done2 } = await reader.read();
+            if (done2)
+              break;
+          }
+        } catch {}
+      })();
+      return { ready: true, tail: buf };
+    }
+  }
+  return { ready: false, tail: buf };
+}
 async function probeTunnel(url2) {
   try {
     const ctrl = new AbortController;
@@ -16934,10 +16990,10 @@ async function parseTunnelUrl(stream2) {
           }
         } catch {}
       })();
-      return m[1];
+      return { url: m[1], tail: buf };
     }
   }
-  return null;
+  return { url: null, tail: buf };
 }
 async function markStopped(apiUrl, issueId, reason) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"