@constructive-io/graphql-server 5.33.0 → 5.33.1

package/esm/middleware/routing.js

@@ -38,7 +38,7 @@ export const requireApiRole = (column, value, apiId) => {
     return value;
 };
 const RESOLVER_FUNCTION = 'resolve_route';
-/** The scoped routing plane the server resolves hosts on first. */
+/** API schema of the routing plane the server resolves hosts on first. */
 export const ROUTING_SCHEMA = 'routing_public';
 export const isValidSchemaName = (name) => /^[a-z_][a-z0-9_]*$/.test(name);
 /**
@@ -74,21 +74,25 @@ export const resolveRoute = async (pool, schema, host) => {
     }
 };
 /**
- * The database-scope routing planes after the server's own `routing_public` plane, in
- * the static gateway's order (by database id). The list spans every tenant,
- * so it comes from a SECURITY DEFINER reader granted to the platform login
- * alone, on the login's own connection: no role switch, no RLS bypass. A plane
- * whose registration names no schema or resolver is an incomplete install and
- * fails loud.
+ * Every database-scope routing plane, in the static gateway's order (by
+ * database id). The list spans every tenant, so it comes from a SECURITY
+ * DEFINER reader granted to the platform login alone, on the login's own
+ * connection: no role switch, no RLS bypass. A plane whose registration names
+ * no schema or resolver is an incomplete install and fails loud.
  */
-export const loadDatabaseRoutingPlanes = async (pool) => {
-    const { rows } = await pool.query(`SELECT database_id, schema_name, resolver_function_name
+export const loadRoutingPlanes = async (pool) => {
+    const { rows } = await pool.query(`SELECT database_id, schema_name, resolver_schema_name, resolver_function_name
        FROM function_resolution.routing_planes()`);
-    return rows
-        .filter((row) => row.schema_name !== ROUTING_SCHEMA)
-        .map((row) => {
-        if (!row.schema_name || !row.resolver_function_name) {
-            const error = new Error(`route_module for database ${row.database_id} names no ${row.schema_name ? 'resolver function' : 'public schema'}`);
+    return rows.map((row) => {
+        const missing = !row.schema_name
+            ? 'public schema'
+            : !row.resolver_schema_name
+                ? 'resolver schema'
+                : !row.resolver_function_name
+                    ? 'resolver function'
+                    : null;
+        if (missing) {
+            const error = new Error(`route_module for database ${row.database_id} names no ${missing}`);
             error.code = 'ROUTING_PLANE_INCOMPLETE';
             error.databaseId = row.database_id;
             throw error;
@@ -96,26 +100,33 @@ export const loadDatabaseRoutingPlanes = async (pool) => {
         return {
             databaseId: row.database_id,
             schema: row.schema_name,
+            resolverSchema: row.resolver_schema_name,
             resolver: row.resolver_function_name
         };
     });
 };
 const resolveOnPlane = async (pool, plane, host) => {
-    const resolver = QuoteUtils.quoteQualifiedIdentifier(plane.schema, plane.resolver);
+    const resolver = QuoteUtils.quoteQualifiedIdentifier(plane.resolverSchema, plane.resolver);
     const result = await pool.query(`SELECT * FROM ${resolver}($1, '/', NULL)`, [host]);
     const row = result.rows[0];
     return row && row.route_binding_id !== null ? row : null;
 };
 /**
- * Resolve a host across routing planes: `routing_public` first, then
- * each tenant database-scope plane. The first plane that matches owns the
- * host; later planes are not consulted.
+ * Resolve a host across routing planes: the server's own `routing_public`
+ * plane first, then each tenant database-scope plane. The first plane that
+ * matches owns the host; later planes are not consulted.
  */
 export const resolveRouteAcrossPlanes = async (pool, host) => {
-    const route = await resolveRoute(pool, ROUTING_SCHEMA, host);
-    if (route)
-        return { route, planeDatabaseId: null };
-    for (const plane of await loadDatabaseRoutingPlanes(pool)) {
+    const planes = await loadRoutingPlanes(pool);
+    const own = planes.find((plane) => plane.schema === ROUTING_SCHEMA);
+    if (own) {
+        const route = await resolveRoute(pool, own.resolverSchema, host);
+        if (route)
+            return { route, planeDatabaseId: null };
+    }
+    for (const plane of planes) {
+        if (plane === own)
+            continue;
         const planeRoute = await resolveOnPlane(pool, plane, host);
         if (planeRoute) {
             log.debug(`[resolve-route] host=${host} owned by database plane ${plane.schema} (db=${plane.databaseId})`);

package/middleware/routing.d.ts

@@ -25,7 +25,7 @@ export interface ResolvedRoute {
     tls_status: string | null;
     tls_secret_name: string | null;
 }
-/** The scoped routing plane the server resolves hosts on first. */
+/** API schema of the routing plane the server resolves hosts on first. */
 export declare const ROUTING_SCHEMA = "routing_public";
 export declare const isValidSchemaName: (name: string) => boolean;
 /**
@@ -41,32 +41,33 @@ export declare const resolveRoute: (pool: Pool, schema: string, host: string) =>
  * `resolved_config`) that the server maps onto ApiStructure.
  */
 /**
- * A tenant database's own database-scope routing plane: one `route_module`
- * row whose resolver keeps the resolve_route contract.
+ * A database-scope routing plane: one `route_module` row whose resolver keeps
+ * the resolve_route contract. `schema` is the plane's API schema (it names the
+ * server's own plane); `resolverSchema` is where its resolver lives.
  */
 export interface DatabaseRoutingPlane {
     databaseId: string;
     schema: string;
+    resolverSchema: string;
     resolver: string;
 }
 /**
- * The database-scope routing planes after the server's own `routing_public` plane, in
- * the static gateway's order (by database id). The list spans every tenant,
- * so it comes from a SECURITY DEFINER reader granted to the platform login
- * alone, on the login's own connection: no role switch, no RLS bypass. A plane
- * whose registration names no schema or resolver is an incomplete install and
- * fails loud.
+ * Every database-scope routing plane, in the static gateway's order (by
+ * database id). The list spans every tenant, so it comes from a SECURITY
+ * DEFINER reader granted to the platform login alone, on the login's own
+ * connection: no role switch, no RLS bypass. A plane whose registration names
+ * no schema or resolver is an incomplete install and fails loud.
  */
-export declare const loadDatabaseRoutingPlanes: (pool: Pool) => Promise<DatabaseRoutingPlane[]>;
+export declare const loadRoutingPlanes: (pool: Pool) => Promise<DatabaseRoutingPlane[]>;
 export interface PlaneRouteMatch {
     route: ResolvedRoute;
     /** Database whose own plane owns the host; null for `routing_public`. */
     planeDatabaseId: string | null;
 }
 /**
- * Resolve a host across routing planes: `routing_public` first, then
- * each tenant database-scope plane. The first plane that matches owns the
- * host; later planes are not consulted.
+ * Resolve a host across routing planes: the server's own `routing_public`
+ * plane first, then each tenant database-scope plane. The first plane that
+ * matches owns the host; later planes are not consulted.
  */
 export declare const resolveRouteAcrossPlanes: (pool: Pool, host: string) => Promise<PlaneRouteMatch | null>;
 /**

package/middleware/routing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.routeToApiStructure = exports.resolveRouteAcrossPlanes = exports.loadDatabaseRoutingPlanes = exports.resolveRoute = exports.isValidSchemaName = exports.ROUTING_SCHEMA = exports.requireApiRole = void 0;
+exports.routeToApiStructure = 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 log = new logger_1.Logger('routing');
@@ -42,7 +42,7 @@ const requireApiRole = (column, value, apiId) => {
 };
 exports.requireApiRole = requireApiRole;
 const RESOLVER_FUNCTION = 'resolve_route';
-/** The scoped routing plane the server resolves hosts on first. */
+/** API schema of the routing plane the server resolves hosts on first. */
 exports.ROUTING_SCHEMA = 'routing_public';
 const isValidSchemaName = (name) => /^[a-z_][a-z0-9_]*$/.test(name);
 exports.isValidSchemaName = isValidSchemaName;
@@ -80,21 +80,25 @@ const resolveRoute = async (pool, schema, host) => {
 };
 exports.resolveRoute = resolveRoute;
 /**
- * The database-scope routing planes after the server's own `routing_public` plane, in
- * the static gateway's order (by database id). The list spans every tenant,
- * so it comes from a SECURITY DEFINER reader granted to the platform login
- * alone, on the login's own connection: no role switch, no RLS bypass. A plane
- * whose registration names no schema or resolver is an incomplete install and
- * fails loud.
+ * Every database-scope routing plane, in the static gateway's order (by
+ * database id). The list spans every tenant, so it comes from a SECURITY
+ * DEFINER reader granted to the platform login alone, on the login's own
+ * connection: no role switch, no RLS bypass. A plane whose registration names
+ * no schema or resolver is an incomplete install and fails loud.
  */
-const loadDatabaseRoutingPlanes = async (pool) => {
-    const { rows } = await pool.query(`SELECT database_id, schema_name, resolver_function_name
+const loadRoutingPlanes = async (pool) => {
+    const { rows } = await pool.query(`SELECT database_id, schema_name, resolver_schema_name, resolver_function_name
        FROM function_resolution.routing_planes()`);
-    return rows
-        .filter((row) => row.schema_name !== exports.ROUTING_SCHEMA)
-        .map((row) => {
-        if (!row.schema_name || !row.resolver_function_name) {
-            const error = new Error(`route_module for database ${row.database_id} names no ${row.schema_name ? 'resolver function' : 'public schema'}`);
+    return rows.map((row) => {
+        const missing = !row.schema_name
+            ? 'public schema'
+            : !row.resolver_schema_name
+                ? 'resolver schema'
+                : !row.resolver_function_name
+                    ? 'resolver function'
+                    : null;
+        if (missing) {
+            const error = new Error(`route_module for database ${row.database_id} names no ${missing}`);
             error.code = 'ROUTING_PLANE_INCOMPLETE';
             error.databaseId = row.database_id;
             throw error;
@@ -102,27 +106,34 @@ const loadDatabaseRoutingPlanes = async (pool) => {
         return {
             databaseId: row.database_id,
             schema: row.schema_name,
+            resolverSchema: row.resolver_schema_name,
             resolver: row.resolver_function_name
         };
     });
 };
-exports.loadDatabaseRoutingPlanes = loadDatabaseRoutingPlanes;
+exports.loadRoutingPlanes = loadRoutingPlanes;
 const resolveOnPlane = async (pool, plane, host) => {
-    const resolver = quotes_1.QuoteUtils.quoteQualifiedIdentifier(plane.schema, plane.resolver);
+    const resolver = quotes_1.QuoteUtils.quoteQualifiedIdentifier(plane.resolverSchema, plane.resolver);
     const result = await pool.query(`SELECT * FROM ${resolver}($1, '/', NULL)`, [host]);
     const row = result.rows[0];
     return row && row.route_binding_id !== null ? row : null;
 };
 /**
- * Resolve a host across routing planes: `routing_public` first, then
- * each tenant database-scope plane. The first plane that matches owns the
- * host; later planes are not consulted.
+ * Resolve a host across routing planes: the server's own `routing_public`
+ * plane first, then each tenant database-scope plane. The first plane that
+ * matches owns the host; later planes are not consulted.
  */
 const resolveRouteAcrossPlanes = async (pool, host) => {
-    const route = await (0, exports.resolveRoute)(pool, exports.ROUTING_SCHEMA, host);
-    if (route)
-        return { route, planeDatabaseId: null };
-    for (const plane of await (0, exports.loadDatabaseRoutingPlanes)(pool)) {
+    const planes = await (0, exports.loadRoutingPlanes)(pool);
+    const own = planes.find((plane) => plane.schema === exports.ROUTING_SCHEMA);
+    if (own) {
+        const route = await (0, exports.resolveRoute)(pool, own.resolverSchema, host);
+        if (route)
+            return { route, planeDatabaseId: null };
+    }
+    for (const plane of planes) {
+        if (plane === own)
+            continue;
         const planeRoute = await resolveOnPlane(pool, plane, host);
         if (planeRoute) {
             log.debug(`[resolve-route] host=${host} owned by database plane ${plane.schema} (db=${plane.databaseId})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "5.33.0",
+  "version": "5.33.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -100,5 +100,5 @@
     "supertest": "^7.2.2",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "55dbe288f7f011fa6987f7f99bb9fc8d7183152b"
+  "gitHead": "69c7d68237a248bf5923dd6e3e3e5d73674c4050"
 }