@mybase-dev/cli 1.0.5 → 1.0.6

package/dist/mybase.js

@@ -139,7 +139,7 @@ function parseDotenv(text) {
 // package.json
 var package_default = {
   name: "@mybase-dev/cli",
-  version: "1.0.5",
+  version: "1.0.6",
   description: "The mybase CLI: projects, keys, cron, queues, cache, rate limits, analytics, docs, and agent setup for a self-hosted mybase.",
   type: "module",
   repository: {
@@ -3759,6 +3759,7 @@ var compose_default = `# Runs mybase: the control plane (API + dashboard), the s
 #        MYBASE_S3_PUBLIC_URL=https://s3.<domain>
 #        MYBASE_TRUST_PROXY=cloudflare
 #      Optionally POSTGRES_BIND=127.0.0.1, GARAGE_S3_BIND=127.0.0.1, and VALKEY_BIND=127.0.0.1 to stop exposing those ports on the LAN.
+#      Optionally CLOUDFLARED_REGION=us if the tunnel lands on far-away data centers (see \`mybase server status\`).
 #   5. docker compose up -d
 # Apps on serverless hosts reach Postgres at wss://mybase.<domain>/db with @neondatabase/serverless,
 # or, with a router port forward, at a normal postgres:// URL (public Postgres, below).
@@ -3922,6 +3923,11 @@ services:
     command: tunnel --no-autoupdate run
     environment:
       TUNNEL_TOKEN: \${CLOUDFLARE_TUNNEL_TOKEN:-}
+      # Which Cloudflare data centers the tunnel connects to: empty = nearest by anycast, \`us\` = US only
+      # (if \`mybase server status\` shows far-away colos, every request takes the detour).
+      TUNNEL_REGION: \${CLOUDFLARED_REGION:-}
+      # auto (QUIC, falls back to HTTP/2), quic, or http2 (if your network blocks or throttles UDP).
+      TUNNEL_TRANSPORT_PROTOCOL: \${CLOUDFLARED_PROTOCOL:-auto}
     depends_on:
       - mybase
 
@@ -4253,6 +4259,25 @@ async function enableDockerOnBoot() {
     return false;
   }
 }
+function tunnelConnections(logs) {
+  const conns = new Map;
+  for (const line of logs.split(`
+`)) {
+    if (/Starting tunnel/.test(line))
+      conns.clear();
+    const index = Number(/connIndex=(\d+)/.exec(line)?.[1]);
+    if (Number.isNaN(index))
+      continue;
+    if (/Registered tunnel connection/.test(line)) {
+      const location = /location=(\S+)/.exec(line)?.[1];
+      if (location)
+        conns.set(index, { index, location, protocol: /protocol=(\S+)/.exec(line)?.[1] ?? null });
+    } else if (/Unregistered tunnel connection|Connection terminated|Retrying connection|Serve tunnel error/.test(line)) {
+      conns.delete(index);
+    }
+  }
+  return [...conns.values()].sort((a, b) => a.index - b.index);
+}
 
 // src/server-setup.ts
 import { chmod as chmod2, mkdir as mkdir3 } from "fs/promises";
@@ -5044,6 +5069,7 @@ var serverUsage = `  server setup [--dir <dir>]     Install mybase on this machi
     [--admin-user <u> --admin-password-stdin]   Without a terminal: defaults plus these flags
   server status [--dir <dir>]    Containers, health, and whether mybase starts on boot
   server update [--dir <dir>]    Download new images and restart (also refreshes compose.yml)
+  server restart [--dir <dir>]   Restart every container (API, Postgres, storage, cache, search, tunnel)
   server tunnel [--dir <dir>]    Add or replace the Cloudflare Tunnel [--tunnel-token <t> --domain <d>] | --off
   server database-public [--dir <dir>]   A normal postgres:// URL from anywhere: router port forward +
                                  Let's Encrypt TLS + DNS kept on your IP (Cloudflare)
@@ -5076,6 +5102,10 @@ async function status(args) {
   const health = await fetch(`${url}/health`, { signal: AbortSignal.timeout(3000) }).then(async (r) => r.ok ? (await r.json()).version ?? "unknown" : null).catch(() => null);
   const autostart = values.MYBASE_RESTART !== "no";
   const docker = dockerOnBoot();
+  const tunnelOn = !!values.CLOUDFLARE_TUNNEL_TOKEN && containers.some((c) => c.Service === "cloudflared");
+  const tunnelLogs = tunnelOn ? await compose(dir, ["logs", "--no-log-prefix", "--tail", "500", "cloudflared"]) : null;
+  const tunnel = tunnelLogs?.ok ? tunnelConnections(`${tunnelLogs.stdout}
+${tunnelLogs.stderr}`) : null;
   const data = {
     dir,
     url,
@@ -5084,6 +5114,7 @@ async function status(args) {
     autostart: autostart && docker !== "disabled",
     dockerOnBoot: docker,
     publicUrl: values.CLOUDFLARE_TUNNEL_TOKEN ? values.MYBASE_PUBLIC_URL ?? null : null,
+    tunnel,
     containers: containers.map((c) => ({ service: c.Service, state: c.State, health: c.Health || null }))
   };
   print(data, () => {
@@ -5091,6 +5122,10 @@ async function status(args) {
     console.log(`  ${health ? green("\u25CF") : red("\u25CF")} ${url}  ${health ? `version ${health}` : "not answering"}`);
     if (data.publicUrl)
       console.log(`  ${dim2("public")}  ${data.publicUrl}`);
+    if (tunnel) {
+      const where = tunnel.map((c) => `${c.location}${c.protocol ? ` ${c.protocol}` : ""}`).join(", ");
+      console.log(`  ${tunnel.length > 0 ? green("\u25CF") : red("\u25CF")} ${dim2("tunnel")}  ${tunnel.length > 0 ? `${tunnel.length} connection(s): ${where}` : "not connected to Cloudflare (public URL answers 530)"}`);
+    }
     console.log(`  ${dim2("starts on boot")}  ${!autostart ? "no (mybase server autostart on)" : docker === "disabled" ? "no: Docker doesn't start at boot (sudo systemctl enable docker)" : "yes"}`);
     console.log("");
     if (containers.length === 0)
@@ -5121,6 +5156,31 @@ async function update(args) {
     return print({ dir, version, composeUpdated: replaced }, () => {});
   outro(`mybase ${version} is running at ${localUrl(values)}`);
 }
+async function restart(args) {
+  const dir = await serverDir(args);
+  const { values } = await loadEnv(dir);
+  if (!await stackExists(dir))
+    throw new CliError("no containers to restart. Start them: mybase server update", 4);
+  const s = ui.spinner();
+  s.start("Restarting containers");
+  const res = await compose(dir, ["restart"]);
+  if (!res.ok) {
+    s.stop("Restart failed");
+    throw new CliError(`docker compose restart failed:
+${res.stderr}`);
+  }
+  s.message("Waiting for mybase to answer");
+  const version = await waitHealthy(localUrl(values), 120000);
+  s.stop(version ? "Restarted" : "Containers restarted");
+  if (!version) {
+    ui.warn("mybase didn't answer yet; check `mybase server status`.");
+    process.exitCode = 1;
+  }
+  print({ dir, healthy: version !== null, version }, () => {
+    if (version)
+      console.log(`mybase ${version} is running at ${localUrl(values)}`);
+  });
+}
 async function tunnel(args) {
   const dir = await serverDir(args);
   const { text, values } = await loadEnv(dir);
@@ -5277,6 +5337,8 @@ async function server(command, args) {
     await status(args);
   else if (command === "update")
     await update(args);
+  else if (command === "restart")
+    await restart(args);
   else if (command === "tunnel")
     await tunnel(args);
   else if (command === "database-public")

package/package.json

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