@morojs/moro 1.6.2 → 1.6.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 (366) hide show
  1. package/dist/core/http/http-server.js +12 -9
  2. package/dist/core/http/http-server.js.map +1 -1
  3. package/dist/core/http/uws-http-server.js +1 -1
  4. package/dist/core/http/uws-http-server.js.map +1 -1
  5. package/dist/core/middleware/built-in/auth/core.d.ts +78 -0
  6. package/dist/core/middleware/built-in/auth/core.js +358 -0
  7. package/dist/core/middleware/built-in/auth/core.js.map +1 -0
  8. package/dist/core/middleware/built-in/{auth-helpers.js → auth/helpers.js} +1 -1
  9. package/dist/core/middleware/built-in/auth/helpers.js.map +1 -0
  10. package/dist/core/middleware/built-in/auth/hook.d.ts +30 -0
  11. package/dist/core/middleware/built-in/auth/hook.js +99 -0
  12. package/dist/core/middleware/built-in/auth/hook.js.map +1 -0
  13. package/dist/core/middleware/built-in/auth/index.d.ts +7 -0
  14. package/dist/core/middleware/built-in/auth/index.js +15 -0
  15. package/dist/core/middleware/built-in/auth/index.js.map +1 -0
  16. package/dist/core/middleware/built-in/{jwt-helpers.js → auth/jwt-helpers.js} +1 -1
  17. package/dist/core/middleware/built-in/auth/jwt-helpers.js.map +1 -0
  18. package/dist/core/middleware/built-in/auth/middleware.d.ts +23 -0
  19. package/dist/core/middleware/built-in/auth/middleware.js +71 -0
  20. package/dist/core/middleware/built-in/auth/middleware.js.map +1 -0
  21. package/dist/core/middleware/built-in/{auth-providers.d.ts → auth/providers.d.ts} +1 -1
  22. package/dist/core/middleware/built-in/{auth-providers.js → auth/providers.js} +1 -1
  23. package/dist/core/middleware/built-in/auth/providers.js.map +1 -0
  24. package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/file.d.ts +1 -1
  25. package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/file.js +1 -1
  26. package/dist/core/middleware/built-in/cache/adapters/cache/file.js.map +1 -0
  27. package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/index.d.ts +1 -1
  28. package/dist/core/middleware/built-in/cache/adapters/cache/index.js.map +1 -0
  29. package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/memory.d.ts +1 -1
  30. package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/memory.js +1 -1
  31. package/dist/core/middleware/built-in/cache/adapters/cache/memory.js.map +1 -0
  32. package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/redis.d.ts +1 -1
  33. package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/redis.js +2 -2
  34. package/dist/core/middleware/built-in/cache/adapters/cache/redis.js.map +1 -0
  35. package/dist/core/middleware/built-in/{adapters → cache/adapters}/index.d.ts +0 -2
  36. package/{src/core/middleware/built-in/adapters/index.ts → dist/core/middleware/built-in/cache/adapters/index.js} +1 -3
  37. package/dist/core/middleware/built-in/cache/adapters/index.js.map +1 -0
  38. package/dist/core/middleware/built-in/cache/core.d.ts +37 -0
  39. package/dist/core/middleware/built-in/cache/core.js +87 -0
  40. package/dist/core/middleware/built-in/cache/core.js.map +1 -0
  41. package/dist/core/middleware/built-in/cache/hook.d.ts +20 -0
  42. package/dist/core/middleware/built-in/{cache.js → cache/hook.js} +22 -5
  43. package/dist/core/middleware/built-in/cache/hook.js.map +1 -0
  44. package/dist/core/middleware/built-in/cache/index.d.ts +3 -0
  45. package/dist/core/middleware/built-in/cache/index.js +9 -0
  46. package/dist/core/middleware/built-in/cache/index.js.map +1 -0
  47. package/dist/core/middleware/built-in/cache/middleware.d.ts +17 -0
  48. package/dist/core/middleware/built-in/cache/middleware.js +44 -0
  49. package/dist/core/middleware/built-in/cache/middleware.js.map +1 -0
  50. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/azure.d.ts +1 -1
  51. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/azure.js +1 -1
  52. package/dist/core/middleware/built-in/cdn/adapters/cdn/azure.js.map +1 -0
  53. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/cloudflare.d.ts +1 -1
  54. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/cloudflare.js +1 -1
  55. package/dist/core/middleware/built-in/cdn/adapters/cdn/cloudflare.js.map +1 -0
  56. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/cloudfront.d.ts +1 -1
  57. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/cloudfront.js +2 -2
  58. package/dist/core/middleware/built-in/cdn/adapters/cdn/cloudfront.js.map +1 -0
  59. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/index.d.ts +1 -1
  60. package/dist/core/middleware/built-in/cdn/adapters/cdn/index.js.map +1 -0
  61. package/dist/core/middleware/built-in/cdn/adapters/index.d.ts +2 -0
  62. package/dist/core/middleware/built-in/{adapters → cdn/adapters}/index.js +0 -2
  63. package/dist/core/middleware/built-in/cdn/adapters/index.js.map +1 -0
  64. package/dist/core/middleware/built-in/cdn/core.d.ts +43 -0
  65. package/dist/core/middleware/built-in/cdn/core.js +144 -0
  66. package/dist/core/middleware/built-in/cdn/core.js.map +1 -0
  67. package/dist/core/middleware/built-in/cdn/hook.d.ts +22 -0
  68. package/dist/core/middleware/built-in/cdn/hook.js +70 -0
  69. package/dist/core/middleware/built-in/cdn/hook.js.map +1 -0
  70. package/dist/core/middleware/built-in/cdn/index.d.ts +5 -0
  71. package/dist/core/middleware/built-in/cdn/index.js +11 -0
  72. package/dist/core/middleware/built-in/cdn/index.js.map +1 -0
  73. package/dist/core/middleware/built-in/cdn/middleware.d.ts +21 -0
  74. package/dist/core/middleware/built-in/cdn/middleware.js +52 -0
  75. package/dist/core/middleware/built-in/cdn/middleware.js.map +1 -0
  76. package/dist/core/middleware/built-in/cookie/core.d.ts +37 -0
  77. package/dist/core/middleware/built-in/cookie/core.js +83 -0
  78. package/dist/core/middleware/built-in/cookie/core.js.map +1 -0
  79. package/dist/core/middleware/built-in/cookie/hook.d.ts +20 -0
  80. package/dist/core/middleware/built-in/cookie/hook.js +47 -0
  81. package/dist/core/middleware/built-in/cookie/hook.js.map +1 -0
  82. package/dist/core/middleware/built-in/cookie/index.d.ts +3 -0
  83. package/dist/core/middleware/built-in/cookie/index.js +9 -0
  84. package/dist/core/middleware/built-in/cookie/index.js.map +1 -0
  85. package/dist/core/middleware/built-in/cookie/middleware.d.ts +17 -0
  86. package/dist/core/middleware/built-in/cookie/middleware.js +36 -0
  87. package/dist/core/middleware/built-in/cookie/middleware.js.map +1 -0
  88. package/dist/core/middleware/built-in/cors/core.d.ts +23 -0
  89. package/dist/core/middleware/built-in/cors/core.js +51 -0
  90. package/dist/core/middleware/built-in/cors/core.js.map +1 -0
  91. package/dist/core/middleware/built-in/cors/hook.d.ts +17 -0
  92. package/dist/core/middleware/built-in/cors/hook.js +37 -0
  93. package/dist/core/middleware/built-in/cors/hook.js.map +1 -0
  94. package/dist/core/middleware/built-in/cors/index.d.ts +3 -0
  95. package/dist/core/middleware/built-in/cors/index.js +9 -0
  96. package/dist/core/middleware/built-in/cors/index.js.map +1 -0
  97. package/dist/core/middleware/built-in/cors/middleware.d.ts +16 -0
  98. package/dist/core/middleware/built-in/cors/middleware.js +22 -0
  99. package/dist/core/middleware/built-in/cors/middleware.js.map +1 -0
  100. package/dist/core/middleware/built-in/csp/core.d.ts +45 -0
  101. package/dist/core/middleware/built-in/csp/core.js +88 -0
  102. package/dist/core/middleware/built-in/csp/core.js.map +1 -0
  103. package/dist/core/middleware/built-in/csp/hook.d.ts +22 -0
  104. package/dist/core/middleware/built-in/csp/hook.js +47 -0
  105. package/dist/core/middleware/built-in/csp/hook.js.map +1 -0
  106. package/dist/core/middleware/built-in/csp/index.d.ts +3 -0
  107. package/dist/core/middleware/built-in/csp/index.js +9 -0
  108. package/dist/core/middleware/built-in/csp/index.js.map +1 -0
  109. package/dist/core/middleware/built-in/csp/middleware.d.ts +19 -0
  110. package/dist/core/middleware/built-in/csp/middleware.js +29 -0
  111. package/dist/core/middleware/built-in/csp/middleware.js.map +1 -0
  112. package/dist/core/middleware/built-in/csrf/core.d.ts +28 -0
  113. package/dist/core/middleware/built-in/csrf/core.js +69 -0
  114. package/dist/core/middleware/built-in/csrf/core.js.map +1 -0
  115. package/dist/core/middleware/built-in/csrf/hook.d.ts +17 -0
  116. package/dist/core/middleware/built-in/csrf/hook.js +45 -0
  117. package/dist/core/middleware/built-in/csrf/hook.js.map +1 -0
  118. package/dist/core/middleware/built-in/csrf/index.d.ts +3 -0
  119. package/dist/core/middleware/built-in/csrf/index.js +9 -0
  120. package/dist/core/middleware/built-in/csrf/index.js.map +1 -0
  121. package/dist/core/middleware/built-in/csrf/middleware.d.ts +16 -0
  122. package/dist/core/middleware/built-in/csrf/middleware.js +34 -0
  123. package/dist/core/middleware/built-in/csrf/middleware.js.map +1 -0
  124. package/dist/core/middleware/built-in/error-tracker/index.d.ts +1 -0
  125. package/dist/core/middleware/built-in/error-tracker/index.js +4 -0
  126. package/dist/core/middleware/built-in/error-tracker/index.js.map +1 -0
  127. package/dist/core/middleware/built-in/error-tracker/middleware.d.ts +12 -0
  128. package/dist/core/middleware/built-in/{error-tracker.js → error-tracker/middleware.js} +14 -3
  129. package/dist/core/middleware/built-in/error-tracker/middleware.js.map +1 -0
  130. package/dist/core/middleware/built-in/index.d.ts +25 -59
  131. package/dist/core/middleware/built-in/index.js +31 -31
  132. package/dist/core/middleware/built-in/index.js.map +1 -1
  133. package/dist/core/middleware/built-in/performance-monitor/index.d.ts +1 -0
  134. package/dist/core/middleware/built-in/performance-monitor/index.js +4 -0
  135. package/dist/core/middleware/built-in/performance-monitor/index.js.map +1 -0
  136. package/dist/core/middleware/built-in/performance-monitor/middleware.d.ts +12 -0
  137. package/dist/core/middleware/built-in/{performance-monitor.js → performance-monitor/middleware.js} +14 -3
  138. package/dist/core/middleware/built-in/performance-monitor/middleware.js.map +1 -0
  139. package/dist/core/middleware/built-in/rate-limit/core.d.ts +33 -0
  140. package/dist/core/middleware/built-in/rate-limit/core.js +86 -0
  141. package/dist/core/middleware/built-in/rate-limit/core.js.map +1 -0
  142. package/dist/core/middleware/built-in/rate-limit/hook.d.ts +20 -0
  143. package/dist/core/middleware/built-in/{rate-limit.js → rate-limit/hook.js} +22 -16
  144. package/dist/core/middleware/built-in/rate-limit/hook.js.map +1 -0
  145. package/dist/core/middleware/built-in/rate-limit/index.d.ts +3 -0
  146. package/dist/core/middleware/built-in/rate-limit/index.js +9 -0
  147. package/dist/core/middleware/built-in/rate-limit/index.js.map +1 -0
  148. package/dist/core/middleware/built-in/rate-limit/middleware.d.ts +16 -0
  149. package/dist/core/middleware/built-in/rate-limit/middleware.js +35 -0
  150. package/dist/core/middleware/built-in/rate-limit/middleware.js.map +1 -0
  151. package/dist/core/middleware/built-in/request-logger/index.d.ts +1 -0
  152. package/dist/core/middleware/built-in/request-logger/index.js +4 -0
  153. package/dist/core/middleware/built-in/request-logger/index.js.map +1 -0
  154. package/dist/core/middleware/built-in/request-logger/middleware.d.ts +12 -0
  155. package/dist/core/middleware/built-in/{request-logger.js → request-logger/middleware.js} +14 -3
  156. package/dist/core/middleware/built-in/request-logger/middleware.js.map +1 -0
  157. package/dist/core/middleware/built-in/session/core.d.ts +73 -0
  158. package/dist/core/middleware/built-in/session/core.js +227 -0
  159. package/dist/core/middleware/built-in/session/core.js.map +1 -0
  160. package/dist/core/middleware/built-in/session/hook.d.ts +17 -0
  161. package/dist/core/middleware/built-in/session/hook.js +53 -0
  162. package/dist/core/middleware/built-in/session/hook.js.map +1 -0
  163. package/dist/core/middleware/built-in/session/index.d.ts +3 -0
  164. package/dist/core/middleware/built-in/session/index.js +9 -0
  165. package/dist/core/middleware/built-in/session/index.js.map +1 -0
  166. package/dist/core/middleware/built-in/session/middleware.d.ts +17 -0
  167. package/dist/core/middleware/built-in/session/middleware.js +38 -0
  168. package/dist/core/middleware/built-in/session/middleware.js.map +1 -0
  169. package/dist/core/middleware/built-in/sse/core.d.ts +44 -0
  170. package/dist/core/middleware/built-in/sse/core.js +117 -0
  171. package/dist/core/middleware/built-in/sse/core.js.map +1 -0
  172. package/dist/core/middleware/built-in/sse/hook.d.ts +18 -0
  173. package/dist/core/middleware/built-in/sse/hook.js +60 -0
  174. package/dist/core/middleware/built-in/sse/hook.js.map +1 -0
  175. package/dist/core/middleware/built-in/sse/index.d.ts +3 -0
  176. package/dist/core/middleware/built-in/sse/index.js +9 -0
  177. package/dist/core/middleware/built-in/sse/index.js.map +1 -0
  178. package/dist/core/middleware/built-in/sse/middleware.d.ts +18 -0
  179. package/dist/core/middleware/built-in/sse/middleware.js +43 -0
  180. package/dist/core/middleware/built-in/sse/middleware.js.map +1 -0
  181. package/dist/core/middleware/built-in/validation/core.d.ts +23 -0
  182. package/dist/core/middleware/built-in/validation/core.js +93 -0
  183. package/dist/core/middleware/built-in/validation/core.js.map +1 -0
  184. package/dist/core/middleware/built-in/validation/hook.d.ts +13 -0
  185. package/dist/core/middleware/built-in/{validation.js → validation/hook.js} +14 -3
  186. package/dist/core/middleware/built-in/validation/hook.js.map +1 -0
  187. package/dist/core/middleware/built-in/validation/index.d.ts +3 -0
  188. package/dist/core/middleware/built-in/validation/index.js +9 -0
  189. package/dist/core/middleware/built-in/validation/index.js.map +1 -0
  190. package/dist/core/middleware/built-in/validation/middleware.d.ts +16 -0
  191. package/dist/core/middleware/built-in/validation/middleware.js +27 -0
  192. package/dist/core/middleware/built-in/validation/middleware.js.map +1 -0
  193. package/dist/core/middleware/index.js +6 -0
  194. package/dist/core/middleware/index.js.map +1 -1
  195. package/dist/core/routing/unified-router.d.ts +4 -20
  196. package/dist/core/routing/unified-router.js +61 -106
  197. package/dist/core/routing/unified-router.js.map +1 -1
  198. package/dist/index.d.ts +3 -2
  199. package/dist/index.js +3 -2
  200. package/dist/index.js.map +1 -1
  201. package/dist/moro.js +12 -18
  202. package/dist/moro.js.map +1 -1
  203. package/dist/types/hooks.d.ts +3 -0
  204. package/package.json +2 -6
  205. package/dist/core/middleware/built-in/adapters/cache/file.js.map +0 -1
  206. package/dist/core/middleware/built-in/adapters/cache/index.js.map +0 -1
  207. package/dist/core/middleware/built-in/adapters/cache/memory.js.map +0 -1
  208. package/dist/core/middleware/built-in/adapters/cache/redis.js.map +0 -1
  209. package/dist/core/middleware/built-in/adapters/cdn/azure.js.map +0 -1
  210. package/dist/core/middleware/built-in/adapters/cdn/cloudflare.js.map +0 -1
  211. package/dist/core/middleware/built-in/adapters/cdn/cloudfront.js.map +0 -1
  212. package/dist/core/middleware/built-in/adapters/cdn/index.js.map +0 -1
  213. package/dist/core/middleware/built-in/adapters/index.js.map +0 -1
  214. package/dist/core/middleware/built-in/auth-helpers.js.map +0 -1
  215. package/dist/core/middleware/built-in/auth-providers.js.map +0 -1
  216. package/dist/core/middleware/built-in/auth.d.ts +0 -30
  217. package/dist/core/middleware/built-in/auth.js +0 -348
  218. package/dist/core/middleware/built-in/auth.js.map +0 -1
  219. package/dist/core/middleware/built-in/cache.d.ts +0 -3
  220. package/dist/core/middleware/built-in/cache.js.map +0 -1
  221. package/dist/core/middleware/built-in/cdn.d.ts +0 -3
  222. package/dist/core/middleware/built-in/cdn.js +0 -109
  223. package/dist/core/middleware/built-in/cdn.js.map +0 -1
  224. package/dist/core/middleware/built-in/cookie.d.ts +0 -14
  225. package/dist/core/middleware/built-in/cookie.js +0 -64
  226. package/dist/core/middleware/built-in/cookie.js.map +0 -1
  227. package/dist/core/middleware/built-in/cors.d.ts +0 -2
  228. package/dist/core/middleware/built-in/cors.js +0 -25
  229. package/dist/core/middleware/built-in/cors.js.map +0 -1
  230. package/dist/core/middleware/built-in/csp.d.ts +0 -22
  231. package/dist/core/middleware/built-in/csp.js +0 -68
  232. package/dist/core/middleware/built-in/csp.js.map +0 -1
  233. package/dist/core/middleware/built-in/csrf.d.ts +0 -9
  234. package/dist/core/middleware/built-in/csrf.js +0 -60
  235. package/dist/core/middleware/built-in/csrf.js.map +0 -1
  236. package/dist/core/middleware/built-in/error-tracker.d.ts +0 -1
  237. package/dist/core/middleware/built-in/error-tracker.js.map +0 -1
  238. package/dist/core/middleware/built-in/jwt-helpers.js.map +0 -1
  239. package/dist/core/middleware/built-in/performance-monitor.d.ts +0 -1
  240. package/dist/core/middleware/built-in/performance-monitor.js.map +0 -1
  241. package/dist/core/middleware/built-in/rate-limit.d.ts +0 -6
  242. package/dist/core/middleware/built-in/rate-limit.js.map +0 -1
  243. package/dist/core/middleware/built-in/request-logger.d.ts +0 -1
  244. package/dist/core/middleware/built-in/request-logger.js.map +0 -1
  245. package/dist/core/middleware/built-in/session.d.ts +0 -41
  246. package/dist/core/middleware/built-in/session.js +0 -205
  247. package/dist/core/middleware/built-in/session.js.map +0 -1
  248. package/dist/core/middleware/built-in/sse.d.ts +0 -6
  249. package/dist/core/middleware/built-in/sse.js +0 -69
  250. package/dist/core/middleware/built-in/sse.js.map +0 -1
  251. package/dist/core/middleware/built-in/validation.d.ts +0 -2
  252. package/dist/core/middleware/built-in/validation.js.map +0 -1
  253. package/jest.config.mjs +0 -41
  254. package/src/core/auth/README.md +0 -339
  255. package/src/core/auth/morojs-adapter.ts +0 -415
  256. package/src/core/config/config-manager.ts +0 -133
  257. package/src/core/config/config-sources.ts +0 -600
  258. package/src/core/config/config-validator.ts +0 -1116
  259. package/src/core/config/file-loader.ts +0 -150
  260. package/src/core/config/index.ts +0 -109
  261. package/src/core/config/schema.ts +0 -164
  262. package/src/core/config/utils.ts +0 -244
  263. package/src/core/database/README.md +0 -238
  264. package/src/core/database/adapters/drizzle.ts +0 -415
  265. package/src/core/database/adapters/index.ts +0 -42
  266. package/src/core/database/adapters/mongodb.ts +0 -317
  267. package/src/core/database/adapters/mysql.ts +0 -235
  268. package/src/core/database/adapters/postgresql.ts +0 -226
  269. package/src/core/database/adapters/redis.ts +0 -379
  270. package/src/core/database/adapters/sqlite.ts +0 -263
  271. package/src/core/database/index.ts +0 -3
  272. package/src/core/docs/index.ts +0 -231
  273. package/src/core/docs/openapi-generator.ts +0 -576
  274. package/src/core/docs/schema-to-openapi.ts +0 -145
  275. package/src/core/docs/simple-docs.ts +0 -295
  276. package/src/core/docs/swagger-ui.ts +0 -354
  277. package/src/core/docs/zod-to-openapi.ts +0 -532
  278. package/src/core/events/event-bus.ts +0 -231
  279. package/src/core/events/index.ts +0 -12
  280. package/src/core/framework.ts +0 -885
  281. package/src/core/http/http-server.ts +0 -1847
  282. package/src/core/http/index.ts +0 -7
  283. package/src/core/http/uws-http-server.ts +0 -591
  284. package/src/core/logger/filters.ts +0 -153
  285. package/src/core/logger/index.ts +0 -21
  286. package/src/core/logger/logger.ts +0 -1033
  287. package/src/core/logger/outputs.ts +0 -132
  288. package/src/core/middleware/built-in/adapters/cache/file.ts +0 -104
  289. package/src/core/middleware/built-in/adapters/cache/index.ts +0 -23
  290. package/src/core/middleware/built-in/adapters/cache/memory.ts +0 -73
  291. package/src/core/middleware/built-in/adapters/cache/redis.ts +0 -114
  292. package/src/core/middleware/built-in/adapters/cdn/azure.ts +0 -60
  293. package/src/core/middleware/built-in/adapters/cdn/cloudflare.ts +0 -83
  294. package/src/core/middleware/built-in/adapters/cdn/cloudfront.ts +0 -94
  295. package/src/core/middleware/built-in/adapters/cdn/index.ts +0 -23
  296. package/src/core/middleware/built-in/auth-helpers.ts +0 -401
  297. package/src/core/middleware/built-in/auth-providers.ts +0 -480
  298. package/src/core/middleware/built-in/auth.ts +0 -410
  299. package/src/core/middleware/built-in/cache.ts +0 -213
  300. package/src/core/middleware/built-in/cdn.ts +0 -124
  301. package/src/core/middleware/built-in/cookie.ts +0 -85
  302. package/src/core/middleware/built-in/cors.ts +0 -38
  303. package/src/core/middleware/built-in/csp.ts +0 -101
  304. package/src/core/middleware/built-in/csrf.ts +0 -82
  305. package/src/core/middleware/built-in/error-tracker.ts +0 -16
  306. package/src/core/middleware/built-in/index.ts +0 -87
  307. package/src/core/middleware/built-in/jwt-helpers.ts +0 -243
  308. package/src/core/middleware/built-in/performance-monitor.ts +0 -25
  309. package/src/core/middleware/built-in/rate-limit.ts +0 -60
  310. package/src/core/middleware/built-in/request-logger.ts +0 -16
  311. package/src/core/middleware/built-in/session.ts +0 -287
  312. package/src/core/middleware/built-in/sse.ts +0 -88
  313. package/src/core/middleware/built-in/validation.ts +0 -33
  314. package/src/core/middleware/index.ts +0 -177
  315. package/src/core/modules/auto-discovery.ts +0 -726
  316. package/src/core/modules/index.ts +0 -3
  317. package/src/core/modules/modules.ts +0 -135
  318. package/src/core/networking/adapters/index.ts +0 -17
  319. package/src/core/networking/adapters/socketio-adapter.ts +0 -254
  320. package/src/core/networking/adapters/uws-adapter.ts +0 -619
  321. package/src/core/networking/adapters/ws-adapter.ts +0 -429
  322. package/src/core/networking/index.ts +0 -4
  323. package/src/core/networking/service-discovery.ts +0 -303
  324. package/src/core/networking/websocket-adapter.ts +0 -217
  325. package/src/core/networking/websocket-manager.ts +0 -308
  326. package/src/core/pooling/object-pool-manager.ts +0 -630
  327. package/src/core/routing/app-integration.ts +0 -164
  328. package/src/core/routing/index.ts +0 -261
  329. package/src/core/routing/path-matcher.ts +0 -222
  330. package/src/core/routing/router.ts +0 -97
  331. package/src/core/routing/unified-router.ts +0 -870
  332. package/src/core/runtime/aws-lambda-adapter.ts +0 -147
  333. package/src/core/runtime/base-adapter.ts +0 -130
  334. package/src/core/runtime/cloudflare-workers-adapter.ts +0 -152
  335. package/src/core/runtime/index.ts +0 -62
  336. package/src/core/runtime/node-adapter.ts +0 -202
  337. package/src/core/runtime/vercel-edge-adapter.ts +0 -114
  338. package/src/core/utilities/circuit-breaker.ts +0 -46
  339. package/src/core/utilities/container.ts +0 -736
  340. package/src/core/utilities/hooks.ts +0 -142
  341. package/src/core/utilities/index.ts +0 -17
  342. package/src/core/utilities/package-utils.ts +0 -59
  343. package/src/core/validation/adapters.ts +0 -147
  344. package/src/core/validation/index.ts +0 -258
  345. package/src/core/validation/schema-interface.ts +0 -100
  346. package/src/index.ts +0 -233
  347. package/src/moro.ts +0 -1728
  348. package/src/types/auth.ts +0 -440
  349. package/src/types/cache.ts +0 -38
  350. package/src/types/cdn.ts +0 -22
  351. package/src/types/config.ts +0 -229
  352. package/src/types/core.ts +0 -58
  353. package/src/types/database.ts +0 -32
  354. package/src/types/discovery.ts +0 -7
  355. package/src/types/events.ts +0 -82
  356. package/src/types/hooks.ts +0 -47
  357. package/src/types/http.ts +0 -89
  358. package/src/types/logger.ts +0 -102
  359. package/src/types/module.ts +0 -99
  360. package/src/types/runtime.ts +0 -76
  361. package/src/types/session.ts +0 -89
  362. package/tsconfig.json +0 -23
  363. /package/dist/core/middleware/built-in/{auth-helpers.d.ts → auth/helpers.d.ts} +0 -0
  364. /package/dist/core/middleware/built-in/{jwt-helpers.d.ts → auth/jwt-helpers.d.ts} +0 -0
  365. /package/dist/core/middleware/built-in/{adapters → cache/adapters}/cache/index.js +0 -0
  366. /package/dist/core/middleware/built-in/{adapters → cdn/adapters}/cdn/index.js +0 -0
@@ -1,7 +0,0 @@
1
- // HTTP System - Centralized Exports
2
- export { MoroHttpServer, middleware } from './http-server.js';
3
- export { UWebSocketsHttpServer } from './uws-http-server.js';
4
- export { Router } from '../routing/router.js';
5
-
6
- // Type exports
7
- export type { HttpRequest, HttpResponse, HttpHandler, Middleware } from '../../types/http.js';
@@ -1,591 +0,0 @@
1
- // uWebSockets.js HTTP Server Implementation for Moro Framework
2
- // Provides high-performance HTTP and WebSocket server using uWebSockets.js
3
-
4
- import cluster from 'cluster';
5
- import { createFrameworkLogger } from '../logger/index.js';
6
- import { ObjectPoolManager } from '../pooling/object-pool-manager.js';
7
- import {
8
- HttpRequest,
9
- HttpResponse,
10
- HttpHandler,
11
- Middleware,
12
- RouteEntry,
13
- } from '../../types/http.js';
14
-
15
- /**
16
- * uWebSockets HTTP Server Adapter
17
- * Bridges uWebSockets.js with Moro's HTTP abstractions
18
- */
19
- export class UWebSocketsHttpServer {
20
- private app: any; // uWebSockets app instance
21
- private uws: any; // uWebSockets module reference (stored to avoid re-importing)
22
- private listenSocket: any; // uWebSockets listen socket
23
- private globalMiddleware: Middleware[] = [];
24
- private logger = createFrameworkLogger('UWSHttpServer');
25
- private hookManager: any;
26
- private requestCounter = 0;
27
- private requestTrackingEnabled = true; // Generate request IDs
28
- private isListening = false;
29
- private port?: number;
30
- private host?: string;
31
- private initPromise: Promise<void>;
32
-
33
- // Performance optimizations - shared object pooling
34
- private poolManager = ObjectPoolManager.getInstance();
35
-
36
- // String interning for common values
37
- private static readonly INTERNED_METHODS = new Map([
38
- ['get', 'GET'],
39
- ['post', 'POST'],
40
- ['put', 'PUT'],
41
- ['delete', 'DELETE'],
42
- ['patch', 'PATCH'],
43
- ['head', 'HEAD'],
44
- ['options', 'OPTIONS'],
45
- ]);
46
-
47
- // Pre-compiled response buffers
48
- private static readonly RESPONSE_BUFFERS = {
49
- notFound: Buffer.from('{"success":false,"error":"Not found"}'),
50
- serverError: Buffer.from('{"success":false,"error":"Internal server error"}'),
51
- };
52
-
53
- constructor(
54
- options: {
55
- ssl?: { key_file_name?: string; cert_file_name?: string; passphrase?: string };
56
- } = {}
57
- ) {
58
- this.initPromise = this.initialize(options);
59
- }
60
-
61
- private async initialize(options: {
62
- ssl?: { key_file_name?: string; cert_file_name?: string; passphrase?: string };
63
- }): Promise<void> {
64
- try {
65
- // Lazy load uWebSockets.js - only when explicitly configured
66
- // This ensures it's an optional dependency with graceful fallback
67
- const uwsModule = await import('uWebSockets.js');
68
- this.uws = uwsModule.default || uwsModule;
69
-
70
- if (options.ssl && options.ssl.key_file_name && options.ssl.cert_file_name) {
71
- this.app = this.uws.SSLApp({
72
- key_file_name: options.ssl.key_file_name,
73
- cert_file_name: options.ssl.cert_file_name,
74
- passphrase: options.ssl.passphrase,
75
- });
76
- this.logger.info('uWebSockets SSL/TLS HTTP server created', 'Init');
77
- } else {
78
- this.app = this.uws.App();
79
- this.logger.info('uWebSockets HTTP server created', 'Init');
80
- }
81
-
82
- // Setup generic route handler for all HTTP methods and paths
83
- this.setupRouteHandlers();
84
- } catch (error) {
85
- // Log helpful error message with installation instructions
86
- this.logger.error(
87
- 'Failed to load uWebSockets.js (optional dependency)\n' +
88
- 'To use uWebSockets, install it with:\n' +
89
- ' npm install --save-dev github:uNetworking/uWebSockets.js#v20.52.0\n' +
90
- 'Or set useUWebSockets: false in your config to use the standard HTTP server.\n' +
91
- 'Error: ' +
92
- (error instanceof Error ? error.message : String(error)),
93
- 'Init'
94
- );
95
- throw error; // Re-throw so framework.ts can catch and fallback
96
- }
97
- }
98
-
99
- private setupRouteHandlers(): void {
100
- // Handle all HTTP methods through catchall
101
- // All requests go through middleware chain (includes UnifiedRouter)
102
- this.app.any('/*', (res: any, req: any) => {
103
- this.handleRequest(req, res);
104
- });
105
- }
106
-
107
- private async handleRequest(req: any, res: any): Promise<void> {
108
- this.requestCounter++;
109
-
110
- // Declare outside try block for cleanup in finally
111
- let httpReq: any;
112
- let httpRes: any;
113
-
114
- try {
115
- // Create Moro-compatible request object
116
- httpReq = this.createMoroRequest(req, res);
117
- httpRes = this.createMoroResponse(req, res);
118
-
119
- // Parse body only if there's actually a body (check content-length)
120
- const method = req.getMethod().toUpperCase();
121
- const contentLength = req.getHeader('content-length');
122
- if (
123
- (method === 'POST' || method === 'PUT' || method === 'PATCH') &&
124
- contentLength &&
125
- parseInt(contentLength) > 0
126
- ) {
127
- await this.readBody(res, httpReq);
128
- }
129
-
130
- // Execute hooks before request processing
131
- if (this.hookManager) {
132
- await this.hookManager.execute('request', {
133
- request: httpReq,
134
- response: httpRes,
135
- });
136
- }
137
-
138
- // Execute middleware chain (includes UnifiedRouter for routing)
139
- // The UnifiedRouter will handle route matching, params extraction, and handler execution
140
- if (this.globalMiddleware.length > 0) {
141
- await this.executeMiddleware(this.globalMiddleware, httpReq, httpRes);
142
- } else {
143
- // No middleware - send 404 (router middleware should be present)
144
- if (!httpRes.headersSent) {
145
- httpRes.statusCode = 404;
146
- httpRes.setHeader('Content-Type', 'application/json');
147
- httpRes.end('{"success":false,"error":"Not found"}');
148
- }
149
- }
150
- } catch (error) {
151
- this.logger.error(
152
- `Request handling error: ${error instanceof Error ? error.message : String(error)}`,
153
- 'RequestError'
154
- );
155
-
156
- // Send error response if not already sent
157
- if (!res.aborted) {
158
- try {
159
- res.cork(() => {
160
- res.writeStatus('500 Internal Server Error');
161
- res.writeHeader('Content-Type', 'application/json');
162
- res.end('{"success":false,"error":"Internal server error"}');
163
- });
164
- } catch (writeError) {
165
- this.logger.error('Failed to send error response', 'ResponseError');
166
- }
167
- }
168
- } finally {
169
- // CRITICAL: Release pooled objects back to pool
170
- if (httpReq) {
171
- const pooledQuery = (httpReq as any)._pooledQuery;
172
- const pooledHeaders = (httpReq as any)._pooledHeaders;
173
-
174
- if (pooledQuery && Object.keys(pooledQuery).length > 0) {
175
- this.poolManager.releaseQuery(pooledQuery);
176
- }
177
-
178
- if (pooledHeaders && Object.keys(pooledHeaders).length > 0) {
179
- this.poolManager.releaseHeaders(pooledHeaders);
180
- }
181
- }
182
- }
183
- }
184
-
185
- private createMoroRequest(req: any, res: any): HttpRequest {
186
- const url = req.getUrl();
187
- const queryString = req.getQuery();
188
- const methodRaw = req.getMethod();
189
-
190
- // Use interned method string if available
191
- const method = UWebSocketsHttpServer.INTERNED_METHODS.get(methodRaw) || methodRaw.toUpperCase();
192
-
193
- // Optimized query parsing with pooled object
194
- let queryParams: Record<string, string>;
195
- if (queryString) {
196
- queryParams = this.poolManager.acquireQuery();
197
- // Query parsing without URLSearchParams overhead
198
- const pairs = queryString.split('&');
199
- for (let i = 0; i < pairs.length; i++) {
200
- const pair = pairs[i];
201
- const eqIdx = pair.indexOf('=');
202
- if (eqIdx > 0) {
203
- const key = pair.substring(0, eqIdx);
204
- const value = pair.substring(eqIdx + 1);
205
- queryParams[decodeURIComponent(key)] = decodeURIComponent(value);
206
- }
207
- }
208
- } else {
209
- queryParams = {};
210
- }
211
-
212
- // Optimized header parsing with pooled object
213
- const headers = this.poolManager.acquireHeaders();
214
- req.forEach((key: string, value: string) => {
215
- const lowerKey = key.toLowerCase();
216
- headers[lowerKey] = value;
217
- });
218
-
219
- const httpReq = {
220
- method,
221
- path: url,
222
- url: url,
223
- query: queryParams,
224
- params: {}, // Will be filled by route matching
225
- headers,
226
- body: null,
227
- ip: '', // Lazy - only compute if accessed
228
- requestId: this.requestTrackingEnabled ? this.poolManager.generateRequestId() : '', // ID generation (if enabled)
229
- } as HttpRequest;
230
-
231
- // Store pooled objects for cleanup
232
- (httpReq as any)._pooledQuery = queryParams;
233
- (httpReq as any)._pooledHeaders = headers;
234
-
235
- return httpReq;
236
- }
237
-
238
- private createMoroResponse(req: any, res: any): HttpResponse {
239
- let headersSent = false;
240
- let statusCode = 200;
241
- const responseHeaders: Record<string, string | string[]> = {};
242
- //eslint-disable-next-line @typescript-eslint/no-this-alias
243
- const self = this;
244
-
245
- const httpRes = {
246
- statusCode,
247
- get headersSent() {
248
- return headersSent;
249
- },
250
-
251
- status(code: number) {
252
- statusCode = code;
253
- (httpRes as any).statusCode = code;
254
- return httpRes as HttpResponse;
255
- },
256
-
257
- setHeader(name: string, value: string | string[]) {
258
- responseHeaders[name.toLowerCase()] = value;
259
- return httpRes as HttpResponse;
260
- },
261
-
262
- getHeader(name: string) {
263
- return responseHeaders[name.toLowerCase()];
264
- },
265
-
266
- removeHeader(name: string) {
267
- delete responseHeaders[name.toLowerCase()];
268
- return httpRes as HttpResponse;
269
- },
270
-
271
- json(data: any) {
272
- if (headersSent || res.aborted) return;
273
-
274
- const body = JSON.stringify(data);
275
- responseHeaders['content-type'] = 'application/json';
276
-
277
- try {
278
- res.cork(() => {
279
- res.writeStatus(`${statusCode} OK`);
280
- Object.entries(responseHeaders).forEach(([key, value]) => {
281
- res.writeHeader(key, Array.isArray(value) ? value.join(', ') : String(value));
282
- });
283
- res.end(body);
284
- });
285
- headersSent = true;
286
- } catch (error) {
287
- self.logger.error('Failed to send JSON response', 'ResponseError');
288
- }
289
- },
290
-
291
- send(data: string | Buffer) {
292
- if (headersSent || res.aborted) return;
293
-
294
- const body = typeof data === 'string' ? data : data.toString();
295
-
296
- try {
297
- res.cork(() => {
298
- res.writeStatus(`${statusCode} OK`);
299
- Object.entries(responseHeaders).forEach(([key, value]) => {
300
- res.writeHeader(key, Array.isArray(value) ? value.join(', ') : String(value));
301
- });
302
- res.end(body);
303
- });
304
- headersSent = true;
305
- } catch (error) {
306
- self.logger.error('Failed to send response', 'ResponseError');
307
- }
308
- },
309
-
310
- end(data?: any, encoding?: any, callback?: any) {
311
- if (headersSent || res.aborted) {
312
- if (typeof callback === 'function') callback();
313
- return httpRes as HttpResponse;
314
- }
315
-
316
- try {
317
- res.cork(() => {
318
- res.writeStatus(`${statusCode} OK`);
319
- Object.entries(responseHeaders).forEach(([key, value]) => {
320
- res.writeHeader(key, Array.isArray(value) ? value.join(', ') : String(value));
321
- });
322
- res.end(data || '');
323
- });
324
- headersSent = true;
325
- if (typeof callback === 'function') callback();
326
- } catch (error) {
327
- self.logger.error('Failed to end response', 'ResponseError');
328
- if (typeof callback === 'function') callback();
329
- }
330
-
331
- return httpRes as HttpResponse;
332
- },
333
-
334
- redirect(url: string, code?: number) {
335
- if (headersSent || res.aborted) return;
336
-
337
- const redirectCode = code || 302;
338
- statusCode = redirectCode;
339
-
340
- try {
341
- res.cork(() => {
342
- res.writeStatus(`${redirectCode} Found`);
343
- res.writeHeader('Location', url);
344
- res.end();
345
- });
346
- headersSent = true;
347
- } catch (error) {
348
- self.logger.error('Failed to send redirect', 'ResponseError');
349
- }
350
- },
351
-
352
- // EventEmitter compatibility - stub implementations for middleware
353
- on(event: string, callback: Function) {
354
- // uWebSockets doesn't use events like Node.js, but middleware might try to listen
355
- // Only implement 'finish' and 'close' events as stubs
356
- return httpRes;
357
- },
358
-
359
- once(event: string, callback: Function) {
360
- return httpRes;
361
- },
362
-
363
- emit(event: string, ...args: any[]) {
364
- return true;
365
- },
366
-
367
- removeListener(event: string, callback: Function) {
368
- return httpRes;
369
- },
370
-
371
- cookie(name: string, value: string, options?: any) {
372
- let cookie = `${name}=${value}`;
373
-
374
- if (options) {
375
- if (options.maxAge) cookie += `; Max-Age=${options.maxAge}`;
376
- if (options.domain) cookie += `; Domain=${options.domain}`;
377
- if (options.path) cookie += `; Path=${options.path}`;
378
- if (options.secure) cookie += '; Secure';
379
- if (options.httpOnly) cookie += '; HttpOnly';
380
- if (options.sameSite) cookie += `; SameSite=${options.sameSite}`;
381
- }
382
-
383
- const existing = responseHeaders['set-cookie'];
384
- if (existing) {
385
- if (Array.isArray(existing)) {
386
- responseHeaders['set-cookie'] = [...existing, cookie];
387
- } else {
388
- responseHeaders['set-cookie'] = [existing as string, cookie];
389
- }
390
- } else {
391
- responseHeaders['set-cookie'] = cookie;
392
- }
393
-
394
- return httpRes as HttpResponse;
395
- },
396
- } as any;
397
-
398
- return httpRes as HttpResponse;
399
- }
400
-
401
- private async readBody(res: any, httpReq: HttpRequest): Promise<void> {
402
- return new Promise((resolve, reject) => {
403
- let buffer: Buffer;
404
-
405
- res.onData((chunk: ArrayBuffer, isLast: boolean) => {
406
- const chunkBuffer = Buffer.from(chunk);
407
-
408
- if (isLast) {
409
- if (buffer) {
410
- buffer = Buffer.concat([buffer, chunkBuffer]);
411
- } else {
412
- buffer = chunkBuffer;
413
- }
414
-
415
- try {
416
- const contentType = httpReq.headers['content-type'] || '';
417
-
418
- if (contentType.includes('application/json')) {
419
- httpReq.body = JSON.parse(buffer.toString('utf-8'));
420
- } else if (contentType.includes('application/x-www-form-urlencoded')) {
421
- const params = new URLSearchParams(buffer.toString('utf-8'));
422
- const body: Record<string, any> = {};
423
- params.forEach((value, key) => {
424
- body[key] = value;
425
- });
426
- httpReq.body = body;
427
- } else {
428
- httpReq.body = buffer.toString('utf-8');
429
- }
430
-
431
- resolve();
432
- } catch (error) {
433
- this.logger.error('Failed to parse request body', 'BodyParseError');
434
- httpReq.body = null;
435
- resolve();
436
- }
437
- } else {
438
- if (buffer) {
439
- buffer = Buffer.concat([buffer, chunkBuffer]);
440
- } else {
441
- buffer = chunkBuffer;
442
- }
443
- }
444
- });
445
-
446
- res.onAborted(() => {
447
- this.logger.debug('Request aborted', 'RequestAborted');
448
- resolve();
449
- });
450
- });
451
- }
452
-
453
- private async executeMiddleware(
454
- middleware: Middleware[],
455
- req: HttpRequest,
456
- res: HttpResponse
457
- ): Promise<void> {
458
- for (const mw of middleware) {
459
- if (res.headersSent) break;
460
-
461
- await new Promise<void>((resolve, reject) => {
462
- try {
463
- const result = mw(req, res, (err?: Error) => {
464
- if (err) reject(err);
465
- else resolve();
466
- });
467
-
468
- // Handle async middleware
469
- if (result && typeof result.then === 'function') {
470
- result.then(() => resolve()).catch(reject);
471
- }
472
- } catch (error) {
473
- reject(error);
474
- }
475
- });
476
- }
477
- }
478
-
479
- // Public API - matches MoroHttpServer interface
480
-
481
- use(middleware: Middleware): void {
482
- this.globalMiddleware.push(middleware);
483
- }
484
-
485
- // Configure request tracking (ID generation)
486
- setRequestTracking(enabled: boolean): void {
487
- this.requestTrackingEnabled = enabled;
488
- }
489
-
490
- // Note: Route registration methods (get, post, etc.) are not used by uWebSockets adapter
491
- // All routing is handled by UnifiedRouter through the middleware chain
492
-
493
- setHookManager(hookManager: any): void {
494
- this.hookManager = hookManager;
495
- }
496
-
497
- configurePerformance(config: any): void {
498
- // uWebSockets is already highly optimized
499
- // This method exists for API compatibility
500
- this.logger.debug('Performance configuration noted (uWebSockets is pre-optimized)', 'Config');
501
- }
502
-
503
- listen(port: number, callback?: () => void): void;
504
- listen(port: number, host: string, callback?: () => void): void;
505
- listen(port: number, hostOrCallback?: string | (() => void), callback?: () => void): void {
506
- // Wrap in async to await init
507
- this.initPromise
508
- .then(() => {
509
- if (this.isListening) {
510
- this.logger.warn('Server is already listening', 'Listen');
511
- return;
512
- }
513
-
514
- const host = typeof hostOrCallback === 'string' ? hostOrCallback : '0.0.0.0';
515
- const cb = typeof hostOrCallback === 'function' ? hostOrCallback : callback;
516
-
517
- this.port = port;
518
- this.host = host;
519
-
520
- // Check if we're in a cluster environment
521
- const isClusterWorker = cluster.isWorker;
522
- const isClusterPrimary = cluster.isPrimary;
523
-
524
- // ALWAYS use LIBUS_LISTEN_EXCLUSIVE_PORT when clustering
525
- // This enables SO_REUSEPORT at the OS level, allowing multiple processes to bind to the same port
526
- // NOTE: uWebSockets.js API doesn't have listen(host, port, options, cb)
527
- // We must use listen(port, options, cb) which binds to 0.0.0.0
528
- const listenOptions = 1; // ALWAYS use LIBUS_LISTEN_EXCLUSIVE_PORT for clustering support
529
-
530
- this.app.listen(port, listenOptions, (token: any) => {
531
- if (token) {
532
- this.listenSocket = token;
533
- this.isListening = true;
534
- const clusterInfo = isClusterWorker ? ` (worker ${process.pid})` : '';
535
- this.logger.info(
536
- `uWebSockets HTTP server listening on 0.0.0.0:${port}${clusterInfo}`,
537
- 'Listen'
538
- );
539
- if (cb) cb();
540
- } else {
541
- const clusterInfo = isClusterWorker ? ` (worker ${process.pid})` : '';
542
- this.logger.error(`Failed to listen on port ${port}${clusterInfo}`, 'Listen');
543
- // Don't throw in cluster workers - let them fail gracefully
544
- if (!isClusterWorker) {
545
- throw new Error(`Failed to bind to port ${port}`);
546
- }
547
- }
548
- });
549
- })
550
- .catch(error => {
551
- this.logger.error('Failed to initialize server before listen', 'Listen', {
552
- error: error instanceof Error ? error.message : String(error),
553
- });
554
- });
555
- }
556
-
557
- async close(callback?: () => void): Promise<void> {
558
- if (!this.isListening) {
559
- if (callback) callback();
560
- return;
561
- }
562
-
563
- try {
564
- // Use stored module reference instead of re-importing
565
- if (this.listenSocket && this.uws) {
566
- this.uws.us_listen_socket_close(this.listenSocket);
567
- this.listenSocket = null;
568
- this.isListening = false;
569
- this.logger.info('uWebSockets HTTP server closed', 'Close');
570
- }
571
- if (callback) callback();
572
- } catch (error) {
573
- this.logger.error('Error closing server', 'Close');
574
- if (callback) callback();
575
- }
576
- }
577
-
578
- getServer(): any {
579
- // Return the uWebSockets app for direct access if needed
580
- return this.app;
581
- }
582
-
583
- getApp(): any {
584
- return this.app;
585
- }
586
-
587
- forceCleanup(): void {
588
- // Cleanup method for compatibility
589
- this.logger.debug('Force cleanup called', 'Cleanup');
590
- }
591
- }