@mybase-dev/cli 1.0.3 → 1.0.4

package/dist/mybase.js

@@ -139,7 +139,7 @@ function parseDotenv(text) {
 // package.json
 var package_default = {
   name: "@mybase-dev/cli",
-  version: "1.0.3",
+  version: "1.0.4",
   description: "The mybase CLI: projects, keys, cron, queues, cache, rate limits, analytics, docs, and agent setup for a self-hosted mybase.",
   type: "module",
   repository: {
@@ -5146,24 +5146,72 @@ async function databasePublic(args) {
   if (!off && values.POSTGRES_BIND === "127.0.0.1")
     ui.info("Postgres now listens on your network again (POSTGRES_BIND), so the router can reach it.");
   await saveEnv(dir, mergeEnv(text, updates));
-  const version = await startStack(dir, values, false);
+  if (await writeCompose(dir, interactive, true))
+    ui.success(`compose.yml updated to this CLI's (${CLI_VERSION})`);
+  const version = await startStack(dir, values);
+  const status = off ? null : await waitForDbPublic(localUrl(values));
   const port = values.POSTGRES_PORT || "5432";
   const lan = addresses().find((a) => a.label.startsWith("LAN IP"))?.value ?? "<this machine's LAN IP>";
   const host = off ? null : updates.MYBASE_DB_PUBLIC_HOST;
   if (jsonMode)
-    return print({ dir, version, host, port: Number(port), forward: host ? `${lan}:${port}` : null }, () => {});
+    return print({ dir, version, host, port: Number(port), forward: host ? `${lan}:${port}` : null, status }, () => {});
   if (!host)
     return outro("Public Postgres off. Connection strings point at your network address again. Remove the port forward on your router.");
   ui.note([
     `On your router (usually "Port forwarding" or "Virtual server"):`,
     `  TCP ${port} (external) \u2192 ${lan}:${port}`,
     ``,
-    dim2("mybase now points the DNS record at your public IP and requests the certificate (about a minute)."),
-    dim2("Check progress in the dashboard (Database \u2192 Settings) or with `mybase doctor`.")
+    dim2(status?.tls.active ? "DNS and the certificate are ready." : "Check progress in the dashboard (Database \u2192 Settings) or with `mybase doctor`.")
   ].join(`
 `), "Last step");
   outro(`New connection strings: postgres://<project>:<password>@${host}:${port}/<project>?sslmode=require`);
 }
+async function waitForDbPublic(url) {
+  const s = ui.spinner();
+  s.start("Pointing DNS at your public IP and getting a certificate (about a minute)");
+  const deadline = Date.now() + 150000;
+  let last = null;
+  for (;; ) {
+    try {
+      last = await api("/database/public", { url });
+    } catch (err) {
+      const status = err.status;
+      if (status === 401 || status === 403) {
+        s.stop("Can't check progress: this CLI isn't signed in to the server as admin");
+        return null;
+      }
+      if (status !== 404)
+        throw err;
+      last = null;
+    }
+    if (typeof last?.enabled !== "boolean") {
+      s.error("The server doesn't support public Postgres");
+      throw new CliError("the running mybase image is older than this CLI. Run `mybase server update` (or set MYBASE_IMAGE to a newer build), then this command again.");
+    }
+    if (!last.enabled) {
+      s.error("The server didn't get the settings");
+      throw new CliError("MYBASE_DB_PUBLIC isn't reaching the API. Check that compose.yml passes it (`mybase server update` refreshes compose.yml).");
+    }
+    if (last.problem) {
+      s.error(last.problem);
+      throw new CliError(last.problem);
+    }
+    if (last.dns.error || last.tls.error) {
+      s.error([last.dns.error && `DNS: ${last.dns.error}`, last.tls.error && `Certificate: ${last.tls.error}`].filter(Boolean).join("; "));
+      ui.info("mybase keeps retrying (certificate: in 1 h, 6 h, then daily). Fix the cause, then run `mybase server update` to retry now.");
+      return last;
+    }
+    if (last.tls.active) {
+      s.stop(`${last.host} \u2192 ${last.dns.ip}, certificate valid until ${last.tls.notAfter?.slice(0, 10)}`);
+      return last;
+    }
+    if (Date.now() > deadline) {
+      s.stop(`Still working (${last.dns.ip ? `DNS \u2192 ${last.dns.ip}` : "DNS pending"}, certificate pending)`);
+      return last;
+    }
+    await Bun.sleep(3000);
+  }
+}
 async function autostart(args) {
   const mode = args[0];
   if (mode !== "on" && mode !== "off")

package/package.json

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