@based/server 6.2.6 → 6.3.0

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 (209) hide show
  1. package/dist/BasedServerClient.d.ts +71 -0
  2. package/dist/BasedServerClient.js +390 -0
  3. package/dist/BasedServerClient.js.map +1 -0
  4. package/dist/Client.d.ts +75 -0
  5. package/dist/Client.js +277 -0
  6. package/dist/Client.js.map +1 -0
  7. package/dist/Params.d.ts +20 -0
  8. package/dist/Params.js +48 -0
  9. package/dist/Params.js.map +1 -0
  10. package/dist/auth/defaultConfig.js +5 -1
  11. package/dist/auth/defaultConfig.js.map +1 -1
  12. package/dist/auth/index.js +7 -1
  13. package/dist/auth/index.js.map +1 -1
  14. package/dist/auth/parseJSONAuthState.js +18 -1
  15. package/dist/auth/parseJSONAuthState.js.map +1 -1
  16. package/dist/closeListener.d.ts +4 -0
  17. package/dist/closeListener.js +13 -0
  18. package/dist/closeListener.js.map +1 -0
  19. package/dist/createSimpleServer.d.ts +34 -0
  20. package/dist/createSimpleServer.js +209 -0
  21. package/dist/createSimpleServer.js.map +1 -0
  22. package/dist/findPrefix.d.ts +3 -0
  23. package/dist/findPrefix.js +20 -0
  24. package/dist/findPrefix.js.map +1 -0
  25. package/dist/getFromConfig.d.ts +3 -0
  26. package/dist/getFromConfig.js +50 -0
  27. package/dist/getFromConfig.js.map +1 -0
  28. package/dist/handlers/authorize.d.ts +5 -0
  29. package/dist/handlers/authorize.js +196 -0
  30. package/dist/handlers/authorize.js.map +1 -0
  31. package/dist/handlers/bulkUpdate/index.d.ts +5 -0
  32. package/dist/handlers/bulkUpdate/index.js +26 -0
  33. package/dist/handlers/bulkUpdate/index.js.map +1 -0
  34. package/dist/handlers/configuration/index.d.ts +10 -0
  35. package/dist/handlers/configuration/index.js +74 -0
  36. package/dist/handlers/configuration/index.js.map +1 -0
  37. package/dist/handlers/configuration/observable/index.d.ts +46 -0
  38. package/dist/handlers/configuration/observable/index.js +277 -0
  39. package/dist/handlers/configuration/observable/index.js.map +1 -0
  40. package/dist/handlers/configure/index.d.ts +5 -0
  41. package/dist/handlers/configure/index.js +44 -0
  42. package/dist/handlers/configure/index.js.map +1 -0
  43. package/dist/handlers/copy/index.d.ts +8 -0
  44. package/dist/handlers/copy/index.js +135 -0
  45. package/dist/handlers/copy/index.js.map +1 -0
  46. package/dist/handlers/delete/index.d.ts +5 -0
  47. package/dist/handlers/delete/index.js +34 -0
  48. package/dist/handlers/delete/index.js.map +1 -0
  49. package/dist/handlers/digest/index.d.ts +5 -0
  50. package/dist/handlers/digest/index.js +23 -0
  51. package/dist/handlers/digest/index.js.map +1 -0
  52. package/dist/handlers/functions/call.d.ts +6 -0
  53. package/dist/handlers/functions/call.js +54 -0
  54. package/dist/handlers/functions/call.js.map +1 -0
  55. package/dist/handlers/functions/observable/Observable.d.ts +49 -0
  56. package/dist/handlers/functions/observable/Observable.js +290 -0
  57. package/dist/handlers/functions/observable/Observable.js.map +1 -0
  58. package/dist/handlers/functions/observable/SharedObservable.d.ts +45 -0
  59. package/dist/handlers/functions/observable/SharedObservable.js +291 -0
  60. package/dist/handlers/functions/observable/SharedObservable.js.map +1 -0
  61. package/dist/handlers/functions/observable/index.d.ts +14 -0
  62. package/dist/handlers/functions/observable/index.js +130 -0
  63. package/dist/handlers/functions/observable/index.js.map +1 -0
  64. package/dist/handlers/get/index.d.ts +5 -0
  65. package/dist/handlers/get/index.js +23 -0
  66. package/dist/handlers/get/index.js.map +1 -0
  67. package/dist/handlers/getConfig/index.d.ts +5 -0
  68. package/dist/handlers/getConfig/index.js +38 -0
  69. package/dist/handlers/getConfig/index.js.map +1 -0
  70. package/dist/handlers/handleRequests.d.ts +5 -0
  71. package/dist/handlers/handleRequests.js +78 -0
  72. package/dist/handlers/handleRequests.js.map +1 -0
  73. package/dist/handlers/index.d.ts +4 -0
  74. package/dist/handlers/index.js +49 -0
  75. package/dist/handlers/index.js.map +1 -0
  76. package/dist/handlers/messageParser.d.ts +5 -0
  77. package/dist/handlers/messageParser.js +122 -0
  78. package/dist/handlers/messageParser.js.map +1 -0
  79. package/dist/handlers/removeField/index.d.ts +5 -0
  80. package/dist/handlers/removeField/index.js +42 -0
  81. package/dist/handlers/removeField/index.js.map +1 -0
  82. package/dist/handlers/removeType/index.d.ts +5 -0
  83. package/dist/handlers/removeType/index.js +30 -0
  84. package/dist/handlers/removeType/index.js.map +1 -0
  85. package/dist/handlers/rest/file/DataStream.d.ts +7 -0
  86. package/dist/handlers/rest/file/DataStream.js +17 -0
  87. package/dist/handlers/rest/file/DataStream.js.map +1 -0
  88. package/dist/handlers/rest/file/formStream.d.ts +4 -0
  89. package/dist/handlers/rest/file/formStream.js +188 -0
  90. package/dist/handlers/rest/file/formStream.js.map +1 -0
  91. package/dist/handlers/rest/file/getExtenstion.d.ts +2 -0
  92. package/dist/handlers/rest/file/getExtenstion.js +22 -0
  93. package/dist/handlers/rest/file/getExtenstion.js.map +1 -0
  94. package/dist/handlers/rest/file/index.d.ts +4 -0
  95. package/dist/handlers/rest/file/index.js +53 -0
  96. package/dist/handlers/rest/file/index.js.map +1 -0
  97. package/dist/handlers/rest/file/storeFile.d.ts +6 -0
  98. package/dist/handlers/rest/file/storeFile.js +44 -0
  99. package/dist/handlers/rest/file/storeFile.js.map +1 -0
  100. package/dist/handlers/rest/file/stream.d.ts +5 -0
  101. package/dist/handlers/rest/file/stream.js +104 -0
  102. package/dist/handlers/rest/file/stream.js.map +1 -0
  103. package/dist/handlers/rest/file/types.d.ts +9 -0
  104. package/dist/handlers/rest/file/types.js +3 -0
  105. package/dist/handlers/rest/file/types.js.map +1 -0
  106. package/dist/handlers/rest/getReqMessage.d.ts +3 -0
  107. package/dist/handlers/rest/getReqMessage.js +92 -0
  108. package/dist/handlers/rest/getReqMessage.js.map +1 -0
  109. package/dist/handlers/rest/index.d.ts +4 -0
  110. package/dist/handlers/rest/index.js +121 -0
  111. package/dist/handlers/rest/index.js.map +1 -0
  112. package/dist/handlers/rest/invalidReq.d.ts +4 -0
  113. package/dist/handlers/rest/invalidReq.js +20 -0
  114. package/dist/handlers/rest/invalidReq.js.map +1 -0
  115. package/dist/handlers/rest/parseResponse.d.ts +6 -0
  116. package/dist/handlers/rest/parseResponse.js +230 -0
  117. package/dist/handlers/rest/parseResponse.js.map +1 -0
  118. package/dist/handlers/rest/playground/index.d.ts +5 -0
  119. package/dist/handlers/rest/playground/index.js +308 -0
  120. package/dist/handlers/rest/playground/index.js.map +1 -0
  121. package/dist/handlers/rest/readBody.d.ts +3 -0
  122. package/dist/handlers/rest/readBody.js +45 -0
  123. package/dist/handlers/rest/readBody.js.map +1 -0
  124. package/dist/handlers/set/index.d.ts +5 -0
  125. package/dist/handlers/set/index.js +20 -0
  126. package/dist/handlers/set/index.js.map +1 -0
  127. package/dist/handlers/subscription/index.d.ts +32 -0
  128. package/dist/handlers/subscription/index.js +223 -0
  129. package/dist/handlers/subscription/index.js.map +1 -0
  130. package/dist/handlers/token.d.ts +5 -0
  131. package/dist/handlers/token.js +122 -0
  132. package/dist/handlers/token.js.map +1 -0
  133. package/dist/handlers/track/index.d.ts +7 -0
  134. package/dist/handlers/track/index.js +102 -0
  135. package/dist/handlers/track/index.js.map +1 -0
  136. package/dist/handlers/userAuth/index.d.ts +5 -0
  137. package/dist/handlers/userAuth/index.js +78 -0
  138. package/dist/handlers/userAuth/index.js.map +1 -0
  139. package/dist/incoming/http/index.js +15 -0
  140. package/dist/incoming/http/index.js.map +1 -1
  141. package/dist/incoming/ws/auth.js +16 -11
  142. package/dist/incoming/ws/auth.js.map +1 -1
  143. package/dist/incoming/ws/observable.d.ts +7 -0
  144. package/dist/incoming/ws/observable.js +91 -0
  145. package/dist/incoming/ws/observable.js.map +1 -0
  146. package/dist/observable/cleanup.d.ts +2 -0
  147. package/dist/observable/cleanup.js +66 -0
  148. package/dist/observable/cleanup.js.map +1 -0
  149. package/dist/observable/create.d.ts +3 -0
  150. package/dist/observable/create.js +35 -0
  151. package/dist/observable/create.js.map +1 -0
  152. package/dist/observable/destroy.d.ts +4 -0
  153. package/dist/observable/destroy.js +47 -0
  154. package/dist/observable/destroy.js.map +1 -0
  155. package/dist/observable/extendCache.d.ts +2 -0
  156. package/dist/observable/extendCache.js +10 -0
  157. package/dist/observable/extendCache.js.map +1 -0
  158. package/dist/observable/genObservableId.d.ts +1 -0
  159. package/dist/observable/genObservableId.js +12 -0
  160. package/dist/observable/genObservableId.js.map +1 -0
  161. package/dist/observable/get.d.ts +4 -0
  162. package/dist/observable/get.js +15 -0
  163. package/dist/observable/get.js.map +1 -0
  164. package/dist/observable/index.d.ts +10 -0
  165. package/dist/observable/index.js +27 -0
  166. package/dist/observable/index.js.map +1 -0
  167. package/dist/observable/send.d.ts +5 -0
  168. package/dist/observable/send.js +26 -0
  169. package/dist/observable/send.js.map +1 -0
  170. package/dist/observable/start/error.d.ts +3 -0
  171. package/dist/observable/start/error.js +43 -0
  172. package/dist/observable/start/error.js.map +1 -0
  173. package/dist/observable/start/index.d.ts +2 -0
  174. package/dist/observable/start/index.js +67 -0
  175. package/dist/observable/start/index.js.map +1 -0
  176. package/dist/observable/start/relay.d.ts +4 -0
  177. package/dist/observable/start/relay.js +14 -0
  178. package/dist/observable/start/relay.js.map +1 -0
  179. package/dist/observable/start/update.d.ts +3 -0
  180. package/dist/observable/start/update.js +116 -0
  181. package/dist/observable/start/update.js.map +1 -0
  182. package/dist/observable/subscribe.d.ts +7 -0
  183. package/dist/observable/subscribe.js +47 -0
  184. package/dist/observable/subscribe.js.map +1 -0
  185. package/dist/observable/types.d.ts +25 -0
  186. package/dist/observable/types.js +3 -0
  187. package/dist/observable/types.js.map +1 -0
  188. package/dist/observable/unsub.d.ts +6 -0
  189. package/dist/observable/unsub.js +46 -0
  190. package/dist/observable/unsub.js.map +1 -0
  191. package/dist/openListener.d.ts +4 -0
  192. package/dist/openListener.js +13 -0
  193. package/dist/openListener.js.map +1 -0
  194. package/dist/secrets.d.ts +9 -0
  195. package/dist/secrets.js +150 -0
  196. package/dist/secrets.js.map +1 -0
  197. package/dist/types.d.ts +129 -0
  198. package/dist/types.js +17 -0
  199. package/dist/types.js.map +1 -0
  200. package/dist/upgradeListener.d.ts +4 -0
  201. package/dist/upgradeListener.js +47 -0
  202. package/dist/upgradeListener.js.map +1 -0
  203. package/dist/workers/index.d.ts +0 -0
  204. package/dist/workers/index.js +20 -0
  205. package/dist/workers/index.js.map +1 -0
  206. package/dist/workers/workerCode.d.ts +12 -0
  207. package/dist/workers/workerCode.js +46 -0
  208. package/dist/workers/workerCode.js.map +1 -0
  209. package/package.json +1 -1
package/dist/Client.js ADDED
@@ -0,0 +1,277 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.Client = void 0;
7
+ const secrets_1 = require("./secrets");
8
+ const utils_1 = require("@saulx/utils");
9
+ const parseResponse_1 = __importDefault(require("./handlers/rest/parseResponse"));
10
+ const ua_parser_js_1 = __importDefault(require("ua-parser-js"));
11
+ let clientId = 0;
12
+ let totalBp = 0;
13
+ // make abstract class (rest client)
14
+ // why not make this user less new things that need to be made
15
+ class Client {
16
+ constructor(server, socket, res, type = 0) {
17
+ this.isBasedUser = false;
18
+ this.isApiKey = false;
19
+ this.id = ++clientId;
20
+ this._server = server;
21
+ if (socket) {
22
+ this.socket = socket;
23
+ socket.client = this;
24
+ }
25
+ this.type = type;
26
+ if (res) {
27
+ this.res = res;
28
+ }
29
+ }
30
+ params(name) {
31
+ if (this._params) {
32
+ if (name) {
33
+ return this._params[name] || null;
34
+ }
35
+ return this._params;
36
+ }
37
+ const s = this.socket;
38
+ if (s) {
39
+ const params = {};
40
+ this._params = params;
41
+ try {
42
+ const arr = s.query.split(/\?|&/g);
43
+ for (const pair of arr) {
44
+ const [k, v = true] = pair.split('=');
45
+ params[k] = v;
46
+ }
47
+ }
48
+ catch (err) { }
49
+ if (name) {
50
+ return this._params[name] || null;
51
+ }
52
+ return this._params;
53
+ }
54
+ else {
55
+ return name ? null : {};
56
+ }
57
+ }
58
+ session(obj) {
59
+ if (!this._session) {
60
+ this._session = {};
61
+ }
62
+ if (obj) {
63
+ if (!obj || typeof obj !== 'object') {
64
+ console.error('Cannot set a non object on session');
65
+ return this._session;
66
+ }
67
+ (0, utils_1.deepMerge)(this._session, obj);
68
+ }
69
+ return this._session;
70
+ }
71
+ get ip() {
72
+ if (this._ip) {
73
+ return this._ip;
74
+ }
75
+ if (this.socket) {
76
+ return (this._ip = Buffer.from(this.socket.getRemoteAddressAsText()).toString());
77
+ }
78
+ if (this.res) {
79
+ return (this._ip = Buffer.from(this.res.getRemoteAddressAsText()).toString());
80
+ }
81
+ return '::1';
82
+ }
83
+ get ua() {
84
+ if (this._ua) {
85
+ return this._ua;
86
+ }
87
+ // UA Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36
88
+ // fix the tablet etc
89
+ const ua = (this._ua = new ua_parser_js_1.default((this.socket ? this.socket.ua : this.res.ua) || '').getResult());
90
+ return ua;
91
+ }
92
+ setToken(token, opts) {
93
+ if (token) {
94
+ if (this._unpackedToken && this._token !== token) {
95
+ delete this._unpackedToken;
96
+ }
97
+ if (opts?.isApiKey) {
98
+ this.isApiKey = true;
99
+ }
100
+ else if (opts?.isBasedUser) {
101
+ this.isBasedUser = true;
102
+ }
103
+ else {
104
+ this.isBasedUser = false;
105
+ }
106
+ this._token = token;
107
+ if (opts?.refreshToken) {
108
+ this._refreshToken = opts.refreshToken;
109
+ }
110
+ }
111
+ else {
112
+ this.isApiKey = false;
113
+ this.isBasedUser = false;
114
+ if (this._unpackedToken) {
115
+ delete this._unpackedToken;
116
+ }
117
+ if (this._token) {
118
+ delete this._token;
119
+ }
120
+ if (this._refreshToken) {
121
+ delete this._refreshToken;
122
+ }
123
+ }
124
+ }
125
+ get geo() {
126
+ if (this._geo) {
127
+ return this._geo;
128
+ }
129
+ const getGeo = this._server.config?.getGeo;
130
+ if (this._server.config?.getGeo) {
131
+ return (this._geo = getGeo(this.ip));
132
+ }
133
+ else {
134
+ return {
135
+ iso: 'unkown',
136
+ regions: [],
137
+ long: 0,
138
+ lat: 0,
139
+ };
140
+ }
141
+ }
142
+ async token(secret, type = 'jwt') {
143
+ if (this._unpackedToken) {
144
+ return this._unpackedToken;
145
+ }
146
+ if (this._token) {
147
+ if (this.isApiKey) {
148
+ const getApiKeysPublicKey = this._server?.config?.getApiKeysPublicKey;
149
+ if (getApiKeysPublicKey) {
150
+ const apiTokensPublicKey = await getApiKeysPublicKey();
151
+ this._unpackedToken = await (0, secrets_1.decodeToken)(this._token, apiTokensPublicKey);
152
+ }
153
+ }
154
+ else if (this.isBasedUser) {
155
+ if (secret) {
156
+ throw new Error('Cannot validate based user with a custom secret');
157
+ }
158
+ const getBasedKey = this._server?.config?.getBasedKey;
159
+ if (getBasedKey) {
160
+ this._unpackedToken = await (0, secrets_1.decodeToken)(this._token, await getBasedKey());
161
+ }
162
+ else {
163
+ console.warn('No getBasedKey defined');
164
+ }
165
+ }
166
+ else if (typeof secret === 'string') {
167
+ if (!secret) {
168
+ return this._token;
169
+ }
170
+ this._unpackedToken = await (0, secrets_1.decodeValueBySecret)(this._server, this._token, secret, type);
171
+ }
172
+ else if (typeof secret === 'object' && secret.publicKey) {
173
+ this._unpackedToken = await (0, secrets_1.decodeToken)(this._token, secret.publicKey);
174
+ }
175
+ else {
176
+ return this._token;
177
+ }
178
+ }
179
+ return this._unpackedToken;
180
+ }
181
+ drain() {
182
+ while (this.socket &&
183
+ !this.closed &&
184
+ !this.socket.getBufferedAmount() &&
185
+ this.backpressureQueue?.length) {
186
+ totalBp--;
187
+ const [payload, time] = this.backpressureQueue.shift();
188
+ if (Date.now() - time > 10e3) {
189
+ this.backpressureQueue = [];
190
+ console.info('last bp is larger then 10 seconds destroy client');
191
+ this.destroy();
192
+ return;
193
+ }
194
+ if (!this.socket.send(JSON.stringify(payload))) {
195
+ console.info('drain build bp --- ', this.backpressureQueue.length, 'length in queue still');
196
+ }
197
+ }
198
+ // totalBpQ
199
+ if (this.backpressureQueue?.length === 0) {
200
+ this.backpressureQueue = null;
201
+ }
202
+ }
203
+ send(payload, headers) {
204
+ // here we are going to add checksum ALLWAYS
205
+ if (this.res) {
206
+ (0, parseResponse_1.default)(this.res, payload, this.type, undefined, headers);
207
+ this.destroy();
208
+ }
209
+ else if (!this.closed && this.socket) {
210
+ if (this.socket.getBufferedAmount()) {
211
+ if (!this.backpressureQueue) {
212
+ this.backpressureQueue = [];
213
+ }
214
+ if (this.backpressureQueue.length) {
215
+ const time = this.backpressureQueue[0][1];
216
+ if (Date.now() - time > 10e3) {
217
+ this.backpressureQueue = [];
218
+ console.info('last bp is larger then 10 seconds destory');
219
+ this.destroy();
220
+ return;
221
+ }
222
+ }
223
+ totalBp++;
224
+ if (totalBp > 5e3) {
225
+ console.info('Too much bp EXIT process');
226
+ process.exit();
227
+ }
228
+ this.backpressureQueue.push([payload, Date.now()]);
229
+ if (this.backpressureQueue.length > 50) {
230
+ this.backpressureQueue = [];
231
+ console.info('too large bp destroy client');
232
+ this.destroy();
233
+ return;
234
+ }
235
+ console.info('add to bp queue', this.backpressureQueue.length, this.socket.getBufferedAmount());
236
+ }
237
+ else {
238
+ // lets do better with backpressure
239
+ // buffer directly?
240
+ if (typeof payload === 'string') {
241
+ this.socket.send(payload);
242
+ }
243
+ else {
244
+ this.socket.send(JSON.stringify(payload));
245
+ }
246
+ }
247
+ }
248
+ else {
249
+ console.info('Not sending socket is closed ', !!this.socket, this.closed);
250
+ }
251
+ }
252
+ destroy(socketClosed) {
253
+ this.closed = true;
254
+ if (this.backpressureQueue && this.backpressureQueue.length) {
255
+ totalBp -= this.backpressureQueue.length;
256
+ this.backpressureQueue = [];
257
+ }
258
+ if (this.subscriptions) {
259
+ for (const id in this.subscriptions) {
260
+ this.subscriptions[id].unsubscribe(this);
261
+ }
262
+ }
263
+ if (this.socket) {
264
+ this.socket.client = null;
265
+ if (!socketClosed) {
266
+ this.socket.end();
267
+ }
268
+ this.socket = null;
269
+ }
270
+ else {
271
+ this.res = null;
272
+ }
273
+ }
274
+ }
275
+ exports.Client = Client;
276
+ exports.default = Client;
277
+ //# sourceMappingURL=Client.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Client.js","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,20 @@
1
+ /// <reference types="node" />
2
+ import { BasedServer } from './';
3
+ import BasedServerClient from './BasedServerClient';
4
+ import { Client } from './Client';
5
+ import { Readable } from 'stream';
6
+ export declare class Params {
7
+ constructor(server: BasedServer, payload?: any, user?: Client, callStack?: string[], update?: (value: any, checksum?: number) => void, name?: string, type?: string, useGlobalBased?: boolean, stream?: Readable);
8
+ private useGlobalBased?;
9
+ type?: string;
10
+ name?: string;
11
+ update: (value: any, checksum?: number) => void;
12
+ callStack: string[];
13
+ user: Client;
14
+ payload?: any;
15
+ fileStream?: Readable;
16
+ private _based;
17
+ server: BasedServer;
18
+ path?: string;
19
+ get based(): BasedServerClient;
20
+ }
package/dist/Params.js ADDED
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.Params = void 0;
7
+ const BasedServerClient_1 = __importDefault(require("./BasedServerClient"));
8
+ class Params {
9
+ constructor(server, payload, user, callStack, update, name, type, useGlobalBased = false, stream = null) {
10
+ this.update = (value, checksum) => {
11
+ console.warn('cannot use update on a non-observable function', value, checksum);
12
+ };
13
+ this.server = server;
14
+ if (callStack) {
15
+ this.callStack = callStack;
16
+ }
17
+ if (user) {
18
+ this.user = user;
19
+ }
20
+ if (stream) {
21
+ this.fileStream = stream;
22
+ }
23
+ if (update) {
24
+ this.update = update;
25
+ }
26
+ if (name) {
27
+ this.name = name;
28
+ }
29
+ if (type) {
30
+ this.type = type;
31
+ }
32
+ this.payload = payload;
33
+ if (useGlobalBased) {
34
+ this.useGlobalBased = true;
35
+ }
36
+ }
37
+ get based() {
38
+ if (this.useGlobalBased) {
39
+ return this.server.based;
40
+ }
41
+ else {
42
+ return this._based || (this._based = new BasedServerClient_1.default(this));
43
+ }
44
+ }
45
+ }
46
+ exports.Params = Params;
47
+ Params.prototype.callStack = [];
48
+ //# sourceMappingURL=Params.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Params.js","sourceRoot":"","sources":["../src/Params.ts"],"names":[],"mappings":";;;;;;AACA,4EAAmD;AAInD,MAAa,MAAM;IACjB,YACE,MAAmB,EACnB,OAAa,EACb,IAAa,EACb,SAAoB,EACpB,MAAgD,EAChD,IAAa,EACb,IAAa,EACb,iBAA0B,KAAK,EAC/B,SAAmB,IAAI;QAkClB,WAAM,GAA4C,CACvD,KAAU,EACV,QAAiB,EACjB,EAAE;YACF,OAAO,CAAC,IAAI,CACV,gDAAgD,EAChD,KAAK,EACL,QAAQ,CACT,CAAA;QACH,CAAC,CAAA;QAzCC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;SAC3B;QACD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;SACjB;QACD,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,UAAU,GAAG,MAAM,CAAA;SACzB;QACD,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;SACrB;QACD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;SACjB;QACD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;SACjB;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QAEtB,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;SAC3B;IACH,CAAC;IAiCD,IAAI,KAAK;QACP,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;SACzB;aAAM;YACL,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,2BAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;SAClE;IACH,CAAC;CACF;AA5ED,wBA4EC;AAED,MAAM,CAAC,SAAS,CAAC,SAAS,GAAG,EAAE,CAAA"}
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.defaultVerifyAuthState = exports.defaultAuthorize = void 0;
4
+ const utils_1 = require("@saulx/utils");
4
5
  const defaultAuthorize = async () => {
5
6
  return true;
6
7
  };
7
8
  exports.defaultAuthorize = defaultAuthorize;
8
- const defaultVerifyAuthState = async () => {
9
+ const defaultVerifyAuthState = async (based, ctx, authState) => {
10
+ if (ctx.session && !(0, utils_1.deepEqual)(authState, ctx.session.authState)) {
11
+ return authState;
12
+ }
9
13
  return true;
10
14
  };
11
15
  exports.defaultVerifyAuthState = defaultVerifyAuthState;
@@ -1 +1 @@
1
- {"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../../src/auth/defaultConfig.ts"],"names":[],"mappings":";;;AAEO,MAAM,gBAAgB,GAAc,KAAK,IAAI,EAAE;IACpD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B;AAEM,MAAM,sBAAsB,GAAoB,KAAK,IAAI,EAAE;IAChE,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAFY,QAAA,sBAAsB,0BAElC"}
1
+ {"version":3,"file":"defaultConfig.js","sourceRoot":"","sources":["../../src/auth/defaultConfig.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAEjC,MAAM,gBAAgB,GAAc,KAAK,IAAI,EAAE;IACpD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B;AAEM,MAAM,sBAAsB,GAAoB,KAAK,EAC1D,KAAK,EACL,GAAG,EACH,SAAS,EACT,EAAE;IACF,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,IAAA,iBAAS,EAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/D,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AATY,QAAA,sBAAsB,0BASlC"}
@@ -12,6 +12,7 @@ exports.parseAuthState = parseAuthState_1.default;
12
12
  const parseJSONAuthState_1 = __importDefault(require("./parseJSONAuthState"));
13
13
  exports.parseJSONAuthState = parseJSONAuthState_1.default;
14
14
  const auth_1 = require("../incoming/ws/auth");
15
+ const utils_1 = require("@saulx/utils");
15
16
  class BasedAuth {
16
17
  constructor(server, config = {}) {
17
18
  this.verifyAuthState = defaultConfig_1.defaultVerifyAuthState;
@@ -47,9 +48,14 @@ class BasedAuth {
47
48
  if (verified === true || !ctx.session) {
48
49
  return;
49
50
  }
51
+ if (typeof ctx.session.authState === 'object' && typeof verified === 'object' && (0, utils_1.deepEqual)(ctx.session.authState, verified)) {
52
+ return;
53
+ }
50
54
  ctx.session.authState = verified;
51
55
  if ((0, functions_1.isWsContext)(ctx)) {
52
- (0, auth_1.reEvaulateUnauthorized)(this.server, ctx);
56
+ if (verified.token) {
57
+ (0, auth_1.reEvaulateUnauthorized)(this.server, ctx);
58
+ }
53
59
  this.sendAuthState(ctx, verified);
54
60
  }
55
61
  return verified;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA+D;AAE/D,gDASyB;AACzB,mDAA0E;AAC1E,sEAA6C;AAIpC,yBAJF,wBAAc,CAIE;AAHvB,8EAAqD;AAI5C,6BAJF,4BAAkB,CAIE;AAH3B,8CAA4D;AAiB5D,MAAa,SAAS;IAOpB,YAAY,MAAmB,EAAE,SAAqB,EAAE;QAHxD,oBAAe,GAAoB,sCAAsB,CAAA;QACzD,cAAS,GAAc,gCAAgB,CAAA;QAGrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;IAED,YAAY,CAAC,MAAkB;QAC7B,IAAI,CAAC,MAAM,EAAE;YACX,OAAM;SACP;QACD,IAAI,MAAM,CAAC,mBAAmB,EAAE;YAC9B,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAA;SACtD;QACD,IAAI,MAAM,CAAC,SAAS,EAAE;YACpB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;SAClC;QACD,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;SAC9C;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAClB,GAAY,EACZ,SAAqB;QAErB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QAED,IAAI,CAAC,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;YACjC,OAAM;SACP;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CACrD,IAAI,CAAC,MAAM,CAAC,MAAM,EACgC,GAAG,EACrD,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CACnC,CAAA;QAED,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACrC,OAAM;SACP;QAED,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAA;QAEhC,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,EAAE;YACpB,IAAA,6BAAsB,EAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YACxC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;SAClC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,eAAe,CAAC,SAAoB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC1E,CAAC;IAED,eAAe,CAAC,SAAc;QAC5B,OAAO,IAAA,wBAAc,EAAC,SAAS,CAAC,CAAA;IAClC,CAAC;IAED,0CAA0C;IAC1C,aAAa,CAAC,GAA8B,EAAE,SAAoB;QAChE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAClB,IAAA,6BAAkB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC5C,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC;CACF;AA9ED,8BA8EC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA+D;AAE/D,gDASyB;AACzB,mDAA0E;AAC1E,sEAA6C;AAKpC,yBALF,wBAAc,CAKE;AAJvB,8EAAqD;AAK5C,6BALF,4BAAkB,CAKE;AAJ3B,8CAA4D;AAC5D,wCAAwC;AAiBxC,MAAa,SAAS;IAOpB,YAAY,MAAmB,EAAE,SAAqB,EAAE;QAHxD,oBAAe,GAAoB,sCAAsB,CAAA;QACzD,cAAS,GAAc,gCAAgB,CAAA;QAGrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;IAED,YAAY,CAAC,MAAkB;QAC7B,IAAI,CAAC,MAAM,EAAE;YACX,OAAM;SACP;QACD,IAAI,MAAM,CAAC,mBAAmB,EAAE;YAC9B,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAA;SACtD;QACD,IAAI,MAAM,CAAC,SAAS,EAAE;YACpB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;SAClC;QACD,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;SAC9C;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAClB,GAAY,EACZ,SAAqB;QAErB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QAED,IAAI,CAAC,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;YACjC,OAAM;SACP;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CACrD,IAAI,CAAC,MAAM,CAAC,MAAM,EACgC,GAAG,EACrD,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CACnC,CAAA;QAED,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACrC,OAAM;SACP;QAED,IAAI,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,IAAA,iBAAS,EAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;YAC3H,OAAM;SACP;QAED,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAA;QAEhC,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,EAAE;YACpB,IAAI,QAAQ,CAAC,KAAK,EAAE;gBAClB,IAAA,6BAAsB,EAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;aACzC;YACD,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;SAClC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,eAAe,CAAC,SAAoB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC1E,CAAC;IAED,eAAe,CAAC,SAAc;QAC5B,OAAO,IAAA,wBAAc,EAAC,SAAS,CAAC,CAAA;IAClC,CAAC;IAED,0CAA0C;IAC1C,aAAa,CAAC,GAA8B,EAAE,SAAoB;QAChE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAClB,IAAA,6BAAkB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC5C,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC;CACF;AApFD,8BAoFC"}
@@ -2,7 +2,24 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = (authorization) => {
4
4
  try {
5
- return JSON.parse(decodeURIComponent(authorization));
5
+ const authState = JSON.parse(decodeURIComponent(authorization));
6
+ for (const key in authState) {
7
+ if (key !== 'token' &&
8
+ key !== 'userId' &&
9
+ key !== 'refreshToken' &&
10
+ key !== 'error' &&
11
+ key !== 'persistent' &&
12
+ key !== 'type') {
13
+ return { error: 'Illegal key in authState ' + key };
14
+ }
15
+ else if (key === 'persistent' && typeof authState[key] !== 'boolean') {
16
+ return { error: 'Persistent is not a boolean' };
17
+ }
18
+ else if (typeof authState[key] !== 'string') {
19
+ return { error: `${key} is not of string` };
20
+ }
21
+ }
22
+ return authState;
6
23
  }
7
24
  catch (err) { }
8
25
  return { error: 'Invalid token' };
@@ -1 +1 @@
1
- {"version":3,"file":"parseJSONAuthState.js","sourceRoot":"","sources":["../../src/auth/parseJSONAuthState.ts"],"names":[],"mappings":";;AAEA,kBAAe,CAAC,aAAqB,EAAa,EAAE;IAClD,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAA;KACrD;IAAC,OAAO,GAAG,EAAE,GAAE;IAChB,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,CAAA;AACnC,CAAC,CAAA"}
1
+ {"version":3,"file":"parseJSONAuthState.js","sourceRoot":"","sources":["../../src/auth/parseJSONAuthState.ts"],"names":[],"mappings":";;AAEA,kBAAe,CAAC,aAAqB,EAAa,EAAE;IAClD,IAAI;QACF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAA;QAC/D,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;YAC3B,IACE,GAAG,KAAK,OAAO;gBACf,GAAG,KAAK,QAAQ;gBAChB,GAAG,KAAK,cAAc;gBACtB,GAAG,KAAK,OAAO;gBACf,GAAG,KAAK,YAAY;gBACpB,GAAG,KAAK,MAAM,EACd;gBACA,OAAO,EAAE,KAAK,EAAE,2BAA2B,GAAG,GAAG,EAAE,CAAA;aACpD;iBAAM,IAAI,GAAG,KAAK,YAAY,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;gBACtE,OAAO,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAA;aAChD;iBAAM,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;gBAC7C,OAAO,EAAE,KAAK,EAAE,GAAG,GAAG,mBAAmB,EAAE,CAAA;aAC5C;SACF;QACD,OAAO,SAAS,CAAA;KACjB;IAAC,OAAO,GAAG,EAAE,GAAE;IAChB,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,CAAA;AACnC,CAAC,CAAA"}
@@ -0,0 +1,4 @@
1
+ import uws from '@based/uws';
2
+ import { BasedServer } from '.';
3
+ declare const close: (server: BasedServer, socket: uws.WebSocket) => void;
4
+ export default close;
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const close = (server, socket) => {
4
+ if (!socket.client) {
5
+ return;
6
+ }
7
+ const client = socket.client;
8
+ server.emit('close', client);
9
+ delete server.clients[client.id];
10
+ client.destroy(true);
11
+ };
12
+ exports.default = close;
13
+ //# sourceMappingURL=closeListener.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"closeListener.js","sourceRoot":"","sources":["../src/closeListener.ts"],"names":[],"mappings":";;AAGA,MAAM,KAAK,GAAG,CAAC,MAAmB,EAAE,MAAqB,EAAE,EAAE;IAC3D,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,OAAM;KACP;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC5B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAChC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACtB,CAAC,CAAA;AAED,kBAAe,KAAK,CAAA"}
@@ -0,0 +1,34 @@
1
+ import { BasedFunctionSpec, BasedQueryFunctionSpec, BasedStreamFunctionSpec, BasedSpec, BasedChannelFunctionSpec } from './functions';
2
+ import { BasedQueryFunction, BasedFunction, BasedChannelFunction, BasedStreamFunction } from '@based/functions';
3
+ import { BasedServer, ServerOptions } from './server';
4
+ export type SimpleServerOptions = {
5
+ install?: (opts: {
6
+ server: BasedServer;
7
+ name: string;
8
+ function?: BasedSpec;
9
+ }) => Promise<null | BasedSpec>;
10
+ uninstall?: (opts: {
11
+ server: BasedServer;
12
+ name: string;
13
+ function: BasedSpec;
14
+ }) => Promise<boolean>;
15
+ functions?: {
16
+ [key: string]: BasedFunction | Partial<BasedFunctionSpec>;
17
+ };
18
+ streams?: {
19
+ [key: string]: BasedStreamFunction | Partial<BasedStreamFunctionSpec>;
20
+ };
21
+ queryFunctions?: {
22
+ [key: string]: BasedQueryFunction | Partial<BasedQueryFunctionSpec>;
23
+ };
24
+ channels?: {
25
+ [key: string]: BasedChannelFunction | Partial<BasedChannelFunctionSpec>;
26
+ };
27
+ silent?: boolean;
28
+ closeAfterIdleTime?: {
29
+ channel: number;
30
+ query: number;
31
+ };
32
+ uninstallAfterIdleTime?: number;
33
+ } & Omit<ServerOptions, 'functions'>;
34
+ export declare function createSimpleServer(props: SimpleServerOptions, sharedSocket?: boolean): Promise<BasedServer>;