nukebase 2.5.0 → 2.5.1

package/lib/project-commands.js

@@ -908,8 +908,9 @@ async function domainCommand() {
     if (args.has('wait')) {
       const ip = await regionIp();
       const needTxt = (await currentDomain()) !== sub;   // already ours: proven when connected
-      printDnsRecords(ip, needTxt);
-      await waitForDns(sub, ip, needTxt);
+      const kind = domainKind(sub);
+      printDnsRecords(ip, needTxt, kind);
+      await waitForDns(sub, ip, needTxt, kind);
     }
     await connectDomain(sub, email);
     if (args.has('email-domain')) await emailDomainCommand(null);
@@ -939,8 +940,9 @@ async function domainCommand() {
     if (!/^[a-z0-9.-]+\.[a-z]{2,}$/.test(domain)) { console.log(`   "${domain}" does not look like a domain.`); domain = ''; }
   }
 
-  printDnsRecords(ip, true);
-  await waitForDns(domain, ip, true);
+  const kind = domainKind(domain);
+  printDnsRecords(ip, true, kind);
+  await waitForDns(domain, ip, true, kind);
 
   // Step 3 — the server does the real verification and issues the cert.
   await connectDomain(domain, email);
@@ -1083,7 +1085,7 @@ async function connectDomain(domain, email) {
   });
   console.log(`\n✓ https://${r.domain} is live.`);
   if (r.wwwNote) console.log(`   ${r.wwwNote}`);
-  else if (r.verified) console.log('   www redirects to the apex if its A record also points here.');
+  else if (r.verified) console.log('   www redirects to the main domain.');
 }
 
 // This region's public IP, from /region-info. null when it cannot be read;
@@ -1099,31 +1101,47 @@ async function regionIp() {
 // The ownership record the server checks on a domain's first connection.
 const domainTxtValue = () => `nukebase-uid=${uid}`;
 
-function printDnsRecords(ip, withTxt) {
+// A domain of its own (example.com) or a subdomain (app.example.com), and
+// what its record is called (@, or "app"). By the dots: two labels is a
+// domain, three or more a subdomain, except under a two-part ending
+// (example.co.uk is a domain). Only for the instructions; the server decides
+// at connect. Same rule as the dashboard's domainKind.
+const TWO_PART_ENDING = /^(co|com|net|org|gov|edu|ac|ltd|plc|sch)\.[a-z]{2}$/;
+function domainKind(domain) {
+  const labels = domain.split('.');
+  const base = labels.length >= 3 && TWO_PART_ENDING.test(labels.slice(-2).join('.')) ? 3 : 2;
+  if (labels.length <= base) return { subdomain: false, zone: domain, name: '@' };
+  return { subdomain: true, zone: labels.slice(-base).join('.'), name: labels.slice(0, -base).join('.') };
+}
+
+function printDnsRecords(ip, withTxt, kind) {
+  const sub = kind && kind.subdomain;
+  const pad = (s) => s.padEnd(10);
   console.log('\n   Step 1 — point it here. At your registrar (GoDaddy, Namecheap,');
-  console.log('   Cloudflare, ...) add these DNS records:\n');
+  console.log(`   Cloudflare, ...) add these DNS records${sub ? ` to ${kind.zone}` : ''}:\n`);
   console.log('     Type   Name       Value');
-  console.log(`     A      @          ${ip || "(this region's IP — see the dashboard)"}`);
-  console.log(`     A      www        ${ip || '(same)'}`);
+  console.log(`     A      ${pad(sub ? kind.name : '@')} ${ip || "(this region's IP — see the dashboard)"}`);
+  if (!sub) console.log(`     A      www        ${ip || '(same)'}`);
   if (withTxt) {
     console.log(`     TXT    nukebase   ${domainTxtValue()}`);
     console.log('\n   The TXT record proves the domain is yours, so no other account can');
     console.log('   connect it. One on your main domain covers its subdomains too.');
   }
+  if (sub) console.log(`\n   ${kind.name}.${kind.zone} is a subdomain, so no www record is needed.`);
   console.log('\n   If you use Cloudflare, set the records to "DNS only" (grey cloud)');
   console.log('   so the certificate can be issued.\n');
 }
 
 // Step 2 — wait for DNS. Poll quietly; Enter forces a check; Ctrl+C leaves
 // the records in place and the command can be re-run later. Resolves once
-// the apex points here; says so if www does not yet.
+// the apex and www point here (only the apex for a subdomain).
 //
 // Ask public resolvers directly, not the machine's. Two reasons: the OS
 // resolver caches, so a record changed a minute ago can look unchanged here
 // long after the server sees it — and on some Windows setups Node's own
 // resolver cannot reach the system DNS server at all (ECONNREFUSED on every
 // name). getaddrinfo is the fallback for a machine that blocks 1.1.1.1.
-async function waitForDns(domain, ip, needTxt) {
+async function waitForDns(domain, ip, needTxt, kind) {
   console.log('   Step 2 — waiting for DNS. This can take a few minutes.');
   console.log('   Press Enter to check now, Ctrl+C to stop and come back later.\n');
   const dns = require('dns').promises;
@@ -1144,6 +1162,12 @@ async function waitForDns(domain, ip, needTxt) {
     return false;
   };
   let apexOk = false, wwwOk = false, txtOk = !needTxt;
+  // The server connects a domain of its own with www or not at all (since
+  // 2026-11); only a subdomain (no NS records of its own) goes without it.
+  // By the dots, not "resolveNs says ENODATA": a subdomain whose record is
+  // not added yet is NXDOMAIN, which read as a domain of its own and waited
+  // for www.
+  const subdomain = (kind || domainKind(domain)).subdomain;
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   let poke = null;
   rl.on('line', () => { if (poke) poke(); });
@@ -1155,18 +1179,15 @@ async function waitForDns(domain, ip, needTxt) {
       wwwOk = ip ? www.includes(ip) : www.length > 0;
       txtOk = txt;
       const mark = ok => ok ? '✓' : '…';
-      process.stdout.write(`\r   ${mark(apexOk)} ${domain} ${apex.length ? '→ ' + apex.join(', ') : '(no record yet)'}   ${mark(wwwOk)} www ${www.length ? '→ ' + www.join(', ') : '(no record yet)'}${needTxt ? `   ${mark(txtOk)} TXT ${txtOk ? 'found' : '(not yet)'}` : ''}      `);
-      if (apexOk && txtOk) break;
+      const wwwPart = subdomain ? '' : `   ${mark(wwwOk)} www ${www.length ? '→ ' + www.join(', ') : '(no record yet)'}`;
+      process.stdout.write(`\r   ${mark(apexOk)} ${domain} ${apex.length ? '→ ' + apex.join(', ') : '(no record yet)'}${wwwPart}${needTxt ? `   ${mark(txtOk)} TXT ${txtOk ? 'found' : '(not yet)'}` : ''}      `);
+      if (apexOk && txtOk && (wwwOk || subdomain)) break;
       await wait(15000);
     }
   } finally {
     rl.close();
   }
   console.log('\n');
-  if (!wwwOk) {
-    console.log('   www is not pointing here yet — connecting the apex only. Re-run');
-    console.log('   `nukebase domain ' + domain + '` later to add the www redirect.\n');
-  }
 }
 
 // nukebase logs [--follow]   the recent journal for the unit; --follow keeps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nukebase",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "NukeBase CLI: create, deploy and manage NukeBase projects",
   "bin": {
     "nukebase": "bin/nukebase.js"