@mybase-dev/cli 1.0.1 → 1.0.2

package/dist/mybase.js

@@ -139,7 +139,7 @@ function parseDotenv(text) {
 // package.json
 var package_default = {
   name: "@mybase-dev/cli",
-  version: "1.0.1",
+  version: "1.0.2",
   description: "The mybase CLI: projects, keys, cron, queues, cache, rate limits, analytics, docs, and agent setup for a self-hosted mybase.",
   type: "module",
   repository: {
@@ -3875,6 +3875,8 @@ configs:
       metadata_dir = "/var/lib/garage/meta"
       data_dir = "/var/lib/garage/data"
       db_engine = "lmdb"
+      # Garage maps 1 TiB by default; Raspberry Pi kernels give processes only 512 GiB (39-bit VA).
+      lmdb_map_size = "64G"
       replication_factor = 1
       rpc_bind_addr = "[::]:3901"
       rpc_public_addr = "127.0.0.1:3901"
@@ -4604,6 +4606,22 @@ async function writeCompose(dir, interactive, replace) {
   await Bun.write(file, compose_default);
   return true;
 }
+function pullHint(output) {
+  const failed = /Image (\S+) Error/.exec(output)?.[1];
+  if (/unauthorized|denied|requested access to the resource/i.test(output)) {
+    const image = failed ?? "an image";
+    return failed?.startsWith("ghcr.io/") ? `
+
+${image} is private on GitHub's registry (or doesn't exist). Its owner has to make the package public (GitHub \u2192 Packages \u2192 Package settings \u2192 Change visibility), or sign in first: docker login ghcr.io` : `
+
+The registry refused ${image}: check the image name (MYBASE_IMAGE / MYBASE_POSTGRES_IMAGE in .env), or docker login.`;
+  }
+  if (/timeout|no such host|network|TLS handshake/i.test(output))
+    return `
+
+This machine couldn't reach the registry. Check its internet connection and DNS, then run setup again.`;
+  return "";
+}
 async function missingImages(dir) {
   const images = await compose(dir, ["config", "--images"]);
   const missing = [];
@@ -4615,6 +4633,14 @@ async function missingImages(dir) {
   return missing;
 }
 var imageExists = (image) => Bun.spawnSync(["docker", "image", "inspect", image], { stdout: "ignore", stderr: "ignore" }).exitCode === 0;
+async function brokenServices(dir) {
+  const ps = await compose(dir, ["ps", "-a", "--format", "json"]);
+  if (!ps.ok || !ps.stdout)
+    return [];
+  const rows = ps.stdout.startsWith("[") ? JSON.parse(ps.stdout) : ps.stdout.split(`
+`).filter(Boolean).map((l) => JSON.parse(l));
+  return rows.filter((r) => r.State !== "running" || r.Health === "unhealthy").map((r) => r.Service);
+}
 async function startStack(dir, env, pull = true) {
   const s = ui.spinner();
   if (pull) {
@@ -4625,7 +4651,7 @@ async function startStack(dir, env, pull = true) {
       if (missing.length) {
         s.error("Couldn't download the images");
         throw new CliError(`couldn't download ${missing.join(", ")}:
-${tail(pulled.stderr || pulled.stdout)}`);
+${tail(pulled.stderr || pulled.stdout)}${pullHint(pulled.stderr || pulled.stdout)}`);
       }
       s.stop("Using the images already on this machine (couldn't download newer ones)");
     } else
@@ -4642,11 +4668,21 @@ ${tail(up.stderr || up.stdout)}`);
   const version = await waitHealthy(localUrl(env));
   if (!version) {
     s.error("mybase didn't come up");
-    const logs = await compose(dir, ["logs", "--tail", "30", "mybase"]);
-    throw new CliError(`mybase didn't answer at ${localUrl(env)}/health within 3 minutes. Its last log lines:
-${logs.stdout || logs.stderr}
+    const broken = await brokenServices(dir);
+    const sections = [];
+    for (const service of broken.length ? broken : ["mybase"]) {
+      const logs = await compose(dir, ["logs", "--no-log-prefix", "--tail", "25", service]);
+      sections.push(`\u2500\u2500 ${service} \u2500\u2500
+${logs.stdout || logs.stderr || "(no output)"}`);
+    }
+    const which = broken.length ? `Not running: ${broken.join(", ")}.` : "Every container is up, but the API isn't answering.";
+    throw new CliError(`mybase didn't answer at ${localUrl(env)}/health within 3 minutes. ${which}
+
+${sections.join(`
+
+`)}
 
-Fix the problem, then run \`mybase server setup --dir ${dir}\` again (keys are kept).`);
+Fix the problem, then run \`mybase server setup --dir ${dir}\` again (keys are kept). \`mybase server status\` shows every container.`);
   }
   s.stop(`mybase ${version} is running`);
   return version;
@@ -4929,7 +4965,7 @@ async function update(args) {
   const version = await startStack(dir, values);
   const minor = (v) => v.split(".").slice(0, 2).join(".");
   if (minor(version) !== minor(CLI_VERSION)) {
-    ui.warn(`The server is ${version}, this CLI ${CLI_VERSION}. Update the CLI: curl -fsSL https://raw.githubusercontent.com/LandonHarter/mybase/master/scripts/install.sh | sh`);
+    ui.warn(`The server is ${version}, this CLI ${CLI_VERSION}. Update the CLI: mybase update --cli`);
   }
   if (jsonMode)
     return print({ dir, version, composeUpdated: replaced }, () => {});
@@ -5005,6 +5041,125 @@ async function server(command, args) {
   return true;
 }
 
+// src/update.ts
+import { chmod as chmod3, rename, rm } from "fs/promises";
+import { join as join5 } from "path";
+var updateUsage = `  update [--version <v>] [--cli] [--yes]
+                                 Update this CLI to the latest release (or <v>), then the server on this
+                                 machine, if there is one. --cli: only the CLI`;
+var REPO = "landonharter/mybase";
+var isCompiled = () => Bun.main.startsWith("/$bunfs/") || Bun.main.includes("~BUN");
+function assetName(platform = process.platform, arch = process.arch) {
+  const os = platform === "win32" ? "windows" : platform;
+  if (!["linux", "darwin", "windows"].includes(os))
+    throw new CliError(`no mybase binary for ${platform}`);
+  const cpu = arch === "x64" ? "x64" : arch === "arm64" ? "arm64" : null;
+  if (!cpu)
+    throw new CliError(`no mybase binary for ${arch} CPUs`);
+  return `mybase-${os}-${cpu}${os === "windows" ? ".exe" : ""}`;
+}
+async function latestVersion() {
+  const res = await fetch(`https://github.com/${REPO}/releases/latest`, { redirect: "manual" }).catch(() => {
+    throw new CliError("can't reach github.com to check for updates");
+  });
+  const tag = /\/tag\/v?([^/?#]+)$/.exec(res.headers.get("location") ?? "")?.[1];
+  if (!tag)
+    throw new CliError(`couldn't find the latest release (GitHub answered ${res.status})`);
+  return tag;
+}
+function newer(a, b) {
+  const pa = a.split(/[.-]/).map((n) => Number.parseInt(n, 10) || 0);
+  const pb = b.split(/[.-]/).map((n) => Number.parseInt(n, 10) || 0);
+  for (let i = 0;i < 3; i++)
+    if ((pa[i] ?? 0) !== (pb[i] ?? 0))
+      return (pa[i] ?? 0) > (pb[i] ?? 0);
+  return false;
+}
+async function replaceBinary(version) {
+  const target = process.execPath;
+  const url = `https://github.com/${REPO}/releases/download/v${version}/${assetName()}`;
+  const res = await fetch(url).catch(() => {
+    throw new CliError(`can't download ${url}`);
+  });
+  if (!res.ok)
+    throw new CliError(`can't download ${url} (${res.status})`);
+  const temp = `${target}.new`;
+  try {
+    const writer = Bun.file(temp).writer();
+    for await (const chunk of res.body)
+      writer.write(chunk);
+    await writer.end();
+    await chmod3(temp, 493);
+  } catch (err) {
+    const code = err.code;
+    if (code === "EACCES" || code === "EPERM")
+      throw new CliError(`can't write next to ${target}. Run it with sudo, or reinstall: curl -fsSL https://raw.githubusercontent.com/${REPO}/master/scripts/install.sh | sh`);
+    throw err;
+  }
+  const check = Bun.spawnSync([temp, "help"], { stdout: "ignore", stderr: "ignore" });
+  if (check.exitCode !== 0) {
+    await rm(temp, { force: true });
+    throw new CliError(`the downloaded binary doesn't run on this machine; kept ${CLI_VERSION}`);
+  }
+  if (process.platform === "win32") {
+    await rm(`${target}.old`, { force: true });
+    await rename(target, `${target}.old`);
+  }
+  await rename(temp, target);
+}
+async function updateServer(bin, dir) {
+  const args = [...bin, "server", "update", "--dir", dir, ...jsonMode ? ["--json", "--yes"] : []];
+  const proc = Bun.spawn(args, { stdio: [jsonMode ? "ignore" : "inherit", jsonMode ? "ignore" : "inherit", "inherit"] });
+  return await proc.exited === 0;
+}
+async function update2(args) {
+  const versionIndex = args.indexOf("--version");
+  const wanted = versionIndex === -1 ? null : args[versionIndex + 1]?.replace(/^v/, "");
+  if (versionIndex !== -1 && !wanted)
+    throw new CliError("--version needs a value", 2);
+  const yes = args.includes("--yes");
+  const result = {
+    cli: { from: CLI_VERSION, to: CLI_VERSION, updated: false },
+    server: null
+  };
+  if (!isCompiled()) {
+    if (!jsonMode)
+      console.log("This CLI was installed with npm/bun. Update it with: bun add -g @mybase-dev/cli@latest (or npm i -g)");
+  } else {
+    const target = wanted ?? await latestVersion();
+    result.cli.to = target;
+    if (target === CLI_VERSION || !wanted && !newer(target, CLI_VERSION)) {
+      if (!jsonMode)
+        console.log(`CLI ${CLI_VERSION} is up to date.`);
+    } else {
+      if (!jsonMode)
+        console.log(`Updating the CLI: ${CLI_VERSION} \u2192 ${target}`);
+      await replaceBinary(target);
+      result.cli.updated = true;
+      if (!jsonMode)
+        console.log(`CLI ${target} installed at ${process.execPath}`);
+    }
+  }
+  const dir = (await loadConfig()).server;
+  const installed = dir && await Bun.file(join5(dir, "compose.yml")).exists();
+  if (installed && !args.includes("--cli")) {
+    let go = yes || jsonMode;
+    if (!go && process.stdin.isTTY) {
+      const answer = prompt(`Update the server in ${dir} too? (new images, restart) [Y/n]`);
+      go = answer === null || /^(y|yes|)$/i.test(answer.trim());
+    }
+    if (go) {
+      const bin = isCompiled() ? [process.execPath] : [process.execPath, Bun.main];
+      const ok = await updateServer(bin, dir);
+      result.server = { dir, updated: ok };
+      if (!ok)
+        throw new CliError(`the server update failed${result.cli.updated ? ` (the CLI is ${result.cli.to} now)` : ""}. Run \`mybase server update\` to see why.`);
+    } else if (!jsonMode)
+      console.log("Server left as it is. Update it later with: mybase server update");
+  }
+  print(result, () => {});
+}
+
 // src/users.ts
 var usersUsage = `  users enable <project>         Turn on users: an auth schema for Better Auth, plus setup steps
   users init <project> [--env <secrets env>]  Print an auth.ts for Better Auth; --env stores a new BETTER_AUTH_SECRET there
@@ -5145,6 +5300,7 @@ var projectUsage = `  project create <name>          Create a new project (datab
 var USAGE = {
   auth: authUsage,
   server: serverUsage,
+  update: updateUsage,
   token: tokenUsage,
   project: projectUsage,
   context: contextUsage,
@@ -5198,6 +5354,8 @@ async function main(args) {
     return;
   if (command === "run")
     return run(args.slice(1));
+  if (command === "update")
+    return update2(args.slice(1));
   if (command === "doctor")
     return doctor(args.slice(1));
   if (command === "audit")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mybase-dev/cli",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The mybase CLI: projects, keys, cron, queues, cache, rate limits, analytics, docs, and agent setup for a self-hosted mybase.",
   "type": "module",
   "repository": {