@constructive-io/express-context 0.14.2 → 0.18.0

package/README.md

@@ -63,11 +63,11 @@ Each loader encapsulates a SQL query + type transform + per-databaseId LRU cache
 
 | Loader | Source | Description |
 |--------|--------|-------------|
-| `rlsLoader` | `constructive_routing_public.rls_settings` | RLS module (authenticate functions, schema refs) |
-| `corsLoader` | `constructive_routing_public.cors_settings` | CORS allowed origins |
-| `databaseSettingsLoader` | `constructive_routing_public.database_settings` | Feature flags (aggregates, search, uploads, etc.) |
-| `pubkeyLoader` | `constructive_routing_public.pubkey_settings` | Public key challenge auth settings |
-| `webauthnLoader` | `constructive_routing_public.webauthn_settings` | WebAuthn/passkey configuration |
+| `rlsLoader` | `routing_public.rls_settings` | RLS module (authenticate functions, schema refs) |
+| `corsLoader` | `routing_public.cors_settings` | CORS allowed origins |
+| `databaseSettingsLoader` | `routing_public.database_settings` | Feature flags (aggregates, search, uploads, etc.) |
+| `pubkeyLoader` | `routing_public.pubkey_settings` | Public key challenge auth settings |
+| `webauthnLoader` | `routing_public.webauthn_settings` | WebAuthn/passkey configuration |
 | `authSettingsLoader` | `metaschema_modules_public.sessions_module` | Cookie/captcha settings (two-step tenant DB discovery) |
 
 ### Custom loaders

package/context.d.ts

@@ -22,6 +22,8 @@ export interface ContextMiddlewareOptions {
     pg?: PgpmOptions['pg'];
     /** Module loader registry for per-database cached lookups */
     loaders?: LoaderRegistry;
+    /** Routing-plane schema loaders query (defaults to routing_public) */
+    routingSchema?: string;
 }
 /**
  * Build the ConstructiveContext from the current request state.

package/context.js

@@ -67,6 +67,7 @@ function buildContext(req, opts = {}) {
         const routingPool = (0, pg_cache_1.getPgPool)(opts.pg);
         loaderCtx = {
             routingPool,
+            routingSchema: opts.routingSchema,
             tenantPool,
             databaseId: api.databaseId,
             apiId: api.apiId,

package/esm/context.js

@@ -63,6 +63,7 @@ export function buildContext(req, opts = {}) {
         const routingPool = getPgPool(opts.pg);
         loaderCtx = {
             routingPool,
+            routingSchema: opts.routingSchema,
             tenantPool,
             databaseId: api.databaseId,
             apiId: api.apiId,

package/esm/loaders/cors.js

@@ -2,54 +2,39 @@
  * CORS Origins Loader
  *
  * Resolves allowed CORS origins for a database+API combination from the
- * scoped routing plane. Checks per-API settings first, falls back to
- * database-level default, then to the api_modules approach.
+ * scoped routing plane. Checks per-API settings first, falls back to the
+ * database-level default.
  */
 import { createModuleLoader } from './create-loader';
+import { routingSchemaOf } from './types';
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const CORS_SETTINGS_SQL = `
+const corsSettingsSql = (schema) => `
   SELECT allowed_origins
-  FROM constructive_routing_public.cors_settings
+  FROM "${schema}".cors_settings
   WHERE database_id = $1 AND api_id = $2
   LIMIT 1
 `;
-const CORS_SETTINGS_DB_DEFAULT_SQL = `
+const corsSettingsDbDefaultSql = (schema) => `
   SELECT allowed_origins
-  FROM constructive_routing_public.cors_settings
+  FROM "${schema}".cors_settings
   WHERE database_id = $1 AND api_id IS NULL
   LIMIT 1
 `;
-const CORS_MODULE_SQL = `
-  SELECT data
-  FROM constructive_routing_public.api_modules
-  WHERE api_id = $1 AND name = 'cors'
-  LIMIT 1
-`;
 // ─── Loader ─────────────────────────────────────────────────────────────────
 export const corsLoader = createModuleLoader({
     name: 'corsOrigins',
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
         const { routingPool, databaseId, apiId } = ctx;
-        // Try per-API cors_settings first
-        try {
-            if (apiId) {
-                const perApi = await routingPool.query(CORS_SETTINGS_SQL, [databaseId, apiId]);
-                if (perApi.rows[0])
-                    return perApi.rows[0].allowed_origins;
-            }
-            const dbDefault = await routingPool.query(CORS_SETTINGS_DB_DEFAULT_SQL, [databaseId]);
-            if (dbDefault.rows[0])
-                return dbDefault.rows[0].allowed_origins;
-        }
-        catch {
-            // Table may not exist yet
-        }
-        // Fall back to api_modules
+        const schema = routingSchemaOf(ctx);
         if (apiId) {
-            const result = await routingPool.query(CORS_MODULE_SQL, [apiId]);
-            return result.rows[0]?.data?.urls;
+            const perApi = await routingPool.query(corsSettingsSql(schema), [databaseId, apiId]);
+            if (perApi.rows[0])
+                return perApi.rows[0].allowed_origins;
         }
+        const dbDefault = await routingPool.query(corsSettingsDbDefaultSql(schema), [databaseId]);
+        if (dbDefault.rows[0])
+            return dbDefault.rows[0].allowed_origins;
         return undefined;
     }
 });

package/esm/loaders/database-settings.js

@@ -6,8 +6,9 @@
  * Merges database-level defaults with optional per-API overrides.
  */
 import { createModuleLoader } from './create-loader';
+import { routingSchemaOf } from './types';
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const DATABASE_SETTINGS_SQL = `
+const databaseSettingsSql = (schema) => `
   SELECT
     COALESCE(aps.enable_aggregates, ds.enable_aggregates) AS resolved_enable_aggregates,
     COALESCE(aps.enable_postgis, ds.enable_postgis) AS resolved_enable_postgis,
@@ -21,8 +22,8 @@ const DATABASE_SETTINGS_SQL = `
     COALESCE(aps.enable_realtime, ds.enable_realtime) AS resolved_enable_realtime,
     COALESCE(aps.enable_bulk, ds.enable_bulk) AS resolved_enable_bulk,
     COALESCE(aps.enable_i18n, ds.enable_i18n) AS resolved_enable_i18n
-  FROM constructive_routing_public.database_settings ds
-  LEFT JOIN constructive_routing_public.api_settings aps ON ds.database_id = aps.database_id AND aps.api_id = $2
+  FROM "${schema}".database_settings ds
+  LEFT JOIN "${schema}".api_settings aps ON ds.database_id = aps.database_id AND aps.api_id = $2
   WHERE ds.database_id = $1
   LIMIT 1
 `;
@@ -32,7 +33,7 @@ export const databaseSettingsLoader = createModuleLoader({
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
         const { routingPool, databaseId, apiId } = ctx;
-        const result = await routingPool.query(DATABASE_SETTINGS_SQL, [databaseId, apiId ?? null]);
+        const result = await routingPool.query(databaseSettingsSql(routingSchemaOf(ctx)), [databaseId, apiId ?? null]);
         const row = result.rows[0];
         if (!row)
             return undefined;

package/esm/loaders/index.js

@@ -6,11 +6,11 @@
  * a LoaderRegistry and pass it to createContextMiddleware().
  *
  * Built-in loaders cover the standard Constructive modules:
- *   - rlsModule       (constructive_routing_public.rls_settings)
- *   - corsOrigins     (constructive_routing_public.cors_settings)
- *   - databaseSettings(constructive_routing_public.database_settings)
- *   - pubkeyChallengeSettings (constructive_routing_public.pubkey_settings)
- *   - webauthnSettings(constructive_routing_public.webauthn_settings)
+ *   - rlsModule       (routing-plane rls_settings)
+ *   - corsOrigins     (routing-plane cors_settings)
+ *   - databaseSettings(routing-plane database_settings)
+ *   - pubkeyChallengeSettings (routing-plane pubkey_settings)
+ *   - webauthnSettings(routing-plane webauthn_settings)
  *   - authSettings    (metaschema_modules_public.sessions_module → tenant DB)
  *
  * To add a new per-db lookup, implement a ModuleLoader and register it:

package/esm/loaders/pubkey.js

@@ -2,12 +2,13 @@
  * Pubkey Challenge Settings Loader
  *
  * Resolves public-key challenge auth config (crypto network, sign-in/sign-up
- * function names) from the scoped routing plane. Tries the pubkey_settings
- * table first, falls back to the api_modules approach.
+ * function names) from the scoped routing plane via the typed pubkey_settings
+ * table.
  */
 import { createModuleLoader } from './create-loader';
+import { routingSchemaOf } from './types';
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const PUBKEY_SETTINGS_SQL = `
+const pubkeySettingsSql = (schema) => `
   SELECT
     s.schema_name AS schema,
     ps.crypto_network,
@@ -15,7 +16,7 @@ const PUBKEY_SETTINGS_SQL = `
     sign_in_req_fn.name AS sign_in_request_challenge,
     sign_in_fail_fn.name AS sign_in_record_failure,
     sign_in_fn.name AS sign_in_with_challenge
-  FROM constructive_routing_public.pubkey_settings ps
+  FROM "${schema}".pubkey_settings ps
   LEFT JOIN metaschema_public.schema s ON ps.schema_id = s.id
   LEFT JOIN metaschema_public.function sign_up_fn ON ps.sign_up_with_key_function_id = sign_up_fn.id
   LEFT JOIN metaschema_public.function sign_in_req_fn ON ps.sign_in_request_challenge_function_id = sign_in_req_fn.id
@@ -24,12 +25,6 @@ const PUBKEY_SETTINGS_SQL = `
   WHERE ps.database_id = $1
   LIMIT 1
 `;
-const PUBKEY_MODULE_SQL = `
-  SELECT data
-  FROM constructive_routing_public.api_modules
-  WHERE api_id = $1 AND name = 'pubkey_challenge'
-  LIMIT 1
-`;
 // ─── Transforms ─────────────────────────────────────────────────────────────
 function fromRow(row) {
     if (!row?.schema || !row?.sign_up_with_key)
@@ -48,22 +43,8 @@ export const pubkeyLoader = createModuleLoader({
     name: 'pubkeyChallengeSettings',
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
-        const { routingPool, databaseId, apiId } = ctx;
-        // Try new pubkey_settings table first
-        try {
-            const result = await routingPool.query(PUBKEY_SETTINGS_SQL, [databaseId]);
-            const resolved = fromRow(result.rows[0] ?? null);
-            if (resolved)
-                return resolved;
-        }
-        catch {
-            // Table may not exist yet
-        }
-        // Fall back to api_modules
-        if (apiId) {
-            const result = await routingPool.query(PUBKEY_MODULE_SQL, [apiId]);
-            return fromRow(result.rows[0]?.data ?? null);
-        }
-        return undefined;
+        const { routingPool, databaseId } = ctx;
+        const result = await routingPool.query(pubkeySettingsSql(routingSchemaOf(ctx)), [databaseId]);
+        return fromRow(result.rows[0] ?? null);
     }
 });

package/esm/loaders/rls.js

@@ -2,12 +2,13 @@
  * RLS Module Loader
  *
  * Resolves RLS authentication function names and schema references for
- * a given database from the scoped routing plane. Tries the rls_settings
- * table first, falls back to the api_modules approach.
+ * a given database from the scoped routing plane via the typed rls_settings
+ * table.
  */
 import { createModuleLoader } from './create-loader';
+import { routingSchemaOf } from './types';
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const RLS_SETTINGS_SQL = `
+const rlsSettingsSql = (schema) => `
   SELECT
     auth_schema.schema_name AS authenticate_schema,
     role_schema.schema_name AS role_schema,
@@ -17,7 +18,7 @@ const RLS_SETTINGS_SQL = `
     role_id_fn.name AS current_role_id,
     ua_fn.name AS current_user_agent,
     ip_fn.name AS current_ip_address
-  FROM constructive_routing_public.rls_settings rs
+  FROM "${schema}".rls_settings rs
   LEFT JOIN metaschema_public.schema auth_schema ON rs.authenticate_schema_id = auth_schema.id
   LEFT JOIN metaschema_public.schema role_schema ON rs.role_schema_id = role_schema.id
   LEFT JOIN metaschema_public.function auth_fn ON rs.authenticate_function_id = auth_fn.id
@@ -29,12 +30,6 @@ const RLS_SETTINGS_SQL = `
   WHERE rs.database_id = $1
   LIMIT 1
 `;
-const RLS_MODULE_SQL = `
-  SELECT data
-  FROM constructive_routing_public.api_modules
-  WHERE api_id = $1 AND name = 'rls_module'
-  LIMIT 1
-`;
 // ─── Transforms ─────────────────────────────────────────────────────────────
 function fromSettings(row) {
     if (!row)
@@ -52,42 +47,13 @@ function fromSettings(row) {
         currentUserAgent: row.current_user_agent
     };
 }
-function fromModule(row) {
-    if (!row?.data)
-        return undefined;
-    const d = row.data;
-    return {
-        authenticate: d.authenticate,
-        authenticateStrict: d.authenticate_strict,
-        privateSchema: { schemaName: d.authenticate_schema },
-        publicSchema: { schemaName: d.role_schema },
-        currentRole: d.current_role,
-        currentRoleId: d.current_role_id,
-        currentIpAddress: d.current_ip_address,
-        currentUserAgent: d.current_user_agent
-    };
-}
 // ─── Loader ─────────────────────────────────────────────────────────────────
 export const rlsLoader = createModuleLoader({
     name: 'rlsModule',
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
-        const { routingPool, databaseId, apiId } = ctx;
-        // Try new rls_settings table first
-        try {
-            const result = await routingPool.query(RLS_SETTINGS_SQL, [databaseId]);
-            const resolved = fromSettings(result.rows[0] ?? null);
-            if (resolved)
-                return resolved;
-        }
-        catch {
-            // Table may not exist yet
-        }
-        // Fall back to api_modules
-        if (apiId) {
-            const result = await routingPool.query(RLS_MODULE_SQL, [apiId]);
-            return fromModule(result.rows[0] ?? null);
-        }
-        return undefined;
+        const { routingPool, databaseId } = ctx;
+        const result = await routingPool.query(rlsSettingsSql(routingSchemaOf(ctx)), [databaseId]);
+        return fromSettings(result.rows[0] ?? null);
     }
 });

package/esm/loaders/types.js

@@ -9,4 +9,17 @@
  * during context building. The result is a typed modules map on
  * `req.constructive.modules`.
  */
-export {};
+/** Published logical name of the scoped routing plane. */
+export const DEFAULT_ROUTING_SCHEMA = 'routing_public';
+/**
+ * The routing-plane schema a loader should query: the context override or
+ * the published default. Throws on names unsafe to interpolate as an
+ * identifier.
+ */
+export const routingSchemaOf = (ctx) => {
+    const schema = ctx.routingSchema ?? DEFAULT_ROUTING_SCHEMA;
+    if (!/^[a-z_][a-z0-9_]*$/.test(schema)) {
+        throw new Error(`invalid routing schema name: ${schema}`);
+    }
+    return schema;
+};

package/esm/loaders/webauthn.js

@@ -5,8 +5,9 @@
  * schema references, attestation policy, and challenge expiry.
  */
 import { createModuleLoader } from './create-loader';
+import { routingSchemaOf } from './types';
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const WEBAUTHN_SETTINGS_SQL = `
+const webauthnSettingsSql = (schema) => `
   SELECT
     s.schema_name AS schema,
     cred_s.schema_name AS credentials_schema,
@@ -19,7 +20,7 @@ const WEBAUTHN_SETTINGS_SQL = `
     ws.require_user_verification,
     ws.resident_key,
     ws.challenge_expiry_seconds
-  FROM constructive_routing_public.webauthn_settings ws
+  FROM "${schema}".webauthn_settings ws
   LEFT JOIN metaschema_public.schema s ON ws.schema_id = s.id
   LEFT JOIN metaschema_public.schema cred_s ON ws.credentials_schema_id = cred_s.id
   LEFT JOIN metaschema_public.schema sess_s ON ws.sessions_schema_id = sess_s.id
@@ -33,7 +34,7 @@ export const webauthnLoader = createModuleLoader({
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
         const { routingPool, databaseId } = ctx;
-        const result = await routingPool.query(WEBAUTHN_SETTINGS_SQL, [databaseId]);
+        const result = await routingPool.query(webauthnSettingsSql(routingSchemaOf(ctx)), [databaseId]);
         const row = result.rows[0];
         if (!row?.schema)
             return undefined;

package/index.d.ts

@@ -34,7 +34,7 @@
  * });
  * ```
  */
-export type { AgentChatConfig, ApiConfigResult, ApiError, ApiModule, ApiStructure, AuthSettings, BillingConfig, BuiltinModuleMap, ComputeConfig, ComputeModuleConfig, ConstructiveAPIToken, ConstructiveContext, CorsModuleData, DatabaseSettings, GenericModuleData, InferenceLogConfig, LlmConfig, PublicKeyChallengeData, PubkeyChallengeSettings, RlsModule, WebauthnSettings, WithPgClient, } from './types';
+export type { AgentChatConfig, ApiConfigResult, ApiError, ApiStructure, AuthSettings, BillingConfig, BuiltinModuleMap, ComputeConfig, ComputeModuleConfig, ConstructiveAPIToken, ConstructiveContext, DatabaseSettings, InferenceLogConfig, LlmConfig, PubkeyChallengeSettings, RlsModule, WebauthnSettings, WithPgClient, } from './types';
 export type { BillingClient, InferenceLogEntry } from './billing-client';
 export { createBillingClient } from './billing-client';
 export type { PgSettingsInput } from './pg-settings';

package/loaders/cors.d.ts

@@ -2,8 +2,8 @@
  * CORS Origins Loader
  *
  * Resolves allowed CORS origins for a database+API combination from the
- * scoped routing plane. Checks per-API settings first, falls back to
- * database-level default, then to the api_modules approach.
+ * scoped routing plane. Checks per-API settings first, falls back to the
+ * database-level default.
  */
 import type { ModuleLoader } from './types';
 export declare const corsLoader: ModuleLoader<string[]>;

package/loaders/cors.js

@@ -3,56 +3,41 @@
  * CORS Origins Loader
  *
  * Resolves allowed CORS origins for a database+API combination from the
- * scoped routing plane. Checks per-API settings first, falls back to
- * database-level default, then to the api_modules approach.
+ * scoped routing plane. Checks per-API settings first, falls back to the
+ * database-level default.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.corsLoader = void 0;
 const create_loader_1 = require("./create-loader");
+const types_1 = require("./types");
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const CORS_SETTINGS_SQL = `
+const corsSettingsSql = (schema) => `
   SELECT allowed_origins
-  FROM constructive_routing_public.cors_settings
+  FROM "${schema}".cors_settings
   WHERE database_id = $1 AND api_id = $2
   LIMIT 1
 `;
-const CORS_SETTINGS_DB_DEFAULT_SQL = `
+const corsSettingsDbDefaultSql = (schema) => `
   SELECT allowed_origins
-  FROM constructive_routing_public.cors_settings
+  FROM "${schema}".cors_settings
   WHERE database_id = $1 AND api_id IS NULL
   LIMIT 1
 `;
-const CORS_MODULE_SQL = `
-  SELECT data
-  FROM constructive_routing_public.api_modules
-  WHERE api_id = $1 AND name = 'cors'
-  LIMIT 1
-`;
 // ─── Loader ─────────────────────────────────────────────────────────────────
 exports.corsLoader = (0, create_loader_1.createModuleLoader)({
     name: 'corsOrigins',
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
         const { routingPool, databaseId, apiId } = ctx;
-        // Try per-API cors_settings first
-        try {
-            if (apiId) {
-                const perApi = await routingPool.query(CORS_SETTINGS_SQL, [databaseId, apiId]);
-                if (perApi.rows[0])
-                    return perApi.rows[0].allowed_origins;
-            }
-            const dbDefault = await routingPool.query(CORS_SETTINGS_DB_DEFAULT_SQL, [databaseId]);
-            if (dbDefault.rows[0])
-                return dbDefault.rows[0].allowed_origins;
-        }
-        catch {
-            // Table may not exist yet
-        }
-        // Fall back to api_modules
+        const schema = (0, types_1.routingSchemaOf)(ctx);
         if (apiId) {
-            const result = await routingPool.query(CORS_MODULE_SQL, [apiId]);
-            return result.rows[0]?.data?.urls;
+            const perApi = await routingPool.query(corsSettingsSql(schema), [databaseId, apiId]);
+            if (perApi.rows[0])
+                return perApi.rows[0].allowed_origins;
         }
+        const dbDefault = await routingPool.query(corsSettingsDbDefaultSql(schema), [databaseId]);
+        if (dbDefault.rows[0])
+            return dbDefault.rows[0].allowed_origins;
         return undefined;
     }
 });

package/loaders/database-settings.js

@@ -9,8 +9,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.databaseSettingsLoader = void 0;
 const create_loader_1 = require("./create-loader");
+const types_1 = require("./types");
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const DATABASE_SETTINGS_SQL = `
+const databaseSettingsSql = (schema) => `
   SELECT
     COALESCE(aps.enable_aggregates, ds.enable_aggregates) AS resolved_enable_aggregates,
     COALESCE(aps.enable_postgis, ds.enable_postgis) AS resolved_enable_postgis,
@@ -24,8 +25,8 @@ const DATABASE_SETTINGS_SQL = `
     COALESCE(aps.enable_realtime, ds.enable_realtime) AS resolved_enable_realtime,
     COALESCE(aps.enable_bulk, ds.enable_bulk) AS resolved_enable_bulk,
     COALESCE(aps.enable_i18n, ds.enable_i18n) AS resolved_enable_i18n
-  FROM constructive_routing_public.database_settings ds
-  LEFT JOIN constructive_routing_public.api_settings aps ON ds.database_id = aps.database_id AND aps.api_id = $2
+  FROM "${schema}".database_settings ds
+  LEFT JOIN "${schema}".api_settings aps ON ds.database_id = aps.database_id AND aps.api_id = $2
   WHERE ds.database_id = $1
   LIMIT 1
 `;
@@ -35,7 +36,7 @@ exports.databaseSettingsLoader = (0, create_loader_1.createModuleLoader)({
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
         const { routingPool, databaseId, apiId } = ctx;
-        const result = await routingPool.query(DATABASE_SETTINGS_SQL, [databaseId, apiId ?? null]);
+        const result = await routingPool.query(databaseSettingsSql((0, types_1.routingSchemaOf)(ctx)), [databaseId, apiId ?? null]);
         const row = result.rows[0];
         if (!row)
             return undefined;

package/loaders/index.d.ts

@@ -6,11 +6,11 @@
  * a LoaderRegistry and pass it to createContextMiddleware().
  *
  * Built-in loaders cover the standard Constructive modules:
- *   - rlsModule       (constructive_routing_public.rls_settings)
- *   - corsOrigins     (constructive_routing_public.cors_settings)
- *   - databaseSettings(constructive_routing_public.database_settings)
- *   - pubkeyChallengeSettings (constructive_routing_public.pubkey_settings)
- *   - webauthnSettings(constructive_routing_public.webauthn_settings)
+ *   - rlsModule       (routing-plane rls_settings)
+ *   - corsOrigins     (routing-plane cors_settings)
+ *   - databaseSettings(routing-plane database_settings)
+ *   - pubkeyChallengeSettings (routing-plane pubkey_settings)
+ *   - webauthnSettings(routing-plane webauthn_settings)
  *   - authSettings    (metaschema_modules_public.sessions_module → tenant DB)
  *
  * To add a new per-db lookup, implement a ModuleLoader and register it:

package/loaders/index.js

@@ -7,11 +7,11 @@
  * a LoaderRegistry and pass it to createContextMiddleware().
  *
  * Built-in loaders cover the standard Constructive modules:
- *   - rlsModule       (constructive_routing_public.rls_settings)
- *   - corsOrigins     (constructive_routing_public.cors_settings)
- *   - databaseSettings(constructive_routing_public.database_settings)
- *   - pubkeyChallengeSettings (constructive_routing_public.pubkey_settings)
- *   - webauthnSettings(constructive_routing_public.webauthn_settings)
+ *   - rlsModule       (routing-plane rls_settings)
+ *   - corsOrigins     (routing-plane cors_settings)
+ *   - databaseSettings(routing-plane database_settings)
+ *   - pubkeyChallengeSettings (routing-plane pubkey_settings)
+ *   - webauthnSettings(routing-plane webauthn_settings)
  *   - authSettings    (metaschema_modules_public.sessions_module → tenant DB)
  *
  * To add a new per-db lookup, implement a ModuleLoader and register it:

package/loaders/pubkey.d.ts

@@ -2,8 +2,8 @@
  * Pubkey Challenge Settings Loader
  *
  * Resolves public-key challenge auth config (crypto network, sign-in/sign-up
- * function names) from the scoped routing plane. Tries the pubkey_settings
- * table first, falls back to the api_modules approach.
+ * function names) from the scoped routing plane via the typed pubkey_settings
+ * table.
  */
 import type { PubkeyChallengeSettings } from '../types';
 import type { ModuleLoader } from './types';

package/loaders/pubkey.js

@@ -3,14 +3,15 @@
  * Pubkey Challenge Settings Loader
  *
  * Resolves public-key challenge auth config (crypto network, sign-in/sign-up
- * function names) from the scoped routing plane. Tries the pubkey_settings
- * table first, falls back to the api_modules approach.
+ * function names) from the scoped routing plane via the typed pubkey_settings
+ * table.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pubkeyLoader = void 0;
 const create_loader_1 = require("./create-loader");
+const types_1 = require("./types");
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const PUBKEY_SETTINGS_SQL = `
+const pubkeySettingsSql = (schema) => `
   SELECT
     s.schema_name AS schema,
     ps.crypto_network,
@@ -18,7 +19,7 @@ const PUBKEY_SETTINGS_SQL = `
     sign_in_req_fn.name AS sign_in_request_challenge,
     sign_in_fail_fn.name AS sign_in_record_failure,
     sign_in_fn.name AS sign_in_with_challenge
-  FROM constructive_routing_public.pubkey_settings ps
+  FROM "${schema}".pubkey_settings ps
   LEFT JOIN metaschema_public.schema s ON ps.schema_id = s.id
   LEFT JOIN metaschema_public.function sign_up_fn ON ps.sign_up_with_key_function_id = sign_up_fn.id
   LEFT JOIN metaschema_public.function sign_in_req_fn ON ps.sign_in_request_challenge_function_id = sign_in_req_fn.id
@@ -27,12 +28,6 @@ const PUBKEY_SETTINGS_SQL = `
   WHERE ps.database_id = $1
   LIMIT 1
 `;
-const PUBKEY_MODULE_SQL = `
-  SELECT data
-  FROM constructive_routing_public.api_modules
-  WHERE api_id = $1 AND name = 'pubkey_challenge'
-  LIMIT 1
-`;
 // ─── Transforms ─────────────────────────────────────────────────────────────
 function fromRow(row) {
     if (!row?.schema || !row?.sign_up_with_key)
@@ -51,22 +46,8 @@ exports.pubkeyLoader = (0, create_loader_1.createModuleLoader)({
     name: 'pubkeyChallengeSettings',
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
-        const { routingPool, databaseId, apiId } = ctx;
-        // Try new pubkey_settings table first
-        try {
-            const result = await routingPool.query(PUBKEY_SETTINGS_SQL, [databaseId]);
-            const resolved = fromRow(result.rows[0] ?? null);
-            if (resolved)
-                return resolved;
-        }
-        catch {
-            // Table may not exist yet
-        }
-        // Fall back to api_modules
-        if (apiId) {
-            const result = await routingPool.query(PUBKEY_MODULE_SQL, [apiId]);
-            return fromRow(result.rows[0]?.data ?? null);
-        }
-        return undefined;
+        const { routingPool, databaseId } = ctx;
+        const result = await routingPool.query(pubkeySettingsSql((0, types_1.routingSchemaOf)(ctx)), [databaseId]);
+        return fromRow(result.rows[0] ?? null);
     }
 });

package/loaders/rls.d.ts

@@ -2,8 +2,8 @@
  * RLS Module Loader
  *
  * Resolves RLS authentication function names and schema references for
- * a given database from the scoped routing plane. Tries the rls_settings
- * table first, falls back to the api_modules approach.
+ * a given database from the scoped routing plane via the typed rls_settings
+ * table.
  */
 import type { RlsModule } from '../types';
 import type { ModuleLoader } from './types';

package/loaders/rls.js

@@ -3,14 +3,15 @@
  * RLS Module Loader
  *
  * Resolves RLS authentication function names and schema references for
- * a given database from the scoped routing plane. Tries the rls_settings
- * table first, falls back to the api_modules approach.
+ * a given database from the scoped routing plane via the typed rls_settings
+ * table.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rlsLoader = void 0;
 const create_loader_1 = require("./create-loader");
+const types_1 = require("./types");
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const RLS_SETTINGS_SQL = `
+const rlsSettingsSql = (schema) => `
   SELECT
     auth_schema.schema_name AS authenticate_schema,
     role_schema.schema_name AS role_schema,
@@ -20,7 +21,7 @@ const RLS_SETTINGS_SQL = `
     role_id_fn.name AS current_role_id,
     ua_fn.name AS current_user_agent,
     ip_fn.name AS current_ip_address
-  FROM constructive_routing_public.rls_settings rs
+  FROM "${schema}".rls_settings rs
   LEFT JOIN metaschema_public.schema auth_schema ON rs.authenticate_schema_id = auth_schema.id
   LEFT JOIN metaschema_public.schema role_schema ON rs.role_schema_id = role_schema.id
   LEFT JOIN metaschema_public.function auth_fn ON rs.authenticate_function_id = auth_fn.id
@@ -32,12 +33,6 @@ const RLS_SETTINGS_SQL = `
   WHERE rs.database_id = $1
   LIMIT 1
 `;
-const RLS_MODULE_SQL = `
-  SELECT data
-  FROM constructive_routing_public.api_modules
-  WHERE api_id = $1 AND name = 'rls_module'
-  LIMIT 1
-`;
 // ─── Transforms ─────────────────────────────────────────────────────────────
 function fromSettings(row) {
     if (!row)
@@ -55,42 +50,13 @@ function fromSettings(row) {
         currentUserAgent: row.current_user_agent
     };
 }
-function fromModule(row) {
-    if (!row?.data)
-        return undefined;
-    const d = row.data;
-    return {
-        authenticate: d.authenticate,
-        authenticateStrict: d.authenticate_strict,
-        privateSchema: { schemaName: d.authenticate_schema },
-        publicSchema: { schemaName: d.role_schema },
-        currentRole: d.current_role,
-        currentRoleId: d.current_role_id,
-        currentIpAddress: d.current_ip_address,
-        currentUserAgent: d.current_user_agent
-    };
-}
 // ─── Loader ─────────────────────────────────────────────────────────────────
 exports.rlsLoader = (0, create_loader_1.createModuleLoader)({
     name: 'rlsModule',
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
-        const { routingPool, databaseId, apiId } = ctx;
-        // Try new rls_settings table first
-        try {
-            const result = await routingPool.query(RLS_SETTINGS_SQL, [databaseId]);
-            const resolved = fromSettings(result.rows[0] ?? null);
-            if (resolved)
-                return resolved;
-        }
-        catch {
-            // Table may not exist yet
-        }
-        // Fall back to api_modules
-        if (apiId) {
-            const result = await routingPool.query(RLS_MODULE_SQL, [apiId]);
-            return fromModule(result.rows[0] ?? null);
-        }
-        return undefined;
+        const { routingPool, databaseId } = ctx;
+        const result = await routingPool.query(rlsSettingsSql((0, types_1.routingSchemaOf)(ctx)), [databaseId]);
+        return fromSettings(result.rows[0] ?? null);
     }
 });

package/loaders/types.d.ts

@@ -10,14 +10,24 @@
  * `req.constructive.modules`.
  */
 import type { Pool } from 'pg';
+/** Published logical name of the scoped routing plane. */
+export declare const DEFAULT_ROUTING_SCHEMA = "routing_public";
+/**
+ * The routing-plane schema a loader should query: the context override or
+ * the published default. Throws on names unsafe to interpolate as an
+ * identifier.
+ */
+export declare const routingSchemaOf: (ctx: Pick<LoaderContext, "routingSchema">) => string;
 /**
  * Context passed to every loader's resolve function.
  * Provides both pool references so the loader can query whichever
  * database tier it needs.
  */
 export interface LoaderContext {
-    /** Routing/configuration database pool (for constructive_routing_public.* lookups) */
+    /** Routing/configuration database pool (for routing-plane lookups) */
     routingPool: Pool;
+    /** Routing-plane schema to query (defaults to the published routing_public) */
+    routingSchema?: string;
     /** Tenant database pool (for metaschema_modules_public.* lookups) */
     tenantPool: Pool;
     /** UUID of the database being resolved */

package/loaders/types.js

@@ -11,3 +11,19 @@
  * `req.constructive.modules`.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.routingSchemaOf = exports.DEFAULT_ROUTING_SCHEMA = void 0;
+/** Published logical name of the scoped routing plane. */
+exports.DEFAULT_ROUTING_SCHEMA = 'routing_public';
+/**
+ * The routing-plane schema a loader should query: the context override or
+ * the published default. Throws on names unsafe to interpolate as an
+ * identifier.
+ */
+const routingSchemaOf = (ctx) => {
+    const schema = ctx.routingSchema ?? exports.DEFAULT_ROUTING_SCHEMA;
+    if (!/^[a-z_][a-z0-9_]*$/.test(schema)) {
+        throw new Error(`invalid routing schema name: ${schema}`);
+    }
+    return schema;
+};
+exports.routingSchemaOf = routingSchemaOf;

package/loaders/webauthn.js

@@ -8,8 +8,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webauthnLoader = void 0;
 const create_loader_1 = require("./create-loader");
+const types_1 = require("./types");
 // ─── SQL ────────────────────────────────────────────────────────────────────
-const WEBAUTHN_SETTINGS_SQL = `
+const webauthnSettingsSql = (schema) => `
   SELECT
     s.schema_name AS schema,
     cred_s.schema_name AS credentials_schema,
@@ -22,7 +23,7 @@ const WEBAUTHN_SETTINGS_SQL = `
     ws.require_user_verification,
     ws.resident_key,
     ws.challenge_expiry_seconds
-  FROM constructive_routing_public.webauthn_settings ws
+  FROM "${schema}".webauthn_settings ws
   LEFT JOIN metaschema_public.schema s ON ws.schema_id = s.id
   LEFT JOIN metaschema_public.schema cred_s ON ws.credentials_schema_id = cred_s.id
   LEFT JOIN metaschema_public.schema sess_s ON ws.sessions_schema_id = sess_s.id
@@ -36,7 +37,7 @@ exports.webauthnLoader = (0, create_loader_1.createModuleLoader)({
     ttlMs: 5 * 60_000,
     async resolve(ctx) {
         const { routingPool, databaseId } = ctx;
-        const result = await routingPool.query(WEBAUTHN_SETTINGS_SQL, [databaseId]);
+        const result = await routingPool.query(webauthnSettingsSql((0, types_1.routingSchemaOf)(ctx)), [databaseId]);
         const row = result.rows[0];
         if (!row?.schema)
             return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/express-context",
-  "version": "0.14.2",
+  "version": "0.18.0",
   "description": "Extractable Express middleware for Constructive tenant context — domain resolution, JWT auth, pgSettings, and withPgClient",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -29,15 +29,15 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@constructive-io/url-domains": "^2.20.2",
-    "@pgpmjs/env": "^2.30.2",
-    "@pgpmjs/logger": "^2.15.2",
-    "@pgpmjs/server-utils": "^3.16.2",
-    "@pgpmjs/types": "^2.37.2",
+    "@constructive-io/url-domains": "^2.23.0",
+    "@pgpmjs/env": "^2.33.0",
+    "@pgpmjs/logger": "^2.18.0",
+    "@pgpmjs/server-utils": "^3.19.0",
+    "@pgpmjs/types": "^2.40.0",
     "lru-cache": "^11.2.7",
     "pg": "^8.21.0",
-    "pg-cache": "^3.16.2",
-    "pg-query-context": "^2.20.2"
+    "pg-cache": "^3.19.0",
+    "pg-query-context": "^2.23.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.6",
@@ -59,5 +59,5 @@
     "jwt",
     "pgSettings"
   ],
-  "gitHead": "08741ce3a6897192c2dbc7d1da48b9f456ffb59f"
+  "gitHead": "73f55ad24d9a92e7ef1e268526b31bfb7bb12b28"
 }

package/types.d.ts

@@ -8,20 +8,6 @@
  */
 import type { Pool, PoolClient } from 'pg';
 import type { BillingClient } from './billing-client';
-export interface CorsModuleData {
-    urls: string[];
-}
-export interface PublicKeyChallengeData {
-    schema: string;
-    crypto_network: string;
-    sign_up_with_key: string;
-    sign_in_request_challenge: string;
-    sign_in_record_failure: string;
-    sign_in_with_challenge: string;
-}
-export interface GenericModuleData {
-    [key: string]: unknown;
-}
 export interface DatabaseSettings {
     enableAggregates: boolean;
     enablePostgis: boolean;
@@ -57,16 +43,6 @@ export interface WebauthnSettings {
     residentKey: string;
     challengeExpirySeconds: number;
 }
-export type ApiModule = {
-    name: 'cors';
-    data: CorsModuleData;
-} | {
-    name: 'pubkey_challenge';
-    data: PublicKeyChallengeData;
-} | {
-    name: string;
-    data?: GenericModuleData;
-};
 export interface RlsModule {
     authenticate: string;
     authenticateStrict: string;
@@ -98,7 +74,6 @@ export interface ApiStructure {
     anonRole: string;
     roleName: string;
     schema: string[];
-    apiModules: ApiModule[];
     rlsModule?: RlsModule;
     domains?: string[];
     databaseId?: string;