nukebase 2.2.1 → 2.2.2

package/lib/account-commands.js

@@ -296,10 +296,69 @@ function namePackage(dir, name) {
   } catch { return false; }
 }
 
-// Create `name` on the server and unpack it into `dest`. Returns
-// { exists: true } when the account already has a project by that name, so
-// `start` can try the next one; any other failure stops the command.
-async function createProject({ acct, api, name, tier, dest, install }) {
+// Read a download to the end, showing how much has arrived: one line that
+// updates in a terminal, or a line every 10 MB when the output goes to a file
+// or an AI agent (where \r updates would pile up). The archives are streamed
+// without a length, so it shows MB so far, not a percentage.
+async function readWithProgress(res, label) {
+  const tty = process.stdout.isTTY;
+  const mb = (n) => (n / 1048576).toFixed(1);
+  const chunks = [];
+  let got = 0, lastShown = 0, lastLine = 0;
+  const show = (final) => {
+    if (tty) process.stdout.write(`\r  ${label}… ${mb(got)} MB${final ? '\n' : ''}`);
+    else if (final || got - lastLine >= 10 * 1048576) { console.log(`  ${label}… ${mb(got)} MB`); lastLine = got; }
+  };
+  if (!res.body || typeof res.body.getReader !== 'function') {
+    const buf = Buffer.from(await res.arrayBuffer());
+    got = buf.length; show(true);
+    return buf;
+  }
+  const reader = res.body.getReader();
+  try {
+    for (;;) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      chunks.push(Buffer.from(value));
+      got += value.length;
+      if (Date.now() - lastShown > 250) { lastShown = Date.now(); show(false); }
+    }
+  } catch (e) {
+    // End the half-drawn progress line, so whatever is printed next starts clean.
+    if (tty && got) process.stdout.write('\n');
+    throw e;
+  }
+  show(true);
+  return Buffer.concat(chunks);
+}
+
+// The project's files as the server has them, without node_modules (an
+// `npm install` follows; servers too old for ?skip send them anyway). One
+// retry, since this runs right after a dropped connection.
+async function downloadExisting({ acct, api, name }) {
+  const headers = { 'X-Project': name, Cookie: cookieFor(acct) };
+  const url = `${api}/download-project?project=${encodeURIComponent(name)}&skip=node_modules`;
+  let lastErr = null;
+  for (let attempt = 1; attempt <= 2; attempt++) {
+    try {
+      const dl = await fetch(url, { headers });
+      if (!dl.ok) { lastErr = new Error(`the server answered ${dl.status}`); continue; }
+      return await readWithProgress(dl, `Downloading ${name}`);
+    } catch (e) {
+      lastErr = e;
+      if (attempt === 1) console.log('  (download interrupted, trying again)');
+    }
+  }
+  fail(`${name} exists but could not be downloaded (${lastErr.cause?.message || lastErr.message}).\n` +
+    `   In an empty folder, run: nukebase link ${name}   then: nukebase pull --yes   then: npm install`);
+}
+
+// Create `name` on the server and unpack it into `dest`. When the account
+// already has a project by that name: with `reuse`, that project is
+// downloaded into `dest` instead (`start`: running it again finishes the
+// job rather than making name-2); without, returns { exists: true }. Any
+// other failure stops the command.
+async function createProject({ acct, api, name, tier, dest, install, reuse = false }) {
   console.log(`\n🚀 Creating ${name}...`);
   const headers = (extra = {}) => ({ ...extra, 'X-Project': name, Cookie: cookieFor(acct) });
 
@@ -325,14 +384,7 @@ async function createProject({ acct, api, name, tier, dest, install }) {
     }
     if (!probe.ok) fail(`Create failed: ${why} (and the server answered ${probe.status} when asked whether ${name} exists).`);
     console.log(`  (the connection dropped while the server finished setting up ${name} — it exists, downloading it)`);
-    let dl;
-    try {
-      dl = await fetch(`${api}/download-project?project=${encodeURIComponent(name)}`, { headers: headers() });
-    } catch (e) {
-      fail(`${name} was created but could not be downloaded (${e.cause?.message || e.message}). Link to it: nukebase link ${name}`);
-    }
-    if (!dl.ok) fail(`${name} was created but could not be downloaded (${dl.status}). Link to it: nukebase link ${name}`);
-    return Buffer.from(await dl.arrayBuffer());
+    return downloadExisting({ acct, api, name });
   }
 
   let res = null, zip = null;
@@ -348,19 +400,25 @@ async function createProject({ acct, api, name, tier, dest, install }) {
   if (res && !res.ok) {
     let msg = '';
     try { msg = (await res.json()).error; } catch {}
-    if (res.status === 400 && /already exists/i.test(msg || '')) return { exists: true };
-    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: fixed on the dashboard.
-    if (res.status === 403 && /plan|funds|credit|wallet|balance|upgrade/i.test(msg)) {
-      fail(`${msg}\n   Manage your plan at ${api}/`);
+    const taken = res.status === 400 && /already exists/i.test(msg || '');
+    if (taken && !reuse) return { exists: true };
+    if (taken) {
+      console.log(`  ${name} already exists in your account, so downloading it here instead of making a new one.`);
+      zip = await downloadExisting({ acct, api, name });
+    } else {
+      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: fixed on the dashboard.
+      if (res.status === 403 && /plan|funds|credit|wallet|balance|upgrade/i.test(msg)) {
+        fail(`${msg}\n   Manage your plan at ${api}/`);
+      }
+      fail(`Create failed (${res.status}): ${msg || res.statusText}`);
     }
-    fail(`Create failed (${res.status}): ${msg || res.statusText}`);
   }
 
   // The server finishes setup as the ZIP finishes streaming, so read it all.
   // A drop here is the same case as above.
   if (!zip) {
-    try { zip = Buffer.from(await res.arrayBuffer()); }
+    try { zip = await readWithProgress(res, `Downloading ${name}`); }
     catch (e) { zip = await recover(e); }
   }
   fs.mkdirSync(dest, { recursive: true });
@@ -373,7 +431,7 @@ async function createProject({ acct, api, name, tier, dest, install }) {
   console.log(`✓ Downloaded ${count} files into ${path.relative(process.cwd(), dest) || 'this folder'}`);
 
   if (install && fs.existsSync(path.join(dest, 'package.json'))) {
-    console.log('\n📦 npm install\n');
+    console.log('\n📦 Installing packages (npm install)…\n');
     // One command string under a shell: npm is npm.cmd on Windows, which
     // needs a shell, and Node 26 deprecates passing separate args with one.
     const r = spawnSync('npm install', [], { cwd: dest, stdio: 'inherit', shell: true });
@@ -496,19 +554,17 @@ async function startCommand(args) {
   const intoHere = isEmptyFolder(here);
   const given = args.positional.find(a => !a.includes('@') && PROJECT_NAME_RE.test(a) && !resolveTier(a, catalog));
   const base = given || (intoHere && nameFromFolder(here)) || 'myapp';
-  const candidates = given ? [given] : [base, ...Array.from({ length: 8 }, (_, i) => `${base}-${i + 2}`.slice(0, 31))];
+  // One name. If the account already has a project by it, that project is
+  // downloaded here rather than a name-2 being created: running start again
+  // after a hiccup finishes the job.
+  const name = base;
+  const dest = intoHere ? here : path.resolve(here, name);
+  if (!intoHere && fs.existsSync(dest) && fs.readdirSync(dest).length) {
+    fail(`There is already a folder named ${name} here with files in it. Run this in an empty folder, or choose another name: npx nukebase start <name>`);
+  }
 
   console.log(`  Size: ${tierLabel(catalog, tier)}${isFree ? ' (paid from your $10 monthly credit)' : ''}`);
-  let created = null, name = null, dest = null;
-  for (const candidate of candidates) {
-    dest = intoHere ? here : path.resolve(here, candidate);
-    if (!intoHere && fs.existsSync(dest) && fs.readdirSync(dest).length) continue;
-    const out = await createProject({ acct, api, name: candidate, tier, dest, install: !args.has('no-install') });
-    if (out.exists) { console.log(`  (${candidate} is taken, trying another name)`); continue; }
-    created = out; name = candidate;
-    break;
-  }
-  if (!created) fail(given ? `You already have a project named ${given}. Pick another name: npx nukebase start <name>` : 'Could not find a free project name. Run: npx nukebase start <name>');
+  const created = await createProject({ acct, api, name, tier, dest, install: !args.has('no-install'), reuse: true });
 
   // Written for whoever runs this next, person or AI agent.
   console.log(`\n✅ Your app "${name}" is live at ${created.url}`);

package/package.json

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