@constructive-io/graphql-server 4.12.0 → 4.13.0

package/esm/middleware/graphile.js

@@ -3,7 +3,7 @@ import { getNodeEnv } from '@pgpmjs/env';
 import { Logger } from '@pgpmjs/logger';
 import { createGraphileInstance, graphileCache } from 'graphile-cache';
 import { ConstructivePreset, makePgService } from 'graphile-settings';
-import { buildConnectionString } from 'pg-cache';
+import { getPgPool } from 'pg-cache';
 import { getPgEnvOptions } from 'pg-env';
 import './types'; // for Request type
 import { isGraphqlObservabilityEnabled } from '../diagnostics/observability';
@@ -109,12 +109,12 @@ const reqLabel = (req) => (req.requestId ? `[${req.requestId}]` : '[req]');
 /**
  * Build a PostGraphile v5 preset for a tenant.
  */
-const buildPreset = (connectionString, schemas, anonRole, roleName) => {
+const buildPreset = (pool, schemas, anonRole, roleName) => {
     return {
         extends: [ConstructivePreset],
         pgServices: [
             makePgService({
-                connectionString,
+                pool,
                 schemas,
             }),
         ],
@@ -227,9 +227,11 @@ export const graphile = (opts) => {
                 ...opts.pg,
                 database: dbname,
             });
-            const connectionString = buildConnectionString(pgConfig.user, pgConfig.password, pgConfig.host, pgConfig.port, pgConfig.database);
+            // 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);
             // Create promise and store in in-flight map BEFORE try block
-            const preset = buildPreset(connectionString, schema || [], anonRole, roleName);
+            const preset = buildPreset(pool, schema || [], anonRole, roleName);
             const creationPromise = observeGraphileBuild({
                 cacheKey: key,
                 serviceKey: key,

package/middleware/graphile.js

@@ -118,12 +118,12 @@ const reqLabel = (req) => (req.requestId ? `[${req.requestId}]` : '[req]');
 /**
  * Build a PostGraphile v5 preset for a tenant.
  */
-const buildPreset = (connectionString, schemas, anonRole, roleName) => {
+const buildPreset = (pool, schemas, anonRole, roleName) => {
     return {
         extends: [graphile_settings_1.ConstructivePreset],
         pgServices: [
             (0, graphile_settings_1.makePgService)({
-                connectionString,
+                pool,
                 schemas,
             }),
         ],
@@ -236,9 +236,11 @@ const graphile = (opts) => {
                 ...opts.pg,
                 database: dbname,
             });
-            const connectionString = (0, pg_cache_1.buildConnectionString)(pgConfig.user, pgConfig.password, pgConfig.host, pgConfig.port, pgConfig.database);
+            // 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);
             // Create promise and store in in-flight map BEFORE try block
-            const preset = buildPreset(connectionString, schema || [], anonRole, roleName);
+            const preset = buildPreset(pool, schema || [], anonRole, roleName);
             const creationPromise = (0, graphile_build_stats_1.observeGraphileBuild)({
                 cacheKey: key,
                 serviceKey: key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -63,7 +63,7 @@
     "graphile-build-pg": "5.0.0-rc.8",
     "graphile-cache": "^3.3.4",
     "graphile-config": "1.0.0-rc.6",
-    "graphile-settings": "^4.11.0",
+    "graphile-settings": "^4.12.0",
     "graphile-utils": "5.0.0-rc.8",
     "graphql": "16.13.0",
     "graphql-upload": "^13.0.0",
@@ -91,5 +91,5 @@
     "nodemon": "^3.1.14",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "d7ad4d8a95a9ab73c9eee919e0cdfcc2334845af"
+  "gitHead": "b8d4ae2b36e37e7f3533f858f19ec000febaa04b"
 }