@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.
- package/.claude/rules/architecture.md +16 -0
- package/.claude/rules/configurable-features.md +11 -3
- package/.claude/rules/testing.md +101 -1
- package/CLAUDE.md +5 -0
- package/FRAMEWORK-API.md +58 -3
- package/dist/core/common/helpers/content-disposition.helper.d.ts +1 -0
- package/dist/core/common/helpers/content-disposition.helper.js +14 -0
- package/dist/core/common/helpers/content-disposition.helper.js.map +1 -0
- package/dist/core/common/helpers/file.helper.d.ts +7 -0
- package/dist/core/common/helpers/file.helper.js +21 -4
- package/dist/core/common/helpers/file.helper.js.map +1 -1
- package/dist/core/common/helpers/graceful-shutdown.helper.d.ts +2 -0
- package/dist/core/common/helpers/graceful-shutdown.helper.js +55 -0
- package/dist/core/common/helpers/graceful-shutdown.helper.js.map +1 -0
- package/dist/core/common/helpers/project-name.helper.d.ts +2 -0
- package/dist/core/common/helpers/project-name.helper.js +38 -0
- package/dist/core/common/helpers/project-name.helper.js.map +1 -0
- package/dist/core/common/interfaces/cron-job-config.interface.d.ts +1 -0
- package/dist/core/common/interfaces/server-options.interface.d.ts +39 -0
- package/dist/core/common/services/core-cron-jobs.initializer.d.ts +10 -0
- package/dist/core/common/services/core-cron-jobs.initializer.js +46 -0
- package/dist/core/common/services/core-cron-jobs.initializer.js.map +1 -0
- package/dist/core/common/services/core-cron-jobs.registry.d.ts +8 -0
- package/dist/core/common/services/core-cron-jobs.registry.js +12 -0
- package/dist/core/common/services/core-cron-jobs.registry.js.map +1 -0
- package/dist/core/common/services/core-cron-jobs.service.d.ts +37 -7
- package/dist/core/common/services/core-cron-jobs.service.js +278 -27
- package/dist/core/common/services/core-cron-jobs.service.js.map +1 -1
- package/dist/core/common/services/core-redis-pubsub.d.ts +20 -0
- package/dist/core/common/services/core-redis-pubsub.js +112 -0
- package/dist/core/common/services/core-redis-pubsub.js.map +1 -0
- package/dist/core/common/services/core-redis.service.d.ts +25 -0
- package/dist/core/common/services/core-redis.service.js +154 -0
- package/dist/core/common/services/core-redis.service.js.map +1 -0
- package/dist/core/common/services/core-s3.service.d.ts +51 -0
- package/dist/core/common/services/core-s3.service.js +261 -0
- package/dist/core/common/services/core-s3.service.js.map +1 -0
- package/dist/core/common/services/core-trust-proxy.initializer.d.ts +16 -0
- package/dist/core/common/services/core-trust-proxy.initializer.js +77 -0
- package/dist/core/common/services/core-trust-proxy.initializer.js.map +1 -0
- package/dist/core/common/services/rate-limit-store.d.ts +61 -0
- package/dist/core/common/services/rate-limit-store.js +235 -0
- package/dist/core/common/services/rate-limit-store.js.map +1 -0
- package/dist/core/modules/ai/core-ai-mcp.controller.d.ts +19 -3
- package/dist/core/modules/ai/core-ai-mcp.controller.js +148 -18
- package/dist/core/modules/ai/core-ai-mcp.controller.js.map +1 -1
- package/dist/core/modules/ai/services/core-ai.service.d.ts +7 -2
- package/dist/core/modules/ai/services/core-ai.service.js +24 -20
- package/dist/core/modules/ai/services/core-ai.service.js.map +1 -1
- package/dist/core/modules/auth/core-auth.module.js +4 -1
- package/dist/core/modules/auth/core-auth.module.js.map +1 -1
- package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.d.ts +1 -1
- package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.js +3 -14
- package/dist/core/modules/auth/guards/legacy-auth-rate-limit.guard.js.map +1 -1
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.d.ts +12 -10
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js +30 -59
- package/dist/core/modules/auth/services/legacy-auth-rate-limiter.service.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-email-verification.service.d.ts +8 -2
- package/dist/core/modules/better-auth/core-better-auth-email-verification.service.js +118 -45
- package/dist/core/modules/better-auth/core-better-auth-email-verification.service.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-rate-limit.middleware.d.ts +1 -1
- package/dist/core/modules/better-auth/core-better-auth-rate-limit.middleware.js +2 -11
- package/dist/core/modules/better-auth/core-better-auth-rate-limit.middleware.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-rate-limiter.service.d.ts +12 -10
- package/dist/core/modules/better-auth/core-better-auth-rate-limiter.service.js +30 -85
- package/dist/core/modules/better-auth/core-better-auth-rate-limiter.service.js.map +1 -1
- package/dist/core/modules/better-auth/core-better-auth-user.mapper.js +0 -1
- package/dist/core/modules/better-auth/core-better-auth-user.mapper.js.map +1 -1
- package/dist/core/modules/file/core-file.controller.d.ts +11 -2
- package/dist/core/modules/file/core-file.controller.js +52 -15
- package/dist/core/modules/file/core-file.controller.js.map +1 -1
- package/dist/core/modules/file/core-file.resolver.d.ts +4 -4
- package/dist/core/modules/file/core-file.resolver.js +23 -16
- package/dist/core/modules/file/core-file.resolver.js.map +1 -1
- package/dist/core/modules/file/core-file.service.d.ts +41 -7
- package/dist/core/modules/file/core-file.service.js +227 -7
- package/dist/core/modules/file/core-file.service.js.map +1 -1
- package/dist/core/modules/file/file-metadata.helper.d.ts +16 -0
- package/dist/core/modules/file/file-metadata.helper.js +33 -0
- package/dist/core/modules/file/file-metadata.helper.js.map +1 -0
- package/dist/core/modules/file/file-roles.helper.d.ts +4 -0
- package/dist/core/modules/file/file-roles.helper.js +53 -0
- package/dist/core/modules/file/file-roles.helper.js.map +1 -0
- package/dist/core/modules/file/file-storage.helper.d.ts +13 -0
- package/dist/core/modules/file/file-storage.helper.js +65 -0
- package/dist/core/modules/file/file-storage.helper.js.map +1 -0
- package/dist/core/modules/file/filesystem-file.helper.d.ts +22 -0
- package/dist/core/modules/file/filesystem-file.helper.js +77 -0
- package/dist/core/modules/file/filesystem-file.helper.js.map +1 -0
- package/dist/core/modules/file/interfaces/file-service-options.interface.d.ts +1 -0
- package/dist/core/modules/file/interfaces/file-upload.interface.d.ts +7 -1
- package/dist/core/modules/file/s3-file.helper.d.ts +37 -0
- package/dist/core/modules/file/s3-file.helper.js +81 -0
- package/dist/core/modules/file/s3-file.helper.js.map +1 -0
- package/dist/core/modules/hub/core-hub.controller.d.ts +8 -8
- package/dist/core/modules/hub/core-hub.controller.js +24 -22
- package/dist/core/modules/hub/core-hub.controller.js.map +1 -1
- package/dist/core/modules/hub/helpers/hub-mask.helper.js +2 -2
- package/dist/core/modules/hub/helpers/hub-mask.helper.js.map +1 -1
- package/dist/core/modules/hub/hub-buffer.d.ts +23 -0
- package/dist/core/modules/hub/hub-buffer.js +101 -0
- package/dist/core/modules/hub/hub-buffer.js.map +1 -0
- package/dist/core/modules/hub/services/core-hub-mailbox.service.d.ts +7 -5
- package/dist/core/modules/hub/services/core-hub-mailbox.service.js +14 -10
- package/dist/core/modules/hub/services/core-hub-mailbox.service.js.map +1 -1
- package/dist/core/modules/hub/services/hub-log-buffer.service.d.ts +5 -2
- package/dist/core/modules/hub/services/hub-log-buffer.service.js +17 -8
- package/dist/core/modules/hub/services/hub-log-buffer.service.js.map +1 -1
- package/dist/core/modules/hub/services/hub-query-profiler.service.d.ts +4 -2
- package/dist/core/modules/hub/services/hub-query-profiler.service.js +13 -7
- package/dist/core/modules/hub/services/hub-query-profiler.service.js.map +1 -1
- package/dist/core/modules/hub/services/hub-trace-buffer.service.d.ts +4 -2
- package/dist/core/modules/hub/services/hub-trace-buffer.service.js +13 -8
- package/dist/core/modules/hub/services/hub-trace-buffer.service.js.map +1 -1
- package/dist/core/modules/migrate/helpers/migration.helper.d.ts +2 -6
- package/dist/core/modules/migrate/helpers/migration.helper.js +4 -4
- package/dist/core/modules/migrate/helpers/migration.helper.js.map +1 -1
- package/dist/core/modules/migrate/migration-runner.d.ts +1 -0
- package/dist/core/modules/migrate/migration-runner.js +4 -0
- package/dist/core/modules/migrate/migration-runner.js.map +1 -1
- package/dist/core/modules/migrate/mongo-state-store.d.ts +1 -0
- package/dist/core/modules/migrate/mongo-state-store.js +98 -9
- package/dist/core/modules/migrate/mongo-state-store.js.map +1 -1
- package/dist/core/modules/system-setup/core-system-setup.service.d.ts +2 -0
- package/dist/core/modules/system-setup/core-system-setup.service.js +31 -1
- package/dist/core/modules/system-setup/core-system-setup.service.js.map +1 -1
- package/dist/core/modules/tenant/core-tenant.guard.d.ts +17 -3
- package/dist/core/modules/tenant/core-tenant.guard.js +92 -15
- package/dist/core/modules/tenant/core-tenant.guard.js.map +1 -1
- package/dist/core/modules/tenant/core-tenant.module.js +3 -4
- package/dist/core/modules/tenant/core-tenant.module.js.map +1 -1
- package/dist/core/modules/tus/core-tus.controller.d.ts +2 -0
- package/dist/core/modules/tus/core-tus.controller.js +29 -3
- package/dist/core/modules/tus/core-tus.controller.js.map +1 -1
- package/dist/core/modules/tus/core-tus.service.d.ts +24 -1
- package/dist/core/modules/tus/core-tus.service.js +182 -28
- package/dist/core/modules/tus/core-tus.service.js.map +1 -1
- package/dist/core/modules/tus/interfaces/tus-config.interface.js +3 -0
- package/dist/core/modules/tus/interfaces/tus-config.interface.js.map +1 -1
- package/dist/core/modules/tus/tus-redis-locker.d.ts +25 -0
- package/dist/core/modules/tus/tus-redis-locker.js +87 -0
- package/dist/core/modules/tus/tus-redis-locker.js.map +1 -0
- package/dist/core/modules/tus/tus.module.d.ts +1 -0
- package/dist/core/modules/tus/tus.module.js +30 -4
- package/dist/core/modules/tus/tus.module.js.map +1 -1
- package/dist/core.module.js +18 -1
- package/dist/core.module.js.map +1 -1
- package/dist/index.d.ts +10 -0
- package/dist/index.js +10 -0
- package/dist/index.js.map +1 -1
- package/dist/main.js +2 -1
- package/dist/main.js.map +1 -1
- package/dist/server/modules/file/file.controller.js.map +1 -1
- package/dist/server/modules/file/file.resolver.js +1 -12
- package/dist/server/modules/file/file.resolver.js.map +1 -1
- package/dist/server/modules/file/file.service.d.ts +5 -1
- package/dist/server/modules/file/file.service.js +12 -3
- package/dist/server/modules/file/file.service.js.map +1 -1
- package/dist/server/modules/user/avatar.controller.d.ts +5 -1
- package/dist/server/modules/user/avatar.controller.js +26 -10
- package/dist/server/modules/user/avatar.controller.js.map +1 -1
- package/dist/server/modules/user/user.model.js +3 -2
- package/dist/server/modules/user/user.model.js.map +1 -1
- package/dist/server/modules/user/user.module.js +6 -2
- package/dist/server/modules/user/user.module.js.map +1 -1
- package/dist/server/modules/user/user.service.d.ts +1 -1
- package/dist/server/modules/user/user.service.js +6 -13
- package/dist/server/modules/user/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/docs/REQUEST-LIFECYCLE.md +57 -8
- package/docs/security-overrides.md +21 -3
- package/migration-guides/11.32.3-to-11.32.4.md +15 -3
- package/migration-guides/11.32.x-to-11.33.x.md +1551 -0
- package/package.json +74 -42
- package/src/core/common/helpers/content-disposition.helper.ts +90 -0
- package/src/core/common/helpers/file.helper.ts +53 -10
- package/src/core/common/helpers/graceful-shutdown.helper.ts +116 -0
- package/src/core/common/helpers/project-name.helper.ts +71 -0
- package/src/core/common/interfaces/cron-job-config.interface.ts +16 -0
- package/src/core/common/interfaces/server-options.interface.ts +439 -2
- package/src/core/common/services/core-cron-jobs.initializer.ts +39 -0
- package/src/core/common/services/core-cron-jobs.registry.ts +45 -0
- package/src/core/common/services/core-cron-jobs.service.ts +589 -47
- package/src/core/common/services/core-redis-pubsub.ts +183 -0
- package/src/core/common/services/core-redis.service.ts +249 -0
- package/src/core/common/services/core-s3.service.ts +465 -0
- package/src/core/common/services/core-trust-proxy.initializer.ts +112 -0
- package/src/core/common/services/rate-limit-store.ts +492 -0
- package/src/core/modules/ai/README.md +25 -0
- package/src/core/modules/ai/core-ai-mcp.controller.ts +253 -22
- package/src/core/modules/ai/services/core-ai.service.ts +33 -24
- package/src/core/modules/auth/core-auth.module.ts +7 -1
- package/src/core/modules/auth/guards/legacy-auth-rate-limit.guard.ts +12 -21
- package/src/core/modules/auth/services/legacy-auth-rate-limiter.service.ts +49 -93
- package/src/core/modules/better-auth/core-better-auth-email-verification.service.ts +202 -66
- package/src/core/modules/better-auth/core-better-auth-rate-limit.middleware.ts +11 -18
- package/src/core/modules/better-auth/core-better-auth-rate-limiter.service.ts +51 -132
- package/src/core/modules/better-auth/core-better-auth-user.mapper.ts +7 -1
- package/src/core/modules/file/INTEGRATION-CHECKLIST.md +108 -0
- package/src/core/modules/file/README.md +277 -53
- package/src/core/modules/file/core-file.controller.ts +168 -12
- package/src/core/modules/file/core-file.resolver.ts +46 -12
- package/src/core/modules/file/core-file.service.ts +482 -16
- package/src/core/modules/file/file-metadata.helper.ts +142 -0
- package/src/core/modules/file/file-roles.helper.ts +110 -0
- package/src/core/modules/file/file-storage.helper.ts +163 -0
- package/src/core/modules/file/filesystem-file.helper.ts +184 -0
- package/src/core/modules/file/interfaces/file-service-options.interface.ts +14 -0
- package/src/core/modules/file/interfaces/file-upload.interface.ts +17 -1
- package/src/core/modules/file/s3-file.helper.ts +209 -0
- package/src/core/modules/hub/README.md +48 -0
- package/src/core/modules/hub/core-hub.controller.ts +18 -16
- package/src/core/modules/hub/helpers/hub-mask.helper.ts +21 -4
- package/src/core/modules/hub/hub-buffer.ts +198 -0
- package/src/core/modules/hub/services/core-hub-mailbox.service.ts +22 -12
- package/src/core/modules/hub/services/hub-log-buffer.service.ts +24 -8
- package/src/core/modules/hub/services/hub-query-profiler.service.ts +9 -6
- package/src/core/modules/hub/services/hub-trace-buffer.service.ts +14 -9
- package/src/core/modules/migrate/README.md +33 -6
- package/src/core/modules/migrate/helpers/migration.helper.ts +13 -6
- package/src/core/modules/migrate/migration-runner.ts +10 -1
- package/src/core/modules/migrate/mongo-state-store.ts +179 -11
- package/src/core/modules/system-setup/README.md +7 -2
- package/src/core/modules/system-setup/core-system-setup.service.ts +95 -1
- package/src/core/modules/tenant/README.md +21 -1
- package/src/core/modules/tenant/core-tenant.guard.ts +135 -14
- package/src/core/modules/tenant/core-tenant.module.ts +8 -4
- package/src/core/modules/tus/INTEGRATION-CHECKLIST.md +93 -21
- package/src/core/modules/tus/README.md +35 -2
- package/src/core/modules/tus/core-tus.controller.ts +64 -12
- package/src/core/modules/tus/core-tus.service.ts +358 -34
- package/src/core/modules/tus/interfaces/tus-config.interface.ts +9 -0
- package/src/core/modules/tus/tus-redis-locker.ts +139 -0
- package/src/core/modules/tus/tus.module.ts +78 -6
- package/src/core.module.ts +26 -1
- package/src/index.ts +10 -0
- package/src/main.ts +7 -1
- package/src/server/modules/file/file.controller.ts +7 -3
- package/src/server/modules/file/file.resolver.ts +5 -17
- package/src/server/modules/file/file.service.ts +42 -3
- package/src/server/modules/user/avatar.controller.ts +39 -9
- package/src/server/modules/user/user.model.ts +9 -3
- package/src/server/modules/user/user.module.ts +12 -3
- package/src/server/modules/user/user.service.ts +20 -17
- package/src/test/README.md +7 -2
- package/src/core/common/helpers/file.helper.spec.ts +0 -145
- package/src/core/common/helpers/logging.helper.spec.ts +0 -61
- package/src/core/common/helpers/process-diagnostics.helper.spec.ts +0 -310
- package/src/core/common/services/brevo.service.spec.ts +0 -266
- package/src/core/modules/file/core-file.controller.spec.ts +0 -164
- package/src/core/modules/hub/core-hub.module.spec.ts +0 -108
- package/src/core/modules/hub/helpers/hub-command-shape.helper.spec.ts +0 -48
- package/src/core/modules/hub/helpers/hub-mask.helper.spec.ts +0 -67
- package/src/core/modules/hub/helpers/hub-mermaid.helper.spec.ts +0 -61
- package/src/core/modules/hub/helpers/hub-shell.helper.spec.ts +0 -106
- package/src/core/modules/hub/hub-config.helper.spec.ts +0 -108
- package/src/core/modules/hub/hub-ring-buffer.spec.ts +0 -95
- package/src/core/modules/hub/services/core-hub-mailbox.service.spec.ts +0 -116
- package/src/core/modules/hub/services/hub-trace-buffer.service.spec.ts +0 -112
- package/src/core/modules/migrate/helpers/migration.helper.spec.ts +0 -85
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.maskConfigDeep = maskConfigDeep;
|
|
4
|
-
const SECRET_KEY_PATTERN = /secret|passwd|password|passphrase|credential|api[-_]?key|access[-_]?token|refresh[-_]?token|private[-_]?key|encryption|\btoken\b|\bpass\b|(^|[^a-z])key([^a-z]|$)/i;
|
|
5
|
-
const URI_CREDENTIAL_PATTERN = /^([a-z][a-z0-9+.-]*:\/\/[^/@:\s]
|
|
4
|
+
const SECRET_KEY_PATTERN = /secret|passwd|password|passphrase|credential|api[-_]?key|access[-_]?key|access[-_]?token|refresh[-_]?token|private[-_]?key|encryption|\btoken\b|\bpass\b|(^|[^a-z])key([^a-z]|$)/i;
|
|
5
|
+
const URI_CREDENTIAL_PATTERN = /^([a-z][a-z0-9+.-]*:\/\/[^/@:\s]*:)([^@/\s]+)(@)/i;
|
|
6
6
|
const MASK = '***';
|
|
7
7
|
function maskConfigDeep(value, extraSecretKeys = []) {
|
|
8
8
|
const extra = new Set(extraSecretKeys.map((k) => k.toLowerCase()));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-mask.helper.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/helpers/hub-mask.helper.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"hub-mask.helper.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/helpers/hub-mask.helper.ts"],"names":[],"mappings":";;AA4CA,wCAGC;AAhCD,MAAM,kBAAkB,GACtB,mLAAmL,CAAC;AActL,MAAM,sBAAsB,GAAG,mDAAmD,CAAC;AAEnF,MAAM,IAAI,GAAG,KAAK,CAAC;AAYnB,SAAgB,cAAc,CAAI,KAAQ,EAAE,kBAA4B,EAAE;IACxE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACnE,OAAO,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAM,CAAC;AAC7C,CAAC;AAED,SAAS,WAAW,CAAC,GAAW,EAAE,KAAkB;IAClD,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACrD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CAAC,KAAc,EAAE,WAAoB,EAAE,KAAkB;IACzE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAGD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC/D,CAAC;IAGD,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAID,IAAI,KAAK,YAAY,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,GAAG,GAA4B,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { CoreRedisService } from '../../common/services/core-redis.service';
|
|
2
|
+
import { HubBufferEntry, HubRingBuffer } from './hub-ring-buffer';
|
|
3
|
+
export interface HubBufferData<T> {
|
|
4
|
+
cursor: number;
|
|
5
|
+
dropped: number;
|
|
6
|
+
entries: T[];
|
|
7
|
+
}
|
|
8
|
+
export declare class HubBuffer<T extends HubBufferEntry> {
|
|
9
|
+
protected readonly listKey: string;
|
|
10
|
+
protected readonly local: HubRingBuffer<T>;
|
|
11
|
+
protected readonly redis?: CoreRedisService;
|
|
12
|
+
protected readonly seqKey: string;
|
|
13
|
+
protected readonly ttlSeconds: number;
|
|
14
|
+
constructor(capacity: number, name: string, redis?: CoreRedisService, ttlSeconds?: number);
|
|
15
|
+
add(entry: Omit<T, 'seq' | 'timestamp'> & {
|
|
16
|
+
timestamp?: number;
|
|
17
|
+
}): T;
|
|
18
|
+
clear(): void;
|
|
19
|
+
protected mirror(label: string, run: (client: ReturnType<CoreRedisService['getClient']>) => Promise<unknown>): void;
|
|
20
|
+
read(since?: number, limit?: number): Promise<HubBufferData<T>>;
|
|
21
|
+
protected readShared(since?: number, limit?: number): Promise<HubBufferData<T> | undefined>;
|
|
22
|
+
protected shape(total: number, raw: string[], needed: number): HubBufferData<T>;
|
|
23
|
+
}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.HubBuffer = void 0;
|
|
4
|
+
const hub_ring_buffer_1 = require("./hub-ring-buffer");
|
|
5
|
+
const DEFAULT_SHARED_TTL_SECONDS = 24 * 60 * 60;
|
|
6
|
+
const SHARED_READ_CHUNK = 64;
|
|
7
|
+
class HubBuffer {
|
|
8
|
+
listKey;
|
|
9
|
+
local;
|
|
10
|
+
redis;
|
|
11
|
+
seqKey;
|
|
12
|
+
ttlSeconds;
|
|
13
|
+
constructor(capacity, name, redis, ttlSeconds = DEFAULT_SHARED_TTL_SECONDS) {
|
|
14
|
+
this.local = new hub_ring_buffer_1.HubRingBuffer(capacity);
|
|
15
|
+
this.redis = redis?.enabled ? redis : undefined;
|
|
16
|
+
this.listKey = this.redis?.key('hub', name) ?? '';
|
|
17
|
+
this.seqKey = this.redis?.key('hub', name, 'seq') ?? '';
|
|
18
|
+
this.ttlSeconds = ttlSeconds;
|
|
19
|
+
}
|
|
20
|
+
add(entry) {
|
|
21
|
+
const full = this.local.add(entry);
|
|
22
|
+
this.mirror('append', (client) => client
|
|
23
|
+
.multi()
|
|
24
|
+
.incr(this.seqKey)
|
|
25
|
+
.lpush(this.listKey, JSON.stringify(full))
|
|
26
|
+
.ltrim(this.listKey, 0, this.local.capacity - 1)
|
|
27
|
+
.expire(this.listKey, this.ttlSeconds)
|
|
28
|
+
.exec());
|
|
29
|
+
return full;
|
|
30
|
+
}
|
|
31
|
+
clear() {
|
|
32
|
+
this.local.clear();
|
|
33
|
+
this.mirror('clear', (client) => client.del(this.listKey));
|
|
34
|
+
}
|
|
35
|
+
mirror(label, run) {
|
|
36
|
+
if (!this.redis) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
const failed = (err) => console.debug(`Hub buffer ${label} failed (${this.listKey}): ${err.message}`);
|
|
40
|
+
try {
|
|
41
|
+
run(this.redis.getClient()).catch(failed);
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
failed(err);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
async read(since, limit) {
|
|
48
|
+
const shared = this.redis ? await this.readShared(since, limit) : undefined;
|
|
49
|
+
if (shared) {
|
|
50
|
+
return shared;
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
cursor: this.local.lastSeq,
|
|
54
|
+
dropped: this.local.firstRetainedSeq,
|
|
55
|
+
entries: since === undefined ? this.local.recent(limit) : this.local.since(since, limit),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
async readShared(since, limit) {
|
|
59
|
+
try {
|
|
60
|
+
const client = this.redis.getClient();
|
|
61
|
+
const capacity = this.local.capacity;
|
|
62
|
+
const cap = Math.min(limit ?? capacity, capacity);
|
|
63
|
+
let want = Math.max(1, since === undefined ? cap : Math.min(cap, SHARED_READ_CHUNK));
|
|
64
|
+
for (let attempt = 0;; attempt++) {
|
|
65
|
+
const result = await client
|
|
66
|
+
.multi()
|
|
67
|
+
.get(this.seqKey)
|
|
68
|
+
.lrange(this.listKey, 0, want - 1)
|
|
69
|
+
.exec();
|
|
70
|
+
const total = Number(result?.[0]?.[1] ?? 0);
|
|
71
|
+
const raw = (result?.[1]?.[1] ?? []);
|
|
72
|
+
const needed = since === undefined ? cap : Math.max(0, Math.min(cap, total - 1 - since));
|
|
73
|
+
if (raw.length >= needed || raw.length < want || attempt >= 2) {
|
|
74
|
+
return this.shape(total, raw, needed);
|
|
75
|
+
}
|
|
76
|
+
want = Math.min(Math.max(needed, want * 4), capacity);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
catch (err) {
|
|
80
|
+
console.debug(`Hub buffer read failed (${this.listKey}), using the local buffer: ${err.message}`);
|
|
81
|
+
return undefined;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
shape(total, raw, needed) {
|
|
85
|
+
const entries = [];
|
|
86
|
+
for (let i = Math.min(raw.length, needed) - 1; i >= 0; i--) {
|
|
87
|
+
try {
|
|
88
|
+
entries.push({ ...JSON.parse(raw[i]), seq: total - 1 - i });
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return {
|
|
94
|
+
cursor: total - 1,
|
|
95
|
+
dropped: raw.length ? total - raw.length : -1,
|
|
96
|
+
entries,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
exports.HubBuffer = HubBuffer;
|
|
101
|
+
//# sourceMappingURL=hub-buffer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hub-buffer.js","sourceRoot":"","sources":["../../../../src/core/modules/hub/hub-buffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CoreRedisService } from '../../../common/services/core-redis.service';
|
|
2
|
+
import { HubBuffer } from '../hub-buffer';
|
|
2
3
|
import { HubMailboxData, HubMailboxEntry } from '../interfaces/hub-panels.interface';
|
|
3
4
|
import { IHubCapturedMailInput, IHubEmailCapture, ResolvedHubConfig } from '../interfaces/hub-config.interface';
|
|
4
5
|
interface StoredMail extends HubMailboxEntry {
|
|
@@ -7,14 +8,15 @@ interface StoredMail extends HubMailboxEntry {
|
|
|
7
8
|
}
|
|
8
9
|
export declare class CoreHubMailboxService implements IHubEmailCapture {
|
|
9
10
|
protected readonly config: ResolvedHubConfig;
|
|
10
|
-
protected readonly
|
|
11
|
+
protected readonly redis?: CoreRedisService;
|
|
12
|
+
protected readonly buffer: HubBuffer<StoredMail>;
|
|
11
13
|
protected readonly mode: 'capture' | 'copy';
|
|
12
|
-
constructor(config: ResolvedHubConfig);
|
|
14
|
+
constructor(config: ResolvedHubConfig, redis?: CoreRedisService);
|
|
13
15
|
capture(mail: IHubCapturedMailInput): boolean;
|
|
14
16
|
captureAndGetSeq(mail: IHubCapturedMailInput): number;
|
|
15
17
|
clear(): void;
|
|
16
|
-
getMailHtml(seq: number): string | undefined
|
|
17
|
-
getMailbox(since?: number): HubMailboxData
|
|
18
|
+
getMailHtml(seq: number): Promise<string | undefined>;
|
|
19
|
+
getMailbox(since?: number): Promise<HubMailboxData>;
|
|
18
20
|
protected store(mail: IHubCapturedMailInput): StoredMail;
|
|
19
21
|
}
|
|
20
22
|
export {};
|
|
@@ -15,18 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.CoreHubMailboxService = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const logging_helper_1 = require("../../../common/helpers/logging.helper");
|
|
18
|
+
const core_redis_service_1 = require("../../../common/services/core-redis.service");
|
|
18
19
|
const hub_constants_1 = require("../hub.constants");
|
|
19
|
-
const
|
|
20
|
+
const hub_buffer_1 = require("../hub-buffer");
|
|
20
21
|
const TRUNCATION_MARKER = '… [truncated]';
|
|
21
22
|
let CoreHubMailboxService = class CoreHubMailboxService {
|
|
22
23
|
config;
|
|
24
|
+
redis;
|
|
23
25
|
buffer;
|
|
24
26
|
mode;
|
|
25
|
-
constructor(config) {
|
|
27
|
+
constructor(config, redis) {
|
|
26
28
|
this.config = config;
|
|
29
|
+
this.redis = redis;
|
|
27
30
|
const mailbox = config.mailbox === false ? { capacity: 100, maxMailSize: 262144, mode: 'capture' } : config.mailbox;
|
|
28
31
|
this.mode = mailbox.mode;
|
|
29
|
-
this.buffer = new
|
|
32
|
+
this.buffer = new hub_buffer_1.HubBuffer(mailbox.capacity, 'mailbox', redis);
|
|
30
33
|
}
|
|
31
34
|
capture(mail) {
|
|
32
35
|
this.store(mail);
|
|
@@ -38,18 +41,18 @@ let CoreHubMailboxService = class CoreHubMailboxService {
|
|
|
38
41
|
clear() {
|
|
39
42
|
this.buffer.clear();
|
|
40
43
|
}
|
|
41
|
-
getMailHtml(seq) {
|
|
42
|
-
const mail = this.buffer.
|
|
44
|
+
async getMailHtml(seq) {
|
|
45
|
+
const mail = (await this.buffer.read()).entries.find((m) => m.seq === seq);
|
|
43
46
|
if (!mail) {
|
|
44
47
|
return undefined;
|
|
45
48
|
}
|
|
46
49
|
return mail.html ?? (mail.text ? `<pre>${escapeForPre(mail.text)}</pre>` : undefined);
|
|
47
50
|
}
|
|
48
|
-
getMailbox(since) {
|
|
49
|
-
const
|
|
51
|
+
async getMailbox(since) {
|
|
52
|
+
const { cursor, dropped, entries } = await this.buffer.read(since);
|
|
50
53
|
return {
|
|
51
|
-
cursor
|
|
52
|
-
dropped
|
|
54
|
+
cursor,
|
|
55
|
+
dropped,
|
|
53
56
|
mails: entries.map(toEntry),
|
|
54
57
|
mode: this.mode,
|
|
55
58
|
};
|
|
@@ -75,7 +78,8 @@ exports.CoreHubMailboxService = CoreHubMailboxService;
|
|
|
75
78
|
exports.CoreHubMailboxService = CoreHubMailboxService = __decorate([
|
|
76
79
|
(0, common_1.Injectable)(),
|
|
77
80
|
__param(0, (0, common_1.Inject)(hub_constants_1.HUB_CONFIG)),
|
|
78
|
-
|
|
81
|
+
__param(1, (0, common_1.Optional)()),
|
|
82
|
+
__metadata("design:paramtypes", [Object, core_redis_service_1.CoreRedisService])
|
|
79
83
|
], CoreHubMailboxService);
|
|
80
84
|
function escapeForPre(text) {
|
|
81
85
|
return text.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-hub-mailbox.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/core-hub-mailbox.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"core-hub-mailbox.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/core-hub-mailbox.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,22 @@
|
|
|
1
1
|
import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
|
|
2
|
+
import { CoreRedisService } from '../../../common/services/core-redis.service';
|
|
2
3
|
import { HubLogsData } from '../interfaces/hub-panels.interface';
|
|
3
4
|
import { ResolvedHubConfig } from '../interfaces/hub-config.interface';
|
|
4
5
|
export declare class HubLogBufferService implements OnModuleDestroy, OnModuleInit {
|
|
5
6
|
protected readonly config: ResolvedHubConfig;
|
|
7
|
+
protected readonly redis?: CoreRedisService;
|
|
6
8
|
private buffer?;
|
|
7
9
|
private cfg?;
|
|
8
10
|
private delegating?;
|
|
9
11
|
private excludeContexts;
|
|
12
|
+
private destroyed;
|
|
10
13
|
private previousRef?;
|
|
11
|
-
constructor(config: ResolvedHubConfig);
|
|
14
|
+
constructor(config: ResolvedHubConfig, redis?: CoreRedisService);
|
|
12
15
|
attach(): void;
|
|
13
16
|
clear(): void;
|
|
14
17
|
detach(): void;
|
|
15
18
|
get enabled(): boolean;
|
|
16
|
-
getData(since?: number): HubLogsData
|
|
19
|
+
getData(since?: number): Promise<HubLogsData>;
|
|
17
20
|
onModuleDestroy(): void;
|
|
18
21
|
onModuleInit(): void;
|
|
19
22
|
private extract;
|
|
@@ -16,8 +16,9 @@ exports.HubLogBufferService = void 0;
|
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const util_1 = require("util");
|
|
18
18
|
const logging_helper_1 = require("../../../common/helpers/logging.helper");
|
|
19
|
+
const core_redis_service_1 = require("../../../common/services/core-redis.service");
|
|
19
20
|
const hub_constants_1 = require("../hub.constants");
|
|
20
|
-
const
|
|
21
|
+
const hub_buffer_1 = require("../hub-buffer");
|
|
21
22
|
class HubDelegatingLogger {
|
|
22
23
|
capture;
|
|
23
24
|
previous;
|
|
@@ -68,21 +69,24 @@ class HubDelegatingLogger {
|
|
|
68
69
|
}
|
|
69
70
|
let HubLogBufferService = class HubLogBufferService {
|
|
70
71
|
config;
|
|
72
|
+
redis;
|
|
71
73
|
buffer;
|
|
72
74
|
cfg;
|
|
73
75
|
delegating;
|
|
74
76
|
excludeContexts = new Set();
|
|
77
|
+
destroyed = false;
|
|
75
78
|
previousRef;
|
|
76
|
-
constructor(config) {
|
|
79
|
+
constructor(config, redis) {
|
|
77
80
|
this.config = config;
|
|
81
|
+
this.redis = redis;
|
|
78
82
|
}
|
|
79
83
|
attach() {
|
|
80
|
-
if (this.config.collectors.logs === false) {
|
|
84
|
+
if (this.destroyed || this.config.collectors.logs === false) {
|
|
81
85
|
return;
|
|
82
86
|
}
|
|
83
87
|
if (!this.cfg) {
|
|
84
88
|
this.cfg = this.config.collectors.logs;
|
|
85
|
-
this.buffer = new
|
|
89
|
+
this.buffer = new hub_buffer_1.HubBuffer(this.cfg.capacity, 'logs', this.redis);
|
|
86
90
|
this.excludeContexts = new Set(this.cfg.excludeContexts);
|
|
87
91
|
}
|
|
88
92
|
const current = this.staticRef();
|
|
@@ -114,12 +118,16 @@ let HubLogBufferService = class HubLogBufferService {
|
|
|
114
118
|
get enabled() {
|
|
115
119
|
return this.config.collectors.logs !== false;
|
|
116
120
|
}
|
|
117
|
-
getData(since) {
|
|
121
|
+
async getData(since) {
|
|
118
122
|
this.selfHeal();
|
|
119
|
-
|
|
120
|
-
|
|
123
|
+
if (!this.buffer) {
|
|
124
|
+
return { cursor: -1, dropped: -1, records: [] };
|
|
125
|
+
}
|
|
126
|
+
const { cursor, dropped, entries } = await this.buffer.read(since);
|
|
127
|
+
return { cursor, dropped, records: entries };
|
|
121
128
|
}
|
|
122
129
|
onModuleDestroy() {
|
|
130
|
+
this.destroyed = true;
|
|
123
131
|
this.detach();
|
|
124
132
|
}
|
|
125
133
|
onModuleInit() {
|
|
@@ -205,6 +213,7 @@ exports.HubLogBufferService = HubLogBufferService;
|
|
|
205
213
|
exports.HubLogBufferService = HubLogBufferService = __decorate([
|
|
206
214
|
(0, common_1.Injectable)(),
|
|
207
215
|
__param(0, (0, common_1.Inject)(hub_constants_1.HUB_CONFIG)),
|
|
208
|
-
|
|
216
|
+
__param(1, (0, common_1.Optional)()),
|
|
217
|
+
__metadata("design:paramtypes", [Object, core_redis_service_1.CoreRedisService])
|
|
209
218
|
], HubLogBufferService);
|
|
210
219
|
//# sourceMappingURL=hub-log-buffer.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-log-buffer.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/hub-log-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"hub-log-buffer.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/hub-log-buffer.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Logger, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
|
|
2
2
|
import { Connection } from 'mongoose';
|
|
3
|
+
import { CoreRedisService } from '../../../common/services/core-redis.service';
|
|
3
4
|
import { HubQueriesData, HubQueryRecord } from '../interfaces/hub-panels.interface';
|
|
4
5
|
import { ResolvedHubConfig } from '../interfaces/hub-config.interface';
|
|
5
6
|
export declare class HubQueryProfilerService implements OnModuleDestroy, OnModuleInit {
|
|
6
7
|
protected readonly config: ResolvedHubConfig;
|
|
7
8
|
protected readonly connection?: Connection;
|
|
9
|
+
protected readonly redis?: CoreRedisService;
|
|
8
10
|
protected readonly logger: Logger;
|
|
9
11
|
private buffer?;
|
|
10
12
|
private client?;
|
|
@@ -14,10 +16,10 @@ export declare class HubQueryProfilerService implements OnModuleDestroy, OnModul
|
|
|
14
16
|
private readonly onStarted;
|
|
15
17
|
private readonly onSucceeded;
|
|
16
18
|
private readonly pending;
|
|
17
|
-
constructor(config: ResolvedHubConfig, connection?: Connection);
|
|
19
|
+
constructor(config: ResolvedHubConfig, connection?: Connection, redis?: CoreRedisService);
|
|
18
20
|
clear(): void;
|
|
19
21
|
get enabled(): boolean;
|
|
20
|
-
getData(): HubQueriesData
|
|
22
|
+
getData(): Promise<HubQueriesData>;
|
|
21
23
|
onModuleDestroy(): void;
|
|
22
24
|
onModuleInit(): void;
|
|
23
25
|
protected safe(fn: () => void): void;
|
|
@@ -18,8 +18,9 @@ const common_1 = require("@nestjs/common");
|
|
|
18
18
|
const mongoose_1 = require("@nestjs/mongoose");
|
|
19
19
|
const mongoose_2 = require("mongoose");
|
|
20
20
|
const logging_helper_1 = require("../../../common/helpers/logging.helper");
|
|
21
|
+
const core_redis_service_1 = require("../../../common/services/core-redis.service");
|
|
21
22
|
const hub_constants_1 = require("../hub.constants");
|
|
22
|
-
const
|
|
23
|
+
const hub_buffer_1 = require("../hub-buffer");
|
|
23
24
|
const hub_command_shape_helper_1 = require("../helpers/hub-command-shape.helper");
|
|
24
25
|
const DEFAULT_IGNORE = new Set([
|
|
25
26
|
'authenticate',
|
|
@@ -41,6 +42,7 @@ const SHAPED_FIELDS = ['filter', 'query', 'pipeline', 'sort', 'projection', 'q',
|
|
|
41
42
|
let HubQueryProfilerService = HubQueryProfilerService_1 = class HubQueryProfilerService {
|
|
42
43
|
config;
|
|
43
44
|
connection;
|
|
45
|
+
redis;
|
|
44
46
|
logger = new common_1.Logger(HubQueryProfilerService_1.name);
|
|
45
47
|
buffer;
|
|
46
48
|
client;
|
|
@@ -50,9 +52,10 @@ let HubQueryProfilerService = HubQueryProfilerService_1 = class HubQueryProfiler
|
|
|
50
52
|
onStarted = (e) => this.safe(() => this.handleStarted(e));
|
|
51
53
|
onSucceeded = (e) => this.safe(() => this.handleFinished(e, undefined));
|
|
52
54
|
pending = new Map();
|
|
53
|
-
constructor(config, connection) {
|
|
55
|
+
constructor(config, connection, redis) {
|
|
54
56
|
this.config = config;
|
|
55
57
|
this.connection = connection;
|
|
58
|
+
this.redis = redis;
|
|
56
59
|
}
|
|
57
60
|
clear() {
|
|
58
61
|
this.buffer?.clear();
|
|
@@ -61,10 +64,11 @@ let HubQueryProfilerService = HubQueryProfilerService_1 = class HubQueryProfiler
|
|
|
61
64
|
get enabled() {
|
|
62
65
|
return this.config.collectors.queries !== false;
|
|
63
66
|
}
|
|
64
|
-
getData() {
|
|
65
|
-
const
|
|
67
|
+
async getData() {
|
|
68
|
+
const data = this.buffer ? await this.buffer.read() : { cursor: -1, entries: [] };
|
|
69
|
+
const records = data.entries;
|
|
66
70
|
return {
|
|
67
|
-
cursor:
|
|
71
|
+
cursor: data.cursor,
|
|
68
72
|
recent: records.slice(-100),
|
|
69
73
|
slowest: [...records].sort((a, b) => b.durationMs - a.durationMs).slice(0, 10),
|
|
70
74
|
summary: this.summary(records),
|
|
@@ -87,7 +91,7 @@ let HubQueryProfilerService = HubQueryProfilerService_1 = class HubQueryProfiler
|
|
|
87
91
|
return;
|
|
88
92
|
}
|
|
89
93
|
this.cfg = this.config.collectors.queries;
|
|
90
|
-
this.buffer = new
|
|
94
|
+
this.buffer = new hub_buffer_1.HubBuffer(this.cfg.capacity, 'queries', this.redis);
|
|
91
95
|
if (this.cfg.ignoreCommands?.length) {
|
|
92
96
|
this.ignore = new Set(this.cfg.ignoreCommands.map((c) => c.toLowerCase()));
|
|
93
97
|
}
|
|
@@ -230,6 +234,8 @@ exports.HubQueryProfilerService = HubQueryProfilerService = HubQueryProfilerServ
|
|
|
230
234
|
__param(0, (0, common_1.Inject)(hub_constants_1.HUB_CONFIG)),
|
|
231
235
|
__param(1, (0, common_1.Optional)()),
|
|
232
236
|
__param(1, (0, mongoose_1.InjectConnection)()),
|
|
233
|
-
|
|
237
|
+
__param(2, (0, common_1.Optional)()),
|
|
238
|
+
__metadata("design:paramtypes", [Object, mongoose_2.Connection,
|
|
239
|
+
core_redis_service_1.CoreRedisService])
|
|
234
240
|
], HubQueryProfilerService);
|
|
235
241
|
//# sourceMappingURL=hub-query-profiler.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-query-profiler.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/hub-query-profiler.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAqG;AACrG,+CAAoD;AACpD,uCAAsC;AAEtC,2EAA6E;AAC7E,oDAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"hub-query-profiler.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/hub-query-profiler.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
|
+
import { CoreRedisService } from '../../../common/services/core-redis.service';
|
|
2
3
|
import { HubTracesData } from '../interfaces/hub-panels.interface';
|
|
3
4
|
import { ResolvedHubConfig } from '../interfaces/hub-config.interface';
|
|
4
5
|
export declare class HubTraceBufferService {
|
|
5
6
|
protected readonly config: ResolvedHubConfig;
|
|
7
|
+
protected readonly redis?: CoreRedisService;
|
|
6
8
|
private readonly buffer?;
|
|
7
9
|
private readonly cfg?;
|
|
8
10
|
private readonly excludePrefixes;
|
|
9
|
-
constructor(config: ResolvedHubConfig);
|
|
11
|
+
constructor(config: ResolvedHubConfig, redis?: CoreRedisService);
|
|
10
12
|
clear(): void;
|
|
11
13
|
get enabled(): boolean;
|
|
12
|
-
getData(since?: number): HubTracesData
|
|
14
|
+
getData(since?: number): Promise<HubTracesData>;
|
|
13
15
|
isExcluded(path: string): boolean;
|
|
14
16
|
record(req: Request, res: Response, durationMs: number, aborted: boolean, fullPath?: string): void;
|
|
15
17
|
private collapseParams;
|
|
@@ -14,18 +14,21 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.HubTraceBufferService = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const core_redis_service_1 = require("../../../common/services/core-redis.service");
|
|
17
18
|
const hub_constants_1 = require("../hub.constants");
|
|
18
|
-
const
|
|
19
|
+
const hub_buffer_1 = require("../hub-buffer");
|
|
19
20
|
let HubTraceBufferService = class HubTraceBufferService {
|
|
20
21
|
config;
|
|
22
|
+
redis;
|
|
21
23
|
buffer;
|
|
22
24
|
cfg;
|
|
23
25
|
excludePrefixes;
|
|
24
|
-
constructor(config) {
|
|
26
|
+
constructor(config, redis) {
|
|
25
27
|
this.config = config;
|
|
28
|
+
this.redis = redis;
|
|
26
29
|
if (config.collectors.traces !== false) {
|
|
27
30
|
this.cfg = config.collectors.traces;
|
|
28
|
-
this.buffer = new
|
|
31
|
+
this.buffer = new hub_buffer_1.HubBuffer(this.cfg.capacity, 'traces', redis);
|
|
29
32
|
}
|
|
30
33
|
this.excludePrefixes = [...(this.cfg?.excludePaths ?? []), '/' + config.path];
|
|
31
34
|
}
|
|
@@ -35,8 +38,9 @@ let HubTraceBufferService = class HubTraceBufferService {
|
|
|
35
38
|
get enabled() {
|
|
36
39
|
return this.config.collectors.traces !== false;
|
|
37
40
|
}
|
|
38
|
-
getData(since) {
|
|
39
|
-
const
|
|
41
|
+
async getData(since) {
|
|
42
|
+
const data = this.buffer ? await this.buffer.read(since) : { cursor: -1, dropped: -1, entries: [] };
|
|
43
|
+
const records = data.entries;
|
|
40
44
|
let totalMs = 0;
|
|
41
45
|
let slowCount = 0;
|
|
42
46
|
let errorCount = 0;
|
|
@@ -50,8 +54,8 @@ let HubTraceBufferService = class HubTraceBufferService {
|
|
|
50
54
|
}
|
|
51
55
|
}
|
|
52
56
|
return {
|
|
53
|
-
cursor:
|
|
54
|
-
dropped:
|
|
57
|
+
cursor: data.cursor,
|
|
58
|
+
dropped: data.dropped,
|
|
55
59
|
summary: { avgMs: records.length ? totalMs / records.length : 0, errorCount, slowCount, total: records.length },
|
|
56
60
|
traces: records,
|
|
57
61
|
};
|
|
@@ -118,6 +122,7 @@ exports.HubTraceBufferService = HubTraceBufferService;
|
|
|
118
122
|
exports.HubTraceBufferService = HubTraceBufferService = __decorate([
|
|
119
123
|
(0, common_1.Injectable)(),
|
|
120
124
|
__param(0, (0, common_1.Inject)(hub_constants_1.HUB_CONFIG)),
|
|
121
|
-
|
|
125
|
+
__param(1, (0, common_1.Optional)()),
|
|
126
|
+
__metadata("design:paramtypes", [Object, core_redis_service_1.CoreRedisService])
|
|
122
127
|
], HubTraceBufferService);
|
|
123
128
|
//# sourceMappingURL=hub-trace-buffer.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub-trace-buffer.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/hub-trace-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"hub-trace-buffer.service.js","sourceRoot":"","sources":["../../../../../src/core/modules/hub/services/hub-trace-buffer.service.ts"],"names":[],"mappings":"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"}
|