@venizia/ignis 0.0.6-1 → 0.0.6-3
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/dist/base/applications/abstract.d.ts +1 -2
- package/dist/base/applications/abstract.d.ts.map +1 -1
- package/dist/base/applications/abstract.js +28 -18
- package/dist/base/applications/abstract.js.map +1 -1
- package/dist/base/applications/base.d.ts.map +1 -1
- package/dist/base/applications/base.js +33 -17
- package/dist/base/applications/base.js.map +1 -1
- package/dist/base/components/base.d.ts.map +1 -1
- package/dist/base/components/base.js +6 -2
- package/dist/base/components/base.js.map +1 -1
- package/dist/base/controllers/abstract.d.ts.map +1 -1
- package/dist/base/controllers/abstract.js +6 -2
- package/dist/base/controllers/abstract.js.map +1 -1
- package/dist/base/controllers/factory/controller.d.ts +2 -2
- package/dist/base/datasources/base.d.ts.map +1 -1
- package/dist/base/datasources/base.js +6 -4
- package/dist/base/datasources/base.js.map +1 -1
- package/dist/base/middlewares/app-error.middleware.d.ts +2 -2
- package/dist/base/middlewares/app-error.middleware.d.ts.map +1 -1
- package/dist/base/middlewares/app-error.middleware.js +3 -3
- package/dist/base/middlewares/app-error.middleware.js.map +1 -1
- package/dist/base/middlewares/not-found.middleware.d.ts +2 -2
- package/dist/base/middlewares/not-found.middleware.d.ts.map +1 -1
- package/dist/base/middlewares/not-found.middleware.js +10 -2
- package/dist/base/middlewares/not-found.middleware.js.map +1 -1
- package/dist/base/middlewares/request-normalize.middleware.d.ts.map +1 -1
- package/dist/base/middlewares/request-normalize.middleware.js +9 -1
- package/dist/base/middlewares/request-normalize.middleware.js.map +1 -1
- package/dist/base/middlewares/request-spy.middleware.d.ts +11 -1
- package/dist/base/middlewares/request-spy.middleware.d.ts.map +1 -1
- package/dist/base/middlewares/request-spy.middleware.js +46 -24
- package/dist/base/middlewares/request-spy.middleware.js.map +1 -1
- package/dist/base/mixins/component.mixin.d.ts +1 -1
- package/dist/base/mixins/component.mixin.d.ts.map +1 -1
- package/dist/base/mixins/component.mixin.js +3 -1
- package/dist/base/mixins/component.mixin.js.map +1 -1
- package/dist/base/mixins/controller.mixin.d.ts +1 -1
- package/dist/base/mixins/controller.mixin.d.ts.map +1 -1
- package/dist/base/mixins/controller.mixin.js +3 -1
- package/dist/base/mixins/controller.mixin.js.map +1 -1
- package/dist/base/mixins/repository.mixin.d.ts +1 -1
- package/dist/base/mixins/repository.mixin.d.ts.map +1 -1
- package/dist/base/mixins/repository.mixin.js +3 -1
- package/dist/base/mixins/repository.mixin.js.map +1 -1
- package/dist/base/mixins/service.mixin.d.ts +1 -1
- package/dist/base/mixins/service.mixin.d.ts.map +1 -1
- package/dist/base/repositories/common/index.d.ts +1 -0
- package/dist/base/repositories/common/index.d.ts.map +1 -1
- package/dist/base/repositories/common/index.js +1 -0
- package/dist/base/repositories/common/index.js.map +1 -1
- package/dist/base/repositories/common/shared.d.ts +19 -0
- package/dist/base/repositories/common/shared.d.ts.map +1 -0
- package/dist/base/repositories/common/shared.js +33 -0
- package/dist/base/repositories/common/shared.js.map +1 -0
- package/dist/base/repositories/core/persistable.d.ts.map +1 -1
- package/dist/base/repositories/core/persistable.js +21 -11
- package/dist/base/repositories/core/persistable.js.map +1 -1
- package/dist/base/repositories/operators/filter.d.ts +1 -3
- package/dist/base/repositories/operators/filter.d.ts.map +1 -1
- package/dist/base/repositories/operators/filter.js +6 -15
- package/dist/base/repositories/operators/filter.js.map +1 -1
- package/dist/base/repositories/operators/json-utils.d.ts +9 -7
- package/dist/base/repositories/operators/json-utils.d.ts.map +1 -1
- package/dist/base/repositories/operators/json-utils.js +15 -15
- package/dist/base/repositories/operators/json-utils.js.map +1 -1
- package/dist/base/repositories/operators/update.d.ts +1 -3
- package/dist/base/repositories/operators/update.d.ts.map +1 -1
- package/dist/base/repositories/operators/update.js +4 -10
- package/dist/base/repositories/operators/update.js.map +1 -1
- package/dist/components/auth/authenticate/component.d.ts.map +1 -1
- package/dist/components/auth/authenticate/component.js +10 -6
- package/dist/components/auth/authenticate/component.js.map +1 -1
- package/dist/components/auth/authenticate/controllers/factory.d.ts +2 -2
- package/dist/components/auth/authenticate/services/basic-token.service.d.ts.map +1 -1
- package/dist/components/auth/authenticate/services/basic-token.service.js +6 -2
- package/dist/components/auth/authenticate/services/basic-token.service.js.map +1 -1
- package/dist/components/auth/authenticate/services/jwt-token.service.d.ts.map +1 -1
- package/dist/components/auth/authenticate/services/jwt-token.service.js +6 -4
- package/dist/components/auth/authenticate/services/jwt-token.service.js.map +1 -1
- package/dist/components/auth/authenticate/strategies/strategy-registry.d.ts.map +1 -1
- package/dist/components/auth/authenticate/strategies/strategy-registry.js +9 -3
- package/dist/components/auth/authenticate/strategies/strategy-registry.js.map +1 -1
- package/dist/components/mail/component.d.ts.map +1 -1
- package/dist/components/mail/component.js +8 -4
- package/dist/components/mail/component.js.map +1 -1
- package/dist/components/mail/helpers/executors/bull-mq-executor.helper.d.ts.map +1 -1
- package/dist/components/mail/helpers/executors/bull-mq-executor.helper.js +35 -13
- package/dist/components/mail/helpers/executors/bull-mq-executor.helper.js.map +1 -1
- package/dist/components/mail/helpers/executors/direct-executor.helper.d.ts.map +1 -1
- package/dist/components/mail/helpers/executors/direct-executor.helper.js +3 -1
- package/dist/components/mail/helpers/executors/direct-executor.helper.js.map +1 -1
- package/dist/components/mail/helpers/executors/internal-queue-executor.helper.d.ts.map +1 -1
- package/dist/components/mail/helpers/executors/internal-queue-executor.helper.js +23 -11
- package/dist/components/mail/helpers/executors/internal-queue-executor.helper.js.map +1 -1
- package/dist/components/mail/helpers/transporters/mailgun-transporter.helper.js +5 -5
- package/dist/components/mail/helpers/transporters/mailgun-transporter.helper.js.map +1 -1
- package/dist/components/mail/helpers/transporters/nodemail-transporter.helper.js +6 -6
- package/dist/components/mail/helpers/transporters/nodemail-transporter.helper.js.map +1 -1
- package/dist/components/mail/providers/mail-queue-executor.provider.d.ts.map +1 -1
- package/dist/components/mail/providers/mail-queue-executor.provider.js +3 -1
- package/dist/components/mail/providers/mail-queue-executor.provider.js.map +1 -1
- package/dist/components/mail/providers/mail-transporter.provider.d.ts.map +1 -1
- package/dist/components/mail/providers/mail-transporter.provider.js +8 -4
- package/dist/components/mail/providers/mail-transporter.provider.js.map +1 -1
- package/dist/components/mail/services/mail.service.d.ts.map +1 -1
- package/dist/components/mail/services/mail.service.js +21 -13
- package/dist/components/mail/services/mail.service.js.map +1 -1
- package/dist/components/mail/services/template.service.d.ts.map +1 -1
- package/dist/components/mail/services/template.service.js +11 -7
- package/dist/components/mail/services/template.service.js.map +1 -1
- package/dist/components/socket-io/component.js +2 -2
- package/dist/components/socket-io/component.js.map +1 -1
- package/dist/components/static-asset/controller/factory.d.ts +2 -2
- package/dist/components/static-asset/controller/factory.d.ts.map +1 -1
- package/dist/components/static-asset/controller/factory.js +9 -3
- package/dist/components/static-asset/controller/factory.js.map +1 -1
- package/dist/components/swagger/ui-factory.d.ts.map +1 -1
- package/dist/components/swagger/ui-factory.js +3 -1
- package/dist/components/swagger/ui-factory.js.map +1 -1
- package/dist/helpers/inversion/container.d.ts +2 -2
- package/dist/helpers/inversion/container.d.ts.map +1 -1
- package/dist/helpers/inversion/container.js.map +1 -1
- package/dist/utilities/network.utility.d.ts +7 -0
- package/dist/utilities/network.utility.d.ts.map +1 -0
- package/dist/utilities/network.utility.js +28 -0
- package/dist/utilities/network.utility.js.map +1 -0
- package/package.json +7 -7
|
@@ -114,7 +114,9 @@ let JWTTokenService = class JWTTokenService extends services_1.BaseService {
|
|
|
114
114
|
// --------------------------------------------------------------------------------------
|
|
115
115
|
decryptPayload(opts) {
|
|
116
116
|
const { payload, protectedHeader } = opts.result;
|
|
117
|
-
this.logger
|
|
117
|
+
this.logger
|
|
118
|
+
.for(this.decryptPayload.name)
|
|
119
|
+
.debug('JWT Token | payload: %j | header: %j', payload, protectedHeader);
|
|
118
120
|
const rs = {};
|
|
119
121
|
for (const key in payload) {
|
|
120
122
|
if (JWTTokenService_1.JWT_COMMON_FIELDS.has(key)) {
|
|
@@ -142,7 +144,7 @@ let JWTTokenService = class JWTTokenService extends services_1.BaseService {
|
|
|
142
144
|
async verify(opts) {
|
|
143
145
|
const { token } = opts;
|
|
144
146
|
if (!token) {
|
|
145
|
-
this.logger.error('
|
|
147
|
+
this.logger.for(this.verify.name).error('Missing token for validating request!');
|
|
146
148
|
throw (0, ignis_helpers_1.getError)({
|
|
147
149
|
statusCode: ignis_helpers_1.HTTP.ResultCodes.RS_4.Unauthorized,
|
|
148
150
|
message: '[verify] Invalid request token!',
|
|
@@ -153,7 +155,7 @@ let JWTTokenService = class JWTTokenService extends services_1.BaseService {
|
|
|
153
155
|
return this.decryptPayload({ result: decodedToken });
|
|
154
156
|
}
|
|
155
157
|
catch (error) {
|
|
156
|
-
this.logger.error('
|
|
158
|
+
this.logger.for(this.verify.name).error('Failed to verify token | Error: %s', error);
|
|
157
159
|
throw (0, ignis_helpers_1.getError)({
|
|
158
160
|
statusCode: ignis_helpers_1.HTTP.ResultCodes.RS_4.Unauthorized,
|
|
159
161
|
message: `[verify] Failed to verify token | Message: ${error.message}`,
|
|
@@ -186,7 +188,7 @@ let JWTTokenService = class JWTTokenService extends services_1.BaseService {
|
|
|
186
188
|
return rs;
|
|
187
189
|
}
|
|
188
190
|
catch (error) {
|
|
189
|
-
this.logger.error('
|
|
191
|
+
this.logger.for(this.generate.name).error('Failed to generate token | Error: %s', error);
|
|
190
192
|
throw (0, ignis_helpers_1.getError)({
|
|
191
193
|
statusCode: ignis_helpers_1.HTTP.ResultCodes.RS_5.InternalServerError,
|
|
192
194
|
message: `[generate] Failed to generate token | Error: ${error.message}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../../../../src/components/auth/authenticate/services/jwt-token.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../../../../src/components/auth/authenticate/services/jwt-token.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy-registry.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/authenticate/strategies/strategy-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAkB,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAW,GAAG,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGvD,OAAO,EAGL,uBAAuB,EAEvB,SAAS,EACV,MAAM,WAAW,CAAC;AAEnB,qBAAa,8BAA8B,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,CAAE,SAAQ,UAAU;IACjF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiC;IAExD,OAAO,CAAC,UAAU,CAMhB;;IAQF,MAAM,CAAC,WAAW;IASlB,cAAc,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAQrC,WAAW,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IASxD,QAAQ,CAAC,IAAI,EAAE;QACb,SAAS,EAAE,SAAS,CAAC;QACrB,UAAU,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC9E;IAiBD,YAAY,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG,iBAAiB;
|
|
1
|
+
{"version":3,"file":"strategy-registry.d.ts","sourceRoot":"","sources":["../../../../../src/components/auth/authenticate/strategies/strategy-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAkB,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAW,GAAG,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGvD,OAAO,EAGL,uBAAuB,EAEvB,SAAS,EACV,MAAM,WAAW,CAAC;AAEnB,qBAAa,8BAA8B,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,CAAE,SAAQ,UAAU;IACjF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAiC;IAExD,OAAO,CAAC,UAAU,CAMhB;;IAQF,MAAM,CAAC,WAAW;IASlB,cAAc,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAQrC,WAAW,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IASxD,QAAQ,CAAC,IAAI,EAAE;QACb,SAAS,EAAE,SAAS,CAAC;QACrB,UAAU,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC9E;IAiBD,YAAY,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG,iBAAiB;IAsFjF,OAAO,CAAC,eAAe;CAyBxB;AAED,eAAO,MAAM,YAAY,GAAI,MAAM;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAA;CAAE,sBAE5E,CAAC"}
|
|
@@ -56,7 +56,9 @@ class AuthenticationStrategyRegistry extends ignis_helpers_1.BaseHelper {
|
|
|
56
56
|
const isSkipAuthenticate = context.get(common_1.Authentication.SKIP_AUTHENTICATION);
|
|
57
57
|
if (isSkipAuthenticate) {
|
|
58
58
|
const path = context.req.path;
|
|
59
|
-
this.logger
|
|
59
|
+
this.logger
|
|
60
|
+
.for(this.authenticate.name)
|
|
61
|
+
.debug('SKIP checking authentication | action: %s', path);
|
|
60
62
|
return next();
|
|
61
63
|
}
|
|
62
64
|
const isAuthenticated = context.get(common_1.Authentication.CURRENT_USER);
|
|
@@ -78,7 +80,9 @@ class AuthenticationStrategyRegistry extends ignis_helpers_1.BaseHelper {
|
|
|
78
80
|
return;
|
|
79
81
|
}
|
|
80
82
|
catch (error) {
|
|
81
|
-
this.logger
|
|
83
|
+
this.logger
|
|
84
|
+
.for(this.authenticate.name)
|
|
85
|
+
.debug('Strategy %s failed, trying next...', strategyName);
|
|
82
86
|
errors.push(error);
|
|
83
87
|
}
|
|
84
88
|
}
|
|
@@ -100,7 +104,9 @@ class AuthenticationStrategyRegistry extends ignis_helpers_1.BaseHelper {
|
|
|
100
104
|
context.set(common_1.Authentication.AUDIT_USER_ID, authUser.userId);
|
|
101
105
|
}
|
|
102
106
|
else {
|
|
103
|
-
this.logger
|
|
107
|
+
this.logger
|
|
108
|
+
.for(this.authenticate.name)
|
|
109
|
+
.error('Failed to identify authenticated user | user: %j | userId: %s', authUser, authUser?.userId);
|
|
104
110
|
throw (0, ignis_helpers_1.getError)({
|
|
105
111
|
statusCode: ignis_helpers_1.HTTP.ResultCodes.RS_4.Unauthorized,
|
|
106
112
|
message: 'Failed to identify authenticated user!',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy-registry.js","sourceRoot":"","sources":["../../../../../src/components/auth/authenticate/strategies/strategy-registry.ts"],"names":[],"mappings":";;;;;;AAAA,mDAA+D;AAC/D,0DAA4E;AAE5E,0CAAgD;AAChD,6DAAqC;AACrC,sCAMmB;AAEnB,MAAa,8BAAoD,SAAQ,0BAAU;IAWjF,iFAAiF;IACjF;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,8BAA8B,CAAC,IAAI,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,8BAA8B,CAAC,QAAQ,EAAE,CAAC;YAC7C,8BAA8B,CAAC,QAAQ,GAAG,IAAI,8BAA8B,EAAE,CAAC;QACjF,CAAC;QAED,OAAO,8BAA8B,CAAC,QAAQ,CAAC;IACjD,CAAC;IAED,iFAAiF;IACjF,cAAc,CAAC,IAAsB;QACnC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,IAAA,iBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,MAAM,IAAA,wBAAQ,EAAC,EAAE,OAAO,EAAE,kDAAkD,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7F,CAAC;QAED,OAAO,CAAC,uBAAc,CAAC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,WAAW,CAAC,IAA4C;QACtD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACjC,OAAO,SAAS,CAAC,GAAG,CAA0B;YAC5C,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC;YAClC,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IAED,iFAAiF;IACjF,QAAQ,CAAC,IAGR;QACC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEvC,KAAK,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,CAAC;YAC5C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC;YAClE,SAAS;iBACN,IAAI,CAAC;gBACJ,GAAG,EAAE,CAAC,uBAAc,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;aAC9D,CAAC;iBACD,OAAO,CAAC,QAAQ,CAAC;iBACjB,QAAQ,CAAC,yBAAa,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iFAAiF;IACjF,YAAY,CAAC,IAAgD;QAC3D,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC;QAE1C,MAAM,EAAE,GAAG,IAAA,0BAAgB,EAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;YAClD,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAc,CAAC,mBAAmB,CAAC,CAAC;YAC3E,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"strategy-registry.js","sourceRoot":"","sources":["../../../../../src/components/auth/authenticate/strategies/strategy-registry.ts"],"names":[],"mappings":";;;;;;AAAA,mDAA+D;AAC/D,0DAA4E;AAE5E,0CAAgD;AAChD,6DAAqC;AACrC,sCAMmB;AAEnB,MAAa,8BAAoD,SAAQ,0BAAU;IAWjF,iFAAiF;IACjF;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,8BAA8B,CAAC,IAAI,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,8BAA8B,CAAC,QAAQ,EAAE,CAAC;YAC7C,8BAA8B,CAAC,QAAQ,GAAG,IAAI,8BAA8B,EAAE,CAAC;QACjF,CAAC;QAED,OAAO,8BAA8B,CAAC,QAAQ,CAAC;IACjD,CAAC;IAED,iFAAiF;IACjF,cAAc,CAAC,IAAsB;QACnC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,IAAA,iBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,MAAM,IAAA,wBAAQ,EAAC,EAAE,OAAO,EAAE,kDAAkD,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7F,CAAC;QAED,OAAO,CAAC,uBAAc,CAAC,uBAAuB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,WAAW,CAAC,IAA4C;QACtD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACjC,OAAO,SAAS,CAAC,GAAG,CAA0B;YAC5C,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC;YAClC,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IAED,iFAAiF;IACjF,QAAQ,CAAC,IAGR;QACC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEvC,KAAK,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,CAAC;YAC5C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC;YAClE,SAAS;iBACN,IAAI,CAAC;gBACJ,GAAG,EAAE,CAAC,uBAAc,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;aAC9D,CAAC;iBACD,OAAO,CAAC,QAAQ,CAAC;iBACjB,QAAQ,CAAC,yBAAa,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iFAAiF;IACjF,YAAY,CAAC,IAAgD;QAC3D,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC;QAE1C,MAAM,EAAE,GAAG,IAAA,0BAAgB,EAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;YAClD,MAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAc,CAAC,mBAAmB,CAAC,CAAC;YAC3E,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAC9B,IAAI,CAAC,MAAM;qBACR,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;qBAC3B,KAAK,CAAC,2CAA2C,EAAE,IAAI,CAAC,CAAC;gBAC5D,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YAED,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAc,CAAC,YAAY,CAAC,CAAC;YACjE,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YAED,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,4BAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC7B,oCAAoC;oBACpC,MAAM,MAAM,GAAY,EAAE,CAAC;oBAC3B,KAAK,MAAM,YAAY,IAAI,UAAU,EAAE,CAAC;wBACtC,IAAI,CAAC;4BACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;4BACnE,OAAO,CAAC,GAAG,CAAC,uBAAc,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;4BAC/C,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;gCACjB,OAAO,CAAC,GAAG,CAAC,uBAAc,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;4BACzD,CAAC;4BAED,MAAM,IAAI,EAAE,CAAC;4BACb,OAAO;wBACT,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,IAAI,CAAC,MAAM;iCACR,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;iCAC3B,KAAK,CAAC,oCAAoC,EAAE,YAAY,CAAC,CAAC;4BAC7D,MAAM,CAAC,IAAI,CAAC,KAAc,CAAC,CAAC;wBAC9B,CAAC;oBACH,CAAC;oBAED,wBAAwB;oBACxB,MAAM,IAAA,wBAAQ,EAAC;wBACb,UAAU,EAAE,oBAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY;wBAC9C,OAAO,EAAE,4CAA4C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;qBAC7E,CAAC,CAAC;gBACL,CAAC;gBACD,KAAK,4BAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC7B,qCAAqC;oBACrC,IAAI,QAAQ,GAAqB,IAAI,CAAC;oBACtC,KAAK,MAAM,YAAY,IAAI,UAAU,EAAE,CAAC;wBACtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;wBACnE,QAAQ,GAAG,IAAI,CAAC;oBAClB,CAAC;oBAED,IAAI,QAAQ,EAAE,MAAM,EAAE,CAAC;wBACrB,OAAO,CAAC,GAAG,CAAC,uBAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;wBACnD,OAAO,CAAC,GAAG,CAAC,uBAAc,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAC7D,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,MAAM;6BACR,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;6BAC3B,KAAK,CACJ,+DAA+D,EAC/D,QAAQ,EACR,QAAQ,EAAE,MAAM,CACjB,CAAC;wBACJ,MAAM,IAAA,wBAAQ,EAAC;4BACb,UAAU,EAAE,oBAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY;4BAC9C,OAAO,EAAE,wCAAwC;yBAClD,CAAC,CAAC;oBACL,CAAC;oBAED,OAAO,IAAI,EAAE,CAAC;gBAChB,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,MAAM,IAAA,wBAAQ,EAAC;wBACb,UAAU,EAAE,oBAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB;wBACrD,OAAO,EAAE,uCAAuC,IAAI,EAAE;qBACvD,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,iFAAiF;IACzE,eAAe,CAAC,IAAmD;QACzE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;QACvC,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAE3D,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAA,wBAAQ,EAAC;gBACb,UAAU,EAAE,oBAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB;gBACrD,OAAO,EAAE,yCAAyC,YAAY,EAAE;aACjE,CAAC,CAAC;QACL,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC;QACvC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAA6B;YACzD,GAAG,EAAE,CAAC,uBAAc,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACtE,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAA,wBAAQ,EAAC;gBACb,UAAU,EAAE,oBAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB;gBACrD,OAAO,EAAE,+BAA+B,YAAY,sCAAsC;aAC3F,CAAC,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;CACF;AA9KD,wEA8KC;AAEM,MAAM,YAAY,GAAG,CAAC,IAAgD,EAAE,EAAE;IAC/E,OAAO,8BAA8B,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACzE,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/components/mail/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAmBlD,qBAAa,aAAc,SAAQ,aAAa;IAEQ,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,eAAe;IAUjF,OAAO,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/components/mail/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAmBlD,qBAAa,aAAc,SAAQ,aAAa;IAEQ,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,eAAe;IAUjF,OAAO,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBxC,cAAc;IAad,aAAa;IAYb,YAAY;IAYZ,sBAAsB,IAAI,IAAI;CA2B/B"}
|
|
@@ -34,7 +34,9 @@ let MailComponent = MailComponent_1 = class MailComponent extends components_1.B
|
|
|
34
34
|
// --------------------------------------------------------------------------------
|
|
35
35
|
binding() {
|
|
36
36
|
if (!this.application.isBound({ key: common_2.MailKeys.MAIL_OPTIONS })) {
|
|
37
|
-
this.logger
|
|
37
|
+
this.logger
|
|
38
|
+
.for(this.binding.name)
|
|
39
|
+
.error('Mail options not configured. Please bind MailKeys.MAIL_OPTIONS before adding MailComponent.');
|
|
38
40
|
throw (0, helpers_1.getError)({
|
|
39
41
|
message: 'Mail options not configured',
|
|
40
42
|
});
|
|
@@ -43,7 +45,7 @@ let MailComponent = MailComponent_1 = class MailComponent extends components_1.B
|
|
|
43
45
|
this.initProviders();
|
|
44
46
|
this.initServices();
|
|
45
47
|
this.createAndBindInstances();
|
|
46
|
-
this.logger.info('
|
|
48
|
+
this.logger.for(this.binding.name).info('Mail component initialized successfully');
|
|
47
49
|
}
|
|
48
50
|
// --------------------------------------------------------------------------------
|
|
49
51
|
initGenerators() {
|
|
@@ -86,7 +88,7 @@ let MailComponent = MailComponent_1 = class MailComponent extends components_1.B
|
|
|
86
88
|
key: common_2.MailKeys.MAIL_TRANSPORT_PROVIDER,
|
|
87
89
|
});
|
|
88
90
|
const mailOptions = this.application.get({ key: common_2.MailKeys.MAIL_OPTIONS });
|
|
89
|
-
this.logger.info('
|
|
91
|
+
this.logger.for(this.createAndBindInstances.name).info('Mail Options: %j', mailOptions);
|
|
90
92
|
const mailTransportInstance = transportGetter(mailOptions);
|
|
91
93
|
this.application.bind({ key: common_2.MailKeys.MAIL_TRANSPORT_INSTANCE }).toValue(mailTransportInstance);
|
|
92
94
|
// Queue
|
|
@@ -96,7 +98,9 @@ let MailComponent = MailComponent_1 = class MailComponent extends components_1.B
|
|
|
96
98
|
const queueConf = this.application.get({
|
|
97
99
|
key: common_2.MailKeys.MAIL_QUEUE_EXECUTOR_CONFIG,
|
|
98
100
|
});
|
|
99
|
-
this.logger
|
|
101
|
+
this.logger
|
|
102
|
+
.for(this.createAndBindInstances.name)
|
|
103
|
+
.info('Mail Queue Executor Config: %j', queueConf);
|
|
100
104
|
const queueExecutorInstance = queueGetter(queueConf);
|
|
101
105
|
this.application
|
|
102
106
|
.bind({ key: common_2.MailKeys.MAIL_QUEUE_EXECUTOR_INSTANCE })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/components/mail/component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,kDAAkD;AAClD,8CAAyC;AACzC,qCAAwC;AACxC,uCAAqC;AACrC,qCAA4E;AAC5E,2CAKqB;AACrB,yCAMoB;AAEpB,IAAa,aAAa,qBAA1B,MAAa,aAAc,SAAQ,0BAAa;IAC9C,YAC8D,WAA4B;QAExF,KAAK,CAAC;YACJ,KAAK,EAAE,eAAa,CAAC,IAAI;YACzB,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;YACrD,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;QANyD,gBAAW,GAAX,WAAW,CAAiB;IAO1F,CAAC;IAED,mFAAmF;IAC1E,OAAO;QACd,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,iBAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/components/mail/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bull-mq-executor.helper.d.ts","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/bull-mq-executor.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,mBAAmB,EAEnB,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAWtB,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,EAAE,WAAW,CAAC,OAAO,mBAAmB,CAAC,CAAC;CAC/C;AAED,qBAAa,wBAAyB,SAAQ,UAAW,YAAW,kBAAkB;IACpF,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,IAAI,CAA0C;IAEtD,OAAO,CAAC,WAAW,CAAC,CAAmD;IACvE,OAAO,CAAC,aAAa,CAA8D;IACnF,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,YAAY,CAAK;IAEzB,OAAO,CAAC,SAAS,CAAC,CAAmD;gBAEzD,IAAI,EAAE,uBAAuB;IAgBzC,SAAS,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;
|
|
1
|
+
{"version":3,"file":"bull-mq-executor.helper.d.ts","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/bull-mq-executor.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,mBAAmB,EAEnB,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAWtB,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,EAAE,WAAW,CAAC,OAAO,mBAAmB,CAAC,CAAC;CAC/C;AAED,qBAAa,wBAAyB,SAAQ,UAAW,YAAW,kBAAkB;IACpF,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,IAAI,CAA0C;IAEtD,OAAO,CAAC,WAAW,CAAC,CAAmD;IACvE,OAAO,CAAC,aAAa,CAA8D;IACnF,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,YAAY,CAAK;IAEzB,OAAO,CAAC,SAAS,CAAC,CAAmD;gBAEzD,IAAI,EAAE,uBAAuB;IAgBzC,SAAS,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAkC/C,YAAY,CAChB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;QACpC,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,gBAAgB,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC,EACF,IAAI,CAAC,EAAE;QACL,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GACA,OAAO,CAAC,IAAI,CAAC;IAkChB,SAAS,CAAC,IAAI,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAmF1F,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgB7C,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC,cAAc,IAAI,MAAM;IAIxB,OAAO,IAAI,WAAW,CAAC,OAAO,mBAAmB,CAAC;IAI5C,wBAAwB,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,gBAAgB,CAAC;CAqD7B"}
|
|
@@ -27,11 +27,15 @@ class BullMQMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
27
27
|
redisConnection: this.redisConnection,
|
|
28
28
|
role: 'queue',
|
|
29
29
|
});
|
|
30
|
-
this.logger
|
|
30
|
+
this.logger
|
|
31
|
+
.for(this.constructor.name)
|
|
32
|
+
.info('BullMQ queue executor initialized (queue enabled) | Identifier: %s | Mode: %s', this.queueIdentifier, this.mode);
|
|
31
33
|
break;
|
|
32
34
|
}
|
|
33
35
|
default: {
|
|
34
|
-
this.logger
|
|
36
|
+
this.logger
|
|
37
|
+
.for(this.constructor.name)
|
|
38
|
+
.info('BullMQ queue executor initialized (worker-only mode) | Identifier: %s | Mode: %s', this.queueIdentifier, this.mode);
|
|
35
39
|
break;
|
|
36
40
|
}
|
|
37
41
|
}
|
|
@@ -39,7 +43,9 @@ class BullMQMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
39
43
|
async setProcessor(processor, opts) {
|
|
40
44
|
this.processor = processor;
|
|
41
45
|
if (this.mode === common_1.BullMQExecutorModes.QUEUE_ONLY) {
|
|
42
|
-
this.logger
|
|
46
|
+
this.logger
|
|
47
|
+
.for(this.setProcessor.name)
|
|
48
|
+
.warn('Skipping worker creation in queue-only mode. Workers will not be started.');
|
|
43
49
|
return;
|
|
44
50
|
}
|
|
45
51
|
const numberOfWorkers = opts?.numberOfWorkers ?? 1;
|
|
@@ -53,7 +59,9 @@ class BullMQMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
53
59
|
lockDuration,
|
|
54
60
|
});
|
|
55
61
|
}
|
|
56
|
-
this.logger
|
|
62
|
+
this.logger
|
|
63
|
+
.for(this.setProcessor.name)
|
|
64
|
+
.info('Processor registered | Mode: %s | Workers: %d | Concurrency per worker: %d', this.mode, numberOfWorkers, concurrencyPerWorker);
|
|
57
65
|
}
|
|
58
66
|
addWorker(opts) {
|
|
59
67
|
if (!this.processor) {
|
|
@@ -71,40 +79,52 @@ class BullMQMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
71
79
|
lockDuration,
|
|
72
80
|
onWorkerData: async (job) => {
|
|
73
81
|
const maxAttempts = job.data.options?.attempts ?? 3;
|
|
74
|
-
this.logger
|
|
82
|
+
this.logger
|
|
83
|
+
.for('onWorkerData')
|
|
84
|
+
.info('Processing job | Worker: %s | jobId: %s | email: %s | attempt: %d/%d', workerIdentifier, job.data.id, job.data.email, job.attemptsMade + 1, maxAttempts);
|
|
75
85
|
return this.processor?.(job.data.email);
|
|
76
86
|
},
|
|
77
87
|
onWorkerDataCompleted: async (job) => {
|
|
78
|
-
this.logger
|
|
88
|
+
this.logger
|
|
89
|
+
.for('onWorkerDataCompleted')
|
|
90
|
+
.info('Job completed | Worker: %s | jobId: %s | email: %s', workerIdentifier, job.data.id, job.data.email);
|
|
79
91
|
},
|
|
80
92
|
onWorkerDataFail: async (job, error) => {
|
|
81
93
|
if (job) {
|
|
82
94
|
const maxAttempts = job.data.options?.attempts ?? 3;
|
|
83
|
-
this.logger
|
|
95
|
+
this.logger
|
|
96
|
+
.for('onWorkerDataFail')
|
|
97
|
+
.error('Job failed | Worker: %s | jobId: %s | email: %s | attempt: %d/%d | error: %s', workerIdentifier, job.data.id, job.data.email, job.attemptsMade, maxAttempts, error.message);
|
|
84
98
|
}
|
|
85
99
|
else {
|
|
86
|
-
this.logger
|
|
100
|
+
this.logger
|
|
101
|
+
.for('onWorkerDataFail')
|
|
102
|
+
.error('Worker error (no job) | Worker: %s | error: %s', workerIdentifier, error.message);
|
|
87
103
|
}
|
|
88
104
|
},
|
|
89
105
|
});
|
|
90
106
|
this.workerHelpers.push(workerHelper);
|
|
91
|
-
this.logger
|
|
107
|
+
this.logger
|
|
108
|
+
.for(this.addWorker.name)
|
|
109
|
+
.info('Worker added | Identifier: %s | Concurrency: %d | Total workers: %d', workerIdentifier, concurrency, this.workerHelpers.length);
|
|
92
110
|
}
|
|
93
111
|
async removeWorker(index) {
|
|
94
112
|
if (index < 0 || index >= this.workerHelpers.length) {
|
|
95
|
-
this.logger.warn('
|
|
113
|
+
this.logger.for(this.removeWorker.name).warn('Invalid worker index: %d', index);
|
|
96
114
|
return false;
|
|
97
115
|
}
|
|
98
116
|
await this.workerHelpers[index].worker.close();
|
|
99
117
|
this.workerHelpers.splice(index, 1);
|
|
100
|
-
this.logger
|
|
118
|
+
this.logger
|
|
119
|
+
.for(this.removeWorker.name)
|
|
120
|
+
.info('Worker removed | Index: %d | Remaining workers: %d', index, this.workerHelpers.length);
|
|
101
121
|
return true;
|
|
102
122
|
}
|
|
103
123
|
async clearWorkers() {
|
|
104
124
|
const count = this.workerHelpers.length;
|
|
105
125
|
await Promise.all(this.workerHelpers.map(workerHelper => workerHelper.worker.close()));
|
|
106
126
|
this.workerHelpers = [];
|
|
107
|
-
this.logger.info('
|
|
127
|
+
this.logger.for(this.clearWorkers.name).info('All workers cleared | Count: %d', count);
|
|
108
128
|
}
|
|
109
129
|
getWorkerCount() {
|
|
110
130
|
return this.workerHelpers.length;
|
|
@@ -134,7 +154,9 @@ class BullMQMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
134
154
|
attempts: 0,
|
|
135
155
|
scheduledAt: Date.now() + (options?.delay ?? 0),
|
|
136
156
|
};
|
|
137
|
-
this.logger
|
|
157
|
+
this.logger
|
|
158
|
+
.for(this.enqueueVerificationEmail.name)
|
|
159
|
+
.info('Queuing email to BullMQ/Redis | jobId: %s | email: %s | mode: %s', jobId, email, this.mode);
|
|
138
160
|
const bullJob = await this.queueHelper.queue.add('send-verification-email', job, {
|
|
139
161
|
priority: options?.priority,
|
|
140
162
|
delay: options?.delay,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bull-mq-executor.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/bull-mq-executor.helper.ts"],"names":[],"mappings":";;;AAAA,uCAOmB;AACnB,yCAMsB;AAiBtB,MAAa,wBAAyB,SAAQ,oBAAU;IAYtD,YAAY,IAA6B;QACvC,KAAK,CAAC,EAAE,KAAK,EAAE,wBAAwB,CAAC,IAAI,EAAE,CAAC,CAAC;QAP1C,kBAAa,GAA2D,EAAE,CAAC;QAE3E,iBAAY,GAAG,CAAC,CAAC;QAOvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEtB,IAAI,CAAC,eAAe,GAAG,IAAI,qBAAW,CAAC;YACrC,GAAG,IAAI,CAAC,KAAK;YACb,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAEjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,KAA2C;QACnD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,4BAAmB,CAAC,UAAU,CAAC;YACpC,KAAK,4BAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC9B,IAAI,CAAC,WAAW,GAAG,IAAI,sBAAY,CAAqC;oBACtE,UAAU,EAAE,KAAK,CAAC,UAAU;oBAC5B,SAAS,EAAE,KAAK,CAAC,IAAI;oBACrB,eAAe,EAAE,IAAI,CAAC,eAAe;oBACrC,IAAI,EAAE,OAAO;iBACd,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"bull-mq-executor.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/bull-mq-executor.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-executor.helper.d.ts","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/direct-executor.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEvF,qBAAa,wBAAyB,SAAQ,UAAW,YAAW,kBAAkB;IACpF,OAAO,CAAC,SAAS,CAAC,CAKf;;IAMH,YAAY,CACV,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;QACpC,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,gBAAgB,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC,GACD,IAAI;IAID,wBAAwB,CAC5B,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"direct-executor.helper.d.ts","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/direct-executor.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEvF,qBAAa,wBAAyB,SAAQ,UAAW,YAAW,kBAAkB;IACpF,OAAO,CAAC,SAAS,CAAC,CAKf;;IAMH,YAAY,CACV,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;QACpC,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,gBAAgB,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC,GACD,IAAI;IAID,wBAAwB,CAC5B,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,gBAAgB,CAAC;CAgB7B"}
|
|
@@ -13,7 +13,9 @@ class DirectMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
13
13
|
if (!this.processor) {
|
|
14
14
|
throw (0, helpers_1.getError)({ message: 'Processor not set. Call setProcessor() first.' });
|
|
15
15
|
}
|
|
16
|
-
this.logger
|
|
16
|
+
this.logger
|
|
17
|
+
.for(this.enqueueVerificationEmail.name)
|
|
18
|
+
.info('Executing immediately (no queue) for: %s', email);
|
|
17
19
|
const result = await this.processor(email);
|
|
18
20
|
return {
|
|
19
21
|
queued: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-executor.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/direct-executor.helper.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAGjD,MAAa,wBAAyB,SAAQ,oBAAU;IAQtD;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,wBAAwB,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,YAAY,CACV,SAKE;QAEF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,KAAa,EACb,QAA4B;QAE5B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAA,kBAAQ,EAAC,EAAE,OAAO,EAAE,+CAA+C,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"direct-executor.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/direct-executor.helper.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAGjD,MAAa,wBAAyB,SAAQ,oBAAU;IAQtD;QACE,KAAK,CAAC,EAAE,KAAK,EAAE,wBAAwB,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,YAAY,CACV,SAKE;QAEF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,KAAa,EACb,QAA4B;QAE5B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAA,kBAAQ,EAAC,EAAE,OAAO,EAAE,+CAA+C,EAAE,CAAC,CAAC;QAC/E,CAAC;QAED,IAAI,CAAC,MAAM;aACR,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC;aACvC,IAAI,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAE3C,OAAO;YACL,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,mCAAmC;YAC5C,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AA1CD,4DA0CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-queue-executor.helper.d.ts","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/internal-queue-executor.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyB,MAAM,WAAW,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAElB,8BAA8B,EAC9B,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAUtB,qBAAa,+BAAgC,SAAQ,UAAW,YAAW,kBAAkB;IAC3F,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,WAAW,CAA0C;IAE7D,OAAO,CAAC,SAAS,CAAC,CAAmD;gBAEzD,IAAI,EAAE,8BAA8B;
|
|
1
|
+
{"version":3,"file":"internal-queue-executor.helper.d.ts","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/internal-queue-executor.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAyB,MAAM,WAAW,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAElB,8BAA8B,EAC9B,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAUtB,qBAAa,+BAAgC,SAAQ,UAAW,YAAW,kBAAkB;IAC3F,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,WAAW,CAA0C;IAE7D,OAAO,CAAC,SAAS,CAAC,CAAmD;gBAEzD,IAAI,EAAE,8BAA8B;IA0BhD,YAAY,CACV,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;QACpC,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,gBAAgB,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC,GACD,IAAI;IAKD,wBAAwB,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,gBAAgB,CAAC;YAwCd,UAAU;IA2DxB,OAAO,CAAC,gBAAgB;CAczB"}
|
|
@@ -14,17 +14,19 @@ class InternalQueueMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
14
14
|
await this.processJob(queueElement.payload);
|
|
15
15
|
},
|
|
16
16
|
onDataEnqueue: ({ queueElement }) => {
|
|
17
|
-
this.logger
|
|
17
|
+
this.logger
|
|
18
|
+
.for('onDataEnqueue')
|
|
19
|
+
.info('Job enqueued | jobId: %s | email: %s', queueElement.payload.id, queueElement.payload.email);
|
|
18
20
|
},
|
|
19
21
|
onStateChange: ({ from, to }) => {
|
|
20
|
-
this.logger.debug('
|
|
22
|
+
this.logger.for('onStateChange').debug('Queue state changed | from: %s | to: %s', from, to);
|
|
21
23
|
},
|
|
22
24
|
});
|
|
23
|
-
this.logger.info('
|
|
25
|
+
this.logger.for(this.constructor.name).info('Internal queue executor initialized');
|
|
24
26
|
}
|
|
25
27
|
setProcessor(processor) {
|
|
26
28
|
this.processor = processor;
|
|
27
|
-
this.logger.info('
|
|
29
|
+
this.logger.for(this.setProcessor.name).info('Processor registered');
|
|
28
30
|
}
|
|
29
31
|
async enqueueVerificationEmail(email, options) {
|
|
30
32
|
if (!this.processor) {
|
|
@@ -38,14 +40,18 @@ class InternalQueueMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
38
40
|
attempts: 0,
|
|
39
41
|
scheduledAt: Date.now() + (options?.delay ?? 0),
|
|
40
42
|
};
|
|
41
|
-
this.logger
|
|
43
|
+
this.logger
|
|
44
|
+
.for(this.enqueueVerificationEmail.name)
|
|
45
|
+
.info('Queuing email | jobId: %s | email: %s', jobId, email);
|
|
42
46
|
if (options?.delay && options.delay > 0) {
|
|
43
47
|
const timeout = setTimeout(() => {
|
|
44
48
|
this.queue.enqueue(job);
|
|
45
49
|
this.delayedJobs.delete(jobId);
|
|
46
50
|
}, options.delay);
|
|
47
51
|
this.delayedJobs.set(jobId, timeout);
|
|
48
|
-
this.logger
|
|
52
|
+
this.logger
|
|
53
|
+
.for(this.enqueueVerificationEmail.name)
|
|
54
|
+
.info('Job scheduled with delay | jobId: %s | delay: %dms', jobId, options.delay);
|
|
49
55
|
}
|
|
50
56
|
else {
|
|
51
57
|
await this.queue.enqueue(job);
|
|
@@ -58,21 +64,25 @@ class InternalQueueMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
58
64
|
}
|
|
59
65
|
async processJob(job) {
|
|
60
66
|
if (!this.processor) {
|
|
61
|
-
this.logger.error('
|
|
67
|
+
this.logger.for(this.processJob.name).error('Processor not set | jobId: %s', job.id);
|
|
62
68
|
return;
|
|
63
69
|
}
|
|
64
70
|
const maxAttempts = job.options?.attempts ?? 3;
|
|
65
|
-
this.logger
|
|
71
|
+
this.logger
|
|
72
|
+
.for(this.processJob.name)
|
|
73
|
+
.info('Processing job | jobId: %s | email: %s | attempt: %d/%d', job.id, job.email, job.attempts + 1, maxAttempts);
|
|
66
74
|
try {
|
|
67
75
|
await this.processor(job.email);
|
|
68
|
-
this.logger.info('
|
|
76
|
+
this.logger.for(this.processJob.name).info('Job completed successfully | jobId: %s', job.id);
|
|
69
77
|
}
|
|
70
78
|
catch (error) {
|
|
71
79
|
const errorMsg = error instanceof Error ? error.message : error;
|
|
72
80
|
job.attempts++;
|
|
73
81
|
if (job.attempts < maxAttempts) {
|
|
74
82
|
const backoffDelay = this.calculateBackoff(job);
|
|
75
|
-
this.logger
|
|
83
|
+
this.logger
|
|
84
|
+
.for(this.processJob.name)
|
|
85
|
+
.warn('Job failed, retrying | jobId: %s | attempt: %d/%d | retryIn: %dms | error: %s', job.id, job.attempts, maxAttempts, backoffDelay, errorMsg);
|
|
76
86
|
// Re-enqueue with delay
|
|
77
87
|
const timeout = setTimeout(() => {
|
|
78
88
|
this.queue.enqueue(job);
|
|
@@ -81,7 +91,9 @@ class InternalQueueMailExecutorHelper extends helpers_1.BaseHelper {
|
|
|
81
91
|
this.delayedJobs.set(job.id, timeout);
|
|
82
92
|
}
|
|
83
93
|
else {
|
|
84
|
-
this.logger
|
|
94
|
+
this.logger
|
|
95
|
+
.for(this.processJob.name)
|
|
96
|
+
.error('Job failed permanently after %d attempts | jobId: %s | error: %s', maxAttempts, job.id, errorMsg);
|
|
85
97
|
}
|
|
86
98
|
}
|
|
87
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-queue-executor.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/internal-queue-executor.helper.ts"],"names":[],"mappings":";;;AAAA,uCAA8D;AAiB9D,MAAa,+BAAgC,SAAQ,oBAAU;IAO7D,YAAY,IAAoC;QAC9C,KAAK,CAAC,EAAE,KAAK,EAAE,+BAA+B,CAAC,IAAI,EAAE,CAAC,CAAC;QANjD,iBAAY,GAAG,CAAC,CAAC;QACjB,gBAAW,GAAgC,IAAI,GAAG,EAAE,CAAC;QAO3D,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAW,CAAmB;YAC7C,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;gBACpC,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC9C,CAAC;YACD,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;gBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"internal-queue-executor.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/executors/internal-queue-executor.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ class MailgunTransportHelper extends helpers_1.BaseHelper {
|
|
|
46
46
|
return attachment;
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
|
-
this.logger.debug('
|
|
49
|
+
this.logger.for(this.send.name).debug('Sending email with Mailgun to: %s', mailgunMessage.to);
|
|
50
50
|
const result = await this.client.create(this.domain, mailgunMessage);
|
|
51
51
|
return {
|
|
52
52
|
success: true,
|
|
@@ -55,7 +55,7 @@ class MailgunTransportHelper extends helpers_1.BaseHelper {
|
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
57
|
catch (error) {
|
|
58
|
-
this.logger.error('
|
|
58
|
+
this.logger.for(this.send.name).error('Mailgun send failed: %s', error);
|
|
59
59
|
return {
|
|
60
60
|
success: false,
|
|
61
61
|
error: error instanceof Error ? error.message : 'Unknown error',
|
|
@@ -64,7 +64,7 @@ class MailgunTransportHelper extends helpers_1.BaseHelper {
|
|
|
64
64
|
}
|
|
65
65
|
async verify() {
|
|
66
66
|
try {
|
|
67
|
-
this.logger.info('
|
|
67
|
+
this.logger.for(this.verify.name).info('Verifying Mailgun API connection');
|
|
68
68
|
// Mailgun doesn't have a dedicated verify endpoint
|
|
69
69
|
// We'll make a lightweight API call to check if credentials work
|
|
70
70
|
await this.client.create(this.domain, {
|
|
@@ -74,11 +74,11 @@ class MailgunTransportHelper extends helpers_1.BaseHelper {
|
|
|
74
74
|
text: 'This is a verification test',
|
|
75
75
|
'o:testmode': 'yes', // Use test mode to avoid actually sending
|
|
76
76
|
});
|
|
77
|
-
this.logger.info('
|
|
77
|
+
this.logger.for(this.verify.name).info('Mailgun API connection verified successfully');
|
|
78
78
|
return true;
|
|
79
79
|
}
|
|
80
80
|
catch (error) {
|
|
81
|
-
this.logger.error('
|
|
81
|
+
this.logger.for(this.verify.name).error('Mailgun API verification failed: %s', error);
|
|
82
82
|
return false;
|
|
83
83
|
}
|
|
84
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailgun-transporter.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/transporters/mailgun-transporter.helper.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAUhE,MAAa,sBAAuB,SAAQ,oBAAU;IAIpD,YAAY,MAAsB;QAChC,KAAK,CAAC,EAAE,KAAK,EAAE,sBAAsB,CAAC,IAAI,EAAE,CAAC,CAAC;QAE9C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAED,SAAS,CAAC,MAAsB;QAC9B,IAAA,wBAAc,EAAC;YACb,KAAK,EAAE,sBAAsB,CAAC,IAAI;YAClC,OAAO,EAAE,CAAC,YAAY,CAAC;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE5B,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAqB;QAC9B,IAAI,CAAC;YACH,MAAM,cAAc,GAAY;gBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzD,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC;YAEF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,cAAc,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;YACjD,CAAC;YAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACvD,cAAc,CAAC,KAAK,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC;gBACrC,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1D,cAAc,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;oBAC3E,MAAM,UAAU,GAGZ;wBACF,QAAQ,EAAE,GAAG,CAAC,QAAQ;wBACtB,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;qBACjD,CAAC;oBACF,OAAO,UAAU,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"mailgun-transporter.helper.js","sourceRoot":"","sources":["../../../../../src/components/mail/helpers/transporters/mailgun-transporter.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ class NodemailerTransportHelper extends helpers_1.BaseHelper {
|
|
|
29
29
|
attachments: message.attachments,
|
|
30
30
|
headers: message.headers,
|
|
31
31
|
};
|
|
32
|
-
this.logger.debug('
|
|
32
|
+
this.logger.for(this.send.name).debug('Sending email with nodemailer to: %s', mailOptions.to);
|
|
33
33
|
const info = await this.transporter.sendMail(mailOptions);
|
|
34
34
|
return {
|
|
35
35
|
success: true,
|
|
@@ -38,7 +38,7 @@ class NodemailerTransportHelper extends helpers_1.BaseHelper {
|
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
41
|
-
this.logger.error('
|
|
41
|
+
this.logger.for(this.send.name).error('Nodemailer send failed: %s', error);
|
|
42
42
|
return {
|
|
43
43
|
success: false,
|
|
44
44
|
error: error instanceof Error ? error.message : 'Unknown error',
|
|
@@ -47,18 +47,18 @@ class NodemailerTransportHelper extends helpers_1.BaseHelper {
|
|
|
47
47
|
}
|
|
48
48
|
async verify() {
|
|
49
49
|
try {
|
|
50
|
-
this.logger.info('
|
|
50
|
+
this.logger.for(this.verify.name).info('Verifying SMTP connection');
|
|
51
51
|
await this.transporter.verify();
|
|
52
|
-
this.logger.info('
|
|
52
|
+
this.logger.for(this.verify.name).info('SMTP connection verified successfully');
|
|
53
53
|
return true;
|
|
54
54
|
}
|
|
55
55
|
catch (error) {
|
|
56
|
-
this.logger.error('
|
|
56
|
+
this.logger.for(this.verify.name).error('SMTP verification failed: %s', error);
|
|
57
57
|
return false;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
async close() {
|
|
61
|
-
this.logger.info('
|
|
61
|
+
this.logger.for(this.close.name).info('Closing nodemailer transport');
|
|
62
62
|
this.transporter.close();
|
|
63
63
|
}
|
|
64
64
|
}
|