@stacksjs/buddy 0.70.205 → 0.70.207

package/dist/commands/deploy.js

@@ -690,7 +690,7 @@ async function runHetznerDeploy(args) {
     process.exit(ExitCode.FatalError);
   }
   const attachTo = tsCloudConfig.cloud?.attachTo;
-  let ip;
+  let ip, ipv6;
   if (attachTo) {
     const box = await resolveAttachTargetBox(attachTo, environment);
     if (!box?.publicIp) {
@@ -698,6 +698,7 @@ async function runHetznerDeploy(args) {
       process.exit(ExitCode.FatalError);
     }
     ip = box.publicIp;
+    ipv6 = box.publicIpv6;
     log.info(`Attaching to '${attachTo}' box '${box.serverName}' (${ip}) \u2014 skipping provisioning`);
     const compute = (tsCloudConfig.infrastructure ??= {}).compute ??= {};
     compute.webServer = "rpx";
@@ -717,6 +718,7 @@ async function runHetznerDeploy(args) {
     log.info("Provisioning Hetzner compute infrastructure...");
     const outputs = await driver.provisionComputeInfrastructure({ config: scrubLoopbackSitePortsForFirewall(tsCloudConfig), environment });
     ip = outputs.appPublicIp;
+    ipv6 = outputs.appPublicIpv6;
     log.success("Hetzner compute infrastructure ready");
     if (outputs.appInstanceId)
       log.info(`Server ID: ${outputs.appInstanceId}`);
@@ -815,7 +817,7 @@ async function runHetznerDeploy(args) {
     }
   });
   if (ok)
-    await reconcileHetznerDns(onlySite ? { [onlySite]: sites[onlySite] } : sites, ip, log);
+    await reconcileHetznerDns(onlySite ? { [onlySite]: sites[onlySite] } : sites, ip, log, ipv6);
   if (ok)
     await reconcileConfigDns(onlySite ? { [onlySite]: sites[onlySite] } : sites, log);
   if (ok) {
@@ -921,7 +923,13 @@ async function resolveAttachTargetBox(owner, environment) {
   }, byLabel = await req(`label_selector=${encodeURIComponent(`ts-cloud/project=${owner},ts-cloud/environment=${environment},ts-cloud/role=app`)}`), chosen = pick(byLabel) || pick(await req(`name=${encodeURIComponent(`${owner}-${environment}-app`)}`));
   if (!chosen)
     return null;
-  return { serverId: chosen.id, serverName: chosen.name, publicIp: chosen.public_net?.ipv4?.ip };
+  const { hetznerBoxIpv6 } = await import("@stacksjs/ts-cloud");
+  return {
+    serverId: chosen.id,
+    serverName: chosen.name,
+    publicIp: chosen.public_net?.ipv4?.ip,
+    publicIpv6: hetznerBoxIpv6?.(chosen.public_net?.ipv6?.ip)
+  };
 }
 export async function provisionMailTenant(ip, logger) {
   if (!hasExplicitEmailConfig())
@@ -1291,22 +1299,7 @@ async function reconcileConfigDns(sites, logger) {
       logger.warn(`DNS (config/dns.ts) reconcile for ${domain} failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
-async function verifyDnsRecord(provider, domain, fqdn, ip) {
-  try {
-    if (typeof provider?.listRecords !== "function")
-      return !0;
-    const res = await provider.listRecords(domain);
-    if (!res?.success || !Array.isArray(res.records))
-      return !0;
-    return res.records.some((r) => {
-      const name = typeof r?.name === "string" ? r.name.replace(/\.$/, "") : "";
-      return r?.type === "A" && name === fqdn && r?.content === ip;
-    });
-  } catch {
-    return !0;
-  }
-}
-async function reconcileHetznerDns(sites, ip, logger) {
+async function reconcileHetznerDns(sites, ip, logger, ipv6) {
   const domains = new Set;
   for (const site of Object.values(sites))
     if (site?.domain && typeof site.domain === "string")
@@ -1331,7 +1324,7 @@ async function reconcileHetznerDns(sites, ip, logger) {
   const {
     createDnsProvider,
     detectDnsProvider,
-    removeStaleServerAddressRecords
+    reconcileAddressRecords
   } = await import("@stacksjs/ts-cloud");
   logger.info("Reconciling DNS records...");
   const resolveA = async (fqdn) => {
@@ -1370,18 +1363,11 @@ async function reconcileHetznerDns(sites, ip, logger) {
         continue;
       }
       for (const sub of ["", "www"]) {
-        const fqdn = sub ? `${sub}.${domain}` : domain, res = await provider.upsertRecord(domain, { name: fqdn, type: "A", content: ip, ttl: 600 });
-        if (res?.success === !1) {
-          logger.warn(`  DNS: ${fqdn} \u2192 ${ip} failed: ${res.error || res.message || "unknown error"}`);
-          continue;
-        }
-        const cleanupWarnings = await removeStaleServerAddressRecords(provider, domain, fqdn, ip);
-        for (const warning of cleanupWarnings)
-          logger.warn(`  DNS: ${fqdn} cleanup: ${warning}`);
-        if (await verifyDnsRecord(provider, domain, fqdn, ip))
-          logger.success(`  DNS: ${fqdn} \u2192 ${ip} (${provider.name})`);
-        else
-          logger.warn(`  DNS: ${fqdn} \u2192 ${ip} reported success at ${provider.name} but no matching A record exists \u2014 create it manually: A ${fqdn} \u2192 ${ip}`);
+        const fqdn = sub ? `${sub}.${domain}` : domain, report = await reconcileAddressRecords({ provider, zone: domain, fqdn, ipv4: ip, ipv6 });
+        for (const record of report.published)
+          logger.success(`  DNS: ${record.fqdn} \u2192 ${record.content} (${provider.name})`);
+        for (const warning of report.warnings)
+          logger.warn(`  DNS: ${warning}`);
       }
     } catch (err) {
       logger.warn(`  DNS: ${domain} reconciliation failed: ${err?.message || err}`);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/buddy",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.205",
+  "version": "0.70.207",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [
@@ -137,7 +137,7 @@
     "@stacksjs/ui": "^0.70.180",
     "@stacksjs/utils": "^0.70.180",
     "@stacksjs/validation": "^0.70.180",
-    "@stacksjs/ts-cloud": "^0.7.84",
+    "@stacksjs/ts-cloud": "^0.7.86",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1"
   },