@miqro/core 4.0.1 → 5.0.2

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 (220) hide show
  1. package/build/app.d.ts +15 -11
  2. package/build/app.js +22 -20
  3. package/build/app.js.map +1 -1
  4. package/build/common.d.ts +106 -0
  5. package/build/common.js +477 -0
  6. package/build/common.js.map +1 -0
  7. package/build/lib.d.ts +7 -38
  8. package/build/lib.js +6 -33
  9. package/build/lib.js.map +1 -1
  10. package/build/middleware/body-parser.d.ts +78 -0
  11. package/build/middleware/body-parser.js +552 -0
  12. package/build/middleware/body-parser.js.map +1 -0
  13. package/build/middleware/router.d.ts +114 -0
  14. package/build/middleware/router.js +704 -0
  15. package/build/middleware/router.js.map +1 -0
  16. package/build/middleware/session.d.ts +27 -3
  17. package/build/middleware/session.js +238 -18
  18. package/build/middleware/session.js.map +1 -1
  19. package/build/types.d.ts +309 -0
  20. package/build/types.js +455 -0
  21. package/build/types.js.map +1 -0
  22. package/build/{websocket/cluster.d.ts → websocket.d.ts} +13 -2
  23. package/build/websocket.js +316 -0
  24. package/build/websocket.js.map +1 -0
  25. package/package.json +7 -7
  26. package/src/app.ts +36 -32
  27. package/src/common.ts +528 -0
  28. package/src/lib.ts +63 -101
  29. package/src/middleware/body-parser.ts +597 -0
  30. package/src/middleware/router.ts +840 -0
  31. package/src/middleware/session.ts +249 -19
  32. package/src/types.ts +785 -0
  33. package/src/websocket.ts +356 -0
  34. package/build/api-router.d.ts +0 -34
  35. package/build/api-router.js +0 -48
  36. package/build/api-router.js.map +0 -1
  37. package/build/app-utils.d.ts +0 -13
  38. package/build/app-utils.js +0 -78
  39. package/build/app-utils.js.map +0 -1
  40. package/build/common/api-router-types.d.ts +0 -28
  41. package/build/common/api-router-types.js +0 -24
  42. package/build/common/api-router-types.js.map +0 -1
  43. package/build/common/api-router-utils.d.ts +0 -3
  44. package/build/common/api-router-utils.js +0 -118
  45. package/build/common/api-router-utils.js.map +0 -1
  46. package/build/common/config/config.d.ts +0 -15
  47. package/build/common/config/config.js +0 -38
  48. package/build/common/config/config.js.map +0 -1
  49. package/build/common/config/featuretoggle.d.ts +0 -1
  50. package/build/common/config/featuretoggle.js +0 -6
  51. package/build/common/config/featuretoggle.js.map +0 -1
  52. package/build/common/config/loader.d.ts +0 -13
  53. package/build/common/config/loader.js +0 -64
  54. package/build/common/config/loader.js.map +0 -1
  55. package/build/common/context.d.ts +0 -57
  56. package/build/common/context.js +0 -137
  57. package/build/common/context.js.map +0 -1
  58. package/build/common/error/badrequesterror.d.ts +0 -3
  59. package/build/common/error/badrequesterror.js +0 -7
  60. package/build/common/error/badrequesterror.js.map +0 -1
  61. package/build/common/error/configfilenotfound.d.ts +0 -3
  62. package/build/common/error/configfilenotfound.js +0 -7
  63. package/build/common/error/configfilenotfound.js.map +0 -1
  64. package/build/common/error/forbiddenerror.d.ts +0 -3
  65. package/build/common/error/forbiddenerror.js +0 -7
  66. package/build/common/error/forbiddenerror.js.map +0 -1
  67. package/build/common/error/notfound.d.ts +0 -3
  68. package/build/common/error/notfound.js +0 -7
  69. package/build/common/error/notfound.js.map +0 -1
  70. package/build/common/error/notimplemented.d.ts +0 -3
  71. package/build/common/error/notimplemented.js +0 -7
  72. package/build/common/error/notimplemented.js.map +0 -1
  73. package/build/common/error/unauthorizederror.d.ts +0 -3
  74. package/build/common/error/unauthorizederror.js +0 -7
  75. package/build/common/error/unauthorizederror.js.map +0 -1
  76. package/build/common/logger/constants.d.ts +0 -14
  77. package/build/common/logger/constants.js +0 -22
  78. package/build/common/logger/constants.js.map +0 -1
  79. package/build/common/logger/factory.d.ts +0 -16
  80. package/build/common/logger/factory.js +0 -47
  81. package/build/common/logger/factory.js.map +0 -1
  82. package/build/common/logger/interfaces.d.ts +0 -18
  83. package/build/common/logger/interfaces.js +0 -2
  84. package/build/common/logger/interfaces.js.map +0 -1
  85. package/build/common/logger/logger.d.ts +0 -35
  86. package/build/common/logger/logger.js +0 -95
  87. package/build/common/logger/logger.js.map +0 -1
  88. package/build/common/logger/transport/console.d.ts +0 -5
  89. package/build/common/logger/transport/console.js +0 -37
  90. package/build/common/logger/transport/console.js.map +0 -1
  91. package/build/common/logger/transport/file.d.ts +0 -2
  92. package/build/common/logger/transport/file.js +0 -25
  93. package/build/common/logger/transport/file.js.map +0 -1
  94. package/build/common/parser.d.ts +0 -7
  95. package/build/common/parser.js +0 -44
  96. package/build/common/parser.js.map +0 -1
  97. package/build/common/router-default-logger-factory.d.ts +0 -4
  98. package/build/common/router-default-logger-factory.js +0 -38
  99. package/build/common/router-default-logger-factory.js.map +0 -1
  100. package/build/common/router-handler.d.ts +0 -20
  101. package/build/common/router-handler.js +0 -154
  102. package/build/common/router-handler.js.map +0 -1
  103. package/build/common/router-types.d.ts +0 -63
  104. package/build/common/router-types.js +0 -86
  105. package/build/common/router-types.js.map +0 -1
  106. package/build/common/router-utils.d.ts +0 -3
  107. package/build/common/router-utils.js +0 -46
  108. package/build/common/router-utils.js.map +0 -1
  109. package/build/common/session/common.d.ts +0 -37
  110. package/build/common/session/common.js +0 -2
  111. package/build/common/session/common.js.map +0 -1
  112. package/build/common/session/service.d.ts +0 -26
  113. package/build/common/session/service.js +0 -154
  114. package/build/common/session/service.js.map +0 -1
  115. package/build/common/tokenize-match.d.ts +0 -19
  116. package/build/common/tokenize-match.js +0 -73
  117. package/build/common/tokenize-match.js.map +0 -1
  118. package/build/common/url-utils.d.ts +0 -6
  119. package/build/common/url-utils.js +0 -48
  120. package/build/common/url-utils.js.map +0 -1
  121. package/build/middleware/buffer.d.ts +0 -6
  122. package/build/middleware/buffer.js +0 -78
  123. package/build/middleware/buffer.js.map +0 -1
  124. package/build/middleware/cookie.d.ts +0 -4
  125. package/build/middleware/cookie.js +0 -15
  126. package/build/middleware/cookie.js.map +0 -1
  127. package/build/middleware/cors.d.ts +0 -8
  128. package/build/middleware/cors.js +0 -89
  129. package/build/middleware/cors.js.map +0 -1
  130. package/build/middleware/form.d.ts +0 -6
  131. package/build/middleware/form.js +0 -58
  132. package/build/middleware/form.js.map +0 -1
  133. package/build/middleware/group.d.ts +0 -3
  134. package/build/middleware/group.js +0 -77
  135. package/build/middleware/group.js.map +0 -1
  136. package/build/middleware/json.d.ts +0 -6
  137. package/build/middleware/json.js +0 -55
  138. package/build/middleware/json.js.map +0 -1
  139. package/build/middleware/logger.d.ts +0 -4
  140. package/build/middleware/logger.js +0 -16
  141. package/build/middleware/logger.js.map +0 -1
  142. package/build/middleware/parse.d.ts +0 -14
  143. package/build/middleware/parse.js +0 -88
  144. package/build/middleware/parse.js.map +0 -1
  145. package/build/middleware/result.d.ts +0 -9
  146. package/build/middleware/result.js +0 -62
  147. package/build/middleware/result.js.map +0 -1
  148. package/build/middleware/tag.d.ts +0 -4
  149. package/build/middleware/tag.js +0 -10
  150. package/build/middleware/tag.js.map +0 -1
  151. package/build/middleware/text.d.ts +0 -5
  152. package/build/middleware/text.js +0 -46
  153. package/build/middleware/text.js.map +0 -1
  154. package/build/proxy.d.ts +0 -19
  155. package/build/proxy.js +0 -74
  156. package/build/proxy.js.map +0 -1
  157. package/build/router.d.ts +0 -26
  158. package/build/router.js +0 -116
  159. package/build/router.js.map +0 -1
  160. package/build/static.d.ts +0 -14
  161. package/build/static.js +0 -211
  162. package/build/static.js.map +0 -1
  163. package/build/websocket/cluster.js +0 -114
  164. package/build/websocket/cluster.js.map +0 -1
  165. package/build/websocket/server.d.ts +0 -15
  166. package/build/websocket/server.js +0 -127
  167. package/build/websocket/server.js.map +0 -1
  168. package/build/websocket/types.d.ts +0 -39
  169. package/build/websocket/types.js +0 -2
  170. package/build/websocket/types.js.map +0 -1
  171. package/build/websocket/utils.d.ts +0 -8
  172. package/build/websocket/utils.js +0 -77
  173. package/build/websocket/utils.js.map +0 -1
  174. package/src/api-router.ts +0 -50
  175. package/src/app-utils.ts +0 -82
  176. package/src/common/api-router-types.ts +0 -52
  177. package/src/common/api-router-utils.ts +0 -126
  178. package/src/common/config/config.ts +0 -49
  179. package/src/common/config/featuretoggle.ts +0 -6
  180. package/src/common/config/loader.ts +0 -81
  181. package/src/common/context.ts +0 -192
  182. package/src/common/error/badrequesterror.ts +0 -6
  183. package/src/common/error/configfilenotfound.ts +0 -6
  184. package/src/common/error/forbiddenerror.ts +0 -6
  185. package/src/common/error/notfound.ts +0 -6
  186. package/src/common/error/notimplemented.ts +0 -6
  187. package/src/common/error/unauthorizederror.ts +0 -6
  188. package/src/common/logger/constants.ts +0 -28
  189. package/src/common/logger/factory.ts +0 -53
  190. package/src/common/logger/interfaces.ts +0 -19
  191. package/src/common/logger/logger.ts +0 -136
  192. package/src/common/logger/transport/console.ts +0 -36
  193. package/src/common/logger/transport/file.ts +0 -26
  194. package/src/common/parser.ts +0 -50
  195. package/src/common/router-default-logger-factory.ts +0 -44
  196. package/src/common/router-handler.ts +0 -186
  197. package/src/common/router-types.ts +0 -153
  198. package/src/common/router-utils.ts +0 -47
  199. package/src/common/session/common.ts +0 -40
  200. package/src/common/session/service.ts +0 -175
  201. package/src/common/tokenize-match.ts +0 -98
  202. package/src/common/url-utils.ts +0 -46
  203. package/src/middleware/buffer.ts +0 -82
  204. package/src/middleware/cookie.ts +0 -20
  205. package/src/middleware/cors.ts +0 -98
  206. package/src/middleware/form.ts +0 -61
  207. package/src/middleware/group.ts +0 -74
  208. package/src/middleware/json.ts +0 -57
  209. package/src/middleware/logger.ts +0 -18
  210. package/src/middleware/parse.ts +0 -105
  211. package/src/middleware/result.ts +0 -73
  212. package/src/middleware/tag.ts +0 -15
  213. package/src/middleware/text.ts +0 -47
  214. package/src/proxy.ts +0 -99
  215. package/src/router.ts +0 -140
  216. package/src/static.ts +0 -242
  217. package/src/websocket/cluster.ts +0 -128
  218. package/src/websocket/server.ts +0 -135
  219. package/src/websocket/types.ts +0 -41
  220. package/src/websocket/utils.ts +0 -95
@@ -0,0 +1,316 @@
1
+ import { createHash, randomUUID } from "crypto";
2
+ export class WebSocketServer {
3
+ constructor(options) {
4
+ this.options = options;
5
+ this.clients = new Map();
6
+ this.onUpgrade = this.onUpgrade.bind(this);
7
+ this.isConnected = this.isConnected.bind(this);
8
+ this.writeTo = this.writeTo.bind(this);
9
+ this.broadcast = this.broadcast.bind(this);
10
+ }
11
+ isConnected(clientUUID) {
12
+ return this.clients.get(clientUUID) !== undefined;
13
+ }
14
+ async broadcast(data, fromUUID) {
15
+ const tR = [];
16
+ const clients = this.clients.values();
17
+ for (const client of clients) {
18
+ if (fromUUID === undefined || client.uuid !== fromUUID) {
19
+ tR.push(this.writeTo(client.uuid, data));
20
+ }
21
+ }
22
+ await Promise.all(tR);
23
+ }
24
+ async writeTo(clientUUID, data) {
25
+ const client = this.clients.get(clientUUID);
26
+ if (!client) {
27
+ throw new Error("client not found");
28
+ }
29
+ return new Promise((resolve, reject) => {
30
+ try {
31
+ client.req.socket.write(createFrame(data), function SocketWriteCallback(err) {
32
+ if (err) {
33
+ reject(err);
34
+ }
35
+ else {
36
+ resolve();
37
+ }
38
+ });
39
+ }
40
+ catch (e) {
41
+ reject(e);
42
+ }
43
+ });
44
+ }
45
+ async onUpgrade(req, socket, head) {
46
+ const acceptKey = req.headers["sec-websocket-key"];
47
+ if (!socket ||
48
+ (!req.headers.connection || req.headers.connection.indexOf("Upgrade") === -1) ||
49
+ req.headers.upgrade !== "websocket" ||
50
+ req.method !== "GET" ||
51
+ !acceptKey) {
52
+ socket.end("HTTP/1.1 400 Bad Request");
53
+ socket.destroy();
54
+ return;
55
+ }
56
+ else {
57
+ const validateRet = this.options.validate ? await this.options.validate(req) : true;
58
+ const uuid = typeof validateRet === "boolean" ?
59
+ (validateRet ? randomUUID() : null) :
60
+ (typeof validateRet === "object" ? validateRet.uuid :
61
+ validateRet ? randomUUID() : null);
62
+ const extraHeaders = typeof validateRet === "object" ? validateRet.headers : undefined;
63
+ if (!uuid) {
64
+ socket.end("HTTP/1.1 403 Forbidden");
65
+ socket.destroy();
66
+ return;
67
+ }
68
+ else {
69
+ if (this.options.maxConnections !== undefined && this.clients.size >= this.options.maxConnections) {
70
+ socket.end("HTTP/1.1 403 Forbidden");
71
+ socket.destroy();
72
+ return;
73
+ }
74
+ const client = {
75
+ uuid,
76
+ head,
77
+ req,
78
+ socket
79
+ };
80
+ this.options.logger?.debug("upgrading connection");
81
+ socket.write(createUpgradeHeaders(acceptKey, extraHeaders));
82
+ socket.on("data", (data) => {
83
+ const frame = parseFrame(data);
84
+ if (frame !== null) {
85
+ if (!this.options.onMessage) {
86
+ socket.end();
87
+ socket.destroy();
88
+ }
89
+ else {
90
+ try {
91
+ this.options.onMessage(client, frame);
92
+ }
93
+ catch (e) {
94
+ this.options.logger?.error(e);
95
+ }
96
+ }
97
+ }
98
+ });
99
+ socket.on("end", () => {
100
+ this.options.logger?.debug("upgraded connection disconnected!");
101
+ this.clients.delete(uuid);
102
+ if (this.options.onDisconnect) {
103
+ try {
104
+ this.options.onDisconnect(client);
105
+ }
106
+ catch (e) {
107
+ this.options.logger?.error(e);
108
+ }
109
+ }
110
+ });
111
+ this.options.logger?.debug("connection upgraded");
112
+ this.clients.set(uuid, client);
113
+ if (this.options.onConnection) {
114
+ try {
115
+ this.options.onConnection(client);
116
+ }
117
+ catch (e) {
118
+ this.options.logger?.error(e);
119
+ }
120
+ }
121
+ return;
122
+ }
123
+ }
124
+ }
125
+ }
126
+ const ClusterWebSocketServerMessageType = "ClusterWebSocketServerMessage";
127
+ export class ClusterWebSocketServer extends WebSocketServer {
128
+ constructor(options) {
129
+ super({
130
+ ...options,
131
+ validate: (req) => {
132
+ if (this.options.maxConnections !== undefined &&
133
+ this.clients.size + this.remoteClients.size >= this.options.maxConnections) {
134
+ return false;
135
+ }
136
+ else {
137
+ return options.validate ? options.validate(req) : true;
138
+ }
139
+ },
140
+ onConnection: (req) => {
141
+ if (process.send) {
142
+ process.send({
143
+ type: ClusterWebSocketServerMessageType,
144
+ action: "connection",
145
+ clientUUID: req.uuid
146
+ });
147
+ }
148
+ if (options.onConnection) {
149
+ options.onConnection(req);
150
+ }
151
+ },
152
+ onDisconnect: (req) => {
153
+ if (process.send) {
154
+ process.send({
155
+ type: ClusterWebSocketServerMessageType,
156
+ action: "disconnection",
157
+ clientUUID: req.uuid
158
+ });
159
+ }
160
+ if (options.onDisconnect) {
161
+ options.onDisconnect(req);
162
+ }
163
+ }
164
+ });
165
+ this.remoteClients = new Set();
166
+ if (ClusterWebSocketServer.instance) {
167
+ throw new Error("cannot create more than one instance");
168
+ }
169
+ ClusterWebSocketServer.instance = this;
170
+ if (process.send) {
171
+ process.on("message", (data) => {
172
+ const msg = data;
173
+ if (msg &&
174
+ msg.type === ClusterWebSocketServerMessageType &&
175
+ msg.action) {
176
+ // receive message from cluster workers
177
+ switch (msg.action) {
178
+ case "connection":
179
+ if (!msg.clientUUID) {
180
+ throw new Error(`action [${msg.action}] without clientUUID`);
181
+ }
182
+ this.remoteClients.add(msg.clientUUID);
183
+ break;
184
+ case "disconnection":
185
+ if (!msg.clientUUID) {
186
+ throw new Error(`action [${msg.action}] without clientUUID`);
187
+ }
188
+ this.remoteClients.delete(msg.clientUUID);
189
+ break;
190
+ case "sendMessage": {
191
+ const data = String(msg.payload);
192
+ if (msg.clientUUID && this.isConnected(msg.clientUUID)) {
193
+ // write if local client
194
+ super.writeTo(msg.clientUUID, data);
195
+ }
196
+ else {
197
+ super.broadcast(data, msg.fromUUID);
198
+ }
199
+ break;
200
+ }
201
+ default:
202
+ throw new Error(`action [${msg.action}] not supported`);
203
+ }
204
+ }
205
+ });
206
+ }
207
+ }
208
+ async broadcast(payload, fromUUID) {
209
+ if (process.send) {
210
+ process.send({
211
+ type: ClusterWebSocketServerMessageType,
212
+ action: "sendMessage",
213
+ payload,
214
+ fromUUID
215
+ });
216
+ }
217
+ super.broadcast(payload, fromUUID);
218
+ }
219
+ async writeTo(clientUUID, payload) {
220
+ if (this.remoteClients.has(clientUUID)) {
221
+ // write to remote client via IPC
222
+ if (process.send) {
223
+ process.send({
224
+ type: ClusterWebSocketServerMessageType,
225
+ action: "sendMessage",
226
+ clientUUID,
227
+ payload
228
+ });
229
+ return;
230
+ }
231
+ }
232
+ else {
233
+ // write to local client
234
+ super.writeTo(clientUUID, payload);
235
+ }
236
+ }
237
+ }
238
+ /**
239
+ * Private
240
+ */
241
+ const OPCODES = { text: 0x01, close: 0x08 };
242
+ const GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
243
+ //Set-Cookie: <cookie-name>=<cookie-value>; Domain=<domain-value>; Secure; HttpOnly
244
+ function createUpgradeHeaders(acceptKey, extraHeaders) {
245
+ const acceptValue = createHash('sha1')
246
+ .update(acceptKey + GUID, 'binary')
247
+ .digest('base64');
248
+ let extra = extraHeaders && extraHeaders.length > 0 ? `\r\n${extraHeaders.map(h => `${h.name}: ${h.value}`).join("\r\n")}` : "";
249
+ return `HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: ${acceptValue}${extra}\r\n\r\n`;
250
+ }
251
+ function parseFrame(buffer) {
252
+ const firstByte = buffer.readUInt8(0);
253
+ const opCode = firstByte & 0b00001111; // get last 4 bits of a byte
254
+ if (opCode === OPCODES.close) {
255
+ //this.emit('close');
256
+ return null;
257
+ }
258
+ else if (opCode !== OPCODES.text) {
259
+ return;
260
+ }
261
+ const secondByte = buffer.readUInt8(1); // start with a payload length
262
+ let offset = 2;
263
+ let payloadLength = secondByte & 0b01111111; // get last 7 bits of a second byte
264
+ if (payloadLength === 126) {
265
+ offset += 2;
266
+ }
267
+ else if (payloadLength === 127) {
268
+ offset += 8;
269
+ }
270
+ const isMasked = Boolean((secondByte >>> 7) & 0x1); // get first bit of a second byte
271
+ if (isMasked) {
272
+ const maskingKey = buffer.readUInt32BE(offset); // read 4-byte mask
273
+ offset += 4;
274
+ const payload = buffer.subarray(offset);
275
+ const result = unmask(payload, maskingKey);
276
+ return result.toString('utf-8');
277
+ }
278
+ return buffer.subarray(offset).toString('utf-8');
279
+ }
280
+ function unmask(payload, maskingKey) {
281
+ const result = Buffer.alloc(payload.byteLength);
282
+ for (let i = 0; i < payload.byteLength; ++i) {
283
+ const j = i % 4;
284
+ const maskingKeyByteShift = j === 3 ? 0 : (3 - j) << 3;
285
+ const maskingKeyByte = (maskingKeyByteShift === 0 ? maskingKey : maskingKey >>> maskingKeyByteShift) & 0b11111111;
286
+ const transformedByte = maskingKeyByte ^ payload.readUInt8(i);
287
+ result.writeUInt8(transformedByte, i);
288
+ }
289
+ return result;
290
+ }
291
+ function createFrame(payload) {
292
+ const payloadByteLength = Buffer.byteLength(payload);
293
+ let payloadBytesOffset = 2;
294
+ let payloadLength = payloadByteLength;
295
+ if (payloadByteLength > 65535) { // length value cannot fit in 2 bytes
296
+ payloadBytesOffset += 8;
297
+ payloadLength = 127;
298
+ }
299
+ else if (payloadByteLength > 125) {
300
+ payloadBytesOffset += 2;
301
+ payloadLength = 126;
302
+ }
303
+ const buffer = Buffer.alloc(payloadBytesOffset + payloadByteLength);
304
+ // first byte
305
+ buffer.writeUInt8(0b10000001, 0); // [FIN (1), RSV1 (0), RSV2 (0), RSV3 (0), Opode (0x01 - text frame)]
306
+ buffer[1] = payloadLength; // second byte - actual payload size (if <= 125 bytes) or 126, or 127
307
+ if (payloadLength === 126) { // write actual payload length as a 16-bit unsigned integer
308
+ buffer.writeUInt16BE(payloadByteLength, 2);
309
+ }
310
+ else if (payloadByteLength === 127) { // write actual payload length as a 64-bit unsigned integer
311
+ buffer.writeBigUInt64BE(BigInt(payloadByteLength), 2);
312
+ }
313
+ buffer.write(payload, payloadBytesOffset);
314
+ return buffer;
315
+ }
316
+ //# sourceMappingURL=websocket.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"websocket.js","sourceRoot":"","sources":["../src/websocket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAKhD,MAAM,OAAO,eAAe;IAG1B,YAA4B,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;QAF3C,YAAO,GAAiC,IAAI,GAAG,EAAE,CAAC;QAGhE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEM,WAAW,CAAC,UAAkB;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,SAAS,CAAC;IACpD,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,QAAiB;QACpD,MAAM,EAAE,GAAG,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACvD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,UAAkB,EAAE,IAAY;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,SAAS,mBAAmB,CAAC,GAAW;oBACjF,IAAI,GAAG,EAAE,CAAC;wBACR,MAAM,CAAC,GAAG,CAAC,CAAC;oBACd,CAAC;yBAAM,CAAC;wBACN,OAAO,EAAE,CAAC;oBACZ,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,GAAY,EAAE,MAAc,EAAE,IAAY;QAC/D,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACnD,IACE,CAAC,MAAM;YACP,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7E,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,WAAW;YACnC,GAAG,CAAC,MAAM,KAAK,KAAK;YACpB,CAAC,SAAS,EACV,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACvC,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACpF,MAAM,IAAI,GAAG,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC;gBAC7C,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrC,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBACnD,WAAW,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAClC,CAAC;YACJ,MAAM,YAAY,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YACvF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBACrC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;oBAClG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;oBACrC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACjB,OAAO;gBACT,CAAC;gBACD,MAAM,MAAM,GAAoB;oBAC9B,IAAI;oBACJ,IAAI;oBACJ,GAAG;oBACH,MAAM;iBACP,CAAC;gBACF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBAEnD,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;gBAE5D,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;oBACjC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;oBAC/B,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;wBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;4BAC5B,MAAM,CAAC,GAAG,EAAE,CAAC;4BACb,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnB,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC;gCACH,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;4BACxC,CAAC;4BAAC,OAAO,CAAC,EAAE,CAAC;gCACX,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;4BAChC,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACpB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,mCAAmC,CAAC,CAAC;oBAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;wBAC9B,IAAI,CAAC;4BACH,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;wBACpC,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;wBAChC,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBAClD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC/B,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;oBAC9B,IAAI,CAAC;wBACH,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACpC,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;oBAChC,CAAC;gBACH,CAAC;gBACD,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,MAAM,iCAAiC,GAAG,+BAA+B,CAAC;AAU1E,MAAM,OAAO,sBAAuB,SAAQ,eAAe;IAGzD,YAAmB,OAA+B;QAChD,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;gBAChB,IACE,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS;oBACzC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,EAC1E,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC;qBAAM,CAAC;oBACN,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACzD,CAAC;YACH,CAAC;YACD,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE;gBACpB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,iCAAiC;wBACvC,MAAM,EAAE,YAAY;wBACpB,UAAU,EAAE,GAAG,CAAC,IAAI;qBACY,CAAC,CAAC;gBACtC,CAAC;gBACD,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;oBACzB,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YACD,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE;gBACpB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,iCAAiC;wBACvC,MAAM,EAAE,eAAe;wBACvB,UAAU,EAAE,GAAG,CAAC,IAAI;qBACY,CAAC,CAAC;gBACtC,CAAC;gBACD,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;oBACzB,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAtCE,kBAAa,GAAgB,IAAI,GAAG,EAAE,CAAC;QAuC5C,IAAI,sBAAsB,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QACD,sBAAsB,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,GAAG,GAAI,IAAsC,CAAC;gBACpD,IACE,GAAG;oBACH,GAAG,CAAC,IAAI,KAAK,iCAAiC;oBAC9C,GAAG,CAAC,MAAM,EAAE,CAAC;oBACb,uCAAuC;oBACvC,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC;wBACnB,KAAK,YAAY;4BACf,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;gCACpB,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,sBAAsB,CAAC,CAAC;4BAC/D,CAAC;4BACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;4BACvC,MAAM;wBACR,KAAK,eAAe;4BAClB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;gCACpB,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,sBAAsB,CAAC,CAAC;4BAC/D,CAAC;4BACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;4BAC1C,MAAM;wBACR,KAAK,aAAa,CAAC,CAAC,CAAC;4BACnB,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;4BACjC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gCACvD,wBAAwB;gCACxB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;4BACtC,CAAC;iCAAM,CAAC;gCACN,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;4BACtC,CAAC;4BACD,MAAM;wBACR,CAAC;wBACD;4BACE,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,iBAAiB,CAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,QAAiB;QACvD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,iCAAiC;gBACvC,MAAM,EAAE,aAAa;gBACrB,OAAO;gBACP,QAAQ;aACwB,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,UAAkB,EAAE,OAAe;QACtD,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,iCAAiC;YACjC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,iCAAiC;oBACvC,MAAM,EAAE,aAAa;oBACrB,UAAU;oBACV,OAAO;iBACyB,CAAC,CAAC;gBACpC,OAAO;YACT,CAAC;QACH,CAAC;aAAM,CAAC;YACN,wBAAwB;YACxB,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;CACF;AAED;;GAEG;AAGH,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAC5C,MAAM,IAAI,GAAW,sCAAsC,CAAC;AAC5D,mFAAmF;AACnF,SAAS,oBAAoB,CAAC,SAAiB,EAAE,YAG9C;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;SACnC,MAAM,CAAC,SAAS,GAAG,IAAI,EAAE,QAAQ,CAAC;SAClC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpB,IAAI,KAAK,GAAG,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAChI,OAAO,0GAA0G,WAAW,GAAG,KAAK,UAAU,CAAC;AACjJ,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAChC,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,4BAA4B;IAEnE,IAAI,MAAM,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;QAC7B,qBAAqB;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,MAAM,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,8BAA8B;IAEtE,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,aAAa,GAAG,UAAU,GAAG,UAAU,CAAC,CAAC,mCAAmC;IAEhF,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,CAAC;IACd,CAAC;SAAM,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC;QACjC,MAAM,IAAI,CAAC,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,iCAAiC;IAErF,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB;QACnE,MAAM,IAAI,CAAC,CAAC;QACZ,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,MAAM,CAAC,OAAe,EAAE,UAAkB;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAEhD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChB,MAAM,mBAAmB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,CAAC,mBAAmB,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,KAAK,mBAAmB,CAAC,GAAG,UAAU,CAAC;QAClH,MAAM,eAAe,GAAG,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,WAAW,CAAC,OAAe;IAElC,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,aAAa,GAAG,iBAAiB,CAAC;IAEtC,IAAI,iBAAiB,GAAG,KAAK,EAAE,CAAC,CAAC,qCAAqC;QACpE,kBAAkB,IAAI,CAAC,CAAC;QACxB,aAAa,GAAG,GAAG,CAAC;IACtB,CAAC;SAAM,IAAI,iBAAiB,GAAG,GAAG,EAAE,CAAC;QACnC,kBAAkB,IAAI,CAAC,CAAC;QACxB,aAAa,GAAG,GAAG,CAAC;IACtB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,kBAAkB,GAAG,iBAAiB,CAAC,CAAC;IAEpE,aAAa;IACb,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,qEAAqE;IAEvG,MAAM,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,qEAAqE;IAEhG,IAAI,aAAa,KAAK,GAAG,EAAE,CAAC,CAAC,2DAA2D;QACtF,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;SAAM,IAAI,iBAAiB,KAAK,GAAG,EAAE,CAAC,CAAC,2DAA2D;QACjG,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAC1C,OAAO,MAAM,CAAC;AAChB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@miqro/core",
3
- "version": "4.0.1",
3
+ "version": "5.0.2",
4
4
  "type": "module",
5
5
  "description": "",
6
6
  "main": "build/lib.js",
@@ -16,18 +16,18 @@
16
16
  "author": "claukers",
17
17
  "license": "ISC",
18
18
  "devDependencies": {
19
- "@miqro/test-http": "^0.1.1",
20
- "@types/cookie": "0.5.1",
19
+ "@miqro/test-http": "^0.1.2",
20
+ "@types/cookie": "0.6.0",
21
21
  "@types/node": "^20.4.2",
22
- "typescript": "5.2.2"
22
+ "typescript": "5.3.3"
23
23
  },
24
24
  "engines": {
25
25
  "node": ">=18.0.0",
26
26
  "npm": ">=6.0.0"
27
27
  },
28
28
  "dependencies": {
29
- "@miqro/parser": "^2.0.1",
30
- "@miqro/request": "^0.2.2",
31
- "cookie": "0.5.0"
29
+ "@miqro/parser": "^2.0.2",
30
+ "@miqro/request": "^0.2.3",
31
+ "cookie": "0.6.0"
32
32
  }
33
33
  }
package/src/app.ts CHANGED
@@ -1,35 +1,39 @@
1
1
  import { createServer, RequestListener, Server as HttpServer } from "http";
2
- import { randomUUID } from 'crypto'
3
- import { Context } from "./common/context.js";
4
- import { Router } from "./router.js";
5
- import { defaultAppErrorHandler, HTML_HEADERS, STATUS } from "./app-utils.js";
6
- import { RouterOptions } from "./common/router-types.js";
7
- import { OnUpgrade } from "./websocket/types.js";
8
- import { defaultLoggerFactory } from "./common/router-default-logger-factory.js";
2
+ import { Router } from "./middleware/router.js";
3
+ import { routerDefaultLoggerFactory, defaultAppErrorHandler, HTML_HEADERS, STATUS } from "./common.js";
4
+ import { Request, Response, RouterOptions } from "./types.js";
5
+ import { ServerOptions } from "http";
6
+ import { Duplex } from "stream";
9
7
 
10
- export interface ServerOptions extends RouterOptions {
11
- onUpgrade?: OnUpgrade;
8
+ export interface AppOptions extends RouterOptions {
9
+ onUpgrade?: (req: Request, socket: Duplex, head: Buffer) => Promise<void> | void;
10
+ serverOptions: ServerOptions<typeof Request, typeof Response>;
12
11
  }
13
12
 
14
13
  export class App extends Router {
15
- public readonly listener: RequestListener;
16
- public readonly httpServer: HttpServer;
14
+ public readonly listener: RequestListener<typeof Request, typeof Response>;
15
+ public readonly httpServer: HttpServer<typeof Request, typeof Response>;
17
16
 
18
- constructor(config?: ServerOptions) {
17
+ constructor(config?: AppOptions) {
19
18
  super(config);
19
+ if (config?.serverOptions) {
20
+ this.serverOptions = {
21
+ ...this.serverOptions,
22
+ ...config.serverOptions
23
+ };
24
+ }
20
25
  const errorHandler = defaultAppErrorHandler();
21
- const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : defaultLoggerFactory;
22
- this.listener = async (req, res) => {
26
+ const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : routerDefaultLoggerFactory;
27
+ this.listener = async (req: Request, res: Response) => {
23
28
  try {
24
- const uuid = randomUUID();
25
- const logger = loggerFactory(uuid, req);
29
+ const logger = loggerFactory(req.uuid, req);
26
30
  try {
27
- const ctx = new Context(uuid, req, res, logger);
31
+ req.logger = logger;
28
32
  try {
29
- ctx.logger.trace(`request received`);
30
- await this.run(ctx);
31
- if (!ctx.res.headersSent) {
32
- await ctx.end({
33
+ req.logger.trace(`request received for [%s]`, req.path);
34
+ await this.run(req, res);
35
+ if (!res.headersSent) {
36
+ await res.asyncEnd({
33
37
  headers: HTML_HEADERS,
34
38
  status: STATUS.NOT_FOUND,
35
39
  body: "NOT FOUND"
@@ -37,11 +41,11 @@ export class App extends Router {
37
41
  }
38
42
  } catch (e: any) {
39
43
  try {
40
- if (!ctx.res.headersSent) {
41
- await errorHandler(e, ctx);
42
- if (!ctx.res.headersSent) {
43
- ctx.logger.error(e);
44
- await ctx.end({
44
+ if (!res.headersSent) {
45
+ await errorHandler(e, req, res);
46
+ if (!res.headersSent) {
47
+ req.logger.error(e);
48
+ await res.asyncEnd({
45
49
  headers: HTML_HEADERS,
46
50
  status: STATUS.ERROR,
47
51
  body: "SERVER ERROR"
@@ -49,7 +53,7 @@ export class App extends Router {
49
53
  }
50
54
  }
51
55
  } catch (e3) {
52
- ctx.logger.error(e3);
56
+ req.logger.error(e3);
53
57
  }
54
58
  }
55
59
  } catch (errorCtx) {
@@ -59,17 +63,17 @@ export class App extends Router {
59
63
  console.error(loggerError);
60
64
  }
61
65
  };
62
- this.httpServer = createServer(this.listener);
66
+ this.httpServer = createServer<typeof Request, typeof Response>(this.serverOptions, this.listener);
63
67
  if (config?.onUpgrade) {
64
68
  this.httpServer.on("upgrade", config.onUpgrade);
65
69
  }
66
70
  }
67
71
 
68
- public listenSync(...args: any[]): HttpServer {
72
+ public listenSync(...args: any[]): HttpServer<typeof Request, typeof Response> {
69
73
  return this.httpServer.listen(...args)
70
74
  }
71
75
 
72
- public async listen(...args: any[]): Promise<HttpServer> {
76
+ public async listen(...args: any[]): Promise<HttpServer<typeof Request, typeof Response>> {
73
77
  return new Promise<HttpServer>((resolve, reject) => {
74
78
  try {
75
79
  this.httpServer.listen(...args, () => {
@@ -81,8 +85,8 @@ export class App extends Router {
81
85
  });
82
86
  }
83
87
 
84
- public async close(): Promise<HttpServer> {
85
- return new Promise<HttpServer>((resolve, reject) => {
88
+ public async close(): Promise<HttpServer<typeof Request, typeof Response>> {
89
+ return new Promise<HttpServer<typeof Request, typeof Response>>((resolve, reject) => {
86
90
  try {
87
91
  this.httpServer.close((err) => {
88
92
  if (err) {