@futdevpro/nts-dynamo 1.9.33 → 1.9.35
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/build/_models/control-models/endpoint-params.control-model.d.ts +2 -1
- package/build/_models/control-models/endpoint-params.control-model.d.ts.map +1 -1
- package/build/_models/control-models/endpoint-params.control-model.js +15 -8
- package/build/_models/control-models/endpoint-params.control-model.js.map +1 -1
- package/build/_models/control-models/system-control.control-model.d.ts +1 -1
- package/build/_models/control-models/system-control.control-model.d.ts.map +1 -1
- package/build/_models/control-models/system-control.control-model.js +1 -1
- package/build/_models/control-models/system-control.control-model.js.map +1 -1
- package/build/_modules/socket/_services/app-extended.server.d.ts.map +1 -1
- package/build/_modules/socket/_services/app-extended.server.js +32 -30
- package/build/_modules/socket/_services/app-extended.server.js.map +1 -1
- package/build/_modules/socket/_services/app-extended.server.spec.js +51 -14
- package/build/_modules/socket/_services/app-extended.server.spec.js.map +1 -1
- package/build/_modules/usage/usage.controller.d.ts.map +1 -1
- package/build/_modules/usage/usage.controller.js +1 -2
- package/build/_modules/usage/usage.controller.js.map +1 -1
- package/build/_services/core/email.service.d.ts +1 -1
- package/build/_services/core/email.service.d.ts.map +1 -1
- package/build/_services/core/email.service.js +8 -11
- package/build/_services/core/email.service.js.map +1 -1
- package/build/_services/core/global.service.d.ts +14 -4
- package/build/_services/core/global.service.d.ts.map +1 -1
- package/build/_services/core/global.service.js +72 -15
- package/build/_services/core/global.service.js.map +1 -1
- package/build/_services/server/app.server.d.ts +2 -0
- package/build/_services/server/app.server.d.ts.map +1 -1
- package/build/_services/server/app.server.js +63 -59
- package/build/_services/server/app.server.js.map +1 -1
- package/build/_services/server/app.server.spec.js +21 -6
- package/build/_services/server/app.server.spec.js.map +1 -1
- package/package.json +1 -1
- package/src/_models/control-models/endpoint-params.control-model.ts +15 -9
- package/src/_models/control-models/system-control.control-model.ts +1 -1
- package/src/_modules/socket/_services/app-extended.server.spec.ts +59 -20
- package/src/_modules/socket/_services/app-extended.server.ts +48 -42
- package/src/_modules/usage/usage.controller.ts +1 -2
- package/src/_services/core/email.service.ts +14 -16
- package/src/_services/core/global.service.ts +44 -22
- package/src/_services/server/app.server.spec.ts +26 -7
- package/src/_services/server/app.server.ts +103 -144
|
@@ -18,6 +18,7 @@ export declare class DyNTS_Endpoint_Params {
|
|
|
18
18
|
private logRequestsParams;
|
|
19
19
|
private logRequestsContent;
|
|
20
20
|
private logResponseContent;
|
|
21
|
+
private stack;
|
|
21
22
|
constructor(set: {
|
|
22
23
|
/**
|
|
23
24
|
* naming the endpoint will help to follow events on service
|
|
@@ -71,7 +72,7 @@ export declare class DyNTS_Endpoint_Params {
|
|
|
71
72
|
* @returns
|
|
72
73
|
*/
|
|
73
74
|
private preLog;
|
|
74
|
-
private
|
|
75
|
+
private getStackLocation;
|
|
75
76
|
/**
|
|
76
77
|
*
|
|
77
78
|
* @returns
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E;;;;GAIG;AACH,qBAAa,qBAAqB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,mBAAmB,CAAC;IAE9B,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"endpoint-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E;;;;GAIG;AACH,qBAAa,qBAAqB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,mBAAmB,CAAC;IAE9B,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IAKjB,OAAO,CAAC,UAAU,CAAW;IAE7B,OAAO,CAAC,YAAY,CAAqD;IACzE,OAAO,CAAC,KAAK,CAAsE;IAEnF,OAAO,CAAC,UAAU,CAAU;IAC5B,OAAO,CAAC,iBAAiB,CAAU;IACnC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,KAAK,CAAS;gBAGpB,GAAG,EAAE;QACH;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QACb;;;;WAIG;QACH,QAAQ,CAAC,EAAE,mBAAmB,CAAC;QAE/B;;WAEG;QACH,IAAI,EAAE,kBAAkB,CAAC;QACzB;;;;WAIG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;WAGG;QACH,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAClE;;;WAGG;QACH,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAE3E;;WAEG;QACH,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B;IAoDH;;;OAGG;YACW,MAAM;IA0BpB,OAAO,CAAC,gBAAgB;IAYxB;;;OAGG;IACH,gBAAgB,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC;IA4ClE;;;;OAIG;YACW,KAAK;IA6EnB,OAAO,CAAC,eAAe;IAkCvB,OAAO,CAAC,uBAAuB;CAShC"}
|
|
@@ -14,6 +14,8 @@ class DyNTS_Endpoint_Params {
|
|
|
14
14
|
security;
|
|
15
15
|
type;
|
|
16
16
|
endpoint;
|
|
17
|
+
/* TODO: ENCRYPTION !!EZTET
|
|
18
|
+
useEncryptionKey?: string; */
|
|
17
19
|
pathParams;
|
|
18
20
|
preProcesses;
|
|
19
21
|
tasks;
|
|
@@ -21,6 +23,7 @@ class DyNTS_Endpoint_Params {
|
|
|
21
23
|
logRequestsParams;
|
|
22
24
|
logRequestsContent;
|
|
23
25
|
logResponseContent;
|
|
26
|
+
stack;
|
|
24
27
|
constructor(set) {
|
|
25
28
|
try {
|
|
26
29
|
this.name = set.name ?? set.endpoint;
|
|
@@ -51,6 +54,7 @@ class DyNTS_Endpoint_Params {
|
|
|
51
54
|
this.pathParams = pathParts;
|
|
52
55
|
this.preProcesses = set.preProcesses ?? [];
|
|
53
56
|
this.tasks = set.tasks ?? [];
|
|
57
|
+
this.stack = this.getStackLocation();
|
|
54
58
|
}
|
|
55
59
|
catch (error) {
|
|
56
60
|
fsm_dynamo_1.DyFM_Log.error(`\nEndpoint params setup failed: name: '${set.name}' ` +
|
|
@@ -86,13 +90,15 @@ class DyNTS_Endpoint_Params {
|
|
|
86
90
|
this.error(req, res, error, issuer);
|
|
87
91
|
}
|
|
88
92
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
stack = stack?.split('\n').filter(
|
|
94
|
-
|
|
95
|
-
|
|
93
|
+
getStackLocation() {
|
|
94
|
+
return new Error().stack;
|
|
95
|
+
/* DyFM_Log.info(`\nTRYING TO FIND STACK LOCATION FOR: ${this.name}`); */
|
|
96
|
+
/* DyFM_Log.info(`\n..."${this.stack}"`); */
|
|
97
|
+
/* this.stack = this.stack?.split('\n').filter(
|
|
98
|
+
(line: string): boolean => !line.includes('node_modules')
|
|
99
|
+
).join('\n');
|
|
100
|
+
this.stack = this.stack.replace(' at ', ''); */
|
|
101
|
+
/* DyFM_Log.H_info(`\n stack location: "${this.stack}"`); */
|
|
96
102
|
}
|
|
97
103
|
/**
|
|
98
104
|
*
|
|
@@ -107,7 +113,8 @@ class DyNTS_Endpoint_Params {
|
|
|
107
113
|
await this.preLog(req, res, issuer);
|
|
108
114
|
}
|
|
109
115
|
if (global_settings_const_1.DyNTS_global_settings.log_settings.requestStackLocation) {
|
|
110
|
-
this.logStackLocation();
|
|
116
|
+
/* this.logStackLocation(); */
|
|
117
|
+
fsm_dynamo_1.DyFM_Log.H_info(`\n stack location: "${this.stack}"`);
|
|
111
118
|
}
|
|
112
119
|
await fsm_dynamo_1.DyFM_Array.asyncForEach(this.preProcesses, async (preProcess) => {
|
|
113
120
|
await preProcess(req, res);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":";;;AAIA,sDAAyF;AAGzF,oFAAiF;AACjF,wEAA0E;AAE1E;;;;GAIG;AACH,MAAa,qBAAqB;IAChC,IAAI,CAAS;IACb,QAAQ,CAAsB;IAE9B,IAAI,CAAqB;IACzB,QAAQ,CAAS;
|
|
1
|
+
{"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-control.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/system-control.control-model.ts"],"names":[],"mappings":"AAGA,qBAAa,mBAAmB;IAC9B,IAAI,EAAE,OAAO,CAAS;IACtB,OAAO,EAAE,OAAO,CAAS;IAEzB,
|
|
1
|
+
{"version":3,"file":"system-control.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/system-control.control-model.ts"],"names":[],"mappings":"AAGA,qBAAa,mBAAmB;IAC9B,IAAI,EAAE,OAAO,CAAS;IACtB,OAAO,EAAE,OAAO,CAAS;IAEzB,UAAU,IAAI,OAAO;CAGtB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-control.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/system-control.control-model.ts"],"names":[],"mappings":";;;AAGA,MAAa,mBAAmB;IAC9B,IAAI,GAAY,KAAK,CAAC;IACtB,OAAO,GAAY,KAAK,CAAC;IAEzB,
|
|
1
|
+
{"version":3,"file":"system-control.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/system-control.control-model.ts"],"names":[],"mappings":";;;AAGA,MAAa,mBAAmB;IAC9B,IAAI,GAAY,KAAK,CAAC;IACtB,OAAO,GAAY,KAAK,CAAC;IAEzB,UAAU;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;CACF;AAPD,kDAOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-extended.server.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAOpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmGG;AACH,8BAAsB,iBAAkB,SAAQ,SAAS;IAEvD,OAAO,CAAC,iBAAiB,CAA0D;IACnF,IAAa,OAAO,IAAI,OAAO,CAAuD;IACtF,OAAO,CAAC,yBAAyB,CAAa;IAC9C,OAAO,CAAC,wBAAwB,CAAa;IAE7C,OAAO,CAAC,cAAc,CAAsB;IAE5C,OAAO,CAAC,gBAAgB,CAAc;IAEtC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,EAAE,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3D,OAAO,CAAC,gBAAgB,CAAyB;;YAwBnC,iBAAiB;IAmEhB,KAAK,CAAC,OAAO,GAAE,
|
|
1
|
+
{"version":3,"file":"app-extended.server.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAOpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmGG;AACH,8BAAsB,iBAAkB,SAAQ,SAAS;IAEvD,OAAO,CAAC,iBAAiB,CAA0D;IACnF,IAAa,OAAO,IAAI,OAAO,CAAuD;IACtF,OAAO,CAAC,yBAAyB,CAAa;IAC9C,OAAO,CAAC,wBAAwB,CAAa;IAE7C,OAAO,CAAC,cAAc,CAAsB;IAE5C,OAAO,CAAC,gBAAgB,CAAc;IAEtC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,EAAE,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3D,OAAO,CAAC,gBAAgB,CAAyB;;YAwBnC,iBAAiB;IAmEhB,KAAK,CAAC,OAAO,GAAE,MAAiC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgIhE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA+CpC;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;YACW,yBAAyB;IAuJvC;;OAEG;IACH,QAAQ,CAAC,iBAAiB,IAAI,yBAAyB,CAAC,GAAG,CAAC,EAAE;IAE9D,OAAO,CAAC,yBAAyB;CAclC"}
|
|
@@ -162,7 +162,7 @@ class DyNTS_AppExtended extends app_server_1.DyNTS_App {
|
|
|
162
162
|
console.log(this.params.title);
|
|
163
163
|
console.log(`Version: ${this.params.version}`);
|
|
164
164
|
}
|
|
165
|
-
fsm_dynamo_1.DyFM_Log.H_success(
|
|
165
|
+
fsm_dynamo_1.DyFM_Log.H_success(`"${this.params.name}" started successfully.`);
|
|
166
166
|
}
|
|
167
167
|
catch (error) {
|
|
168
168
|
if (global_settings_const_1.DyNTS_global_settings.log_settings.highDetailedLogs ||
|
|
@@ -181,19 +181,19 @@ class DyNTS_AppExtended extends app_server_1.DyNTS_App {
|
|
|
181
181
|
systemControls: this.systemControls,
|
|
182
182
|
systemControlsExt: this.systemControlsExt,
|
|
183
183
|
systemReadies: {
|
|
184
|
-
app: this.systemControls.app.
|
|
185
|
-
appExtended: this.systemControlsExt.appExtended.
|
|
186
|
-
mongoose: this.systemControls.mongoose.
|
|
187
|
-
httpServer: this.systemControls.httpServer.
|
|
188
|
-
httpsServer: this.systemControls.httpsServer.
|
|
189
|
-
httpSocketServer: this.systemControlsExt.httpSocketServer.
|
|
190
|
-
httpsSocketServer: this.systemControlsExt.httpsSocketServer.
|
|
184
|
+
app: this.systemControls.app.getIsReady(),
|
|
185
|
+
appExtended: this.systemControlsExt.appExtended.getIsReady(),
|
|
186
|
+
mongoose: this.systemControls.mongoose.getIsReady(),
|
|
187
|
+
httpServer: this.systemControls.httpServer.getIsReady(),
|
|
188
|
+
httpsServer: this.systemControls.httpsServer.getIsReady(),
|
|
189
|
+
httpSocketServer: this.systemControlsExt.httpSocketServer.getIsReady(),
|
|
190
|
+
httpsSocketServer: this.systemControlsExt.httpsSocketServer.getIsReady(),
|
|
191
191
|
},
|
|
192
192
|
},
|
|
193
193
|
});
|
|
194
194
|
}
|
|
195
195
|
}
|
|
196
|
-
async ready(timeout =
|
|
196
|
+
async ready(timeout = this.defaultReadyTimeout) {
|
|
197
197
|
if (this.fnLogs)
|
|
198
198
|
console.log('\nfn:. ready-extended');
|
|
199
199
|
try {
|
|
@@ -201,14 +201,16 @@ class DyNTS_AppExtended extends app_server_1.DyNTS_App {
|
|
|
201
201
|
let ready = false;
|
|
202
202
|
const start = +new Date();
|
|
203
203
|
if (this.constructErrors.length) {
|
|
204
|
-
|
|
205
|
-
if (
|
|
206
|
-
|
|
204
|
+
if (this.deepLog) {
|
|
205
|
+
if (global_settings_const_1.DyNTS_global_settings.log_settings.highDetailedLogs) {
|
|
206
|
+
fsm_dynamo_1.DyFM_Log.H_error(`Extended Application: "${this.params.name}" start failed. ` +
|
|
207
|
+
`(ready; constructErrors check +1)`, `\n construct ERRORS:`, this.constructErrors);
|
|
207
208
|
}
|
|
208
209
|
else {
|
|
209
|
-
|
|
210
|
+
fsm_dynamo_1.DyFM_Log.H_error(`Extended Application: "${this.params.name}" start failed. ` +
|
|
211
|
+
`(ready; constructErrors check +1)`, `\n construct ERRORS:`, this.getSimplifiedConstructErrors());
|
|
210
212
|
}
|
|
211
|
-
}
|
|
213
|
+
}
|
|
212
214
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
213
215
|
message: `${this.params?.name} start failed.`,
|
|
214
216
|
additionalContent: this.constructErrors,
|
|
@@ -218,25 +220,25 @@ class DyNTS_AppExtended extends app_server_1.DyNTS_App {
|
|
|
218
220
|
while (!ready && +new Date() - start < timeout) {
|
|
219
221
|
if (this.systemControlsExt.appExtended.init) {
|
|
220
222
|
ready = (this.superStarted &&
|
|
221
|
-
this.systemControlsExt.httpSocketServer.
|
|
222
|
-
this.systemControlsExt.httpsSocketServer.
|
|
223
|
+
this.systemControlsExt.httpSocketServer.getIsReady() &&
|
|
224
|
+
this.systemControlsExt.httpsSocketServer.getIsReady());
|
|
223
225
|
}
|
|
224
226
|
else {
|
|
225
|
-
fsm_dynamo_1.DyFM_Log.error(
|
|
227
|
+
fsm_dynamo_1.DyFM_Log.error(`"${this.params.name}" APP NOT INITIALIZED while trying to get ready.`);
|
|
226
228
|
}
|
|
227
229
|
if (!ready) {
|
|
228
230
|
await (0, fsm_dynamo_1.DyFM_wait)(100);
|
|
229
231
|
}
|
|
230
232
|
}
|
|
231
233
|
if (this.constructErrors.length) {
|
|
232
|
-
|
|
233
|
-
if (
|
|
234
|
-
|
|
234
|
+
if (this.deepLog) {
|
|
235
|
+
if (global_settings_const_1.DyNTS_global_settings.log_settings.highDetailedLogs) {
|
|
236
|
+
fsm_dynamo_1.DyFM_Log.H_error(`Extended Application: "${this.params.name}" start failed. (ready; TIMEOUT check +2)`, `\n construct ERRORS:`, this.constructErrors);
|
|
235
237
|
}
|
|
236
238
|
else {
|
|
237
|
-
|
|
239
|
+
fsm_dynamo_1.DyFM_Log.H_error(`Extended Application: "${this.params.name}" start failed. (ready; TIMEOUT check +2)`, `\n construct ERRORS:`, this.getSimplifiedConstructErrors());
|
|
238
240
|
}
|
|
239
|
-
}
|
|
241
|
+
}
|
|
240
242
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
241
243
|
message: `${this.params?.name} start failed. TIMEOUT`,
|
|
242
244
|
additionalContent: this.constructErrors,
|
|
@@ -269,13 +271,13 @@ class DyNTS_AppExtended extends app_server_1.DyNTS_App {
|
|
|
269
271
|
systemControls: this.systemControls,
|
|
270
272
|
systemControlsExt: this.systemControlsExt,
|
|
271
273
|
systemReadies: {
|
|
272
|
-
app: this.systemControls.app.
|
|
273
|
-
appExtended: this.systemControlsExt.appExtended.
|
|
274
|
-
mongoose: this.systemControls.mongoose.
|
|
275
|
-
httpServer: this.systemControls.httpServer.
|
|
276
|
-
httpsServer: this.systemControls.httpsServer.
|
|
277
|
-
httpSocketServer: this.systemControlsExt.httpSocketServer.
|
|
278
|
-
httpsSocketServer: this.systemControlsExt.httpsSocketServer.
|
|
274
|
+
app: this.systemControls.app.getIsReady(),
|
|
275
|
+
appExtended: this.systemControlsExt.appExtended.getIsReady(),
|
|
276
|
+
mongoose: this.systemControls.mongoose.getIsReady(),
|
|
277
|
+
httpServer: this.systemControls.httpServer.getIsReady(),
|
|
278
|
+
httpsServer: this.systemControls.httpsServer.getIsReady(),
|
|
279
|
+
httpSocketServer: this.systemControlsExt.httpSocketServer.getIsReady(),
|
|
280
|
+
httpsSocketServer: this.systemControlsExt.httpsSocketServer.getIsReady(),
|
|
279
281
|
},
|
|
280
282
|
},
|
|
281
283
|
error: this.constructErrors?.[0] ?? new Error(),
|
|
@@ -319,7 +321,7 @@ class DyNTS_AppExtended extends app_server_1.DyNTS_App {
|
|
|
319
321
|
this.systemControlsExt.httpSocketServer.init = false;
|
|
320
322
|
this.systemControlsExt.httpsSocketServer.init = false;
|
|
321
323
|
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
322
|
-
fsm_dynamo_1.DyFM_Log.H_info(
|
|
324
|
+
fsm_dynamo_1.DyFM_Log.H_info(`"${this.params.name}" stopped successfully.`);
|
|
323
325
|
}
|
|
324
326
|
}
|
|
325
327
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-extended.server.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app-extended.server.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,13 +6,25 @@ describe('DyNTS_AppExtended;', () => {
|
|
|
6
6
|
describe('a extended-base instance;', () => {
|
|
7
7
|
let app;
|
|
8
8
|
beforeEach(async () => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
try {
|
|
10
|
+
app = new app_extended_server_mock_1.DyNTS_AppExtendedBase_Mock();
|
|
11
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
12
|
+
await app.ready();
|
|
13
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
fsm_dynamo_1.DyFM_Log.test('test beforeEach error:', error?._message);
|
|
17
|
+
}
|
|
12
18
|
});
|
|
13
19
|
afterEach(async () => {
|
|
14
|
-
|
|
15
|
-
|
|
20
|
+
try {
|
|
21
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
22
|
+
await app.stop();
|
|
23
|
+
app = null;
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
fsm_dynamo_1.DyFM_Log.test('test afterEach error:', error?._message);
|
|
27
|
+
}
|
|
16
28
|
});
|
|
17
29
|
it('should be created', () => {
|
|
18
30
|
expect(app).toBeDefined();
|
|
@@ -24,13 +36,25 @@ describe('DyNTS_AppExtended;', () => {
|
|
|
24
36
|
describe('a extended-full instance;', () => {
|
|
25
37
|
let app;
|
|
26
38
|
beforeEach(async () => {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
39
|
+
try {
|
|
40
|
+
app = new app_extended_server_mock_1.DyNTS_AppExtendedFull_Mock();
|
|
41
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
42
|
+
await app.ready();
|
|
43
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
fsm_dynamo_1.DyFM_Log.test('test beforeEach error:', error?._message);
|
|
47
|
+
}
|
|
30
48
|
});
|
|
31
49
|
afterEach(async () => {
|
|
32
|
-
|
|
33
|
-
|
|
50
|
+
try {
|
|
51
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
52
|
+
await app.stop();
|
|
53
|
+
app = null;
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
fsm_dynamo_1.DyFM_Log.test('test afterEach error:', error?._message);
|
|
57
|
+
}
|
|
34
58
|
});
|
|
35
59
|
it('should be created', () => {
|
|
36
60
|
expect(app).toBeDefined();
|
|
@@ -42,12 +66,25 @@ describe('DyNTS_AppExtended;', () => {
|
|
|
42
66
|
describe('a wb-mock instance;', () => {
|
|
43
67
|
let app;
|
|
44
68
|
beforeEach(async () => {
|
|
45
|
-
|
|
46
|
-
|
|
69
|
+
try {
|
|
70
|
+
app = new app_extended_server_mock_1.DyNTS_AppWbMock_Mock();
|
|
71
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
72
|
+
await app.ready();
|
|
73
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
fsm_dynamo_1.DyFM_Log.test('test beforeEach error:', error?._message);
|
|
77
|
+
}
|
|
47
78
|
});
|
|
48
79
|
afterEach(async () => {
|
|
49
|
-
|
|
50
|
-
|
|
80
|
+
try {
|
|
81
|
+
await (0, fsm_dynamo_1.DyFM_delay)(100);
|
|
82
|
+
await app.stop();
|
|
83
|
+
app = null;
|
|
84
|
+
}
|
|
85
|
+
catch (error) {
|
|
86
|
+
fsm_dynamo_1.DyFM_Log.test('test afterEach error:', error?._message);
|
|
87
|
+
}
|
|
51
88
|
});
|
|
52
89
|
it('should be created', () => {
|
|
53
90
|
expect(app).toBeDefined();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-extended.server.spec.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.spec.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"app-extended.server.spec.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.spec.ts"],"names":[],"mappings":";;AAAA,sDAAyE;AACzE,kFAE6C;AAE7C,QAAQ,CAAC,oBAAoB,EAAE,GAAS,EAAE;IACxC,QAAQ,CAAC,2BAA2B,EAAE,GAAS,EAAE;QAC/C,IAAI,GAA+B,CAAC;QAEpC,UAAU,CAAC,KAAK,IAAmB,EAAE;YACnC,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,qDAA0B,EAAE,CAAC;gBAEvC,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;gBAEtB,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;gBAElB,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;YACxB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,qBAAQ,CAAC,IAAI,CAAC,wBAAwB,EAAG,KAAoB,EAAE,QAAQ,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,KAAK,IAAmB,EAAE;YAClC,IAAI,CAAC;gBACH,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;gBAEtB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAEjB,GAAG,GAAG,IAAI,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,qBAAQ,CAAC,IAAI,CAAC,uBAAuB,EAAG,KAAoB,EAAE,QAAQ,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAS,EAAE;QAC/C,IAAI,GAA+B,CAAC;QAEpC,UAAU,CAAC,KAAK,IAAmB,EAAE;YACnC,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,qDAA0B,EAAE,CAAC;gBAEvC,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;gBAEtB,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;gBAElB,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;YACxB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,qBAAQ,CAAC,IAAI,CAAC,wBAAwB,EAAG,KAAoB,EAAE,QAAQ,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,KAAK,IAAmB,EAAE;YAClC,IAAI,CAAC;gBACH,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;gBAEtB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAEjB,GAAG,GAAG,IAAI,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,qBAAQ,CAAC,IAAI,CAAC,uBAAuB,EAAG,KAAoB,EAAE,QAAQ,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAS,EAAE;QACzC,IAAI,GAAyB,CAAC;QAE9B,UAAU,CAAC,KAAK,IAAmB,EAAE;YACnC,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,+CAAoB,EAAE,CAAC;gBAEjC,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;gBAEtB,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;gBAElB,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;YACxB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,qBAAQ,CAAC,IAAI,CAAC,wBAAwB,EAAG,KAAoB,EAAE,QAAQ,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,KAAK,IAAmB,EAAE;YAClC,IAAI,CAAC;gBACH,MAAM,IAAA,uBAAU,EAAC,GAAG,CAAC,CAAC;gBAEtB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;gBAEjB,GAAG,GAAG,IAAI,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,qBAAQ,CAAC,IAAI,CAAC,uBAAuB,EAAG,KAAoB,EAAE,QAAQ,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.controller.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAO5E,qBAAa,sBAAuB,SAAQ,gBAAgB;IAE1D,MAAM,CAAC,WAAW,IAAI,sBAAsB;IAK5C,OAAO,CAAC,WAAW,CAAoB;IAEvC,cAAc,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"usage.controller.d.ts","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAO5E,qBAAa,sBAAuB,SAAQ,gBAAgB;IAE1D,MAAM,CAAC,WAAW,IAAI,sBAAsB;IAK5C,OAAO,CAAC,WAAW,CAAoB;IAEvC,cAAc,IAAI,IAAI;CA2FvB"}
|
|
@@ -22,8 +22,7 @@ class DyNTS_Usage_Controller extends controller_service_1.DyNTS_Controller {
|
|
|
22
22
|
endpoint: usage_1.DyFM_usageModule_settings.endPoints.newSession,
|
|
23
23
|
tasks: [
|
|
24
24
|
async (req, res, issuer) => {
|
|
25
|
-
const
|
|
26
|
-
const username = authService.getUsernameFromRequest(req);
|
|
25
|
+
const username = this.authService.getUsernameFromRequest(req);
|
|
27
26
|
const usageService = new usage_data_service_1.DyNTS_Usage_DataService({
|
|
28
27
|
usageSession: new usage_1.DyFM_UsageSession({
|
|
29
28
|
sessionStart: new Date(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":";;;AAIA,uDAEqC;AAErC,+EAA2E;AAE3E,iFAA4E;AAC5E,wEAA0E;AAC1E,8GAEoE;AACpE,6DAA+D;AAE/D,MAAa,sBAAuB,SAAQ,qCAAgB;IAE1D,MAAM,CAAC,WAAW;QAChB,OAAO,sBAAsB,CAAC,oBAAoB,EAAE,CAAC;IACvD,CAAC;IAED,WAAW;IACH,WAAW,CAAoB;IAEvC,cAAc;QACZ,IAAI,CAAC,WAAW,GAAG,oCAAmB,CAAC,cAAc,EAAE,CAAC;QAExD,IAAI,CAAC,SAAS,GAAG;YACf,IAAI,qDAAqB,CAAC;gBACxB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,wCAAkB,CAAC,GAAG;gBAC5B,QAAQ,EAAE,iCAAyB,CAAC,SAAS,CAAC,UAAU;gBACxD,KAAK,EAAE;oBACL,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,MAAc,EAAiB,EAAE;wBACnE,MAAM,
|
|
1
|
+
{"version":3,"file":"usage.controller.js","sourceRoot":"","sources":["../../../src/_modules/usage/usage.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/email.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAA0B,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE3E,OAAO,EACL,aAAa,EAA0B,mBAAmB,EAC3D,MAAM,uBAAuB,CAAC;AAI/B,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,4BAA4B,EAAE,CAAC;CACrD;AAED,qBAAa,4BAA4B;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,WAAW,CAAC,EAAE,MAAM,CAAM;IAE1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAM;IAC3B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAM;gBAGpC,GAAG,CAAC,EAAE,4BAA4B;CAMrC;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG;IAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE;IAC9E,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAEvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,UAAU,CAAsC;IACxD,OAAO,CAAC,oBAAoB,CAErB;IACP,OAAO,CAAC,gBAAgB,CAEjB;IAEP,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAc;IAEhD,QAAQ,CAAC,mBAAmB,SAE2B;gBAGrD,GAAG,EAAE,2BAA2B;IAiB5B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"email.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/email.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAA0B,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE3E,OAAO,EACL,aAAa,EAA0B,mBAAmB,EAC3D,MAAM,uBAAuB,CAAC;AAI/B,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,4BAA4B,EAAE,CAAC;CACrD;AAED,qBAAa,4BAA4B;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,WAAW,CAAC,EAAE,MAAM,CAAM;IAE1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAM;IAC3B,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAM;gBAGpC,GAAG,CAAC,EAAE,4BAA4B;CAMrC;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG;IAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAAE;IAC9E,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAEvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,aAAa,CAAyB;IAC9C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,UAAU,CAAsC;IACxD,OAAO,CAAC,oBAAoB,CAErB;IACP,OAAO,CAAC,gBAAgB,CAEjB;IAEP,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAc;IAEhD,QAAQ,CAAC,mBAAmB,SAE2B;gBAGrD,GAAG,EAAE,2BAA2B;IAiB5B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBzC;;;OAGG;IACU,SAAS,CAAC,CAAC,EACtB,GAAG,EAAE,wBAAwB,CAAC,CAAC,CAAC,EAChC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;YAmFF,wBAAwB;IAwDtC,OAAO,CAAC,oBAAoB;IAqD5B,6DAA6D;IAC7D,OAAO,CAAC,SAAS;IAajB,4BAA4B;IAC5B,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,eAAe;YAMT,0BAA0B;YAwC1B,mBAAmB;YAkEnB,0BAA0B;IA+GxC,OAAO,CAAC,iBAAiB;IAkDzB;;;;OAIG;IACH,OAAO,CAAC,uBAAuB;IA8C/B,OAAO,CAAC,wBAAwB;IAgBhC,SAAS,CAAC,uBAAuB,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GACb,mBAAmB;CAYvB"}
|
|
@@ -55,7 +55,7 @@ class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
|
|
|
55
55
|
try {
|
|
56
56
|
if (this.components) {
|
|
57
57
|
await fsm_dynamo_1.DyFM_Array.asyncForEach(this.components, async (component) => {
|
|
58
|
-
await this.
|
|
58
|
+
await this.loadEmailTemplateComponent(component);
|
|
59
59
|
});
|
|
60
60
|
this.connectComponents();
|
|
61
61
|
}
|
|
@@ -65,8 +65,6 @@ class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
|
|
|
65
65
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
66
66
|
...this._getDefaultErrorSettings('asyncPostConstruct', error, 'SYSTEM'),
|
|
67
67
|
errorCode: 'NTS-ES0-APC0',
|
|
68
|
-
message: `\nDynamoBEEmailService ERROR, ` +
|
|
69
|
-
`\nThe emailService construction failed for ${this.serviceName}.`,
|
|
70
68
|
});
|
|
71
69
|
}
|
|
72
70
|
}
|
|
@@ -294,20 +292,19 @@ class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
|
|
|
294
292
|
} */
|
|
295
293
|
return template;
|
|
296
294
|
}
|
|
297
|
-
async
|
|
295
|
+
async loadEmailTemplateComponent(component) {
|
|
298
296
|
try {
|
|
299
297
|
if (this.componentsBySelector[component.selector]) {
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
errorCode: 'NTS-ES0-LC1',
|
|
303
|
-
message: `Template already loaded! (${component.name})`,
|
|
304
|
-
});
|
|
298
|
+
fsm_dynamo_1.DyFM_Log.warn('Email component already loaded! (it will be skipped)', component.selector);
|
|
299
|
+
return;
|
|
305
300
|
}
|
|
306
301
|
if (!component.templatePath && !component.template) {
|
|
307
302
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
308
|
-
...this._getDefaultErrorSettings('loadComponent', new Error(), 'SYSTEM'),
|
|
303
|
+
...this._getDefaultErrorSettings('loadComponent', new Error(`Component missing template and templatePath! (${component.name})`), 'SYSTEM'),
|
|
309
304
|
errorCode: 'NTS-ES0-LC2',
|
|
310
|
-
|
|
305
|
+
additionalContent: {
|
|
306
|
+
component: component,
|
|
307
|
+
},
|
|
311
308
|
});
|
|
312
309
|
}
|
|
313
310
|
if (!component.template) {
|