@common-stack/server-stack 9.0.2-alpha.2 → 9.0.2-alpha.7

package/lib/servers/WebsocketMultipathUpdate.mjs

@@ -1,6 +1,7 @@
-import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'graphql-ws/lib/use/ws';import {createWebSocketContext}from'./websocket-context.mjs';import {config}from'../config/env-config.mjs';class WebsocketMultiPathServer {
+import {WebSocketServer}from'../express-adapter.mjs';import {useServer}from'graphql-ws/lib/use/ws';import {createWebSocketContext}from'./websocket-context.mjs';import {config}from'../config/env-config.mjs';class WebsocketMultiPathServer {
     moduleService;
     cache;
+    serverHost;
     webSockets = {};
     // private graphqlSubscriptionServer: GraphqlSubscriptionServer;
     _graphqlWs;
@@ -8,27 +9,58 @@ import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'
     maxConnections;
     /** Whether connection limiting is enabled */
     limitEnabled;
-    constructor(moduleService, cache, multiplePathConfig, limitConfig) {
+    constructor(moduleService, cache, serverHost, // ultimate-express app or http.Server for WebSocket binding
+    multiplePathConfig, limitConfig) {
         this.moduleService = moduleService;
         this.cache = cache;
+        this.serverHost = serverHost;
         // Read from validated config (Kubernetes configmap) or use defaults
         this.maxConnections = limitConfig?.maxConnections ?? config.WEBSOCKET_MAX_CONNECTIONS;
         this.limitEnabled = limitConfig?.limitEnabled ?? config.WEBSOCKET_LIMIT_ENABLED;
-        this._graphqlWs = new WebSocketServer({ noServer: true, path: __GRAPHQL_ENDPOINT__ });
+        // With the adapter, WebSocketServer works with both ultimate-ws and ws.
+        // - ultimate-ws: binds to the ultimate-express app via { server: app, path }
+        // - ws: binds to the http.Server via { server: httpServer, path }
+        this._graphqlWs = new WebSocketServer({
+            server: this.serverHost,
+            path: __GRAPHQL_ENDPOINT__,
+            verifyClient: (info, cb) => {
+                if (this.limitEnabled && this.isConnectionLimitReached()) {
+                    this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
+                    cb(false, 503, 'Service Unavailable');
+                    return;
+                }
+                cb(true);
+            },
+        });
         this.webSockets[__GRAPHQL_ENDPOINT__] = this._graphqlWs;
         // Initialize useServer ONCE for the GraphQL WebSocket server
-        // This prevents memory leaks from creating new listeners on each connection
+        // This prevents memory leaks from creating new listeners on each connection.
+        // The 3rd positional `keepAlive` arg drives transport-level ping/pong so
+        // dead clients (mobile sleep, NAT timeout) are evicted. Default 30s,
+        // tunable via `GRAPHQL_WS_KEEPALIVE_MS`.
+        const keepAliveMs = Number(process.env.GRAPHQL_WS_KEEPALIVE_MS) || 30_000;
         useServer({
             schema: moduleService.schema,
             // Using shared context creation function to maintain consistency with GraphqlWs
             context: async (ctx) => createWebSocketContext(ctx, moduleService, cache),
-        }, this._graphqlWs);
+        }, this._graphqlWs, keepAliveMs);
         for (let key in multiplePathConfig) {
             if (!multiplePathConfig.hasOwnProperty(key)) {
                 continue;
             }
             if (!this.webSockets[key]) {
-                this.webSockets[key] = new WebSocketServer({ noServer: true });
+                this.webSockets[key] = new WebSocketServer({
+                    server: this.serverHost,
+                    path: key,
+                    verifyClient: (info, cb) => {
+                        if (this.limitEnabled && this.isConnectionLimitReached()) {
+                            this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
+                            cb(false, 503, 'Service Unavailable');
+                            return;
+                        }
+                        cb(true);
+                    },
+                });
                 this.webSockets[key].on('connection', (ws, request) => {
                     Promise.all([
                         moduleService.createContext(request, null),
@@ -38,37 +70,6 @@ import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'
             }
         }
     }
-    httpServerUpgrade(httpServer) {
-        httpServer.on('upgrade', (request, socket, head) => {
-            const pathname = url.parse(request.url).pathname;
-            // Check connection limit before accepting new connections
-            if (this.limitEnabled && this.isConnectionLimitReached()) {
-                this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
-                socket.write('HTTP/1.1 503 Service Unavailable\r\n');
-                socket.write('Retry-After: 60\r\n');
-                socket.write('\r\n');
-                socket.destroy();
-                return;
-            }
-            if (!this.webSockets[pathname]) {
-                // in development
-                if (pathname !== '/sockjs-node') {
-                    // need to destroy
-                    socket.destroy();
-                }
-                return;
-            }
-            // code to run when a new connection is made
-            this.webSockets[pathname].handleUpgrade(request, socket, head, (ws) => {
-                this.webSockets[pathname].emit('connection', ws, request);
-            });
-        });
-        // (new GraphqlWs(this.graphqlWs, this.moduleService, this.cache)).create();
-        // useServer({
-        //     schema: this.moduleService.schema,
-        // }, this.graphqlWs);
-        return httpServer;
-    }
     /**
      * Get total number of active WebSocket connections across all paths
      */

package/lib/servers/WebsocketMultipathUpdate.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketMultipathUpdate.mjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"WebsocketMultipathUpdate.mjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/server-stack",
-    "version": "9.0.2-alpha.2",
+    "version": "9.0.2-alpha.7",
     "description": "common core for higher packages to depend on",
     "license": "UNLICENSED",
     "author": "CDMBase LLC",
@@ -32,9 +32,9 @@
         "@cdm-logger/client": "^9.0.17",
         "@cdm-logger/server": "^9.0.17",
         "@cdmbase/graphql-type-uri": "^4.0.0",
-        "@common-stack/codegen-zod": "9.0.2-alpha.1",
-        "@common-stack/graphql-api": "9.0.2-alpha.2",
-        "@common-stack/store-redis": "9.0.2-alpha.1",
+        "@common-stack/codegen-zod": "9.0.2-alpha.7",
+        "@common-stack/graphql-api": "9.0.2-alpha.7",
+        "@common-stack/store-redis": "9.0.2-alpha.7",
         "@graphql-tools/links": "^9.0.1",
         "@graphql-tools/schema": "^10.0.6",
         "@graphql-tools/stitch": "^9.2.10",
@@ -84,8 +84,8 @@
         "zod": "^4.0.0"
     },
     "devDependencies": {
-        "@common-stack/server-core": "9.0.2-alpha.2",
-        "common": "9.0.2-alpha.1"
+        "@common-stack/server-core": "9.0.2-alpha.7",
+        "common": "9.0.2-alpha.7"
     },
     "peerDependencies": {
         "@cdm-logger/core": ">=7.0.12",
@@ -98,7 +98,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "a9302f283cd6804ea171774a4f476dc911855b42",
+    "gitHead": "61ed3dee2b995cf4adaf8c5df9a0c3aaef62b24e",
     "typescript": {
         "definition": "lib/index.d.ts"
     }