@budibase/backend-core 2.5.9 → 2.5.10-alpha.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 (438) hide show
  1. package/dist/package.json +13 -10
  2. package/dist/src/configs/configs.d.ts +2 -1
  3. package/dist/src/configs/configs.js +9 -1
  4. package/dist/src/configs/configs.js.map +1 -1
  5. package/dist/src/constants/db.d.ts +1 -0
  6. package/dist/src/constants/db.js +1 -0
  7. package/dist/src/constants/db.js.map +1 -1
  8. package/dist/src/constants/misc.d.ts +4 -2
  9. package/dist/src/constants/misc.js +2 -0
  10. package/dist/src/constants/misc.js.map +1 -1
  11. package/dist/src/context/mainContext.d.ts +5 -2
  12. package/dist/src/context/mainContext.js +20 -3
  13. package/dist/src/context/mainContext.js.map +1 -1
  14. package/dist/src/context/types.d.ts +1 -0
  15. package/dist/src/db/couch/DatabaseImpl.js +1 -1
  16. package/dist/src/db/couch/DatabaseImpl.js.map +1 -1
  17. package/dist/src/db/index.d.ts +2 -1
  18. package/dist/src/db/index.js +15 -2
  19. package/dist/src/db/index.js.map +1 -1
  20. package/dist/src/db/lucene.d.ts +8 -14
  21. package/dist/src/db/lucene.js +164 -97
  22. package/dist/src/db/lucene.js.map +1 -1
  23. package/dist/src/db/searchIndexes/index.d.ts +1 -0
  24. package/dist/src/db/searchIndexes/index.js +18 -0
  25. package/dist/src/db/searchIndexes/index.js.map +1 -0
  26. package/dist/src/db/searchIndexes/searchIndexes.d.ts +1 -0
  27. package/dist/src/db/searchIndexes/searchIndexes.js +77 -0
  28. package/dist/src/db/searchIndexes/searchIndexes.js.map +1 -0
  29. package/dist/src/db/utils.d.ts +5 -126
  30. package/dist/src/db/utils.js +20 -232
  31. package/dist/src/db/utils.js.map +1 -1
  32. package/dist/src/db/views.d.ts +3 -1
  33. package/dist/src/db/views.js +61 -30
  34. package/dist/src/db/views.js.map +1 -1
  35. package/dist/src/docIds/conversions.js.map +1 -0
  36. package/dist/src/docIds/ids.d.ts +53 -0
  37. package/dist/src/docIds/ids.js +101 -0
  38. package/dist/src/docIds/ids.js.map +1 -0
  39. package/dist/src/docIds/index.d.ts +2 -0
  40. package/dist/src/docIds/index.js +19 -0
  41. package/dist/src/docIds/index.js.map +1 -0
  42. package/dist/src/docIds/newid.js.map +1 -0
  43. package/dist/src/docIds/params.d.ts +69 -0
  44. package/dist/src/docIds/params.js +138 -0
  45. package/dist/src/docIds/params.js.map +1 -0
  46. package/dist/src/docUpdates/index.d.ts +2 -0
  47. package/dist/src/docUpdates/index.js +36 -0
  48. package/dist/src/docUpdates/index.js.map +1 -0
  49. package/dist/src/environment.d.ts +4 -2
  50. package/dist/src/environment.js +35 -2
  51. package/dist/src/environment.js.map +1 -1
  52. package/dist/src/errors/errors.d.ts +3 -0
  53. package/dist/src/errors/errors.js +8 -1
  54. package/dist/src/errors/errors.js.map +1 -1
  55. package/dist/src/events/asyncEvents/index.d.ts +2 -0
  56. package/dist/src/events/asyncEvents/index.js +19 -0
  57. package/dist/src/events/asyncEvents/index.js.map +1 -0
  58. package/dist/src/events/asyncEvents/publisher.d.ts +2 -0
  59. package/dist/src/events/asyncEvents/publisher.js +27 -0
  60. package/dist/src/events/asyncEvents/publisher.js.map +1 -0
  61. package/dist/src/events/asyncEvents/queue.d.ts +11 -0
  62. package/dist/src/events/asyncEvents/queue.js +26 -0
  63. package/dist/src/events/asyncEvents/queue.js.map +1 -0
  64. package/dist/src/events/documentId.d.ts +2 -0
  65. package/dist/src/events/documentId.js +28 -0
  66. package/dist/src/events/documentId.js.map +1 -0
  67. package/dist/src/events/events.js +9 -0
  68. package/dist/src/events/events.js.map +1 -1
  69. package/dist/src/events/identification.d.ts +1 -0
  70. package/dist/src/events/identification.js +3 -2
  71. package/dist/src/events/identification.js.map +1 -1
  72. package/dist/src/events/index.d.ts +1 -0
  73. package/dist/src/events/index.js +3 -1
  74. package/dist/src/events/index.js.map +1 -1
  75. package/dist/src/events/processors/LoggingProcessor.js +3 -17
  76. package/dist/src/events/processors/LoggingProcessor.js.map +1 -1
  77. package/dist/src/events/processors/Processors.js +9 -3
  78. package/dist/src/events/processors/Processors.js.map +1 -1
  79. package/dist/src/events/processors/async/DocumentUpdateProcessor.d.ts +13 -0
  80. package/dist/src/events/processors/async/DocumentUpdateProcessor.js +44 -0
  81. package/dist/src/events/processors/async/DocumentUpdateProcessor.js.map +1 -0
  82. package/dist/src/events/processors/posthog/PosthogProcessor.js +1 -2
  83. package/dist/src/events/processors/posthog/PosthogProcessor.js.map +1 -1
  84. package/dist/src/events/processors/types.d.ts +1 -11
  85. package/dist/src/events/processors/types.js +0 -6
  86. package/dist/src/events/processors/types.js.map +1 -1
  87. package/dist/src/events/publishers/group.js +6 -0
  88. package/dist/src/events/publishers/group.js.map +1 -1
  89. package/dist/src/events/publishers/license.d.ts +9 -4
  90. package/dist/src/events/publishers/license.js +2 -17
  91. package/dist/src/events/publishers/license.js.map +1 -1
  92. package/dist/src/events/publishers/user.js +4 -0
  93. package/dist/src/events/publishers/user.js.map +1 -1
  94. package/dist/src/index.d.ts +6 -2
  95. package/dist/src/index.js +2 -1
  96. package/dist/src/index.js.map +1 -1
  97. package/dist/src/installation.d.ts +1 -0
  98. package/dist/src/installation.js +7 -6
  99. package/dist/src/installation.js.map +1 -1
  100. package/dist/src/{logging.d.ts → logging/alerts.d.ts} +0 -5
  101. package/dist/src/logging/alerts.js +24 -0
  102. package/dist/src/logging/alerts.js.map +1 -0
  103. package/dist/src/logging/correlation/correlation.d.ts +2 -0
  104. package/dist/src/logging/correlation/correlation.js +17 -0
  105. package/dist/src/logging/correlation/correlation.js.map +1 -0
  106. package/dist/src/logging/correlation/index.d.ts +1 -0
  107. package/dist/src/logging/correlation/index.js +18 -0
  108. package/dist/src/logging/correlation/index.js.map +1 -0
  109. package/dist/src/logging/correlation/middleware.d.ts +2 -0
  110. package/dist/src/logging/correlation/middleware.js +17 -0
  111. package/dist/src/logging/correlation/middleware.js.map +1 -0
  112. package/dist/src/logging/index.d.ts +4 -0
  113. package/dist/src/logging/index.js +36 -0
  114. package/dist/src/logging/index.js.map +1 -0
  115. package/dist/src/logging/pino/logger.d.ts +2 -0
  116. package/dist/src/logging/pino/logger.js +167 -0
  117. package/dist/src/logging/pino/logger.js.map +1 -0
  118. package/dist/src/logging/pino/middleware.d.ts +4 -0
  119. package/dist/src/logging/pino/middleware.js +47 -0
  120. package/dist/src/logging/pino/middleware.js.map +1 -0
  121. package/dist/src/middleware/authenticated.js +6 -3
  122. package/dist/src/middleware/authenticated.js.map +1 -1
  123. package/dist/src/middleware/errorHandling.js +5 -7
  124. package/dist/src/middleware/errorHandling.js.map +1 -1
  125. package/dist/src/middleware/index.d.ts +2 -1
  126. package/dist/src/middleware/index.js +5 -3
  127. package/dist/src/middleware/index.js.map +1 -1
  128. package/dist/src/middleware/passport/sso/oidc.js +2 -5
  129. package/dist/src/middleware/passport/sso/oidc.js.map +1 -1
  130. package/dist/src/middleware/tenancy.d.ts +1 -1
  131. package/dist/src/migrations/migrations.js +4 -4
  132. package/dist/src/migrations/migrations.js.map +1 -1
  133. package/dist/src/objectStore/objectStore.js +3 -3
  134. package/dist/src/objectStore/objectStore.js.map +1 -1
  135. package/dist/src/plugin/utils.js +53 -2
  136. package/dist/src/plugin/utils.js.map +1 -1
  137. package/dist/src/queue/constants.d.ts +2 -1
  138. package/dist/src/queue/constants.js +1 -0
  139. package/dist/src/queue/constants.js.map +1 -1
  140. package/dist/src/redis/redlockImpl.js +4 -1
  141. package/dist/src/redis/redlockImpl.js.map +1 -1
  142. package/dist/src/security/encryption.d.ts +1 -0
  143. package/dist/src/security/encryption.js +2 -1
  144. package/dist/src/security/encryption.js.map +1 -1
  145. package/dist/src/security/permissions.d.ts +35 -2
  146. package/dist/src/security/permissions.js +9 -6
  147. package/dist/src/security/permissions.js.map +1 -1
  148. package/dist/src/tenancy/tenancy.js +1 -5
  149. package/dist/src/tenancy/tenancy.js.map +1 -1
  150. package/dist/src/users.d.ts +11 -1
  151. package/dist/src/users.js +45 -1
  152. package/dist/src/users.js.map +1 -1
  153. package/dist/src/utils/hashing.d.ts +1 -1
  154. package/dist/src/utils/hashing.js +1 -1
  155. package/dist/src/utils/hashing.js.map +1 -1
  156. package/dist/src/utils/index.d.ts +1 -0
  157. package/dist/src/utils/index.js +1 -0
  158. package/dist/src/utils/index.js.map +1 -1
  159. package/dist/src/utils/stringUtils.d.ts +1 -0
  160. package/dist/src/utils/stringUtils.js +9 -0
  161. package/dist/src/utils/stringUtils.js.map +1 -0
  162. package/dist/src/utils/utils.d.ts +0 -1
  163. package/dist/src/utils/utils.js +1 -24
  164. package/dist/src/utils/utils.js.map +1 -1
  165. package/dist/tests/core/logging.js.map +1 -0
  166. package/dist/tests/{utilities → core/utilities}/index.d.ts +1 -2
  167. package/dist/tests/{utilities → core/utilities}/index.js +2 -7
  168. package/dist/tests/core/utilities/index.js.map +1 -0
  169. package/dist/tests/core/utilities/jestUtils.js.map +1 -0
  170. package/dist/tests/core/utilities/mocks/alerts.d.ts +3 -0
  171. package/dist/tests/core/utilities/mocks/alerts.js +30 -0
  172. package/dist/tests/core/utilities/mocks/alerts.js.map +1 -0
  173. package/dist/tests/core/utilities/mocks/date.js.map +1 -0
  174. package/dist/tests/core/utilities/mocks/events.js +144 -0
  175. package/dist/tests/core/utilities/mocks/events.js.map +1 -0
  176. package/dist/tests/core/utilities/mocks/fetch.d.ts +33 -0
  177. package/dist/tests/core/utilities/mocks/fetch.js +15 -0
  178. package/dist/tests/core/utilities/mocks/fetch.js.map +1 -0
  179. package/dist/tests/{utilities → core/utilities}/mocks/index.d.ts +4 -3
  180. package/dist/tests/{utilities → core/utilities}/mocks/index.js +7 -3
  181. package/dist/tests/core/utilities/mocks/index.js.map +1 -0
  182. package/dist/tests/{utilities → core/utilities}/mocks/licenses.d.ts +1 -0
  183. package/dist/tests/{utilities → core/utilities}/mocks/licenses.js +5 -1
  184. package/dist/tests/core/utilities/mocks/licenses.js.map +1 -0
  185. package/dist/tests/core/utilities/mocks/posthog.js.map +1 -0
  186. package/dist/tests/core/utilities/structures/Chance.d.ts +7 -0
  187. package/dist/tests/core/utilities/structures/Chance.js +21 -0
  188. package/dist/tests/core/utilities/structures/Chance.js.map +1 -0
  189. package/dist/tests/{utilities → core/utilities}/structures/accounts.js +3 -25
  190. package/dist/tests/core/utilities/structures/accounts.js.map +1 -0
  191. package/dist/tests/{utilities → core/utilities}/structures/apps.js +1 -1
  192. package/dist/tests/core/utilities/structures/apps.js.map +1 -0
  193. package/dist/tests/core/utilities/structures/common.js.map +1 -0
  194. package/dist/tests/{utilities → core/utilities}/structures/db.js +1 -1
  195. package/dist/tests/core/utilities/structures/db.js.map +1 -0
  196. package/dist/tests/core/utilities/structures/generator.d.ts +2 -0
  197. package/dist/tests/{utilities → core/utilities}/structures/generator.js +2 -2
  198. package/dist/tests/core/utilities/structures/generator.js.map +1 -0
  199. package/dist/tests/{utilities → core/utilities}/structures/index.d.ts +2 -0
  200. package/dist/tests/{utilities → core/utilities}/structures/index.js +3 -1
  201. package/dist/tests/core/utilities/structures/index.js.map +1 -0
  202. package/dist/tests/core/utilities/structures/koa.js.map +1 -0
  203. package/dist/tests/core/utilities/structures/licenses.d.ts +17 -0
  204. package/dist/tests/core/utilities/structures/licenses.js +127 -0
  205. package/dist/tests/core/utilities/structures/licenses.js.map +1 -0
  206. package/dist/tests/core/utilities/structures/plugins.js.map +1 -0
  207. package/dist/tests/core/utilities/structures/quotas.d.ts +2 -0
  208. package/dist/tests/core/utilities/structures/quotas.js +71 -0
  209. package/dist/tests/core/utilities/structures/quotas.js.map +1 -0
  210. package/dist/tests/core/utilities/structures/scim.d.ts +14 -0
  211. package/dist/tests/core/utilities/structures/scim.js +67 -0
  212. package/dist/tests/core/utilities/structures/scim.js.map +1 -0
  213. package/dist/tests/core/utilities/structures/shared.js.map +1 -0
  214. package/dist/tests/core/utilities/structures/sso.js.map +1 -0
  215. package/dist/tests/{utilities → core/utilities}/structures/tenants.js +1 -1
  216. package/dist/tests/core/utilities/structures/tenants.js.map +1 -0
  217. package/dist/tests/core/utilities/structures/userGroups.js.map +1 -0
  218. package/dist/tests/core/utilities/structures/users.js.map +1 -0
  219. package/dist/tests/core/utilities/testContainerUtils.js.map +1 -0
  220. package/dist/tests/core/utilities/utils/index.d.ts +1 -0
  221. package/dist/tests/core/utilities/utils/index.js +28 -0
  222. package/dist/tests/core/utilities/utils/index.js.map +1 -0
  223. package/dist/tests/core/utilities/utils/time.d.ts +1 -0
  224. package/dist/tests/core/utilities/utils/time.js +8 -0
  225. package/dist/tests/core/utilities/utils/time.js.map +1 -0
  226. package/dist/tests/{utilities → extra}/DBTestConfiguration.d.ts +1 -1
  227. package/dist/tests/{utilities → extra}/DBTestConfiguration.js +2 -2
  228. package/dist/tests/extra/DBTestConfiguration.js.map +1 -0
  229. package/dist/tests/extra/index.d.ts +2 -0
  230. package/dist/tests/extra/index.js +33 -0
  231. package/dist/tests/extra/index.js.map +1 -0
  232. package/dist/tests/{utilities → extra}/testEnv.d.ts +1 -1
  233. package/dist/tests/{utilities → extra}/testEnv.js +1 -1
  234. package/dist/tests/extra/testEnv.js.map +1 -0
  235. package/dist/tests/index.d.ts +1 -1
  236. package/dist/tests/index.js +1 -1
  237. package/dist/tests/index.js.map +1 -1
  238. package/dist/tests/jestEnv.js +0 -1
  239. package/dist/tests/jestEnv.js.map +1 -1
  240. package/dist/tests/jestSetup.d.ts +1 -1
  241. package/dist/tests/jestSetup.js +2 -2
  242. package/dist/tests/jestSetup.js.map +1 -1
  243. package/dist/tsconfig.build.tsbuildinfo +1 -1
  244. package/package.json +13 -10
  245. package/src/auth/tests/auth.spec.ts +2 -1
  246. package/src/cache/tests/writethrough.spec.ts +4 -3
  247. package/src/configs/configs.ts +9 -0
  248. package/src/configs/tests/configs.spec.ts +2 -6
  249. package/src/constants/db.ts +1 -0
  250. package/src/constants/misc.ts +2 -0
  251. package/src/context/mainContext.ts +22 -5
  252. package/src/context/tests/index.spec.ts +16 -3
  253. package/src/context/types.ts +1 -0
  254. package/src/db/couch/DatabaseImpl.ts +1 -1
  255. package/src/db/index.ts +2 -1
  256. package/src/db/lucene.ts +156 -99
  257. package/src/db/searchIndexes/index.ts +1 -0
  258. package/src/db/searchIndexes/searchIndexes.ts +62 -0
  259. package/src/db/tests/lucene.spec.ts +101 -1
  260. package/src/db/tests/utils.spec.ts +1 -1
  261. package/src/db/utils.ts +7 -275
  262. package/src/db/views.ts +64 -25
  263. package/src/docIds/ids.ts +102 -0
  264. package/src/docIds/index.ts +2 -0
  265. package/src/docIds/params.ts +174 -0
  266. package/src/docUpdates/index.ts +29 -0
  267. package/src/environment.ts +44 -2
  268. package/src/errors/errors.ts +8 -0
  269. package/src/events/asyncEvents/index.ts +2 -0
  270. package/src/events/asyncEvents/publisher.ts +12 -0
  271. package/src/events/asyncEvents/queue.ts +22 -0
  272. package/src/events/documentId.ts +56 -0
  273. package/src/events/events.ts +10 -1
  274. package/src/events/identification.ts +3 -3
  275. package/src/events/index.ts +2 -0
  276. package/src/events/processors/LoggingProcessor.ts +3 -22
  277. package/src/events/processors/Processors.ts +9 -3
  278. package/src/events/processors/async/DocumentUpdateProcessor.ts +43 -0
  279. package/src/events/processors/posthog/PosthogProcessor.ts +1 -2
  280. package/src/events/processors/posthog/tests/PosthogProcessor.spec.ts +1 -1
  281. package/src/events/processors/types.ts +1 -18
  282. package/src/events/publishers/group.ts +6 -1
  283. package/src/events/publishers/license.ts +12 -13
  284. package/src/events/publishers/user.ts +4 -0
  285. package/src/index.ts +1 -0
  286. package/src/installation.ts +4 -5
  287. package/src/logging/alerts.ts +26 -0
  288. package/src/logging/correlation/correlation.ts +13 -0
  289. package/src/logging/correlation/index.ts +1 -0
  290. package/src/logging/correlation/middleware.ts +17 -0
  291. package/src/logging/index.ts +6 -0
  292. package/src/logging/pino/logger.ts +173 -0
  293. package/src/logging/pino/middleware.ts +45 -0
  294. package/src/middleware/authenticated.ts +9 -3
  295. package/src/middleware/errorHandling.ts +4 -4
  296. package/src/middleware/index.ts +2 -1
  297. package/src/middleware/passport/sso/oidc.ts +2 -9
  298. package/src/middleware/passport/sso/tests/sso.spec.ts +2 -1
  299. package/src/migrations/migrations.ts +4 -8
  300. package/src/migrations/tests/__snapshots__/migrations.spec.ts.snap +1 -1
  301. package/src/migrations/tests/migrations.spec.ts +1 -1
  302. package/src/objectStore/buckets/tests/app.spec.ts +1 -1
  303. package/src/objectStore/buckets/tests/global.spec.ts +1 -1
  304. package/src/objectStore/buckets/tests/plugins.spec.ts +2 -1
  305. package/src/objectStore/objectStore.ts +3 -3
  306. package/src/platform/tests/tenants.spec.ts +2 -1
  307. package/src/plugin/tests/validation.spec.ts +83 -0
  308. package/src/plugin/utils.ts +63 -3
  309. package/src/queue/constants.ts +1 -0
  310. package/src/redis/redlockImpl.ts +9 -3
  311. package/src/security/encryption.ts +1 -1
  312. package/src/security/permissions.ts +5 -5
  313. package/src/security/tests/encryption.spec.ts +31 -0
  314. package/src/security/tests/permissions.spec.ts +145 -0
  315. package/src/tenancy/tenancy.ts +2 -2
  316. package/src/tenancy/tests/tenancy.spec.ts +184 -0
  317. package/src/users.ts +56 -7
  318. package/src/utils/hashing.ts +1 -1
  319. package/src/utils/index.ts +1 -0
  320. package/src/utils/stringUtils.ts +8 -0
  321. package/src/utils/tests/utils.spec.ts +2 -1
  322. package/src/utils/utils.ts +3 -23
  323. package/tests/{utilities → core/utilities}/index.ts +1 -4
  324. package/tests/core/utilities/mocks/alerts.ts +3 -0
  325. package/tests/core/utilities/mocks/events.ts +133 -0
  326. package/tests/core/utilities/mocks/fetch.ts +17 -0
  327. package/tests/{utilities → core/utilities}/mocks/index.ts +4 -3
  328. package/tests/{utilities → core/utilities}/mocks/licenses.ts +4 -0
  329. package/tests/core/utilities/structures/Chance.ts +20 -0
  330. package/tests/{utilities → core/utilities}/structures/accounts.ts +4 -3
  331. package/tests/{utilities → core/utilities}/structures/apps.ts +1 -1
  332. package/tests/{utilities → core/utilities}/structures/db.ts +1 -1
  333. package/tests/{utilities → core/utilities}/structures/generator.ts +1 -1
  334. package/tests/{utilities → core/utilities}/structures/index.ts +2 -0
  335. package/tests/core/utilities/structures/licenses.ts +145 -0
  336. package/tests/core/utilities/structures/quotas.ts +67 -0
  337. package/tests/core/utilities/structures/scim.ts +81 -0
  338. package/tests/{utilities → core/utilities}/structures/tenants.ts +1 -1
  339. package/tests/core/utilities/utils/index.ts +1 -0
  340. package/tests/core/utilities/utils/time.ts +3 -0
  341. package/tests/{utilities → extra}/DBTestConfiguration.ts +2 -2
  342. package/tests/extra/index.ts +2 -0
  343. package/tests/{utilities → extra}/testEnv.ts +1 -1
  344. package/tests/index.ts +1 -1
  345. package/tests/jestEnv.ts +0 -1
  346. package/tests/jestSetup.ts +2 -2
  347. package/tsconfig.build.json +3 -7
  348. package/dist/src/db/conversions.js.map +0 -1
  349. package/dist/src/logging.js +0 -56
  350. package/dist/src/logging.js.map +0 -1
  351. package/dist/src/middleware/logging.d.ts +0 -2
  352. package/dist/src/middleware/logging.js +0 -106
  353. package/dist/src/middleware/logging.js.map +0 -1
  354. package/dist/src/newid.js.map +0 -1
  355. package/dist/tests/logging.js.map +0 -1
  356. package/dist/tests/utilities/DBTestConfiguration.js.map +0 -1
  357. package/dist/tests/utilities/index.js.map +0 -1
  358. package/dist/tests/utilities/jestUtils.js.map +0 -1
  359. package/dist/tests/utilities/mocks/date.js.map +0 -1
  360. package/dist/tests/utilities/mocks/events.js +0 -126
  361. package/dist/tests/utilities/mocks/events.js.map +0 -1
  362. package/dist/tests/utilities/mocks/fetch.d.ts +0 -31
  363. package/dist/tests/utilities/mocks/fetch.js +0 -8
  364. package/dist/tests/utilities/mocks/fetch.js.map +0 -1
  365. package/dist/tests/utilities/mocks/index.js.map +0 -1
  366. package/dist/tests/utilities/mocks/licenses.js.map +0 -1
  367. package/dist/tests/utilities/mocks/posthog.js.map +0 -1
  368. package/dist/tests/utilities/structures/accounts.js.map +0 -1
  369. package/dist/tests/utilities/structures/apps.js.map +0 -1
  370. package/dist/tests/utilities/structures/common.js.map +0 -1
  371. package/dist/tests/utilities/structures/db.js.map +0 -1
  372. package/dist/tests/utilities/structures/generator.d.ts +0 -1
  373. package/dist/tests/utilities/structures/generator.js.map +0 -1
  374. package/dist/tests/utilities/structures/index.js.map +0 -1
  375. package/dist/tests/utilities/structures/koa.js.map +0 -1
  376. package/dist/tests/utilities/structures/licenses.d.ts +0 -5
  377. package/dist/tests/utilities/structures/licenses.js +0 -18
  378. package/dist/tests/utilities/structures/licenses.js.map +0 -1
  379. package/dist/tests/utilities/structures/plugins.js.map +0 -1
  380. package/dist/tests/utilities/structures/shared.js.map +0 -1
  381. package/dist/tests/utilities/structures/sso.js.map +0 -1
  382. package/dist/tests/utilities/structures/tenants.js.map +0 -1
  383. package/dist/tests/utilities/structures/userGroups.js.map +0 -1
  384. package/dist/tests/utilities/structures/users.js.map +0 -1
  385. package/dist/tests/utilities/testContainerUtils.js.map +0 -1
  386. package/dist/tests/utilities/testEnv.js.map +0 -1
  387. package/src/logging.ts +0 -60
  388. package/src/middleware/logging.ts +0 -90
  389. package/tests/utilities/mocks/events.ts +0 -122
  390. package/tests/utilities/mocks/fetch.ts +0 -10
  391. package/tests/utilities/structures/licenses.ts +0 -18
  392. /package/dist/src/{db → docIds}/conversions.d.ts +0 -0
  393. /package/dist/src/{db → docIds}/conversions.js +0 -0
  394. /package/dist/src/{newid.d.ts → docIds/newid.d.ts} +0 -0
  395. /package/dist/src/{newid.js → docIds/newid.js} +0 -0
  396. /package/dist/tests/{logging.d.ts → core/logging.d.ts} +0 -0
  397. /package/dist/tests/{logging.js → core/logging.js} +0 -0
  398. /package/dist/tests/{utilities → core/utilities}/jestUtils.d.ts +0 -0
  399. /package/dist/tests/{utilities → core/utilities}/jestUtils.js +0 -0
  400. /package/dist/tests/{utilities → core/utilities}/mocks/date.d.ts +0 -0
  401. /package/dist/tests/{utilities → core/utilities}/mocks/date.js +0 -0
  402. /package/dist/tests/{utilities → core/utilities}/mocks/events.d.ts +0 -0
  403. /package/dist/tests/{utilities → core/utilities}/mocks/posthog.d.ts +0 -0
  404. /package/dist/tests/{utilities → core/utilities}/mocks/posthog.js +0 -0
  405. /package/dist/tests/{utilities → core/utilities}/structures/accounts.d.ts +0 -0
  406. /package/dist/tests/{utilities → core/utilities}/structures/apps.d.ts +0 -0
  407. /package/dist/tests/{utilities → core/utilities}/structures/common.d.ts +0 -0
  408. /package/dist/tests/{utilities → core/utilities}/structures/common.js +0 -0
  409. /package/dist/tests/{utilities → core/utilities}/structures/db.d.ts +0 -0
  410. /package/dist/tests/{utilities → core/utilities}/structures/koa.d.ts +0 -0
  411. /package/dist/tests/{utilities → core/utilities}/structures/koa.js +0 -0
  412. /package/dist/tests/{utilities → core/utilities}/structures/plugins.d.ts +0 -0
  413. /package/dist/tests/{utilities → core/utilities}/structures/plugins.js +0 -0
  414. /package/dist/tests/{utilities → core/utilities}/structures/shared.d.ts +0 -0
  415. /package/dist/tests/{utilities → core/utilities}/structures/shared.js +0 -0
  416. /package/dist/tests/{utilities → core/utilities}/structures/sso.d.ts +0 -0
  417. /package/dist/tests/{utilities → core/utilities}/structures/sso.js +0 -0
  418. /package/dist/tests/{utilities → core/utilities}/structures/tenants.d.ts +0 -0
  419. /package/dist/tests/{utilities → core/utilities}/structures/userGroups.d.ts +0 -0
  420. /package/dist/tests/{utilities → core/utilities}/structures/userGroups.js +0 -0
  421. /package/dist/tests/{utilities → core/utilities}/structures/users.d.ts +0 -0
  422. /package/dist/tests/{utilities → core/utilities}/structures/users.js +0 -0
  423. /package/dist/tests/{utilities → core/utilities}/testContainerUtils.d.ts +0 -0
  424. /package/dist/tests/{utilities → core/utilities}/testContainerUtils.js +0 -0
  425. /package/src/{db → docIds}/conversions.ts +0 -0
  426. /package/src/{newid.ts → docIds/newid.ts} +0 -0
  427. /package/tests/{logging.ts → core/logging.ts} +0 -0
  428. /package/tests/{utilities → core/utilities}/jestUtils.ts +0 -0
  429. /package/tests/{utilities → core/utilities}/mocks/date.ts +0 -0
  430. /package/tests/{utilities → core/utilities}/mocks/posthog.ts +0 -0
  431. /package/tests/{utilities → core/utilities}/structures/common.ts +0 -0
  432. /package/tests/{utilities → core/utilities}/structures/koa.ts +0 -0
  433. /package/tests/{utilities → core/utilities}/structures/plugins.ts +0 -0
  434. /package/tests/{utilities → core/utilities}/structures/shared.ts +0 -0
  435. /package/tests/{utilities → core/utilities}/structures/sso.ts +0 -0
  436. /package/tests/{utilities → core/utilities}/structures/userGroups.ts +0 -0
  437. /package/tests/{utilities → core/utilities}/structures/users.ts +0 -0
  438. /package/tests/{utilities → core/utilities}/testContainerUtils.ts +0 -0
@@ -0,0 +1,167 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ var __importDefault = (this && this.__importDefault) || function (mod) {
26
+ return (mod && mod.__esModule) ? mod : { "default": mod };
27
+ };
28
+ Object.defineProperty(exports, "__esModule", { value: true });
29
+ exports.logger = void 0;
30
+ const environment_1 = __importDefault(require("../../environment"));
31
+ const pino_1 = __importDefault(require("pino"));
32
+ const context = __importStar(require("../../context"));
33
+ const correlation = __importStar(require("../correlation"));
34
+ const index_1 = require("../index");
35
+ // LOGGER
36
+ let pinoInstance;
37
+ if (!environment_1.default.DISABLE_PINO_LOGGER) {
38
+ const pinoOptions = {
39
+ level: environment_1.default.LOG_LEVEL,
40
+ formatters: {
41
+ level: label => {
42
+ return { level: label.toUpperCase() };
43
+ },
44
+ bindings: () => {
45
+ return {};
46
+ },
47
+ },
48
+ timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
49
+ };
50
+ if (environment_1.default.isDev()) {
51
+ pinoOptions.transport = {
52
+ target: "pino-pretty",
53
+ options: {
54
+ singleLine: true,
55
+ },
56
+ };
57
+ }
58
+ pinoInstance = (0, pino_1.default)(pinoOptions);
59
+ function isPlainObject(obj) {
60
+ return typeof obj === "object" && obj !== null && !(obj instanceof Error);
61
+ }
62
+ function isError(obj) {
63
+ return obj instanceof Error;
64
+ }
65
+ function isMessage(obj) {
66
+ return typeof obj === "string";
67
+ }
68
+ /**
69
+ * Backwards compatibility between console logging statements
70
+ * and pino logging requirements.
71
+ */
72
+ function getLogParams(args) {
73
+ let error = undefined;
74
+ let objects = [];
75
+ let message = "";
76
+ args.forEach(arg => {
77
+ if (isMessage(arg)) {
78
+ message = `${message} ${arg}`.trimStart();
79
+ }
80
+ if (isPlainObject(arg)) {
81
+ objects.push(arg);
82
+ }
83
+ if (isError(arg)) {
84
+ error = arg;
85
+ }
86
+ });
87
+ const identity = getIdentity();
88
+ let contextObject = {};
89
+ if (index_1.LOG_CONTEXT) {
90
+ contextObject = {
91
+ tenantId: getTenantId(),
92
+ appId: getAppId(),
93
+ identityId: identity === null || identity === void 0 ? void 0 : identity._id,
94
+ identityType: identity === null || identity === void 0 ? void 0 : identity.type,
95
+ correlationId: correlation.getId(),
96
+ };
97
+ }
98
+ const mergingObject = Object.assign({ objects: objects.length ? objects : undefined, err: error }, contextObject);
99
+ return [mergingObject, message];
100
+ }
101
+ console.log = (...arg) => {
102
+ const [obj, msg] = getLogParams(arg);
103
+ pinoInstance === null || pinoInstance === void 0 ? void 0 : pinoInstance.info(obj, msg);
104
+ };
105
+ console.info = (...arg) => {
106
+ const [obj, msg] = getLogParams(arg);
107
+ pinoInstance === null || pinoInstance === void 0 ? void 0 : pinoInstance.info(obj, msg);
108
+ };
109
+ console.warn = (...arg) => {
110
+ const [obj, msg] = getLogParams(arg);
111
+ pinoInstance === null || pinoInstance === void 0 ? void 0 : pinoInstance.warn(obj, msg);
112
+ };
113
+ console.error = (...arg) => {
114
+ const [obj, msg] = getLogParams(arg);
115
+ pinoInstance === null || pinoInstance === void 0 ? void 0 : pinoInstance.error(obj, msg);
116
+ };
117
+ /**
118
+ * custom trace impl - this resembles the node trace behaviour rather
119
+ * than traditional trace logging
120
+ * @param arg
121
+ */
122
+ console.trace = (...arg) => {
123
+ const [obj, msg] = getLogParams(arg);
124
+ if (!obj.err) {
125
+ // to get stack trace
126
+ obj.err = new Error();
127
+ }
128
+ pinoInstance === null || pinoInstance === void 0 ? void 0 : pinoInstance.trace(obj, msg);
129
+ };
130
+ console.debug = (...arg) => {
131
+ const [obj, msg] = getLogParams(arg);
132
+ pinoInstance === null || pinoInstance === void 0 ? void 0 : pinoInstance.debug(obj, msg);
133
+ };
134
+ // CONTEXT
135
+ const getTenantId = () => {
136
+ let tenantId;
137
+ try {
138
+ tenantId = context.getTenantId();
139
+ }
140
+ catch (e) {
141
+ // do nothing
142
+ }
143
+ return tenantId;
144
+ };
145
+ const getAppId = () => {
146
+ let appId;
147
+ try {
148
+ appId = context.getAppId();
149
+ }
150
+ catch (e) {
151
+ // do nothing
152
+ }
153
+ return appId;
154
+ };
155
+ const getIdentity = () => {
156
+ let identity;
157
+ try {
158
+ identity = context.getIdentity();
159
+ }
160
+ catch (e) {
161
+ // do nothing
162
+ }
163
+ return identity;
164
+ };
165
+ }
166
+ exports.logger = pinoInstance;
167
+ //# sourceMappingURL=logger.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../src/logging/pino/logger.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ import { Options } from "pino-http";
2
+ export declare function pinoSettings(): Options;
3
+ declare const pinoMiddleware: any;
4
+ export default pinoMiddleware;
@@ -0,0 +1,47 @@
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.pinoSettings = void 0;
7
+ const environment_1 = __importDefault(require("../../environment"));
8
+ const logger_1 = require("./logger");
9
+ const pino = require("koa-pino-logger");
10
+ const correlator = require("correlation-id");
11
+ function pinoSettings() {
12
+ return {
13
+ logger: logger_1.logger,
14
+ genReqId: correlator.getId,
15
+ autoLogging: {
16
+ ignore: (req) => { var _a; return !!((_a = req.url) === null || _a === void 0 ? void 0 : _a.includes("/health")); },
17
+ },
18
+ serializers: {
19
+ req: req => {
20
+ return {
21
+ method: req.method,
22
+ url: req.url,
23
+ correlationId: req.id,
24
+ };
25
+ },
26
+ res: res => {
27
+ return {
28
+ status: res.statusCode,
29
+ };
30
+ },
31
+ },
32
+ };
33
+ }
34
+ exports.pinoSettings = pinoSettings;
35
+ function getMiddleware() {
36
+ if (environment_1.default.HTTP_LOGGING) {
37
+ return pino(pinoSettings());
38
+ }
39
+ else {
40
+ return (ctx, next) => {
41
+ return next();
42
+ };
43
+ }
44
+ }
45
+ const pinoMiddleware = getMiddleware();
46
+ exports.default = pinoMiddleware;
47
+ //# sourceMappingURL=middleware.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../../src/logging/pino/middleware.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAmC;AACnC,qCAAiC;AAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAGvC,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE5C,SAAgB,YAAY;IAC1B,OAAO;QACL,MAAM,EAAN,eAAM;QACN,QAAQ,EAAE,UAAU,CAAC,KAAK;QAC1B,WAAW,EAAE;YACX,MAAM,EAAE,CAAC,GAAoB,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,GAAG,CAAC,GAAG,0CAAE,QAAQ,CAAC,SAAS,CAAC,CAAA,CAAA,EAAA;SACjE;QACD,WAAW,EAAE;YACX,GAAG,EAAE,GAAG,CAAC,EAAE;gBACT,OAAO;oBACL,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,aAAa,EAAE,GAAG,CAAC,EAAE;iBACtB,CAAA;YACH,CAAC;YACD,GAAG,EAAE,GAAG,CAAC,EAAE;gBACT,OAAO;oBACL,MAAM,EAAE,GAAG,CAAC,UAAU;iBACvB,CAAA;YACH,CAAC;SACF;KACF,CAAA;AACH,CAAC;AAtBD,oCAsBC;AAED,SAAS,aAAa;IACpB,IAAI,qBAAG,CAAC,YAAY,EAAE;QACpB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,CAAA;KAC5B;SAAM;QACL,OAAO,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;YAC7B,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAA;KACF;AACH,CAAC;AAED,MAAM,cAAc,GAAG,aAAa,EAAE,CAAA;AAEtC,kBAAe,cAAc,CAAA"}
@@ -64,7 +64,7 @@ function checkApiKey(apiKey, populateUser) {
64
64
  // check both the primary and the fallback internal api keys
65
65
  // this allows for rotation
66
66
  if ((0, utils_1.isValidInternalAPIKey)(apiKey)) {
67
- return { valid: true };
67
+ return { valid: true, user: undefined };
68
68
  }
69
69
  const decrypted = (0, encryption_1.decrypt)(apiKey);
70
70
  const tenantId = decrypted.split(db_1.SEPARATOR)[0];
@@ -111,9 +111,12 @@ function default_1(noAuthPatterns = [], opts = {
111
111
  }
112
112
  try {
113
113
  // check the actual user is authenticated first, try header or cookie
114
- const headerToken = ctx.request.headers[constants_1.Header.TOKEN];
114
+ let headerToken = ctx.request.headers[constants_1.Header.TOKEN];
115
115
  const authCookie = (0, utils_1.getCookie)(ctx, constants_1.Cookie.Auth) || (0, utils_1.openJwt)(headerToken);
116
- const apiKey = ctx.request.headers[constants_1.Header.API_KEY];
116
+ let apiKey = ctx.request.headers[constants_1.Header.API_KEY];
117
+ if (!apiKey && ctx.request.headers[constants_1.Header.AUTHORIZATION]) {
118
+ apiKey = ctx.request.headers[constants_1.Header.AUTHORIZATION].split(" ")[1];
119
+ }
117
120
  const tenantId = ctx.request.headers[constants_1.Header.TENANT_ID];
118
121
  let authenticated = false, user = null, internal = false;
119
122
  if (authCookie && !apiKey) {
@@ -1 +1 @@
1
- {"version":3,"file":"authenticated.js","sourceRoot":"","sources":["../../../src/middleware/authenticated.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"authenticated.js","sourceRoot":"","sources":["../../../src/middleware/authenticated.ts"],"names":[],"mappings":"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"}
@@ -31,13 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
31
31
  step((generator = generator.apply(thisArg, _arguments || [])).next());
32
32
  });
33
33
  };
34
- var __importDefault = (this && this.__importDefault) || function (mod) {
35
- return (mod && mod.__esModule) ? mod : { "default": mod };
36
- };
37
34
  Object.defineProperty(exports, "__esModule", { value: true });
38
35
  exports.errorHandling = void 0;
39
36
  const errors = __importStar(require("../errors"));
40
- const environment_1 = __importDefault(require("../environment"));
41
37
  function errorHandling(ctx, next) {
42
38
  return __awaiter(this, void 0, void 0, function* () {
43
39
  try {
@@ -46,9 +42,11 @@ function errorHandling(ctx, next) {
46
42
  catch (err) {
47
43
  const status = err.status || err.statusCode || 500;
48
44
  ctx.status = status;
49
- if (status > 499 || environment_1.default.ENABLE_4XX_HTTP_LOGGING) {
50
- ctx.log.error(err);
51
- console.trace(err);
45
+ if (status >= 400 && status < 500) {
46
+ console.warn(err);
47
+ }
48
+ else {
49
+ console.error(err);
52
50
  }
53
51
  const error = errors.getPublicError(err);
54
52
  const body = {
@@ -1 +1 @@
1
- {"version":3,"file":"errorHandling.js","sourceRoot":"","sources":["../../../src/middleware/errorHandling.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAmC;AACnC,iEAAgC;AAEhC,SAAsB,aAAa,CAAC,GAAQ,EAAE,IAAS;;QACrD,IAAI;YACF,MAAM,IAAI,EAAE,CAAA;SACb;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAA;YAClD,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;YAEnB,IAAI,MAAM,GAAG,GAAG,IAAI,qBAAG,CAAC,uBAAuB,EAAE;gBAC/C,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAClB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACnB;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;YACxC,MAAM,IAAI,GAAa;gBACrB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,MAAM,EAAE,MAAM;gBACd,gBAAgB,EAAE,GAAG,CAAC,UAAU;gBAChC,KAAK;aACN,CAAA;YAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;SAChB;IACH,CAAC;CAAA;AAtBD,sCAsBC;AAED,kBAAe,aAAa,CAAA"}
1
+ {"version":3,"file":"errorHandling.js","sourceRoot":"","sources":["../../../src/middleware/errorHandling.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAmC;AAEnC,SAAsB,aAAa,CAAC,GAAQ,EAAE,IAAS;;QACrD,IAAI;YACF,MAAM,IAAI,EAAE,CAAA;SACb;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAA;YAClD,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;YAEnB,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,EAAE;gBACjC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aAClB;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACnB;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;YACxC,MAAM,IAAI,GAAa;gBACrB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,MAAM,EAAE,MAAM;gBACd,gBAAgB,EAAE,GAAG,CAAC,UAAU;gBAChC,KAAK;aACN,CAAA;YAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;SAChB;IACH,CAAC;CAAA;AAvBD,sCAuBC;AAED,kBAAe,aAAa,CAAA"}
@@ -14,7 +14,8 @@ export { default as csrf } from "./csrf";
14
14
  export { default as adminOnly } from "./adminOnly";
15
15
  export { default as builderOrAdmin } from "./builderOrAdmin";
16
16
  export { default as builderOnly } from "./builderOnly";
17
- export { default as logging } from "./logging";
17
+ export { default as pino } from "../logging/pino/middleware";
18
+ export { default as correlation } from "../logging/correlation/middleware";
18
19
  export { default as errorHandling } from "./errorHandling";
19
20
  export { default as querystringToBody } from "./querystringToBody";
20
21
  export * as joiValidator from "./joi-validator";
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.joiValidator = exports.querystringToBody = exports.errorHandling = exports.logging = exports.builderOnly = exports.builderOrAdmin = exports.adminOnly = exports.csrf = exports.internalApi = exports.tenancy = exports.auditLog = exports.authenticated = exports.ssoCallbackUrl = exports.authError = exports.datasource = exports.oidc = exports.google = exports.local = void 0;
29
+ exports.joiValidator = exports.querystringToBody = exports.errorHandling = exports.correlation = exports.pino = exports.builderOnly = exports.builderOrAdmin = exports.adminOnly = exports.csrf = exports.internalApi = exports.tenancy = exports.auditLog = exports.authenticated = exports.ssoCallbackUrl = exports.authError = exports.datasource = exports.oidc = exports.google = exports.local = void 0;
30
30
  exports.local = __importStar(require("./passport/local"));
31
31
  exports.google = __importStar(require("./passport/sso/google"));
32
32
  exports.oidc = __importStar(require("./passport/sso/oidc"));
@@ -53,8 +53,10 @@ var builderOrAdmin_1 = require("./builderOrAdmin");
53
53
  Object.defineProperty(exports, "builderOrAdmin", { enumerable: true, get: function () { return __importDefault(builderOrAdmin_1).default; } });
54
54
  var builderOnly_1 = require("./builderOnly");
55
55
  Object.defineProperty(exports, "builderOnly", { enumerable: true, get: function () { return __importDefault(builderOnly_1).default; } });
56
- var logging_1 = require("./logging");
57
- Object.defineProperty(exports, "logging", { enumerable: true, get: function () { return __importDefault(logging_1).default; } });
56
+ var middleware_1 = require("../logging/pino/middleware");
57
+ Object.defineProperty(exports, "pino", { enumerable: true, get: function () { return __importDefault(middleware_1).default; } });
58
+ var middleware_2 = require("../logging/correlation/middleware");
59
+ Object.defineProperty(exports, "correlation", { enumerable: true, get: function () { return __importDefault(middleware_2).default; } });
58
60
  var errorHandling_1 = require("./errorHandling");
59
61
  Object.defineProperty(exports, "errorHandling", { enumerable: true, get: function () { return __importDefault(errorHandling_1).default; } });
60
62
  var querystringToBody_1 = require("./querystringToBody");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAyC;AACzC,gEAA+C;AAC/C,4DAA2C;AAC3C,+EAAgE;AACnD,QAAA,UAAU,GAAG;IACxB,MAAM,EAAE,gBAAgB;CACzB,CAAA;AACD,0CAA4D;AAAnD,kGAAA,SAAS,OAAA;AAAE,uGAAA,cAAc,OAAA;AAClC,iDAA0D;AAAjD,+HAAA,OAAO,OAAiB;AACjC,uCAAgD;AAAvC,qHAAA,OAAO,OAAY;AAC5B,qCAA8C;AAArC,mHAAA,OAAO,OAAW;AAC3B,6CAAsD;AAA7C,2HAAA,OAAO,OAAe;AAC/B,+BAAwC;AAA/B,6GAAA,OAAO,OAAQ;AACxB,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,mDAA4D;AAAnD,iIAAA,OAAO,OAAkB;AAClC,6CAAsD;AAA7C,2HAAA,OAAO,OAAe;AAC/B,qCAA8C;AAArC,mHAAA,OAAO,OAAW;AAC3B,iDAA0D;AAAjD,+HAAA,OAAO,OAAiB;AACjC,yDAAkE;AAAzD,uIAAA,OAAO,OAAqB;AACrC,gEAA+C"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAyC;AACzC,gEAA+C;AAC/C,4DAA2C;AAC3C,+EAAgE;AACnD,QAAA,UAAU,GAAG;IACxB,MAAM,EAAE,gBAAgB;CACzB,CAAA;AACD,0CAA4D;AAAnD,kGAAA,SAAS,OAAA;AAAE,uGAAA,cAAc,OAAA;AAClC,iDAA0D;AAAjD,+HAAA,OAAO,OAAiB;AACjC,uCAAgD;AAAvC,qHAAA,OAAO,OAAY;AAC5B,qCAA8C;AAArC,mHAAA,OAAO,OAAW;AAC3B,6CAAsD;AAA7C,2HAAA,OAAO,OAAe;AAC/B,+BAAwC;AAA/B,6GAAA,OAAO,OAAQ;AACxB,yCAAkD;AAAzC,uHAAA,OAAO,OAAa;AAC7B,mDAA4D;AAAnD,iIAAA,OAAO,OAAkB;AAClC,6CAAsD;AAA7C,2HAAA,OAAO,OAAe;AAC/B,yDAA4D;AAAnD,mHAAA,OAAO,OAAQ;AACxB,gEAA0E;AAAjE,0HAAA,OAAO,OAAe;AAC/B,iDAA0D;AAAjD,+HAAA,OAAO,OAAiB;AACjC,yDAAkE;AAAzD,uIAAA,OAAO,OAAqB;AACrC,gEAA+C"}
@@ -39,6 +39,7 @@ exports.getCallbackUrl = exports.fetchStrategyConfig = exports.strategyFactory =
39
39
  const node_fetch_1 = __importDefault(require("node-fetch"));
40
40
  const sso = __importStar(require("./sso"));
41
41
  const utils_1 = require("../utils");
42
+ const utils_2 = require("../../../utils");
42
43
  const types_1 = require("@budibase/types");
43
44
  const OIDCStrategy = require("@techpass/passport-openidconnect").Strategy;
44
45
  function buildVerifyFn(saveUserFn) {
@@ -86,15 +87,11 @@ function getEmail(profile, jwtClaims) {
86
87
  }
87
88
  // fallback to id token preferred username
88
89
  const username = jwtClaims.preferred_username;
89
- if (username && validEmail(username)) {
90
+ if (username && (0, utils_2.validEmail)(username)) {
90
91
  return username;
91
92
  }
92
93
  throw new Error(`Could not determine user email from profile ${JSON.stringify(profile)} and claims ${JSON.stringify(jwtClaims)}`);
93
94
  }
94
- function validEmail(value) {
95
- return (value &&
96
- !!value.match(/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/));
97
- }
98
95
  /**
99
96
  * Create an instance of the oidc passport strategy. This wrapper fetches the configuration
100
97
  * from couchDB rather than environment variables, using this factory is necessary for dynamically configuring passport.
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/sso/oidc.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/sso/oidc.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
1
  import { BBContext, EndpointMatcher } from "@budibase/types";
2
2
  export default function (allowQueryStringPatterns: EndpointMatcher[], noTenancyPatterns: EndpointMatcher[], opts?: {
3
3
  noTenancyRequired?: boolean;
4
- }): (ctx: BBContext | any, next: any) => Promise<any>;
4
+ }): (ctx: BBContext | any, next: any) => Promise<unknown>;
@@ -116,7 +116,7 @@ const runMigration = (migration, options = {}) => __awaiter(void 0, void 0, void
116
116
  if (options.force &&
117
117
  options.force[migrationType] &&
118
118
  options.force[migrationType].includes(migrationName)) {
119
- log(`[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Forcing`);
119
+ log(`[Migration: ${migrationName}] [DB: ${dbName}] Forcing`);
120
120
  }
121
121
  else {
122
122
  // no force, exit
@@ -125,7 +125,7 @@ const runMigration = (migration, options = {}) => __awaiter(void 0, void 0, void
125
125
  }
126
126
  // check if the migration is not a no-op
127
127
  if (!options.noOp) {
128
- log(`[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Running ${lengthStatement}`);
128
+ log(`[Migration: ${migrationName}] [DB: ${dbName}] Running ${lengthStatement}`);
129
129
  if (migration.preventRetry) {
130
130
  // eagerly set the completion date
131
131
  // so that we never run this migration twice even upon failure
@@ -142,14 +142,14 @@ const runMigration = (migration, options = {}) => __awaiter(void 0, void 0, void
142
142
  else {
143
143
  yield migration.fn(db);
144
144
  }
145
- log(`[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Complete`);
145
+ log(`[Migration: ${migrationName}] [DB: ${dbName}] Complete`);
146
146
  }
147
147
  // mark as complete
148
148
  doc[migrationName] = Date.now();
149
149
  yield db.put(doc);
150
150
  }
151
151
  catch (err) {
152
- console.error(`[Tenant: ${tenantId}] [Migration: ${migrationName}] [DB: ${dbName}] Error: `, err);
152
+ console.error(`[Migration: ${migrationName}] [DB: ${dbName}] Error: `, err);
153
153
  throw err;
154
154
  }
155
155
  }
@@ -1 +1 @@
1
- {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/migrations/migrations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/migrations/migrations.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ const aws_sdk_1 = __importDefault(require("aws-sdk"));
18
18
  const stream_1 = __importDefault(require("stream"));
19
19
  const node_fetch_1 = __importDefault(require("node-fetch"));
20
20
  const tar_fs_1 = __importDefault(require("tar-fs"));
21
- const zlib = require("zlib");
21
+ const zlib_1 = __importDefault(require("zlib"));
22
22
  const util_1 = require("util");
23
23
  const path_1 = require("path");
24
24
  const fs_1 = __importDefault(require("fs"));
@@ -360,7 +360,7 @@ const downloadTarballDirect = (url, path, headers = {}) => __awaiter(void 0, voi
360
360
  if (!response.ok) {
361
361
  throw new Error(`unexpected response ${response.statusText}`);
362
362
  }
363
- yield streamPipeline(response.body, zlib.Unzip(), tar_fs_1.default.extract(path));
363
+ yield streamPipeline(response.body, zlib_1.default.createUnzip(), tar_fs_1.default.extract(path));
364
364
  });
365
365
  exports.downloadTarballDirect = downloadTarballDirect;
366
366
  const downloadTarball = (url, bucketName, path) => __awaiter(void 0, void 0, void 0, function* () {
@@ -371,7 +371,7 @@ const downloadTarball = (url, bucketName, path) => __awaiter(void 0, void 0, voi
371
371
  throw new Error(`unexpected response ${response.statusText}`);
372
372
  }
373
373
  const tmpPath = (0, path_1.join)((0, utils_1.budibaseTempDir)(), path);
374
- yield streamPipeline(response.body, zlib.Unzip(), tar_fs_1.default.extract(tmpPath));
374
+ yield streamPipeline(response.body, zlib_1.default.createUnzip(), tar_fs_1.default.extract(tmpPath));
375
375
  if (!environment_1.default.isTest() && environment_1.default.SELF_HOSTED) {
376
376
  yield (0, exports.uploadDirectory)(bucketName, tmpPath, path);
377
377
  }
@@ -1 +1 @@
1
- {"version":3,"file":"objectStore.js","sourceRoot":"","sources":["../../../src/objectStore/objectStore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"objectStore.js","sourceRoot":"","sources":["../../../src/objectStore/objectStore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AACjD,sDAAyB;AACzB,oDAA2B;AAC3B,4DAA8B;AAC9B,oDAAwB;AACxB,gDAAuB;AACvB,+BAAgC;AAChC,+BAA2B;AAC3B,4CAAmB;AACnB,iEAAgC;AAChC,mCAAyC;AACzC,+BAAyB;AACzB,8BAAkD;AAElD,MAAM,cAAc,GAAG,IAAA,gBAAS,EAAC,gBAAM,CAAC,QAAQ,CAAC,CAAA;AACjD,kEAAkE;AAClE,MAAM,KAAK,GAAG;IACZ,sBAAsB,EAAE,EAAE;CAC3B,CAAA;AAiBD,MAAM,gBAAgB,GAAQ;IAC5B,GAAG,EAAE,YAAY;IACjB,IAAI,EAAE,WAAW;IACjB,GAAG,EAAE,UAAU;IACf,EAAE,EAAE,wBAAwB;IAC5B,IAAI,EAAE,kBAAkB;IACxB,EAAE,EAAE,kBAAkB;CACvB,CAAA;AAED,MAAM,oBAAoB,GAAG;IAC3B,gBAAgB,CAAC,IAAI;IACrB,gBAAgB,CAAC,GAAG;IACpB,gBAAgB,CAAC,EAAE;IACnB,gBAAgB,CAAC,IAAI;CACtB,CAAA;AAED,2DAA2D;AAC3D,SAAgB,WAAW,CAAC,KAAa;IACvC,OAAO,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AAC5D,CAAC;AAFD,kCAEC;AAED,+CAA+C;AAC/C,SAAgB,cAAc,CAAC,KAAa;IAC1C,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,mBAAc,EAAE,GAAG,CAAC,EAAE,eAAU,CAAC,CAAA;AACnE,CAAC;AAFD,wCAEC;AAED;;;;;;GAMG;AACI,MAAM,WAAW,GAAG,CACzB,MAAc,EACd,OAAgC,EAAE,UAAU,EAAE,KAAK,EAAE,EACrD,EAAE;IACF,MAAM,MAAM,GAAQ;QAClB,gBAAgB,EAAE,IAAI;QACtB,gBAAgB,EAAE,IAAI;QACtB,UAAU,EAAE,YAAY;QACxB,WAAW,EAAE,qBAAG,CAAC,gBAAgB;QACjC,eAAe,EAAE,qBAAG,CAAC,gBAAgB;QACrC,MAAM,EAAE,qBAAG,CAAC,UAAU;KACvB,CAAA;IACD,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,MAAM,GAAG;YACd,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC;SAC/B,CAAA;KACF;IAED,iCAAiC;IACjC,IAAI,qBAAG,CAAC,SAAS,EAAE;QACjB,IAAI,IAAI,CAAC,UAAU,IAAI,qBAAG,CAAC,aAAa,EAAE;YACxC,sEAAsE;YACtE,iFAAiF;YACjF,4EAA4E;YAC5E,gGAAgG;YAChG,MAAM,CAAC,QAAQ,GAAG,eAAe,CAAA;SAClC;aAAM;YACL,MAAM,CAAC,QAAQ,GAAG,qBAAG,CAAC,SAAS,CAAA;SAChC;KACF;IAED,OAAO,IAAI,iBAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC,CAAA;AAhCY,QAAA,WAAW,eAgCvB;AAED;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAAO,MAAW,EAAE,UAAkB,EAAE,EAAE;IAC5E,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;IACvC,IAAI;QACF,MAAM,MAAM;aACT,UAAU,CAAC;YACV,MAAM,EAAE,UAAU;SACnB,CAAC;aACD,OAAO,EAAE,CAAA;KACb;IAAC,OAAO,GAAQ,EAAE;QACjB,MAAM,QAAQ,GAAQ,KAAK,CAAC,sBAAsB,CAAA;QAClD,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,KAAK,GAAG,EACxC,QAAQ,GAAG,GAAG,CAAC,UAAU,KAAK,GAAG,CAAA;QACnC,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE;YACxB,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAA;SAC3B;aAAM,IAAI,WAAW,IAAI,QAAQ,EAAE;YAClC,IAAI,WAAW,EAAE;gBACf,iCAAiC;gBACjC,QAAQ,CAAC,UAAU,CAAC,GAAG,MAAM;qBAC1B,YAAY,CAAC;oBACZ,MAAM,EAAE,UAAU;iBACnB,CAAC;qBACD,OAAO,EAAE,CAAA;gBACZ,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAA;gBAC1B,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAA;aAC5B;SACF;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;SAC3D;KACF;AACH,CAAC,CAAA,CAAA;AA7BY,QAAA,oBAAoB,wBA6BhC;AAED;;;GAGG;AACI,MAAM,MAAM,GAAG,CAAO,EAC3B,MAAM,EAAE,UAAU,EAClB,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,QAAQ,GACK,EAAE,EAAE;IACjB,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;IAC3C,MAAM,SAAS,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IAEvC,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,IAAA,4BAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAEnD,IAAI,WAAW,GAAG,IAAI,CAAA;IACtB,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,SAAS;YACrB,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAC3C,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAA;KACzB;IACD,MAAM,MAAM,GAAQ;QAClB,oEAAoE;QACpE,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC;QAC1B,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,WAAW;KACzB,CAAA;IACD,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAC5C,uFAAuF;QACvF,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACrC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;gBACvD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAA;aACrB;SACF;QACD,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;KAC3B;IACD,OAAO,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;AAC7C,CAAC,CAAA,CAAA;AAnCY,QAAA,MAAM,UAmClB;AAED;;;GAGG;AACI,MAAM,YAAY,GAAG,CAC1B,UAAkB,EAClB,QAAgB,EAChB,MAAW,EACX,KAAK,GAAG,EAAE,EACV,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,IAAA,4BAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAEnD,gDAAgD;IAChD,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC7B,KAAK,mCACA,KAAK,KACR,WAAW,EAAE,wBAAwB,GACtC,CAAA;KACF;SAAM,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;QACrC,KAAK,mCACA,KAAK,KACR,WAAW,EAAE,OAAO,GACrB,CAAA;KACF;IAED,MAAM,MAAM,mBACV,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,EAC1B,IAAI,EAAE,MAAM,IACT,KAAK,CACT,CAAA;IACD,OAAO,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;AAC7C,CAAC,CAAA,CAAA;AA7BY,QAAA,YAAY,gBA6BxB;AAED;;;GAGG;AACI,MAAM,QAAQ,GAAG,CAAO,UAAkB,EAAE,QAAgB,EAAE,EAAE;IACrE,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC;QAClC,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC;KAC3B,CAAA;IACD,MAAM,QAAQ,GAAQ,MAAM,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;IACnE,kCAAkC;IAClC,IAAI,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACvD,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;KACtC;SAAM;QACL,OAAO,QAAQ,CAAC,IAAI,CAAA;KACrB;AACH,CAAC,CAAA,CAAA;AAbY,QAAA,QAAQ,YAapB;AAEM,MAAM,cAAc,GAAG,CAAO,UAAkB,EAAE,IAAY,EAAE,EAAE;IACvE,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,CAAC,SAAqB,EAAE,EAAE,EAAE;QACvC,OAAO,WAAW;aACf,aAAa,iCACT,MAAM,KACT,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,IACzB;aACD,OAAO,EAAE,CAAA;IACd,CAAC,CAAA;IACD,IAAI,WAAW,GAAG,KAAK,EACrB,KAAK,EACL,OAAO,GAA0B,EAAE,CAAA;IACrC,GAAG;QACD,IAAI,MAAM,GAAe,EAAE,CAAA;QAC3B,IAAI,KAAK,EAAE;YACT,MAAM,CAAC,iBAAiB,GAAG,KAAK,CAAA;SACjC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAA;QACnC,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACrB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;SAC5C;QACD,WAAW,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAA;KACrC,QAAQ,WAAW,EAAC;IACrB,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA,CAAA;AA1BY,QAAA,cAAc,kBA0B1B;AAED;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,UAAkB,EAClB,GAAW,EACX,kBAA0B,IAAI,EAC9B,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IACjE,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC;QAClC,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC;QACrB,OAAO,EAAE,eAAe;KACzB,CAAA;IACD,MAAM,GAAG,GAAG,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAEzD,IAAI,CAAC,qBAAG,CAAC,aAAa,EAAE;QACtB,oCAAoC;QACpC,OAAO,GAAG,CAAA;KACX;SAAM;QACL,qCAAqC;QACrC,mDAAmD;QACnD,uCAAuC;QACvC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QAC9B,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAA;QAC/B,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAA;QAC9B,OAAO,gBAAgB,IAAI,GAAG,KAAK,EAAE,CAAA;KACtC;AACH,CAAC,CAAA;AAzBY,QAAA,eAAe,mBAyB3B;AAED;;GAEG;AACI,MAAM,aAAa,GAAG,CAAO,UAAkB,EAAE,QAAgB,EAAE,EAAE;IAC1E,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;IACvC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;IAChC,MAAM,IAAI,GAAG,MAAM,IAAA,gBAAQ,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,IAAA,uBAAe,GAAE,EAAE,IAAA,SAAE,GAAE,CAAC,CAAA;IAChD,YAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAClC,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAEM,MAAM,iBAAiB,GAAG,CAAO,UAAkB,EAAE,IAAY,EAAE,EAAE;IAC1E,IAAI,SAAS,GAAG,IAAA,WAAI,EAAC,IAAA,uBAAe,GAAE,EAAE,IAAA,SAAE,GAAE,CAAC,CAAA;IAC7C,YAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACvB,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAc,EAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACtD,IAAI,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAA,gBAAQ,EAAC,UAAU,EAAE,GAAG,CAAC,GAAI,CAAC,CAAC,CACnD,CAAA;IACD,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,KAAK,IAAI,GAAG,IAAI,OAAO,EAAE;QACvB,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAI,CAAA;QACzB,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,CAAC,CAAA;QACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACxC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAC3D,YAAE,CAAC,SAAS,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SAC5D;QACD,YAAE,CAAC,aAAa,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,IAAI,CAAC,CAAA;KACzD;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA,CAAA;AAnBY,QAAA,iBAAiB,qBAmB7B;AAED;;GAEG;AACI,MAAM,UAAU,GAAG,CAAO,UAAkB,EAAE,QAAgB,EAAE,EAAE;IACvE,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,IAAA,4BAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IACnD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC;KAC3B,CAAA;IACD,OAAO,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;AACnD,CAAC,CAAA,CAAA;AARY,QAAA,UAAU,cAQtB;AAEM,MAAM,WAAW,GAAG,CAAO,UAAkB,EAAE,SAAmB,EAAE,EAAE;IAC3E,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,IAAA,4BAAoB,EAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IACnD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE;YACN,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACpE;KACF,CAAA;IACD,OAAO,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;AACpD,CAAC,CAAA,CAAA;AAVY,QAAA,WAAW,eAUvB;AAED;;GAEG;AACI,MAAM,YAAY,GAAG,CAC1B,UAAkB,EAClB,MAAc,EACA,EAAE;;IAChB,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;IACvC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IAC5B,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAA;IACtC,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,MAAM;KACf,CAAA;IAED,MAAM,uBAAuB,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAA;IAC9E,IAAI,CAAA,MAAA,uBAAuB,CAAC,QAAQ,0CAAE,MAAM,MAAK,CAAC,EAAE;QAClD,OAAM;KACP;IACD,MAAM,YAAY,GAAQ;QACxB,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE;YACN,OAAO,EAAE,EAAE;SACZ;KACF,CAAA;IAED,MAAA,uBAAuB,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;QACzD,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAA;IACzE,oCAAoC;IACpC,IAAI,CAAA,MAAA,cAAc,CAAC,OAAO,0CAAE,MAAM,MAAK,IAAI,EAAE;QAC3C,OAAO,IAAA,oBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAA;KACxC;AACH,CAAC,CAAA,CAAA;AAhCY,QAAA,YAAY,gBAgCxB;AAEM,MAAM,eAAe,GAAG,CAC7B,UAAkB,EAClB,SAAiB,EACjB,UAAkB,EAClB,EAAE;IACF,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;IACvC,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,MAAM,KAAK,GAAG,YAAE,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;IAChE,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;QACtB,MAAM,IAAI,GAAG,WAAW,CAAC,IAAA,WAAI,EAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACrD,MAAM,KAAK,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACxC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;YACtB,OAAO,CAAC,IAAI,CAAC,IAAA,uBAAe,EAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;SACvD;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,IAAA,oBAAY,EAAC,UAAU,EAAE,IAAI,EAAE,YAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SACzE;KACF;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC1B,OAAO,KAAK,CAAA;AACd,CAAC,CAAA,CAAA;AAnBY,QAAA,eAAe,mBAmB3B;AAEM,MAAM,qBAAqB,GAAG,CACnC,GAAW,EACX,IAAY,EACZ,OAAO,GAAG,EAAE,EACZ,EAAE;IACF,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;IACxB,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;KAC9D;IAED,MAAM,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAI,CAAC,WAAW,EAAE,EAAE,gBAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;AAC5E,CAAC,CAAA,CAAA;AAZY,QAAA,qBAAqB,yBAYjC;AAEM,MAAM,eAAe,GAAG,CAC7B,GAAW,EACX,UAAkB,EAClB,IAAY,EACZ,EAAE;IACF,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;IACvC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;IACxB,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,CAAC,CAAA;IACjC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;KAC9D;IAED,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,IAAA,uBAAe,GAAE,EAAE,IAAI,CAAC,CAAA;IAC7C,MAAM,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAI,CAAC,WAAW,EAAE,EAAE,gBAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IAC7E,IAAI,CAAC,qBAAG,CAAC,MAAM,EAAE,IAAI,qBAAG,CAAC,WAAW,EAAE;QACpC,MAAM,IAAA,uBAAe,EAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;KACjD;IACD,yDAAyD;IACzD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA,CAAA;AAnBY,QAAA,eAAe,mBAmB3B"}