@schmock/cli 2.2.2 → 2.3.0

package/dist/cli.d.ts

@@ -25,7 +25,8 @@ export interface WatchHandle {
     close(): void;
 }
 /**
- * Reload a CLI server: close the old one, create a new one on the same port.
+ * Prepare a replacement before closing the live server, then bind it to the
+ * same port. Invalid spec changes therefore leave the current server online.
  */
 export declare function reloadServer(current: CliServer, options: CliOptions): Promise<CliServer>;
 /**

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAaxC,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,IAAI,IAAI,CAAC;CACf;AA0ED,wBAAsB,eAAe,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAuF7E;AAYD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAqC3E;AAqBD,MAAM,WAAW,WAAW;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,SAAS,CAAC,CAQpB;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,UAAU,EACnB,gBAAgB,EAAE,MAAM,SAAS,EACjC,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,GACpC,WAAW,CA2Bb;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDvD"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,WAAW,CAAC;AAcxD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,IAAI,IAAI,CAAC;CACf;AA6QD,wBAAsB,eAAe,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAG7E;AAYD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAqC3E;AAqBD,MAAM,WAAW,WAAW;IAC1B,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,SAAS,CAAC,CAWpB;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,UAAU,EACnB,gBAAgB,EAAE,MAAM,SAAS,EACjC,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,GACpC,WAAW,CAqCb;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDvD"}

package/dist/cli.js

@@ -2,13 +2,27 @@
 import { readFileSync, watch } from "node:fs";
 import { createServer } from "node:http";
 import { parseArgs } from "node:util";
-import { collectBody, parseNodeHeaders, parseNodeQuery, schmock, toHttpMethod, writeSchmockResponse, } from "@schmock/core";
+import { collectBody, HTTP_METHODS, isHttpMethod, parseNodeHeaders, parseNodeQuery, schmock, writeSchmockResponse, } from "@schmock/core";
 import { openapi } from "@schmock/openapi";
+const MAX_REQUEST_BODY_SIZE = 10 * 1024 * 1024;
+const ALLOWED_METHODS = HTTP_METHODS.join(", ");
 const CORS_HEADERS = {
     "access-control-allow-origin": "*",
-    "access-control-allow-methods": "GET, POST, PUT, PATCH, DELETE, OPTIONS",
+    "access-control-allow-methods": ALLOWED_METHODS,
     "access-control-allow-headers": "Content-Type, Authorization",
 };
+class CliHttpError extends Error {
+    status;
+    code;
+    headers;
+    constructor(status, code, message, headers = {}) {
+        super(message);
+        this.status = status;
+        this.code = code;
+        this.headers = headers;
+        this.name = "CliHttpError";
+    }
+}
 function isSeedSource(value) {
     return (Array.isArray(value) ||
         typeof value === "string" ||
@@ -55,7 +69,95 @@ function handleAdminRequest(method, path, mock, res, headers) {
     res.writeHead(404, headers);
     res.end(JSON.stringify({ error: "Unknown admin endpoint", code: "NOT_FOUND" }));
 }
-export async function createCliServer(options) {
+function parseRequestUrl(req) {
+    const host = req.headers.host;
+    if (!host) {
+        throw new CliHttpError(400, "BAD_REQUEST", "Missing Host header");
+    }
+    try {
+        return new URL(req.url ?? "/", `http://${host}`);
+    }
+    catch {
+        throw new CliHttpError(400, "BAD_REQUEST", "Malformed request target");
+    }
+}
+function parseRequestMethod(req) {
+    const method = (req.method ?? "GET").toUpperCase();
+    if (!isHttpMethod(method)) {
+        throw new CliHttpError(405, "METHOD_NOT_ALLOWED", `Unsupported HTTP method: ${method}`, { allow: ALLOWED_METHODS });
+    }
+    return method;
+}
+function assertBodySize(headers) {
+    const contentLength = headers["content-length"];
+    if (contentLength === undefined)
+        return;
+    const declaredSize = Number(contentLength);
+    if (Number.isFinite(declaredSize) && declaredSize > MAX_REQUEST_BODY_SIZE) {
+        throw new CliHttpError(413, "PAYLOAD_TOO_LARGE", "Request body too large");
+    }
+}
+function toCliHttpError(error) {
+    if (error instanceof CliHttpError)
+        return error;
+    if (error !== null &&
+        typeof error === "object" &&
+        "status" in error &&
+        error.status === 413) {
+        return new CliHttpError(413, "PAYLOAD_TOO_LARGE", error instanceof Error ? error.message : "Request body too large");
+    }
+    return new CliHttpError(500, "SERVER_ERROR", error instanceof Error ? error.message : "Internal Server Error");
+}
+async function handleCliRequest(req, res, mock, options) {
+    try {
+        const url = parseRequestUrl(req);
+        const method = parseRequestMethod(req);
+        const path = url.pathname;
+        if (options.cors && method === "OPTIONS") {
+            res.writeHead(204, CORS_HEADERS);
+            res.end();
+            return;
+        }
+        if (options.admin && path.startsWith("/schmock-admin/")) {
+            const adminHeaders = {
+                "content-type": "application/json",
+                ...(options.cors ? CORS_HEADERS : {}),
+            };
+            handleAdminRequest(method, path, mock, res, adminHeaders);
+            return;
+        }
+        const headers = parseNodeHeaders(req);
+        assertBodySize(headers);
+        const query = parseNodeQuery(url);
+        const body = await collectBody(req, headers, MAX_REQUEST_BODY_SIZE);
+        const schmockResponse = await mock.handle(method, path, {
+            headers,
+            body,
+            query,
+        });
+        const extraHeaders = options.cors ? CORS_HEADERS : undefined;
+        writeSchmockResponse(res, schmockResponse, extraHeaders);
+    }
+    catch (error) {
+        const cliError = toCliHttpError(error);
+        try {
+            if (!res.headersSent) {
+                res.writeHead(cliError.status, {
+                    "content-type": "application/json",
+                    ...(options.cors ? CORS_HEADERS : {}),
+                    ...cliError.headers,
+                });
+            }
+            if (!res.writableEnded) {
+                res.end(JSON.stringify({ error: cliError.message, code: cliError.code }));
+            }
+        }
+        catch {
+            res.destroy();
+        }
+    }
+}
+async function createCliMock(options) {
     const mock = schmock({ debug: options.debug, state: {} });
     const openapiOptions = {
         spec: options.spec,
@@ -67,47 +169,15 @@ export async function createCliServer(options) {
     }
     const plugin = await openapi(openapiOptions);
     mock.pipe(plugin);
+    return mock;
+}
+function listenWithMock(options, mock) {
     const hostname = options.hostname ?? "127.0.0.1";
     const port = options.port ?? 3000;
     const cors = options.cors ?? false;
     const admin = options.admin ?? false;
     const httpServer = createServer((req, res) => {
-        // Handle CORS preflight
-        if (cors && req.method === "OPTIONS") {
-            res.writeHead(204, CORS_HEADERS);
-            res.end();
-            return;
-        }
-        const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
-        const path = url.pathname;
-        // Admin API intercept
-        if (admin && path.startsWith("/schmock-admin/")) {
-            const adminHeaders = {
-                "content-type": "application/json",
-                ...(cors ? CORS_HEADERS : {}),
-            };
-            handleAdminRequest(req.method ?? "GET", path, mock, res, adminHeaders);
-            return;
-        }
-        const method = toHttpMethod(req.method ?? "GET");
-        const headers = parseNodeHeaders(req);
-        const query = parseNodeQuery(url);
-        void collectBody(req, headers)
-            .then((body) => mock
-            .handle(method, path, { headers, body, query })
-            .then((schmockResponse) => {
-            const extra = cors ? CORS_HEADERS : undefined;
-            writeSchmockResponse(res, schmockResponse, extra);
-        }))
-            .catch((error) => {
-            if (!res.headersSent) {
-                res.writeHead(500, { "content-type": "application/json" });
-            }
-            res.end(JSON.stringify({
-                error: error instanceof Error ? error.message : "Internal Server Error",
-                code: "SERVER_ERROR",
-            }));
-        });
+        void handleCliRequest(req, res, mock, { admin, cors });
     });
     return new Promise((resolve, reject) => {
         httpServer.on("error", reject);
@@ -125,6 +195,10 @@ export async function createCliServer(options) {
         });
     });
 }
+export async function createCliServer(options) {
+    const mock = await createCliMock(options);
+    return listenWithMock(options, mock);
+}
 function validatePort(value) {
     const port = Number(value);
     if (!Number.isInteger(port) || port < 0 || port > 65535) {
@@ -186,39 +260,53 @@ Options:
 `;
 const WATCH_DEBOUNCE_MS = 500;
 /**
- * Reload a CLI server: close the old one, create a new one on the same port.
+ * Prepare a replacement before closing the live server, then bind it to the
+ * same port. Invalid spec changes therefore leave the current server online.
  */
 export async function reloadServer(current, options) {
     const port = current.port;
+    const nextOptions = { ...options, port };
+    const replacementMock = await createCliMock(nextOptions);
     // Close existing connections and wait for the server to fully close
     current.server.closeAllConnections();
     await new Promise((resolve) => {
         current.server.close(() => resolve());
     });
-    return createCliServer({ ...options, port });
+    return listenWithMock(nextOptions, replacementMock);
 }
 /**
  * Watch a spec file and hot-reload the server on changes.
  */
 export function startWatch(specPath, options, getCurrentServer, onReload) {
     let debounceTimer;
+    let closed = false;
+    let reloadQueue = Promise.resolve();
     const watcher = watch(specPath, () => {
         if (debounceTimer)
             clearTimeout(debounceTimer);
-        debounceTimer = setTimeout(async () => {
-            process.stderr.write("\nSpec changed, reloading...\n");
-            try {
-                const newServer = await reloadServer(getCurrentServer(), options);
-                onReload(newServer);
-                process.stderr.write(`Schmock server reloaded on http://${newServer.hostname}:${newServer.port}\n`);
-            }
-            catch (err) {
-                process.stderr.write(`Reload failed: ${err instanceof Error ? err.message : String(err)}\n`);
-            }
+        debounceTimer = setTimeout(() => {
+            reloadQueue = reloadQueue.then(async () => {
+                if (closed)
+                    return;
+                process.stderr.write("\nSpec changed, reloading...\n");
+                try {
+                    const newServer = await reloadServer(getCurrentServer(), options);
+                    if (closed) {
+                        newServer.close();
+                        return;
+                    }
+                    onReload(newServer);
+                    process.stderr.write(`Schmock server reloaded on http://${newServer.hostname}:${newServer.port}\n`);
+                }
+                catch (err) {
+                    process.stderr.write(`Reload failed: ${err instanceof Error ? err.message : String(err)}\n`);
+                }
+            });
         }, WATCH_DEBOUNCE_MS);
     });
     return {
         close() {
+            closed = true;
             watcher.close();
             if (debounceTimer)
                 clearTimeout(debounceTimer);