@kvbox/cli 0.5.20 → 0.5.21

package/dist/kvbox.js

@@ -164,7 +164,7 @@ function versionOf(srcFileUrl, injected) {
 }
 
 // src/version.ts
-var VERSION = versionOf(import.meta.url, true ? "0.5.20" : void 0);
+var VERSION = versionOf(import.meta.url, true ? "0.5.21" : void 0);
 
 // src/commands/vm/index.ts
 import { Command as Command25 } from "commander";
@@ -370,12 +370,12 @@ import { z as z2 } from "zod";
 
 // ../shared/src/sizes.ts
 var SIZES = {
+  xs: { vcpu: 1, memMib: 2048, diskGib: 8 },
   s: { vcpu: 2, memMib: 4096, diskGib: 8 },
   m: { vcpu: 4, memMib: 8192, diskGib: 16 },
   l: { vcpu: 8, memMib: 16384, diskGib: 32 }
 };
 var SIZE_NAMES = Object.keys(SIZES);
-var DEFAULT_SIZE = "s";
 function parseMib(text2) {
   const m = /^\s*(\d+(?:\.\d+)?)\s*([gm]i?b?)?\s*$/i.exec(text2);
   if (!m) return void 0;
@@ -2891,14 +2891,12 @@ import { Command as Command49, Option as Option5 } from "commander";
 
 // src/commands/deploy/config.ts
 import { readFile as readFile6, writeFile as writeFile4 } from "fs/promises";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import { z as z5 } from "zod";
 
-// src/commands/deploy/templates/react.ts
-import { spawn as spawn4 } from "child_process";
+// src/commands/deploy/templates/pm.ts
 import { access } from "fs/promises";
 import { join as join2 } from "path";
-var OUT_DIRS = ["dist", "build"];
 async function packageManager(dir) {
   const has = (f) => access(join2(dir, f)).then(() => true, () => false);
   if (await has("pnpm-lock.yaml")) return "pnpm";
@@ -2906,8 +2904,100 @@ async function packageManager(dir) {
   if (await has("bun.lockb") || await has("bun.lock")) return "bun";
   return "npm";
 }
+function runScript(pm, script) {
+  return pm === "yarn" ? [script] : ["run", script];
+}
+
+// src/commands/deploy/templates/nextjs.ts
+var APP_DIR = "/srv/app/current";
+var SERVICE = "kvbox-app";
+var PORT = 3e3;
+function commands(pm) {
+  switch (pm) {
+    case "pnpm":
+      return { setup: ["sudo -n corepack enable pnpm"], install: "pnpm install --frozen-lockfile", build: "pnpm run build", start: "pnpm run start" };
+    case "yarn":
+      return { setup: ["sudo -n corepack enable yarn"], install: "yarn install --frozen-lockfile", build: "yarn build", start: "yarn start" };
+    case "bun":
+      return { setup: [], install: "npm install", build: "npm run build", start: "npm run start" };
+    case "npm":
+      return { setup: [], install: "if [ -f package-lock.json ]; then npm ci; else npm install; fi", build: "npm run build", start: "npm run start" };
+  }
+}
+var nextjsTemplate = {
+  id: "nextjs",
+  label: "Next.js",
+  hint: "source shipped; installed, built and run in the box on port 3000",
+  size: "s",
+  port: PORT,
+  detect(pkg) {
+    if (!pkg) return false;
+    return "next" in { ...pkg.dependencies, ...pkg.devDependencies };
+  },
+  /** No local build: the box does it. Only the scripts it will need are checked here. */
+  async build(ctx) {
+    for (const script of ["build", "start"]) {
+      if (typeof ctx.pkg?.scripts?.[script] !== "string") throw new KvboxError(`${ctx.dir}: package.json has no "${script}" script; Next.js needs "build": "next build" and "start": "next start"`);
+    }
+    const pm = await packageManager(ctx.dir);
+    return { outDir: ctx.dir, exclude: ["node_modules", ".next", ".git"], pm, what: "the source" };
+  },
+  /**
+   * The source lands in a staging directory and is installed and built there while the old app
+   * keeps serving; only then is it swapped into place and the service restarted, so a failed
+   * install or build leaves the running app alone. The unit is rewritten every time, so a changed
+   * package manager or start script takes effect. /srv/app is the kvbox user's (image v0.8.0+).
+   */
+  remote(built) {
+    const c = commands(built.pm);
+    const unit = [
+      "[Unit]",
+      "Description=kvbox deploy: the app in " + APP_DIR,
+      "After=network.target",
+      "",
+      "[Service]",
+      "User=kvbox",
+      `WorkingDirectory=${APP_DIR}`,
+      `ExecStart=/usr/bin/env ${c.start}`,
+      `Environment=NODE_ENV=production PORT=${PORT}`,
+      "Restart=always",
+      "RestartSec=2",
+      "",
+      "[Install]",
+      "WantedBy=multi-user.target"
+    ];
+    return [
+      "set -e",
+      "test -d /srv/app -a -w /srv/app || exit 3",
+      "rm -rf /srv/app/.incoming /srv/app/.old",
+      "mkdir -p /srv/app/.incoming",
+      "tar -xf - -C /srv/app/.incoming",
+      "cd /srv/app/.incoming",
+      "export CI=1 NEXT_TELEMETRY_DISABLED=1 NODE_ENV=production",
+      ...c.setup,
+      c.install,
+      c.build,
+      "cd /",
+      `sudo -n tee /etc/systemd/system/${SERVICE}.service >/dev/null <<'UNIT'`,
+      ...unit,
+      "UNIT",
+      `if [ -e ${APP_DIR} ]; then mv ${APP_DIR} /srv/app/.old; fi`,
+      `mv /srv/app/.incoming ${APP_DIR}`,
+      "sudo -n systemctl daemon-reload",
+      `sudo -n systemctl enable --quiet ${SERVICE}`,
+      `sudo -n systemctl restart ${SERVICE}`,
+      "rm -rf /srv/app/.old"
+    ].join("\n");
+  }
+};
+
+// src/commands/deploy/templates/react.ts
+import { spawn as spawn4 } from "child_process";
+import { access as access2 } from "fs/promises";
+import { join as join3 } from "path";
+var OUT_DIRS = ["dist", "build"];
 async function runBuild(dir, pm) {
-  const args = pm === "yarn" ? ["build"] : ["run", "build"];
+  const args = runScript(pm, "build");
   info(`${color.dim("$")} ${pm} ${args.join(" ")}`);
   const status2 = await new Promise((resolve3, reject) => {
     const child = spawn4(pm, args, { cwd: dir, stdio: ["ignore", process.stderr, process.stderr], shell: process.platform === "win32" });
@@ -2920,6 +3010,7 @@ var reactTemplate = {
   id: "react",
   label: "React",
   hint: "static site: built here, served by nginx in the box",
+  size: "xs",
   port: 80,
   /** A Vite or Create React App project. A framework with its own server (Next.js, Remix, Expo) is not a static site. */
   detect(pkg) {
@@ -2930,11 +3021,12 @@ var reactTemplate = {
   },
   async build(ctx) {
     if (typeof ctx.pkg?.scripts?.["build"] !== "string") throw new KvboxError(`${ctx.dir}: package.json has no "build" script`);
-    await runBuild(ctx.dir, await packageManager(ctx.dir));
+    const pm = await packageManager(ctx.dir);
+    await runBuild(ctx.dir, pm);
     const candidates = ctx.dist !== void 0 ? [ctx.dist] : OUT_DIRS;
     for (const dist of candidates) {
-      const outDir = join2(ctx.dir, dist);
-      if (await access(join2(outDir, "index.html")).then(() => true, () => false)) return { outDir, dist };
+      const outDir = join3(ctx.dir, dist);
+      if (await access2(join3(outDir, "index.html")).then(() => true, () => false)) return { outDir, dist, exclude: [], pm, what: `${dist}/` };
     }
     throw new KvboxError(
       `the build left no ${candidates.join(" or ")}/index.html. The React template ships a directory of static files; set "dist" in kvbox.json to the build output directory, or pick the right template with --template`
@@ -2965,7 +3057,7 @@ var reactTemplate = {
 };
 
 // src/commands/deploy/templates/index.ts
-var TEMPLATES = [reactTemplate];
+var TEMPLATES = [reactTemplate, nextjsTemplate];
 var TEMPLATE_IDS = TEMPLATES.map((t) => t.id);
 function templateById(id) {
   const t = TEMPLATES.find((x) => x.id === id);
@@ -2977,6 +3069,7 @@ function detectTemplate(pkg) {
 }
 
 // src/commands/deploy/config.ts
+var DEPLOY_AUTO_HIBERNATE_SEC = 3600;
 var CONFIG_FILE = "kvbox.json";
 var BOX_NAME_RE = /^[a-z0-9][a-z0-9-]{0,11}$/;
 var DeployConfigSchema = z5.object({
@@ -2994,7 +3087,7 @@ var DeployConfigSchema = z5.object({
   dist: z5.string().optional()
 });
 async function readConfig(dir) {
-  const path = join3(dir, CONFIG_FILE);
+  const path = join4(dir, CONFIG_FILE);
   let raw;
   try {
     raw = await readFile6(path, "utf8");
@@ -3016,7 +3109,7 @@ async function readConfig(dir) {
   return parsed.data;
 }
 async function writeConfig(dir, config) {
-  await writeFile4(join3(dir, CONFIG_FILE), JSON.stringify(config, null, 2) + "\n");
+  await writeFile4(join4(dir, CONFIG_FILE), JSON.stringify(config, null, 2) + "\n");
 }
 function nameFromDir(dirName) {
   const slug = dirName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 12).replace(/-+$/, "");
@@ -3029,21 +3122,27 @@ function subdomainFor(name) {
 // src/commands/deploy/ship.ts
 import { spawn as spawn5 } from "child_process";
 import { readdir, stat as stat2 } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var IMAGE_TOO_OLD = 3;
 var SSH_FAILED3 = 255;
-async function measure(dir) {
-  let files = 0;
-  let bytes = 0;
-  for (const entry of await readdir(dir, { recursive: true, withFileTypes: true })) {
-    if (!entry.isFile()) continue;
-    files += 1;
-    bytes += (await stat2(join4(entry.parentPath, entry.name))).size;
-  }
-  return { files, bytes };
-}
-async function ship(ep, dir, remote) {
-  const tar = spawn5("tar", ["-cf", "-", "-C", dir, "."], { stdio: ["ignore", "pipe", "pipe"] });
+async function measure(dir, exclude = []) {
+  const total = { files: 0, bytes: 0 };
+  const walk = async (d) => {
+    for (const entry of await readdir(d, { withFileTypes: true })) {
+      if (exclude.includes(entry.name)) continue;
+      const path = join5(d, entry.name);
+      if (entry.isDirectory()) await walk(path);
+      else if (entry.isFile()) {
+        total.files += 1;
+        total.bytes += (await stat2(path)).size;
+      }
+    }
+  };
+  await walk(dir);
+  return total;
+}
+async function ship(ep, dir, remote, exclude = []) {
+  const tar = spawn5("tar", ["-cf", "-", ...exclude.map((e) => `--exclude=${e}`), "-C", dir, "."], { stdio: ["ignore", "pipe", "pipe"] });
   const ssh = spawn5("ssh", [...sshArgs(ep), remote], { stdio: ["pipe", "pipe", "pipe"] });
   tar.stdout.pipe(ssh.stdin);
   const chunks = [];
@@ -3074,7 +3173,7 @@ async function ship(ep, dir, remote) {
 var shipping = { ship, measure, waitForSsh };
 
 // src/commands/deploy/index.ts
-var deployCommand = new Command49("deploy").description("put the app in this directory on a box with its own HTTPS address (React for now); redeploy by running it again").argument("[dir]", "the app's directory (default: the current one)").addOption(new Option5("-t, --template <template>", "what kind of app it is (detected from package.json when not given)").choices(TEMPLATE_IDS)).option("-n, --name <name>", "the box's name (default: the directory's name)").option("--sub <subdomain>", "its HTTPS name, https://<subdomain>.kvbox.app (default: the box's name)").addOption(new Option5("-s, --size <size>", "size of the box when it has to be made").choices(SIZE_NAMES)).option("-y, --yes", "ask nothing: take the defaults for whatever the flags and kvbox.json leave open").option("--json", "print the result as JSON").option("--org <slug>", "deploy into this org's boxes (saved to kvbox.json)").action(async (dirArg, opts, cmd) => {
+var deployCommand = new Command49("deploy").description("put the app in this directory (React or Next.js) on a box with its own HTTPS address; redeploy by running it again").argument("[dir]", "the app's directory (default: the current one)").addOption(new Option5("-t, --template <template>", "what kind of app it is (detected from package.json when not given)").choices(TEMPLATE_IDS)).option("-n, --name <name>", "the box's name (default: the directory's name)").option("--sub <subdomain>", "its HTTPS name, https://<subdomain>.kvbox.app (default: the box's name)").addOption(new Option5("-s, --size <size>", "size of the box when it has to be made").choices(SIZE_NAMES)).option("-y, --yes", "ask nothing: take the defaults for whatever the flags and kvbox.json leave open").option("--json", "print the result as JSON").option("--org <slug>", "deploy into this org's boxes (saved to kvbox.json)").action(async (dirArg, opts, cmd) => {
   const dir = resolve2(dirArg ?? ".");
   const pkg = await readPackageJson(dir);
   const saved = await readConfig(dir);
@@ -3092,8 +3191,8 @@ var deployCommand = new Command49("deploy").description("put the app in this dir
 `);
     info(`${color.bold("Building")} ${color.cyan(config.name)} ${color.dim(`(${template.label})`)}`);
     const built = await template.build({ dir, pkg, dist: config.dist });
-    if (built.dist !== config.dist) await writeConfig(dir, { ...config, dist: built.dist });
-    const size = await shipping.measure(built.outDir);
+    if (built.dist !== void 0 && built.dist !== config.dist) await writeConfig(dir, { ...config, dist: built.dist });
+    const size = await shipping.measure(built.outDir, built.exclude);
     info("");
     const { box: found, ref, created } = await findOrCreate(client, config);
     const cert = await ensureCert(client, void 0, void 0, { owner: found.owner });
@@ -3101,17 +3200,18 @@ var deployCommand = new Command49("deploy").description("put the app in this dir
     const box = created || wasRunning ? found : await wakeUp(client, found, ref);
     const ep = sshEndpoint(box, client.target);
     if (!wasRunning) await spin(`waiting for ${ref} to accept SSH\u2026`, shipping.waitForSsh(ep));
-    const shipIt = () => shipping.ship(ep, built.outDir, template.remote());
-    let result = await spin(`shipping ${built.dist}/ (${size.files} files, ${gb(size.bytes)}) to ${ref}\u2026`, shipIt);
+    const shipIt = () => shipping.ship(ep, built.outDir, template.remote(built), built.exclude);
+    const doing = built.dist === void 0 ? `shipping ${built.what} (${size.files} files, ${gb(size.bytes)}) to ${ref} and building there, a minute or two\u2026` : `shipping ${built.what} (${size.files} files, ${gb(size.bytes)}) to ${ref}\u2026`;
+    let result = await spin(doing, shipIt);
     if (result.status === SSH_FAILED3 && await renewAfterRefusal(client, cert, box.owner)) {
       info("renewed your SSH certificate, trying again\u2026");
-      result = await spin(`shipping ${built.dist}/ to ${ref}\u2026`, shipIt);
+      result = await spin(doing, shipIt);
     }
     if (result.status === SSH_FAILED3) throw new KvboxError(`box ${ref}: could not reach it over SSH (still booting?)${result.output ? `
 ${result.output.trim()}` : ""}`, SSH_FAILED3);
     if (result.status === IMAGE_TOO_OLD) {
       throw new KvboxError(
-        `box ${ref} runs an image without nginx; ${template.label} needs base v0.8.0 or newer. Update the box (kvbox vm update ${ref}) once its host has the new image, or deploy under another name (--name) to get a fresh box`
+        `box ${ref} runs an image too old for the ${template.label} template (base v0.8.0 or newer). Update the box (kvbox vm update ${ref}) once its host has the new image, or deploy under another name (--name) to get a fresh box`
       );
     }
     if (result.status !== 0) throw new KvboxError(`deploying to ${ref} failed (exit ${result.status}):
@@ -3120,10 +3220,10 @@ ${result.output.trim()}`);
     if (cloud) {
       const got = await address(client, box, ref, config, template);
       url = got.url;
-      if (got.subdomain !== config.subdomain) await writeConfig(dir, { ...config, subdomain: got.subdomain, ...built.dist !== config.dist ? { dist: built.dist } : {} });
+      if (got.subdomain !== config.subdomain) await writeConfig(dir, { ...config, subdomain: got.subdomain, ...built.dist !== void 0 && built.dist !== config.dist ? { dist: built.dist } : {} });
     }
     if (opts.json) {
-      json({ box: ref, created, template: template.id, url, dist: built.dist, files: size.files, bytes: size.bytes });
+      json({ box: ref, created, template: template.id, url, ...built.dist !== void 0 ? { dist: built.dist } : {}, files: size.files, bytes: size.bytes });
       return;
     }
     process.stdout.write(`${url}
@@ -3153,8 +3253,9 @@ async function settle(dir, pkg, saved, opts, orgFlag, cloud) {
     template: opts.template ?? saved?.template ?? detected?.id,
     name: opts.name ?? saved?.name ?? nameFromDir(basename(dir)),
     subdomain: opts.sub ?? savedSub,
-    size: opts.size ?? saved?.size ?? DEFAULT_SIZE
+    size: opts.size ?? saved?.size
   };
+  const sizeFor = (t) => defaults.size ?? t?.size ?? "xs";
   const open = {
     template: opts.template === void 0 && saved?.template === void 0,
     name: opts.name === void 0 && saved?.name === void 0,
@@ -3166,7 +3267,7 @@ async function settle(dir, pkg, saved, opts, orgFlag, cloud) {
   if (anyOpen && !opts.yes && !interactive()) {
     const sub = defaults.subdomain ?? subdomainFor(defaults.name);
     throw new KvboxError(
-      `kvbox deploy asks a few questions the first time, and this is not a terminal. Pass -y to take the defaults (${defaults.template ?? "template?"}, box ${defaults.name}${cloud ? `, https://${sub}.kvbox.app` : ""}, size ${defaults.size}), or answer with --template, --name${cloud ? ", --sub" : ""} and --size`
+      `kvbox deploy asks a few questions the first time, and this is not a terminal. Pass -y to take the defaults (${defaults.template ?? "template?"}, box ${defaults.name}${cloud ? `, https://${sub}.kvbox.app` : ""}, size ${sizeFor(defaults.template !== void 0 ? templateById(defaults.template) : void 0)}), or answer with --template, --name${cloud ? ", --sub" : ""} and --size`
     );
   }
   const ask = anyOpen && !opts.yes;
@@ -3177,7 +3278,7 @@ async function settle(dir, pkg, saved, opts, orgFlag, cloud) {
     const initial = detected ? TEMPLATES.indexOf(detected) : 0;
     templateId = await select("Template", TEMPLATES.map((t) => ({ value: t.id, label: t.label, hint: t === detected ? `${t.hint} \xB7 detected` : t.hint })), initial);
   }
-  if (templateId === void 0) throw new KvboxError(`could not tell what kind of app ${dir} is (no package.json of a Vite or Create React App project): say it with --template ${TEMPLATE_IDS.join("|")}`);
+  if (templateId === void 0) throw new KvboxError(`could not tell what kind of app ${dir} is (no package.json of a Vite, Create React App or Next.js project): say it with --template ${TEMPLATE_IDS.join("|")}`);
   const template = templateById(templateId);
   let name = defaults.name;
   if (open.name && ask) name = await text("Box name", { default: defaults.name, validate: (a) => BOX_NAME_RE.test(a) ? void 0 : NAME_RULE });
@@ -3192,9 +3293,9 @@ async function settle(dir, pkg, saved, opts, orgFlag, cloud) {
     });
     info(`  ${color.dim(`https://${subdomain}.kvbox.app`)}`);
   }
-  let size = defaults.size;
+  let size = sizeFor(template);
   if (open.size && ask) {
-    size = await select("Box size", SIZE_NAMES.map((s) => ({ value: s, label: s, hint: `${SIZES[s].vcpu} vCPU, ${SIZES[s].memMib / 1024} GB RAM, ${SIZES[s].diskGib} GB disk` })), SIZE_NAMES.indexOf(DEFAULT_SIZE));
+    size = await select("Box size", SIZE_NAMES.map((s) => ({ value: s, label: s, hint: `${SIZES[s].vcpu} vCPU, ${SIZES[s].memMib / 1024} GB RAM, ${SIZES[s].diskGib} GB disk` })), SIZE_NAMES.indexOf(template.size));
   }
   const org = orgFlag ?? saved?.org;
   const config = {
@@ -3215,7 +3316,7 @@ async function findOrCreate(client, config) {
   let box = slug === void 0 ? named[0] : named.find((b) => slugOf(b.owner) === slug);
   let created = false;
   if (!box) {
-    box = await spin(`booting a new box ${config.name}\u2026`, client.createMachine({ name: config.name, ...config.size !== void 0 ? { size: config.size } : {} }));
+    box = await spin(`booting a new box ${config.name}\u2026`, client.createMachine({ name: config.name, ...config.size !== void 0 ? { size: config.size } : {}, autoHibernateSec: DEPLOY_AUTO_HIBERNATE_SEC }));
     created = true;
     info(`${color.green("\u2713")} box ${color.bold(config.name)} is up: ${box.vcpu} vCPU, ${gb(box.memMib * 1024 ** 2)} RAM, ${gb(box.diskBytes)} disk`);
   }