@common-stack/server-stack 9.0.1-alpha.8 → 9.0.2-alpha.2

package/lib/servers/WebsocketMultipathUpdate.cjs.map

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

package/lib/servers/WebsocketMultipathUpdate.mjs

@@ -1,7 +1,6 @@
-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 {
+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 {
     moduleService;
     cache;
-    serverHost;
     webSockets = {};
     // private graphqlSubscriptionServer: GraphqlSubscriptionServer;
     _graphqlWs;
@@ -9,29 +8,13 @@ import {WebSocketServer}from'../express-adapter.mjs';import {useServer}from'grap
     maxConnections;
     /** Whether connection limiting is enabled */
     limitEnabled;
-    constructor(moduleService, cache, serverHost, // ultimate-express app or http.Server for WebSocket binding
-    multiplePathConfig, limitConfig) {
+    constructor(moduleService, cache, 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;
-        // 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._graphqlWs = new WebSocketServer({ noServer: true, path: __GRAPHQL_ENDPOINT__ });
         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
@@ -45,18 +28,7 @@ import {WebSocketServer}from'../express-adapter.mjs';import {useServer}from'grap
                 continue;
             }
             if (!this.webSockets[key]) {
-                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] = new WebSocketServer({ noServer: true });
                 this.webSockets[key].on('connection', (ws, request) => {
                     Promise.all([
                         moduleService.createContext(request, null),
@@ -66,6 +38,37 @@ import {WebSocketServer}from'../express-adapter.mjs';import {useServer}from'grap
             }
         }
     }
+    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.1-alpha.8",
+    "version": "9.0.2-alpha.2",
     "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.1-alpha.1",
-        "@common-stack/graphql-api": "9.0.1-alpha.2",
-        "@common-stack/store-redis": "9.0.1-alpha.4",
+        "@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",
         "@graphql-tools/links": "^9.0.1",
         "@graphql-tools/schema": "^10.0.6",
         "@graphql-tools/stitch": "^9.2.10",
@@ -67,7 +67,7 @@
         "ioredis": "^5.4.1",
         "isomorphic-fetch": "^2.2.1",
         "moleculer": "^0.14.2",
-        "mongoose": "^6.3.3",
+        "mongoose": "^7.8.9",
         "mongoose-autopopulate": "^1.1.0",
         "mongoose-execution-time": "^1.1.0",
         "morgan": "^1.9.1",
@@ -84,8 +84,8 @@
         "zod": "^4.0.0"
     },
     "devDependencies": {
-        "@common-stack/server-core": "9.0.1-alpha.1",
-        "common": "9.0.1-alpha.1"
+        "@common-stack/server-core": "9.0.2-alpha.2",
+        "common": "9.0.2-alpha.1"
     },
     "peerDependencies": {
         "@cdm-logger/core": ">=7.0.12",
@@ -98,8 +98,8 @@
     "publishConfig": {
         "access": "public"
     },
+    "gitHead": "a9302f283cd6804ea171774a4f476dc911855b42",
     "typescript": {
         "definition": "lib/index.d.ts"
-    },
-    "gitHead": "295ec131124f14556016989b2012bd7636ef2c04"
+    }
 }

package/lib/express-adapter.cjs

@@ -1,73 +0,0 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var node_module=require('node:module');var_documentCurrentScript=typeofdocument!=='undefined'?document.currentScript:null;/**
- * Express Engine Adapter
- *
- * Provides a unified interface for both Express 4 and ultimate-express (uWebSockets.js).
- * The engine is selected at startup via the `EXPRESS_ENGINE` environment variable:
- *
- *   - `EXPRESS_ENGINE=ultimate` (default) — uses ultimate-express + ultimate-ws for best performance
- *   - `EXPRESS_ENGINE=express` — uses classic Express 4 + ws for maximum compatibility
- *
- * All server modules import from this adapter instead of directly from 'express' or 'ultimate-express',
- * so switching engines requires zero code changes — just set the env var.
- *
- * IMPORTANT: ultimate-express does NOT support http.createServer(). The server is started via app.listen().
- * Classic express works with both http.createServer() and app.listen().
- * This adapter normalizes both to use app.listen() for consistency.
- */
-// ─── Engine Detection ────────────────────────────────────────────────────────
-// Read engine choice early (before envalid config is available).
-// This module is loaded at import time, so we read directly from process.env.
-const engine = (process.env.EXPRESS_ENGINE || 'ultimate').toLowerCase();
-/** Whether the ultimate-express (uWebSockets.js) engine is active */
-const isUltimateEngine = engine === 'ultimate';
-const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('express-adapter.cjs', document.baseURI).href)));
-/**
- * The express factory function — creates an Express application.
- * When engine='ultimate', this is ultimate-express (uWS.js-backed).
- * When engine='express', this is classic Express 4.
- */
-const express = isUltimateEngine
-    ? _require('ultimate-express')
-    : _require('express');
-/**
- * WebSocketServer class.
- * When engine='ultimate', this is ultimate-ws (uWS.js-backed).
- * When engine='express', this is the standard `ws` package.
- */
-const WebSocketServer = isUltimateEngine
-    ? _require('ultimate-ws').WebSocketServer
-    : _require('ws').WebSocketServer;
-/**
- * Create an HTTP server for the given express app.
- *
- * - ultimate-express: returns null (uWS manages the server internally via app.listen())
- * - classic express: returns http.createServer(app)
- */
-function createHttpServer(app) {
-    if (isUltimateEngine) {
-        // ultimate-express manages its own uWS server; no http.Server is created
-        return null;
-    }
-    const http = _require('http');
-    return http.createServer(app);
-}
-/**
- * Body parser middleware.
- *
- * - ultimate-express: uses built-in express.json() / express.urlencoded() for best perf
- * - classic express: uses body-parser package (more battle-tested options)
- */
-function jsonParser(options) {
-    if (isUltimateEngine) {
-        return express.json(options);
-    }
-    const bodyParser = _require('body-parser');
-    return bodyParser.json(options);
-}
-function urlencodedParser(options) {
-    if (isUltimateEngine) {
-        return express.urlencoded(options);
-    }
-    const bodyParser = _require('body-parser');
-    return bodyParser.urlencoded(options);
-}exports.WebSocketServer=WebSocketServer;exports.createHttpServer=createHttpServer;exports.default=express;exports.express=express;exports.isUltimateEngine=isUltimateEngine;exports.jsonParser=jsonParser;exports.urlencodedParser=urlencodedParser;//# sourceMappingURL=express-adapter.cjs.map

package/lib/express-adapter.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"express-adapter.cjs","sources":["../src/express-adapter.ts"],"sourcesContent":[null],"names":["createRequire"],"mappings":"gMAAA;;;;;;;;;;;;;;;AAeG;AAQH;AACA;AACA;AACA,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,UAAU,EAAE,WAAW,EAAE,CAAC;AAExE;AACa,MAAA,gBAAgB,GAAY,MAAM,KAAK,WAAW;AAK/D,MAAM,QAAQ,GAAGA,yBAAa,CAAC,qQAAe,CAAC,CAAC;AAEhD;;;;AAIG;AACI,MAAM,OAAO,GAAG,gBAAgB;AACnC,MAAE,QAAQ,CAAC,kBAAkB,CAAC;AAC9B,MAAE,QAAQ,CAAC,SAAS,EAAE;AAI1B;;;;AAIG;AACI,MAAM,eAAe,GAAG,gBAAgB;AAC3C,MAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,eAAe;AACzC,MAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,gBAAgB;AAKrC;;;;;AAKG;AACG,SAAU,gBAAgB,CAAC,GAAY,EAAA;IACzC,IAAI,gBAAgB,EAAE;;AAElB,QAAA,OAAO,IAAI,CAAC;KACf;AACD,IAAA,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC9B,IAAA,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAuBD;;;;;AAKG;AACG,SAAU,UAAU,CAAC,OAAa,EAAA;IACpC,IAAI,gBAAgB,EAAE;AAClB,QAAA,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KAChC;AACD,IAAA,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAC3C,IAAA,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAEK,SAAU,gBAAgB,CAAC,OAAa,EAAA;IAC1C,IAAI,gBAAgB,EAAE;AAClB,QAAA,OAAO,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KACtC;AACD,IAAA,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAC3C,IAAA,OAAO,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC1C"}

package/lib/express-adapter.mjs

@@ -1,73 +0,0 @@
-import {createRequire}from'node:module';/**
- * Express Engine Adapter
- *
- * Provides a unified interface for both Express 4 and ultimate-express (uWebSockets.js).
- * The engine is selected at startup via the `EXPRESS_ENGINE` environment variable:
- *
- *   - `EXPRESS_ENGINE=ultimate` (default) — uses ultimate-express + ultimate-ws for best performance
- *   - `EXPRESS_ENGINE=express` — uses classic Express 4 + ws for maximum compatibility
- *
- * All server modules import from this adapter instead of directly from 'express' or 'ultimate-express',
- * so switching engines requires zero code changes — just set the env var.
- *
- * IMPORTANT: ultimate-express does NOT support http.createServer(). The server is started via app.listen().
- * Classic express works with both http.createServer() and app.listen().
- * This adapter normalizes both to use app.listen() for consistency.
- */
-// ─── Engine Detection ────────────────────────────────────────────────────────
-// Read engine choice early (before envalid config is available).
-// This module is loaded at import time, so we read directly from process.env.
-const engine = (process.env.EXPRESS_ENGINE || 'ultimate').toLowerCase();
-/** Whether the ultimate-express (uWebSockets.js) engine is active */
-const isUltimateEngine = engine === 'ultimate';
-const _require = createRequire(import.meta.url);
-/**
- * The express factory function — creates an Express application.
- * When engine='ultimate', this is ultimate-express (uWS.js-backed).
- * When engine='express', this is classic Express 4.
- */
-const express = isUltimateEngine
-    ? _require('ultimate-express')
-    : _require('express');
-/**
- * WebSocketServer class.
- * When engine='ultimate', this is ultimate-ws (uWS.js-backed).
- * When engine='express', this is the standard `ws` package.
- */
-const WebSocketServer = isUltimateEngine
-    ? _require('ultimate-ws').WebSocketServer
-    : _require('ws').WebSocketServer;
-/**
- * Create an HTTP server for the given express app.
- *
- * - ultimate-express: returns null (uWS manages the server internally via app.listen())
- * - classic express: returns http.createServer(app)
- */
-function createHttpServer(app) {
-    if (isUltimateEngine) {
-        // ultimate-express manages its own uWS server; no http.Server is created
-        return null;
-    }
-    const http = _require('http');
-    return http.createServer(app);
-}
-/**
- * Body parser middleware.
- *
- * - ultimate-express: uses built-in express.json() / express.urlencoded() for best perf
- * - classic express: uses body-parser package (more battle-tested options)
- */
-function jsonParser(options) {
-    if (isUltimateEngine) {
-        return express.json(options);
-    }
-    const bodyParser = _require('body-parser');
-    return bodyParser.json(options);
-}
-function urlencodedParser(options) {
-    if (isUltimateEngine) {
-        return express.urlencoded(options);
-    }
-    const bodyParser = _require('body-parser');
-    return bodyParser.urlencoded(options);
-}export{WebSocketServer,createHttpServer,express as default,express,isUltimateEngine,jsonParser,urlencodedParser};//# sourceMappingURL=express-adapter.mjs.map

package/lib/express-adapter.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"express-adapter.mjs","sources":["../src/express-adapter.ts"],"sourcesContent":[null],"names":[],"mappings":"wCAAA;;;;;;;;;;;;;;;AAeG;AAQH;AACA;AACA;AACA,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,UAAU,EAAE,WAAW,EAAE,CAAC;AAExE;AACa,MAAA,gBAAgB,GAAY,MAAM,KAAK,WAAW;AAK/D,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEhD;;;;AAIG;AACI,MAAM,OAAO,GAAG,gBAAgB;AACnC,MAAE,QAAQ,CAAC,kBAAkB,CAAC;AAC9B,MAAE,QAAQ,CAAC,SAAS,EAAE;AAI1B;;;;AAIG;AACI,MAAM,eAAe,GAAG,gBAAgB;AAC3C,MAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,eAAe;AACzC,MAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,gBAAgB;AAKrC;;;;;AAKG;AACG,SAAU,gBAAgB,CAAC,GAAY,EAAA;IACzC,IAAI,gBAAgB,EAAE;;AAElB,QAAA,OAAO,IAAI,CAAC;KACf;AACD,IAAA,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC9B,IAAA,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAuBD;;;;;AAKG;AACG,SAAU,UAAU,CAAC,OAAa,EAAA;IACpC,IAAI,gBAAgB,EAAE;AAClB,QAAA,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KAChC;AACD,IAAA,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAC3C,IAAA,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAEK,SAAU,gBAAgB,CAAC,OAAa,EAAA;IAC1C,IAAI,gBAAgB,EAAE;AAClB,QAAA,OAAO,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KACtC;AACD,IAAA,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;AAC3C,IAAA,OAAO,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC1C"}