@based/server 4.0.3 → 4.0.4

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 (178) hide show
  1. package/dist/auth/defaultConfig.js +1 -1
  2. package/dist/auth/defaultConfig.js.map +1 -1
  3. package/dist/auth/index.d.ts +14 -2
  4. package/dist/auth/index.js +11 -4
  5. package/dist/auth/index.js.map +1 -1
  6. package/dist/auth/parseJSONAuthState.d.ts +3 -0
  7. package/dist/auth/parseJSONAuthState.js +10 -0
  8. package/dist/auth/parseJSONAuthState.js.map +1 -0
  9. package/dist/authorize.d.ts +3 -3
  10. package/dist/authorize.js +12 -2
  11. package/dist/authorize.js.map +1 -1
  12. package/dist/channel/cleanup.d.ts +2 -0
  13. package/dist/channel/cleanup.js +53 -0
  14. package/dist/channel/cleanup.js.map +1 -0
  15. package/dist/channel/create.d.ts +3 -0
  16. package/dist/channel/create.js +33 -0
  17. package/dist/channel/create.js.map +1 -0
  18. package/dist/channel/destroy.d.ts +4 -0
  19. package/dist/channel/destroy.js +46 -0
  20. package/dist/channel/destroy.js.map +1 -0
  21. package/dist/channel/extend.d.ts +4 -0
  22. package/dist/channel/extend.js +16 -0
  23. package/dist/channel/extend.js.map +1 -0
  24. package/dist/channel/get.d.ts +4 -0
  25. package/dist/channel/get.js +15 -0
  26. package/dist/channel/get.js.map +1 -0
  27. package/dist/channel/index.d.ts +8 -0
  28. package/dist/channel/index.js +25 -0
  29. package/dist/channel/index.js.map +1 -0
  30. package/dist/channel/start.d.ts +2 -0
  31. package/dist/channel/start.js +63 -0
  32. package/dist/channel/start.js.map +1 -0
  33. package/dist/channel/subscribe.d.ts +4 -0
  34. package/dist/channel/subscribe.js +28 -0
  35. package/dist/channel/subscribe.js.map +1 -0
  36. package/dist/channel/types.d.ts +13 -0
  37. package/dist/channel/types.js +4 -0
  38. package/dist/channel/types.js.map +1 -0
  39. package/dist/channel/unsub.d.ts +5 -0
  40. package/dist/channel/unsub.js +49 -0
  41. package/dist/channel/unsub.js.map +1 -0
  42. package/dist/createSimpleServer.d.ts +14 -15
  43. package/dist/createSimpleServer.js +63 -25
  44. package/dist/createSimpleServer.js.map +1 -1
  45. package/dist/error/errorTypeHandlers.d.ts +1 -1
  46. package/dist/error/errorTypeHandlers.js +11 -46
  47. package/dist/error/errorTypeHandlers.js.map +1 -1
  48. package/dist/error/index.js +3 -0
  49. package/dist/error/index.js.map +1 -1
  50. package/dist/error/types.d.ts +19 -26
  51. package/dist/error/types.js +1 -6
  52. package/dist/error/types.js.map +1 -1
  53. package/dist/functionApi/channelSubscribe.d.ts +3 -0
  54. package/dist/functionApi/channelSubscribe.js +43 -0
  55. package/dist/functionApi/channelSubscribe.js.map +1 -0
  56. package/dist/functionApi/client/channel.d.ts +10 -0
  57. package/dist/functionApi/client/channel.js +33 -0
  58. package/dist/functionApi/client/channel.js.map +1 -0
  59. package/dist/functionApi/client/index.d.ts +5 -3
  60. package/dist/functionApi/client/index.js +9 -4
  61. package/dist/functionApi/client/index.js.map +1 -1
  62. package/dist/functionApi/get.js +2 -2
  63. package/dist/functionApi/get.js.map +1 -1
  64. package/dist/functionApi/index.d.ts +3 -0
  65. package/dist/functionApi/index.js +3 -1
  66. package/dist/functionApi/index.js.map +1 -1
  67. package/dist/functionApi/observe.js +2 -2
  68. package/dist/functionApi/observe.js.map +1 -1
  69. package/dist/functionApi/publish.d.ts +3 -0
  70. package/dist/functionApi/publish.js +29 -0
  71. package/dist/functionApi/publish.js.map +1 -0
  72. package/dist/functionApi/stream.d.ts +2 -2
  73. package/dist/functionApi/stream.js +44 -6
  74. package/dist/functionApi/stream.js.map +1 -1
  75. package/dist/functions/index.d.ts +3 -2
  76. package/dist/functions/index.js +47 -18
  77. package/dist/functions/index.js.map +1 -1
  78. package/dist/functions/timeout.js +4 -2
  79. package/dist/functions/timeout.js.map +1 -1
  80. package/dist/functions/types.d.ts +96 -56
  81. package/dist/functions/types.js +16 -5
  82. package/dist/functions/types.js.map +1 -1
  83. package/dist/incoming/http/index.js +34 -7
  84. package/dist/incoming/http/index.js.map +1 -1
  85. package/dist/incoming/http/publish.d.ts +3 -0
  86. package/dist/incoming/http/publish.js +82 -0
  87. package/dist/incoming/http/publish.js.map +1 -0
  88. package/dist/incoming/http/query.js +1 -1
  89. package/dist/incoming/http/query.js.map +1 -1
  90. package/dist/incoming/http/streamFunction/multiPart/readFormData.d.ts +1 -1
  91. package/dist/incoming/http/streamFunction/multiPart/readFormData.js +2 -2
  92. package/dist/incoming/http/streamFunction/multiPart/readFormData.js.map +1 -1
  93. package/dist/incoming/http/streamFunction/stream/createStream.d.ts +2 -3
  94. package/dist/incoming/http/streamFunction/stream/createStream.js +2 -2
  95. package/dist/incoming/http/streamFunction/stream/createStream.js.map +1 -1
  96. package/dist/incoming/http/streamFunction/stream/index.js +3 -2
  97. package/dist/incoming/http/streamFunction/stream/index.js.map +1 -1
  98. package/dist/incoming/index.d.ts +1 -1
  99. package/dist/incoming/index.js +32 -22
  100. package/dist/incoming/index.js.map +1 -1
  101. package/dist/incoming/upgrade.js +18 -11
  102. package/dist/incoming/upgrade.js.map +1 -1
  103. package/dist/incoming/ws/auth.d.ts +1 -1
  104. package/dist/incoming/ws/auth.js +56 -22
  105. package/dist/incoming/ws/auth.js.map +1 -1
  106. package/dist/incoming/ws/channelPublish.d.ts +2 -0
  107. package/dist/incoming/ws/channelPublish.js +73 -0
  108. package/dist/incoming/ws/channelPublish.js.map +1 -0
  109. package/dist/incoming/ws/channelSubscribe.d.ts +7 -0
  110. package/dist/incoming/ws/channelSubscribe.js +118 -0
  111. package/dist/incoming/ws/channelSubscribe.js.map +1 -0
  112. package/dist/incoming/ws/function.js +11 -3
  113. package/dist/incoming/ws/function.js.map +1 -1
  114. package/dist/incoming/ws/get.js +16 -6
  115. package/dist/incoming/ws/get.js.map +1 -1
  116. package/dist/incoming/ws/index.js +22 -2
  117. package/dist/incoming/ws/index.js.map +1 -1
  118. package/dist/incoming/ws/observable.js +16 -10
  119. package/dist/incoming/ws/observable.js.map +1 -1
  120. package/dist/incoming/ws/types.d.ts +1 -1
  121. package/dist/installFn.js +32 -34
  122. package/dist/installFn.js.map +1 -1
  123. package/dist/observable/cleanup.d.ts +2 -0
  124. package/dist/observable/cleanup.js +66 -0
  125. package/dist/observable/cleanup.js.map +1 -0
  126. package/dist/observable/create.js +1 -0
  127. package/dist/observable/create.js.map +1 -1
  128. package/dist/observable/destroy.d.ts +2 -0
  129. package/dist/observable/destroy.js +26 -30
  130. package/dist/observable/destroy.js.map +1 -1
  131. package/dist/observable/extendCache.js +2 -3
  132. package/dist/observable/extendCache.js.map +1 -1
  133. package/dist/observable/genObservableId.js +3 -0
  134. package/dist/observable/genObservableId.js.map +1 -1
  135. package/dist/observable/get.d.ts +1 -1
  136. package/dist/observable/get.js +3 -3
  137. package/dist/observable/get.js.map +1 -1
  138. package/dist/observable/send.d.ts +1 -1
  139. package/dist/observable/send.js +2 -2
  140. package/dist/observable/send.js.map +1 -1
  141. package/dist/observable/start/error.d.ts +1 -1
  142. package/dist/observable/start/error.js +5 -2
  143. package/dist/observable/start/error.js.map +1 -1
  144. package/dist/observable/start/index.js +3 -1
  145. package/dist/observable/start/index.js.map +1 -1
  146. package/dist/observable/start/update.d.ts +1 -4
  147. package/dist/observable/start/update.js +0 -1
  148. package/dist/observable/start/update.js.map +1 -1
  149. package/dist/observable/subscribe.d.ts +1 -1
  150. package/dist/observable/subscribe.js +7 -8
  151. package/dist/observable/subscribe.js.map +1 -1
  152. package/dist/observable/types.d.ts +9 -9
  153. package/dist/observable/unsub.d.ts +1 -1
  154. package/dist/observable/unsub.js +9 -6
  155. package/dist/observable/unsub.js.map +1 -1
  156. package/dist/protocol.d.ts +1 -0
  157. package/dist/protocol.js +60 -48
  158. package/dist/protocol.js.map +1 -1
  159. package/dist/sendError.js +2 -4
  160. package/dist/sendError.js.map +1 -1
  161. package/dist/sendHttpResponse.js +16 -3
  162. package/dist/sendHttpResponse.js.map +1 -1
  163. package/dist/server.d.ts +22 -13
  164. package/dist/server.js +13 -10
  165. package/dist/server.js.map +1 -1
  166. package/dist/verifyRoute.d.ts +3 -3
  167. package/dist/verifyRoute.js +31 -20
  168. package/dist/verifyRoute.js.map +1 -1
  169. package/package.json +7 -7
  170. package/dist/functionApi/callFunction copy.d.ts +0 -3
  171. package/dist/functionApi/callFunction copy.js +0 -29
  172. package/dist/functionApi/callFunction copy.js.map +0 -1
  173. package/dist/incoming/http/get.d.ts +0 -4
  174. package/dist/incoming/http/get.js +0 -156
  175. package/dist/incoming/http/get.js.map +0 -1
  176. package/dist/incoming/http/streamFunction/DataStream.d.ts +0 -15
  177. package/dist/incoming/http/streamFunction/DataStream.js +0 -58
  178. package/dist/incoming/http/streamFunction/DataStream.js.map +0 -1
@@ -1,3 +1,3 @@
1
1
  import type { BasedServer, ServerOptions } from '../server';
2
- declare const _default: (server: BasedServer, { key, cert, port, ws: wsListeners, disableRest }: ServerOptions) => void;
2
+ declare const _default: (server: BasedServer, { key, cert, port, ws: wsOptions, disableRest }: ServerOptions) => void;
3
3
  export default _default;
@@ -7,9 +7,10 @@ const uws_1 = __importDefault(require("@based/uws"));
7
7
  const upgrade_1 = require("./upgrade");
8
8
  const ws_1 = require("./ws");
9
9
  const observable_1 = require("../observable");
10
+ const channel_1 = require("../channel");
10
11
  const http_1 = require("./http");
11
12
  const auth_1 = require("./ws/auth");
12
- exports.default = (server, { key, cert, port, ws: wsListeners, disableRest }) => {
13
+ exports.default = (server, { key, cert, port, ws: wsOptions = {}, disableRest }) => {
13
14
  const app = key && cert
14
15
  ? uws_1.default.SSLApp({
15
16
  key_file_name: key,
@@ -20,16 +21,20 @@ exports.default = (server, { key, cert, port, ws: wsListeners, disableRest }) =>
20
21
  if (port) {
21
22
  server.port = port;
22
23
  }
23
- if (!wsListeners) {
24
- wsListeners = {
25
- open: () => undefined,
26
- close: () => undefined,
27
- };
24
+ if (!wsOptions.close) {
25
+ wsOptions.close = () => undefined;
26
+ }
27
+ if (!wsOptions.open) {
28
+ wsOptions.open = () => undefined;
29
+ }
30
+ if (!wsOptions.maxBackpressureSize) {
31
+ wsOptions.maxBackpressureSize = 1024 * 1024 * 10;
28
32
  }
29
33
  app.ws('/*', {
30
- maxPayloadLength: 1024 * 1024 * 10,
34
+ maxPayloadLength: 1024 * 1024 * 20,
31
35
  idleTimeout: 100,
32
- maxBackpressure: 1024,
36
+ maxBackpressure: wsOptions.maxBackpressureSize,
37
+ closeOnBackpressureLimit: wsOptions.maxBackpressureSize,
33
38
  // No compression handled in the protocol
34
39
  // compression: uws.SHARED_COMPRESSOR,
35
40
  upgrade: server.auth?.authorizeConnection
@@ -40,33 +45,40 @@ exports.default = (server, { key, cert, port, ws: wsListeners, disableRest }) =>
40
45
  (0, upgrade_1.upgrade)(server, res, req, ctx);
41
46
  },
42
47
  message: (ws, data, isBinary) => {
43
- (0, ws_1.message)(server, ws.c, data, isBinary);
48
+ const session = ws.getUserData();
49
+ (0, ws_1.message)(server, session.c, data, isBinary);
44
50
  },
45
51
  open: (ws) => {
46
52
  if (ws) {
53
+ const session = ws.getUserData();
47
54
  const ctx = {
48
- session: ws,
55
+ session,
49
56
  };
50
- ws.c = ctx;
51
- wsListeners.open(ctx);
52
- if (ctx.session.authState.token || ctx.session.authState.refreshToken) {
57
+ session.ws = ws;
58
+ session.c = ctx;
59
+ wsOptions.open(ctx);
60
+ if (session.authState.token || session.authState.refreshToken) {
53
61
  (0, auth_1.sendAndVerifyAuthMessage)(server, ctx);
54
62
  }
55
63
  }
56
64
  },
57
65
  close: (ws) => {
58
- // cl--
59
- ws.obs.forEach((id) => {
60
- (0, observable_1.unsubscribeWsIgnoreClient)(server, id, ws.c);
66
+ const session = ws.getUserData();
67
+ session.obs.forEach((id) => {
68
+ if ((0, observable_1.unsubscribeWsIgnoreClient)(server, id, session.c)) {
69
+ // This is here for channels so we do not need to keep a seperate obs set on clients
70
+ (0, channel_1.unsubscribeChannelIgnoreClient)(server, id, session.c);
71
+ }
61
72
  });
62
- wsListeners.close(ws.c);
73
+ wsOptions.close(session.c);
63
74
  // Looks really ugly but same impact on memory and GC as using the ws directly
64
75
  // and better for dc's when functions etc are in progress
65
- ws.c.session = null;
66
- ws.c = null;
76
+ session.ws = null;
77
+ session.c.session = null;
78
+ session.c = null;
67
79
  },
68
80
  drain: () => {
69
- console.info('drain');
81
+ // console.info('drain')
70
82
  // lets handle drain efficiently (or more efficiently at least)
71
83
  // call client.drain can be much more efficient
72
84
  // if (ws.client && ws.client.backpressureQueue) {
@@ -79,8 +91,6 @@ exports.default = (server, { key, cert, port, ws: wsListeners, disableRest }) =>
79
91
  app.post('/*', (res, req) => (0, http_1.httpHandler)(server, req, res));
80
92
  app.options('/*', (res, req) => (0, http_1.httpHandler)(server, req, res));
81
93
  }
82
- // REST make this configurable
83
- // .options('/*', (res, req) => httpHandler(server, req, res))
84
94
  server.uwsApp = app;
85
95
  };
86
96
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/incoming/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/incoming/index.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ exports.upgradeAuthorize = exports.upgrade = void 0;
4
4
  const auth_1 = require("../auth");
5
5
  const security_1 = require("../security");
6
6
  const ip_1 = require("../ip");
7
- const error_1 = require("../error");
7
+ // import { BasedErrorCode } from '../error'
8
8
  let clientId = 0;
9
9
  const upgradeInternal = (server, res, req,
10
10
  // eslint-disable-next-line
@@ -12,14 +12,20 @@ ctx, ip) => {
12
12
  const secWebSocketProtocol = req.getHeader('sec-websocket-protocol');
13
13
  const ua = req.getHeader('user-agent');
14
14
  if (!secWebSocketProtocol) {
15
- server.emit('error', {
16
- session: {
17
- ua,
18
- ip,
19
- },
20
- }, { code: error_1.BasedErrorCode.MissingAuthStateProtocolHeader });
21
- res.close();
22
- return;
15
+ // server.emit(
16
+ // 'error',
17
+ // {
18
+ // session: {
19
+ // ua,
20
+ // ip,
21
+ // },
22
+ // },
23
+ // { code: BasedErrorCode.MissingAuthStateProtocolHeader }
24
+ // )
25
+ // res.close()
26
+ // return
27
+ // TODO: fix this, no bueno
28
+ console.warn('No sec-websocket-protocol in handshake...');
23
29
  }
24
30
  const query = req.getQuery();
25
31
  const secWebSocketKey = req.getHeader('sec-websocket-key');
@@ -30,9 +36,10 @@ ctx, ip) => {
30
36
  ua,
31
37
  ip,
32
38
  id: ++clientId,
33
- authState: (0, auth_1.parseAuthState)(secWebSocketProtocol),
39
+ authState: secWebSocketProtocol
40
+ ? (0, auth_1.parseAuthState)(secWebSocketProtocol)
41
+ : {},
34
42
  obs: new Set(),
35
- unauthorizedObs: new Set(),
36
43
  }, secWebSocketKey, secWebSocketProtocol, secWebSocketExtensions, ctx);
37
44
  };
38
45
  const upgrade = (server, res, req,
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":"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"}
@@ -2,4 +2,4 @@ import { BasedServer } from '../../server';
2
2
  import { WebSocketSession, Context } from '@based/functions';
3
3
  import { BinaryMessageHandler } from './types';
4
4
  export declare const authMessage: BinaryMessageHandler;
5
- export declare const sendAndVerifyAuthMessage: (server: BasedServer, ctx: Context<WebSocketSession>) => void;
5
+ export declare const sendAndVerifyAuthMessage: (server: BasedServer, ctx: Context<WebSocketSession>) => Promise<void>;
@@ -4,7 +4,8 @@ exports.sendAndVerifyAuthMessage = exports.authMessage = void 0;
4
4
  const protocol_1 = require("../../protocol");
5
5
  const observable_1 = require("./observable");
6
6
  const security_1 = require("../../security");
7
- const sendAuthMessage = (ctx, payload) => ctx.session?.send((0, protocol_1.encodeAuthResponse)((0, protocol_1.valueToBuffer)(payload)), true, false);
7
+ const channelSubscribe_1 = require("./channelSubscribe");
8
+ const sendAuthMessage = (ctx, payload) => ctx.session?.ws.send((0, protocol_1.encodeAuthResponse)((0, protocol_1.valueToBuffer)(payload)), true, false);
8
9
  const parse = (payload) => {
9
10
  try {
10
11
  return JSON.parse(payload);
@@ -15,43 +16,76 @@ const parse = (payload) => {
15
16
  };
16
17
  const authMessage = (arr, start, len, isDeflate, ctx, server) => {
17
18
  if ((0, security_1.rateLimitRequest)(server, ctx, 10, server.rateLimit.ws)) {
18
- ctx.session.close();
19
+ ctx.session.ws.close();
19
20
  return false;
20
21
  }
21
22
  // | 4 header | * payload |
22
23
  const payload = (0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 4, start + len)), isDeflate);
23
24
  const authState = parse(payload);
24
- const verified = server.auth.verifyAuthState(server.client, ctx, authState);
25
- ctx.session.authState = verified === true ? authState : verified;
26
- if (verified !== true && verified.error) {
25
+ server.auth
26
+ .verifyAuthState(server.client, ctx, authState)
27
+ .then((verified) => {
28
+ const session = ctx.session;
29
+ if (!session) {
30
+ return;
31
+ }
32
+ session.authState = verified === true ? authState : verified;
33
+ if (verified !== true && verified.error) {
34
+ sendAuthMessage(ctx, verified);
35
+ return true;
36
+ }
37
+ if (session.unauthorizedObs?.size) {
38
+ session.unauthorizedObs.forEach((obs) => {
39
+ const { id, name, checksum, payload } = obs;
40
+ (0, observable_1.enableSubscribe)({
41
+ name,
42
+ query: true,
43
+ }, server, ctx, payload, id, checksum);
44
+ });
45
+ session.unauthorizedObs.clear();
46
+ }
47
+ if (session.unauthorizedChannels?.size) {
48
+ session.unauthorizedChannels.forEach((channel) => {
49
+ const { id, name, payload } = channel;
50
+ (0, channelSubscribe_1.enableChannelSubscribe)({
51
+ name,
52
+ channel: true,
53
+ }, server, ctx, payload, id);
54
+ });
55
+ session.unauthorizedChannels.clear();
56
+ }
27
57
  sendAuthMessage(ctx, verified);
28
- return true;
29
- }
30
- if (ctx.session.unauthorizedObs.size) {
31
- ctx.session.unauthorizedObs.forEach((obs) => {
32
- const { id, name, checksum, payload } = obs;
33
- (0, observable_1.enableSubscribe)({
34
- name,
35
- query: true,
36
- }, server, ctx, payload, id, checksum);
37
- });
38
- ctx.session.unauthorizedObs.clear();
39
- }
40
- sendAuthMessage(ctx, verified);
58
+ })
59
+ .catch((err) => {
60
+ const session = ctx.session;
61
+ if (!session) {
62
+ return;
63
+ }
64
+ const authState = {
65
+ error: err.message,
66
+ };
67
+ session.authState = authState;
68
+ sendAuthMessage(ctx, authState);
69
+ });
41
70
  return true;
42
71
  };
43
72
  exports.authMessage = authMessage;
44
73
  // send and verify
45
- const sendAndVerifyAuthMessage = (server, ctx) => {
46
- if (!ctx.session) {
74
+ const sendAndVerifyAuthMessage = async (server, ctx) => {
75
+ const session = ctx.session;
76
+ if (!session) {
47
77
  return;
48
78
  }
49
- const verified = server.auth.verifyAuthState(server.client, ctx, ctx.session.authState);
79
+ const verified = await server.auth
80
+ .verifyAuthState(server.client, ctx, session.authState)
81
+ .catch((err) => {
82
+ return { error: err.message };
83
+ });
50
84
  if (verified === true) {
51
85
  sendAuthMessage(ctx, true);
52
86
  return;
53
87
  }
54
- ctx.session.authState = verified;
88
+ session.authState = verified;
55
89
  sendAuthMessage(ctx, verified);
56
90
  };
57
91
  exports.sendAndVerifyAuthMessage = sendAndVerifyAuthMessage;
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import { BinaryMessageHandler } from './types';
2
+ export declare const channelPublishMessage: BinaryMessageHandler;
@@ -0,0 +1,73 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.channelPublishMessage = void 0;
4
+ const protocol_1 = require("../../protocol");
5
+ const security_1 = require("../../security");
6
+ const verifyRoute_1 = require("../../verifyRoute");
7
+ const installFn_1 = require("../../installFn");
8
+ const channel_1 = require("../../channel");
9
+ const authorize_1 = require("../../authorize");
10
+ const sendError_1 = require("../../sendError");
11
+ const error_1 = require("../../error");
12
+ const publish = (route, server, ctx, payload, id) => {
13
+ (0, installFn_1.installFn)(server, ctx, route).then((spec) => {
14
+ if (spec === null) {
15
+ return;
16
+ }
17
+ const channel = server.activeChannelsById.get(id);
18
+ if (!channel) {
19
+ return;
20
+ }
21
+ try {
22
+ spec.publish(server.client, channel.payload, payload, channel.id, ctx);
23
+ }
24
+ catch (err) {
25
+ (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
26
+ channelId: id,
27
+ err,
28
+ route,
29
+ });
30
+ }
31
+ });
32
+ };
33
+ const channelPublishMessage = (arr, start, len, isDeflate, ctx, server) => {
34
+ // | 4 header | 8 id | * payload |
35
+ const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
36
+ if (!(0, channel_1.hasChannel)(server, id)) {
37
+ if ((0, security_1.rateLimitRequest)(server, ctx, 1, server.rateLimit.ws)) {
38
+ ctx.session.ws.close();
39
+ return false;
40
+ }
41
+ ctx.session.ws.send(arr.slice(start, start + len), true, false);
42
+ return true;
43
+ }
44
+ const channel = server.activeChannelsById.get(id);
45
+ (0, channel_1.extendChannel)(server, channel);
46
+ const name = channel.name;
47
+ const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'channel', server.functions.route(name), name);
48
+ if (route === null) {
49
+ return true;
50
+ }
51
+ if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
52
+ ctx.session.ws.close();
53
+ return false;
54
+ }
55
+ if (len > route.maxPayloadSize) {
56
+ return true;
57
+ }
58
+ const payload = len === 12
59
+ ? undefined
60
+ : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 12, start + len)), isDeflate));
61
+ if (route.public || route.publisher?.public) {
62
+ (0, installFn_1.installFn)(server, ctx, route)
63
+ .then((spec) => {
64
+ spec?.publish(server.client, channel.payload, payload, channel.id, ctx);
65
+ })
66
+ .catch(() => { });
67
+ return true;
68
+ }
69
+ (0, authorize_1.authorize)(route, server, ctx, payload, publish, id);
70
+ return true;
71
+ };
72
+ exports.channelPublishMessage = channelPublishMessage;
73
+ //# sourceMappingURL=channelPublish.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"channelPublish.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelPublish.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ import { BasedChannelFunctionRoute } from '../../functions';
2
+ import { WebSocketSession } from '@based/functions';
3
+ import { IsAuthorizedHandler } from '../../authorize';
4
+ import { BinaryMessageHandler } from './types';
5
+ export declare const enableChannelSubscribe: IsAuthorizedHandler<WebSocketSession, BasedChannelFunctionRoute>;
6
+ export declare const channelSubscribeMessage: BinaryMessageHandler;
7
+ export declare const unsubscribeChannelMessage: BinaryMessageHandler;
@@ -0,0 +1,118 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.unsubscribeChannelMessage = exports.channelSubscribeMessage = exports.enableChannelSubscribe = void 0;
4
+ const protocol_1 = require("../../protocol");
5
+ const error_1 = require("../../error");
6
+ const sendError_1 = require("../../sendError");
7
+ const security_1 = require("../../security");
8
+ const verifyRoute_1 = require("../../verifyRoute");
9
+ const installFn_1 = require("../../installFn");
10
+ const authorize_1 = require("../../authorize");
11
+ const channel_1 = require("../../channel");
12
+ const enableChannelSubscribe = (route, server, ctx, payload, id) => {
13
+ if ((0, channel_1.hasChannel)(server, id)) {
14
+ (0, channel_1.subscribeChannel)(server, id, ctx);
15
+ return;
16
+ }
17
+ (0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
18
+ const session = ctx.session;
19
+ if (spec === null || !session || !session.obs.has(id)) {
20
+ return;
21
+ }
22
+ if (!(0, channel_1.hasChannel)(server, id)) {
23
+ (0, channel_1.createChannel)(server, route.name, id, payload, true);
24
+ }
25
+ (0, channel_1.subscribeChannel)(server, id, ctx);
26
+ });
27
+ };
28
+ exports.enableChannelSubscribe = enableChannelSubscribe;
29
+ const isNotAuthorized = (route, server, ctx, payload, id) => {
30
+ const session = ctx.session;
31
+ if (!session.unauthorizedChannels) {
32
+ session.unauthorizedChannels = new Set();
33
+ }
34
+ session.unauthorizedChannels.add({
35
+ id,
36
+ name: route.name,
37
+ payload,
38
+ });
39
+ };
40
+ const channelSubscribeMessage = (arr, start, len,
41
+ // isDeflate is used differently here
42
+ isChannelIdRequester, ctx, server) => {
43
+ // | 4 header | 8 id | 1 name length | * name | * payload |
44
+ const nameLen = arr[start + 12];
45
+ const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
46
+ const name = (0, protocol_1.decodeName)(arr, start + 13, start + 13 + nameLen);
47
+ if (!name || !id) {
48
+ return false;
49
+ }
50
+ const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'channel', server.functions.route(name), name);
51
+ // // TODO: add strictness setting - if strict return false here
52
+ if (route === null) {
53
+ return true;
54
+ }
55
+ if ((0, security_1.rateLimitRequest)(server, ctx,
56
+ // Requesting the id multiple times is something that should not happen - so probably a bad actor
57
+ isChannelIdRequester ? route.rateLimitTokens * 5 : route.rateLimitTokens, server.rateLimit.ws)) {
58
+ ctx.session.ws.close();
59
+ return false;
60
+ }
61
+ if (len > route.maxPayloadSize) {
62
+ (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, {
63
+ route,
64
+ channelId: id,
65
+ });
66
+ return true;
67
+ }
68
+ if (isChannelIdRequester) {
69
+ // TODO: Add authorization here....
70
+ if (!(0, channel_1.hasChannel)(server, id)) {
71
+ const payload = len === nameLen + 13
72
+ ? undefined
73
+ : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false));
74
+ // This has to be done instantly so publish can be received immediatly
75
+ (0, channel_1.createChannel)(server, name, id, payload, true);
76
+ (0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
77
+ if (spec === null) {
78
+ server.activeChannels[name].delete(id);
79
+ delete server.activeChannels[name];
80
+ server.activeChannelsById.delete(id);
81
+ return;
82
+ }
83
+ (0, channel_1.destroyChannel)(server, id);
84
+ });
85
+ return true;
86
+ }
87
+ (0, channel_1.extendChannel)(server, server.activeChannelsById.get(id));
88
+ return true;
89
+ }
90
+ const session = ctx.session;
91
+ if (session.obs.has(id)) {
92
+ // Allready subscribed to this id
93
+ return true;
94
+ }
95
+ const payload = len === nameLen + 13
96
+ ? undefined
97
+ : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false));
98
+ session.obs.add(id);
99
+ (0, authorize_1.authorize)(route, server, ctx, payload, exports.enableChannelSubscribe, id, 0, isNotAuthorized);
100
+ return true;
101
+ };
102
+ exports.channelSubscribeMessage = channelSubscribeMessage;
103
+ const unsubscribeChannelMessage = (arr, start, len, isDeflate, ctx, server) => {
104
+ // | 4 header | 8 id |
105
+ if (!ctx.session) {
106
+ return false;
107
+ }
108
+ const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
109
+ if (!id) {
110
+ return false;
111
+ }
112
+ if ((0, channel_1.unsubscribeChannel)(server, id, ctx)) {
113
+ ctx.session.ws.unsubscribe(String(id));
114
+ }
115
+ return true;
116
+ };
117
+ exports.unsubscribeChannelMessage = unsubscribeChannelMessage;
118
+ //# sourceMappingURL=channelSubscribe.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"channelSubscribe.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelSubscribe.ts"],"names":[],"mappings":"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"}
@@ -8,12 +8,18 @@ const security_1 = require("../../security");
8
8
  const verifyRoute_1 = require("../../verifyRoute");
9
9
  const installFn_1 = require("../../installFn");
10
10
  const authorize_1 = require("../../authorize");
11
+ const stream_1 = require("stream");
12
+ const utils_1 = require("@saulx/utils");
11
13
  const sendFunction = async (route, server, ctx, payload, requestId) => {
12
14
  const spec = await (0, installFn_1.installFn)(server, ctx, route, requestId);
13
15
  spec
14
16
  ?.function(server.client, payload, ctx)
15
17
  .then(async (v) => {
16
- ctx.session?.send((0, protocol_1.encodeFunctionResponse)(requestId, (0, protocol_1.valueToBuffer)(v)), true, false);
18
+ // TODO: allow chunked reply!
19
+ if (v && (v instanceof stream_1.Duplex || v instanceof stream_1.Readable)) {
20
+ v = await (0, utils_1.readStream)(v);
21
+ }
22
+ ctx.session?.ws.send((0, protocol_1.encodeFunctionResponse)(requestId, (0, protocol_1.valueToBuffer)(v)), true, false);
17
23
  })
18
24
  .catch((err) => {
19
25
  (0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
@@ -37,7 +43,7 @@ const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
37
43
  return true;
38
44
  }
39
45
  if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
40
- ctx.session.close();
46
+ ctx.session.ws.close();
41
47
  return false;
42
48
  }
43
49
  if (len > route.maxPayloadSize) {
@@ -47,7 +53,9 @@ const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
47
53
  });
48
54
  return true;
49
55
  }
50
- const payload = (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate));
56
+ const payload = len === nameLen + 8
57
+ ? undefined
58
+ : (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate));
51
59
  (0, authorize_1.authorize)(route, server, ctx, payload, sendFunction, requestId);
52
60
  return true;
53
61
  };
@@ -1 +1 @@
1
- {"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":";;;AAAA,6CAOuB;AACvB,uCAA4C;AAC5C,+CAA2C;AAG3C,6CAAiD;AACjD,mDAA+C;AAC/C,+CAA2C;AAC3C,+CAAgE;AAGhE,MAAM,YAAY,GAGd,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IACnD,MAAM,IAAI,GAAG,MAAM,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IAC3D,IAAI;QACF,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;SACtC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAChB,GAAG,CAAC,OAAO,EAAE,IAAI,CACf,IAAA,iCAAsB,EAAC,SAAS,EAAE,IAAA,wBAAa,EAAC,CAAC,CAAC,CAAC,EACnD,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,aAAa,EAAE;YACnD,KAAK;YACL,SAAS;YACT,GAAG;SACJ,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAEM,MAAM,eAAe,GAAyB,CACnD,GAAG,EACH,KAAK,EACL,GAAG,EACH,SAAS,EACT,GAAG,EACH,MAAM,EACN,EAAE;IACF,2DAA2D;IAC3D,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAC9B,MAAM,IAAI,GAAG,IAAA,qBAAU,EAAC,GAAG,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,CAAA;IAE5D,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;QACvB,OAAO,KAAK,CAAA;KACb;IAED,MAAM,KAAK,GAAG,IAAA,yBAAW,EACvB,MAAM,EACN,GAAG,EACH,IAAI,EACJ,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAC5B,IAAI,EACJ,SAAS,CACV,CAAA;IAED,6DAA6D;IAC7D,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,IAAI,CAAA;KACZ;IAED,IACE,IAAA,2BAAgB,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EACzE;QACA,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QACnB,OAAO,KAAK,CAAA;KACb;IAED,IAAI,GAAG,GAAG,KAAK,CAAC,cAAc,EAAE;QAC9B,IAAA,qBAAS,EAAC,MAAM,EAAE,GAAG,EAAE,sBAAc,CAAC,eAAe,EAAE;YACrD,KAAK;YACL,SAAS;SACV,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,OAAO,GAAG,IAAA,uBAAY,EAC1B,IAAA,wBAAa,EACX,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,OAAO,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,EAC3D,SAAS,CACV,CACF,CAAA;IAED,IAAA,qBAAS,EAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;IAE/D,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAxDY,QAAA,eAAe,mBAwD3B"}
1
+ {"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":"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"}