@lenne.tech/nest-server 11.32.4 → 11.33.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 (260) hide show
  1. package/.claude/rules/architecture.md +16 -0
  2. package/.claude/rules/configurable-features.md +11 -3
  3. package/.claude/rules/testing.md +101 -1
  4. package/CLAUDE.md +5 -0
  5. package/FRAMEWORK-API.md +58 -3
  6. package/dist/core/common/helpers/content-disposition.helper.d.ts +1 -0
  7. package/dist/core/common/helpers/content-disposition.helper.js +14 -0
  8. package/dist/core/common/helpers/content-disposition.helper.js.map +1 -0
  9. package/dist/core/common/helpers/file.helper.d.ts +7 -0
  10. package/dist/core/common/helpers/file.helper.js +21 -4
  11. package/dist/core/common/helpers/file.helper.js.map +1 -1
  12. package/dist/core/common/helpers/graceful-shutdown.helper.d.ts +2 -0
  13. package/dist/core/common/helpers/graceful-shutdown.helper.js +55 -0
  14. package/dist/core/common/helpers/graceful-shutdown.helper.js.map +1 -0
  15. package/dist/core/common/helpers/project-name.helper.d.ts +2 -0
  16. package/dist/core/common/helpers/project-name.helper.js +38 -0
  17. package/dist/core/common/helpers/project-name.helper.js.map +1 -0
  18. package/dist/core/common/interfaces/cron-job-config.interface.d.ts +1 -0
  19. package/dist/core/common/interfaces/server-options.interface.d.ts +39 -0
  20. package/dist/core/common/services/core-cron-jobs.initializer.d.ts +10 -0
  21. package/dist/core/common/services/core-cron-jobs.initializer.js +46 -0
  22. package/dist/core/common/services/core-cron-jobs.initializer.js.map +1 -0
  23. package/dist/core/common/services/core-cron-jobs.registry.d.ts +8 -0
  24. package/dist/core/common/services/core-cron-jobs.registry.js +12 -0
  25. package/dist/core/common/services/core-cron-jobs.registry.js.map +1 -0
  26. package/dist/core/common/services/core-cron-jobs.service.d.ts +37 -7
  27. package/dist/core/common/services/core-cron-jobs.service.js +278 -27
  28. package/dist/core/common/services/core-cron-jobs.service.js.map +1 -1
  29. package/dist/core/common/services/core-redis-pubsub.d.ts +20 -0
  30. package/dist/core/common/services/core-redis-pubsub.js +112 -0
  31. package/dist/core/common/services/core-redis-pubsub.js.map +1 -0
  32. package/dist/core/common/services/core-redis.service.d.ts +25 -0
  33. package/dist/core/common/services/core-redis.service.js +154 -0
  34. package/dist/core/common/services/core-redis.service.js.map +1 -0
  35. package/dist/core/common/services/core-s3.service.d.ts +51 -0
  36. package/dist/core/common/services/core-s3.service.js +261 -0
  37. package/dist/core/common/services/core-s3.service.js.map +1 -0
  38. package/dist/core/common/services/core-trust-proxy.initializer.d.ts +16 -0
  39. package/dist/core/common/services/core-trust-proxy.initializer.js +77 -0
  40. package/dist/core/common/services/core-trust-proxy.initializer.js.map +1 -0
  41. package/dist/core/common/services/rate-limit-store.d.ts +61 -0
  42. package/dist/core/common/services/rate-limit-store.js +235 -0
  43. package/dist/core/common/services/rate-limit-store.js.map +1 -0
  44. package/dist/core/modules/ai/core-ai-mcp.controller.d.ts +19 -3
  45. package/dist/core/modules/ai/core-ai-mcp.controller.js +148 -18
  46. package/dist/core/modules/ai/core-ai-mcp.controller.js.map +1 -1
  47. package/dist/core/modules/ai/services/core-ai.service.d.ts +7 -2
  48. package/dist/core/modules/ai/services/core-ai.service.js +24 -20
  49. package/dist/core/modules/ai/services/core-ai.service.js.map +1 -1
  50. package/dist/core/modules/auth/core-auth.module.js +4 -1
  51. package/dist/core/modules/auth/core-auth.module.js.map +1 -1
  52. package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.d.ts +1 -1
  53. package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.js +3 -14
  54. package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.js.map +1 -1
  55. package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.d.ts +12 -10
  56. package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js +30 -59
  57. package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js.map +1 -1
  58. package/dist/core/modules/better-auth/core-better-auth-email-verification.service.d.ts +8 -2
  59. package/dist/core/modules/better-auth/core-better-auth-email-verification.service.js +118 -45
  60. package/dist/core/modules/better-auth/core-better-auth-email-verification.service.js.map +1 -1
  61. package/dist/core/modules/better-auth/core-better-auth-rate-limit.middleware.d.ts +1 -1
  62. package/dist/core/modules/better-auth/core-better-auth-rate-limit.middleware.js +2 -11
  63. package/dist/core/modules/better-auth/core-better-auth-rate-limit.middleware.js.map +1 -1
  64. package/dist/core/modules/better-auth/core-better-auth-rate-limiter.service.d.ts +12 -10
  65. package/dist/core/modules/better-auth/core-better-auth-rate-limiter.service.js +30 -85
  66. package/dist/core/modules/better-auth/core-better-auth-rate-limiter.service.js.map +1 -1
  67. package/dist/core/modules/better-auth/core-better-auth-user.mapper.js +0 -1
  68. package/dist/core/modules/better-auth/core-better-auth-user.mapper.js.map +1 -1
  69. package/dist/core/modules/file/core-file.controller.d.ts +11 -2
  70. package/dist/core/modules/file/core-file.controller.js +52 -15
  71. package/dist/core/modules/file/core-file.controller.js.map +1 -1
  72. package/dist/core/modules/file/core-file.resolver.d.ts +4 -4
  73. package/dist/core/modules/file/core-file.resolver.js +23 -16
  74. package/dist/core/modules/file/core-file.resolver.js.map +1 -1
  75. package/dist/core/modules/file/core-file.service.d.ts +41 -7
  76. package/dist/core/modules/file/core-file.service.js +227 -7
  77. package/dist/core/modules/file/core-file.service.js.map +1 -1
  78. package/dist/core/modules/file/file-metadata.helper.d.ts +16 -0
  79. package/dist/core/modules/file/file-metadata.helper.js +33 -0
  80. package/dist/core/modules/file/file-metadata.helper.js.map +1 -0
  81. package/dist/core/modules/file/file-roles.helper.d.ts +4 -0
  82. package/dist/core/modules/file/file-roles.helper.js +53 -0
  83. package/dist/core/modules/file/file-roles.helper.js.map +1 -0
  84. package/dist/core/modules/file/file-storage.helper.d.ts +13 -0
  85. package/dist/core/modules/file/file-storage.helper.js +65 -0
  86. package/dist/core/modules/file/file-storage.helper.js.map +1 -0
  87. package/dist/core/modules/file/filesystem-file.helper.d.ts +22 -0
  88. package/dist/core/modules/file/filesystem-file.helper.js +77 -0
  89. package/dist/core/modules/file/filesystem-file.helper.js.map +1 -0
  90. package/dist/core/modules/file/interfaces/file-service-options.interface.d.ts +1 -0
  91. package/dist/core/modules/file/interfaces/file-upload.interface.d.ts +7 -1
  92. package/dist/core/modules/file/s3-file.helper.d.ts +37 -0
  93. package/dist/core/modules/file/s3-file.helper.js +81 -0
  94. package/dist/core/modules/file/s3-file.helper.js.map +1 -0
  95. package/dist/core/modules/hub/core-hub.controller.d.ts +8 -8
  96. package/dist/core/modules/hub/core-hub.controller.js +24 -22
  97. package/dist/core/modules/hub/core-hub.controller.js.map +1 -1
  98. package/dist/core/modules/hub/helpers/hub-mask.helper.js +2 -2
  99. package/dist/core/modules/hub/helpers/hub-mask.helper.js.map +1 -1
  100. package/dist/core/modules/hub/hub-buffer.d.ts +23 -0
  101. package/dist/core/modules/hub/hub-buffer.js +101 -0
  102. package/dist/core/modules/hub/hub-buffer.js.map +1 -0
  103. package/dist/core/modules/hub/services/core-hub-mailbox.service.d.ts +7 -5
  104. package/dist/core/modules/hub/services/core-hub-mailbox.service.js +14 -10
  105. package/dist/core/modules/hub/services/core-hub-mailbox.service.js.map +1 -1
  106. package/dist/core/modules/hub/services/hub-log-buffer.service.d.ts +5 -2
  107. package/dist/core/modules/hub/services/hub-log-buffer.service.js +17 -8
  108. package/dist/core/modules/hub/services/hub-log-buffer.service.js.map +1 -1
  109. package/dist/core/modules/hub/services/hub-query-profiler.service.d.ts +4 -2
  110. package/dist/core/modules/hub/services/hub-query-profiler.service.js +13 -7
  111. package/dist/core/modules/hub/services/hub-query-profiler.service.js.map +1 -1
  112. package/dist/core/modules/hub/services/hub-trace-buffer.service.d.ts +4 -2
  113. package/dist/core/modules/hub/services/hub-trace-buffer.service.js +13 -8
  114. package/dist/core/modules/hub/services/hub-trace-buffer.service.js.map +1 -1
  115. package/dist/core/modules/migrate/helpers/migration.helper.d.ts +2 -6
  116. package/dist/core/modules/migrate/helpers/migration.helper.js +4 -4
  117. package/dist/core/modules/migrate/helpers/migration.helper.js.map +1 -1
  118. package/dist/core/modules/migrate/migration-runner.d.ts +1 -0
  119. package/dist/core/modules/migrate/migration-runner.js +4 -0
  120. package/dist/core/modules/migrate/migration-runner.js.map +1 -1
  121. package/dist/core/modules/migrate/mongo-state-store.d.ts +1 -0
  122. package/dist/core/modules/migrate/mongo-state-store.js +98 -9
  123. package/dist/core/modules/migrate/mongo-state-store.js.map +1 -1
  124. package/dist/core/modules/system-setup/core-system-setup.service.d.ts +2 -0
  125. package/dist/core/modules/system-setup/core-system-setup.service.js +31 -1
  126. package/dist/core/modules/system-setup/core-system-setup.service.js.map +1 -1
  127. package/dist/core/modules/tenant/core-tenant.guard.d.ts +17 -3
  128. package/dist/core/modules/tenant/core-tenant.guard.js +92 -15
  129. package/dist/core/modules/tenant/core-tenant.guard.js.map +1 -1
  130. package/dist/core/modules/tenant/core-tenant.module.js +3 -4
  131. package/dist/core/modules/tenant/core-tenant.module.js.map +1 -1
  132. package/dist/core/modules/tus/core-tus.controller.d.ts +2 -0
  133. package/dist/core/modules/tus/core-tus.controller.js +29 -3
  134. package/dist/core/modules/tus/core-tus.controller.js.map +1 -1
  135. package/dist/core/modules/tus/core-tus.service.d.ts +24 -1
  136. package/dist/core/modules/tus/core-tus.service.js +182 -28
  137. package/dist/core/modules/tus/core-tus.service.js.map +1 -1
  138. package/dist/core/modules/tus/interfaces/tus-config.interface.js +3 -0
  139. package/dist/core/modules/tus/interfaces/tus-config.interface.js.map +1 -1
  140. package/dist/core/modules/tus/tus-redis-locker.d.ts +25 -0
  141. package/dist/core/modules/tus/tus-redis-locker.js +87 -0
  142. package/dist/core/modules/tus/tus-redis-locker.js.map +1 -0
  143. package/dist/core/modules/tus/tus.module.d.ts +1 -0
  144. package/dist/core/modules/tus/tus.module.js +30 -4
  145. package/dist/core/modules/tus/tus.module.js.map +1 -1
  146. package/dist/core.module.js +18 -1
  147. package/dist/core.module.js.map +1 -1
  148. package/dist/index.d.ts +10 -0
  149. package/dist/index.js +10 -0
  150. package/dist/index.js.map +1 -1
  151. package/dist/main.js +2 -1
  152. package/dist/main.js.map +1 -1
  153. package/dist/server/modules/file/file.controller.js.map +1 -1
  154. package/dist/server/modules/file/file.resolver.js +1 -12
  155. package/dist/server/modules/file/file.resolver.js.map +1 -1
  156. package/dist/server/modules/file/file.service.d.ts +5 -1
  157. package/dist/server/modules/file/file.service.js +12 -3
  158. package/dist/server/modules/file/file.service.js.map +1 -1
  159. package/dist/server/modules/user/avatar.controller.d.ts +5 -1
  160. package/dist/server/modules/user/avatar.controller.js +26 -10
  161. package/dist/server/modules/user/avatar.controller.js.map +1 -1
  162. package/dist/server/modules/user/user.model.js +3 -2
  163. package/dist/server/modules/user/user.model.js.map +1 -1
  164. package/dist/server/modules/user/user.module.js +6 -2
  165. package/dist/server/modules/user/user.module.js.map +1 -1
  166. package/dist/server/modules/user/user.service.d.ts +1 -1
  167. package/dist/server/modules/user/user.service.js +6 -13
  168. package/dist/server/modules/user/user.service.js.map +1 -1
  169. package/dist/tsconfig.build.tsbuildinfo +1 -1
  170. package/docs/REQUEST-LIFECYCLE.md +57 -8
  171. package/docs/security-overrides.md +21 -3
  172. package/migration-guides/11.32.3-to-11.32.4.md +15 -3
  173. package/migration-guides/11.32.x-to-11.33.x.md +1551 -0
  174. package/package.json +74 -42
  175. package/src/core/common/helpers/content-disposition.helper.ts +90 -0
  176. package/src/core/common/helpers/file.helper.ts +53 -10
  177. package/src/core/common/helpers/graceful-shutdown.helper.ts +116 -0
  178. package/src/core/common/helpers/project-name.helper.ts +71 -0
  179. package/src/core/common/interfaces/cron-job-config.interface.ts +16 -0
  180. package/src/core/common/interfaces/server-options.interface.ts +439 -2
  181. package/src/core/common/services/core-cron-jobs.initializer.ts +39 -0
  182. package/src/core/common/services/core-cron-jobs.registry.ts +45 -0
  183. package/src/core/common/services/core-cron-jobs.service.ts +589 -47
  184. package/src/core/common/services/core-redis-pubsub.ts +183 -0
  185. package/src/core/common/services/core-redis.service.ts +249 -0
  186. package/src/core/common/services/core-s3.service.ts +465 -0
  187. package/src/core/common/services/core-trust-proxy.initializer.ts +112 -0
  188. package/src/core/common/services/rate-limit-store.ts +492 -0
  189. package/src/core/modules/ai/README.md +25 -0
  190. package/src/core/modules/ai/core-ai-mcp.controller.ts +253 -22
  191. package/src/core/modules/ai/services/core-ai.service.ts +33 -24
  192. package/src/core/modules/auth/core-auth.module.ts +7 -1
  193. package/src/core/modules/auth/guards/legacy-auth-rate-limit.guard.ts +12 -21
  194. package/src/core/modules/auth/services/legacy-auth-rate-limiter.service.ts +49 -93
  195. package/src/core/modules/better-auth/core-better-auth-email-verification.service.ts +202 -66
  196. package/src/core/modules/better-auth/core-better-auth-rate-limit.middleware.ts +11 -18
  197. package/src/core/modules/better-auth/core-better-auth-rate-limiter.service.ts +51 -132
  198. package/src/core/modules/better-auth/core-better-auth-user.mapper.ts +7 -1
  199. package/src/core/modules/file/INTEGRATION-CHECKLIST.md +108 -0
  200. package/src/core/modules/file/README.md +277 -53
  201. package/src/core/modules/file/core-file.controller.ts +168 -12
  202. package/src/core/modules/file/core-file.resolver.ts +46 -12
  203. package/src/core/modules/file/core-file.service.ts +482 -16
  204. package/src/core/modules/file/file-metadata.helper.ts +142 -0
  205. package/src/core/modules/file/file-roles.helper.ts +110 -0
  206. package/src/core/modules/file/file-storage.helper.ts +163 -0
  207. package/src/core/modules/file/filesystem-file.helper.ts +184 -0
  208. package/src/core/modules/file/interfaces/file-service-options.interface.ts +14 -0
  209. package/src/core/modules/file/interfaces/file-upload.interface.ts +17 -1
  210. package/src/core/modules/file/s3-file.helper.ts +209 -0
  211. package/src/core/modules/hub/README.md +48 -0
  212. package/src/core/modules/hub/core-hub.controller.ts +18 -16
  213. package/src/core/modules/hub/helpers/hub-mask.helper.ts +21 -4
  214. package/src/core/modules/hub/hub-buffer.ts +198 -0
  215. package/src/core/modules/hub/services/core-hub-mailbox.service.ts +22 -12
  216. package/src/core/modules/hub/services/hub-log-buffer.service.ts +24 -8
  217. package/src/core/modules/hub/services/hub-query-profiler.service.ts +9 -6
  218. package/src/core/modules/hub/services/hub-trace-buffer.service.ts +14 -9
  219. package/src/core/modules/migrate/README.md +33 -6
  220. package/src/core/modules/migrate/helpers/migration.helper.ts +13 -6
  221. package/src/core/modules/migrate/migration-runner.ts +10 -1
  222. package/src/core/modules/migrate/mongo-state-store.ts +179 -11
  223. package/src/core/modules/system-setup/README.md +7 -2
  224. package/src/core/modules/system-setup/core-system-setup.service.ts +95 -1
  225. package/src/core/modules/tenant/README.md +21 -1
  226. package/src/core/modules/tenant/core-tenant.guard.ts +135 -14
  227. package/src/core/modules/tenant/core-tenant.module.ts +8 -4
  228. package/src/core/modules/tus/INTEGRATION-CHECKLIST.md +93 -21
  229. package/src/core/modules/tus/README.md +35 -2
  230. package/src/core/modules/tus/core-tus.controller.ts +64 -12
  231. package/src/core/modules/tus/core-tus.service.ts +358 -34
  232. package/src/core/modules/tus/interfaces/tus-config.interface.ts +9 -0
  233. package/src/core/modules/tus/tus-redis-locker.ts +139 -0
  234. package/src/core/modules/tus/tus.module.ts +78 -6
  235. package/src/core.module.ts +26 -1
  236. package/src/index.ts +10 -0
  237. package/src/main.ts +7 -1
  238. package/src/server/modules/file/file.controller.ts +7 -3
  239. package/src/server/modules/file/file.resolver.ts +5 -17
  240. package/src/server/modules/file/file.service.ts +42 -3
  241. package/src/server/modules/user/avatar.controller.ts +39 -9
  242. package/src/server/modules/user/user.model.ts +9 -3
  243. package/src/server/modules/user/user.module.ts +12 -3
  244. package/src/server/modules/user/user.service.ts +20 -17
  245. package/src/test/README.md +7 -2
  246. package/src/core/common/helpers/file.helper.spec.ts +0 -145
  247. package/src/core/common/helpers/logging.helper.spec.ts +0 -61
  248. package/src/core/common/helpers/process-diagnostics.helper.spec.ts +0 -310
  249. package/src/core/common/services/brevo.service.spec.ts +0 -266
  250. package/src/core/modules/file/core-file.controller.spec.ts +0 -164
  251. package/src/core/modules/hub/core-hub.module.spec.ts +0 -108
  252. package/src/core/modules/hub/helpers/hub-command-shape.helper.spec.ts +0 -48
  253. package/src/core/modules/hub/helpers/hub-mask.helper.spec.ts +0 -67
  254. package/src/core/modules/hub/helpers/hub-mermaid.helper.spec.ts +0 -61
  255. package/src/core/modules/hub/helpers/hub-shell.helper.spec.ts +0 -106
  256. package/src/core/modules/hub/hub-config.helper.spec.ts +0 -108
  257. package/src/core/modules/hub/hub-ring-buffer.spec.ts +0 -95
  258. package/src/core/modules/hub/services/core-hub-mailbox.service.spec.ts +0 -116
  259. package/src/core/modules/hub/services/hub-trace-buffer.service.spec.ts +0 -112
  260. package/src/core/modules/migrate/helpers/migration.helper.spec.ts +0 -85
@@ -1,4 +1,5 @@
1
1
  import { Db, ObjectId } from 'mongodb';
2
+ import { MongoStateStore } from '../mongo-state-store';
2
3
  export declare const _startMigration: () => void;
3
4
  export declare const _endMigration: () => Promise<void>;
4
5
  export declare const getDb: (mongoUrl: string) => Promise<Db>;
@@ -7,9 +8,4 @@ export declare const uploadFileToGridFS: (mongoUrl: string, relativePath: string
7
8
  bucketName?: string;
8
9
  filename?: string;
9
10
  }) => Promise<ObjectId>;
10
- export declare const createMigrationStore: (mongoUrl: string, collectionName?: string, lockCollectionName?: string) => {
11
- new (): {
12
- [x: string]: any;
13
- };
14
- [x: string]: any;
15
- };
11
+ export declare const createMigrationStore: (mongoUrl: string, collectionName?: string, lockCollectionName?: string) => new () => MongoStateStore;
@@ -4,6 +4,7 @@ exports.createMigrationStore = exports.uploadFileToGridFS = exports.assertGridFs
4
4
  const fs = require("fs");
5
5
  const mongodb_1 = require("mongodb");
6
6
  const path = require("path");
7
+ const mongo_state_store_1 = require("../mongo-state-store");
7
8
  const activeConnections = new Set();
8
9
  let inMigrationContext = false;
9
10
  const _startMigration = () => {
@@ -96,13 +97,12 @@ const uploadFileToGridFS = async (mongoUrl, relativePath, options) => {
96
97
  });
97
98
  };
98
99
  exports.uploadFileToGridFS = uploadFileToGridFS;
99
- const createMigrationStore = (mongoUrl, collectionName = 'migrations', lockCollectionName) => {
100
- const { MongoStateStore } = require('../mongo-state-store');
101
- return class MigrationStateStore extends MongoStateStore {
100
+ const createMigrationStore = (mongoUrl, collectionName = 'migrations', lockCollectionName = 'migrations_lock') => {
101
+ return class MigrationStateStore extends mongo_state_store_1.MongoStateStore {
102
102
  constructor() {
103
103
  super({
104
104
  collectionName,
105
- lockCollectionName,
105
+ lockCollectionName: lockCollectionName || undefined,
106
106
  uri: mongoUrl,
107
107
  });
108
108
  }
@@ -1 +1 @@
1
- {"version":3,"file":"migration.helper.js","sourceRoot":"","sources":["../../../../../src/core/modules/migrate/helpers/migration.helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"migration.helper.js","sourceRoot":"","sources":["../../../../../src/core/modules/migrate/helpers/migration.helper.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,7 @@ export declare class MigrationRunner {
21
21
  constructor(options: MigrationRunnerOptions);
22
22
  private loadMigrationFiles;
23
23
  up(): Promise<void>;
24
+ protected runUp(): Promise<void>;
24
25
  down(): Promise<void>;
25
26
  status(): Promise<{
26
27
  completed: string[];
@@ -5,6 +5,7 @@ exports.migrationId = migrationId;
5
5
  exports.parseStrictEnv = parseStrictEnv;
6
6
  const fs = require("fs");
7
7
  const path = require("path");
8
+ const mongo_state_store_1 = require("./mongo-state-store");
8
9
  exports.DEFAULT_MIGRATION_FILE_PATTERN = /(?:(?<!\.d)\.ts|\.js)$/;
9
10
  const MIGRATION_EXTENSION_PATTERN = /\.(ts|js)$/;
10
11
  function migrationId(title) {
@@ -67,6 +68,9 @@ class MigrationRunner {
67
68
  return migrations;
68
69
  }
69
70
  async up() {
71
+ await (0, mongo_state_store_1.withMigrationLock)(this.options.stateStore, () => this.runUp());
72
+ }
73
+ async runUp() {
70
74
  const { _endMigration, _startMigration } = await Promise.resolve().then(() => require('./helpers/migration.helper'));
71
75
  const allMigrations = await this.loadMigrationFiles();
72
76
  const state = await this.options.stateStore.loadAsync();
@@ -1 +1 @@
1
- {"version":3,"file":"migration-runner.js","sourceRoot":"","sources":["../../../../src/core/modules/migrate/migration-runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"migration-runner.js","sourceRoot":"","sources":["../../../../src/core/modules/migrate/migration-runner.ts"],"names":[],"mappings":"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"}
@@ -28,3 +28,4 @@ export declare class MongoStateStore {
28
28
  }
29
29
  export declare function synchronizedMigration(opts: MigrationOptions, callback: (set: MigrationSet) => Promise<void>): Promise<void>;
30
30
  export declare function synchronizedUp(opts: MigrationOptions): Promise<void>;
31
+ export declare function withMigrationLock<T>(stateStore: MongoStateStore, fn: () => Promise<T>): Promise<T>;
@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.MongoStateStore = void 0;
4
4
  exports.synchronizedMigration = synchronizedMigration;
5
5
  exports.synchronizedUp = synchronizedUp;
6
+ exports.withMigrationLock = withMigrationLock;
7
+ const crypto_1 = require("crypto");
6
8
  const mongodb_1 = require("mongodb");
9
+ const os_1 = require("os");
7
10
  const util_1 = require("util");
8
11
  class MongoStateStore {
9
12
  collectionName;
@@ -58,13 +61,19 @@ async function synchronizedMigration(opts, callback) {
58
61
  if (typeof lockCollectionName !== 'string') {
59
62
  throw new Error('`lockCollectionName` in MongoStateStore is not set');
60
63
  }
64
+ let heartbeat;
65
+ let lockToken;
61
66
  try {
62
- await acquireLock(stateStore.mongodbHost, lockCollectionName);
67
+ lockToken = await acquireLock(stateStore.mongodbHost, lockCollectionName);
68
+ heartbeat = startLockHeartbeat(stateStore.mongodbHost, lockCollectionName, lockToken);
63
69
  const set = await stateStore.loadAsync();
64
70
  await callback(set);
65
71
  }
66
72
  finally {
67
- await releaseLock(stateStore.mongodbHost, lockCollectionName);
73
+ heartbeat?.stop();
74
+ if (lockToken) {
75
+ await releaseLock(stateStore.mongodbHost, lockCollectionName, lockToken);
76
+ }
68
77
  }
69
78
  }
70
79
  async function synchronizedUp(opts) {
@@ -72,16 +81,93 @@ async function synchronizedUp(opts) {
72
81
  await (0, util_1.promisify)(loadedSet.up).call(loadedSet);
73
82
  });
74
83
  }
84
+ async function withMigrationLock(stateStore, fn) {
85
+ const lockCollectionName = stateStore.lockCollectionName;
86
+ if (!lockCollectionName) {
87
+ return fn();
88
+ }
89
+ const token = await acquireLock(stateStore.mongodbHost, lockCollectionName);
90
+ const heartbeat = startLockHeartbeat(stateStore.mongodbHost, lockCollectionName, token);
91
+ try {
92
+ return await fn();
93
+ }
94
+ finally {
95
+ heartbeat.stop();
96
+ await releaseLock(stateStore.mongodbHost, lockCollectionName, token);
97
+ }
98
+ }
99
+ const LOCK_STALE_AFTER_MS = 60_000;
100
+ const LOCK_HEARTBEAT_INTERVAL_MS = 15_000;
101
+ const LOCK_WAIT_TIMEOUT_MS = 15 * 60_000;
102
+ function startLockHeartbeat(url, lockCollectionName, token) {
103
+ let client;
104
+ let stopped = false;
105
+ const beat = async () => {
106
+ if (stopped) {
107
+ return;
108
+ }
109
+ if (!client) {
110
+ const connected = await mongodb_1.MongoClient.connect(url);
111
+ if (stopped) {
112
+ await connected.close();
113
+ return;
114
+ }
115
+ client = connected;
116
+ }
117
+ await client
118
+ .db()
119
+ .collection(lockCollectionName)
120
+ .updateOne({ lock: 'lock', owner: token }, { $set: { acquiredAt: new Date() } });
121
+ };
122
+ const timer = setInterval(() => {
123
+ beat().catch((error) => {
124
+ console.warn(`Migration lock heartbeat failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
125
+ const broken = client;
126
+ client = undefined;
127
+ void broken?.close().catch(() => undefined);
128
+ });
129
+ }, LOCK_HEARTBEAT_INTERVAL_MS);
130
+ timer.unref?.();
131
+ return {
132
+ stop: () => {
133
+ stopped = true;
134
+ clearInterval(timer);
135
+ const open = client;
136
+ client = undefined;
137
+ void open?.close().catch(() => undefined);
138
+ },
139
+ };
140
+ }
75
141
  async function acquireLock(url, lockCollectionName) {
76
- await dbRequest(url, async (db) => {
142
+ return dbRequest(url, async (db) => {
77
143
  const collection = db.collection(lockCollectionName);
78
144
  await collection.createIndex({ lock: 1 }, { unique: true });
145
+ const token = lockOwnerId();
146
+ const deadline = Date.now() + LOCK_WAIT_TIMEOUT_MS;
79
147
  let showMessage = true;
80
148
  for (;;) {
81
- const result = await collection.updateOne({ lock: 'lock' }, { $set: { lock: 'lock' } }, { upsert: true });
82
- const lockAcquired = result.upsertedCount > 0;
83
- if (lockAcquired) {
84
- break;
149
+ const result = await collection.updateOne({ lock: 'lock' }, { $set: { lock: 'lock' }, $setOnInsert: { acquiredAt: new Date(), owner: token } }, { upsert: true });
150
+ if (result.upsertedCount > 0) {
151
+ return token;
152
+ }
153
+ const holder = await collection.findOne({ lock: 'lock' });
154
+ if (holder) {
155
+ const acquiredAt = holder.acquiredAt instanceof Date ? holder.acquiredAt : undefined;
156
+ if (!acquiredAt) {
157
+ await collection.updateOne({ _id: holder._id, acquiredAt: { $exists: false } }, { $set: { acquiredAt: new Date() } });
158
+ }
159
+ else if (Date.now() - acquiredAt.getTime() > LOCK_STALE_AFTER_MS) {
160
+ console.warn(`Breaking stale migration lock in "${lockCollectionName}" (last heartbeat ${acquiredAt.toISOString()}, ` +
161
+ `owner ${holder.owner ?? 'unknown'}) — its holder is gone.`);
162
+ await collection.deleteOne({ _id: holder._id, acquiredAt });
163
+ continue;
164
+ }
165
+ }
166
+ if (Date.now() > deadline) {
167
+ throw new Error(`Timed out after ${Math.round(LOCK_WAIT_TIMEOUT_MS / 60_000)} minutes waiting for the migration lock in ` +
168
+ `collection "${lockCollectionName}". Another replica is still migrating, or the lock is held by a process ` +
169
+ `that is alive but stuck. Inspect it with: db.getCollection("${lockCollectionName}").find({}) — and remove ` +
170
+ `the document only once you are sure no migration is running.`);
85
171
  }
86
172
  if (showMessage) {
87
173
  console.debug('Waiting for migration lock release …');
@@ -91,6 +177,9 @@ async function acquireLock(url, lockCollectionName) {
91
177
  }
92
178
  });
93
179
  }
180
+ function lockOwnerId() {
181
+ return `${(0, os_1.hostname)()}:${process.pid}:${(0, crypto_1.randomUUID)()}`;
182
+ }
94
183
  async function dbRequest(url, callback) {
95
184
  let client;
96
185
  try {
@@ -102,7 +191,7 @@ async function dbRequest(url, callback) {
102
191
  await client?.close();
103
192
  }
104
193
  }
105
- async function releaseLock(url, lockCollectionName) {
106
- await dbRequest(url, (db) => db.collection(lockCollectionName).deleteOne({ lock: 'lock' }));
194
+ async function releaseLock(url, lockCollectionName, token) {
195
+ await dbRequest(url, (db) => db.collection(lockCollectionName).deleteOne({ lock: 'lock', owner: token }));
107
196
  }
108
197
  //# sourceMappingURL=mongo-state-store.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"mongo-state-store.js","sourceRoot":"","sources":["../../../../src/core/modules/migrate/mongo-state-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mongo-state-store.js","sourceRoot":"","sources":["../../../../src/core/modules/migrate/mongo-state-store.ts"],"names":[],"mappings":"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"}
@@ -25,6 +25,8 @@ export declare class CoreSystemSetupService implements OnApplicationBootstrap {
25
25
  private readonly logger;
26
26
  constructor(connection: Connection, betterAuthService: CoreBetterAuthService, userMapper: CoreBetterAuthUserMapper, configService: ConfigService);
27
27
  onApplicationBootstrap(): Promise<void>;
28
+ protected claimInitialAdminSetup(): Promise<boolean>;
29
+ protected releaseInitialAdminSetupClaim(): Promise<void>;
28
30
  getSetupStatus(): Promise<SystemSetupStatus>;
29
31
  createInitialAdmin(input: SystemSetupInitInput): Promise<SystemSetupInitResult>;
30
32
  }
@@ -22,6 +22,9 @@ const config_service_1 = require("../../common/services/config.service");
22
22
  const core_better_auth_user_mapper_1 = require("../better-auth/core-better-auth-user.mapper");
23
23
  const core_better_auth_service_1 = require("../better-auth/core-better-auth.service");
24
24
  const error_codes_1 = require("../error-code/error-codes");
25
+ const SETUP_LOCK_COLLECTION = 'system-setup-locks';
26
+ const INITIAL_ADMIN_CLAIM_STALE_AFTER_MS = 5 * 60_000;
27
+ const INITIAL_ADMIN_LOCK_ID = 'initial-admin';
25
28
  let CoreSystemSetupService = CoreSystemSetupService_1 = class CoreSystemSetupService {
26
29
  connection;
27
30
  betterAuthService;
@@ -70,13 +73,36 @@ let CoreSystemSetupService = CoreSystemSetupService_1 = class CoreSystemSetupSer
70
73
  }
71
74
  catch (error) {
72
75
  if (error instanceof common_1.ForbiddenException) {
73
- this.logger.log('Initial admin auto-creation skipped (users already exist)');
76
+ this.logger.log('Initial admin auto-creation skipped (users already exist or claimed elsewhere)');
74
77
  }
75
78
  else {
76
79
  this.logger.warn(`Initial admin auto-creation failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
77
80
  }
78
81
  }
79
82
  }
83
+ async claimInitialAdminSetup() {
84
+ try {
85
+ const collection = this.connection.collection(SETUP_LOCK_COLLECTION);
86
+ const staleBefore = new Date(Date.now() - INITIAL_ADMIN_CLAIM_STALE_AFTER_MS);
87
+ await collection.deleteOne({ _id: INITIAL_ADMIN_LOCK_ID, claimedAt: { $lt: staleBefore } });
88
+ const previous = await collection.findOneAndUpdate({ _id: INITIAL_ADMIN_LOCK_ID }, { $setOnInsert: { claimedAt: new Date() } }, { returnDocument: 'before', upsert: true });
89
+ return !previous;
90
+ }
91
+ catch (error) {
92
+ if (error instanceof Error && (error.message?.includes('duplicate key') || error.message?.includes('E11000'))) {
93
+ return false;
94
+ }
95
+ throw error;
96
+ }
97
+ }
98
+ async releaseInitialAdminSetupClaim() {
99
+ try {
100
+ await this.connection.collection(SETUP_LOCK_COLLECTION).deleteOne({ _id: INITIAL_ADMIN_LOCK_ID });
101
+ }
102
+ catch (error) {
103
+ this.logger.warn(`Failed to release initial admin setup claim: ${error instanceof Error ? error.message : 'Unknown error'}`);
104
+ }
105
+ }
80
106
  async getSetupStatus() {
81
107
  const userCount = await this.connection.collection('users').countDocuments({});
82
108
  return {
@@ -96,6 +122,9 @@ let CoreSystemSetupService = CoreSystemSetupService_1 = class CoreSystemSetupSer
96
122
  if (!authInstance) {
97
123
  throw new common_1.ForbiddenException(error_codes_1.ErrorCode.SYSTEM_SETUP_BETTERAUTH_REQUIRED);
98
124
  }
125
+ if (!(await this.claimInitialAdminSetup())) {
126
+ throw new common_1.ForbiddenException(error_codes_1.ErrorCode.SYSTEM_SETUP_NOT_AVAILABLE);
127
+ }
99
128
  try {
100
129
  const context = await authInstance.$context;
101
130
  const normalizedPassword = this.userMapper.normalizePasswordForIam(input.password);
@@ -135,6 +164,7 @@ let CoreSystemSetupService = CoreSystemSetupService_1 = class CoreSystemSetupSer
135
164
  };
136
165
  }
137
166
  catch (error) {
167
+ await this.releaseInitialAdminSetupClaim();
138
168
  if (error instanceof Error && (error.message?.includes('duplicate key') || error.message?.includes('E11000'))) {
139
169
  throw new common_1.ForbiddenException(error_codes_1.ErrorCode.SYSTEM_SETUP_NOT_AVAILABLE);
140
170
  }
@@ -1 +1 @@
1
- {"version":3,"file":"core-system-setup.service.js","sourceRoot":"","sources":["../../../../src/core/modules/system-setup/core-system-setup.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"core-system-setup.service.js","sourceRoot":"","sources":["../../../../src/core/modules/system-setup/core-system-setup.service.ts"],"names":[],"mappings":"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"}
@@ -1,24 +1,37 @@
1
- import { CanActivate, ExecutionContext, OnModuleDestroy } from '@nestjs/common';
1
+ import { CanActivate, ExecutionContext, OnApplicationBootstrap, OnModuleDestroy } from '@nestjs/common';
2
2
  import { Reflector } from '@nestjs/core';
3
3
  import { Model } from 'mongoose';
4
+ import { CoreRedisService } from '../../common/services/core-redis.service';
4
5
  import { CoreTenantMemberModel } from './core-tenant-member.model';
5
- export declare class CoreTenantGuard implements CanActivate, OnModuleDestroy {
6
+ interface TenantCacheInvalidation {
7
+ scope: 'all' | 'user';
8
+ userId?: string;
9
+ }
10
+ export declare class CoreTenantGuard implements CanActivate, OnApplicationBootstrap, OnModuleDestroy {
6
11
  private readonly reflector;
7
12
  private readonly memberModel;
13
+ protected readonly redisService?: CoreRedisService;
8
14
  private readonly logger;
15
+ private invalidationChannel?;
16
+ private invalidationListener?;
9
17
  private readonly membershipCache;
10
18
  private readonly tenantIdsCache;
11
19
  private cacheTtlMs;
12
20
  private static readonly MAX_CACHE_SIZE;
13
21
  private cleanupInterval;
14
22
  private lastSeenConfig;
15
- constructor(reflector: Reflector, memberModel: Model<CoreTenantMemberModel>);
23
+ constructor(reflector: Reflector, memberModel: Model<CoreTenantMemberModel>, redisService?: CoreRedisService);
24
+ onApplicationBootstrap(): Promise<void>;
16
25
  onModuleDestroy(): void;
17
26
  invalidateUser(userId: string): void;
18
27
  invalidateAll(): void;
19
28
  canActivate(context: ExecutionContext): Promise<boolean>;
20
29
  private resolveUserTenantIds;
21
30
  private getRequest;
31
+ protected applyInvalidation(message: string): void;
32
+ protected clearAll(): void;
33
+ protected clearUser(userId: string): void;
34
+ protected publishInvalidation(message: TenantCacheInvalidation): void;
22
35
  private findMembershipCached;
23
36
  private evictIfOverCapacity;
24
37
  private evictExpired;
@@ -26,3 +39,4 @@ export declare class CoreTenantGuard implements CanActivate, OnModuleDestroy {
26
39
  private skipWithUserRoleCheck;
27
40
  private isBetterAuthHandler;
28
41
  }
42
+ export {};
@@ -21,6 +21,7 @@ const mongoose_1 = require("@nestjs/mongoose");
21
21
  const mongoose_2 = require("mongoose");
22
22
  const role_enum_1 = require("../../common/enums/role.enum");
23
23
  const config_service_1 = require("../../common/services/config.service");
24
+ const core_redis_service_1 = require("../../common/services/core-redis.service");
24
25
  const error_codes_1 = require("../error-code/error-codes");
25
26
  const core_tenant_decorators_1 = require("./core-tenant.decorators");
26
27
  const core_tenant_enums_1 = require("./core-tenant.enums");
@@ -29,22 +30,58 @@ let CoreTenantGuard = class CoreTenantGuard {
29
30
  static { CoreTenantGuard_1 = this; }
30
31
  reflector;
31
32
  memberModel;
33
+ redisService;
32
34
  logger = new common_1.Logger(CoreTenantGuard_1.name);
35
+ invalidationChannel;
36
+ invalidationListener;
33
37
  membershipCache = new Map();
34
38
  tenantIdsCache = new Map();
35
39
  cacheTtlMs = 30_000;
36
40
  static MAX_CACHE_SIZE = 500;
37
41
  cleanupInterval = null;
38
42
  lastSeenConfig = null;
39
- constructor(reflector, memberModel) {
43
+ constructor(reflector, memberModel, redisService) {
40
44
  this.reflector = reflector;
41
45
  this.memberModel = memberModel;
46
+ this.redisService = redisService;
42
47
  this.cleanupInterval = setInterval(() => this.evictExpired(), 60_000);
43
48
  if (this.cleanupInterval.unref) {
44
49
  this.cleanupInterval.unref();
45
50
  }
46
51
  }
52
+ async onApplicationBootstrap() {
53
+ if (!this.redisService?.enabled) {
54
+ return;
55
+ }
56
+ const channel = this.redisService.key('tenant-cache', 'invalidate');
57
+ try {
58
+ const subscriber = this.redisService.getSubscriber();
59
+ this.invalidationChannel = channel;
60
+ this.invalidationListener = (incomingChannel, message) => {
61
+ if (incomingChannel === channel) {
62
+ this.applyInvalidation(message);
63
+ }
64
+ };
65
+ subscriber.on('message', this.invalidationListener);
66
+ await subscriber.subscribe(channel);
67
+ }
68
+ catch (error) {
69
+ this.logger.debug(`Tenant cache invalidation subscribe failed: ${error.message}`);
70
+ }
71
+ }
47
72
  onModuleDestroy() {
73
+ if (this.invalidationListener) {
74
+ try {
75
+ const subscriber = this.redisService?.getSubscriber();
76
+ subscriber?.off('message', this.invalidationListener);
77
+ if (this.invalidationChannel) {
78
+ void subscriber?.unsubscribe(this.invalidationChannel).catch(() => undefined);
79
+ }
80
+ }
81
+ catch {
82
+ }
83
+ this.invalidationListener = undefined;
84
+ }
48
85
  if (this.cleanupInterval) {
49
86
  clearInterval(this.cleanupInterval);
50
87
  this.cleanupInterval = null;
@@ -53,20 +90,12 @@ let CoreTenantGuard = class CoreTenantGuard {
53
90
  this.tenantIdsCache.clear();
54
91
  }
55
92
  invalidateUser(userId) {
56
- for (const key of this.membershipCache.keys()) {
57
- if (key.startsWith(`${userId}:`)) {
58
- this.membershipCache.delete(key);
59
- }
60
- }
61
- for (const key of this.tenantIdsCache.keys()) {
62
- if (key === userId || key.startsWith(`${userId}:`)) {
63
- this.tenantIdsCache.delete(key);
64
- }
65
- }
93
+ this.clearUser(userId);
94
+ this.publishInvalidation({ scope: 'user', userId });
66
95
  }
67
96
  invalidateAll() {
68
- this.membershipCache.clear();
69
- this.tenantIdsCache.clear();
97
+ this.clearAll();
98
+ this.publishInvalidation({ scope: 'all' });
70
99
  }
71
100
  async canActivate(context) {
72
101
  const config = config_service_1.ConfigService.configFastButReadOnly?.multiTenancy;
@@ -77,7 +106,7 @@ let CoreTenantGuard = class CoreTenantGuard {
77
106
  this.lastSeenConfig = config;
78
107
  const isTestEnv = process.env.VITEST === 'true' || process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'e2e';
79
108
  this.cacheTtlMs = config.cacheTtlMs ?? (isTestEnv ? 0 : 30_000);
80
- this.invalidateAll();
109
+ this.clearAll();
81
110
  }
82
111
  const request = this.getRequest(context);
83
112
  if (!request) {
@@ -250,6 +279,52 @@ let CoreTenantGuard = class CoreTenantGuard {
250
279
  return null;
251
280
  }
252
281
  }
282
+ applyInvalidation(message) {
283
+ let parsed;
284
+ try {
285
+ parsed = JSON.parse(message);
286
+ }
287
+ catch {
288
+ this.logger.debug(`Ignoring malformed tenant cache invalidation message: ${message}`);
289
+ return;
290
+ }
291
+ if (parsed?.scope === 'all') {
292
+ this.clearAll();
293
+ }
294
+ else if (parsed?.scope === 'user' && parsed.userId) {
295
+ this.clearUser(parsed.userId);
296
+ }
297
+ }
298
+ clearAll() {
299
+ this.membershipCache.clear();
300
+ this.tenantIdsCache.clear();
301
+ }
302
+ clearUser(userId) {
303
+ for (const key of this.membershipCache.keys()) {
304
+ if (key.startsWith(`${userId}:`)) {
305
+ this.membershipCache.delete(key);
306
+ }
307
+ }
308
+ for (const key of this.tenantIdsCache.keys()) {
309
+ if (key === userId || key.startsWith(`${userId}:`)) {
310
+ this.tenantIdsCache.delete(key);
311
+ }
312
+ }
313
+ }
314
+ publishInvalidation(message) {
315
+ if (!this.redisService?.enabled) {
316
+ return;
317
+ }
318
+ try {
319
+ void this.redisService
320
+ .getClient()
321
+ .publish(this.redisService.key('tenant-cache', 'invalidate'), JSON.stringify(message))
322
+ .catch((error) => this.logger.debug(`Tenant cache invalidation publish failed: ${error.message}`));
323
+ }
324
+ catch (error) {
325
+ this.logger.debug(`Tenant cache invalidation publish failed: ${error.message}`);
326
+ }
327
+ }
253
328
  async findMembershipCached(userId, tenantId) {
254
329
  const ttl = this.cacheTtlMs;
255
330
  if (ttl <= 0) {
@@ -358,7 +433,9 @@ exports.CoreTenantGuard = CoreTenantGuard;
358
433
  exports.CoreTenantGuard = CoreTenantGuard = CoreTenantGuard_1 = __decorate([
359
434
  (0, common_1.Injectable)(),
360
435
  __param(1, (0, mongoose_1.InjectModel)(core_tenant_enums_1.TENANT_MEMBER_MODEL_TOKEN)),
436
+ __param(2, (0, common_1.Optional)()),
361
437
  __metadata("design:paramtypes", [core_1.Reflector,
362
- mongoose_2.Model])
438
+ mongoose_2.Model,
439
+ core_redis_service_1.CoreRedisService])
363
440
  ], CoreTenantGuard);
364
441
  //# sourceMappingURL=core-tenant.guard.js.map