@cubejs-backend/api-gateway 1.8.21 → 1.8.23

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.
@@ -28,12 +28,27 @@ class SubscriptionServer {
28
28
  }
29
29
  resultFn(connectionId, messageId, requestId, logNetworkUsage = true) {
30
30
  return async (message, { status } = { status: 200 }) => {
31
- if (logNetworkUsage) {
32
- this.apiGateway.log({ type: 'Outgoing network usage', service: 'api-ws', bytes: calcMessageLength(message), }, { requestId });
31
+ try {
32
+ if (logNetworkUsage) {
33
+ this.apiGateway.log({ type: 'Outgoing network usage', service: 'api-ws', bytes: calcMessageLength(message), }, { requestId });
34
+ }
35
+ await this.sendMessage(connectionId, { messageId, message, status });
36
+ }
37
+ catch (e) {
38
+ this.apiGateway.log({
39
+ type: 'WebSocket Send Error',
40
+ service: 'api-ws',
41
+ error: e?.stack || String(e),
42
+ }, { requestId });
33
43
  }
34
- return this.sendMessage(connectionId, { messageId, message, status });
35
44
  };
36
45
  }
46
+ replyMessageId(message) {
47
+ if (!message || typeof message !== 'object' || !('messageId' in message)) {
48
+ return undefined;
49
+ }
50
+ return (0, message_schema_1.validateMessageId)(message.messageId);
51
+ }
37
52
  deserializeMessage(message) {
38
53
  try {
39
54
  return JSON.parse(message);
@@ -48,6 +63,9 @@ class SubscriptionServer {
48
63
  .join(', ');
49
64
  }
50
65
  validateMessage(message) {
66
+ if (!message || typeof message !== 'object') {
67
+ throw new cubejs_handler_error_1.CubejsHandlerError(400, 'Invalid message format', 'Message must be a JSON object');
68
+ }
51
69
  if ('authorization' in message) {
52
70
  const result = message_schema_1.authMessageSchema.safeParse(message);
53
71
  if (!result.success) {
@@ -69,35 +87,42 @@ class SubscriptionServer {
69
87
  return result.data;
70
88
  }
71
89
  async processMessage(connectionId, body) {
72
- let message;
90
+ let rawMessage;
73
91
  try {
74
- message = this.deserializeMessage(body);
75
- message = this.validateMessage(message);
92
+ rawMessage = this.deserializeMessage(body);
93
+ const message = this.validateMessage(rawMessage);
76
94
  await this.handleMessage(connectionId, message, false);
77
95
  }
78
96
  catch (e) {
79
97
  this.apiGateway.handleError({
80
98
  e,
81
- query: message?.query,
82
- res: this.resultFn(connectionId, message?.messageId, undefined, false),
99
+ res: this.resultFn(connectionId, this.replyMessageId(rawMessage), undefined, false),
83
100
  });
84
101
  }
85
102
  }
86
103
  async handleMessage(connectionId, message, isSubscription) {
87
104
  let authContext = {};
88
105
  let context = {};
89
- const bytes = calcMessageLength(message);
90
106
  try {
107
+ const connection = this.subscriptionStore.connect(connectionId);
91
108
  if ('authorization' in message) {
92
- authContext = { isSubscription, protocol: 'ws' };
93
- await this.apiGateway.checkAuthFn(authContext, message.authorization);
94
- const acceptanceResult = await this.contextAcceptor(authContext);
95
- if (!acceptanceResult.accepted) {
96
- this.sendMessage(connectionId, acceptanceResult.rejectMessage);
97
- return;
109
+ if (connection.isAuthorizing()) {
110
+ throw new cubejs_handler_error_1.CubejsHandlerError(409, 'Authorization in progress', 'Authorization is already in progress for this connection');
98
111
  }
99
- await this.subscriptionStore.setAuthContext(connectionId, authContext);
100
- this.sendMessage(connectionId, { handshake: true });
112
+ await connection.trackAuth(async () => {
113
+ authContext = { isSubscription, protocol: 'ws' };
114
+ await this.apiGateway.checkAuthFn(authContext, message.authorization);
115
+ const acceptanceResult = await this.contextAcceptor(authContext);
116
+ if (!acceptanceResult.accepted) {
117
+ await this.sendMessage(connectionId, acceptanceResult.rejectMessage);
118
+ return;
119
+ }
120
+ if (connection.isClosed()) {
121
+ return;
122
+ }
123
+ await this.subscriptionStore.setAuthContext(connectionId, authContext);
124
+ await this.sendMessage(connectionId, { handshake: true });
125
+ });
101
126
  return;
102
127
  }
103
128
  if ('unsubscribe' in message) {
@@ -132,10 +157,13 @@ class SubscriptionServer {
132
157
  context = await this.apiGateway.contextByReq(
133
158
  // TODO: We need to standardize type for WS request type
134
159
  message, authContext.securityContext, requestId);
160
+ if (connection.isClosed()) {
161
+ return;
162
+ }
135
163
  this.apiGateway.log({
136
164
  type: 'Incoming network usage',
137
165
  service: 'api-ws',
138
- bytes,
166
+ bytes: calcMessageLength(message),
139
167
  }, context);
140
168
  const collectedParams = Object.create(null);
141
169
  if (message.params) {
@@ -184,7 +212,18 @@ class SubscriptionServer {
184
212
  async processSubscriptions() {
185
213
  const allSubscriptions = this.subscriptionStore.getAllSubscriptions();
186
214
  await Promise.all(allSubscriptions.map(async (subscription) => {
187
- await this.handleMessage(subscription.connectionId, subscription.message, true);
215
+ // One failing subscription must not abort the tick for the others
216
+ try {
217
+ await this.handleMessage(subscription.connectionId, subscription.message, true);
218
+ }
219
+ catch (e) {
220
+ this.apiGateway.log({
221
+ type: 'WebSocket Subscription Error',
222
+ service: 'api-ws',
223
+ connectionId: subscription.connectionId,
224
+ error: e?.stack || String(e),
225
+ });
226
+ }
188
227
  }));
189
228
  }
190
229
  async disconnect(connectionId) {
@@ -1 +1 @@
1
- {"version":3,"file":"subscription-server.js","sourceRoot":"","sources":["../../../src/ws/subscription-server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"subscription-server.js","sourceRoot":"","sources":["../../../src/ws/subscription-server.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/api-gateway",
3
3
  "description": "Cube API Gateway",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "1.8.21",
5
+ "version": "1.8.23",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.git",
@@ -25,9 +25,9 @@
25
25
  "dist/src/*"
26
26
  ],
27
27
  "dependencies": {
28
- "@cubejs-backend/native": "1.8.21",
29
- "@cubejs-backend/query-orchestrator": "1.8.21",
30
- "@cubejs-backend/shared": "1.8.21",
28
+ "@cubejs-backend/native": "1.8.23",
29
+ "@cubejs-backend/query-orchestrator": "1.8.23",
30
+ "@cubejs-backend/shared": "1.8.23",
31
31
  "@ungap/structured-clone": "^0.3.4",
32
32
  "assert-never": "^1.4.0",
33
33
  "body-parser": "^1.20.8",
@@ -51,7 +51,7 @@
51
51
  "zod": "^4.1.13"
52
52
  },
53
53
  "devDependencies": {
54
- "@cubejs-backend/linter": "1.8.21",
54
+ "@cubejs-backend/linter": "1.8.23",
55
55
  "@types/express": "^4.17.21",
56
56
  "@types/jest": "^29",
57
57
  "@types/jsonwebtoken": "^9.0.2",
@@ -68,5 +68,5 @@
68
68
  "typescript": "~6.0.3"
69
69
  },
70
70
  "license": "Apache-2.0",
71
- "gitHead": "3fb5275758e9d8d20b5528bb2fedcd603fb80c8e"
71
+ "gitHead": "27fbd15f9b7392066ca08c57dba467a0d77d74e1"
72
72
  }