@constructive-io/graphql-server 5.33.4 → 5.33.5

package/esm/middleware/api.js

@@ -6,7 +6,7 @@ import { svcCache } from '@pgpmjs/server-utils';
 import { getPgPool } from 'pg-cache';
 import errorPage50x from '../errors/50x';
 import errorPage404Message from '../errors/404-message';
-import { requireApiRole, resolveRouteAcrossPlanes, routeToApiStructure } from './routing';
+import { requireApiRole, resolveRouteAcrossPlanes, routeToApiStructure, servedDatabasePool } from './routing';
 const log = new Logger('api');
 // =============================================================================
 // Module Loader Registry (replaces inline SQL queries for per-db config)
@@ -23,7 +23,7 @@ const defaultRegistry = createDefaultRegistry();
 // `is_published` governs cross-scope route visibility, not internal
 // addressability, so it does not filter this lookup.
 const API_BY_NAME_SQL = `
-  SELECT api_id, api_database_id AS database_id, dbname, role_name, anon_role, is_public, schemas
+  SELECT api_id, api_database_id AS database_id, role_name, anon_role, is_public, schemas
   FROM function_resolution.api_by_name($1, $2)
   LIMIT 1
 `;
@@ -31,18 +31,12 @@ const API_BY_NAME_SQL = `
  * Build a LoaderContext from the API row and options.
  * This is used to resolve per-database module settings via the loader registry.
  */
-const buildLoaderContext = (routingPool, opts, row) => {
-    // Scoped APIs leave dbname NULL when their schemas live in the serving
-    // database (pooled tenants); fall back to the server's own database.
-    const dbname = row.dbname || opts.pg?.database || '';
-    return {
-        routingPool,
-        tenantPool: getPgPool({ ...opts.pg, database: dbname }),
-        databaseId: row.database_id,
-        apiId: row.api_id,
-        dbname
-    };
-};
+const buildLoaderContext = (routingPool, opts, row) => ({
+    routingPool,
+    tenantPool: servedDatabasePool(opts),
+    databaseId: row.database_id,
+    apiId: row.api_id
+});
 /**
  * Resolve all per-database module settings in parallel via the loader registry.
  * Each loader independently caches by databaseId — repeated calls are cheap.
@@ -129,7 +123,7 @@ export const getSvcKey = (opts, req) => {
 };
 const toApiStructure = (row, opts, settings = {}) => ({
     apiId: row.api_id,
-    dbname: row.dbname || opts.pg?.database || '',
+    tenantPool: servedDatabasePool(opts),
     anonRole: requireApiRole('anon_role', row.anon_role, row.api_id),
     roleName: requireApiRole('role_name', row.role_name, row.api_id),
     schema: row.schemas || [],
@@ -144,7 +138,7 @@ const toApiStructure = (row, opts, settings = {}) => ({
     webauthnSettings: settings.webauthnSettings
 });
 const createAdminStructure = (opts, schemas, databaseId) => ({
-    dbname: opts.pg?.database ?? '',
+    tenantPool: servedDatabasePool(opts),
     anonRole: 'anonymous',
     roleName: 'authenticated',
     schema: schemas,
@@ -221,13 +215,12 @@ const resolveScopedRoute = async (ctx) => {
         error.code = 'CROSS_DATABASE_ROUTE';
         throw error;
     }
-    log.debug(`[scoped-routing] resolved host=${host} → api=${structure.apiId} db=${structure.dbname}`);
+    log.debug(`[scoped-routing] resolved host=${host} → api=${structure.apiId} databaseId=${structure.databaseId}`);
     if (!structure.databaseId || !structure.apiId)
         return structure;
     const loaderCtx = buildLoaderContext(pool, opts, {
         api_id: structure.apiId,
         database_id: structure.databaseId,
-        dbname: structure.dbname,
         role_name: structure.roleName,
         anon_role: structure.anonRole,
         is_public: structure.isPublic ?? false,
@@ -324,7 +317,7 @@ export const createApiMiddleware = (opts) => {
             }
             req.api = apiConfig;
             req.databaseId = apiConfig.databaseId;
-            log.debug(`Resolved API: db=${apiConfig.dbname}, schemas=[${apiConfig.schema?.join(', ')}]`);
+            log.debug(`Resolved API: databaseId=${apiConfig.databaseId}, schemas=[${apiConfig.schema?.join(', ')}]`);
             next();
         }
         catch (error) {

package/esm/middleware/auth.js

@@ -2,7 +2,6 @@ import './types'; // for Request type
 import { errors } from '@constructive-io/errors';
 import { getNodeEnv } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
-import { getPgPool } from 'pg-cache';
 import pgQueryContext from 'pg-query-context';
 import { respondWithGraphQLError } from '../errors/graphql-response';
 const log = new Logger('auth');
@@ -38,10 +37,7 @@ export const createAuthenticateMiddleware = (opts) => {
             res.status(500).send('Missing API info');
             return;
         }
-        const pool = getPgPool({
-            ...opts.pg,
-            database: api.dbname,
-        });
+        const pool = api.tenantPool;
         const rlsModule = api.rlsModule;
         log.info(`[auth] rlsModule=${rlsModule ? 'present' : 'missing'}, ` +
             `authenticate=${rlsModule?.authenticate ?? 'none'}, ` +

package/esm/middleware/graphile.js

@@ -5,8 +5,6 @@ import { Logger } from '@pgpmjs/logger';
 import { cacheGraphileInstance, createGraphileInstance, graphileCache } from 'graphile-cache';
 import { createFunctionBindingsPlugin } from 'graphile-function-bindings';
 import { createConstructivePreset, createGrafastCacheLimitsPreset } from 'graphile-settings';
-import { getPgPool } from 'pg-cache';
-import { getPgEnvOptions } from 'pg-env';
 import { isGraphqlObservabilityEnabled } from '../diagnostics/observability';
 import { HandlerCreationError } from '../errors/api-errors';
 import { respondWithGraphQLError } from '../errors/graphql-response';
@@ -261,17 +259,18 @@ export const graphile = (opts) => {
                 respondWithGraphQLError(res, errors.INTERNAL_FAILURE({ details: 'Missing service cache key' }));
                 return;
             }
-            const { dbname, anonRole, roleName, schema } = api;
+            const { anonRole, roleName, schema } = api;
+            const databaseLabel = api.databaseId ?? 'none';
             const schemaLabel = schema?.join(',') || 'unknown';
             // =========================================================================
             // Phase A: Cache Check (fast path)
             // =========================================================================
             const cached = graphileCache.get(key);
             if (cached) {
-                log.debug(`${label} PostGraphile cache hit key=${key} db=${dbname} schemas=${schemaLabel}`);
+                log.debug(`${label} PostGraphile cache hit key=${key} databaseId=${databaseLabel} schemas=${schemaLabel}`);
                 return cached.handler(req, res, next);
             }
-            log.debug(`${label} PostGraphile cache miss key=${key} db=${dbname} schemas=${schemaLabel}`);
+            log.debug(`${label} PostGraphile cache miss key=${key} databaseId=${databaseLabel} schemas=${schemaLabel}`);
             // =========================================================================
             // Phase B: In-Flight Check (single-flight coalescing)
             // =========================================================================
@@ -303,14 +302,8 @@ export const graphile = (opts) => {
                 const retryInstance = await retryInFlight;
                 return retryInstance.handler(req, res, next);
             }
-            log.info(`${label} Building PostGraphile v5 handler key=${key} db=${dbname} schemas=${schemaLabel} role=${roleName} anon=${anonRole}`);
-            const pgConfig = getPgEnvOptions({
-                ...opts.pg,
-                database: dbname
-            });
-            // Route through pg-cache so the pool is tracked and can be cleaned up
-            // properly, preventing leaked connections during database teardown.
-            const pool = getPgPool(pgConfig);
+            log.info(`${label} Building PostGraphile v5 handler key=${key} databaseId=${databaseLabel} schemas=${schemaLabel} role=${roleName} anon=${anonRole}`);
+            const pool = api.tenantPool;
             // Register the creation promise before any asynchronous preset work so
             // concurrent requests coalesce while optional plugin modules load.
             const creationPromise = (async () => {
@@ -333,7 +326,7 @@ export const graphile = (opts) => {
             creating.set(key, creationPromise);
             try {
                 const instance = await creationPromise;
-                log.info(`${label} Cached PostGraphile v5 handler key=${key} db=${dbname}`);
+                log.info(`${label} Cached PostGraphile v5 handler key=${key} databaseId=${databaseLabel}`);
                 return instance.handler(req, res, next);
             }
             catch (error) {

package/esm/middleware/observability/request-logger.js

@@ -18,7 +18,7 @@ export const createRequestLogger = ({ observabilityEnabled }) => {
             finished = true;
             const durationMs = Number(process.hrtime.bigint() - start) / 1e6;
             const apiInfo = req.api
-                ? `db=${req.api.dbname} schemas=${req.api.schema?.join(',') || 'none'}`
+                ? `databaseId=${req.api.databaseId ?? 'none'} schemas=${req.api.schema?.join(',') || 'none'}`
                 : 'api=unresolved';
             const authInfo = req.token ? 'auth=token' : 'auth=anon';
             const svcInfo = req.svc_key ? `svc=${req.svc_key}` : 'svc=unset';
@@ -31,7 +31,7 @@ export const createRequestLogger = ({ observabilityEnabled }) => {
                 }
                 const durationMs = Number(process.hrtime.bigint() - start) / 1e6;
                 const apiInfo = req.api
-                    ? `db=${req.api.dbname} schemas=${req.api.schema?.join(',') || 'none'}`
+                    ? `databaseId=${req.api.databaseId ?? 'none'} schemas=${req.api.schema?.join(',') || 'none'}`
                     : 'api=unresolved';
                 log.warn(`[${reqId}] connection closed before response completed ` +
                     `${req.method} ${req.originalUrl} (${durationMs.toFixed(1)} ms) ${apiInfo}`);

package/esm/middleware/routing.js

@@ -1,5 +1,6 @@
 import { Logger } from '@pgpmjs/logger';
 import { QuoteUtils } from '@pgsql/quotes';
+import { getPgPool } from 'pg-cache';
 const log = new Logger('routing');
 // =============================================================================
 // Scoped routing plane (resolve_route contract)
@@ -141,6 +142,8 @@ export const resolveRouteAcrossPlanes = async (pool, host) => {
  * rest of the middleware chain. Returns null when the route target is not an
  * api surface or its resolved_config lacks the api essentials (→ 404).
  */
+/** The server always serves its own configured database. */
+export const servedDatabasePool = (opts) => getPgPool({ ...opts.pg });
 export const routeToApiStructure = (route, opts) => {
     if (route.target_module !== 'apis' && route.target_module !== 'api') {
         return null;
@@ -153,9 +156,7 @@ export const routeToApiStructure = (route, opts) => {
     const apiId = config.api_id ?? route.target_source_id ?? undefined;
     return {
         apiId,
-        // Scoped APIs leave dbname NULL when their schemas live in the serving
-        // database; fall back to the server's own database in that case.
-        dbname: config.dbname || opts.pg?.database || '',
+        tenantPool: servedDatabasePool(opts),
         anonRole: requireApiRole('anon_role', config.anon_role, apiId),
         roleName: requireApiRole('role_name', config.role_name, apiId),
         schema: config.schemas,

package/middleware/api.js

@@ -29,7 +29,7 @@ const defaultRegistry = (0, express_context_1.createDefaultRegistry)();
 // `is_published` governs cross-scope route visibility, not internal
 // addressability, so it does not filter this lookup.
 const API_BY_NAME_SQL = `
-  SELECT api_id, api_database_id AS database_id, dbname, role_name, anon_role, is_public, schemas
+  SELECT api_id, api_database_id AS database_id, role_name, anon_role, is_public, schemas
   FROM function_resolution.api_by_name($1, $2)
   LIMIT 1
 `;
@@ -37,18 +37,12 @@ const API_BY_NAME_SQL = `
  * Build a LoaderContext from the API row and options.
  * This is used to resolve per-database module settings via the loader registry.
  */
-const buildLoaderContext = (routingPool, opts, row) => {
-    // Scoped APIs leave dbname NULL when their schemas live in the serving
-    // database (pooled tenants); fall back to the server's own database.
-    const dbname = row.dbname || opts.pg?.database || '';
-    return {
-        routingPool,
-        tenantPool: (0, pg_cache_1.getPgPool)({ ...opts.pg, database: dbname }),
-        databaseId: row.database_id,
-        apiId: row.api_id,
-        dbname
-    };
-};
+const buildLoaderContext = (routingPool, opts, row) => ({
+    routingPool,
+    tenantPool: (0, routing_1.servedDatabasePool)(opts),
+    databaseId: row.database_id,
+    apiId: row.api_id
+});
 /**
  * Resolve all per-database module settings in parallel via the loader registry.
  * Each loader independently caches by databaseId — repeated calls are cheap.
@@ -137,7 +131,7 @@ const getSvcKey = (opts, req) => {
 exports.getSvcKey = getSvcKey;
 const toApiStructure = (row, opts, settings = {}) => ({
     apiId: row.api_id,
-    dbname: row.dbname || opts.pg?.database || '',
+    tenantPool: (0, routing_1.servedDatabasePool)(opts),
     anonRole: (0, routing_1.requireApiRole)('anon_role', row.anon_role, row.api_id),
     roleName: (0, routing_1.requireApiRole)('role_name', row.role_name, row.api_id),
     schema: row.schemas || [],
@@ -152,7 +146,7 @@ const toApiStructure = (row, opts, settings = {}) => ({
     webauthnSettings: settings.webauthnSettings
 });
 const createAdminStructure = (opts, schemas, databaseId) => ({
-    dbname: opts.pg?.database ?? '',
+    tenantPool: (0, routing_1.servedDatabasePool)(opts),
     anonRole: 'anonymous',
     roleName: 'authenticated',
     schema: schemas,
@@ -229,13 +223,12 @@ const resolveScopedRoute = async (ctx) => {
         error.code = 'CROSS_DATABASE_ROUTE';
         throw error;
     }
-    log.debug(`[scoped-routing] resolved host=${host} → api=${structure.apiId} db=${structure.dbname}`);
+    log.debug(`[scoped-routing] resolved host=${host} → api=${structure.apiId} databaseId=${structure.databaseId}`);
     if (!structure.databaseId || !structure.apiId)
         return structure;
     const loaderCtx = buildLoaderContext(pool, opts, {
         api_id: structure.apiId,
         database_id: structure.databaseId,
-        dbname: structure.dbname,
         role_name: structure.roleName,
         anon_role: structure.anonRole,
         is_public: structure.isPublic ?? false,
@@ -333,7 +326,7 @@ const createApiMiddleware = (opts) => {
             }
             req.api = apiConfig;
             req.databaseId = apiConfig.databaseId;
-            log.debug(`Resolved API: db=${apiConfig.dbname}, schemas=[${apiConfig.schema?.join(', ')}]`);
+            log.debug(`Resolved API: databaseId=${apiConfig.databaseId}, schemas=[${apiConfig.schema?.join(', ')}]`);
             next();
         }
         catch (error) {

package/middleware/auth.js

@@ -8,7 +8,6 @@ require("./types"); // for Request type
 const errors_1 = require("@constructive-io/errors");
 const env_1 = require("@pgpmjs/env");
 const logger_1 = require("@pgpmjs/logger");
-const pg_cache_1 = require("pg-cache");
 const pg_query_context_1 = __importDefault(require("pg-query-context"));
 const graphql_response_1 = require("../errors/graphql-response");
 const log = new logger_1.Logger('auth');
@@ -45,10 +44,7 @@ const createAuthenticateMiddleware = (opts) => {
             res.status(500).send('Missing API info');
             return;
         }
-        const pool = (0, pg_cache_1.getPgPool)({
-            ...opts.pg,
-            database: api.dbname,
-        });
+        const pool = api.tenantPool;
         const rlsModule = api.rlsModule;
         log.info(`[auth] rlsModule=${rlsModule ? 'present' : 'missing'}, ` +
             `authenticate=${rlsModule?.authenticate ?? 'none'}, ` +

package/middleware/graphile.js

@@ -11,8 +11,6 @@ const logger_1 = require("@pgpmjs/logger");
 const graphile_cache_1 = require("graphile-cache");
 const graphile_function_bindings_1 = require("graphile-function-bindings");
 const graphile_settings_1 = require("graphile-settings");
-const pg_cache_1 = require("pg-cache");
-const pg_env_1 = require("pg-env");
 const observability_1 = require("../diagnostics/observability");
 const api_errors_1 = require("../errors/api-errors");
 const graphql_response_1 = require("../errors/graphql-response");
@@ -267,17 +265,18 @@ const graphile = (opts) => {
                 (0, graphql_response_1.respondWithGraphQLError)(res, errors_1.errors.INTERNAL_FAILURE({ details: 'Missing service cache key' }));
                 return;
             }
-            const { dbname, anonRole, roleName, schema } = api;
+            const { anonRole, roleName, schema } = api;
+            const databaseLabel = api.databaseId ?? 'none';
             const schemaLabel = schema?.join(',') || 'unknown';
             // =========================================================================
             // Phase A: Cache Check (fast path)
             // =========================================================================
             const cached = graphile_cache_1.graphileCache.get(key);
             if (cached) {
-                log.debug(`${label} PostGraphile cache hit key=${key} db=${dbname} schemas=${schemaLabel}`);
+                log.debug(`${label} PostGraphile cache hit key=${key} databaseId=${databaseLabel} schemas=${schemaLabel}`);
                 return cached.handler(req, res, next);
             }
-            log.debug(`${label} PostGraphile cache miss key=${key} db=${dbname} schemas=${schemaLabel}`);
+            log.debug(`${label} PostGraphile cache miss key=${key} databaseId=${databaseLabel} schemas=${schemaLabel}`);
             // =========================================================================
             // Phase B: In-Flight Check (single-flight coalescing)
             // =========================================================================
@@ -309,14 +308,8 @@ const graphile = (opts) => {
                 const retryInstance = await retryInFlight;
                 return retryInstance.handler(req, res, next);
             }
-            log.info(`${label} Building PostGraphile v5 handler key=${key} db=${dbname} schemas=${schemaLabel} role=${roleName} anon=${anonRole}`);
-            const pgConfig = (0, pg_env_1.getPgEnvOptions)({
-                ...opts.pg,
-                database: dbname
-            });
-            // Route through pg-cache so the pool is tracked and can be cleaned up
-            // properly, preventing leaked connections during database teardown.
-            const pool = (0, pg_cache_1.getPgPool)(pgConfig);
+            log.info(`${label} Building PostGraphile v5 handler key=${key} databaseId=${databaseLabel} schemas=${schemaLabel} role=${roleName} anon=${anonRole}`);
+            const pool = api.tenantPool;
             // Register the creation promise before any asynchronous preset work so
             // concurrent requests coalesce while optional plugin modules load.
             const creationPromise = (async () => {
@@ -339,7 +332,7 @@ const graphile = (opts) => {
             creating.set(key, creationPromise);
             try {
                 const instance = await creationPromise;
-                log.info(`${label} Cached PostGraphile v5 handler key=${key} db=${dbname}`);
+                log.info(`${label} Cached PostGraphile v5 handler key=${key} databaseId=${databaseLabel}`);
                 return instance.handler(req, res, next);
             }
             catch (error) {

package/middleware/observability/request-logger.js

@@ -21,7 +21,7 @@ const createRequestLogger = ({ observabilityEnabled }) => {
             finished = true;
             const durationMs = Number(process.hrtime.bigint() - start) / 1e6;
             const apiInfo = req.api
-                ? `db=${req.api.dbname} schemas=${req.api.schema?.join(',') || 'none'}`
+                ? `databaseId=${req.api.databaseId ?? 'none'} schemas=${req.api.schema?.join(',') || 'none'}`
                 : 'api=unresolved';
             const authInfo = req.token ? 'auth=token' : 'auth=anon';
             const svcInfo = req.svc_key ? `svc=${req.svc_key}` : 'svc=unset';
@@ -34,7 +34,7 @@ const createRequestLogger = ({ observabilityEnabled }) => {
                 }
                 const durationMs = Number(process.hrtime.bigint() - start) / 1e6;
                 const apiInfo = req.api
-                    ? `db=${req.api.dbname} schemas=${req.api.schema?.join(',') || 'none'}`
+                    ? `databaseId=${req.api.databaseId ?? 'none'} schemas=${req.api.schema?.join(',') || 'none'}`
                     : 'api=unresolved';
                 log.warn(`[${reqId}] connection closed before response completed ` +
                     `${req.method} ${req.originalUrl} (${durationMs.toFixed(1)} ms) ${apiInfo}`);

package/middleware/routing.d.ts

@@ -75,4 +75,6 @@ export declare const resolveRouteAcrossPlanes: (pool: Pool, host: string) => Pro
  * rest of the middleware chain. Returns null when the route target is not an
  * api surface or its resolved_config lacks the api essentials (→ 404).
  */
+/** The server always serves its own configured database. */
+export declare const servedDatabasePool: (opts: ApiOptions) => Pool;
 export declare const routeToApiStructure: (route: ResolvedRoute, opts: ApiOptions) => ApiStructure | null;

package/middleware/routing.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.routeToApiStructure = exports.resolveRouteAcrossPlanes = exports.loadRoutingPlanes = exports.resolveRoute = exports.isValidSchemaName = exports.ROUTING_SCHEMA = exports.requireApiRole = void 0;
+exports.routeToApiStructure = exports.servedDatabasePool = exports.resolveRouteAcrossPlanes = exports.loadRoutingPlanes = exports.resolveRoute = exports.isValidSchemaName = exports.ROUTING_SCHEMA = exports.requireApiRole = void 0;
 const logger_1 = require("@pgpmjs/logger");
 const quotes_1 = require("@pgsql/quotes");
+const pg_cache_1 = require("pg-cache");
 const log = new logger_1.Logger('routing');
 // =============================================================================
 // Scoped routing plane (resolve_route contract)
@@ -149,6 +150,9 @@ exports.resolveRouteAcrossPlanes = resolveRouteAcrossPlanes;
  * rest of the middleware chain. Returns null when the route target is not an
  * api surface or its resolved_config lacks the api essentials (→ 404).
  */
+/** The server always serves its own configured database. */
+const servedDatabasePool = (opts) => (0, pg_cache_1.getPgPool)({ ...opts.pg });
+exports.servedDatabasePool = servedDatabasePool;
 const routeToApiStructure = (route, opts) => {
     if (route.target_module !== 'apis' && route.target_module !== 'api') {
         return null;
@@ -161,9 +165,7 @@ const routeToApiStructure = (route, opts) => {
     const apiId = config.api_id ?? route.target_source_id ?? undefined;
     return {
         apiId,
-        // Scoped APIs leave dbname NULL when their schemas live in the serving
-        // database; fall back to the server's own database in that case.
-        dbname: config.dbname || opts.pg?.database || '',
+        tenantPool: (0, exports.servedDatabasePool)(opts),
         anonRole: (0, exports.requireApiRole)('anon_role', config.anon_role, apiId),
         roleName: (0, exports.requireApiRole)('role_name', config.role_name, apiId),
         schema: config.schemas,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "5.33.4",
+  "version": "5.33.5",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -43,7 +43,7 @@
     "@agentic-kit/ollama": "2.16.0",
     "@constructive-io/csrf": "^0.31.0",
     "@constructive-io/errors": "^0.25.0",
-    "@constructive-io/express-context": "^0.35.3",
+    "@constructive-io/express-context": "^0.35.4",
     "@constructive-io/graphql-env": "^3.37.2",
     "@constructive-io/graphql-types": "^3.36.1",
     "@constructive-io/llm-env": "^0.16.0",
@@ -72,7 +72,7 @@
     "graphile-plugin-utils": "^1.14.1",
     "graphile-presigned-url-plugin": "^1.23.4",
     "graphile-scoped-introspection": "^0.6.0",
-    "graphile-settings": "^6.28.3",
+    "graphile-settings": "^6.28.4",
     "graphile-utils": "5.0.3",
     "graphql": "16.13.0",
     "graphql-upload": "^13.0.0",
@@ -98,5 +98,5 @@
     "supertest": "^7.2.2",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "7ce27b6ff591192fe5eb87e26bb3fb1e538d6505"
+  "gitHead": "ed0726630bf8211ff3f58934e0e0b70a180284db"
 }