@lenne.tech/nest-server 11.32.3 → 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/bin/migrate.js +13 -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 +21 -2
- package/dist/core/common/helpers/file.helper.js +69 -13
- 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 +15 -3
- package/dist/core/modules/file/core-file.controller.js +90 -20
- 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/cli/migrate-cli.d.ts +3 -1
- package/dist/core/modules/migrate/cli/migrate-cli.js +29 -4
- package/dist/core/modules/migrate/cli/migrate-cli.js.map +1 -1
- package/dist/core/modules/migrate/helpers/migration.helper.d.ts +3 -6
- package/dist/core/modules/migrate/helpers/migration.helper.js +55 -8
- 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 +30 -5
- package/migration-guides/11.32.3-to-11.32.4.md +335 -0
- 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 +201 -20
- 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 +324 -41
- package/src/core/modules/file/core-file.controller.ts +267 -19
- 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 +68 -6
- package/src/core/modules/migrate/cli/migrate-cli.ts +69 -6
- package/src/core/modules/migrate/helpers/migration.helper.ts +144 -10
- 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/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/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
|
@@ -15,12 +15,14 @@ var CoreBetterAuthEmailVerificationService_1;
|
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.CoreBetterAuthEmailVerificationService = void 0;
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
|
+
const node_crypto_1 = require("node:crypto");
|
|
18
19
|
const ejs = require("ejs");
|
|
19
20
|
const fs = require("fs");
|
|
20
21
|
const path = require("path");
|
|
21
22
|
const logging_helper_1 = require("../../common/helpers/logging.helper");
|
|
22
23
|
const brevo_service_1 = require("../../common/services/brevo.service");
|
|
23
24
|
const config_service_1 = require("../../common/services/config.service");
|
|
25
|
+
const core_redis_service_1 = require("../../common/services/core-redis.service");
|
|
24
26
|
const email_service_1 = require("../../common/services/email.service");
|
|
25
27
|
const template_service_1 = require("../../common/services/template.service");
|
|
26
28
|
const better_auth_config_1 = require("./better-auth.config");
|
|
@@ -33,21 +35,25 @@ const DEFAULT_CONFIG = {
|
|
|
33
35
|
resendCooldownSeconds: 60,
|
|
34
36
|
template: 'email-verification',
|
|
35
37
|
};
|
|
38
|
+
const LOCAL_SLOT_TOKEN = 'local';
|
|
36
39
|
let CoreBetterAuthEmailVerificationService = class CoreBetterAuthEmailVerificationService {
|
|
37
40
|
static { CoreBetterAuthEmailVerificationService_1 = this; }
|
|
38
41
|
configService;
|
|
39
42
|
emailService;
|
|
40
43
|
templateService;
|
|
41
44
|
brevoService;
|
|
45
|
+
coreRedisService;
|
|
42
46
|
logger = new common_1.Logger(CoreBetterAuthEmailVerificationService_1.name);
|
|
43
47
|
config = DEFAULT_CONFIG;
|
|
44
48
|
lastSendTimes = new Map();
|
|
49
|
+
sendTimers = new Map();
|
|
45
50
|
static BREVO_SERVICE_TOKEN = 'BETTER_AUTH_BREVO_SERVICE';
|
|
46
|
-
constructor(configService, emailService, templateService, brevoService) {
|
|
51
|
+
constructor(configService, emailService, templateService, brevoService, coreRedisService) {
|
|
47
52
|
this.configService = configService;
|
|
48
53
|
this.emailService = emailService;
|
|
49
54
|
this.templateService = templateService;
|
|
50
55
|
this.brevoService = brevoService;
|
|
56
|
+
this.coreRedisService = coreRedisService;
|
|
51
57
|
this.configure();
|
|
52
58
|
}
|
|
53
59
|
isEnabled() {
|
|
@@ -65,70 +71,129 @@ let CoreBetterAuthEmailVerificationService = class CoreBetterAuthEmailVerificati
|
|
|
65
71
|
async sendVerificationEmail(options) {
|
|
66
72
|
const { token, user } = options;
|
|
67
73
|
let { url } = options;
|
|
68
|
-
|
|
74
|
+
const slotToken = await this.acquireSendSlot(user.email);
|
|
75
|
+
if (!slotToken) {
|
|
69
76
|
this.logger.debug(`Resend cooldown active for ${this.maskEmail(user.email)}, skipping email send`);
|
|
70
77
|
return;
|
|
71
78
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
+
let sent = false;
|
|
80
|
+
try {
|
|
81
|
+
if (this.config.callbackURL) {
|
|
82
|
+
url = this.buildFrontendVerificationUrl(token);
|
|
83
|
+
}
|
|
84
|
+
if (process.env.NODE_ENV !== 'production') {
|
|
85
|
+
console.log(`[EMAIL VERIFICATION] User: ${user.email}, URL: ${url}`);
|
|
86
|
+
}
|
|
87
|
+
if (this.config.brevoTemplateId && this.brevoService) {
|
|
88
|
+
try {
|
|
89
|
+
const appName = this.getAppName();
|
|
90
|
+
const result = await this.brevoService.sendMail(user.email, this.config.brevoTemplateId, {
|
|
91
|
+
appName,
|
|
92
|
+
expiresIn: this.formatExpiresIn(this.config.expiresIn),
|
|
93
|
+
link: url,
|
|
94
|
+
name: user.name || user.email.split('@')[0],
|
|
95
|
+
});
|
|
96
|
+
if (result === null) {
|
|
97
|
+
this.logger.error(`Brevo verification send failed for ${this.maskEmail(user.email)} — falling back to SMTP`);
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
sent = true;
|
|
101
|
+
this.logger.debug(`Verification email sent via Brevo to ${this.maskEmail(user.email)}`);
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
this.logger.error(`Failed to send verification email via Brevo to ${this.maskEmail(user.email)}: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
107
|
+
throw error;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
if (!this.emailService) {
|
|
111
|
+
this.logger.warn('EmailService not available, cannot send verification email');
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
79
114
|
try {
|
|
115
|
+
const resolved = await this.resolveTemplatePath(this.config.template, this.config.locale);
|
|
80
116
|
const appName = this.getAppName();
|
|
81
|
-
const
|
|
117
|
+
const templateData = {
|
|
82
118
|
appName,
|
|
83
119
|
expiresIn: this.formatExpiresIn(this.config.expiresIn),
|
|
84
120
|
link: url,
|
|
85
121
|
name: user.name || user.email.split('@')[0],
|
|
86
|
-
}
|
|
87
|
-
if (
|
|
88
|
-
|
|
122
|
+
};
|
|
123
|
+
if (resolved.isAbsolute) {
|
|
124
|
+
const templateContent = fs.readFileSync(`${resolved.path}.ejs`, 'utf-8');
|
|
125
|
+
const html = ejs.render(templateContent, templateData);
|
|
126
|
+
await this.emailService.sendMail(user.email, this.getEmailSubject(appName), { html });
|
|
89
127
|
}
|
|
90
128
|
else {
|
|
91
|
-
this.
|
|
92
|
-
|
|
93
|
-
|
|
129
|
+
await this.emailService.sendMail(user.email, this.getEmailSubject(appName), {
|
|
130
|
+
htmlTemplate: resolved.path,
|
|
131
|
+
templateData,
|
|
132
|
+
});
|
|
94
133
|
}
|
|
134
|
+
sent = true;
|
|
135
|
+
this.logger.debug(`Verification email sent to ${this.maskEmail(user.email)}`);
|
|
95
136
|
}
|
|
96
137
|
catch (error) {
|
|
97
|
-
this.logger.error(`Failed to send verification email
|
|
138
|
+
this.logger.error(`Failed to send verification email to ${this.maskEmail(user.email)}: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
98
139
|
throw error;
|
|
99
140
|
}
|
|
100
141
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
142
|
+
finally {
|
|
143
|
+
if (!sent) {
|
|
144
|
+
await this.releaseSendSlot(user.email, slotToken);
|
|
145
|
+
}
|
|
104
146
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
147
|
+
}
|
|
148
|
+
async acquireSendSlot(email) {
|
|
149
|
+
const cooldown = this.config.resendCooldownSeconds;
|
|
150
|
+
if (cooldown <= 0) {
|
|
151
|
+
return LOCAL_SLOT_TOKEN;
|
|
152
|
+
}
|
|
153
|
+
if (this.coreRedisService?.enabled) {
|
|
154
|
+
try {
|
|
155
|
+
const token = (0, node_crypto_1.randomUUID)();
|
|
156
|
+
const result = await this.coreRedisService
|
|
157
|
+
.getClient()
|
|
158
|
+
.set(this.cooldownKey(email), token, 'PX', cooldown * 1000, 'NX');
|
|
159
|
+
return result === 'OK' ? token : null;
|
|
118
160
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
htmlTemplate: resolved.path,
|
|
122
|
-
templateData,
|
|
123
|
-
});
|
|
161
|
+
catch (error) {
|
|
162
|
+
this.logger.warn(`Redis cooldown unavailable, falling back to the per-replica counter: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
124
163
|
}
|
|
125
|
-
this.trackSend(user.email);
|
|
126
|
-
this.logger.debug(`Verification email sent to ${this.maskEmail(user.email)}`);
|
|
127
164
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
165
|
+
if (this.isInCooldown(email)) {
|
|
166
|
+
return null;
|
|
167
|
+
}
|
|
168
|
+
this.trackSend(email);
|
|
169
|
+
return LOCAL_SLOT_TOKEN;
|
|
170
|
+
}
|
|
171
|
+
async releaseSendSlot(email, token) {
|
|
172
|
+
if (this.config.resendCooldownSeconds <= 0) {
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
if (this.coreRedisService?.enabled) {
|
|
176
|
+
if (typeof token === 'string' && token !== LOCAL_SLOT_TOKEN) {
|
|
177
|
+
const script = `if redis.call('GET', KEYS[1]) == ARGV[1] then return redis.call('DEL', KEYS[1]) end return 0`;
|
|
178
|
+
await this.coreRedisService
|
|
179
|
+
.getClient()
|
|
180
|
+
.eval(script, 1, this.cooldownKey(email), token)
|
|
181
|
+
.catch(() => undefined);
|
|
182
|
+
}
|
|
183
|
+
else if (token === undefined) {
|
|
184
|
+
await this.coreRedisService
|
|
185
|
+
.getClient()
|
|
186
|
+
.del(this.cooldownKey(email))
|
|
187
|
+
.catch(() => undefined);
|
|
188
|
+
}
|
|
131
189
|
}
|
|
190
|
+
const key = email.toLowerCase();
|
|
191
|
+
clearTimeout(this.sendTimers.get(key));
|
|
192
|
+
this.sendTimers.delete(key);
|
|
193
|
+
this.lastSendTimes.delete(key);
|
|
194
|
+
}
|
|
195
|
+
cooldownKey(email) {
|
|
196
|
+
return this.coreRedisService.key('email-verification-cooldown', email.toLowerCase());
|
|
132
197
|
}
|
|
133
198
|
configure() {
|
|
134
199
|
const rawConfig = this.configService.getFastButReadOnly('betterAuth.emailVerification');
|
|
@@ -239,7 +304,13 @@ let CoreBetterAuthEmailVerificationService = class CoreBetterAuthEmailVerificati
|
|
|
239
304
|
this.lastSendTimes.set(key, Date.now());
|
|
240
305
|
const cooldown = this.config.resendCooldownSeconds;
|
|
241
306
|
if (cooldown > 0) {
|
|
242
|
-
|
|
307
|
+
clearTimeout(this.sendTimers.get(key));
|
|
308
|
+
const timer = setTimeout(() => {
|
|
309
|
+
this.lastSendTimes.delete(key);
|
|
310
|
+
this.sendTimers.delete(key);
|
|
311
|
+
}, cooldown * 1000);
|
|
312
|
+
timer.unref?.();
|
|
313
|
+
this.sendTimers.set(key, timer);
|
|
243
314
|
}
|
|
244
315
|
}
|
|
245
316
|
maskEmail(email) {
|
|
@@ -253,9 +324,11 @@ exports.CoreBetterAuthEmailVerificationService = CoreBetterAuthEmailVerification
|
|
|
253
324
|
__param(2, (0, common_1.Optional)()),
|
|
254
325
|
__param(3, (0, common_1.Optional)()),
|
|
255
326
|
__param(3, (0, common_1.Inject)(CoreBetterAuthEmailVerificationService.BREVO_SERVICE_TOKEN)),
|
|
327
|
+
__param(4, (0, common_1.Optional)()),
|
|
256
328
|
__metadata("design:paramtypes", [config_service_1.ConfigService,
|
|
257
329
|
email_service_1.EmailService,
|
|
258
330
|
template_service_1.TemplateService,
|
|
259
|
-
brevo_service_1.BrevoService
|
|
331
|
+
brevo_service_1.BrevoService,
|
|
332
|
+
core_redis_service_1.CoreRedisService])
|
|
260
333
|
], CoreBetterAuthEmailVerificationService);
|
|
261
334
|
//# sourceMappingURL=core-better-auth-email-verification.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-better-auth-email-verification.service.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-email-verification.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"core-better-auth-email-verification.service.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-email-verification.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare class CoreBetterAuthRateLimitMiddleware implements NestMiddleware
|
|
|
6
6
|
private readonly rateLimiter;
|
|
7
7
|
private readonly betterAuthService;
|
|
8
8
|
constructor(rateLimiter: CoreBetterAuthRateLimiter, betterAuthService: CoreBetterAuthService);
|
|
9
|
-
use(req: Request, res: Response, next: NextFunction): void
|
|
9
|
+
use(req: Request, res: Response, next: NextFunction): Promise<void>;
|
|
10
10
|
private getClientIp;
|
|
11
11
|
private addRateLimitHeaders;
|
|
12
12
|
}
|
|
@@ -20,7 +20,7 @@ let CoreBetterAuthRateLimitMiddleware = class CoreBetterAuthRateLimitMiddleware
|
|
|
20
20
|
this.rateLimiter = rateLimiter;
|
|
21
21
|
this.betterAuthService = betterAuthService;
|
|
22
22
|
}
|
|
23
|
-
use(req, res, next) {
|
|
23
|
+
async use(req, res, next) {
|
|
24
24
|
if (!this.betterAuthService.isEnabled()) {
|
|
25
25
|
return next();
|
|
26
26
|
}
|
|
@@ -30,7 +30,7 @@ let CoreBetterAuthRateLimitMiddleware = class CoreBetterAuthRateLimitMiddleware
|
|
|
30
30
|
const ip = this.getClientIp(req);
|
|
31
31
|
const basePath = this.betterAuthService.getBasePath();
|
|
32
32
|
const path = req.path.startsWith(basePath) ? req.path.substring(basePath.length) : req.path;
|
|
33
|
-
const result = this.rateLimiter.check(ip, path);
|
|
33
|
+
const result = await this.rateLimiter.check(ip, path);
|
|
34
34
|
this.addRateLimitHeaders(res, result);
|
|
35
35
|
if (!result.allowed) {
|
|
36
36
|
throw new common_1.HttpException({
|
|
@@ -43,15 +43,6 @@ let CoreBetterAuthRateLimitMiddleware = class CoreBetterAuthRateLimitMiddleware
|
|
|
43
43
|
next();
|
|
44
44
|
}
|
|
45
45
|
getClientIp(req) {
|
|
46
|
-
const forwardedFor = req.headers['x-forwarded-for'];
|
|
47
|
-
if (forwardedFor) {
|
|
48
|
-
const ips = Array.isArray(forwardedFor) ? forwardedFor[0] : forwardedFor.split(',')[0];
|
|
49
|
-
return ips.trim();
|
|
50
|
-
}
|
|
51
|
-
const realIp = req.headers['x-real-ip'];
|
|
52
|
-
if (realIp) {
|
|
53
|
-
return Array.isArray(realIp) ? realIp[0] : realIp;
|
|
54
|
-
}
|
|
55
46
|
return req.ip || req.socket?.remoteAddress || 'unknown';
|
|
56
47
|
}
|
|
57
48
|
addRateLimitHeaders(res, result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-better-auth-rate-limit.middleware.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-rate-limit.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuF;AAGvF,mGAAqG;AACrG,yEAAmE;AA4B5D,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAEzB;IACA;IAFnB,YACmB,WAAsC,EACtC,iBAAwC;QADxC,gBAAW,GAAX,WAAW,CAA2B;QACtC,sBAAiB,GAAjB,iBAAiB,CAAuB;IACxD,CAAC;IAEJ,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;
|
|
1
|
+
{"version":3,"file":"core-better-auth-rate-limit.middleware.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-rate-limit.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuF;AAGvF,mGAAqG;AACrG,yEAAmE;AA4B5D,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAEzB;IACA;IAFnB,YACmB,WAAsC,EACtC,iBAAwC;QADxC,gBAAW,GAAX,WAAW,CAA2B;QACtC,sBAAiB,GAAjB,iBAAiB,CAAuB;IACxD,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QAEvD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,CAAC;YACxC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAGD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YAClC,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAGD,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAGjC,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;QAG5F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAGtD,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAGtC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,sBAAa,CACrB;gBACE,KAAK,EAAE,mBAAmB;gBAC1B,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;gBACtC,UAAU,EAAE,MAAM,CAAC,OAAO;gBAC1B,UAAU,EAAE,mBAAU,CAAC,iBAAiB;aACzC,EACD,mBAAU,CAAC,iBAAiB,CAC7B,CAAC;QACJ,CAAC;QAED,IAAI,EAAE,CAAC;IACT,CAAC;IAaO,WAAW,CAAC,GAAY;QAC9B,OAAO,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,aAAa,IAAI,SAAS,CAAC;IAC1D,CAAC;IAKO,mBAAmB,CAAC,GAAa,EAAE,MAAuB;QAChE,GAAG,CAAC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,GAAG,CAAC,SAAS,CAAC,uBAAuB,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,GAAG,CAAC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CACF,CAAA;AAzEY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,mBAAU,GAAE;qCAGqB,iEAAyB;QACnB,gDAAqB;GAHhD,iCAAiC,CAyE7C"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { Logger } from '@nestjs/common';
|
|
1
2
|
import { IBetterAuthRateLimit } from '../../common/interfaces/server-options.interface';
|
|
3
|
+
import { CoreRedisService } from '../../common/services/core-redis.service';
|
|
4
|
+
import { RateLimitStore } from '../../common/services/rate-limit-store';
|
|
2
5
|
export interface RateLimitResult {
|
|
3
6
|
allowed: boolean;
|
|
4
7
|
current: number;
|
|
@@ -7,27 +10,26 @@ export interface RateLimitResult {
|
|
|
7
10
|
resetIn: number;
|
|
8
11
|
}
|
|
9
12
|
export declare class CoreBetterAuthRateLimiter {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
constructor();
|
|
13
|
+
protected readonly coreRedisService?: CoreRedisService;
|
|
14
|
+
protected readonly logger: Logger;
|
|
15
|
+
protected config: Required<IBetterAuthRateLimit>;
|
|
16
|
+
protected store?: RateLimitStore;
|
|
17
|
+
constructor(coreRedisService?: CoreRedisService);
|
|
15
18
|
configure(config: IBetterAuthRateLimit | undefined): void;
|
|
16
|
-
check(ip: string, path: string): RateLimitResult
|
|
19
|
+
check(ip: string, path: string): Promise<RateLimitResult>;
|
|
17
20
|
getMessage(): string;
|
|
18
21
|
isEnabled(): boolean;
|
|
19
|
-
reset(ip: string): void
|
|
20
|
-
clear(): void
|
|
22
|
+
reset(ip: string): Promise<void>;
|
|
23
|
+
clear(): Promise<void>;
|
|
21
24
|
getStats(): {
|
|
22
25
|
activeEntries: number;
|
|
23
26
|
enabled: boolean;
|
|
24
27
|
};
|
|
25
28
|
onModuleDestroy(): void;
|
|
26
|
-
|
|
29
|
+
protected getStore(): RateLimitStore;
|
|
27
30
|
private shouldSkip;
|
|
28
31
|
private getLimit;
|
|
29
32
|
private getKey;
|
|
30
33
|
private normalizeEndpoint;
|
|
31
34
|
private maskIp;
|
|
32
|
-
private startCleanup;
|
|
33
35
|
}
|
|
@@ -8,10 +8,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
var CoreBetterAuthRateLimiter_1;
|
|
12
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
16
|
exports.CoreBetterAuthRateLimiter = void 0;
|
|
14
17
|
const common_1 = require("@nestjs/common");
|
|
18
|
+
const core_redis_service_1 = require("../../common/services/core-redis.service");
|
|
19
|
+
const rate_limit_store_1 = require("../../common/services/rate-limit-store");
|
|
15
20
|
const DEFAULT_CONFIG = {
|
|
16
21
|
enabled: false,
|
|
17
22
|
max: 10,
|
|
@@ -22,12 +27,12 @@ const DEFAULT_CONFIG = {
|
|
|
22
27
|
windowSeconds: 60,
|
|
23
28
|
};
|
|
24
29
|
let CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter_1 = class CoreBetterAuthRateLimiter {
|
|
30
|
+
coreRedisService;
|
|
25
31
|
logger = new common_1.Logger(CoreBetterAuthRateLimiter_1.name);
|
|
26
|
-
store = new Map();
|
|
27
32
|
config = DEFAULT_CONFIG;
|
|
28
|
-
|
|
29
|
-
constructor() {
|
|
30
|
-
this.
|
|
33
|
+
store;
|
|
34
|
+
constructor(coreRedisService) {
|
|
35
|
+
this.coreRedisService = coreRedisService;
|
|
31
36
|
}
|
|
32
37
|
configure(config) {
|
|
33
38
|
this.config = {
|
|
@@ -40,7 +45,7 @@ let CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter_1 = class CoreBetterAu
|
|
|
40
45
|
this.logger.debug(`Rate limiting enabled: ${this.config.max} requests per ${this.config.windowSeconds}s`);
|
|
41
46
|
}
|
|
42
47
|
}
|
|
43
|
-
check(ip, path) {
|
|
48
|
+
async check(ip, path) {
|
|
44
49
|
if (!this.config.enabled) {
|
|
45
50
|
return {
|
|
46
51
|
allowed: true,
|
|
@@ -60,36 +65,15 @@ let CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter_1 = class CoreBetterAu
|
|
|
60
65
|
};
|
|
61
66
|
}
|
|
62
67
|
const limit = this.getLimit(path);
|
|
63
|
-
const
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
if (!entry || now >= entry.resetTime) {
|
|
67
|
-
if (!entry && this.store.size >= this.config.maxEntries) {
|
|
68
|
-
this.evictOldest();
|
|
69
|
-
}
|
|
70
|
-
entry = {
|
|
71
|
-
count: 1,
|
|
72
|
-
resetTime: now + this.config.windowSeconds * 1000,
|
|
73
|
-
};
|
|
74
|
-
this.store.set(key, entry);
|
|
75
|
-
return {
|
|
76
|
-
allowed: true,
|
|
77
|
-
current: 1,
|
|
78
|
-
limit,
|
|
79
|
-
remaining: limit - 1,
|
|
80
|
-
resetIn: this.config.windowSeconds,
|
|
81
|
-
};
|
|
82
|
-
}
|
|
83
|
-
entry.count++;
|
|
84
|
-
const resetIn = Math.ceil((entry.resetTime - now) / 1000);
|
|
85
|
-
const allowed = entry.count <= limit;
|
|
86
|
-
const remaining = Math.max(0, limit - entry.count);
|
|
68
|
+
const { count, resetIn } = await this.getStore().hit(this.getKey(ip, path), this.config.windowSeconds);
|
|
69
|
+
const allowed = count <= limit;
|
|
70
|
+
const remaining = Math.max(0, limit - count);
|
|
87
71
|
if (!allowed) {
|
|
88
|
-
this.logger.warn(`Rate limit exceeded for IP ${this.maskIp(ip)} on ${path}: ${
|
|
72
|
+
this.logger.warn(`Rate limit exceeded for IP ${this.maskIp(ip)} on ${path}: ${count}/${limit}`);
|
|
89
73
|
}
|
|
90
74
|
return {
|
|
91
75
|
allowed,
|
|
92
|
-
current:
|
|
76
|
+
current: count,
|
|
93
77
|
limit,
|
|
94
78
|
remaining,
|
|
95
79
|
resetIn,
|
|
@@ -101,50 +85,28 @@ let CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter_1 = class CoreBetterAu
|
|
|
101
85
|
isEnabled() {
|
|
102
86
|
return this.config.enabled;
|
|
103
87
|
}
|
|
104
|
-
reset(ip) {
|
|
105
|
-
|
|
106
|
-
if (key.startsWith(`${ip}:`)) {
|
|
107
|
-
this.store.delete(key);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
88
|
+
async reset(ip) {
|
|
89
|
+
await this.getStore().resetByPrefix((0, rate_limit_store_1.rateLimitKeyPrefix)(ip));
|
|
110
90
|
}
|
|
111
|
-
clear() {
|
|
112
|
-
this.
|
|
91
|
+
async clear() {
|
|
92
|
+
await this.getStore().clear();
|
|
113
93
|
}
|
|
114
94
|
getStats() {
|
|
115
95
|
return {
|
|
116
|
-
activeEntries: this.store
|
|
96
|
+
activeEntries: this.store?.size() ?? 0,
|
|
117
97
|
enabled: this.config.enabled,
|
|
118
98
|
};
|
|
119
99
|
}
|
|
120
100
|
onModuleDestroy() {
|
|
121
|
-
|
|
122
|
-
clearInterval(this.cleanupInterval);
|
|
123
|
-
this.cleanupInterval = null;
|
|
124
|
-
}
|
|
101
|
+
this.store?.destroy?.();
|
|
125
102
|
}
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
this.store.delete(key);
|
|
132
|
-
evicted++;
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
if (this.store.size >= this.config.maxEntries) {
|
|
136
|
-
const targetSize = Math.floor(this.config.maxEntries * 0.9);
|
|
137
|
-
const entries = [...this.store.entries()].sort((a, b) => a[1].resetTime - b[1].resetTime);
|
|
138
|
-
for (const [key] of entries) {
|
|
139
|
-
if (this.store.size <= targetSize)
|
|
140
|
-
break;
|
|
141
|
-
this.store.delete(key);
|
|
142
|
-
evicted++;
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
if (evicted > 0) {
|
|
146
|
-
this.logger.warn(`Evicted ${evicted} rate limit entries (store was at capacity: ${this.config.maxEntries})`);
|
|
103
|
+
getStore() {
|
|
104
|
+
if (!this.store) {
|
|
105
|
+
this.store = this.coreRedisService?.enabled
|
|
106
|
+
? new rate_limit_store_1.RedisRateLimitStore(this.coreRedisService, 'better-auth', this.config.maxEntries)
|
|
107
|
+
: new rate_limit_store_1.InMemoryRateLimitStore(this.config.maxEntries);
|
|
147
108
|
}
|
|
109
|
+
return this.store;
|
|
148
110
|
}
|
|
149
111
|
shouldSkip(path) {
|
|
150
112
|
return this.config.skipEndpoints.some((skip) => path === skip || path.endsWith(skip) || path.includes(skip));
|
|
@@ -155,7 +117,7 @@ let CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter_1 = class CoreBetterAu
|
|
|
155
117
|
}
|
|
156
118
|
getKey(ip, path) {
|
|
157
119
|
const endpoint = this.normalizeEndpoint(path);
|
|
158
|
-
return
|
|
120
|
+
return (0, rate_limit_store_1.rateLimitKey)(ip, endpoint);
|
|
159
121
|
}
|
|
160
122
|
normalizeEndpoint(path) {
|
|
161
123
|
const cleanPath = path.split('?')[0];
|
|
@@ -173,28 +135,11 @@ let CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter_1 = class CoreBetterAu
|
|
|
173
135
|
const parts = ip.split(':');
|
|
174
136
|
return `${parts[0]}:****`;
|
|
175
137
|
}
|
|
176
|
-
startCleanup() {
|
|
177
|
-
this.cleanupInterval = setInterval(() => {
|
|
178
|
-
const now = Date.now();
|
|
179
|
-
let cleaned = 0;
|
|
180
|
-
for (const [key, entry] of this.store.entries()) {
|
|
181
|
-
if (now >= entry.resetTime) {
|
|
182
|
-
this.store.delete(key);
|
|
183
|
-
cleaned++;
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
if (cleaned > 0) {
|
|
187
|
-
this.logger.debug(`Cleaned up ${cleaned} expired rate limit entries`);
|
|
188
|
-
}
|
|
189
|
-
}, 5 * 60 * 1000);
|
|
190
|
-
if (this.cleanupInterval.unref) {
|
|
191
|
-
this.cleanupInterval.unref();
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
138
|
};
|
|
195
139
|
exports.CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter;
|
|
196
140
|
exports.CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter = CoreBetterAuthRateLimiter_1 = __decorate([
|
|
197
141
|
(0, common_1.Injectable)(),
|
|
198
|
-
|
|
142
|
+
__param(0, (0, common_1.Optional)()),
|
|
143
|
+
__metadata("design:paramtypes", [core_redis_service_1.CoreRedisService])
|
|
199
144
|
], CoreBetterAuthRateLimiter);
|
|
200
145
|
//# sourceMappingURL=core-better-auth-rate-limiter.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-better-auth-rate-limiter.service.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-rate-limiter.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core-better-auth-rate-limiter.service.js","sourceRoot":"","sources":["../../../../src/core/modules/better-auth/core-better-auth-rate-limiter.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -332,7 +332,6 @@ let CoreBetterAuthUserMapper = class CoreBetterAuthUserMapper {
|
|
|
332
332
|
lastName: sessionUser.name.split(' ').slice(1).join(' '),
|
|
333
333
|
}),
|
|
334
334
|
...(sessionUser.emailVerified !== undefined && { verified: sessionUser.emailVerified }),
|
|
335
|
-
...(sessionUser.image && { avatar: sessionUser.image }),
|
|
336
335
|
iamId: sessionUser.id,
|
|
337
336
|
updatedAt: new Date(),
|
|
338
337
|
...processedAdditionalData,
|