nukebase 2.0.1 → 2.0.3

package/bin/nukebase.js

@@ -97,7 +97,9 @@ if (args.has('version') && !command) {
 } else if (ACCOUNT_COMMANDS.includes(command) || command === 'setup') {
   Promise.resolve()
     .then(() => require('../lib/account-commands')[command === 'setup' ? 'start' : command](args))
-    .then(() => process.exit(0), err => { console.error('❌', err.message); process.exit(1); });
+    // No process.exit(): see fail() in lib/account-commands.js. Nothing these
+    // commands start outlives them, so Node exits as soon as they finish.
+    .catch(err => { console.error('❌', err.message); process.exitCode = 1; });
 } else if (PROJECT_COMMANDS.includes(command)) {
   require('../lib/project-commands');
 } else {

package/lib/account-commands.js

@@ -14,9 +14,12 @@ const PROJECT_NAME_RE = /^[a-z][a-z0-9_-]{2,30}$/;
 
 const cookieFor = (acct) => `uid=${acct.uid}; token=${acct.token}`;
 
+// Stop the command with a message. Thrown rather than process.exit(): exiting
+// while Node is still closing finished HTTP connections crashes it on Windows
+// (libuv "UV_HANDLE_CLOSING" assertion). bin/nukebase.js prints it once and
+// sets the exit code, and Node exits by itself when the work is done.
 function fail(message) {
-  console.error(`❌ ${message}`);
-  process.exit(1);
+  throw new Error(message);
 }
 
 function describe(acct) {
@@ -197,6 +200,37 @@ async function chooseAccount(args, hint, autoYes) {
   return picked;
 }
 
+// ---- plan -----------------------------------------------------------------
+
+const FREE_TIER = 'spark';
+
+// The account's plan, starting the free plan first when it has none. An
+// account whose paid plan was cancelled is left alone: that's a choice for
+// the dashboard. Returns the plan name, or null if it couldn't be told.
+async function ensurePlan(api, acct) {
+  const call = async (path) => {
+    const r = await fetch(`${api}${path}`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', Cookie: cookieFor(acct) },
+      body: '{}'
+    });
+    let data = {};
+    try { data = await r.json(); } catch {}
+    return { r, data };
+  };
+  let who;
+  try { who = await call('/cli/whoami'); } catch { return null; }
+  if (who.r.status === 401) fail(`The sign-in for ${acct.label} is no longer valid. Run: nukebase login --email ${acct.label}`);
+  if (!who.r.ok) return null;
+  if (who.data.plan || who.data.canceled) return who.data.plan || null;
+
+  const started = await call('/start-free').catch(() => null);
+  if (!started || !started.r.ok) return null;   // the create below says why
+  console.log(`\n✓ You're on the free plan: $${started.data.credit || 10} of credit each month, 1 app (128 MB), 1 GB storage.`);
+  console.log(`  Upgrade any time at ${api}/`);
+  return 'free';
+}
+
 // ---- create ---------------------------------------------------------------
 
 // "256mb", "256", "1gb", "1g", "512 MB" -> megabytes; null when not a size.
@@ -247,6 +281,11 @@ async function createCommand(args) {
   const api = apiFor(args, acct.api);
   const host = hostOf(api);
 
+  // Every account starts free: one with no plan is put on the free plan here,
+  // so a brand-new `npx nukebase start` goes straight to a running app.
+  const plan = await ensurePlan(api, acct);
+  const isFree = plan === 'free';
+
   let catalog;
   try {
     const r = await fetch(`${api}/tiers`);
@@ -262,6 +301,11 @@ async function createCommand(args) {
   if (sizeArg && !tier) {
     fail(`Unknown size "${sizeArg}". One of: ${order.map(k => `${catalog.tiers[k].memoryHigh.replace(/M$/, 'mb').replace(/G$/, 'gb').toLowerCase()} (${k})`).join(', ')}`);
   }
+  if (isFree) {
+    // The free plan has one size; no question to ask.
+    if (tier && tier !== FREE_TIER) fail(`The free plan runs 128 MB apps only. Upgrade for bigger sizes: ${api}/`);
+    tier = FREE_TIER;
+  }
   if (!tier) {
     if (autoYes || !process.stdin.isTTY) {
       tier = def;
@@ -275,10 +319,11 @@ async function createCommand(args) {
   }
 
   console.log(`\n  Project   ${name}`);
-  console.log(`  Size      ${tierLabel(catalog, tier)}`);
+  console.log(`  Size      ${tierLabel(catalog, tier)}${isFree ? ' (free plan: paid from your $10 monthly credit)' : ''}`);
   console.log(`  Account   ${describe(acct)}`);
   console.log(`  Region    ${host}`);
-  if (!(await confirm('\nCreate it? It is billed to this account. (y/n) '))) { console.log('Aborted. Nothing was created.'); return; }
+  const question = isFree ? '\nCreate it? (y/n) ' : '\nCreate it? It is billed to this account. (y/n) ';
+  if (!(await confirm(question))) { console.log('Aborted. Nothing was created.'); return; }
 
   console.log(`\n🚀 Creating ${name}...`);
   let res;

package/lib/login.js

@@ -31,7 +31,13 @@ function page(mark, title, message, accent) {
 }
 
 // A one-shot server on 127.0.0.1 for the browser to come back to. Resolves
-// with the callback's query once one arrives carrying the right state.
+// with { query, reply } once a callback arrives carrying the right state.
+// The browser's request is held open until the caller calls reply(), so the
+// browser only lands on "signed in" once the CLI really has its token:
+//   reply({ redirect })   send the browser on (the dashboard)
+//   reply({ error })      show what went wrong
+//   reply()               a plain "signed in, close this tab" page
+// If reply() never comes, the page is sent after 30 seconds anyway.
 function startLoopback(state) {
   return new Promise((resolveStart, rejectStart) => {
     let finish;
@@ -44,14 +50,30 @@ function startLoopback(state) {
         res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
         return res.end(page('✕', 'Sign-in error', 'This sign-in could not be verified. Return to your terminal and try again.', '#dc2626'));
       }
-      const denied = q.error === 'access_denied';
-      res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-      res.end(denied
-        ? page('✕', 'Cancelled', 'The CLI was not signed in. You can close this tab.', '#64748b')
-        : page('✓', 'CLI signed in', 'You can close this tab and return to your terminal.', '#16a34a'));
       clearTimeout(timer);
       server.close();
-      finish.res(q);
+      if (q.error === 'access_denied') {
+        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+        res.end(page('✕', 'Cancelled', 'The CLI was not signed in. You can close this tab.', '#64748b'));
+        return finish.res({ query: q, reply: () => {} });
+      }
+      let sent = false;
+      const reply = ({ redirect, error } = {}) => {
+        if (sent) return;
+        sent = true;
+        clearTimeout(fallback);
+        if (redirect) {
+          res.writeHead(302, { Location: redirect });
+          return res.end();
+        }
+        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+        res.end(error
+          ? page('✕', 'Sign-in failed', `${String(error).replace(/[<>&"]/g, '')} Return to your terminal.`, '#dc2626')
+          : page('✓', 'CLI signed in', 'You can close this tab and return to your terminal.', '#16a34a'));
+      };
+      const fallback = setTimeout(() => reply(), 30 * 1000);
+      fallback.unref();
+      finish.res({ query: q, reply });
     });
     const timer = setTimeout(() => { server.close(); finish.rej(new Error('No response within 5 minutes. Run nukebase login again.')); }, LOGIN_TIMEOUT_MS);
     server.on('error', rejectStart);
@@ -104,13 +126,20 @@ async function browser(api, { email } = {}) {
     console.log(`\n  Still waiting. No account yet? Sign up at ${api}/start.html first, then run this again.`);
   }, 90 * 1000);
   hint.unref();
-  const q = await result.finally(() => clearTimeout(hint));
+  const { query: q, reply } = await result.finally(() => clearTimeout(hint));
   if (q.error) throw new Error('Sign-in was cancelled in the browser.');
-  if (!q.code) throw new Error('The browser did not return a sign-in code.');
-  const r = await postJson(`${api}/cli/token`, { code: q.code, verifier });
-  needsNewerServer(r, api);
-  if (!r.ok) throw new Error(r.data.error || `Sign-in failed (${r.status})`);
-  return r.data;
+  try {
+    if (!q.code) throw new Error('The browser did not return a sign-in code.');
+    const r = await postJson(`${api}/cli/token`, { code: q.code, verifier });
+    needsNewerServer(r, api);
+    if (!r.ok) throw new Error(r.data.error || `Sign-in failed (${r.status})`);
+    // Signed in: finish the browser on the dashboard, which says so.
+    reply({ redirect: `${api}/?cli=signed-in` });
+    return r.data;
+  } catch (e) {
+    reply({ error: e.message });
+    throw e;
+  }
 }
 
 async function device(api) {
@@ -156,9 +185,18 @@ async function emailLink(api, email) {
   console.log(`\n  ✉  Sign-in link sent to ${email} (if it has a NukeBase account).`);
   console.log('     Open it in a browser on this computer.');
   console.log('\n  Waiting for the link to be clicked…  (expires in 5 minutes)');
-  const q = await result;
-  if (!q.uid || !q.token) throw new Error('The sign-in link did not return a session.');
-  return exchange(api, q.uid, q.token);
+  // This browser has no dashboard session (the link signed in the CLI, not
+  // the browser), so it gets the plain "signed in" page rather than a redirect.
+  const { query: q, reply } = await result;
+  try {
+    if (!q.uid || !q.token) throw new Error('The sign-in link did not return a session.');
+    const out = await exchange(api, q.uid, q.token);
+    reply();
+    return out;
+  } catch (e) {
+    reply({ error: e.message });
+    throw e;
+  }
 }
 
 async function password(api, username, pass) {

package/package.json

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