@crvouga/mockingbird-service-postgres 1.7.0 → 2.1.0

package/dist/wire/cli.js

@@ -7,10 +7,6 @@ import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { parseArgs } from "node:util";
 
-// ../../adapters/node/dist/fleet.js
-import { randomUUID } from "node:crypto";
-import { chmod, readFile, rename, rm, writeFile } from "node:fs/promises";
-
 // ../core/dist/clock.js
 var createClock = (source = Date.now) => {
   let offsetMs = 0;
@@ -48,6 +44,13 @@ var createClock = (source = Date.now) => {
 };
 
 // ../core/dist/control.js
+var ADMIN_PREFIX = "/__admin";
+var resolveAdminPrefix = (prefix = ADMIN_PREFIX) => {
+  if (!/^\/[A-Za-z0-9_-]+(?:\/[A-Za-z0-9_-]+)*$/.test(prefix)) {
+    throw new Error("adminPrefix must be an absolute non-root path of literal segments, without a trailing slash");
+  }
+  return prefix;
+};
 var UNITS = {
   ms: 1,
   s: 1e3,
@@ -227,6 +230,10 @@ var Timeline = class {
   }
 };
 
+// ../../adapters/node/dist/fleet.js
+import { randomUUID } from "node:crypto";
+import { chmod, readFile, rename, rm, writeFile } from "node:fs/promises";
+
 // ../../adapters/node/dist/serve.js
 import { createServer } from "node:http";
 var serve = async (api, options2 = {}) => {
@@ -371,10 +378,12 @@ var removeOwned = async (path, id) => {
 };
 var httpChild = async (target, entry, options2) => {
   const runtime = await target.create(entry.options ?? {}, {
+    adminPrefix: resolveAdminPrefix(entry.adminPrefix),
     adminKey: entry.adminKey,
     seed: entry.seed,
     onLog: options2.onLog
   });
+  const adminPrefix = resolveAdminPrefix(entry.adminPrefix);
   runtime.isolateNamespaces();
   const locked = /* @__PURE__ */ new Set();
   const active = /* @__PURE__ */ new Map();
@@ -408,12 +417,12 @@ var httpChild = async (target, entry, options2) => {
   return {
     protocol: "http",
     url: server2.url,
-    healthUrl: `${server2.url}/health`,
-    adminUrl: `${server2.url}/__admin`,
-    namespaces: { header: "x-mockingbird-namespace", path: "/ns/{name}" },
+    healthUrl: `${server2.url}${adminPrefix}/health`,
+    adminUrl: `${server2.url}${adminPrefix}`,
+    namespaces: { header: "x-mockingbird-namespace", path: `${adminPrefix}/ns/{name}` },
     ready: async () => {
       try {
-        return (await fetch(`${server2.url}/health`, { signal: AbortSignal.timeout(2e3) })).ok;
+        return (await fetch(`${server2.url}${adminPrefix}/health`, { signal: AbortSignal.timeout(2e3) })).ok;
       } catch {
         return false;
       }
@@ -552,7 +561,9 @@ async function startFleet(config, options2) {
   const api = {
     async fetch(request) {
       const url = new URL(request.url);
-      if (url.pathname === "/health" && request.method === "GET") {
+      const adminPrefix = resolveAdminPrefix(config.adminPrefix);
+      const path = url.pathname.startsWith(`${adminPrefix}/`) ? url.pathname.slice(adminPrefix.length) : "";
+      if (path === "/health" && request.method === "GET") {
         const states = await Promise.all([...children].map(async ([name, child]) => {
           let protocolReady = false;
           try {
@@ -576,18 +587,18 @@ async function startFleet(config, options2) {
           services: Object.fromEntries(states)
         });
       }
-      if (!url.pathname.startsWith("/__fleet/"))
+      if (!path.startsWith("/fleet/"))
         return json(404, { error: "not found" });
       const adminKey = config.adminKey ?? process.env.MOCKINGBIRD_ADMIN_KEY;
       if (adminKey !== void 0 && request.headers.get("x-mockingbird-admin-key") !== adminKey)
         return json(401, { error: "admin key required" });
-      const route = /^\/__fleet\/namespaces\/([^/]+)\/(reset|snapshots)(?:\/([^/]+)\/restore)?$/.exec(url.pathname);
+      const route = /^\/fleet\/namespaces\/([^/]+)\/(reset|snapshots)(?:\/([^/]+)\/restore)?$/.exec(path);
       const namespace = route ? decodeURIComponent(route[1]) : url.searchParams.get("namespace") ?? request.headers.get("x-mockingbird-namespace") ?? config.namespace ?? "default";
       if (!NS.test(namespace))
         return json(400, { error: "invalid namespace" });
-      if (request.method === "GET" && url.pathname === "/__fleet/metrics")
+      if (request.method === "GET" && path === "/fleet/metrics")
         return json(200, { namespace, services: diagnostics(namespace) });
-      if (request.method === "GET" && url.pathname === "/__fleet/clock")
+      if (request.method === "GET" && path === "/fleet/clock")
         return json(200, {
           namespace,
           ...clock(namespace).state(),
@@ -611,12 +622,12 @@ async function startFleet(config, options2) {
       } catch (error) {
         return json(400, { error: error instanceof Error ? error.message : "bad selection" });
       }
-      if (url.pathname === "/__fleet/wait-until-idle") {
+      if (path === "/fleet/wait-until-idle") {
         const services = diagnostics(namespace);
         const idle = Object.values(services).every((d) => pending(d) === 0);
         return json(idle ? 200 : 409, { status: idle ? "idle" : "busy", namespace, services });
       }
-      if (url.pathname === "/__fleet/clock") {
+      if (path === "/fleet/clock") {
         const current = clock(namespace);
         let target = current.now();
         if (body.set !== void 0) {
@@ -692,6 +703,7 @@ async function startFleet(config, options2) {
     }
   };
   try {
+    const adminPrefix = resolveAdminPrefix(config.adminPrefix);
     if (!isObject(config.services) || Object.keys(config.services).length === 0)
       throw new Error("config must contain at least one service");
     for (const [name, entry] of Object.entries(config.services)) {
@@ -702,7 +714,11 @@ async function startFleet(config, options2) {
         if (entry.protocol && entry.protocol !== ("protocol" in target ? target.protocol : "http"))
           throw new Error("configured protocol does not match target");
         const adminKey = entry.adminKey ?? config.adminKey ?? process.env.MOCKINGBIRD_ADMIN_KEY;
-        const child = "start" in target ? await target.start(entry) : await httpChild(target, { ...entry, ...adminKey !== void 0 ? { adminKey } : {} }, options2);
+        const child = "start" in target ? await target.start(entry) : await httpChild(target, {
+          ...entry,
+          adminPrefix: resolveAdminPrefix(entry.adminPrefix ?? adminPrefix),
+          ...adminKey !== void 0 ? { adminKey } : {}
+        }, options2);
         children.set(name, child);
         if (!await child.ready())
           throw new Error("protocol readiness failed");
@@ -720,15 +736,15 @@ async function startFleet(config, options2) {
       pid: process.pid,
       id,
       startedAt,
-      adminBase: `${supervisor.url}/__fleet`,
-      healthUrl: `${supervisor.url}/health`,
+      adminBase: `${supervisor.url}${adminPrefix}/fleet`,
+      healthUrl: `${supervisor.url}${adminPrefix}/health`,
       services: Object.fromEntries([...children].map(([name, child]) => [
         name,
         {
           protocol: child.protocol,
           url: publicUrl(child.url),
-          healthUrl: child.healthUrl ?? `${supervisor?.url}/health`,
-          adminUrl: child.adminUrl ?? `${supervisor?.url}/__fleet`,
+          healthUrl: child.healthUrl ?? `${supervisor?.url}${adminPrefix}/health`,
+          adminUrl: child.adminUrl ?? `${supervisor?.url}${adminPrefix}/fleet`,
           namespaces: child.namespaces,
           processReady: true,
           protocolReady: true
@@ -824,6 +840,11 @@ ${commandHelp(spec, name, command2)}`);
 var COMMON_SERVE_OPTIONS = {
   port: { type: "string", value: "<port>", description: "Port to listen on" },
   host: { type: "string", value: "<host>", description: "Interface to bind", default: "127.0.0.1" },
+  "admin-prefix": {
+    type: "string",
+    value: "<path>",
+    description: "Internal API prefix (default /__admin; env MOCKINGBIRD_ADMIN_PREFIX)"
+  },
   "admin-key": {
     type: "string",
     value: "<key>",
@@ -897,7 +918,9 @@ var loadTarget = async (name, own) => {
   }
 };
 var start = async (target, values, config) => {
+  const adminPrefix = resolveAdminPrefix(config.adminPrefix);
   const runtime = await target.create(values, {
+    adminPrefix,
     adminKey: config.adminKey,
     seed: config.seed,
     onLog: formatLog(config.log)
@@ -905,11 +928,11 @@ var start = async (target, values, config) => {
   const listening = await listen(runtime, { port: config.port, host: config.host });
   target.listening?.(listening);
   console.log(`${target.name} mock listening on ${listening.url}`);
-  console.log(`${target.name} health: GET ${listening.url}/health`);
-  console.log(`${target.name} admin: ${listening.url}/__admin (${config.adminKey ? "x-mockingbird-admin-key required" : "open \u2014 pass --admin-key to lock"})`);
-  console.log(`${target.name} admin ui: ${listening.url}/__admin/ui`);
+  console.log(`${target.name} health: GET ${listening.url}${adminPrefix}/health`);
+  console.log(`${target.name} admin: ${listening.url}${adminPrefix} (${config.adminKey ? "x-mockingbird-admin-key required" : "open \u2014 pass --admin-key to lock"})`);
+  console.log(`${target.name} admin ui: ${listening.url}${adminPrefix}/ui`);
   for (const line of target.banner?.(runtime) ?? [])
-    console.log(`${target.name} ${line}`);
+    console.log(`${target.name} ${line.replaceAll("/__admin", adminPrefix)}`);
   return listening;
 };
 var untilSignal = async (servers) => new Promise((resolve2) => {
@@ -936,6 +959,7 @@ var serveCommand = (target) => ({
     if (configPath !== void 0) {
       try {
         const config = JSON.parse(await readFile2(configPath, "utf8"));
+        config.adminPrefix = resolveAdminPrefix(config.adminPrefix ?? asString(values["admin-prefix"]) ?? process.env.MOCKINGBIRD_ADMIN_PREFIX);
         const adminKey2 = config.adminKey ?? asString(values["admin-key"]) ?? process.env.MOCKINGBIRD_ADMIN_KEY;
         if (adminKey2 !== void 0)
           config.adminKey = adminKey2;
@@ -968,6 +992,7 @@ var serveCommand = (target) => ({
     let listening;
     try {
       listening = await start(target, values, {
+        adminPrefix: resolveAdminPrefix(asString(values["admin-prefix"]) ?? process.env.MOCKINGBIRD_ADMIN_PREFIX),
         port: port === void 0 ? target.defaultPort : Number.parseInt(port, 10),
         host: asString(values.host) ?? "127.0.0.1",
         ...adminKey !== void 0 ? { adminKey } : {},