hatchkit 0.1.39 → 0.1.40

package/dist/utils/coolify-server-ips.js

@@ -12,26 +12,16 @@
  * common Docker-on-the-same-box install. That string IS NOT a
  * routable IPv4 — it's the container-internal alias for the Docker
  * host. Pointing DNS A records at it (Cloudflare or otherwise) gets
- * rejected by the API. We have to look elsewhere for the real public
- * IP. Two sources are tried, in order, with a cross-check:
+ * rejected by the API. So we ask /servers/{uuid}/domains, which
+ * surfaces the configured public_ipv4 / public_ipv6 (the values the
+ * operator entered when registering the "localhost" server). On
+ * non-Docker installs /servers itself already returns a real IPv4,
+ * so we fall back to that.
  *
- *   1. GET /servers/{uuid}/domains. For Docker-based Coolify this
- *      endpoint surfaces the configured public_ipv4 / public_ipv6
- *      (the values the operator entered when registering the
- *      "localhost" server). It's the box's self-reported truth.
- *   2. DNS resolution of the Coolify dashboard hostname. The user is
- *      reaching Coolify over the public internet, so the dashboard's
- *      A / AAAA records ARE necessarily the box's public IP. This
- *      catches setups where /servers/{uuid}/domains 404s (older
- *      Coolify) or the operator left public_ipv4 unset.
- *
- * When both sources give us an IPv4 and they disagree, we surface a
- * yellow warning (stale public_ipv4, misconfigured floating IP, proxy
- * in front of the wrong box, …) and proceed with Coolify's value.
+ * Coolify is the source of truth — no DNS cross-check, no second
+ * opinion. If /servers/{uuid}/domains is wrong, the user fixes it
+ * in the dashboard.
  */
-import { resolve4, resolve6 } from "node:dns/promises";
-import chalk from "chalk";
-import ora from "ora";
 /** True for valid public-routable IPv4 strings. Filters out the
  *  values Coolify hands back on Docker installs (`host.docker.internal`,
  *  `localhost`, `127.0.0.1`) plus IPv6, which we don't auto-manage. */
@@ -59,77 +49,32 @@ export function isPublicIpv6(s) {
         return false; // link-local
     return true;
 }
-/** Resolve the box's public IPv4 + IPv6, preferring Coolify's
- *  configured values (via /servers/{uuid}/domains, which surfaces the
- *  instance's `public_ipv4` / `public_ipv6` for localhost-Coolify
- *  installs that report `host.docker.internal` on /servers), falling
- *  back to DNS resolution of the dashboard hostname. Cross-checks
- *  the two IPv4 sources and surfaces a warning when they disagree. */
-export async function discoverPublicIps(api, serverUuid, fallbackServerIp, dashboardUrl) {
-    // Step 1: Coolify-reported IPs. /servers/{uuid}/domains returns
-    // entries with `ip` set per running domain; for localhost-Coolify
-    // this falls back to the configured public_ipv4 / public_ipv6.
-    let coolifyV4;
-    let coolifyV6;
+/** Resolve the box's public IPv4 + IPv6 from Coolify. Prefers
+ *  /servers/{uuid}/domains (which surfaces public_ipv4 / public_ipv6
+ *  for localhost-Coolify installs that report `host.docker.internal`
+ *  on /servers), and falls back to the /servers ip field for
+ *  non-Docker installs. */
+export async function discoverPublicIps(api, serverUuid, fallbackServerIp) {
+    let v4;
+    let v6;
     try {
         const domains = await api.getServerDomains(serverUuid);
         for (const d of domains) {
             const ip = (d.ip ?? "").trim();
-            if (!coolifyV4 && isPublicIpv4(ip))
-                coolifyV4 = ip;
-            if (!coolifyV6 && isPublicIpv6(ip))
-                coolifyV6 = ip;
+            if (!v4 && isPublicIpv4(ip))
+                v4 = ip;
+            if (!v6 && isPublicIpv6(ip))
+                v6 = ip;
         }
     }
     catch {
         // /servers/{uuid}/domains can 404 / 501 on older Coolify builds.
-        // Treat as "Coolify doesn't know" and fall back to DNS only.
-    }
-    // /servers itself may return a real IPv4 on non-Docker installs —
-    // use it as a last-resort source.
-    if (!coolifyV4 && isPublicIpv4(fallbackServerIp))
-        coolifyV4 = fallbackServerIp;
-    if (!coolifyV6 && isPublicIpv6(fallbackServerIp))
-        coolifyV6 = fallbackServerIp;
-    // Step 2: independent DNS resolution of the dashboard hostname.
-    let host;
-    try {
-        host = new URL(dashboardUrl).hostname;
-    }
-    catch {
-        /* ignore — dashboard URL might be malformed */
-    }
-    let dnsV4;
-    let dnsV6;
-    if (host && !isPublicIpv4(host)) {
-        const spinner = ora(`Resolving ${host} for cross-check`).start();
-        try {
-            const [v4, v6] = await Promise.allSettled([resolve4(host), resolve6(host)]);
-            if (v4.status === "fulfilled" && v4.value[0] && isPublicIpv4(v4.value[0])) {
-                dnsV4 = v4.value[0];
-            }
-            if (v6.status === "fulfilled" && v6.value[0] && isPublicIpv6(v6.value[0])) {
-                dnsV6 = v6.value[0];
-            }
-            const parts = [dnsV4 && `A ${dnsV4}`, dnsV6 && `AAAA ${dnsV6}`].filter(Boolean);
-            spinner.succeed(`DNS for ${host}: ${parts.length > 0 ? parts.join(", ") : "no records"}`);
-        }
-        catch {
-            spinner.fail(`Couldn't resolve ${host}`);
-        }
-    }
-    else if (host && isPublicIpv4(host)) {
-        dnsV4 = host;
-    }
-    // Step 3: cross-check + decide. Prefer Coolify's value when we have
-    // it (it's the box's self-reported truth); fall back to DNS.
-    const v4 = coolifyV4 ?? dnsV4;
-    const v6 = coolifyV6 ?? dnsV6;
-    let mismatchWarning;
-    if (coolifyV4 && dnsV4 && coolifyV4 !== dnsV4) {
-        mismatchWarning = `Coolify reports public IPv4 ${coolifyV4} but ${host} resolves to ${dnsV4}. Using Coolify's value; double-check the DNS records and any floating-IP / proxy setup.`;
-        console.log(chalk.yellow(`  ⚠ ${mismatchWarning}`));
+        // Fall through to the /servers ip field below.
     }
-    return { v4, v6, mismatchWarning };
+    if (!v4 && isPublicIpv4(fallbackServerIp))
+        v4 = fallbackServerIp;
+    if (!v6 && isPublicIpv6(fallbackServerIp))
+        v6 = fallbackServerIp;
+    return { v4, v6 };
 }
 //# sourceMappingURL=coolify-server-ips.js.map

package/dist/utils/coolify-server-ips.js.map

@@ -1 +1 @@
-{"version":3,"file":"coolify-server-ips.js","sourceRoot":"","sources":["../../src/utils/coolify-server-ips.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coolify-server-ips.js","sourceRoot":"","sources":["../../src/utils/coolify-server-ips.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH;;uEAEuE;AACvE,MAAM,UAAU,YAAY,CAAC,CAAS;IACpC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACtD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG;QAAE,OAAO,KAAK,CAAC,CAAC,WAAW;IAC/C,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;yDAEyD;AACzD,MAAM,UAAU,YAAY,CAAC,CAAS;IACpC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC,CAAC,aAAa;IACpE,OAAO,IAAI,CAAC;AACd,CAAC;AAOD;;;;2BAI2B;AAC3B,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,UAAkB,EAClB,gBAAwB;IAExB,IAAI,EAAsB,CAAC;IAC3B,IAAI,EAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACvD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/B,IAAI,CAAC,EAAE,IAAI,YAAY,CAAC,EAAE,CAAC;gBAAE,EAAE,GAAG,EAAE,CAAC;YACrC,IAAI,CAAC,EAAE,IAAI,YAAY,CAAC,EAAE,CAAC;gBAAE,EAAE,GAAG,EAAE,CAAC;QACvC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,iEAAiE;QACjE,+CAA+C;IACjD,CAAC;IACD,IAAI,CAAC,EAAE,IAAI,YAAY,CAAC,gBAAgB,CAAC;QAAE,EAAE,GAAG,gBAAgB,CAAC;IACjE,IAAI,CAAC,EAAE,IAAI,YAAY,CAAC,gBAAgB,CAAC;QAAE,EAAE,GAAG,gBAAgB,CAAC;IACjE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;AACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hatchkit",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "packageManager": "pnpm@10.33.2",
   "description": "Interactive CLI for scaffolding full-stack projects and provisioning observability/email clients",
   "type": "module",