@crvouga/mockingbird-service-postgres 3.13.0 → 3.14.0

package/dist/index.js

@@ -32501,7 +32501,7 @@ function analyzeSchema(sql, options = {}) {
   const diagnosticLimit = bounded(options.maxDiagnostics, 100, 1e3);
   const report = {
     engine: "mockingbird-postgres",
-    version: true ? "3.13.0" : "source-tree",
+    version: true ? "3.14.0" : "source-tree",
     statements: 0,
     accepted: 0,
     compatible: null,

package/dist/wire/cli.js

@@ -2649,9 +2649,7 @@ data: ${JSON.stringify(data)}
   async handle(request, path, namespace, body, admin) {
     const route = path.slice("/fleet".length), method = request.method;
     if (path === "/ui")
-      return new Response(fleetConsole(this.ctx.config.adminPrefix ?? "/__admin"), {
-        headers: { "content-type": "text/html; charset=utf-8" }
-      });
+      return new Response(fleetConsole(this.ctx.config.adminPrefix ?? "/__admin", this.ctx.dashboard?.()), { headers: { "content-type": "text/html; charset=utf-8" } });
     if (route === "" && method === "GET")
       return Response.json({
         ...this.capability(),
@@ -3621,7 +3619,8 @@ data: ${JSON.stringify(data)}
     clearInterval(this.expiryTimer);
   }
 };
-var fleetConsole = (prefix) => `<!doctype html><html lang="en"><meta charset="utf-8"><meta name="viewport" content="width=device-width"><title>Mockingbird Fleet</title><style>body{font:16px system-ui;max-width:1000px;margin:3rem auto;padding:1rem;background:#10151b;color:#e0e9f2}input,select,button{padding:.7rem;margin:.3rem;background:#233142;color:inherit;border:1px solid #60768b;border-radius:5px}pre{white-space:pre-wrap;overflow-wrap:anywhere}a{color:#9fdbff}</style><h1>Mockingbird Fleet</h1><label>Admin key <input id="key" type="password" autocomplete="off"></label><label>Namespace <input id="ns" value="default"></label><button id="refresh">Refresh</button><section id="children"></section><label>Action <select id="action"><option value="snapshots">Capture checkpoint</option><option value="reset">Reset namespace</option></select></label><button id="run">Run</button><h2>Lifecycle and operations</h2><pre id="result"></pre><script type="module">const base=${JSON.stringify(`${prefix}/fleet`)};const key=document.querySelector('#key'),ns=document.querySelector('#ns'),result=document.querySelector('#result');async function api(path,method='GET',body){const r=await fetch(base+path,{method,headers:{'content-type':'application/json','x-mockingbird-admin-key':key.value},...(body?{body:JSON.stringify(body)}:{})});const data=await r.json();result.textContent=JSON.stringify(data,null,2);return data}document.querySelector('#refresh').onclick=async()=>{const data=await api('');const host=document.querySelector('#children');host.replaceChildren();for(const [name,child]of Object.entries(data.manifest?.services??{})){const link=document.createElement('a');link.href=child.adminUrl;link.textContent=name+' ('+child.protocol+') ';host.append(link)}await api('/operations?namespace='+encodeURIComponent(ns.value))};document.querySelector('#run').onclick=()=>api('/namespaces/'+encodeURIComponent(ns.value)+'/'+document.querySelector('#action').value,'POST',{});</script></html>`;
+var escapeAttribute = (value) => value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+var fleetConsole = (prefix, dashboard) => `<!doctype html><html lang="en"><meta charset="utf-8"><meta name="viewport" content="width=device-width"><title>Mockingbird Fleet</title><style>body{font:16px system-ui;max-width:1000px;margin:3rem auto;padding:1rem;background:#10151b;color:#e0e9f2}input,select,button{padding:.7rem;margin:.3rem;background:#233142;color:inherit;border:1px solid #60768b;border-radius:5px}pre{white-space:pre-wrap;overflow-wrap:anywhere}a{color:#9fdbff}</style><h1>Mockingbird Fleet</h1>${dashboard ? `<p id="dashboard">Every emulator's admin UI and the notifications UI are on the <a href="${escapeAttribute(dashboard)}">dashboard</a>.</p>` : ""}<label>Admin key <input id="key" type="password" autocomplete="off"></label><label>Namespace <input id="ns" value="default"></label><button id="refresh">Refresh</button><section id="children"></section><label>Action <select id="action"><option value="snapshots">Capture checkpoint</option><option value="reset">Reset namespace</option></select></label><button id="run">Run</button><h2>Lifecycle and operations</h2><pre id="result"></pre><script type="module">const base=${JSON.stringify(`${prefix}/fleet`)};const key=document.querySelector('#key'),ns=document.querySelector('#ns'),result=document.querySelector('#result');async function api(path,method='GET',body){const r=await fetch(base+path,{method,headers:{'content-type':'application/json','x-mockingbird-admin-key':key.value},...(body?{body:JSON.stringify(body)}:{})});const data=await r.json();result.textContent=JSON.stringify(data,null,2);return data}document.querySelector('#refresh').onclick=async()=>{const data=await api('');const host=document.querySelector('#children');host.replaceChildren();for(const [name,child]of Object.entries(data.manifest?.services??{})){const link=document.createElement('a');link.href=child.adminUrl;link.textContent=name+' ('+child.protocol+') ';host.append(link)}await api('/operations?namespace='+encodeURIComponent(ns.value))};document.querySelector('#run').onclick=()=>api('/namespaces/'+encodeURIComponent(ns.value)+'/'+document.querySelector('#action').value,'POST',{});</script></html>`;
 
 // ../../adapters/node/dist/fleet-preflight.js
 import { readFile, realpath } from "node:fs/promises";
@@ -3685,6 +3684,28 @@ var fleet_config_schema_default = {
         }
       }
     },
+    dashboard: {
+      description: "Serve the dashboard (every emulator's admin UI and the notifications UI) next to the fleet. Honored by mockingbird-fleet serve.",
+      anyOf: [
+        {
+          type: "boolean"
+        },
+        {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            port: {
+              type: "integer",
+              minimum: 0,
+              maximum: 65535
+            },
+            host: {
+              type: "string"
+            }
+          }
+        }
+      ]
+    },
     cors: {
       type: "object",
       required: ["origins"],
@@ -3969,6 +3990,7 @@ async function preflightFleet(config, options2) {
     throw new Error("protected archive policy requires a protected repository; configure its protector before startup");
   resolveAdminPrefix(config.adminPrefix);
   normalizeBootControls(config.adminControls);
+  validateDashboard(config.dashboard);
   if (config.idBase !== void 0)
     normalizeIdBase(config.idBase, "idBase");
   const targets = /* @__PURE__ */ new Map();
@@ -4044,7 +4066,7 @@ async function preflightFleet(config, options2) {
             break;
         }
       }
-      targets.set(name2, { ...target, packageVersion: packageVersion ?? "3.13.0" });
+      targets.set(name2, { ...target, packageVersion: packageVersion ?? "3.14.0" });
     } catch (error) {
       throw new Error(`service ${name2}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
     }
@@ -4129,6 +4151,22 @@ function validateFleetPolicies(options2) {
     if (duration !== void 0 && (!Number.isSafeInteger(duration) || duration < 1))
       throw new Error("hook deadlines must be positive integer milliseconds");
 }
+function validateDashboard(value) {
+  if (value === void 0 || typeof value === "boolean")
+    return;
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    throw new Error("dashboard: expected true, false or { port, host }");
+  for (const [key, entry] of Object.entries(value)) {
+    if (key === "port") {
+      if (!Number.isInteger(entry) || entry < 0 || entry > 65535)
+        throw new Error("dashboard.port: expected an integer from 0 to 65535");
+    } else if (key === "host") {
+      if (typeof entry !== "string" || !entry)
+        throw new Error("dashboard.host: expected a host");
+    } else
+      throw new Error(`dashboard.${key}: unknown key; expected port or host`);
+  }
+}
 
 // ../../adapters/node/dist/serve.js
 import { createServer } from "node:http";
@@ -4584,6 +4622,7 @@ async function startFleet(config, options2) {
   const checkpoints = /* @__PURE__ */ new Map();
   let supervisor;
   let management;
+  let dashboard;
   let manifest;
   const privateConnections = () => Object.fromEntries([...children].map(([name2, child]) => [
     name2,
@@ -4651,6 +4690,7 @@ async function startFleet(config, options2) {
         }
       }
       const cleanup = await Promise.allSettled([
+        dashboard?.close(),
         supervisor?.close(),
         removeOwned(options2.readyFile, id),
         removeOwned(options2.connectionsFile, id)
@@ -5017,6 +5057,7 @@ async function startFleet(config, options2) {
       clock,
       transaction,
       manifest: () => manifest,
+      dashboard: () => dashboard?.url,
       publish,
       recovery,
       controlling
@@ -5080,6 +5121,10 @@ async function startFleet(config, options2) {
       }
     }
     await management.startPolicies();
+    if (options2.dashboard) {
+      dashboard = await options2.dashboard({ manifest, config });
+      manifest.dashboard = dashboard.url;
+    }
     await publish();
     if (manifest.state === "ready")
       options2.onReady?.(manifest);
@@ -5911,6 +5956,8 @@ var serveCommand = (target) => ({
         const adminKey2 = config.adminKey ?? asString(values["admin-key"]) ?? process.env.MOCKINGBIRD_ADMIN_KEY;
         if (adminKey2 !== void 0)
           config.adminKey = adminKey2;
+        if (config.dashboard)
+          console.error(`${configPath}: "dashboard" is served by mockingbird-fleet (npx @crvouga/mockingbird-fleet serve --config ${configPath}); a service's own serve command starts the fleet without it`);
         const adminControls = await resolveServeControls(values, process.env, config.adminControls);
         if (adminControls !== void 0)
           config.adminControls = adminControls;