@cubejs-backend/server 1.8.21 → 1.8.22
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.
|
@@ -16,6 +16,7 @@ export declare class WebSocketServer {
|
|
|
16
16
|
protected subscriptionServer: SubscriptionServer | null;
|
|
17
17
|
constructor(serverCore: CubejsServerCore, options?: WebSocketServerOptions);
|
|
18
18
|
initServer(server: http.Server | https.Server): void;
|
|
19
|
+
protected serializeMessage(message: any): Promise<string>;
|
|
19
20
|
close(): Promise<void>;
|
|
20
21
|
}
|
|
21
22
|
//# sourceMappingURL=websocket-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAG3B,OAAO,EAAE,kBAAkB,EAAoC,MAAM,wBAAwB,CAAC;AAE9F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,eAAe;IAQxB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IARpD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IAE/D,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAQ;IAEnD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAG1C,UAAU,EAAE,gBAAgB,EAC5B,OAAO,GAAE,sBAA2B;IAGlD,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAG3B,OAAO,EAAE,kBAAkB,EAAoC,MAAM,wBAAwB,CAAC;AAE9F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,eAAe;IAQxB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IARpD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IAE/D,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAQ;IAEnD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAG1C,UAAU,EAAE,gBAAgB,EAC5B,OAAO,GAAE,sBAA2B;IAGlD,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;cAgFpC,gBAAgB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBlD,KAAK;CAcnB"}
|
|
@@ -24,43 +24,56 @@ class WebSocketServer {
|
|
|
24
24
|
path: this.options.webSocketsBasePath,
|
|
25
25
|
maxPayload: (0, shared_1.getEnv)('maxRequestSize'),
|
|
26
26
|
});
|
|
27
|
-
const connectionIdToSocket =
|
|
27
|
+
const connectionIdToSocket = new Map();
|
|
28
28
|
this.subscriptionServer = this.serverCore.initSubscriptionServer(async (connectionId, message) => {
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
const ws = connectionIdToSocket.get(connectionId);
|
|
30
|
+
if (!ws) {
|
|
31
|
+
return;
|
|
31
32
|
}
|
|
32
33
|
let messageStr;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
// it again - it's too expensive, instead we serialize the rest of the message and then
|
|
36
|
-
// inject query result json into message.
|
|
37
|
-
const resMsg = new TextDecoder().decode(await message.message.getFinalResult());
|
|
38
|
-
delete message.message;
|
|
39
|
-
messageStr = JSON.stringify(message);
|
|
40
|
-
if (messageStr === '{}') {
|
|
41
|
-
messageStr = `{"message":${resMsg}}`;
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
messageStr = `${messageStr.slice(0, -1)},"message":${resMsg}}`;
|
|
45
|
-
}
|
|
34
|
+
try {
|
|
35
|
+
messageStr = await this.serializeMessage(message);
|
|
46
36
|
}
|
|
47
|
-
|
|
48
|
-
|
|
37
|
+
catch (e) {
|
|
38
|
+
this.serverCore.logger('WebSocket Send Error', {
|
|
39
|
+
connectionId,
|
|
40
|
+
error: e?.stack || String(e),
|
|
41
|
+
});
|
|
42
|
+
ws.close(1011, 'Internal error');
|
|
43
|
+
throw e;
|
|
49
44
|
}
|
|
50
|
-
|
|
45
|
+
ws.send(messageStr);
|
|
51
46
|
});
|
|
52
47
|
this.wsServer.on('connection', (ws) => {
|
|
53
48
|
const connectionId = crypto_1.default.randomBytes(8).toString('hex');
|
|
54
|
-
connectionIdToSocket
|
|
49
|
+
connectionIdToSocket.set(connectionId, ws);
|
|
50
|
+
// An exception escaping these async listeners would be an unhandled rejection, which terminates the process
|
|
55
51
|
ws.on('message', async (message) => {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
52
|
+
try {
|
|
53
|
+
await this.subscriptionServer.processMessage(connectionId, message);
|
|
54
|
+
}
|
|
55
|
+
catch (e) {
|
|
56
|
+
this.serverCore.logger('WebSocket Message Error', {
|
|
57
|
+
connectionId,
|
|
58
|
+
error: e?.stack || String(e),
|
|
59
|
+
});
|
|
60
|
+
ws.close(1011, 'Internal error');
|
|
61
|
+
}
|
|
63
62
|
});
|
|
63
|
+
const disconnect = async () => {
|
|
64
|
+
connectionIdToSocket.delete(connectionId);
|
|
65
|
+
try {
|
|
66
|
+
await this.subscriptionServer.disconnect(connectionId);
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
this.serverCore.logger('WebSocket Disconnect Error', {
|
|
70
|
+
connectionId,
|
|
71
|
+
error: e?.stack || String(e),
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
ws.on('close', disconnect);
|
|
76
|
+
ws.on('error', disconnect);
|
|
64
77
|
});
|
|
65
78
|
const processSubscriptionsInterval = this.options.processSubscriptionsInterval || 5 * 1000;
|
|
66
79
|
this.subscriptionsTimer = (0, shared_1.createCancelableInterval)(async () => {
|
|
@@ -72,6 +85,21 @@ class WebSocketServer {
|
|
|
72
85
|
}),
|
|
73
86
|
});
|
|
74
87
|
}
|
|
88
|
+
async serializeMessage(message) {
|
|
89
|
+
if (message.message && message.message.isWrapper) {
|
|
90
|
+
// In case we have a wrapped query result, we don't want to parse/stringify
|
|
91
|
+
// it again - it's too expensive, instead we serialize the rest of the message and then
|
|
92
|
+
// inject query result json into message.
|
|
93
|
+
const resMsg = new TextDecoder().decode(await message.message.getFinalResult());
|
|
94
|
+
delete message.message;
|
|
95
|
+
const messageStr = JSON.stringify(message);
|
|
96
|
+
if (messageStr === '{}') {
|
|
97
|
+
return `{"message":${resMsg}}`;
|
|
98
|
+
}
|
|
99
|
+
return `${messageStr.slice(0, -1)},"message":${resMsg}}`;
|
|
100
|
+
}
|
|
101
|
+
return JSON.stringify(message);
|
|
102
|
+
}
|
|
75
103
|
async close() {
|
|
76
104
|
if (this.subscriptionsTimer) {
|
|
77
105
|
await this.subscriptionsTimer.cancel();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA2B;AAC3B,oDAA4B;AAC5B,gDAAwB;AACxB,mDAA8F;AAY9F,MAAa,eAAe;IAQL;IACA;IARX,kBAAkB,GAA8B,IAAI,CAAC;IAErD,QAAQ,GAA4B,IAAI,CAAC;IAEzC,kBAAkB,GAA8B,IAAI,CAAC;IAE/D,YACqB,UAA4B,EAC5B,UAAkC,EAAE;QADpC,eAAU,GAAV,UAAU,CAAkB;QAC5B,YAAO,GAAP,OAAO,CAA6B;IACrD,CAAC;IAEE,UAAU,CAAC,MAAkC;QAClD,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAS,CAAC,MAAM,CAAC;YACnC,MAAM;YACN,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,kBAAkB;YACrC,UAAU,EAAE,IAAA,eAAM,EAAC,gBAAgB,CAAC;SACrC,CAAC,CAAC;QAEH,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"1.8.
|
|
1
|
+
{"version":"1.8.22","commands":{"dev-server":{"id":"dev-server","description":"Run server in Development mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]},"server":{"id":"server","description":"Run server in Production mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/server",
|
|
3
3
|
"description": "Cube all-in-one server",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "1.8.
|
|
5
|
+
"version": "1.8.22",
|
|
6
6
|
"types": "index.d.ts",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
@@ -38,11 +38,11 @@
|
|
|
38
38
|
"jest:shapshot": "jest --updateSnapshot test"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@cubejs-backend/cubestore-driver": "1.8.
|
|
41
|
+
"@cubejs-backend/cubestore-driver": "1.8.22",
|
|
42
42
|
"@cubejs-backend/dotenv": "^9.0.2",
|
|
43
|
-
"@cubejs-backend/native": "1.8.
|
|
44
|
-
"@cubejs-backend/server-core": "1.8.
|
|
45
|
-
"@cubejs-backend/shared": "1.8.
|
|
43
|
+
"@cubejs-backend/native": "1.8.22",
|
|
44
|
+
"@cubejs-backend/server-core": "1.8.22",
|
|
45
|
+
"@cubejs-backend/shared": "1.8.22",
|
|
46
46
|
"@oclif/color": "^1.0.0",
|
|
47
47
|
"@oclif/command": "^1.8.13",
|
|
48
48
|
"@oclif/config": "^1.18.2",
|
|
@@ -58,8 +58,9 @@
|
|
|
58
58
|
"ws": "^7.5.3"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@cubejs-backend/
|
|
62
|
-
"@cubejs-backend/
|
|
61
|
+
"@cubejs-backend/api-gateway": "1.8.22",
|
|
62
|
+
"@cubejs-backend/linter": "1.8.22",
|
|
63
|
+
"@cubejs-backend/query-orchestrator": "1.8.22",
|
|
63
64
|
"@oclif/dev-cli": "^1.23.1",
|
|
64
65
|
"@types/body-parser": "^1.19.0",
|
|
65
66
|
"@types/cors": "^2.8.8",
|
|
@@ -80,5 +81,5 @@
|
|
|
80
81
|
"@oclif/plugin-help"
|
|
81
82
|
]
|
|
82
83
|
},
|
|
83
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "566650a0863271553dbf883417ec345cfdd7b2cd"
|
|
84
85
|
}
|