@technomoron/api-server-base 2.0.0-beta.17 → 2.0.0-beta.19

package/README.txt

@@ -25,13 +25,13 @@ pnpm add @technomoron/api-server-base
 
 All runtime dependencies and `@types/*` packages are bundled with the distribution. The library exports ES modules by default. Consumers that rely on CommonJS can import via the require entry exposed in package.json.
 
-Quick Start
------------
-import { ApiServer, ApiModule, ApiError, BaseAuthStorage } from '@technomoron/api-server-base';
+	Quick Start
+	-----------
+	import { ApiServer, ApiModule, ApiError, BaseAuthAdapter } from '@technomoron/api-server-base';
 
 type DemoUser = { id: string; email: string; password: string };
 
-class DemoStorage extends BaseAuthStorage<DemoUser, Omit<DemoUser, 'password'>> {
+	class DemoStorage extends BaseAuthAdapter<DemoUser, Omit<DemoUser, 'password'>> {
 	private readonly users = new Map<string, DemoUser>([
 		['1', { id: '1', email: 'demo@example.com', password: 'secret' }]
 	]);
@@ -79,14 +79,15 @@ class UserModule extends ApiModule<AppServer> {
 
 const yourStorageAdapter = new DemoStorage();
 
-const server = new AppServer({
-	apiPort: 3101,
-	apiHost: '127.0.0.1',
-	accessSecret: 'replace-me'
-})
-	.authStorage(yourStorageAdapter)
-	.api(new UserModule())
-	.start();
+	const server = new AppServer({
+		apiPort: 3101,
+		apiHost: '127.0.0.1',
+		accessSecret: 'replace-me'
+	})
+		.authStorage(yourStorageAdapter)
+		.api(new UserModule())
+		.finalize()
+		.start();
 
 Need a dedicated auth module as well? Chain `.authModule(...)` in the same spot.
 
@@ -105,7 +106,11 @@ uploadMax (number, default 30 * 1024 * 1024) Maximum upload size in bytes.
 staticDirs (record, default empty object) Map of mount path => disk path for serving static files as-is (ex: { '/assets': './public' }).
 accessSecret (string, default empty string) Required for JWT signing and verification.
 refreshSecret (string, default empty string) Used for refresh tokens if you implement them.
-cookieDomain (string, default '.somewhere-over-the-rainbow.com') Domain applied to auth cookies.
+cookieDomain (string, default '') Domain applied to auth cookies.
+cookiePath (string, default '/') Path applied to auth cookies.
+cookieSameSite ('lax' | 'strict' | 'none', default 'lax') SameSite attribute applied to auth cookies.
+cookieSecure (boolean | 'auto', default 'auto') Secure attribute applied to auth cookies; 'auto' enables Secure only when the request is HTTPS (or forwarded as HTTPS).
+cookieHttpOnly (boolean, default true) HttpOnly attribute applied to auth cookies.
 accessCookie (string, default 'dat') Access token cookie name.
 refreshCookie (string, default 'drt') Refresh token cookie name.
 accessExpiry (number, default 60 * 15) Access token lifetime in seconds.
@@ -120,14 +125,14 @@ refreshMaybe (boolean, default false) When true, `auth: maybe` routes will try t
 
 Tip: If you add new configuration fields in downstream projects, extend ApiServerConf and update fillConfig so defaults stay aligned.
 
-Request Lifecycle
------------------
-1. Express middlewares (express.json, cookie-parser, optional multer) run before your handler.
-2. ApiServer wraps the route inside handle_request, setting currReq and logging when debug is enabled.
-3. authenticate enforces the ApiRoute auth type: `none`, `maybe`, `yes`, `strict`, or `apikey`. Bearer JWTs and the access cookie (`accessCookie`, default `dat`) are accepted for `yes`/`strict`, while API key tokens prefixed with `apikey-` always delegate to `getApiKey`. When `refreshSecret` is configured and your storage supports refresh lookups (`getToken({ refreshToken })` + `updateToken(...)`), `yes`/`strict` routes will automatically mint a new access token when it is missing or expired (and also recover from "Authorization token is no longer valid" by refreshing). `maybe` routes only do the same when `refreshMaybe: true`. The optional `strict` type (or server-wide `validateTokens` flag) requires the signed JWT to exist in storage; when it does, the persisted row is attached to `apiReq.authToken`. The dedicated `apikey` type simply means “an API key is required”; otherwise API keys are still accepted by `yes`/`strict` routes alongside JWTs, and `apiReq.apiKey` is populated when present.
-4. authorize runs with the requested auth class (any or admin in the base implementation). Override to connect to your role system.
-5. The handler executes and returns its tuple. Responses are normalized to { code, message, data } JSON.
-6. Errors bubble into the wrapper. ApiError instances respect the provided status codes; other exceptions result in a 500 with text derived from guessExceptionText.
+	Request Lifecycle
+	-----------------
+	1. Express middlewares (express.json, cookie-parser, optional multer) run before your handler.
+	2. ApiServer wraps the route inside handle_request, creating an ApiRequest and logging when debug is enabled.
+	3. authenticate enforces the ApiRoute auth type: `none`, `maybe`, `yes`, `strict`, or `apikey`. Bearer JWTs and the access cookie (`accessCookie`, default `dat`) are accepted for `yes`/`strict`, while API key tokens prefixed with `apikey-` always delegate to `getApiKey`. When `refreshSecret` is configured and your storage supports refresh lookups (`getToken({ refreshToken })` + `updateToken(...)`), `yes`/`strict` routes will automatically mint a new access token when it is missing or expired (and also recover from "Authorization token is no longer valid" by refreshing). `maybe` routes only do the same when `refreshMaybe: true`. The optional `strict` type (or server-wide `validateTokens` flag) requires the signed JWT to exist in storage; when it does, the persisted row is attached to `apiReq.authToken`. The dedicated `apikey` type simply means “an API key is required”; otherwise API keys are still accepted by `yes`/`strict` routes alongside JWTs, and `apiReq.apiKey` is populated when present.
+	4. authorize runs with the requested auth class (any or admin in the base implementation). Override to connect to your role system.
+	5. The handler executes and returns its tuple. Responses are normalized to { code, message, data } JSON.
+	6. Errors bubble into the wrapper. ApiError instances respect the provided status codes; other exceptions result in a 500 with text derived from guessExceptionText.
 
 Client IP Helpers
 -----------------
@@ -135,16 +140,20 @@ Call `apiReq.getClientInfo()` when you need the entire client fingerprint captur
 
 Call `apiReq.getClientIp()` to obtain the most likely client address, skipping loopback entries collected from proxy headers. Use `apiReq.getClientIpChain()` when you need the de-duplicated sequence gathered from the standard Forwarded/X-Forwarded-For/X-Real-IP headers as well as Express' `req.ip`/`req.ips` and the underlying socket. Both helpers reuse the cached payload returned by `apiReq.getClientInfo()`.
 
-Extending the Base Classes
---------------------------
-Implement the AuthStorage contract (getUser, verifyPassword, storeToken, updateToken, etc.) to integrate with your persistence layer, then supply it via authStorage().
-Use your storage adapter's filterUser helper to trim sensitive data before returning responses.
-Provide your own authorize method to enforce role based access control using the ApiAuthClass enum.
-Create feature modules by extending ApiModule. Use the optional checkConfig hook to validate prerequisites before routes mount.
+	Extending the Base Classes
+	--------------------------
+	Implement the AuthStorage contract (getUser, verifyPassword, storeToken, updateToken, etc.) to integrate with your persistence layer, then supply it via authStorage().
+	Use your storage adapter's filterUser helper to trim sensitive data before returning responses.
+	Provide your own authorize method to enforce role based access control using the ApiAuthClass enum.
+	Create feature modules by extending ApiModule. Use the optional checkConfig hook to validate prerequisites before routes mount.
+
+	OAuth Client Secrets
+	--------------------
+	If your OAuth client records use a client secret, make `getClient(clientId)` return a client with a truthy `clientSecret` (do not return the stored hash/secret itself) and implement `verifyClientSecret(client, clientSecret)` on your storage adapter. If `clientSecret` is truthy but `verifyClientSecret` is not overridden, the `/auth/v1/oauth2/token` endpoint returns 501.
 
-Sequelize Table Prefixes
-------------------------
-Sequelize-backed stores accept `tablePrefix` to prepend to the built-in table names (`users`, `jwttokens`, `passkey_credentials`, `passkey_challenges`, `oauth_clients`, `oauth_codes`).
+	Sequelize Table Prefixes
+	------------------------
+	Sequelize-backed stores accept `tablePrefix` to prepend to the built-in table names (`users`, `jwttokens`, `passkey_credentials`, `passkey_challenges`, `oauth_clients`, `oauth_codes`).
 
 SqlAuthStore supports both a global prefix (`tablePrefix`) and per-module overrides (`tablePrefixes.user|token|passkey|oauth`). When present, `tokenStoreOptions.tablePrefix` and `oauthStoreOptions.tablePrefix` take precedence.
 
@@ -158,16 +167,16 @@ Example:
 
 If you need a different base name (for example `myapp_tokens` instead of `myapp_jwttokens`), pass a custom model or model factory to the store and set the `tableName` yourself.
 
-Custom Express Endpoints
-------------------------
-ApiModule routes run inside the tuple wrapper (always responding with a standardized JSON envelope). For endpoints that need raw Express control (streaming, webhooks, tus uploads, etc.), mount your own handlers directly.
+	Custom Express Endpoints
+	------------------------
+	ApiModule routes run inside the tuple wrapper (always responding with a standardized JSON envelope). For endpoints that need raw Express control (streaming, webhooks, tus uploads, etc.), mount your own handlers directly.
 
 - `server.useExpress(...)` mounts middleware/routes and keeps the built-in `/api` 404 handler ordered last, so mounts under `apiBasePath` are not intercepted.
 - Protect endpoints by inserting `server.expressAuth({ type, req })` as middleware. It authenticates using the same JWT/cookie/API-key logic as ApiModule routes and then runs `authorize`.
 - On success, `expressAuth` attaches the computed ApiRequest to both `req.apiReq` and `res.locals.apiReq`.
 - If you want the same JSON error envelope for custom endpoints, mount `server.expressErrorHandler()` after your custom routes.
 
-Example:
+	Example:
 
 	server
 		.useExpress(
@@ -178,7 +187,11 @@ Example:
 				res.status(200).json({ uid: apiReq.tokenData?.uid ?? null });
 			}
 		)
-		.useExpress(server.expressErrorHandler());
+			.useExpress(server.expressErrorHandler());
+
+	Finalize And Start
+	------------------
+	Call `server.finalize()` after you have mounted all ApiModules and custom Express endpoints. After finalize (or after `start()`), calling `api()` / `useExpress()` will throw.
 
 
 Tooling and Scripts

package/dist/cjs/api-module.cjs

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiModule = void 0;
 class ApiModule {
+    get server() {
+        if (this._server === undefined) {
+            throw new Error('ApiModule.server is not set. Mount the module with ApiServer.api(...) before using it.');
+        }
+        return this._server;
+    }
+    set server(value) {
+        this._server = value;
+    }
     constructor(opts = {}) {
         this.mountpath = '';
         this.namespace = opts.namespace ?? this.constructor.defaultNamespace ?? '';

package/dist/cjs/api-module.d.ts

@@ -7,7 +7,7 @@ export interface ApiKey {
     uid: unknown;
 }
 export type ApiRoute = {
-    method: 'get' | 'post' | 'put' | 'delete';
+    method: 'get' | 'post' | 'put' | 'patch' | 'delete';
     path: string;
     handler: ApiHandler;
     auth: {
@@ -16,7 +16,9 @@ export type ApiRoute = {
     };
 };
 export declare class ApiModule<T = unknown> {
-    server: T;
+    private _server?;
+    get server(): T;
+    set server(value: T);
     namespace: string;
     mountpath: string;
     static defaultNamespace: string;

package/dist/cjs/api-server-base.cjs

@@ -20,6 +20,7 @@ const express_1 = __importDefault(require("express"));
 const multer_1 = __importDefault(require("multer"));
 const module_js_1 = require("./auth-api/module.js");
 const storage_js_1 = require("./auth-api/storage.js");
+const auth_cookie_options_js_1 = require("./auth-cookie-options.js");
 const base_js_1 = require("./token/base.js");
 class JwtHelperStore extends base_js_1.TokenStore {
     async save() {
@@ -77,6 +78,7 @@ function hydrateGetBody(req) {
         req.body = { ...query };
         return;
     }
+    // Keep explicit body fields authoritative when both query and body provide the same key.
     req.body = { ...query, ...body };
 }
 function normalizeIpAddress(candidate) {
@@ -337,6 +339,17 @@ function isApiErrorLike(candidate) {
     const maybeError = candidate;
     return typeof maybeError.code === 'number' && typeof maybeError.message === 'string';
 }
+function asHttpStatus(error) {
+    if (!error || typeof error !== 'object') {
+        return null;
+    }
+    const maybe = error;
+    const status = typeof maybe.status === 'number' ? maybe.status : maybe.statusCode;
+    if (typeof status === 'number' && status >= 400 && status <= 599) {
+        return status;
+    }
+    return null;
+}
 function fillConfig(config) {
     return {
         apiPort: config.apiPort ?? 3101,
@@ -351,7 +364,11 @@ function fillConfig(config) {
         swaggerPath: config.swaggerPath ?? '',
         accessSecret: config.accessSecret ?? '',
         refreshSecret: config.refreshSecret ?? '',
-        cookieDomain: config.cookieDomain ?? '.somewhere-over-the-rainbow.com',
+        cookieDomain: config.cookieDomain ?? '',
+        cookiePath: config.cookiePath ?? '/',
+        cookieSameSite: config.cookieSameSite ?? 'lax',
+        cookieSecure: config.cookieSecure ?? 'auto',
+        cookieHttpOnly: config.cookieHttpOnly ?? true,
         accessCookie: config.accessCookie ?? 'dat',
         refreshCookie: config.refreshCookie ?? 'drt',
         accessExpiry: config.accessExpiry ?? 60 * 15,
@@ -365,19 +382,37 @@ function fillConfig(config) {
         apiVersion: config.apiVersion ?? '',
         minClientVersion: config.minClientVersion ?? '',
         tokenStore: config.tokenStore,
-        authStores: config.authStores
+        authStores: config.authStores,
+        onStartError: config.onStartError
     };
 }
 class ApiServer {
+    /**
+     * @deprecated ApiServer does not track a global "current request". This value is always null.
+     * Use the per-request ApiRequest passed to handlers, or `req.apiReq` / `res.locals.apiReq`
+     * when mounting raw Express endpoints.
+     */
+    get currReq() {
+        return null;
+    }
+    set currReq(_value) {
+        if (this.config.devMode && !this.currReqDeprecationWarned) {
+            this.currReqDeprecationWarned = true;
+            console.warn('[api-server-base] ApiServer.currReq is deprecated and always null. Use req.apiReq or res.locals.apiReq.');
+        }
+        void _value;
+    }
     constructor(config = {}) {
-        this.currReq = null;
+        this.finalized = false;
         this.serverAuthAdapter = null;
         this.apiNotFoundHandler = null;
+        this.apiErrorHandlerInstalled = false;
         this.tokenStoreAdapter = null;
         this.userStoreAdapter = null;
         this.passkeyServiceAdapter = null;
         this.oauthStoreAdapter = null;
         this.canImpersonateAdapter = null;
+        this.currReqDeprecationWarned = false;
         this.config = fillConfig(config);
         this.apiBasePath = this.normalizeApiBasePath(this.config.apiBasePath);
         this.startedAt = Date.now();
@@ -395,16 +430,68 @@ class ApiServer {
             this.storageAdapter = this.getServerAuthAdapter();
         }
         this.app = (0, express_1.default)();
+        // Mount API modules and any custom endpoints under `apiBasePath` on this router so we can keep
+        // the API 404 handler ordered last without relying on Express internals.
+        this.apiRouter = express_1.default.Router();
         if (config.uploadPath) {
-            const upload = (0, multer_1.default)({ dest: config.uploadPath });
+            const upload = (0, multer_1.default)({ dest: config.uploadPath, limits: { fileSize: this.config.uploadMax } });
             this.app.use(upload.any());
+            // Multer errors happen before ApiModule route wrappers; format the common "too large" failure.
+            this.app.use((err, _req, res, next) => {
+                const code = err && typeof err === 'object' ? err.code : undefined;
+                if (code === 'LIMIT_FILE_SIZE') {
+                    res.status(413).json({
+                        success: false,
+                        code: 413,
+                        message: `Upload exceeds maximum size of ${this.config.uploadMax} bytes`,
+                        data: null,
+                        errors: {}
+                    });
+                    return;
+                }
+                next(err);
+            });
         }
         this.middlewares();
         this.installStaticDirs();
         this.installPingHandler();
         this.installSwaggerHandler();
+        this.app.use(this.apiBasePath, this.apiRouter);
         // addSwaggerUi(this.app);
         this.installApiNotFoundHandler();
+        this.installApiErrorHandler();
+    }
+    assertNotFinalized(action) {
+        if (this.finalized) {
+            throw new Error(`Cannot call ApiServer.${action}() after finalize()/start()`);
+        }
+    }
+    toApiRouterPath(candidate) {
+        if (typeof candidate !== 'string') {
+            return null;
+        }
+        const trimmed = candidate.trim();
+        if (!trimmed) {
+            return null;
+        }
+        const normalized = trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
+        const base = this.apiBasePath;
+        if (base === '/') {
+            return normalized;
+        }
+        if (normalized === base) {
+            return '/';
+        }
+        if (normalized.startsWith(`${base}/`)) {
+            return normalized.slice(base.length) || '/';
+        }
+        return null;
+    }
+    finalize() {
+        this.installApiNotFoundHandler();
+        this.installApiErrorHandler();
+        this.finalized = true;
+        return this;
     }
     authStorage(storage) {
         this.storageAdapter = storage;
@@ -631,7 +718,7 @@ class ApiServer {
         }
         return false;
     }
-    guessExceptionText(error, defMsg = 'Unkown Error') {
+    guessExceptionText(error, defMsg = 'Unknown Error') {
         return guess_exception_text(error, defMsg);
     }
     async authorize(apiReq, requiredClass) {
@@ -657,6 +744,26 @@ class ApiServer {
             credentials: true
         };
         this.app.use((0, cors_1.default)(corsOptions));
+        // Provide a consistent and non-500 response when requests are blocked by the CORS allowlist.
+        this.app.use((err, req, res, next) => {
+            const message = err instanceof Error ? err.message : '';
+            if (message.includes('Not allowed by CORS')) {
+                const isApiRequest = Boolean(req.originalUrl?.startsWith(this.apiBasePath));
+                if (isApiRequest) {
+                    res.status(403).json({
+                        success: false,
+                        code: 403,
+                        message: 'Origin not allowed by CORS',
+                        data: null,
+                        errors: {}
+                    });
+                    return;
+                }
+                res.status(403).send('Origin not allowed by CORS');
+                return;
+            }
+            next(err);
+        });
     }
     installStaticDirs() {
         const staticDirs = this.config.staticDirs;
@@ -725,8 +832,12 @@ class ApiServer {
         const base = this.apiBasePath === '/' ? '' : this.apiBasePath;
         const resolved = rawPath.length > 0 ? rawPath : `${base}/swagger`;
         const path = resolved.startsWith('/') ? resolved : `/${resolved}`;
-        const spec = this.loadSwaggerSpec();
+        let specCache;
         this.app.get(path, (_req, res) => {
+            if (specCache === undefined) {
+                specCache = this.loadSwaggerSpec();
+            }
+            const spec = specCache;
             if (!spec) {
                 res.status(500).json({
                     success: false,
@@ -770,21 +881,12 @@ class ApiServer {
         };
         this.app.use(this.apiBasePath, this.apiNotFoundHandler);
     }
-    ensureApiNotFoundOrdering() {
-        this.installApiNotFoundHandler();
-        if (!this.apiNotFoundHandler) {
+    installApiErrorHandler() {
+        if (this.apiErrorHandlerInstalled) {
             return;
         }
-        const stack = this.app._router?.stack;
-        if (!stack) {
-            return;
-        }
-        const index = stack.findIndex((layer) => layer.handle === this.apiNotFoundHandler);
-        if (index === -1 || index === stack.length - 1) {
-            return;
-        }
-        const [layer] = stack.splice(index, 1);
-        stack.push(layer);
+        this.apiErrorHandlerInstalled = true;
+        this.app.use(this.apiBasePath, this.expressErrorHandler());
     }
     describeMissingEndpoint(req) {
         const method = typeof req.method === 'string' ? req.method.toUpperCase() : 'GET';
@@ -792,6 +894,10 @@ class ApiServer {
         return `No such endpoint: ${method} ${target}`;
     }
     start() {
+        if (!this.finalized) {
+            console.warn('[api-server-base] ApiServer.start() called without finalize(); auto-finalizing. Call server.finalize() before start() to silence this warning.');
+            this.finalize();
+        }
         this.app
             .listen({
             port: this.config.apiPort,
@@ -801,22 +907,32 @@ class ApiServer {
             console.log(`Server is running on http://${this.config.apiHost}:${this.config.apiPort}`);
         })
             .on('error', (error) => {
+            let message;
             if (error.code === 'EADDRINUSE') {
-                console.error(`Error: Port ${this.config.apiPort} is already in use.`);
+                message = `Port ${this.config.apiPort} is already in use.`;
             }
             else if (error.code === 'EACCES') {
-                console.error(`Error: Insufficient permissions to bind to port ${this.config.apiPort}. Try using a port number >= 1024 or running with elevated privileges.`);
+                message = `Insufficient permissions to bind to port ${this.config.apiPort}. Try using a port number >= 1024 or running with elevated privileges.`;
             }
             else if (error.code === 'EADDRNOTAVAIL') {
-                console.error(`Error: Address ${this.config.apiHost} is not available on this machine.`);
+                message = `Address ${this.config.apiHost} is not available on this machine.`;
             }
             else {
-                console.error(`Failed to start server: ${error.message}`);
+                message = `Failed to start server: ${error.message}`;
             }
-            process.exit(1);
+            const err = new Error(message);
+            err.cause = error;
+            if (typeof this.config.onStartError === 'function') {
+                this.config.onStartError(err);
+                return;
+            }
+            throw err;
         });
         return this;
     }
+    internalServerErrorMessage(error) {
+        return this.config.debug ? this.guessExceptionText(error) : 'Internal server error';
+    }
     async verifyJWT(token) {
         if (!this.config.accessSecret) {
             return { tokenData: undefined, error: 'JWT authentication disabled; no jwtSecret set', expired: false };
@@ -831,29 +947,7 @@ class ApiServer {
         return { tokenData: result.data, error: undefined, expired: false };
     }
     jwtCookieOptions(apiReq) {
-        const conf = this.config;
-        const forwarded = apiReq.req.headers['x-forwarded-proto'];
-        const referer = apiReq.req.headers['origin'] ?? apiReq.req.headers['referer'];
-        const origin = typeof referer === 'string' ? referer : '';
-        const isHttps = forwarded === 'https' || apiReq.req.protocol === 'https';
-        const isLocalhost = origin.includes('localhost');
-        const options = {
-            httpOnly: true,
-            secure: true,
-            sameSite: 'strict',
-            domain: conf.cookieDomain || undefined,
-            path: '/',
-            maxAge: undefined
-        };
-        if (conf.devMode) {
-            options.secure = isHttps;
-            options.httpOnly = false;
-            options.sameSite = 'lax';
-            if (isLocalhost) {
-                options.domain = undefined;
-            }
-        }
-        return options;
+        return (0, auth_cookie_options_js_1.buildAuthCookieOptions)(this.config, apiReq.req);
     }
     setAccessCookie(apiReq, accessToken, sessionCookie) {
         const conf = this.config;
@@ -999,7 +1093,7 @@ class ApiServer {
             }
         }
         if (!tokenData) {
-            throw new ApiError({ code: 401, message: 'Unathorized Access - ' + error });
+            throw new ApiError({ code: 401, message: 'Unauthorized Access - ' + error });
         }
         const effectiveUserId = this.extractTokenUserId(tokenData);
         apiReq.realUid = this.resolveRealUserId(tokenData, effectiveUserId);
@@ -1051,6 +1145,11 @@ class ApiServer {
         }
         apiReq.token = secret;
         apiReq.apiKey = key;
+        // Treat API keys as authenticated identities, consistent with JWT-based flows.
+        const resolvedUid = this.normalizeAuthIdentifier(key.uid);
+        if (resolvedUid !== null) {
+            apiReq.realUid = resolvedUid;
+        }
         return {
             uid: key.uid,
             domain: '',
@@ -1110,13 +1209,19 @@ class ApiServer {
         return rawReal;
     }
     useExpress(pathOrHandler, ...handlers) {
+        this.assertNotFinalized('useExpress');
         if (typeof pathOrHandler === 'string') {
-            this.app.use(pathOrHandler, ...handlers);
+            const apiPath = this.toApiRouterPath(pathOrHandler);
+            if (apiPath) {
+                this.apiRouter.use(apiPath, ...handlers);
+            }
+            else {
+                this.app.use(pathOrHandler, ...handlers);
+            }
         }
         else {
             this.app.use(pathOrHandler, ...handlers);
         }
-        this.ensureApiNotFoundOrdering();
         return this;
     }
     createApiRequest(req, res) {
@@ -1150,7 +1255,6 @@ class ApiServer {
             const apiReq = this.createApiRequest(req, res);
             req.apiReq = apiReq;
             res.locals.apiReq = apiReq;
-            this.currReq = apiReq;
             try {
                 if (this.config.hydrateGetBody) {
                     hydrateGetBody(req);
@@ -1189,10 +1293,21 @@ class ApiServer {
                 res.status(apiError.code).json(errorPayload);
                 return;
             }
+            const status = asHttpStatus(error);
+            if (status) {
+                res.status(status).json({
+                    success: false,
+                    code: status,
+                    message: status === 400 ? 'Invalid request payload' : this.internalServerErrorMessage(error),
+                    data: null,
+                    errors: {}
+                });
+                return;
+            }
             const errorPayload = {
                 success: false,
                 code: 500,
-                message: this.guessExceptionText(error),
+                message: this.internalServerErrorMessage(error),
                 data: null,
                 errors: {}
             };
@@ -1203,7 +1318,6 @@ class ApiServer {
         return async (req, res, next) => {
             void next;
             const apiReq = this.createApiRequest(req, res);
-            this.currReq = apiReq;
             try {
                 if (this.config.hydrateGetBody) {
                     hydrateGetBody(apiReq.req);
@@ -1253,7 +1367,7 @@ class ApiServer {
                     const errorPayload = {
                         success: false,
                         code: 500,
-                        message: this.guessExceptionText(error),
+                        message: this.internalServerErrorMessage(error),
                         data: null,
                         errors: {}
                     };
@@ -1266,13 +1380,18 @@ class ApiServer {
         };
     }
     api(module) {
+        this.assertNotFinalized('api');
         const router = express_1.default.Router();
         module.server = this;
         const moduleType = module.moduleType;
         if (moduleType === 'auth') {
             this.authModule(module);
         }
-        module.checkConfig();
+        const configOk = module.checkConfig();
+        if (configOk === false) {
+            const name = module.constructor?.name ? String(module.constructor.name) : 'ApiModule';
+            throw new Error(`${name}.checkConfig() returned false`);
+        }
         const base = this.apiBasePath;
         const ns = module.namespace;
         const mountPath = `${base}${ns}`;
@@ -1289,6 +1408,9 @@ class ApiServer {
                 case 'put':
                     router.put(r.path, handler);
                     break;
+                case 'patch':
+                    router.patch(r.path, handler);
+                    break;
                 case 'delete':
                     router.delete(r.path, handler);
                     break;
@@ -1297,8 +1419,7 @@ class ApiServer {
                 console.log(`Adding ${mountPath}${r.path} (${r.method.toUpperCase()})`);
             }
         });
-        this.app.use(mountPath, router);
-        this.ensureApiNotFoundOrdering();
+        this.apiRouter.use(ns, router);
         return this;
     }
     dumpRequest(apiReq) {