nukebase 2.0.0 → 2.0.2

package/bin/nukebase.js

@@ -20,6 +20,9 @@ function usage() {
 
 Usage: nukebase <command>        (or: npx nukebase <command>)
 
+New here? Run: npx nukebase start
+  signs you in, creates a project and downloads it, ready to build
+
 Accounts
   login                      sign in by approving in your browser
   login --email you@x.com    sign in as a specific account (adds it; others stay)
@@ -33,6 +36,8 @@ Accounts
   whoami                     who owns this project, and are you signed in
 
 New projects
+  start [name] [size]        outside a project: sign in if needed, then create
+                             (inside a project, start = restart)
   create <name> [size] [email]
                              make a project and download it, e.g.
                              nukebase create demoapp123 256mb you@example.com
@@ -79,15 +84,19 @@ dashboard under Signed-in devices).
 Sign-ins are kept in ~/.nukebase/credentials.json, never in a project.`);
 }
 
-const command = args.command;
+let command = args.command;
+
+// `start` means two things: inside a project it restarts the app (as it always
+// has); anywhere else it is the new-user setup (sign in, create, download).
+if (command === 'start' && !require('../lib/project').findProject(process.cwd())) command = 'setup';
 
 if (args.has('version') && !command) {
   console.log(version);
 } else if (!command || command === 'help' || (args.has('help') && !command)) {
   usage();
-} else if (ACCOUNT_COMMANDS.includes(command)) {
+} else if (ACCOUNT_COMMANDS.includes(command) || command === 'setup') {
   Promise.resolve()
-    .then(() => require('../lib/account-commands')[command](args))
+    .then(() => require('../lib/account-commands')[command === 'setup' ? 'start' : command](args))
     .then(() => process.exit(0), err => { console.error('❌', err.message); process.exit(1); });
 } else if (PROJECT_COMMANDS.includes(command)) {
   require('../lib/project-commands');

package/lib/account-commands.js

@@ -295,6 +295,10 @@ async function createCommand(args) {
     let msg = '';
     try { msg = (await res.json()).error; } catch {}
     if (res.status === 401) fail(`The sign-in for ${acct.label} is no longer valid. Run: nukebase login --email ${acct.label}`);
+    // No plan, or no credit: both are fixed on the dashboard.
+    if (res.status === 403 && /plan|funds|credit|wallet|balance/i.test(msg)) {
+      fail(`${msg}\n   Choose a plan or add credit at ${api}/`);
+    }
     fail(`Create failed (${res.status}): ${msg || res.statusText}`);
   }
 
@@ -319,6 +323,44 @@ async function createCommand(args) {
   console.log('   nukebase push      deploy your changes');
 }
 
+// ---- start ----------------------------------------------------------------
+// The one command a new user runs after signing up: sign in if needed, then
+// create a project and download it. `nukebase start [name] [size] [email]`.
+// (Inside a project folder `start` means restart; bin/nukebase.js routes it.)
+
+async function startCommand(args) {
+  const autoYes = args.has('yes');
+  const { parse } = require('./args');
+  const passFlags = [];
+  for (const f of ['api', 'region']) if (args.get(f)) passFlags.push(`--${f}`, args.get(f));
+  if (autoYes) passFlags.push('--yes');
+  if (args.has('no-install')) passFlags.push('--no-install');
+
+  console.log('\n  Welcome to NukeBase.');
+  const emailArg = args.positional.find(a => a.includes('@'));
+  if (!creds.list().length || (emailArg && !creds.find(emailArg))) {
+    console.log('\n  Step 1 of 2: sign in. Click Allow in the browser window that opens.');
+    await loginCommand(parse(['login', ...(emailArg ? ['--email', emailArg] : []), ...passFlags]));
+  }
+
+  console.log(`\n  ${creds.list().length ? 'Step 2 of 2: ' : ''}create your project`);
+  let name = args.positional.find(a => !a.includes('@') && PROJECT_NAME_RE.test(a));
+  if (!name) {
+    if (autoYes || !process.stdin.isTTY) fail('Give the project a name, e.g.: nukebase start myapp');
+    for (;;) {
+      name = (await makeAskLine(false)('\n  Project name (lowercase, e.g. myapp): ')).trim().toLowerCase();
+      if (!name) fail('No name given.');
+      if (PROJECT_NAME_RE.test(name)) break;
+      console.log('  3-31 characters: lowercase letters, numbers, - and _, starting with a letter.');
+    }
+  }
+  const rest = args.positional.filter(a => a !== name);
+  await createCommand(parse(['create', name, ...rest, ...passFlags]));
+
+  console.log('\n  Building with Claude Code? Open the folder and describe your app.');
+  console.log('  Its CLAUDE.md explains NukeBase, and Claude can deploy with: npx nukebase push --yes');
+}
+
 // ---- link -----------------------------------------------------------------
 
 async function linkCommand(args) {
@@ -364,6 +406,7 @@ module.exports = {
   use: useCommand,
   whoami: whoamiCommand,
   create: createCommand,
+  start: startCommand,
   link: linkCommand,
   resolveTier, sizeToMb
 };

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);
@@ -98,13 +120,26 @@ async function browser(api, { email } = {}) {
   console.log('  Waiting for approval…  (Ctrl+C to cancel)');
   openBrowser(url.toString());
 
-  const q = await result;
+  // The usual reason for a long wait: no account yet, so no sign-in email
+  // ever arrives (the server doesn't say which addresses have accounts).
+  const hint = setTimeout(() => {
+    console.log(`\n  Still waiting. No account yet? Sign up at ${api}/start.html first, then run this again.`);
+  }, 90 * 1000);
+  hint.unref();
+  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) {
@@ -150,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.0",
+  "version": "2.0.2",
   "description": "NukeBase CLI: create, deploy and manage NukeBase projects",
   "bin": {
     "nukebase": "bin/nukebase.js"