@based/server 9.2.7 → 10.0.1
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/dist/auth/index.js +1 -1
- package/dist/auth/index.js.map +1 -1
- package/dist/channel/destroy.js +3 -1
- package/dist/channel/destroy.js.map +1 -1
- package/dist/channel/start.js +10 -3
- package/dist/channel/start.js.map +1 -1
- package/dist/channel/subscribe.js +13 -2
- package/dist/channel/subscribe.js.map +1 -1
- package/dist/channel/types.d.ts +1 -0
- package/dist/channel/types.js.map +1 -1
- package/dist/channel/unsub.js +24 -3
- package/dist/channel/unsub.js.map +1 -1
- package/dist/functions/index.d.ts +1 -1
- package/dist/functions/index.js +50 -20
- package/dist/functions/index.js.map +1 -1
- package/dist/incoming/http/fakeWs/function.js +8 -6
- package/dist/incoming/http/fakeWs/function.js.map +1 -1
- package/dist/incoming/http/fakeWs/handleBinary.js +4 -3
- package/dist/incoming/http/fakeWs/handleBinary.js.map +1 -1
- package/dist/incoming/http/fakeWs/query.js +6 -5
- package/dist/incoming/http/fakeWs/query.js.map +1 -1
- package/dist/incoming/http/handleRequest.js.map +1 -1
- package/dist/incoming/http/index.js +2 -0
- package/dist/incoming/http/index.js.map +1 -1
- package/dist/incoming/http/pathMatcher.d.ts +1 -1
- package/dist/incoming/http/pathMatcher.js +16 -1
- package/dist/incoming/http/pathMatcher.js.map +1 -1
- package/dist/incoming/http/payloadParser.d.ts +1 -1
- package/dist/incoming/http/payloadParser.js +1 -0
- package/dist/incoming/http/payloadParser.js.map +1 -1
- package/dist/incoming/http/query.js +3 -2
- package/dist/incoming/http/query.js.map +1 -1
- package/dist/incoming/upgrade.js +1 -0
- package/dist/incoming/upgrade.js.map +1 -1
- package/dist/incoming/ws/auth.js +9 -7
- package/dist/incoming/ws/auth.js.map +1 -1
- package/dist/incoming/ws/channelPublish.js +4 -3
- package/dist/incoming/ws/channelPublish.js.map +1 -1
- package/dist/incoming/ws/channelSubscribe.js +6 -5
- package/dist/incoming/ws/channelSubscribe.js.map +1 -1
- package/dist/incoming/ws/function.js +8 -5
- package/dist/incoming/ws/function.js.map +1 -1
- package/dist/incoming/ws/get.js +8 -7
- package/dist/incoming/ws/get.js.map +1 -1
- package/dist/incoming/ws/index.d.ts +2 -2
- package/dist/incoming/ws/index.js +14 -12
- package/dist/incoming/ws/index.js.map +1 -1
- package/dist/incoming/ws/query.js +6 -5
- package/dist/incoming/ws/query.js.map +1 -1
- package/dist/incoming/ws/stream.d.ts +1 -1
- package/dist/incoming/ws/stream.js +29 -28
- package/dist/incoming/ws/stream.js.map +1 -1
- package/dist/protocol.d.ts +25 -14
- package/dist/protocol.js +346 -158
- package/dist/protocol.js.map +1 -1
- package/dist/query/destroy.js +2 -1
- package/dist/query/destroy.js.map +1 -1
- package/dist/query/send.d.ts +1 -1
- package/dist/query/send.js +29 -7
- package/dist/query/send.js.map +1 -1
- package/dist/query/start/error.js +4 -1
- package/dist/query/start/error.js.map +1 -1
- package/dist/query/start/update.js +22 -4
- package/dist/query/start/update.js.map +1 -1
- package/dist/query/subscribe.js +15 -5
- package/dist/query/subscribe.js.map +1 -1
- package/dist/query/types.d.ts +1 -0
- package/dist/query/unsub.js +32 -8
- package/dist/query/unsub.js.map +1 -1
- package/dist/sendError.js +4 -4
- package/dist/sendError.js.map +1 -1
- package/dist/sendHttpResponse.js +6 -2
- package/dist/sendHttpResponse.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/http/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmC,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,IAAI,QAAQ,GAAG,CAAC,CAAA;AAChB,MAAM,UAAU,GAAG,4BAA4B,CAAA;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,GAAoB,EACpB,GAAqB,EACrB,EAAE;IACF,IAAI,GAAyB,CAAA;IAE7B,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;YACtB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAA;YACtB,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;QACpB,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAEjC,IAAI,oBAAoB,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QACzE,OAAM;IACR,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAA;IAC9B,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/http/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,4 +19,4 @@ export declare function pathMatcher(tokens: PathToken[], path: Buffer): boolean;
|
|
|
19
19
|
* @param pattern - The pattern ("/users/:userId?")
|
|
20
20
|
* @param path - The path to test ("/users/123")
|
|
21
21
|
*/
|
|
22
|
-
export declare function pathExtractor(tokens: PathToken[], path: Buffer): Record<string, string | string[] | boolean>;
|
|
22
|
+
export declare function pathExtractor(tokens: PathToken[], path: Buffer): Record<string, (number | string) | (number | string)[] | boolean>;
|
|
@@ -223,6 +223,7 @@ export function pathExtractor(tokens, path) {
|
|
|
223
223
|
const len = path.byteLength;
|
|
224
224
|
let token = tokens[i - 1];
|
|
225
225
|
let tokenValue = token.value.toString();
|
|
226
|
+
let hasExtracted = false;
|
|
226
227
|
const extractions = {};
|
|
227
228
|
let collected = '';
|
|
228
229
|
let isToCollect = false;
|
|
@@ -230,11 +231,13 @@ export function pathExtractor(tokens, path) {
|
|
|
230
231
|
let queryValue = '';
|
|
231
232
|
if (i === len) {
|
|
232
233
|
extractions[tokenValue] = '';
|
|
234
|
+
hasExtracted = true;
|
|
233
235
|
return extractions;
|
|
234
236
|
}
|
|
235
237
|
for (const { type, value, modifier } of tokens) {
|
|
236
238
|
if (type === PARAM) {
|
|
237
239
|
tokenValue = value.toString();
|
|
240
|
+
hasExtracted = true;
|
|
238
241
|
if (modifier === PLUS || modifier === ASTERISK) {
|
|
239
242
|
extractions[tokenValue] = [];
|
|
240
243
|
}
|
|
@@ -245,6 +248,8 @@ export function pathExtractor(tokens, path) {
|
|
|
245
248
|
}
|
|
246
249
|
while (i < len) {
|
|
247
250
|
if (i === 1 && path[i] === QUESTION_MARK) {
|
|
251
|
+
hasExtracted = true;
|
|
252
|
+
// incorrect needs to be true e.g. ?bla -> bla: true
|
|
248
253
|
extractions[tokenValue] = '';
|
|
249
254
|
}
|
|
250
255
|
if (path[i] !== SLASH) {
|
|
@@ -253,6 +258,7 @@ export function pathExtractor(tokens, path) {
|
|
|
253
258
|
if (query) {
|
|
254
259
|
if (i === len - 1 && collected && !queryValue) {
|
|
255
260
|
extractions[collected] = true;
|
|
261
|
+
hasExtracted = true;
|
|
256
262
|
collected = '';
|
|
257
263
|
}
|
|
258
264
|
if (path[i] === QUESTION_MARK) {
|
|
@@ -261,11 +267,15 @@ export function pathExtractor(tokens, path) {
|
|
|
261
267
|
if (path[i + 1] === EQUALS_SIGN) {
|
|
262
268
|
i++;
|
|
263
269
|
extractions[collected] = '';
|
|
270
|
+
hasExtracted = true;
|
|
264
271
|
queryValue = collected;
|
|
265
272
|
collected = '';
|
|
266
273
|
}
|
|
267
274
|
if (path[i + 1] === AMPERSAND || (i === len - 1 && collected)) {
|
|
268
275
|
i++;
|
|
276
|
+
// @ts-ignore
|
|
277
|
+
collected = !isNaN(collected) ? Number(collected) : collected;
|
|
278
|
+
hasExtracted = true;
|
|
269
279
|
extractions[queryValue] = collected;
|
|
270
280
|
collected = '';
|
|
271
281
|
}
|
|
@@ -294,6 +304,8 @@ export function pathExtractor(tokens, path) {
|
|
|
294
304
|
extractions[tokenValue].push(collected);
|
|
295
305
|
}
|
|
296
306
|
else {
|
|
307
|
+
hasExtracted = true;
|
|
308
|
+
// check if it can be a number
|
|
297
309
|
extractions[tokenValue] = collected;
|
|
298
310
|
}
|
|
299
311
|
}
|
|
@@ -304,6 +316,9 @@ export function pathExtractor(tokens, path) {
|
|
|
304
316
|
token = tokens[tokenIndex];
|
|
305
317
|
}
|
|
306
318
|
}
|
|
307
|
-
|
|
319
|
+
if (hasExtracted) {
|
|
320
|
+
return extractions;
|
|
321
|
+
}
|
|
322
|
+
return null;
|
|
308
323
|
}
|
|
309
324
|
//# sourceMappingURL=pathMatcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathMatcher.js","sourceRoot":"","sources":["../../../src/incoming/http/pathMatcher.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,WAAW,EACX,cAAc,EACd,cAAc,EACd,cAAc,EACd,cAAc,EACd,UAAU,EACV,MAAM,EACN,GAAG,EACH,IAAI,EACJ,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,MAAM,EACN,KAAK,EACL,KAAK,EACL,OAAO,EACP,KAAK,EACL,WAAW,EACX,SAAS,GACV,MAAM,YAAY,CAAA;AAEnB;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,CACL,CAAC,IAAI,IAAI,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC;QAC5C,CAAC,IAAI,IAAI,cAAc,IAAI,IAAI,IAAI,cAAc,CAAC;QAClD,CAAC,IAAI,IAAI,cAAc,IAAI,IAAI,IAAI,cAAc,CAAC;QAClD,IAAI,KAAK,UAAU;QACnB,IAAI,KAAK,MAAM;QACf,IAAI,KAAK,GAAG,CACb,CAAA;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,KAAa;IACnC,OAAO,CACL,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"pathMatcher.js","sourceRoot":"","sources":["../../../src/incoming/http/pathMatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Context, HttpSession, BasedRouteComplete } from '@based/functions';
|
|
2
|
-
declare const _default: (ctx: Context<HttpSession>, route: BasedRouteComplete) => Record<string, string | boolean | string[]>;
|
|
2
|
+
declare const _default: (ctx: Context<HttpSession>, route: BasedRouteComplete) => Record<string, string | number | boolean | (string | number)[]>;
|
|
3
3
|
export default _default;
|
|
@@ -11,6 +11,7 @@ export default (ctx, route) => {
|
|
|
11
11
|
url = `/${route.name}${url}`;
|
|
12
12
|
}
|
|
13
13
|
const payload = pathExtractor(route.tokens, Buffer.from(url));
|
|
14
|
+
// console.log('extracted a payload', payload, route)
|
|
14
15
|
if (payload && 'token' in payload) {
|
|
15
16
|
ctx.session.authState = parseAuthState(payload.token);
|
|
16
17
|
if (route.type === 'query') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payloadParser.js","sourceRoot":"","sources":["../../../src/incoming/http/payloadParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,eAAe,CAAC,GAAyB,EAAE,KAAyB,EAAE,EAAE;IACtE,IAAI,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAA;IACzB,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;IAE9D,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC;QACnD,GAAG,IAAI,GAAG,CAAA;IACZ,CAAC;IAED,GAAG,IAAI,KAAK,CAAA;IAEZ,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACtC,GAAG,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,GAAG,EAAE,CAAA;IAC9B,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAE7D,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;QAClC,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAErD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC,KAAK,CAAA;QACtB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"payloadParser.js","sourceRoot":"","sources":["../../../src/incoming/http/payloadParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,eAAe,CAAC,GAAyB,EAAE,KAAyB,EAAE,EAAE;IACtE,IAAI,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAA;IACzB,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;IAE9D,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC;QACnD,GAAG,IAAI,GAAG,CAAA;IACZ,CAAC;IAED,GAAG,IAAI,KAAK,CAAA;IAEZ,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACtC,GAAG,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,GAAG,EAAE,CAAA;IAC9B,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAE7D,qDAAqD;IAErD,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;QAClC,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAErD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC,KAAK,CAAA;QACtB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
|
|
@@ -7,9 +7,10 @@ import { sendError } from '../../sendError.js';
|
|
|
7
7
|
import { promisify } from 'node:util';
|
|
8
8
|
import { authorize } from '../../authorize.js';
|
|
9
9
|
const inflate = promisify(zlib.inflateRaw);
|
|
10
|
+
const PROTOCOL_CACHE_RAW_OFFSET = 21;
|
|
10
11
|
const sendCacheSwapEncoding = async (server, route, ctx, buffer, checksum, headers, status = '200 OK') => {
|
|
11
12
|
try {
|
|
12
|
-
const inflated = await inflate(buffer.
|
|
13
|
+
const inflated = await inflate(buffer.subarray(PROTOCOL_CACHE_RAW_OFFSET));
|
|
13
14
|
const { payload, encoding } = await compress(inflated, ctx.session.headers.encoding);
|
|
14
15
|
if (!ctx.session.res) {
|
|
15
16
|
return;
|
|
@@ -40,7 +41,7 @@ const sendCache = (ctx, buffer, checksum, isDeflate, headers, status = '200 OK')
|
|
|
40
41
|
if (isDeflate) {
|
|
41
42
|
ctx.session.res.writeHeader('Content-Encoding', 'deflate');
|
|
42
43
|
}
|
|
43
|
-
end(ctx, buffer.
|
|
44
|
+
end(ctx, buffer.subarray(PROTOCOL_CACHE_RAW_OFFSET));
|
|
44
45
|
});
|
|
45
46
|
};
|
|
46
47
|
const sendNotModified = (ctx, headers, status = '304 Not Modified') => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/incoming/http/query.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EACL,SAAS,EACT,UAAU,EACV,mBAAmB,EACnB,MAAM,EACN,eAAe,EACf,aAAa,EAEb,KAAK,EACL,eAAe,GAChB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAuB,MAAM,oBAAoB,CAAA;AAEnE,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,qBAAqB,GAAG,KAAK,EACjC,MAAmB,EACnB,KAA0B,EAC1B,GAAyB,EACzB,MAAkB,EAClB,QAAgB,EAChB,OAAqB,EACrB,SAAiB,QAAQ,EACzB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/incoming/http/query.ts"],"names":[],"mappings":"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"}
|
package/dist/incoming/upgrade.js
CHANGED
|
@@ -40,6 +40,7 @@ ctx, ip) => {
|
|
|
40
40
|
type: authState.t ?? 0,
|
|
41
41
|
origin,
|
|
42
42
|
obs: new Set(),
|
|
43
|
+
v: authState.v ?? 1, // authState contains the protocol version...
|
|
43
44
|
}, secWebSocketKey, secWebSocketProtocol, secWebSocketExtensions, ctx);
|
|
44
45
|
};
|
|
45
46
|
export const upgrade = (server, res, req,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,4CAA4C;AAE5C,IAAI,QAAQ,GAAG,CAAC,CAAA;AAEhB,MAAM,eAAe,GAAG,CACtB,OAAoB,EACpB,GAAqB,EACrB,GAAoB;AACpB,2BAA2B;AAC3B,GAA4B,EAC5B,EAAU,EACV,EAAE;IACF,MAAM,oBAAoB,GAAG,GAAG,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAA;IACpE,MAAM,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;IAEtC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,eAAe;QACf,aAAa;QACb,MAAM;QACN,iBAAiB;QACjB,YAAY;QACZ,YAAY;QACZ,SAAS;QACT,OAAO;QACP,4DAA4D;QAC5D,IAAI;QACJ,cAAc;QACd,SAAS;QACT,2BAA2B;QAC3B,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;IAC5B,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;IAC1D,MAAM,sBAAsB,GAAG,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAA;IACxE,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAEtC,GAAG,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAA;IAE1C,MAAM,SAAS,GAAG,oBAAoB;QACpC,CAAC,CAAC,cAAc,CAAC,oBAAoB,CAAC;QACtC,CAAC,CAAC,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":"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"}
|
package/dist/incoming/ws/auth.js
CHANGED
|
@@ -1,17 +1,19 @@
|
|
|
1
|
-
import { valueToBuffer, decodePayload, encodeAuthResponse, } from '../../protocol.js';
|
|
1
|
+
import { valueToBuffer, decodePayload, encodeAuthResponse, valueToBufferV1, } from '../../protocol.js';
|
|
2
2
|
import { enableSubscribe } from './query.js';
|
|
3
3
|
import { rateLimitRequest } from '../../security.js';
|
|
4
4
|
import { enableChannelSubscribe } from './channelSubscribe.js';
|
|
5
5
|
import { installFn } from '../../installFn.js';
|
|
6
6
|
import { authorize } from '../../authorize.js';
|
|
7
|
-
const sendAuthMessage = (ctx, payload) =>
|
|
7
|
+
const sendAuthMessage = (ctx, payload) => {
|
|
8
|
+
ctx.session?.ws.send(encodeAuthResponse(ctx.session.v < 2
|
|
9
|
+
? valueToBufferV1(payload, true)
|
|
10
|
+
: valueToBuffer(payload, true)), true, false);
|
|
11
|
+
};
|
|
8
12
|
const parse = (payload) => {
|
|
9
|
-
|
|
10
|
-
return JSON.parse(payload);
|
|
11
|
-
}
|
|
12
|
-
catch (err) {
|
|
13
|
+
if (typeof payload !== 'object') {
|
|
13
14
|
return { error: 'invalid token' };
|
|
14
15
|
}
|
|
16
|
+
return payload;
|
|
15
17
|
};
|
|
16
18
|
export const reEvaulateUnauthorized = (server, ctx) => {
|
|
17
19
|
const session = ctx.session;
|
|
@@ -62,7 +64,7 @@ export const authMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
62
64
|
return;
|
|
63
65
|
}
|
|
64
66
|
// | 4 header | * payload |
|
|
65
|
-
const payload = decodePayload(new Uint8Array(arr.slice(start + 4, start + len)), isDeflate);
|
|
67
|
+
const payload = decodePayload(new Uint8Array(arr.slice(start + 4, start + len)), isDeflate, ctx.session.v < 2);
|
|
66
68
|
const authState = parse(payload);
|
|
67
69
|
server.auth
|
|
68
70
|
.verifyAuthState(server.client, ctx, authState)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { decodePayload } from '../../protocol.js';
|
|
2
2
|
import { rateLimitRequest } from '../../security.js';
|
|
3
3
|
import { verifyRoute } from '../../verifyRoute.js';
|
|
4
4
|
import { extendChannel, hasChannel } from '../../channel/index.js';
|
|
5
5
|
import { authorize } from '../../authorize.js';
|
|
6
6
|
import { sendError } from '../../sendError.js';
|
|
7
7
|
import { BasedErrorCode } from '@based/errors';
|
|
8
|
+
import { readUint64 } from '@saulx/utils';
|
|
8
9
|
const publish = (route, spec, server, ctx, payload, id) => {
|
|
9
10
|
const channel = server.activeChannelsById.get(id);
|
|
10
11
|
if (!channel) {
|
|
@@ -29,7 +30,7 @@ const publish = (route, spec, server, ctx, payload, id) => {
|
|
|
29
30
|
};
|
|
30
31
|
export const channelPublishMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
31
32
|
// | 4 header | 8 id | * payload |
|
|
32
|
-
const id =
|
|
33
|
+
const id = readUint64(arr, start + 4);
|
|
33
34
|
// how to determine it does not exist?
|
|
34
35
|
if (!hasChannel(server, id)) {
|
|
35
36
|
if (rateLimitRequest(server, ctx, 1, server.rateLimit.ws)) {
|
|
@@ -55,7 +56,7 @@ export const channelPublishMessage = (arr, start, len, isDeflate, ctx, server) =
|
|
|
55
56
|
}
|
|
56
57
|
const payload = len === 12
|
|
57
58
|
? undefined
|
|
58
|
-
:
|
|
59
|
+
: decodePayload(new Uint8Array(arr.slice(start + 12, start + len)), isDeflate, ctx.session.v < 2);
|
|
59
60
|
authorize(route, server, ctx, payload, publish, id, undefined, route.publicPublisher);
|
|
60
61
|
return true;
|
|
61
62
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channelPublish.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelPublish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"channelPublish.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelPublish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { decodeName, decodePayload } from '../../protocol.js';
|
|
2
2
|
import { BasedErrorCode } from '@based/errors';
|
|
3
3
|
import { sendError } from '../../sendError.js';
|
|
4
4
|
import { rateLimitRequest } from '../../security.js';
|
|
@@ -6,6 +6,7 @@ import { verifyRoute } from '../../verifyRoute.js';
|
|
|
6
6
|
import { installFn } from '../../installFn.js';
|
|
7
7
|
import { authorize, } from '../../authorize.js';
|
|
8
8
|
import { hasChannel, subscribeChannel, createChannel, unsubscribeChannel, destroyChannel, extendChannel, } from '../../channel/index.js';
|
|
9
|
+
import { readUint64 } from '@saulx/utils';
|
|
9
10
|
export const enableChannelSubscribe = (route, _spec, server, ctx, payload, id) => {
|
|
10
11
|
if (hasChannel(server, id)) {
|
|
11
12
|
subscribeChannel(server, id, ctx);
|
|
@@ -36,7 +37,7 @@ export const channelSubscribeMessage = (arr, start, len,
|
|
|
36
37
|
isChannelIdRequester, ctx, server) => {
|
|
37
38
|
// | 4 header | 8 id | 1 name length | * name | * payload |
|
|
38
39
|
const nameLen = arr[start + 12];
|
|
39
|
-
const id =
|
|
40
|
+
const id = readUint64(arr, start + 4);
|
|
40
41
|
const name = decodeName(arr, start + 13, start + 13 + nameLen);
|
|
41
42
|
if (!name || !id) {
|
|
42
43
|
return false;
|
|
@@ -65,7 +66,7 @@ isChannelIdRequester, ctx, server) => {
|
|
|
65
66
|
if (!hasChannel(server, id)) {
|
|
66
67
|
const payload = len === nameLen + 13
|
|
67
68
|
? undefined
|
|
68
|
-
:
|
|
69
|
+
: decodePayload(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false, ctx.session.v < 2);
|
|
69
70
|
// This has to be done instantly so publish can be received immediatly
|
|
70
71
|
const channel = createChannel(server, name, id, payload, true);
|
|
71
72
|
installFn(server, ctx, tmpRoute, id).then((spec) => {
|
|
@@ -100,7 +101,7 @@ isChannelIdRequester, ctx, server) => {
|
|
|
100
101
|
}
|
|
101
102
|
const payload = len === nameLen + 13
|
|
102
103
|
? undefined
|
|
103
|
-
:
|
|
104
|
+
: decodePayload(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false, ctx.session.v < 2);
|
|
104
105
|
session.obs.add(id);
|
|
105
106
|
authorize(route, server, ctx, payload, enableChannelSubscribe, id, 0, false, isNotAuthorized);
|
|
106
107
|
return true;
|
|
@@ -110,7 +111,7 @@ export const unsubscribeChannelMessage = (arr, start, _len, _isDeflate, ctx, ser
|
|
|
110
111
|
if (!ctx.session) {
|
|
111
112
|
return false;
|
|
112
113
|
}
|
|
113
|
-
const id =
|
|
114
|
+
const id = readUint64(arr, start + 5);
|
|
114
115
|
if (!id) {
|
|
115
116
|
return false;
|
|
116
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channelSubscribe.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelSubscribe.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"channelSubscribe.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelSubscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { decodeName, decodePayload, encodeFunctionResponse, valueToBuffer, valueToBufferV1, } from '../../protocol.js';
|
|
2
2
|
import { BasedErrorCode } from '@based/errors';
|
|
3
3
|
import { sendError } from '../../sendError.js';
|
|
4
4
|
import { rateLimitRequest } from '../../security.js';
|
|
@@ -6,6 +6,7 @@ import { verifyRoute } from '../../verifyRoute.js';
|
|
|
6
6
|
import { authorize } from '../../authorize.js';
|
|
7
7
|
import { Duplex, Readable } from 'stream';
|
|
8
8
|
import { readStream } from '@saulx/utils';
|
|
9
|
+
import { readUint24 } from '@saulx/utils';
|
|
9
10
|
const sendFunction = (route, spec, server, ctx, payload, requestId) => {
|
|
10
11
|
if (spec.relay) {
|
|
11
12
|
const client = server.clients[spec.relay.client];
|
|
@@ -20,7 +21,9 @@ const sendFunction = (route, spec, server, ctx, payload, requestId) => {
|
|
|
20
21
|
client
|
|
21
22
|
.call(spec.relay.target ?? spec.name, payload)
|
|
22
23
|
.then(async (v) => {
|
|
23
|
-
ctx.session?.ws.send(encodeFunctionResponse(requestId,
|
|
24
|
+
ctx.session?.ws.send(encodeFunctionResponse(requestId, ctx.session.v < 2
|
|
25
|
+
? valueToBufferV1(v, true)
|
|
26
|
+
: valueToBuffer(v, true)), true, false);
|
|
24
27
|
})
|
|
25
28
|
.catch((err) => {
|
|
26
29
|
sendError(server, ctx, BasedErrorCode.FunctionError, {
|
|
@@ -38,7 +41,7 @@ const sendFunction = (route, spec, server, ctx, payload, requestId) => {
|
|
|
38
41
|
if (v && (v instanceof Duplex || v instanceof Readable)) {
|
|
39
42
|
v = await readStream(v);
|
|
40
43
|
}
|
|
41
|
-
ctx.session?.ws.send(encodeFunctionResponse(requestId, valueToBuffer(v)), true, false);
|
|
44
|
+
ctx.session?.ws.send(encodeFunctionResponse(requestId, ctx.session.v < 2 ? valueToBufferV1(v, true) : valueToBuffer(v, true)), true, false);
|
|
42
45
|
})
|
|
43
46
|
.catch((err) => {
|
|
44
47
|
sendError(server, ctx, BasedErrorCode.FunctionError, {
|
|
@@ -50,7 +53,7 @@ const sendFunction = (route, spec, server, ctx, payload, requestId) => {
|
|
|
50
53
|
};
|
|
51
54
|
export const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
52
55
|
// | 4 header | 3 id | 1 name length | * name | * payload |
|
|
53
|
-
const requestId =
|
|
56
|
+
const requestId = readUint24(arr, start + 4);
|
|
54
57
|
const nameLen = arr[start + 7];
|
|
55
58
|
const name = decodeName(arr, start + 8, start + 8 + nameLen);
|
|
56
59
|
if (!name || !requestId) {
|
|
@@ -74,7 +77,7 @@ export const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
74
77
|
}
|
|
75
78
|
const payload = len === nameLen + 8
|
|
76
79
|
? undefined
|
|
77
|
-
:
|
|
80
|
+
: decodePayload(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate, ctx.session.v < 2);
|
|
78
81
|
authorize(route, server, ctx, payload, sendFunction, requestId);
|
|
79
82
|
return true;
|
|
80
83
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,sBAAsB,EACtB,aAAa,EACb,eAAe,GAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAuB,MAAM,oBAAoB,CAAA;AAEnE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,YAAY,GAGd,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IACnD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAChD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBACnD,KAAK;gBACL,SAAS;gBACT,GAAG,EAAE,IAAI,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC;aACnD,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,MAAM;aACH,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;aAC7C,IAAI,CAAC,KAAK,EAAE,CAAM,EAAE,EAAE;YACrB,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAClB,sBAAsB,CACpB,SAAS,EACT,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;gBACf,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC;gBAC1B,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,CAC3B,EACD,IAAI,EACJ,KAAK,CACN,CAAA;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACpB,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;gBACnD,KAAK;gBACL,SAAS;gBACT,GAAG;aACJ,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEJ,OAAM;IACR,CAAC;IAED,IAAI;SACD,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;SAC/B,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAChB,6BAA6B;QAC7B,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,MAAM,IAAI,CAAC,YAAY,QAAQ,CAAC,EAAE,CAAC;YACxD,CAAC,GAAG,MAAM,UAAU,CAAC,CAAC,CAAC,CAAA;QACzB,CAAC;QAED,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAClB,sBAAsB,CACpB,SAAS,EACT,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,CACtE,EACD,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,aAAa,EAAE;YACnD,KAAK;YACL,SAAS;YACT,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAyB,CACnD,GAAG,EACH,KAAK,EACL,GAAG,EACH,SAAS,EACT,GAAG,EACH,MAAM,EACN,EAAE;IACF,2DAA2D;IAC3D,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC9B,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,CAAA;IAE5D,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACxB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CACvB,MAAM,EACN,GAAG,EACH,UAAU,EACV,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,SAAS,CACV,CAAA;IAED,6DAA6D;IAC7D,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IACE,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EACzE,CAAC;QACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;QACtB,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;QAC/B,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,eAAe,EAAE;YACrD,KAAK;YACL,SAAS;SACV,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,OAAO,GACX,GAAG,KAAK,OAAO,GAAG,CAAC;QACjB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,aAAa,CACX,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,OAAO,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,EAC3D,SAAS,EACT,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAClB,CAAA;IAEP,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;IAE/D,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
|
package/dist/incoming/ws/get.js
CHANGED
|
@@ -1,26 +1,27 @@
|
|
|
1
|
-
import { decodePayload, decodeName,
|
|
1
|
+
import { decodePayload, decodeName, encodeGetResponse } from '../../protocol.js';
|
|
2
2
|
import { createObs, destroyObs, subscribeNext, getObsAndStopRemove, hasObs, start, sendObsWs, sendObsGetError, } from '../../query/index.js';
|
|
3
3
|
import { BasedErrorCode } from '@based/errors';
|
|
4
4
|
import { sendError } from '../../sendError.js';
|
|
5
5
|
import { rateLimitRequest } from '../../security.js';
|
|
6
6
|
import { verifyRoute } from '../../verifyRoute.js';
|
|
7
7
|
import { authorize, } from '../../authorize.js';
|
|
8
|
+
import { readUint64 } from '@saulx/utils';
|
|
8
9
|
const sendGetData = (server, id, obs, checksum, ctx) => {
|
|
9
10
|
if (!ctx.session) {
|
|
10
11
|
destroyObs(server, id);
|
|
11
12
|
return;
|
|
12
13
|
}
|
|
13
14
|
if (checksum === 0) {
|
|
14
|
-
sendObsWs(ctx, obs.cache, obs);
|
|
15
|
+
sendObsWs(ctx, obs.cache, obs, false);
|
|
15
16
|
}
|
|
16
17
|
else if (checksum === obs.checksum) {
|
|
17
18
|
ctx.session.ws.send(encodeGetResponse(id), true, false);
|
|
18
19
|
}
|
|
19
20
|
else if (obs.diffCache && obs.previousChecksum === checksum) {
|
|
20
|
-
sendObsWs(ctx, obs.diffCache, obs);
|
|
21
|
+
sendObsWs(ctx, obs.diffCache, obs, true);
|
|
21
22
|
}
|
|
22
23
|
else {
|
|
23
|
-
sendObsWs(ctx, obs.cache, obs);
|
|
24
|
+
sendObsWs(ctx, obs.cache, obs, false);
|
|
24
25
|
}
|
|
25
26
|
destroyObs(server, id);
|
|
26
27
|
};
|
|
@@ -90,8 +91,8 @@ const isNotAuthorized = (route, _server, ctx, payload, id, checksum) => {
|
|
|
90
91
|
export const getMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
91
92
|
// | 4 header | 8 id | 8 checksum | 1 name length | * name | * payload |
|
|
92
93
|
const nameLen = arr[start + 20];
|
|
93
|
-
const id =
|
|
94
|
-
const checksum =
|
|
94
|
+
const id = readUint64(arr, start + 4);
|
|
95
|
+
const checksum = readUint64(arr, start + 12);
|
|
95
96
|
const name = decodeName(arr, start + 21, start + 21 + nameLen);
|
|
96
97
|
if (!name || !id) {
|
|
97
98
|
return false;
|
|
@@ -114,7 +115,7 @@ export const getMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
114
115
|
}
|
|
115
116
|
const payload = len === nameLen + 21
|
|
116
117
|
? undefined
|
|
117
|
-
:
|
|
118
|
+
: decodePayload(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate, ctx.session.v < 2);
|
|
118
119
|
authorize(route, server, ctx, payload, isAuthorized, id, checksum, false, isNotAuthorized);
|
|
119
120
|
return true;
|
|
120
121
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/incoming/ws/get.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/incoming/ws/get.ts"],"names":[],"mappings":"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"}
|