@technomoron/api-server-base 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/cjs/auth-api/auth-module.js

@@ -240,23 +240,31 @@ class AuthModule extends module_js_1.BaseAuthModule {
         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 forwardedProto = (typeof forwarded === 'string' ? forwarded : Array.isArray(forwarded) ? (forwarded[0] ?? '') : '')
+            .split(',')[0]
+            .trim()
+            .toLowerCase();
+        const isHttps = forwardedProto === 'https' || apiReq.req.protocol === 'https';
         const isLocalhost = origin.includes('localhost');
+        const secure = conf.cookieSecure === true ? true : conf.cookieSecure === false ? false : /* auto */ Boolean(isHttps);
+        let sameSite = conf.cookieSameSite ?? 'lax';
+        if (sameSite !== 'lax' && sameSite !== 'strict' && sameSite !== 'none') {
+            sameSite = 'lax';
+        }
+        let resolvedSecure = secure;
+        if (sameSite === 'none' && resolvedSecure !== true) {
+            resolvedSecure = true;
+        }
         const options = {
-            httpOnly: true,
-            secure: true,
-            sameSite: 'strict',
+            httpOnly: conf.cookieHttpOnly ?? true,
+            secure: resolvedSecure,
+            sameSite,
             domain: conf.cookieDomain || undefined,
-            path: '/',
+            path: conf.cookiePath || '/',
             maxAge: undefined
         };
-        if (conf.devMode) {
-            options.secure = isHttps;
-            options.httpOnly = false;
-            options.sameSite = 'lax';
-            if (isLocalhost) {
-                options.domain = undefined;
-            }
+        if (conf.devMode && isLocalhost) {
+            options.domain = undefined;
         }
         return options;
     }
@@ -552,10 +560,39 @@ class AuthModule extends module_js_1.BaseAuthModule {
                 apiReq.req.cookies[conf.accessCookie].trim().length > 0);
         const shouldRefresh = Boolean(body.refresh) || !hasAccessToken;
         if (shouldRefresh) {
-            const access = this.server.jwtSign(this.buildTokenPayload(user, stored), conf.accessSecret, conf.accessExpiry);
+            const updateToken = this.storage.updateToken;
+            if (typeof updateToken !== 'function' || !this.storageImplements('updateToken')) {
+                throw new api_server_base_js_1.ApiError({ code: 501, message: 'Token update storage is not configured' });
+            }
+            // Sign a new access token without embedding stored token secrets into the JWT payload.
+            const metadata = {
+                ruid: stored.ruid,
+                domain: stored.domain,
+                fingerprint: stored.fingerprint,
+                label: stored.label,
+                clientId: stored.clientId,
+                scope: stored.scope,
+                browser: stored.browser,
+                device: stored.device,
+                ip: stored.ip,
+                os: stored.os,
+                loginType: stored.loginType,
+                refreshTtlSeconds: this.normalizeRefreshTtlSeconds(stored.refreshTtlSeconds),
+                sessionCookie: stored.sessionCookie
+            };
+            const enrichedMetadata = this.enrichTokenMetadata(apiReq, metadata);
+            const access = this.server.jwtSign(this.buildTokenPayload(user, enrichedMetadata), conf.accessSecret, conf.accessExpiry);
             if (!access.success || !access.token) {
                 throw new api_server_base_js_1.ApiError({ code: 500, message: access.error ?? 'Unable to sign access token' });
             }
+            const updated = await updateToken.call(this.storage, {
+                refreshToken,
+                accessToken: access.token,
+                lastSeenAt: new Date()
+            });
+            if (!updated) {
+                throw new api_server_base_js_1.ApiError({ code: 500, message: 'Unable to persist refreshed access token' });
+            }
             const cookiePrefs = this.mergeSessionPreferences({
                 sessionCookie: stored.sessionCookie,
                 refreshTtlSeconds: this.normalizeRefreshTtlSeconds(stored.refreshTtlSeconds)
@@ -1001,14 +1038,11 @@ class AuthModule extends module_js_1.BaseAuthModule {
             if (!secretProvided) {
                 throw new api_server_base_js_1.ApiError({ code: 400, message: 'Client authentication is required' });
             }
-            let valid = false;
-            if (this.storage.verifyClientSecret) {
-                const verifySecret = this.storage.verifyClientSecret.bind(this.storage);
-                valid = await verifySecret(client, clientSecret);
-            }
-            else {
-                valid = client.clientSecret === clientSecret;
+            const verifySecret = this.storage.verifyClientSecret;
+            if (typeof verifySecret !== 'function' || !this.storageImplements('verifyClientSecret')) {
+                throw new api_server_base_js_1.ApiError({ code: 501, message: 'OAuth client secret verification is not configured' });
             }
+            const valid = await verifySecret.call(this.storage, client, clientSecret);
             if (!valid) {
                 throw new api_server_base_js_1.ApiError({ code: 401, message: 'Invalid client credentials' });
             }
@@ -1156,7 +1190,7 @@ class AuthModule extends module_js_1.BaseAuthModule {
                     auth: { type: 'strict', req: 'any' }
                 }, {
                     method: 'delete',
-                    path: '/v1/passkeys/:credentialId?',
+                    path: '/v1/passkeys/:credentialId',
                     handler: (req) => this.deletePasskey(req),
                     auth: { type: 'strict', req: 'any' }
                 });

package/dist/cjs/auth-api/mem-auth-store.js

@@ -25,7 +25,8 @@ function normalizePasskeyConfig(config = {}) {
         timeoutMs: typeof config.timeoutMs === 'number' && config.timeoutMs > 0
             ? config.timeoutMs
             : DEFAULT_PASSKEY_CONFIG.timeoutMs,
-        userVerification: config.userVerification ?? DEFAULT_PASSKEY_CONFIG.userVerification
+        userVerification: config.userVerification ?? DEFAULT_PASSKEY_CONFIG.userVerification,
+        debug: Boolean(config.debug)
     };
 }
 class MemAuthStore {

package/dist/cjs/auth-api/sql-auth-store.js

@@ -41,7 +41,8 @@ function normalizePasskeyConfig(config = {}) {
         timeoutMs: typeof config.timeoutMs === 'number' && config.timeoutMs > 0
             ? config.timeoutMs
             : DEFAULT_PASSKEY_CONFIG.timeoutMs,
-        userVerification: config.userVerification ?? DEFAULT_PASSKEY_CONFIG.userVerification
+        userVerification: config.userVerification ?? DEFAULT_PASSKEY_CONFIG.userVerification,
+        debug: Boolean(config.debug)
     };
 }
 class SqlAuthStore {

package/dist/cjs/oauth/memory.js

@@ -12,7 +12,8 @@ function cloneClient(client) {
     }
     return {
         clientId: client.clientId,
-        clientSecret: client.clientSecret,
+        // clientSecret is stored hashed; do not return the hash.
+        clientSecret: client.clientSecret ? '__stored__' : undefined,
         name: client.name,
         redirectUris: [...client.redirectUris],
         scope: client.scope ? [...client.scope] : undefined,

package/dist/cjs/oauth/sequelize.js

@@ -204,7 +204,8 @@ class SequelizeOAuthStore extends base_js_1.OAuthStore {
     toOAuthClient(model) {
         return {
             clientId: model.client_id,
-            clientSecret: model.client_secret,
+            // client_secret is stored hashed; do not return the hash.
+            clientSecret: model.client_secret ? '__stored__' : undefined,
             name: model.name ?? undefined,
             redirectUris: decodeStringArray(model.redirect_uris),
             scope: decodeStringArray(model.scope),

package/dist/cjs/passkey/service.js

@@ -268,7 +268,7 @@ class PasskeyService {
             }
         }
         const publicKey = publicKeyPrimary && publicKeyPrimary.length > 0 ? publicKeyPrimary : publicKeyFallback;
-        if (this.logger?.warn) {
+        if (this.config.debug && this.logger?.warn) {
             const pkPrimaryHex = publicKeyPrimary ? publicKeyPrimary.slice(0, 4).toString('hex') : 'null';
             const pkFallbackHex = publicKeyFallback ? publicKeyFallback.slice(0, 4).toString('hex') : 'null';
             this.logger.warn(`Passkey registration: pkPrimary len=${publicKeyPrimary?.length ?? 0} head=${pkPrimaryHex}, pkFallback len=${publicKeyFallback?.length ?? 0} head=${pkFallbackHex}`);

package/dist/cjs/passkey/types.d.ts

@@ -8,6 +8,11 @@ export interface PasskeyServiceConfig {
     origins: string[];
     timeoutMs: number;
     userVerification?: 'preferred' | 'required' | 'discouraged';
+    /**
+     * When enabled, PasskeyService emits additional diagnostic logs during registration/authentication.
+     * Defaults to false.
+     */
+    debug?: boolean;
 }
 export interface PasskeyChallengeRecord {
     challenge: string;

package/dist/esm/api-server-base.d.ts

@@ -92,6 +92,7 @@ export interface ApiServerConf {
     apiHost: string;
     uploadPath: string;
     uploadMax: number;
+    staticDirs?: Record<string, string>;
     origins: string[];
     debug: boolean;
     apiBasePath: string;
@@ -99,7 +100,21 @@ export interface ApiServerConf {
     swaggerPath?: string;
     accessSecret: string;
     refreshSecret: string;
+    /** Cookie domain for auth cookies. Prefer leaving empty for localhost/development. */
     cookieDomain: string;
+    /** Cookie path for auth cookies. */
+    cookiePath?: string;
+    /** Cookie SameSite attribute for auth cookies. */
+    cookieSameSite?: 'lax' | 'strict' | 'none';
+    /**
+     * Cookie Secure attribute for auth cookies.
+     * - true: always secure
+     * - false: never secure
+     * - 'auto': secure when request is HTTPS (or forwarded as HTTPS)
+     */
+    cookieSecure?: boolean | 'auto';
+    /** Cookie HttpOnly attribute for auth cookies. */
+    cookieHttpOnly?: boolean;
     accessCookie: string;
     refreshCookie: string;
     accessExpiry: number;
@@ -117,10 +132,11 @@ export interface ApiServerConf {
 }
 export declare class ApiServer {
     app: Application;
-    currReq: ApiRequest | null;
     readonly config: ApiServerConf;
     readonly startedAt: number;
     private readonly apiBasePath;
+    private readonly apiRouter;
+    private finalized;
     private storageAdapter;
     private moduleAdapter;
     private serverAuthAdapter;
@@ -131,7 +147,17 @@ export declare class ApiServer {
     private oauthStoreAdapter;
     private canImpersonateAdapter;
     private readonly jwtHelper;
+    /**
+     * @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(): ApiRequest | null;
+    set currReq(_value: ApiRequest | null);
     constructor(config?: Partial<ApiServerConf>);
+    private assertNotFinalized;
+    private toApiRouterPath;
+    finalize(): this;
     authStorage<UserRow, SafeUser>(storage: AuthAdapter<UserRow, SafeUser>): this;
     /**
      * @deprecated Use {@link ApiServer.authStorage} instead.
@@ -193,12 +219,12 @@ export declare class ApiServer {
     guessExceptionText(error: unknown, defMsg?: string): string;
     protected authorize(apiReq: ApiRequest, requiredClass: ApiAuthClass): Promise<void>;
     private middlewares;
+    private installStaticDirs;
     private installPingHandler;
     private loadSwaggerSpec;
     private installSwaggerHandler;
     private normalizeApiBasePath;
     private installApiNotFoundHandler;
-    private ensureApiNotFoundOrdering;
     private describeMissingEndpoint;
     start(): this;
     private verifyJWT;

package/dist/esm/api-server-base.js

@@ -335,6 +335,7 @@ function fillConfig(config) {
         apiHost: config.apiHost ?? 'localhost',
         uploadPath: config.uploadPath ?? '',
         uploadMax: config.uploadMax ?? 30 * 1024 * 1024,
+        staticDirs: config.staticDirs,
         origins: config.origins ?? [],
         debug: config.debug ?? false,
         apiBasePath: config.apiBasePath ?? '/api',
@@ -342,7 +343,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,
@@ -360,8 +365,19 @@ function fillConfig(config) {
     };
 }
 export 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) {
+        void _value;
+    }
     constructor(config = {}) {
-        this.currReq = null;
+        this.finalized = false;
         this.serverAuthAdapter = null;
         this.apiNotFoundHandler = null;
         this.tokenStoreAdapter = null;
@@ -386,16 +402,67 @@ export class ApiServer {
             this.storageAdapter = this.getServerAuthAdapter();
         }
         this.app = express();
+        // 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.Router();
         if (config.uploadPath) {
-            const upload = multer({ dest: config.uploadPath });
+            const upload = multer({ 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();
     }
+    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.finalized = true;
+        return this;
+    }
     authStorage(storage) {
         this.storageAdapter = storage;
         return this;
@@ -621,7 +688,7 @@ export class ApiServer {
         }
         return false;
     }
-    guessExceptionText(error, defMsg = 'Unkown Error') {
+    guessExceptionText(error, defMsg = 'Unknown Error') {
         return guess_exception_text(error, defMsg);
     }
     async authorize(apiReq, requiredClass) {
@@ -647,6 +714,41 @@ export class ApiServer {
             credentials: true
         };
         this.app.use(cors(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;
+        if (!staticDirs || !isPlainObject(staticDirs)) {
+            return;
+        }
+        for (const [mountRaw, dirRaw] of Object.entries(staticDirs)) {
+            const mount = typeof mountRaw === 'string' ? mountRaw.trim() : '';
+            const dir = typeof dirRaw === 'string' ? dirRaw.trim() : '';
+            if (!mount || !dir) {
+                continue;
+            }
+            const resolvedMount = mount.startsWith('/') ? mount : `/${mount}`;
+            this.app.use(resolvedMount, express.static(dir));
+        }
     }
     installPingHandler() {
         const path = `${this.apiBasePath}/v1/ping`;
@@ -745,28 +847,16 @@ export class ApiServer {
         };
         this.app.use(this.apiBasePath, this.apiNotFoundHandler);
     }
-    ensureApiNotFoundOrdering() {
-        this.installApiNotFoundHandler();
-        if (!this.apiNotFoundHandler) {
-            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);
-    }
     describeMissingEndpoint(req) {
         const method = typeof req.method === 'string' ? req.method.toUpperCase() : 'GET';
         const target = req.originalUrl || req.url || this.apiBasePath;
         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,
@@ -776,19 +866,22 @@ export 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;
+            throw err;
         });
         return this;
     }
@@ -810,23 +903,33 @@ export class ApiServer {
         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 forwardedProto = (typeof forwarded === 'string' ? forwarded : Array.isArray(forwarded) ? (forwarded[0] ?? '') : '')
+            .split(',')[0]
+            .trim()
+            .toLowerCase();
+        const isHttps = forwardedProto === 'https' || apiReq.req.protocol === 'https';
         const isLocalhost = origin.includes('localhost');
+        const secure = conf.cookieSecure === true ? true : conf.cookieSecure === false ? false : /* auto */ Boolean(isHttps);
+        let sameSite = conf.cookieSameSite ?? 'lax';
+        if (sameSite !== 'lax' && sameSite !== 'strict' && sameSite !== 'none') {
+            sameSite = 'lax';
+        }
+        let resolvedSecure = secure;
+        if (sameSite === 'none' && resolvedSecure !== true) {
+            // Modern browsers reject SameSite=None cookies unless Secure is set.
+            resolvedSecure = true;
+        }
         const options = {
-            httpOnly: true,
-            secure: true,
-            sameSite: 'strict',
+            httpOnly: conf.cookieHttpOnly ?? true,
+            secure: resolvedSecure,
+            sameSite,
             domain: conf.cookieDomain || undefined,
-            path: '/',
+            path: conf.cookiePath || '/',
             maxAge: undefined
         };
-        if (conf.devMode) {
-            options.secure = isHttps;
-            options.httpOnly = false;
-            options.sameSite = 'lax';
-            if (isLocalhost) {
-                options.domain = undefined;
-            }
+        if (conf.devMode && isLocalhost) {
+            // Domain cookies do not work on localhost; avoid breaking local development when cookieDomain is set.
+            options.domain = undefined;
         }
         return options;
     }
@@ -974,7 +1077,7 @@ export 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);
@@ -1026,6 +1129,11 @@ export 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: '',
@@ -1085,13 +1193,19 @@ export 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) {
@@ -1125,7 +1239,6 @@ export 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);
@@ -1178,7 +1291,6 @@ export 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);
@@ -1241,13 +1353,18 @@ export class ApiServer {
         };
     }
     api(module) {
+        this.assertNotFinalized('api');
         const router = express.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}`;
@@ -1272,8 +1389,7 @@ export 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) {