@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.
Files changed (74) hide show
  1. package/dist/auth/index.js +1 -1
  2. package/dist/auth/index.js.map +1 -1
  3. package/dist/channel/destroy.js +3 -1
  4. package/dist/channel/destroy.js.map +1 -1
  5. package/dist/channel/start.js +10 -3
  6. package/dist/channel/start.js.map +1 -1
  7. package/dist/channel/subscribe.js +13 -2
  8. package/dist/channel/subscribe.js.map +1 -1
  9. package/dist/channel/types.d.ts +1 -0
  10. package/dist/channel/types.js.map +1 -1
  11. package/dist/channel/unsub.js +24 -3
  12. package/dist/channel/unsub.js.map +1 -1
  13. package/dist/functions/index.d.ts +1 -1
  14. package/dist/functions/index.js +50 -20
  15. package/dist/functions/index.js.map +1 -1
  16. package/dist/incoming/http/fakeWs/function.js +8 -6
  17. package/dist/incoming/http/fakeWs/function.js.map +1 -1
  18. package/dist/incoming/http/fakeWs/handleBinary.js +4 -3
  19. package/dist/incoming/http/fakeWs/handleBinary.js.map +1 -1
  20. package/dist/incoming/http/fakeWs/query.js +6 -5
  21. package/dist/incoming/http/fakeWs/query.js.map +1 -1
  22. package/dist/incoming/http/handleRequest.js.map +1 -1
  23. package/dist/incoming/http/index.js +2 -0
  24. package/dist/incoming/http/index.js.map +1 -1
  25. package/dist/incoming/http/pathMatcher.d.ts +1 -1
  26. package/dist/incoming/http/pathMatcher.js +16 -1
  27. package/dist/incoming/http/pathMatcher.js.map +1 -1
  28. package/dist/incoming/http/payloadParser.d.ts +1 -1
  29. package/dist/incoming/http/payloadParser.js +1 -0
  30. package/dist/incoming/http/payloadParser.js.map +1 -1
  31. package/dist/incoming/http/query.js +3 -2
  32. package/dist/incoming/http/query.js.map +1 -1
  33. package/dist/incoming/upgrade.js +1 -0
  34. package/dist/incoming/upgrade.js.map +1 -1
  35. package/dist/incoming/ws/auth.js +9 -7
  36. package/dist/incoming/ws/auth.js.map +1 -1
  37. package/dist/incoming/ws/channelPublish.js +4 -3
  38. package/dist/incoming/ws/channelPublish.js.map +1 -1
  39. package/dist/incoming/ws/channelSubscribe.js +6 -5
  40. package/dist/incoming/ws/channelSubscribe.js.map +1 -1
  41. package/dist/incoming/ws/function.js +8 -5
  42. package/dist/incoming/ws/function.js.map +1 -1
  43. package/dist/incoming/ws/get.js +8 -7
  44. package/dist/incoming/ws/get.js.map +1 -1
  45. package/dist/incoming/ws/index.d.ts +2 -2
  46. package/dist/incoming/ws/index.js +14 -12
  47. package/dist/incoming/ws/index.js.map +1 -1
  48. package/dist/incoming/ws/query.js +6 -5
  49. package/dist/incoming/ws/query.js.map +1 -1
  50. package/dist/incoming/ws/stream.d.ts +1 -1
  51. package/dist/incoming/ws/stream.js +29 -28
  52. package/dist/incoming/ws/stream.js.map +1 -1
  53. package/dist/protocol.d.ts +25 -14
  54. package/dist/protocol.js +346 -158
  55. package/dist/protocol.js.map +1 -1
  56. package/dist/query/destroy.js +2 -1
  57. package/dist/query/destroy.js.map +1 -1
  58. package/dist/query/send.d.ts +1 -1
  59. package/dist/query/send.js +29 -7
  60. package/dist/query/send.js.map +1 -1
  61. package/dist/query/start/error.js +4 -1
  62. package/dist/query/start/error.js.map +1 -1
  63. package/dist/query/start/update.js +22 -4
  64. package/dist/query/start/update.js.map +1 -1
  65. package/dist/query/subscribe.js +15 -5
  66. package/dist/query/subscribe.js.map +1 -1
  67. package/dist/query/types.d.ts +1 -0
  68. package/dist/query/unsub.js +32 -8
  69. package/dist/query/unsub.js.map +1 -1
  70. package/dist/sendError.js +4 -4
  71. package/dist/sendError.js.map +1 -1
  72. package/dist/sendHttpResponse.js +6 -2
  73. package/dist/sendHttpResponse.js.map +1 -1
  74. package/package.json +2 -2
@@ -66,7 +66,7 @@ export class BasedAuth {
66
66
  }
67
67
  /** Sets the `authState` on the client. */
68
68
  sendAuthState(ctx, authState) {
69
- ctx.session?.ws.send(encodeAuthResponse(valueToBuffer(authState)), true, false);
69
+ ctx.session?.ws.send(encodeAuthResponse(valueToBuffer(authState, true)), true, false);
70
70
  }
71
71
  }
72
72
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
@@ -28,7 +28,9 @@ export const destroyChannel = (server, id) => {
28
28
  console.error('Channel allready destroyed', channel.name);
29
29
  return;
30
30
  }
31
- if (channel.clients.size || channel.functionChannelClients.size) {
31
+ if (channel.clients.size ||
32
+ channel.functionChannelClients.size ||
33
+ channel.oldClients?.size) {
32
34
  if (channel.timeTillDestroy) {
33
35
  console.warn(`Channel being destroyed while listeners are present ${channel.name} ${channel.id}`, channel.payload);
34
36
  channel.timeTillDestroy = null;
@@ -1 +1 @@
1
- {"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/channel/destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,OAAsB,EACtB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACjD,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;QACpD,OAAO,CAAC,KAAK,CACX,gDAAgD,EAChD,IAAI,EACJ,OAAO,CAAC,IAAI,CACb,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,kBAAkB;IACtB,aAAa;IACb,IAAI,EAAE,kBAAkB;QACxB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAA;IACpD,OAAO,CAAC,eAAe,GAAG,kBAAkB,CAAA;IAC5C,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;IAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAA;IACpD,IAAI,SAAS,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC3C,MAAM,CAAC,mBAAmB,GAAG,SAAS,CAAA;IACxC,CAAC;AACH,CAAC,CAAA;AAED,yDAAyD;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IAChE,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEjD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAA;QACtD,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QACzD,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QAChE,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CACV,uDAAuD,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,EAAE,EACnF,OAAO,CAAC,OAAO,CAChB,CAAA;YACD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAA;QAChC,CAAC;QACD,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,eAAe,KAAK,IAAI,EAAE,CAAC;QACrC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACnC,eAAe,CAAC,MAAM,CAAC,CAAA;IACzB,CAAC;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/channel/destroy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,OAAsB,EACtB,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACjD,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;QACpD,OAAO,CAAC,KAAK,CACX,gDAAgD,EAChD,IAAI,EACJ,OAAO,CAAC,IAAI,CACb,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,kBAAkB;IACtB,aAAa;IACb,IAAI,EAAE,kBAAkB;QACxB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAA;IACpD,OAAO,CAAC,eAAe,GAAG,kBAAkB,CAAA;IAC5C,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;IAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAA;IACpD,IAAI,SAAS,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC3C,MAAM,CAAC,mBAAmB,GAAG,SAAS,CAAA;IACxC,CAAC;AACH,CAAC,CAAA;AAED,yDAAyD;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAmB,EAAE,EAAU,EAAE,EAAE;IAChE,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEjD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAA;QACtD,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QACzD,OAAM;IACR,CAAC;IAED,IACE,OAAO,CAAC,OAAO,CAAC,IAAI;QACpB,OAAO,CAAC,sBAAsB,CAAC,IAAI;QACnC,OAAO,CAAC,UAAU,EAAE,IAAI,EACxB,CAAC;QACD,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,OAAO,CAAC,IAAI,CACV,uDAAuD,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,EAAE,EACnF,OAAO,CAAC,OAAO,CAChB,CAAA;YACD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAA;QAChC,CAAC;QACD,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,eAAe,KAAK,IAAI,EAAE,CAAC;QACrC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACnC,eAAe,CAAC,MAAM,CAAC,CAAA;IACzB,CAAC;AACH,CAAC,CAAA"}
@@ -1,10 +1,14 @@
1
- import { valueToBuffer, encodeChannelMessage, encodeErrorResponse, } from '../protocol.js';
1
+ import { valueToBuffer, encodeChannelMessage, encodeErrorResponse, valueToBufferV1, } from '../protocol.js';
2
2
  import { createError } from '../error/index.js';
3
3
  import { isBasedFunctionConfig } from '@based/functions';
4
4
  import { BasedErrorCode } from '@based/errors';
5
5
  const updateChannelListener = (server, channel, msg) => {
6
+ if (channel.oldClients?.size) {
7
+ const data = encodeChannelMessage(channel.id, valueToBufferV1(msg, true));
8
+ server.uwsApp.publish(String(channel.id) + '-v1', data, true, false);
9
+ }
6
10
  if (channel.clients.size) {
7
- const data = encodeChannelMessage(channel.id, valueToBuffer(msg));
11
+ const data = encodeChannelMessage(channel.id, valueToBuffer(msg, true));
8
12
  server.uwsApp.publish(String(channel.id), data, true, false);
9
13
  }
10
14
  if (channel.functionChannelClients.size) {
@@ -34,8 +38,11 @@ const errorChannelListener = (server, channel, err) => {
34
38
  : err.observableId !== channel.id
35
39
  ? { ...err, channelId: channel.id }
36
40
  : err;
41
+ if (channel.oldClients?.size) {
42
+ server.uwsApp.publish(String(channel.id) + '-v1', encodeErrorResponse(valueToBufferV1(err, true)), true, false);
43
+ }
37
44
  if (channel.clients.size) {
38
- server.uwsApp.publish(String(channel.id), encodeErrorResponse(valueToBuffer(err)), true, false);
45
+ server.uwsApp.publish(String(channel.id), encodeErrorResponse(valueToBuffer(err, true)), true, false);
39
46
  }
40
47
  if (channel.functionChannelClients.size) {
41
48
  channel.functionChannelClients.forEach((fnUpdate) => {
@@ -1 +1 @@
1
- {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/channel/start.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/channel/start.ts"],"names":[],"mappings":"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"}
@@ -5,13 +5,24 @@ export const subscribeChannel = (server, id, ctx) => {
5
5
  if (!session) {
6
6
  return;
7
7
  }
8
- ctx.session.ws.subscribe(String(id));
9
8
  const channel = getChannelAndStopRemove(server, id);
10
9
  if (server.channelEvents) {
11
10
  server.channelEvents.subscribe(channel, ctx);
12
11
  }
13
12
  session.obs.add(id);
14
- channel.clients.add(session.id);
13
+ if (ctx.session.v < 2) {
14
+ session.obs.add(id);
15
+ if (!channel.oldClients) {
16
+ channel.oldClients = new Set();
17
+ }
18
+ channel.oldClients.add(session.id);
19
+ ctx.session.ws.subscribe(String(id) + '-v1');
20
+ }
21
+ else {
22
+ session.obs.add(id);
23
+ channel.clients.add(session.id);
24
+ ctx.session.ws.subscribe(String(id));
25
+ }
15
26
  if (!channel.isActive && !channel.doesNotExist) {
16
27
  startChannel(server, id);
17
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/channel/subscribe.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAMlD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAM;IACR,CAAC;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC9C,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC/C,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,MAAmB,EACnB,EAAU,EACV,MAAsC,EACtC,EAAE;IACF,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,IAAI,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/C,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC/C,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/channel/subscribe.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAMlD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAM;IACR,CAAC;IAED,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAC9C,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEnB,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACnB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,OAAO,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;QAChC,CAAC;QACD,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACnB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC/B,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC/C,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,MAAmB,EACnB,EAAU,EACV,MAAsC,EACtC,EAAE;IACF,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEnD,IAAI,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/C,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC/C,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC1B,CAAC;AACH,CAAC,CAAA"}
@@ -6,6 +6,7 @@ export type ActiveChannel = {
6
6
  doesNotExist?: boolean;
7
7
  functionChannelClients: Set<ChannelMessageFunctionInternal>;
8
8
  clients: Set<number>;
9
+ oldClients?: Set<number>;
9
10
  isActive: boolean;
10
11
  closeAfterIdleTime?: number;
11
12
  timeTillDestroy: number | null;
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/channel/types.ts"],"names":[],"mappings":";AAgBA,oBAAoB"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/channel/types.ts"],"names":[],"mappings":";AAiBA,oBAAoB"}
@@ -20,13 +20,28 @@ export const unsubscribeChannel = (server, id, ctx) => {
20
20
  if (!session.obs.has(id)) {
21
21
  return;
22
22
  }
23
- ctx.session.ws.unsubscribe(String(id));
23
+ const isV1 = ctx.session.v < 2;
24
+ if (isV1) {
25
+ ctx.session.ws.unsubscribe(String(id) + '-v1');
26
+ }
27
+ else {
28
+ ctx.session.ws.unsubscribe(String(id));
29
+ }
24
30
  const channel = server.activeChannelsById.get(id);
25
31
  session.obs.delete(id);
26
32
  if (!channel) {
27
33
  return;
28
34
  }
29
- if (channel.clients.delete(session.id)) {
35
+ if (isV1) {
36
+ if (channel.oldClients?.delete(session.id)) {
37
+ if (server.channelEvents) {
38
+ server.channelEvents.unsubscribe(channel, ctx);
39
+ }
40
+ destroyChannel(server, id);
41
+ return true;
42
+ }
43
+ }
44
+ else if (channel.clients.delete(session.id)) {
30
45
  if (server.channelEvents) {
31
46
  server.channelEvents.unsubscribe(channel, ctx);
32
47
  }
@@ -43,7 +58,13 @@ export const unsubscribeChannelIgnoreClient = (server, id, ctx) => {
43
58
  if (!channel) {
44
59
  return;
45
60
  }
46
- if (channel.clients.delete(session.id) && server.channelEvents) {
61
+ const isV1 = ctx.session.v < 2;
62
+ if (isV1) {
63
+ if (channel.oldClients?.delete(session.id) && server.channelEvents) {
64
+ server.channelEvents.unsubscribe(channel, ctx);
65
+ }
66
+ }
67
+ else if (channel.clients.delete(session.id) && server.channelEvents) {
47
68
  server.channelEvents.unsubscribe(channel, ctx);
48
69
  }
49
70
  destroyChannel(server, id);
@@ -1 +1 @@
1
- {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/channel/unsub.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAM;IACR,CAAC;IACD,IAAI,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QAC3C,CAAC;QACD,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAM;IACR,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACzB,OAAM;IACR,CAAC;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAM;IACR,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;QACvC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;QAChD,CAAC;QACD,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,MAAmB,EACnB,EAAU,EACV,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAM;IACR,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACjD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QAC/D,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAChD,CAAC;IAED,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC5B,CAAC,CAAA"}
1
+ {"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/channel/unsub.ts"],"names":[],"mappings":"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"}
@@ -36,7 +36,7 @@ export declare class BasedFunctions {
36
36
  add(specs: BasedFunctionConfigs): void;
37
37
  addRoutes(routes: BasedRoutes): void;
38
38
  completeSpec(spec: Optional<BasedFunctionConfig, 'name'>, name?: string): null | BasedFunctionConfigComplete;
39
- completeRoute(route: Optional<BasedRoute, 'name'>, name?: string): null | BasedRouteComplete;
39
+ generateRoute(route: Optional<BasedRoute, 'name'>, name?: string): null | BasedRouteComplete;
40
40
  removeRoute(name: string): Promise<boolean>;
41
41
  updateRoute(route: BasedRouteComplete, name?: string): null | (BasedRoute & {
42
42
  maxPayloadSize: number;
@@ -50,20 +50,50 @@ export class BasedFunctions {
50
50
  };
51
51
  }
52
52
  if (this.config.route === undefined) {
53
- this.config.route = ({ path }) => {
54
- let route;
55
- if (path === '/' && this.routes[this.paths['/']]) {
56
- return this.routes[this.paths['/']];
57
- }
53
+ this.config.route = ({ path, name }) => {
58
54
  if (path) {
59
- route = this.getRoute(path);
55
+ let route;
56
+ if (path === '/' && this.routes[this.paths['/']]) {
57
+ const r = this.routes[this.paths['/']];
58
+ if (r && !r.tokens) {
59
+ this.generateRoute(r);
60
+ }
61
+ return r;
62
+ }
63
+ if (path) {
64
+ route = this.getRoute(path);
65
+ }
66
+ // deprecate this.routes[this.paths['/']]
67
+ const rr = route ||
68
+ this.routes[path] ||
69
+ this.routes['404'] ||
70
+ this.routes[this.paths['/']] ||
71
+ null;
72
+ // FIXME: dirty hack
73
+ if (rr && !rr.tokens) {
74
+ this.generateRoute(rr);
75
+ }
76
+ return rr;
77
+ }
78
+ else {
79
+ return this.routes[name] || null;
80
+ }
81
+ };
82
+ }
83
+ else {
84
+ // FIXME: tmp dirty hack
85
+ const tmpRoute = this.config.route;
86
+ this.config.route = (x) => {
87
+ if (x.path) {
88
+ const r = tmpRoute(x);
89
+ if (r && !r.tokens) {
90
+ this.generateRoute(r);
91
+ }
92
+ return r;
93
+ }
94
+ else {
95
+ return tmpRoute(x);
60
96
  }
61
- // deprecate this.routes[this.paths['/']]
62
- return (route ||
63
- this.routes[path] ||
64
- this.routes['404'] ||
65
- this.routes[this.paths['/']] ||
66
- null);
67
97
  };
68
98
  }
69
99
  if (this.config.install === undefined) {
@@ -88,7 +118,7 @@ export class BasedFunctions {
88
118
  this.uninstallLoop();
89
119
  }
90
120
  route(externalName, externalPath) {
91
- return this.config.route({ path: externalPath || externalName });
121
+ return this.config.route({ path: externalPath, name: externalName });
92
122
  }
93
123
  async install(name) {
94
124
  let spec = this.getFromStore(name);
@@ -116,17 +146,14 @@ export class BasedFunctions {
116
146
  }
117
147
  addRoutes(routes) {
118
148
  for (const key in routes) {
119
- const nRoute = this.completeRoute(this.routes[key], key);
149
+ const nRoute = this.generateRoute(this.routes[key], key);
120
150
  if (nRoute !== null) {
121
151
  this.updateRoute(nRoute, key);
122
152
  }
123
153
  }
124
154
  }
125
155
  completeSpec(spec, name) {
126
- if (this.completeRoute(spec, name) === null) {
127
- console.error('cannot completeSpec', name, spec);
128
- return null;
129
- }
156
+ this.generateRoute(spec, name);
130
157
  if (!spec.version) {
131
158
  // @ts-ignore added name allready
132
159
  spec.version = genVersion(spec);
@@ -134,7 +161,7 @@ export class BasedFunctions {
134
161
  const nSpec = spec;
135
162
  return nSpec;
136
163
  }
137
- completeRoute(route, name) {
164
+ generateRoute(route, name) {
138
165
  const nRoute = route;
139
166
  if (!nRoute.type) {
140
167
  console.error('Type is required for based-routes', name);
@@ -196,8 +223,9 @@ export class BasedFunctions {
196
223
  return this.uninstall(name);
197
224
  }
198
225
  updateRoute(route, name) {
199
- const realRoute = this.completeRoute(route, name);
226
+ const realRoute = this.generateRoute(route, name);
200
227
  if (realRoute === null) {
228
+ console.log('ROUTE IS NULL INCORRECT');
201
229
  return null;
202
230
  }
203
231
  if (realRoute.path) {
@@ -341,7 +369,9 @@ export class BasedFunctions {
341
369
  delete this.installsInProgress[name];
342
370
  return s;
343
371
  }
372
+ // FIXME: greatly refactor this - this is not get Route now thi sis MATCH PATH
344
373
  getRoute(path) {
374
+ // this make it heavier im affraid
345
375
  const bufferPath = Buffer.from(path);
346
376
  for (const key in this.routes) {
347
377
  const route = this.routes[key];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/functions/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/functions/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,qBAAqB,GAGtB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAEnD,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAEjD,cAAc,YAAY,CAAA;AAE1B,MAAM,OAAO,cAAc;IACzB,MAAM,CAAa;IAEnB,KAAK,GAAW,CAAC,CAAA;IAEjB,MAAM,CAAgB;IAEtB,iBAAiB,CAAgB;IAEjC,kBAAkB,GAAqC,EAAE,CAAA;IAEzD,sBAAsB,GAKlB;QACF,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,GAAG;KACb,CAAA;IAED,KAAK,GAED,EAAE,CAAA;IAEN,KAAK,GAED,EAAE,CAAA;IAEN,MAAM,GAEF,EAAE,CAAA;IAEN,gBAAgB,GAEZ,EAAE,CAAA;IAEN,YAAY,MAAmB,EAAE,MAAuB;QACtD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC3B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IAED,YAAY,CAAC,UAA0B;QACrC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,UAAU,CAAA;QAEjD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAChC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACtB,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,sBAAsB,GAAG,IAAI,CAAA,CAAC,QAAQ;QACpD,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,kBAAkB,GAAG;gBAC/B,KAAK,EAAE,GAAG,EAAE,4DAA4D;gBACxE,OAAO,EAAE,IAAI,EAAE,UAAU;aAC1B,CAAA;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;gBACrC,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,KAAyB,CAAA;oBAE7B,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;wBACjD,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;wBACtC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;4BACnB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;wBACvB,CAAC;wBACD,OAAO,CAAC,CAAA;oBACV,CAAC;oBAED,IAAI,IAAI,EAAE,CAAC;wBACT,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;oBAC7B,CAAC;oBAED,yCAAyC;oBACzC,MAAM,EAAE,GACN,KAAK;wBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;wBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;wBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAC5B,IAAI,CAAA;oBAEN,oBAAoB;oBACpB,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;wBACrB,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;oBACxB,CAAC;oBAED,OAAO,EAAE,CAAA;gBACX,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;gBAClC,CAAC;YACH,CAAC,CAAA;QACH,CAAC;aAAM,CAAC;YACN,wBAAwB;YACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,EAAE;gBACxB,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;oBACX,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACrB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;wBACnB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;oBACvB,CAAC;oBACD,OAAO,CAAC,CAAA;gBACV,CAAC;qBAAM,CAAC;oBACN,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACpB,CAAC;YACH,CAAC,CAAA;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBACvC,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;YAChC,CAAC,CAAA;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,IAAI,EAAE;gBACjC,OAAO,IAAI,CAAA;YACb,CAAC,CAAA;QACH,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACnB,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CACH,YAAqB,EACrB,YAAqB;QAErB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;IACtE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;QACxB,IAAI,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QAClC,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAA;QAChD,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;YACzB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,GAAG,CAAC,KAA2B;QAC7B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;YAC5C,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;gBAC3C,CAAC,CAAC,sBAAsB,GAAG,CAAC,CAAA;YAC9B,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAED,SAAS,CAAC,MAAmB;QAC3B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;YACxD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IAED,YAAY,CACV,IAA2C,EAC3C,IAAa;QAEb,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,iCAAiC;YACjC,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC;QACD,MAAM,KAAK,GAAG,IAAmC,CAAA;QACjD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,aAAa,CACX,KAAmC,EACnC,IAAa;QAEb,MAAM,MAAM,GAAG,KAA2B,CAAA;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,IAAI,CAAC,CAAA;YACxD,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;gBAC3C,OAAO,IAAI,CAAA;YACb,CAAC;YACD,MAAM,CAAC,IAAI,GAAG,IAAI,CAAA;QACpB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAC1B,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChE,CAAC;QACD,IAAI,MAAM,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,CAAC,eAAe,GAAG,CAAC,CAAA;QAC5B,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,SAAS,GAAW,EAAE,CAAA;YAC1B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,SAAS,GAAG,MAAM,CAAC,IAAI,CAAA;gBACvB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;oBACxC,SAAS,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAA;gBAC/B,CAAC;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjD,IAAI,KAAK,GAAG,IAAI,CAAA;oBAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC5C,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;4BAChE,KAAK,GAAG,KAAK,CAAA;4BACb,MAAK;wBACP,CAAC;oBACH,CAAC;oBACD,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,CAAC,UAAU,GAAG,IAAI,CAAA;oBAC1B,CAAC;yBAAM,CAAC;wBACN,SAAS,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,GAAG,SAAS,CAAA;wBACzC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAA;oBAC3B,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,CAAA;gBAC7B,MAAM,CAAC,UAAU,GAAG,KAAK,CAAA;YAC3B,CAAC;YACD,MAAM,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA;QACzD,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAC/B,CAAC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;IAED,WAAW,CACT,KAAyB,EACzB,IAAa;QAOb,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QACjD,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;YACtC,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAA;QAC7C,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAA;QACnC,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,cAAc,CAAC,IAAiC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC3C,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACpC,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;YAC9C,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAA;QAClE,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtC,IAAI,CAAC,cAAc;gBACjB,IAAI,CAAC,sBAAsB,KAAK,CAAC,IAAI,IAAI,CAAC,sBAAsB,KAAK,CAAC,CAAC;oBACrE,CAAC,CAAC,CAAC,CAAC;oBACJ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAA;QACpD,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAA;QACnC,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,IAAI,CAAC,CAAC,CAAA;QAC7D,oDAAoD;QACpD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;QAC5B,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC5C,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzD,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,gBAAgB,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;oBACtC,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzD,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;oBACrC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IACL,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EACxC,CAAC;YACD,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC1C,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5D,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;gBAC7B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,gBAAgB,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;oBACtC,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC5D,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;oBACxB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,aAAa;QACX,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YAC7C,MAAM,CAAC,GAAG,EAAE,CAAA;YACZ,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAC7B,IACE,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC;oBACpC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,EACnC,CAAC;oBACD,oBAAoB,CAAC,IAAI,CAAC,CAAA;gBAC5B,CAAC;qBAAM,IACL,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC;oBACtC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAChC,CAAC;oBACD,oBAAoB,CAAC,IAAI,CAAC,CAAA;gBAC5B,CAAC;qBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;gBACpC,CAAC;YACH,CAAC;YACD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YACpB,IAAI,CAAC,aAAa,EAAE,CAAA;QACtB,CAAC,EAAE,GAAG,CAAC,CAAA;IACT,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,QAAgB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACpC,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAA;YACtD,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC1B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM,EAAE,QAAQ;gBAChB,IAAI;aACL,CAAC,CAAA;YACF,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CACb,IAAY,EACZ,IAA+D;QAE/D,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,IAAI,CAAC,CAAA;QAC9D,CAAC;QACD,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;QAClC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACxB,CAAC;QACD,IACE,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YAC1B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI;YACZ,IAAI;SACL,CAAC,EACF,CAAC;YACD,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBAClC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC1B,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CACV,sDAAsD,EACtD,IAAI,CACL,CAAA;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACpC,IAAY;QAEZ,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACtC,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YAClD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI;SACL,CAAC,CAAA;QACF,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC7C,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACpC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,8EAA8E;IAC9E,QAAQ,CAAC,IAAY;QACnB,kCAAkC;QAClC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAE9B,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC1C,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAE9B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBACtB,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,CAAC;oBACnD,OAAO,KAAK,CAAA;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACpC,CAAC;YACD,oBAAoB,CAAC,IAAI,CAAC,CAAA;YAC1B,OAAO,IAAI,CAAA;QACb,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,IAAY;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAA;QACd,CAAC;QACD,IAAI,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;YACrD,IAAI,SAAS,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;oBAC7B,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;gBAC7B,CAAC;gBACD,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;YAC5C,CAAC;QACH,CAAC;QACD,IAAI,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;YAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;YACtD,IAAI,aAAa,EAAE,CAAC;gBAClB,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,aAAa,EAAE,CAAC;oBACjC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;gBACjC,CAAC;gBACD,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAEvB,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
@@ -1,11 +1,12 @@
1
- import { readUint8, decodeName, decodePayload, encodeFunctionResponse, valueToBuffer, parsePayload, encodeErrorResponse, } from '../../../protocol.js';
1
+ import { decodeName, decodePayload, encodeFunctionResponse, valueToBuffer, encodeErrorResponse, } from '../../../protocol.js';
2
2
  import { verifyRoute } from '../../../verifyRoute.js';
3
3
  import { installFn } from '../../../installFn.js';
4
4
  import { createError } from '../../../error/index.js';
5
5
  import { BasedErrorCode } from '@based/errors';
6
+ import { readUint24 } from '@saulx/utils';
6
7
  export const handleFunction = (arr, startByte, len, isDeflate, ctx, server) => {
7
8
  // | 4 header | 3 id | 1 name length | * name | * payload |
8
- const requestId = readUint8(arr, startByte + 4, 3);
9
+ const requestId = readUint24(arr, startByte + 4);
9
10
  const nameLen = arr[startByte + 7];
10
11
  const name = decodeName(arr, startByte + 8, startByte + 8 + nameLen);
11
12
  if (!name || !requestId) {
@@ -15,9 +16,10 @@ export const handleFunction = (arr, startByte, len, isDeflate, ctx, server) => {
15
16
  if (route === null) {
16
17
  return;
17
18
  }
19
+ const isOldClient = ctx.session.authState.v < 2;
18
20
  const payload = len === nameLen + 8
19
21
  ? undefined
20
- : parsePayload(decodePayload(new Uint8Array(arr.slice(startByte + 8 + nameLen, startByte + len)), isDeflate));
22
+ : decodePayload(new Uint8Array(arr.slice(startByte + 8 + nameLen, startByte + len)), isDeflate, isOldClient);
21
23
  return installFn(server, ctx, route).then(async (spec) => {
22
24
  const isAuth = route.public ||
23
25
  (await server.auth
@@ -28,12 +30,12 @@ export const handleFunction = (arr, startByte, len, isDeflate, ctx, server) => {
28
30
  route,
29
31
  requestId,
30
32
  });
31
- return encodeErrorResponse(valueToBuffer(errorData));
33
+ return encodeErrorResponse(valueToBuffer(errorData, true));
32
34
  }
33
35
  return spec
34
36
  .fn(server.client, payload, ctx)
35
37
  .then((v) => {
36
- return encodeFunctionResponse(requestId, valueToBuffer(v));
38
+ return encodeFunctionResponse(requestId, valueToBuffer(v, true));
37
39
  })
38
40
  .catch((err) => {
39
41
  const errorData = createError(server, ctx, BasedErrorCode.FunctionError, {
@@ -41,7 +43,7 @@ export const handleFunction = (arr, startByte, len, isDeflate, ctx, server) => {
41
43
  requestId,
42
44
  err,
43
45
  });
44
- return encodeErrorResponse(valueToBuffer(errorData));
46
+ return encodeErrorResponse(valueToBuffer(errorData, true));
45
47
  });
46
48
  });
47
49
  };
@@ -1 +1 @@
1
- {"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/incoming/http/fakeWs/function.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/incoming/http/fakeWs/function.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import { end } from '../../../sendHttpResponse.js';
2
- import { decodeHeader, readUint8, encodeAuthResponse, valueToBuffer, } from '../../../protocol.js';
2
+ import { decodeHeader, encodeAuthResponse, valueToBuffer, } from '../../../protocol.js';
3
3
  import { handleQuery } from './query.js';
4
4
  import { handleFunction } from './function.js';
5
+ import { readUint32 } from '@saulx/utils';
5
6
  const reader = (server, ctx, arr, start) => {
6
- const { len, isDeflate, type } = decodeHeader(readUint8(arr, start, 4));
7
+ const { len, isDeflate, type } = decodeHeader(readUint32(arr, start));
7
8
  const next = len + start;
8
9
  // type 0 = function
9
10
  if (type === 0) {
@@ -110,7 +111,7 @@ export const handleBinary = async (server, ctx, data) => {
110
111
  return;
111
112
  }
112
113
  if (ctx.session.authState.token || prevToken) {
113
- const b = encodeAuthResponse(valueToBuffer(ctx.session.authState));
114
+ const b = encodeAuthResponse(valueToBuffer(ctx.session.authState, true));
114
115
  r.push(b);
115
116
  }
116
117
  const buf = Buffer.allocUnsafe(r.reduce((acc, i) => {
@@ -1 +1 @@
1
- {"version":3,"file":"handleBinary.js","sourceRoot":"","sources":["../../../../src/incoming/http/fakeWs/handleBinary.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"handleBinary.js","sourceRoot":"","sources":["../../../../src/incoming/http/fakeWs/handleBinary.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,15 @@
1
1
  import { createObs, getObsAndStopRemove, hasObs, subscribeNext, start, } from '../../../query/index.js';
2
- import { readUint8, decodeName, parsePayload, decodePayload, valueToBuffer, updateId, encodeErrorResponse, } from '../../../protocol.js';
2
+ import { decodeName, decodePayload, valueToBuffer, updateId, encodeErrorResponse, } from '../../../protocol.js';
3
3
  import { verifyRoute } from '../../../verifyRoute.js';
4
4
  import { createError } from '../../../error/index.js';
5
5
  import { BasedErrorCode } from '@based/errors';
6
+ import { readUint64 } from '@saulx/utils';
6
7
  const EMPTY = Buffer.allocUnsafe(0);
7
8
  export const handleQuery = (arr, startByte, len, isDeflate, ctx, server) => {
8
9
  // | 4 header | 8 id | 8 checksum | 1 name length | * name | * payload |
9
10
  const nameLen = arr[startByte + 20];
10
- const id = readUint8(arr, startByte + 4, 8);
11
- const checksum = readUint8(arr, startByte + 12, 8);
11
+ const id = readUint64(arr, startByte + 4);
12
+ const checksum = readUint64(arr, startByte + 12);
12
13
  const name = decodeName(arr, startByte + 21, startByte + 21 + nameLen);
13
14
  if (!name || !id) {
14
15
  return;
@@ -16,7 +17,7 @@ export const handleQuery = (arr, startByte, len, isDeflate, ctx, server) => {
16
17
  const route = verifyRoute(server, ctx, 'query', server.functions.route(name), name, id);
17
18
  const payload = len === nameLen + 21
18
19
  ? undefined
19
- : parsePayload(decodePayload(new Uint8Array(arr.slice(startByte + 21 + nameLen, startByte + len)), isDeflate));
20
+ : decodePayload(new Uint8Array(arr.slice(startByte + 21 + nameLen, startByte + len)), isDeflate, false);
20
21
  if (route === null) {
21
22
  return;
22
23
  }
@@ -31,7 +32,7 @@ export const handleQuery = (arr, startByte, len, isDeflate, ctx, server) => {
31
32
  route,
32
33
  observableId: id,
33
34
  });
34
- resolve(encodeErrorResponse(valueToBuffer(errorData)));
35
+ resolve(encodeErrorResponse(valueToBuffer(errorData, true)));
35
36
  return;
36
37
  }
37
38
  if (hasObs(server, id)) {
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/incoming/http/fakeWs/query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/incoming/http/fakeWs/query.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"handleRequest.js","sourceRoot":"","sources":["../../../src/incoming/http/handleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,MAAc,EACd,GAAyB,EACzB,KAAyB,EACzB,KAA8B,EAC9B,EAAE;IACF,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;IACrC,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IAClC,CAAC;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"handleRequest.js","sourceRoot":"","sources":["../../../src/incoming/http/handleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,MAAc,EACd,GAAyB,EACzB,KAAyB,EACzB,KAA8B,EAC9B,EAAE;IACF,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;IACrC,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IAClC,CAAC;AACH,CAAC,CAAA"}
@@ -29,7 +29,9 @@ export const httpHandler = (server, req, res) => {
29
29
  }
30
30
  const method = req.getMethod();
31
31
  const url = req.getUrl();
32
+ // Now we are doing this for fun
32
33
  const path = url.split('/');
34
+ // TODO Use a header for this
33
35
  if (path[1] === 'based:rpstatus') {
34
36
  res.cork(() => {
35
37
  res.writeHeader('Access-Control-Allow-Headers', defHeaders);