axusage 3.8.1 → 3.8.3

package/dist/commands/serve-command.js

@@ -1,122 +1,61 @@
 /**
  * Serve command handler — starts an HTTP server exposing usage data.
  */
+import closeWithGrace from "close-with-grace";
 import { getServeConfig } from "../config/serve-config.js";
 import { selectServicesToQuery } from "./fetch-service-usage.js";
 import { fetchServicesInParallel } from "./usage-command.js";
+import { createDeferredServeLogger } from "../server/serve-logger.js";
 import { createServer } from "../server/server.js";
-import { createHealthRouter, createMetricsRouter, createUsageRouter, } from "../server/routes.js";
-import { getAvailableServices } from "../services/service-adapter-registry.js";
-/**
- * Creates an on-demand usage cache. Data is fetched via `doFetch` when a
- * caller requests fresh state and the cached snapshot is older than `intervalMs`.
- * Concurrent callers during a refresh all receive the same in-flight promise.
- * When all services fail, the cache retries after a short backoff (≤5s) rather
- * than waiting the full interval.
- */
-export function createUsageCache(doFetch, intervalMs) {
-    let state;
-    let refreshPromise;
-    async function doRefresh() {
-        const results = await doFetch();
-        const usage = [];
-        const errors = [];
-        for (const { service, result } of results) {
-            if (result.ok) {
-                usage.push(result.value);
-            }
-            else {
-                const statusSuffix = result.error.status === undefined
-                    ? ""
-                    : ` (HTTP ${String(result.error.status)})`;
-                errors.push(`${service}: fetch failed${statusSuffix}`);
-                console.error(`Warning: Failed to fetch ${service}: ${result.error.message}`);
-            }
-        }
-        state = { usage, refreshedAt: new Date(), errors };
-    }
-    function ensureFresh() {
-        const age = state === undefined ? Infinity : Date.now() - state.refreshedAt.getTime();
-        // If the last refresh produced no data (all services failed), retry on a
-        // short backoff so the server recovers promptly after transient failures
-        // rather than waiting the full cache interval.
-        const hasData = state !== undefined && state.usage.length > 0;
-        const maxAge = hasData ? intervalMs : Math.min(intervalMs, 5000);
-        if (age < maxAge)
-            return Promise.resolve();
-        refreshPromise ??= doRefresh().finally(() => {
-            refreshPromise = undefined;
-        });
-        return refreshPromise;
-    }
-    return {
-        getState: () => state,
-        getFreshState: async () => {
-            await ensureFresh();
-            return state;
-        },
-        getStateStaleWhileRevalidate: async () => {
-            if (state === undefined) {
-                // No snapshot yet — block until we have something to serve.
-                await ensureFresh();
-            }
-            else {
-                // Serve the current snapshot immediately; kick off a background
-                // refresh if stale. Errors are logged; callers are not affected.
-                void ensureFresh().catch((error) => {
-                    console.error("Background metrics refresh failed:", error);
-                });
-            }
-            return state;
-        },
-    };
-}
+import { createHealthPlugin, createMetricsPlugin, createUsagePlugin, } from "../server/routes.js";
+import { createUsageCache } from "../server/usage-cache.js";
 export async function serveCommand(options) {
     const config = getServeConfig(options);
-    const availableServices = getAvailableServices();
-    if (config.service !== undefined &&
-        config.service.toLowerCase() !== "all" &&
-        !availableServices.includes(config.service.toLowerCase())) {
-        console.error(`Unknown service "${config.service}". Supported: ${availableServices.join(", ")}.`);
-        if (process.exitCode === undefined)
-            process.exitCode = 1;
-        return;
-    }
     const servicesToQuery = selectServicesToQuery(config.service);
-    const cache = createUsageCache(() => fetchServicesInParallel(servicesToQuery), config.intervalMs);
+    const serverReference = { current: undefined };
+    const logger = createDeferredServeLogger(() => serverReference.current?.app.log);
+    let shuttingDown = false;
+    const cache = createUsageCache(() => fetchServicesInParallel(servicesToQuery), config.intervalMs, logger);
     const server = createServer(config, [
-        createHealthRouter(servicesToQuery, cache.getState),
-        createMetricsRouter(cache.getStateStaleWhileRevalidate),
-        createUsageRouter(cache.getFreshState),
+        createHealthPlugin(servicesToQuery, cache.getState, () => shuttingDown),
+        createMetricsPlugin(cache.getStateStaleWhileRevalidate),
+        createUsagePlugin(cache.getFreshState),
     ]);
-    const shutdown = () => {
-        console.error("\nShutting down...");
-        const forceExit = setTimeout(() => {
-            console.error("Shutdown timed out, forcing exit");
-            // eslint-disable-next-line unicorn/no-process-exit -- CLI graceful shutdown
-            process.exit(1);
-        }, 5000);
-        forceExit.unref();
-        server
-            .stop()
-            .finally(() => {
-            clearTimeout(forceExit);
-        })
-            .then(() => {
-            // eslint-disable-next-line unicorn/no-process-exit -- CLI graceful shutdown
-            process.exit(0);
-        }, (error) => {
-            console.error("Error during shutdown:", error);
-            // eslint-disable-next-line unicorn/no-process-exit -- CLI graceful shutdown
-            process.exit(1);
+    serverReference.current = server;
+    // Register shutdown handler before the initial fetch so signals arriving
+    // at any point during startup are caught instead of using Node's default
+    // (immediate termination).
+    closeWithGrace({
+        delay: 5000,
+        logger: false,
+        onTimeout(delay) {
+            server.app.log.error({ delay }, "Graceful shutdown timed out");
+        },
+    }, async ({ signal, err, manual }) => {
+        shuttingDown = true;
+        cache.shutdown();
+        if (err) {
+            server.app.log.error({ err, signal, manual }, "Shutting down axusage server due to fatal error");
+        }
+        else {
+            server.app.log.info({ signal, manual }, "Shutting down axusage server");
+        }
+        await server.stop();
+        await cache.waitForPending().catch((error) => {
+            server.app.log.warn({ err: error }, "In-flight refresh failed during shutdown");
         });
-    };
-    process.once("SIGTERM", shutdown);
-    process.once("SIGINT", shutdown);
+    });
     // Pre-populate the cache before accepting connections so /health returns a
     // meaningful status immediately (important for container readiness checks).
-    console.error(`Fetching initial data for: ${servicesToQuery.join(", ")}`);
+    server.app.log.info({ services: servicesToQuery }, "Fetching initial data for serve mode");
     await cache.getFreshState();
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- mutated by closeWithGrace signal handler above
+    if (shuttingDown)
+        return;
     await server.start();
-    console.error(`Serving usage for: ${servicesToQuery.join(", ")} (max age: ${String(config.intervalMs / 1000)}s)`);
+    server.app.log.info({
+        services: servicesToQuery,
+        maxAgeSeconds: config.intervalMs / 1000,
+    }, "Serving usage");
 }
+//# sourceMappingURL=serve-command.js.map

package/dist/commands/serve-command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serve-command.js","sourceRoot":"","sources":["../../src/commands/serve-command.ts"],"names":[],"mappings":"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"}

package/dist/commands/usage-command.d.ts

@@ -1,11 +1,13 @@
 import type { ServiceResult } from "../types/domain.js";
+import type { SupportedService } from "../services/supported-service.js";
 import type { UsageCommandOptions } from "./fetch-service-usage.js";
 /**
  * Fetches usage for all requested services in parallel.
  * Each service type may produce multiple results (multi-instance support).
  */
-export declare function fetchServicesInParallel(servicesToQuery: string[]): Promise<ServiceResult[]>;
+export declare function fetchServicesInParallel(servicesToQuery: SupportedService[]): Promise<ServiceResult[]>;
 /**
  * Executes the usage command
  */
 export declare function usageCommand(options: UsageCommandOptions): Promise<void>;
+//# sourceMappingURL=usage-command.d.ts.map

package/dist/commands/usage-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-command.d.ts","sourceRoot":"","sources":["../../src/commands/usage-command.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAEV,aAAa,EAEd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAQpE;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,gBAAgB,EAAE,GAClC,OAAO,CAAC,aAAa,EAAE,CAAC,CAO1B;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAsHf"}

package/dist/commands/usage-command.js

@@ -109,8 +109,13 @@ export async function usageCommand(options) {
             }
             break;
         }
+        default: {
+            const _exhaustive = format;
+            throw new Error(`Unhandled format: ${String(_exhaustive)}`);
+        }
     }
     if (hasPartialFailures) {
         process.exitCode = 1;
     }
 }
+//# sourceMappingURL=usage-command.js.map

package/dist/commands/usage-command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-command.js","sourceRoot":"","sources":["../../src/commands/usage-command.ts"],"names":[],"mappings":"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"}

package/dist/config/credential-sources.d.ts

@@ -41,3 +41,4 @@ declare function getCredentialSourcesPath(): string;
 declare function getServiceInstanceConfigs(service: SupportedService): ResolvedInstanceConfig[];
 export { getServiceInstanceConfigs, getCredentialSourcesPath };
 export type { ResolvedInstanceConfig };
+//# sourceMappingURL=credential-sources.d.ts.map

package/dist/config/credential-sources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"credential-sources.d.ts","sourceRoot":"","sources":["../../src/config/credential-sources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,6BAA6B;AAC7B,QAAA,MAAM,oBAAoB;;;;EAAqC,CAAC;AAChE,KAAK,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAsBjE,iDAAiD;AACjD,UAAU,sBAAsB;IAC9B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AA6FD;;;;;;GAMG;AACH,iBAAS,wBAAwB,IAAI,MAAM,CAG1C;AAED;;;;;;GAMG;AACH,iBAAS,yBAAyB,CAChC,OAAO,EAAE,gBAAgB,GACxB,sBAAsB,EAAE,CA+B1B;AAED,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,CAAC;AAC/D,YAAY,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/config/credential-sources.js

@@ -8,6 +8,7 @@
  *   credential, requires vault (no local fallback) to prevent returning the same
  *   local token for multiple instances. Vault must be configured for named credentials.
  */
+/* eslint-disable @typescript-eslint/no-unnecessary-type-arguments -- Conf<SourcesStore> is required: removing the type parameter causes Conf to infer T from the schema option as { sources: unknown }, which is incompatible with our store shape. */
 import Conf from "conf";
 import envPaths from "env-paths";
 import path from "node:path";
@@ -149,3 +150,4 @@ function getServiceInstanceConfigs(service) {
     ];
 }
 export { getServiceInstanceConfigs, getCredentialSourcesPath };
+//# sourceMappingURL=credential-sources.js.map

package/dist/config/credential-sources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"credential-sources.js","sourceRoot":"","sources":["../../src/config/credential-sources.ts"],"names":[],"mappings":"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"}

package/dist/config/serve-config.d.ts

@@ -3,18 +3,34 @@
  *
  * Priority: CLI flags > environment variables > defaults.
  */
+import { z } from "zod";
+export declare const SERVE_LOG_LEVELS: readonly ["trace", "debug", "info", "warn", "error", "fatal", "silent"];
+declare const ServeLogLevelSchema: z.ZodEnum<{
+    error: "error";
+    trace: "trace";
+    debug: "debug";
+    info: "info";
+    warn: "warn";
+    fatal: "fatal";
+    silent: "silent";
+}>;
+export type ServeLogLevel = z.infer<typeof ServeLogLevelSchema>;
 export type ServeConfig = {
     readonly port: number;
     readonly host: string;
     readonly intervalMs: number;
     readonly service: string | undefined;
+    readonly logLevel: ServeLogLevel;
+    readonly trustProxy: boolean;
 };
 type ServeConfigOverrides = {
     readonly port?: string;
     readonly host?: string;
     readonly interval?: string;
     readonly service?: string;
+    readonly logLevel?: string;
 };
 /** Parse serve config from environment and CLI overrides */
 export declare function getServeConfig(overrides?: ServeConfigOverrides): ServeConfig;
 export {};
+//# sourceMappingURL=serve-config.d.ts.map

package/dist/config/serve-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serve-config.d.ts","sourceRoot":"","sources":["../../src/config/serve-config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gBAAgB,yEAQnB,CAAC;AAEX,QAAA,MAAM,mBAAmB;;;;;;;;EAA2B,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAcF,4DAA4D;AAC5D,wBAAgB,cAAc,CAC5B,SAAS,GAAE,oBAAyB,GACnC,WAAW,CAsCb"}

package/dist/config/serve-config.js

@@ -3,38 +3,78 @@
  *
  * Priority: CLI flags > environment variables > defaults.
  */
+import { z } from "zod";
+export const SERVE_LOG_LEVELS = [
+    "trace",
+    "debug",
+    "info",
+    "warn",
+    "error",
+    "fatal",
+    "silent",
+];
+const ServeLogLevelSchema = z.enum(SERVE_LOG_LEVELS);
 const DEFAULT_PORT = 3848;
 const DEFAULT_HOST = "127.0.0.1";
 const DEFAULT_INTERVAL_SECONDS = 300; // 5 minutes
+const DEFAULT_LOG_LEVEL = "info";
+class ServeConfigError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "ServeConfigError";
+    }
+}
 /** Parse serve config from environment and CLI overrides */
 export function getServeConfig(overrides = {}) {
-    const port = parsePort(overrides.port ?? process.env.AXUSAGE_PORT);
-    const host = overrides.host || process.env.AXUSAGE_HOST || DEFAULT_HOST;
-    const intervalSeconds = parsePositiveInt(overrides.interval ?? process.env.AXUSAGE_INTERVAL, DEFAULT_INTERVAL_SECONDS, "AXUSAGE_INTERVAL");
-    const service = (overrides.service ?? process.env.AXUSAGE_SERVICE) || undefined;
+    const port = parseIntegerOption(normalizeOptionalValue(overrides.port ?? process.env.AXUSAGE_PORT), {
+        label: "AXUSAGE_PORT",
+        defaultValue: DEFAULT_PORT,
+        min: 1,
+        max: 65_535,
+    });
+    const host = normalizeOptionalValue(overrides.host ?? process.env.AXUSAGE_HOST) ??
+        DEFAULT_HOST;
+    const intervalSeconds = parseIntegerOption(normalizeOptionalValue(overrides.interval ?? process.env.AXUSAGE_INTERVAL), {
+        label: "AXUSAGE_INTERVAL",
+        defaultValue: DEFAULT_INTERVAL_SECONDS,
+        min: 1,
+    });
+    const service = normalizeOptionalValue(overrides.service ?? process.env.AXUSAGE_SERVICE)?.toLowerCase();
+    const logLevel = parseLogLevel(normalizeOptionalValue(overrides.logLevel ?? process.env.AXUSAGE_LOG_LEVEL));
+    const trustProxy = normalizeOptionalValue(process.env.AXUSAGE_TRUST_PROXY) === "true";
     return {
         port,
         host,
         intervalMs: intervalSeconds * 1000,
         service,
+        logLevel,
+        trustProxy,
     };
 }
-function parsePort(value) {
-    if (!value)
-        return DEFAULT_PORT;
-    const port = Number(value);
-    if (!Number.isInteger(port) || port < 1 || port > 65_535) {
-        throw new Error(`Invalid port: ${value}`);
-    }
-    return port;
+function normalizeOptionalValue(value) {
+    const normalized = value?.trim();
+    return normalized || undefined;
 }
-function parsePositiveInt(value, defaultValue, name) {
-    if (!value)
-        return defaultValue;
+function parseIntegerOption(value, options) {
+    if (value === undefined)
+        return options.defaultValue;
     const parsed = Number(value);
-    if (!Number.isInteger(parsed) || parsed < 1) {
-        console.error(`Invalid ${name} value "${value}", using default ${String(defaultValue)}`);
-        return defaultValue;
+    if (!Number.isInteger(parsed) ||
+        parsed < options.min ||
+        (options.max !== undefined && parsed > options.max)) {
+        const bounds = options.max === undefined
+            ? `an integer >= ${String(options.min)}`
+            : `an integer between ${String(options.min)} and ${String(options.max)}`;
+        throw new ServeConfigError(`Invalid ${options.label} value "${value}". Expected ${bounds}.`);
     }
     return parsed;
 }
+function parseLogLevel(value) {
+    if (value === undefined)
+        return DEFAULT_LOG_LEVEL;
+    const parsed = ServeLogLevelSchema.safeParse(value.toLowerCase());
+    if (parsed.success)
+        return parsed.data;
+    throw new ServeConfigError(`Invalid AXUSAGE_LOG_LEVEL value "${value}". Expected one of: ${SERVE_LOG_LEVELS.join(", ")}.`);
+}
+//# sourceMappingURL=serve-config.js.map

package/dist/config/serve-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serve-config.js","sourceRoot":"","sources":["../../src/config/serve-config.ts"],"names":[],"mappings":"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"}

package/dist/server/routes.d.ts

@@ -1,17 +1,24 @@
 /**
  * Route handlers for axusage serve mode.
  */
-import { Router } from "express";
+import type { FastifyPluginCallbackZod } from "fastify-type-provider-zod";
 import type { ServiceUsageData } from "../types/domain.js";
+/** Structured error from a failed service fetch. */
+export type ServerError = {
+    readonly service: string;
+    readonly message: string;
+    readonly status?: number;
+};
 /** Snapshot produced by each refresh cycle. */
 export type ServerState = {
     readonly usage: readonly ServiceUsageData[];
     readonly refreshedAt: Date;
-    readonly errors: readonly string[];
+    readonly errors: readonly ServerError[];
 };
-/** Create router for GET /health */
-export declare function createHealthRouter(services: readonly string[], getState: () => ServerState | undefined): Router;
-/** Create router for GET /metrics (Prometheus text exposition) */
-export declare function createMetricsRouter(getState: () => Promise<ServerState | undefined>): Router;
-/** Create router for GET /usage (JSON) */
-export declare function createUsageRouter(getFreshState: () => Promise<ServerState | undefined>): Router;
+/** Create plugin for GET /health */
+export declare function createHealthPlugin(services: readonly string[], getState: () => ServerState | undefined, isShuttingDown: () => boolean): FastifyPluginCallbackZod;
+/** Create plugin for GET /metrics (Prometheus text exposition) */
+export declare function createMetricsPlugin(getState: () => Promise<ServerState | undefined>): FastifyPluginCallbackZod;
+/** Create plugin for GET /usage (JSON) */
+export declare function createUsagePlugin(getFreshState: () => Promise<ServerState | undefined>): FastifyPluginCallbackZod;
+//# sourceMappingURL=routes.d.ts.map

package/dist/server/routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/server/routes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAG1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAS3D,oDAAoD;AACpD,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,+CAA+C;AAC/C,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC5C,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;CACzC,CAAC;AASF,oCAAoC;AACpC,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,QAAQ,EAAE,MAAM,WAAW,GAAG,SAAS,EACvC,cAAc,EAAE,MAAM,OAAO,GAC5B,wBAAwB,CAsC1B;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,GAC/C,wBAAwB,CA4C1B;AAED,0CAA0C;AAC1C,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,GACpD,wBAAwB,CA6B1B"}

package/dist/server/routes.js

@@ -1,70 +1,122 @@
 /**
  * Route handlers for axusage serve mode.
  */
-import { Router } from "express";
 import packageJson from "../../package.json" with { type: "json" };
+import { ErrorResponseSchema, HealthResponseSchema, UsageResponseSchema, } from "../types/serve-api.js";
 import { formatPrometheusMetrics } from "../utils/format-prometheus-metrics.js";
 import { toJsonObject } from "../utils/format-service-usage.js";
-/** Create router for GET /health */
-export function createHealthRouter(services, getState) {
-    const router = Router();
-    router.get("/health", (_request, response) => {
-        const state = getState();
-        const healthy = state !== undefined && state.usage.length > 0;
-        response.status(healthy ? 200 : 503).json({
-            status: healthy ? "ok" : "degraded",
-            version: packageJson.version,
-            lastRefresh: state?.refreshedAt.toISOString(),
-            services,
-            errors: state?.errors ?? [],
+function formatServerError(error) {
+    if (error.status === undefined) {
+        return `${error.service}: ${error.message}`;
+    }
+    return `${error.service}: ${error.message} (HTTP ${String(error.status)})`;
+}
+/** Create plugin for GET /health */
+export function createHealthPlugin(services, getState, isShuttingDown) {
+    return function healthPlugin(fastify, _options, done) {
+        fastify.route({
+            method: "GET",
+            url: "/health",
+            config: { rateLimit: false },
+            schema: {
+                response: {
+                    200: HealthResponseSchema,
+                    503: HealthResponseSchema,
+                    500: ErrorResponseSchema,
+                },
+            },
+            handler: async (_request, reply) => {
+                if (isShuttingDown()) {
+                    const state = getState();
+                    return reply.code(503).send({
+                        status: "shutting_down",
+                        version: packageJson.version,
+                        lastRefresh: state?.refreshedAt.toISOString(),
+                        services: [...services],
+                        errors: state?.errors.map((error) => formatServerError(error)) ?? [],
+                    });
+                }
+                const state = getState();
+                const healthy = state !== undefined && state.usage.length > 0;
+                return reply.code(healthy ? 200 : 503).send({
+                    status: healthy ? "ok" : "degraded",
+                    version: packageJson.version,
+                    lastRefresh: state?.refreshedAt.toISOString(),
+                    services: [...services],
+                    errors: state?.errors.map((error) => formatServerError(error)) ?? [],
+                });
+            },
         });
-    });
-    return router;
+        done();
+    };
 }
-/** Create router for GET /metrics (Prometheus text exposition) */
-export function createMetricsRouter(getState) {
-    const router = Router();
-    // Memoize the rendered Prometheus text by the state snapshot's refreshedAt
-    // timestamp. Scrapes within the same cache window reuse the same Promise,
-    // avoiding recreating prom-client Registry/Gauge objects on each request.
-    // Rate is computed at refreshedAt so output is deterministic per snapshot,
-    // keeping the gauge coherent with the usage data it describes.
-    // Assignments happen synchronously (before any await) so require-atomic-updates
-    // is satisfied and concurrent scrapes naturally coalesce onto one render.
-    let memoFor;
-    let memoPromise = Promise.resolve("");
-    router.get("/metrics", async (_request, response) => {
-        const state = await getState();
-        const usage = state?.usage;
-        if (!usage || usage.length === 0) {
-            response.status(503).type("text/plain").send("No data yet\n");
-            return;
-        }
-        if (memoFor !== state.refreshedAt) {
-            memoFor = state.refreshedAt;
-            memoPromise = formatPrometheusMetrics(usage, state.refreshedAt.getTime());
-        }
-        const text = await memoPromise;
-        response
-            .status(200)
-            .type("text/plain; version=0.0.4; charset=utf-8")
-            .send(text);
-    });
-    return router;
+/** Create plugin for GET /metrics (Prometheus text exposition) */
+export function createMetricsPlugin(getState) {
+    return function metricsPlugin(fastify, _options, done) {
+        // Memoize the rendered Prometheus text by the state snapshot's refreshedAt
+        // timestamp. Scrapes within the same cache window reuse the same Promise,
+        // avoiding recreating prom-client Registry/Gauge objects on each request.
+        // Rate is computed at refreshedAt so output is deterministic per snapshot,
+        // keeping the gauge coherent with the usage data it describes.
+        // Assignments happen synchronously (before any await) so require-atomic-updates
+        // is satisfied and concurrent scrapes naturally coalesce onto one render.
+        let memoFor;
+        let memoPromise = Promise.resolve("");
+        fastify.route({
+            method: "GET",
+            url: "/metrics",
+            config: { rateLimit: false },
+            // No response schema: /metrics returns text/plain Prometheus exposition
+            // format for 200, which cannot be validated by a Zod object schema.
+            // Adding only a 503 schema would prevent Fastify's type provider from
+            // accepting the 200 text response. The 503 error returns JSON
+            // { error: "No data yet" } consistent with other error responses.
+            handler: async (_request, reply) => {
+                const state = await getState();
+                const usage = state?.usage;
+                if (!usage || usage.length === 0) {
+                    return reply.code(503).send({ error: "No data yet" });
+                }
+                const refreshedAtMs = state.refreshedAt.getTime();
+                if (memoFor !== refreshedAtMs) {
+                    memoFor = refreshedAtMs;
+                    memoPromise = formatPrometheusMetrics(usage, state.refreshedAt.getTime());
+                }
+                const text = await memoPromise;
+                return reply
+                    .code(200)
+                    .type("text/plain; version=0.0.4; charset=utf-8")
+                    .send(text);
+            },
+        });
+        done();
+    };
 }
-/** Create router for GET /usage (JSON) */
-export function createUsageRouter(getFreshState) {
-    const router = Router();
-    router.get("/usage", async (_request, response) => {
-        const state = await getFreshState();
-        const usage = state?.usage;
-        if (!usage || usage.length === 0) {
-            response.status(503).json({ error: "No data yet" });
-            return;
-        }
-        response
-            .status(200)
-            .json(usage.map((entry) => toJsonObject(entry, state.refreshedAt.getTime())));
-    });
-    return router;
+/** Create plugin for GET /usage (JSON) */
+export function createUsagePlugin(getFreshState) {
+    return function usagePlugin(fastify, _options, done) {
+        fastify.route({
+            method: "GET",
+            url: "/usage",
+            schema: {
+                response: {
+                    200: UsageResponseSchema,
+                    503: ErrorResponseSchema,
+                    500: ErrorResponseSchema,
+                },
+            },
+            handler: async (_request, reply) => {
+                const state = await getFreshState();
+                const usage = state?.usage;
+                if (!usage || usage.length === 0) {
+                    return reply.code(503).send({ error: "No data yet" });
+                }
+                return reply
+                    .code(200)
+                    .send(usage.map((entry) => toJsonObject(entry, state.refreshedAt.getTime())));
+            },
+        });
+        done();
+    };
 }
+//# sourceMappingURL=routes.js.map

package/dist/server/routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/server/routes.ts"],"names":[],"mappings":"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"}