@common-stack/server-stack 9.0.2-alpha.1 → 9.0.2-alpha.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/MainStackServer.cjs +82 -24
- package/lib/MainStackServer.cjs.map +1 -1
- package/lib/MainStackServer.mjs +82 -24
- package/lib/MainStackServer.mjs.map +1 -1
- package/lib/config/env-config.cjs +3 -0
- package/lib/config/env-config.cjs.map +1 -1
- package/lib/config/env-config.mjs +3 -0
- package/lib/config/env-config.mjs.map +1 -1
- package/lib/express-adapter.cjs +90 -0
- package/lib/express-adapter.cjs.map +1 -0
- package/lib/express-adapter.mjs +90 -0
- package/lib/express-adapter.mjs.map +1 -0
- package/lib/middleware/services.cjs +46 -11
- package/lib/middleware/services.cjs.map +1 -1
- package/lib/middleware/services.mjs +46 -11
- package/lib/middleware/services.mjs.map +1 -1
- package/lib/servers/ExpressApp.cjs +27 -12
- package/lib/servers/ExpressApp.cjs.map +1 -1
- package/lib/servers/ExpressApp.mjs +26 -11
- package/lib/servers/ExpressApp.mjs.map +1 -1
- package/lib/servers/GraphqlServer.cjs +30 -18
- package/lib/servers/GraphqlServer.cjs.map +1 -1
- package/lib/servers/GraphqlServer.mjs +29 -17
- package/lib/servers/GraphqlServer.mjs.map +1 -1
- package/lib/servers/GraphqlWs.cjs +10 -1
- package/lib/servers/GraphqlWs.cjs.map +1 -1
- package/lib/servers/GraphqlWs.mjs +10 -1
- package/lib/servers/GraphqlWs.mjs.map +1 -1
- package/lib/servers/WebsocketMultipathUpdate.cjs +39 -38
- package/lib/servers/WebsocketMultipathUpdate.cjs.map +1 -1
- package/lib/servers/WebsocketMultipathUpdate.mjs +38 -37
- package/lib/servers/WebsocketMultipathUpdate.mjs.map +1 -1
- package/package.json +9 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphqlServer.mjs","sources":["../../src/servers/GraphqlServer.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GraphqlServer.mjs","sources":["../../src/servers/GraphqlServer.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -11,11 +11,20 @@
|
|
|
11
11
|
this.logger = this.moduleService.logger;
|
|
12
12
|
}
|
|
13
13
|
create() {
|
|
14
|
+
// Drop a stalled WS connection if the client never sends
|
|
15
|
+
// `connection_init` within this window. Transport-level ping/pong is
|
|
16
|
+
// handled by the graphql-ws `ws` / `uWS` adapter via the third
|
|
17
|
+
// positional `keepAlive` arg (default 12s; we raise it to evict only
|
|
18
|
+
// truly dead clients). Tunable via env so ops can adjust without a
|
|
19
|
+
// rebuild.
|
|
20
|
+
const ackTimeoutMs = Number(process.env.GRAPHQL_WS_ACK_TIMEOUT_MS) || 30_000;
|
|
21
|
+
const keepAliveMs = Number(process.env.GRAPHQL_WS_KEEPALIVE_MS) || 30_000;
|
|
14
22
|
this.subscriptionServer = ws.useServer({
|
|
15
23
|
schema: this.moduleService.schema,
|
|
16
24
|
// Adding a context property lets you add data to your GraphQL operation context
|
|
17
25
|
// Using shared context creation function to maintain consistency
|
|
18
26
|
context: async (ctx) => websocketContext.createWebSocketContext(ctx, this.moduleService, this.cache),
|
|
27
|
+
connectionInitWaitTimeout: ackTimeoutMs,
|
|
19
28
|
// onConnect: async (ctx) => {
|
|
20
29
|
// // do anything when connected
|
|
21
30
|
// },
|
|
@@ -45,7 +54,7 @@
|
|
|
45
54
|
// }
|
|
46
55
|
// return { ...connection }; // TODO: we didn't add `context`
|
|
47
56
|
// },
|
|
48
|
-
}, this.wsServer);
|
|
57
|
+
}, this.wsServer, keepAliveMs);
|
|
49
58
|
return this.subscriptionServer;
|
|
50
59
|
}
|
|
51
60
|
disconnect() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphqlWs.cjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":["useServer","createWebSocketContext"],"mappings":"sIAmDa,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,
|
|
1
|
+
{"version":3,"file":"GraphqlWs.cjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":["useServer","createWebSocketContext"],"mappings":"sIAmDa,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,QAA8C,EAC9C,aAA6B,EAC3B,KAAsC,EAAA;QAFxC,IAAQ,CAAA,QAAA,GAAR,QAAQ,CAAsC;QAC9C,IAAa,CAAA,aAAA,GAAb,aAAa,CAAgB;QAC3B,IAAK,CAAA,KAAA,GAAL,KAAK,CAAiC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;KAC3C;IAEM,MAAM,GAAA;;;;;;;AAOT,QAAA,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,MAAM,CAAC;AAC7E,QAAA,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,MAAM,CAAC;AAE1E,QAAA,IAAI,CAAC,kBAAkB,GAAGA,YAAS,CAC/B;AACI,YAAA,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;;;AAGjC,YAAA,OAAO,EAAE,OAAO,GAAG,KAAKC,uCAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC;AACnF,YAAA,yBAAyB,EAAE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgC1C,SAAA,EACD,IAAI,CAAC,QAAQ,EACb,WAAW,CACd,CAAC;QACF,OAAO,IAAI,CAAC,kBAAkB,CAAC;KAClC;IAEM,UAAU,GAAA;AACb,QAAA,IAAI,IAAI,CAAC,kBAAkB,EAAE;AACzB,YAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;SACrC;KACJ;AACJ"}
|
|
@@ -11,11 +11,20 @@ import {useServer}from'graphql-ws/lib/use/ws';import'graphql';import {createWebS
|
|
|
11
11
|
this.logger = this.moduleService.logger;
|
|
12
12
|
}
|
|
13
13
|
create() {
|
|
14
|
+
// Drop a stalled WS connection if the client never sends
|
|
15
|
+
// `connection_init` within this window. Transport-level ping/pong is
|
|
16
|
+
// handled by the graphql-ws `ws` / `uWS` adapter via the third
|
|
17
|
+
// positional `keepAlive` arg (default 12s; we raise it to evict only
|
|
18
|
+
// truly dead clients). Tunable via env so ops can adjust without a
|
|
19
|
+
// rebuild.
|
|
20
|
+
const ackTimeoutMs = Number(process.env.GRAPHQL_WS_ACK_TIMEOUT_MS) || 30_000;
|
|
21
|
+
const keepAliveMs = Number(process.env.GRAPHQL_WS_KEEPALIVE_MS) || 30_000;
|
|
14
22
|
this.subscriptionServer = useServer({
|
|
15
23
|
schema: this.moduleService.schema,
|
|
16
24
|
// Adding a context property lets you add data to your GraphQL operation context
|
|
17
25
|
// Using shared context creation function to maintain consistency
|
|
18
26
|
context: async (ctx) => createWebSocketContext(ctx, this.moduleService, this.cache),
|
|
27
|
+
connectionInitWaitTimeout: ackTimeoutMs,
|
|
19
28
|
// onConnect: async (ctx) => {
|
|
20
29
|
// // do anything when connected
|
|
21
30
|
// },
|
|
@@ -45,7 +54,7 @@ import {useServer}from'graphql-ws/lib/use/ws';import'graphql';import {createWebS
|
|
|
45
54
|
// }
|
|
46
55
|
// return { ...connection }; // TODO: we didn't add `context`
|
|
47
56
|
// },
|
|
48
|
-
}, this.wsServer);
|
|
57
|
+
}, this.wsServer, keepAliveMs);
|
|
49
58
|
return this.subscriptionServer;
|
|
50
59
|
}
|
|
51
60
|
disconnect() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphqlWs.mjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":[],"mappings":"iIAmDa,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,
|
|
1
|
+
{"version":3,"file":"GraphqlWs.mjs","sources":["../../src/servers/GraphqlWs.ts"],"sourcesContent":[null],"names":[],"mappings":"iIAmDa,SAAS,CAAA;AAMN,IAAA,QAAA,CAAA;AACA,IAAA,aAAA,CAAA;AACE,IAAA,KAAA,CAAA;AAPN,IAAA,kBAAkB,CAAa;AAE/B,IAAA,MAAM,CAAU;AAExB,IAAA,WAAA,CACY,QAA8C,EAC9C,aAA6B,EAC3B,KAAsC,EAAA;QAFxC,IAAQ,CAAA,QAAA,GAAR,QAAQ,CAAsC;QAC9C,IAAa,CAAA,aAAA,GAAb,aAAa,CAAgB;QAC3B,IAAK,CAAA,KAAA,GAAL,KAAK,CAAiC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;KAC3C;IAEM,MAAM,GAAA;;;;;;;AAOT,QAAA,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,MAAM,CAAC;AAC7E,QAAA,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,MAAM,CAAC;AAE1E,QAAA,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAC/B;AACI,YAAA,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM;;;AAGjC,YAAA,OAAO,EAAE,OAAO,GAAG,KAAK,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC;AACnF,YAAA,yBAAyB,EAAE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgC1C,SAAA,EACD,IAAI,CAAC,QAAQ,EACb,WAAW,CACd,CAAC;QACF,OAAO,IAAI,CAAC,kBAAkB,CAAC;KAClC;IAEM,UAAU,GAAA;AACb,QAAA,IAAI,IAAI,CAAC,kBAAkB,EAAE;AACzB,YAAA,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;SACrC;KACJ;AACJ"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
'use strict';var
|
|
1
|
+
'use strict';var expressAdapter=require('../express-adapter.cjs'),ws=require('graphql-ws/lib/use/ws'),websocketContext=require('./websocket-context.cjs'),envConfig=require('../config/env-config.cjs');class WebsocketMultiPathServer {
|
|
2
2
|
moduleService;
|
|
3
3
|
cache;
|
|
4
|
+
serverHost;
|
|
4
5
|
webSockets = {};
|
|
5
6
|
// private graphqlSubscriptionServer: GraphqlSubscriptionServer;
|
|
6
7
|
_graphqlWs;
|
|
@@ -8,27 +9,58 @@
|
|
|
8
9
|
maxConnections;
|
|
9
10
|
/** Whether connection limiting is enabled */
|
|
10
11
|
limitEnabled;
|
|
11
|
-
constructor(moduleService, cache,
|
|
12
|
+
constructor(moduleService, cache, serverHost, // ultimate-express app or http.Server for WebSocket binding
|
|
13
|
+
multiplePathConfig, limitConfig) {
|
|
12
14
|
this.moduleService = moduleService;
|
|
13
15
|
this.cache = cache;
|
|
16
|
+
this.serverHost = serverHost;
|
|
14
17
|
// Read from validated config (Kubernetes configmap) or use defaults
|
|
15
18
|
this.maxConnections = limitConfig?.maxConnections ?? envConfig.config.WEBSOCKET_MAX_CONNECTIONS;
|
|
16
19
|
this.limitEnabled = limitConfig?.limitEnabled ?? envConfig.config.WEBSOCKET_LIMIT_ENABLED;
|
|
17
|
-
|
|
20
|
+
// With the adapter, WebSocketServer works with both ultimate-ws and ws.
|
|
21
|
+
// - ultimate-ws: binds to the ultimate-express app via { server: app, path }
|
|
22
|
+
// - ws: binds to the http.Server via { server: httpServer, path }
|
|
23
|
+
this._graphqlWs = new expressAdapter.WebSocketServer({
|
|
24
|
+
server: this.serverHost,
|
|
25
|
+
path: __GRAPHQL_ENDPOINT__,
|
|
26
|
+
verifyClient: (info, cb) => {
|
|
27
|
+
if (this.limitEnabled && this.isConnectionLimitReached()) {
|
|
28
|
+
this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
|
|
29
|
+
cb(false, 503, 'Service Unavailable');
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
cb(true);
|
|
33
|
+
},
|
|
34
|
+
});
|
|
18
35
|
this.webSockets[__GRAPHQL_ENDPOINT__] = this._graphqlWs;
|
|
19
36
|
// Initialize useServer ONCE for the GraphQL WebSocket server
|
|
20
|
-
// This prevents memory leaks from creating new listeners on each connection
|
|
21
|
-
|
|
37
|
+
// This prevents memory leaks from creating new listeners on each connection.
|
|
38
|
+
// The 3rd positional `keepAlive` arg drives transport-level ping/pong so
|
|
39
|
+
// dead clients (mobile sleep, NAT timeout) are evicted. Default 30s,
|
|
40
|
+
// tunable via `GRAPHQL_WS_KEEPALIVE_MS`.
|
|
41
|
+
const keepAliveMs = Number(process.env.GRAPHQL_WS_KEEPALIVE_MS) || 30_000;
|
|
42
|
+
ws.useServer({
|
|
22
43
|
schema: moduleService.schema,
|
|
23
44
|
// Using shared context creation function to maintain consistency with GraphqlWs
|
|
24
45
|
context: async (ctx) => websocketContext.createWebSocketContext(ctx, moduleService, cache),
|
|
25
|
-
}, this._graphqlWs);
|
|
46
|
+
}, this._graphqlWs, keepAliveMs);
|
|
26
47
|
for (let key in multiplePathConfig) {
|
|
27
48
|
if (!multiplePathConfig.hasOwnProperty(key)) {
|
|
28
49
|
continue;
|
|
29
50
|
}
|
|
30
51
|
if (!this.webSockets[key]) {
|
|
31
|
-
this.webSockets[key] = new
|
|
52
|
+
this.webSockets[key] = new expressAdapter.WebSocketServer({
|
|
53
|
+
server: this.serverHost,
|
|
54
|
+
path: key,
|
|
55
|
+
verifyClient: (info, cb) => {
|
|
56
|
+
if (this.limitEnabled && this.isConnectionLimitReached()) {
|
|
57
|
+
this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
|
|
58
|
+
cb(false, 503, 'Service Unavailable');
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
cb(true);
|
|
62
|
+
},
|
|
63
|
+
});
|
|
32
64
|
this.webSockets[key].on('connection', (ws, request) => {
|
|
33
65
|
Promise.all([
|
|
34
66
|
moduleService.createContext(request, null),
|
|
@@ -38,37 +70,6 @@
|
|
|
38
70
|
}
|
|
39
71
|
}
|
|
40
72
|
}
|
|
41
|
-
httpServerUpgrade(httpServer) {
|
|
42
|
-
httpServer.on('upgrade', (request, socket, head) => {
|
|
43
|
-
const pathname = url__namespace.parse(request.url).pathname;
|
|
44
|
-
// Check connection limit before accepting new connections
|
|
45
|
-
if (this.limitEnabled && this.isConnectionLimitReached()) {
|
|
46
|
-
this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
|
|
47
|
-
socket.write('HTTP/1.1 503 Service Unavailable\r\n');
|
|
48
|
-
socket.write('Retry-After: 60\r\n');
|
|
49
|
-
socket.write('\r\n');
|
|
50
|
-
socket.destroy();
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
if (!this.webSockets[pathname]) {
|
|
54
|
-
// in development
|
|
55
|
-
if (pathname !== '/sockjs-node') {
|
|
56
|
-
// need to destroy
|
|
57
|
-
socket.destroy();
|
|
58
|
-
}
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
|
-
// code to run when a new connection is made
|
|
62
|
-
this.webSockets[pathname].handleUpgrade(request, socket, head, (ws) => {
|
|
63
|
-
this.webSockets[pathname].emit('connection', ws, request);
|
|
64
|
-
});
|
|
65
|
-
});
|
|
66
|
-
// (new GraphqlWs(this.graphqlWs, this.moduleService, this.cache)).create();
|
|
67
|
-
// useServer({
|
|
68
|
-
// schema: this.moduleService.schema,
|
|
69
|
-
// }, this.graphqlWs);
|
|
70
|
-
return httpServer;
|
|
71
|
-
}
|
|
72
73
|
/**
|
|
73
74
|
* Get total number of active WebSocket connections across all paths
|
|
74
75
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketMultipathUpdate.cjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":["config","WebSocketServer","useServer","createWebSocketContext"
|
|
1
|
+
{"version":3,"file":"WebsocketMultipathUpdate.cjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":["config","WebSocketServer","useServer","createWebSocketContext"],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
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 {
|
|
2
2
|
moduleService;
|
|
3
3
|
cache;
|
|
4
|
+
serverHost;
|
|
4
5
|
webSockets = {};
|
|
5
6
|
// private graphqlSubscriptionServer: GraphqlSubscriptionServer;
|
|
6
7
|
_graphqlWs;
|
|
@@ -8,27 +9,58 @@ import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'
|
|
|
8
9
|
maxConnections;
|
|
9
10
|
/** Whether connection limiting is enabled */
|
|
10
11
|
limitEnabled;
|
|
11
|
-
constructor(moduleService, cache,
|
|
12
|
+
constructor(moduleService, cache, serverHost, // ultimate-express app or http.Server for WebSocket binding
|
|
13
|
+
multiplePathConfig, limitConfig) {
|
|
12
14
|
this.moduleService = moduleService;
|
|
13
15
|
this.cache = cache;
|
|
16
|
+
this.serverHost = serverHost;
|
|
14
17
|
// Read from validated config (Kubernetes configmap) or use defaults
|
|
15
18
|
this.maxConnections = limitConfig?.maxConnections ?? config.WEBSOCKET_MAX_CONNECTIONS;
|
|
16
19
|
this.limitEnabled = limitConfig?.limitEnabled ?? config.WEBSOCKET_LIMIT_ENABLED;
|
|
17
|
-
|
|
20
|
+
// With the adapter, WebSocketServer works with both ultimate-ws and ws.
|
|
21
|
+
// - ultimate-ws: binds to the ultimate-express app via { server: app, path }
|
|
22
|
+
// - ws: binds to the http.Server via { server: httpServer, path }
|
|
23
|
+
this._graphqlWs = new WebSocketServer({
|
|
24
|
+
server: this.serverHost,
|
|
25
|
+
path: __GRAPHQL_ENDPOINT__,
|
|
26
|
+
verifyClient: (info, cb) => {
|
|
27
|
+
if (this.limitEnabled && this.isConnectionLimitReached()) {
|
|
28
|
+
this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
|
|
29
|
+
cb(false, 503, 'Service Unavailable');
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
cb(true);
|
|
33
|
+
},
|
|
34
|
+
});
|
|
18
35
|
this.webSockets[__GRAPHQL_ENDPOINT__] = this._graphqlWs;
|
|
19
36
|
// Initialize useServer ONCE for the GraphQL WebSocket server
|
|
20
|
-
// This prevents memory leaks from creating new listeners on each connection
|
|
37
|
+
// This prevents memory leaks from creating new listeners on each connection.
|
|
38
|
+
// The 3rd positional `keepAlive` arg drives transport-level ping/pong so
|
|
39
|
+
// dead clients (mobile sleep, NAT timeout) are evicted. Default 30s,
|
|
40
|
+
// tunable via `GRAPHQL_WS_KEEPALIVE_MS`.
|
|
41
|
+
const keepAliveMs = Number(process.env.GRAPHQL_WS_KEEPALIVE_MS) || 30_000;
|
|
21
42
|
useServer({
|
|
22
43
|
schema: moduleService.schema,
|
|
23
44
|
// Using shared context creation function to maintain consistency with GraphqlWs
|
|
24
45
|
context: async (ctx) => createWebSocketContext(ctx, moduleService, cache),
|
|
25
|
-
}, this._graphqlWs);
|
|
46
|
+
}, this._graphqlWs, keepAliveMs);
|
|
26
47
|
for (let key in multiplePathConfig) {
|
|
27
48
|
if (!multiplePathConfig.hasOwnProperty(key)) {
|
|
28
49
|
continue;
|
|
29
50
|
}
|
|
30
51
|
if (!this.webSockets[key]) {
|
|
31
|
-
this.webSockets[key] = new WebSocketServer({
|
|
52
|
+
this.webSockets[key] = new WebSocketServer({
|
|
53
|
+
server: this.serverHost,
|
|
54
|
+
path: key,
|
|
55
|
+
verifyClient: (info, cb) => {
|
|
56
|
+
if (this.limitEnabled && this.isConnectionLimitReached()) {
|
|
57
|
+
this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
|
|
58
|
+
cb(false, 503, 'Service Unavailable');
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
cb(true);
|
|
62
|
+
},
|
|
63
|
+
});
|
|
32
64
|
this.webSockets[key].on('connection', (ws, request) => {
|
|
33
65
|
Promise.all([
|
|
34
66
|
moduleService.createContext(request, null),
|
|
@@ -38,37 +70,6 @@ import*as url from'url';import {WebSocketServer}from'ws';import {useServer}from'
|
|
|
38
70
|
}
|
|
39
71
|
}
|
|
40
72
|
}
|
|
41
|
-
httpServerUpgrade(httpServer) {
|
|
42
|
-
httpServer.on('upgrade', (request, socket, head) => {
|
|
43
|
-
const pathname = url.parse(request.url).pathname;
|
|
44
|
-
// Check connection limit before accepting new connections
|
|
45
|
-
if (this.limitEnabled && this.isConnectionLimitReached()) {
|
|
46
|
-
this.moduleService.logger?.warn?.(`WebSocket connection limit reached (${this.maxConnections}). Rejecting new connection.`);
|
|
47
|
-
socket.write('HTTP/1.1 503 Service Unavailable\r\n');
|
|
48
|
-
socket.write('Retry-After: 60\r\n');
|
|
49
|
-
socket.write('\r\n');
|
|
50
|
-
socket.destroy();
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
if (!this.webSockets[pathname]) {
|
|
54
|
-
// in development
|
|
55
|
-
if (pathname !== '/sockjs-node') {
|
|
56
|
-
// need to destroy
|
|
57
|
-
socket.destroy();
|
|
58
|
-
}
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
|
-
// code to run when a new connection is made
|
|
62
|
-
this.webSockets[pathname].handleUpgrade(request, socket, head, (ws) => {
|
|
63
|
-
this.webSockets[pathname].emit('connection', ws, request);
|
|
64
|
-
});
|
|
65
|
-
});
|
|
66
|
-
// (new GraphqlWs(this.graphqlWs, this.moduleService, this.cache)).create();
|
|
67
|
-
// useServer({
|
|
68
|
-
// schema: this.moduleService.schema,
|
|
69
|
-
// }, this.graphqlWs);
|
|
70
|
-
return httpServer;
|
|
71
|
-
}
|
|
72
73
|
/**
|
|
73
74
|
* Get total number of active WebSocket connections across all paths
|
|
74
75
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketMultipathUpdate.mjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WebsocketMultipathUpdate.mjs","sources":["../../src/servers/WebsocketMultipathUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/server-stack",
|
|
3
|
-
"version": "9.0.2-alpha.
|
|
3
|
+
"version": "9.0.2-alpha.12",
|
|
4
4
|
"description": "common core for higher packages to depend on",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"@cdm-logger/client": "^9.0.17",
|
|
33
33
|
"@cdm-logger/server": "^9.0.17",
|
|
34
34
|
"@cdmbase/graphql-type-uri": "^4.0.0",
|
|
35
|
-
"@common-stack/codegen-zod": "9.0.2-alpha.
|
|
36
|
-
"@common-stack/graphql-api": "9.0.2-alpha.
|
|
37
|
-
"@common-stack/store-redis": "9.0.2-alpha.
|
|
35
|
+
"@common-stack/codegen-zod": "9.0.2-alpha.10",
|
|
36
|
+
"@common-stack/graphql-api": "9.0.2-alpha.8",
|
|
37
|
+
"@common-stack/store-redis": "9.0.2-alpha.7",
|
|
38
38
|
"@graphql-tools/links": "^9.0.1",
|
|
39
39
|
"@graphql-tools/schema": "^10.0.6",
|
|
40
40
|
"@graphql-tools/stitch": "^9.2.10",
|
|
@@ -76,16 +76,14 @@
|
|
|
76
76
|
"reflect-metadata": "^0.1.13",
|
|
77
77
|
"rxjs": "^7.8.1",
|
|
78
78
|
"subscriptions-transport-ws": "^0.11.0",
|
|
79
|
-
"ultimate-express": "^2.0.17",
|
|
80
|
-
"ultimate-ws": "^2.0.8",
|
|
81
79
|
"universal-cookie-express": "^4.0.1",
|
|
82
80
|
"ws": "^8.11.0",
|
|
83
81
|
"xstate": "^5.20.0",
|
|
84
82
|
"zod": "^4.0.0"
|
|
85
83
|
},
|
|
86
84
|
"devDependencies": {
|
|
87
|
-
"@common-stack/server-core": "9.0.2-alpha.
|
|
88
|
-
"common": "9.0.2-alpha.
|
|
85
|
+
"@common-stack/server-core": "9.0.2-alpha.7",
|
|
86
|
+
"common": "9.0.2-alpha.7"
|
|
89
87
|
},
|
|
90
88
|
"peerDependencies": {
|
|
91
89
|
"@cdm-logger/core": ">=7.0.12",
|
|
@@ -93,12 +91,13 @@
|
|
|
93
91
|
"moleculer": "*"
|
|
94
92
|
},
|
|
95
93
|
"optionalDependencies": {
|
|
96
|
-
"ultimate-express": "^2.0.0"
|
|
94
|
+
"ultimate-express": "^2.0.0",
|
|
95
|
+
"ultimate-ws": "^2.0.0"
|
|
97
96
|
},
|
|
98
97
|
"publishConfig": {
|
|
99
98
|
"access": "public"
|
|
100
99
|
},
|
|
101
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "3c7622b4f631a2e2389b3ba41cb238dca684d94a",
|
|
102
101
|
"typescript": {
|
|
103
102
|
"definition": "lib/index.d.ts"
|
|
104
103
|
}
|