nukebase 2.1.2 → 2.2.0

package/bin/nukebase.js

@@ -79,6 +79,9 @@ In a project folder (runs as the account that owns the project)
   domain                     connect a custom domain, step by step
   domain <name> [--email e]  connect in one go (DNS already set)
   domain remove              disconnect the custom domain
+  domain email               send the app's emails from the custom domain
+                             (--root | --sub, --reply-to you@gmail.com, --wait)
+  domain email remove        go back to sending from nukebase.com
   logs [--follow]            recent log output; --follow streams
   download [--out f.zip]     the project ZIP, exactly as the server has it
   regiontransfer [region]    move this project to another region, step by step

package/lib/args.js

@@ -6,7 +6,7 @@
 // `--name=value` works too.
 
 const VALUE_FLAGS = new Set([
-  'region', 'api', 'as', 'tier', 'streams', 'out', 'email', 'to', 'include', 'name'
+  'region', 'api', 'as', 'tier', 'streams', 'out', 'email', 'to', 'include', 'name', 'reply-to'
 ]);
 
 const SHORT = { y: 'yes', f: 'follow', h: 'help', v: 'version' };

package/lib/project-commands.js

@@ -854,6 +854,7 @@ async function deleteProject() {
 // nukebase domain                          guided: DNS records, wait, connect
 // nukebase domain <name> [--email you@x]   one shot, for scripts (no waiting)
 // nukebase domain remove                   disconnect it
+// nukebase domain email [remove]           send the app's emails from it
 //
 // The guided flow is the dashboard's modal in the terminal: it prints the two
 // A records and the ownership TXT (nukebase.<domain> = nukebase-uid=<uid>,
@@ -878,6 +879,11 @@ async function domainCommand() {
     process.exit(0);
   }
 
+  if (sub === 'email') {
+    await emailDomainCommand(args.positional[1] || null);
+    process.exit(0);
+  }
+
   const email = args.get('email') || (String(accountLabel).includes('@') ? accountLabel : null);
 
   // One shot: name given, no hand-holding. Scripts and people who already
@@ -892,6 +898,7 @@ async function domainCommand() {
       await waitForDns(sub, ip, needTxt);
     }
     await connectDomain(sub, email);
+    if (args.has('email-domain')) await emailDomainCommand(null);
     process.exit(0);
   }
 
@@ -923,6 +930,13 @@ async function domainCommand() {
 
   // Step 3 — the server does the real verification and issues the cert.
   await connectDomain(domain, email);
+
+  // Optional: the app's emails from this domain too.
+  if (args.has('email-domain') || await confirm(`\n✉️  Send this app's emails from ${domain} too (instead of nukebase.com)? (y/n) `)) {
+    await emailDomainCommand(null);
+  } else {
+    console.log('   Later: nukebase domain email');
+  }
   process.exit(0);
 
   async function currentDomain() {
@@ -931,6 +945,106 @@ async function domainCommand() {
   }
 }
 
+// nukebase domain email [--root | --sub] [--reply-to you@gmail.com] [--wait]
+// nukebase domain email remove
+//
+// Send the app's emails (sign-in links today) from its custom domain:
+// login@theirapp.com, replies to --reply-to. The sending domain is either the
+// custom domain itself (--root) or mail.<domain> (--sub; safest when the
+// domain already has email). Prints the two DNS records to add, then waits
+// for the mail provider to verify them (Enter to check now, Ctrl+C to leave
+// it: the server keeps checking every 10 minutes for a week). Run again to
+// see the status, change the Reply-To, or switch between --root and --sub.
+async function emailDomainCommand(action) {
+  if (action === 'remove') {
+    if (!(await confirm(`Stop sending ${project}'s emails from its domain? They go back to nukebase.com. (y/n) `))) {
+      console.log('Aborted.'); process.exit(1);
+    }
+    await projectPost('/remove-email-domain', {}, { label: 'email remove' });
+    console.log('✓ Email sending domain removed. Emails are sent from nukebase.com again.');
+    return;
+  }
+
+  const check = await projectPost('/email-domain-check', {}, { label: 'email' });
+  const domain = check.domain;
+  const current = check.current;
+  const wantRoot = args.has('root') ? true : args.has('sub') ? false : null;
+  const replyTo = args.get('reply-to');
+  const changing = wantRoot !== null && (!current || current.root !== wantRoot);
+
+  let rec = current;
+  if (!current || changing || replyTo !== undefined) {
+    let root = wantRoot;
+    if (root === null) root = current ? current.root : null;
+    if (root === null) {
+      const suggestRoot = check.suggested === 'root';
+      console.log(`\n✉️  Send ${project}'s emails from ${domain}\n`);
+      console.log(`   1) login@${domain}`);
+      console.log(`      ${check.hasEmail ? 'This domain already has email set up' + (check.spf ? ' (you will update its SPF record)' : '') + '.' : 'Recommended: this domain has no email set up yet.'}`);
+      console.log(`   2) login@${domain}, sent via mail.${domain}`);
+      console.log('      Safest if you already use email on this domain: its records are not touched.\n');
+      if (process.stdin.isTTY && !AUTO_YES) {
+        const a = (await askLine(`   Choose 1 or 2 [${suggestRoot ? 1 : 2}]: `)).trim();
+        root = a === '1' ? true : a === '2' ? false : suggestRoot;
+      } else {
+        root = suggestRoot;
+      }
+    }
+    let reply = replyTo;
+    if (reply === undefined && !current && process.stdin.isTTY && !AUTO_YES) {
+      reply = (await askLine('   Where should replies go? (e.g. you@gmail.com, Enter to skip): ')).trim();
+    }
+    const body = { root };
+    if (typeof reply === 'string') body.replyTo = reply;
+    rec = (await projectPost('/email-domain', body, { label: 'email' })).emailDomain;
+  }
+
+  printEmailRecords(rec);
+  if (rec.status === 'verified') return;
+  if (!args.has('wait') && (!process.stdin.isTTY || AUTO_YES)) {
+    console.log('   The server checks every 10 minutes. See the status with: nukebase domain email');
+    return;
+  }
+  await waitForEmailDomain();
+}
+
+function printEmailRecords(rec) {
+  const ok = rec.status === 'verified';
+  console.log(`\n   Sending domain: ${rec.name}   ${ok ? `✓ verified — emails go out as login@${rec.fromDomain || rec.name}` : '… waiting for DNS'}`);
+  if (rec.replyTo) console.log(`   Replies go to:  ${rec.replyTo}`);
+  if (ok) { console.log(''); return; }
+  console.log('\n   At your registrar, add these DNS records:\n');
+  for (const r of rec.records || []) {
+    console.log(`     ${r.valid ? '✓' : '…'} TXT   ${r.host}`);
+    if (r.replace) console.log('            REPLACE your existing SPF record (only one is allowed) with:');
+    console.log(`            ${r.value}\n`);
+  }
+}
+
+async function waitForEmailDomain() {
+  console.log('   Waiting for verification. Enter to check now, Ctrl+C to stop (the server keeps checking).\n');
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  let poke = null;
+  rl.on('line', () => { if (poke) poke(); });
+  const wait = (ms) => new Promise(res => { poke = res; setTimeout(res, ms); });
+  try {
+    for (;;) {
+      const r = await projectPost('/email-domain-status', {}, { label: 'email status' });
+      const rec = r.emailDomain;
+      if (!rec) { console.log('\n   The sending domain is gone. Run: nukebase domain email'); return; }
+      const marks = (rec.records || []).map(x => `${x.valid ? '✓' : '…'} ${x.kind.toUpperCase()}`).join('   ');
+      process.stdout.write(`\r   ${marks}      `);
+      if (rec.status === 'verified') {
+        console.log(`\n\n✓ Verified. ${project}'s emails now go out as login@${rec.fromDomain || rec.name}.`);
+        return;
+      }
+      await wait(20000);
+    }
+  } finally {
+    rl.close();
+  }
+}
+
 async function connectDomain(domain, email) {
   console.log(`🔐 Step 3 — verifying DNS from the server and issuing SSL for ${domain} (up to a minute)...`);
   const r = await projectPost('/custom-domain', email ? { domain, email } : { domain }, {
@@ -1289,6 +1403,14 @@ async function regionTransfer() {
     if (r.status !== 0) {
       console.error(`\n⚠️  The domain was not connected on ${target}. It still works on ${source}.`);
       console.error(`   Finish later with: nukebase domain ${customDomain} --region ${target} --wait${asArgs.length ? ' ' + asArgs.join(' ') : ''}`);
+    } else if (node.emailDomain && node.emailDomain.name) {
+      // Same sending domain on the target: the mail provider already has it
+      // verified (its DNS records do not change), so the target adopts it.
+      const em = node.emailDomain;
+      const emArgs = ['domain', 'email', em.root ? '--root' : '--sub', '--region', target, '--yes', ...asArgs];
+      if (em.replyTo) emArgs.push('--reply-to', em.replyTo);
+      const e = spawnSync(process.execPath, [BIN, ...emArgs], { stdio: 'inherit', cwd: root });
+      if (e.status !== 0) console.error(`   Email sending: finish later with: nukebase domain email --region ${target}${asArgs.length ? ' ' + asArgs.join(' ') : ''}`);
     }
   } else {
     console.log(`  Skipped. ${customDomain} stays on ${source} for now. When ready:`);

package/package.json

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