@tridha643/hestia 1.0.0 → 1.0.1

package/dist/cli.js

@@ -10858,6 +10858,11 @@ async function listTunnels() {
     connections: Array.isArray(t.connections) ? t.connections : []
   }));
 }
+async function countConnectors(uuid) {
+  const out = await run(["tunnel", "info", "-o", "json", uuid]);
+  const parsed = JSON.parse(out);
+  return Array.isArray(parsed.conns) ? parsed.conns.length : 0;
+}
 async function adoptTunnel(name) {
   const entry = (await listTunnels()).find((t) => t.name === name);
   if (entry === undefined) {
@@ -11791,12 +11796,6 @@ async function tunnelChecks() {
   const adopted = listAdopted();
   if (adopted.length === 0)
     return rows;
-  let tunnels = null;
-  try {
-    tunnels = await listTunnels();
-  } catch {
-    tunnels = null;
-  }
   for (const uuid of adopted) {
     const ref = readAdopted(uuid);
     const label = `tunnel:${ref?.name ?? uuid}`;
@@ -11807,14 +11806,18 @@ async function tunnelChecks() {
     } else if (pf.port !== undefined) {
       rows.push(await isReady(pf.port) ? row(label, "ok", "connector live with an edge connection") : row(label, "warn", "connector running but no edge connection yet"));
     }
-    if (tunnels === null) {
+    let connectors;
+    try {
+      connectors = await countConnectors(uuid);
+    } catch {
+      connectors = null;
+    }
+    if (connectors === null) {
       rows.push(row(`${label}:connectors`, "unknown", "cloudflare unreachable \u2014 cannot count connectors"));
     } else {
-      const info = tunnels.find((t) => t.id === uuid);
-      const conns = info?.connections?.length ?? 0;
       const expected = live ? 1 : 0;
-      if (conns > expected) {
-        rows.push(row(`${label}:connectors`, "error", `${conns} connector(s) registered but hestia runs ${expected} \u2014 a foreign ` + `replica cross-wires worktrees; stop the other cloudflared`));
+      if (connectors > expected) {
+        rows.push(row(`${label}:connectors`, "error", `${connectors} connector(s) registered but hestia runs ${expected} \u2014 a foreign ` + `replica cross-wires worktrees; stop the other cloudflared`));
       }
     }
   }
@@ -12419,7 +12422,7 @@ import { execFile as execFile11 } from "child_process";
 import { promisify as promisify9 } from "util";
 import { join as join23, resolve as resolve2 } from "path";
 import { createHash as createHash7 } from "crypto";
-import { resolveCname } from "dns/promises";
+import { resolve4, resolve6, resolveCname } from "dns/promises";
 function composeUnsupported(message) {
   throw new HestiaError("compose-unsupported", message);
 }
@@ -12766,6 +12769,14 @@ async function assertNamedTunnelDns(hostname, tunnelUuid) {
     if (records.includes(expected.toLowerCase()))
       return;
   } catch {}
+  try {
+    if ((await resolve4(hostname)).length > 0)
+      return;
+  } catch {}
+  try {
+    if ((await resolve6(hostname)).length > 0)
+      return;
+  } catch {}
   throw new HestiaError("dns-route-required", `${hostname} does not resolve through Hestia's adopted tunnel; configure wildcard CNAME *.${hostname.split(".").slice(1).join(".")} -> ${expected}`, { hostname, wildcardTarget: expected });
 }
 
@@ -13569,7 +13580,7 @@ class ComposeEngine {
     }
     const adopted = await adoptTunnel(tunnelName);
     if (adopted.connections > 0 && !isAdopted(adopted.uuid) && !opts?.force) {
-      throw new HestiaError("tunnel-busy", `tunnel "${tunnelName}" already has ${adopted.connections} live ` + `connector(s) \u2014 stop the other cloudflared first (hestia's ` + `connector serves your static hostnames too), or pass --force to ` + `accept nondeterministic routing`);
+      throw new HestiaError("tunnel-busy", `tunnel "${tunnelName}" already has ${adopted.connections} live edge ` + `connection(s) from a foreign connector \u2014 stop the other cloudflared first (hestia's ` + `connector serves your static hostnames too), or pass --force to ` + `accept nondeterministic routing`);
     }
     const preflightRecord = readState(worktreeRoot);
     if (preflightRecord === null) {
@@ -15808,7 +15819,7 @@ async function main() {
     switch (cmd) {
       case "version": {
         const version = {
-          cliVersion: "1.0.0",
+          cliVersion: "1.0.1",
           stateSchema: STATE_SCHEMA_VERSION,
           daemonProtocol: HESTIAD_PROTOCOL_VERSION,
           runtime: "bun"
@@ -16393,4 +16404,4 @@ ${JSON.stringify(result.config, null, 2)}
 }
 main();
 
-//# debugId=A4ADFA741120BECE64756E2164756E21
+//# debugId=7C129FA1100BA38864756E2164756E21