@constructive-io/graphql-server 5.16.10 → 5.16.11

package/esm/server.js

@@ -225,24 +225,39 @@ class Server {
         }
         this.listenClient = client;
         this.listenRelease = release;
+        // Attached before any query is issued: an 'error' event on a Client with no
+        // listener is rethrown by Node and takes the whole process down.
+        client.on('error', (e) => {
+            this.dropListener(client, 'Error with database notify listener', e);
+        });
         client.on('notification', ({ channel, payload }) => {
             if (channel === 'schema:update' && payload) {
                 log.info('schema:update', payload);
                 this.flush(payload);
             }
         });
-        client.query('LISTEN "schema:update"');
-        client.on('error', (e) => {
-            if (this.shuttingDown) {
-                release();
-                return;
-            }
-            this.error('Error with database notify listener', e);
-            release();
-            this.addEventListener();
+        client.query('LISTEN "schema:update"').catch((e) => {
+            this.dropListener(client, 'Failed to LISTEN for schema:update', e);
         });
         this.log('connected and listening for changes...');
     }
+    dropListener(client, message, err) {
+        // Another path (shutdown, an earlier failure) already tore this client down.
+        if (this.listenClient !== client)
+            return;
+        const release = this.listenRelease;
+        this.listenClient = null;
+        this.listenRelease = null;
+        client.removeAllListeners('notification');
+        client.removeAllListeners('error');
+        if (this.shuttingDown) {
+            release?.();
+            return;
+        }
+        this.error(message, err);
+        release?.();
+        this.addEventListener();
+    }
     async removeEventListener() {
         if (!this.listenClient || !this.listenRelease) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "5.16.10",
+  "version": "5.16.11",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -96,5 +96,5 @@
     "supertest": "^7.2.2",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "d0d796b7eb0d16c8c19405a49c0ca62ce3df117b"
+  "gitHead": "4839d3c123304735a7aa74fb4e45af41cf947567"
 }

package/server.d.ts

@@ -39,6 +39,7 @@ declare class Server {
     getPool(): Pool;
     addEventListener(): void;
     listenForChanges(err: Error | null, client: PoolClient, release: () => void): void;
+    private dropListener;
     removeEventListener(): Promise<void>;
     close(opts?: {
         closeCaches?: boolean;

package/server.js

@@ -232,24 +232,39 @@ class Server {
         }
         this.listenClient = client;
         this.listenRelease = release;
+        // Attached before any query is issued: an 'error' event on a Client with no
+        // listener is rethrown by Node and takes the whole process down.
+        client.on('error', (e) => {
+            this.dropListener(client, 'Error with database notify listener', e);
+        });
         client.on('notification', ({ channel, payload }) => {
             if (channel === 'schema:update' && payload) {
                 log.info('schema:update', payload);
                 this.flush(payload);
             }
         });
-        client.query('LISTEN "schema:update"');
-        client.on('error', (e) => {
-            if (this.shuttingDown) {
-                release();
-                return;
-            }
-            this.error('Error with database notify listener', e);
-            release();
-            this.addEventListener();
+        client.query('LISTEN "schema:update"').catch((e) => {
+            this.dropListener(client, 'Failed to LISTEN for schema:update', e);
         });
         this.log('connected and listening for changes...');
     }
+    dropListener(client, message, err) {
+        // Another path (shutdown, an earlier failure) already tore this client down.
+        if (this.listenClient !== client)
+            return;
+        const release = this.listenRelease;
+        this.listenClient = null;
+        this.listenRelease = null;
+        client.removeAllListeners('notification');
+        client.removeAllListeners('error');
+        if (this.shuttingDown) {
+            release?.();
+            return;
+        }
+        this.error(message, err);
+        release?.();
+        this.addEventListener();
+    }
     async removeEventListener() {
         if (!this.listenClient || !this.listenRelease) {
             return;