@futdevpro/nts-dynamo 1.14.52 → 1.14.53
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/_modules/server/errors/errors.data-service.d.ts.map +1 -1
- package/build/_modules/server/errors/errors.data-service.js +33 -26
- package/build/_modules/server/errors/errors.data-service.js.map +1 -1
- package/build/_modules/server/server-status/server-status.control-service.d.ts +13 -2
- package/build/_modules/server/server-status/server-status.control-service.d.ts.map +1 -1
- package/build/_modules/server/server-status/server-status.control-service.js +44 -15
- package/build/_modules/server/server-status/server-status.control-service.js.map +1 -1
- package/build/_modules/server/server-status/server-status.controller.js +6 -6
- package/build/_modules/server/server-status/server-status.controller.js.map +1 -1
- package/build/_services/core/api.service.d.ts.map +1 -1
- package/build/_services/core/api.service.js +19 -11
- package/build/_services/core/api.service.js.map +1 -1
- package/package.json +4 -4
- package/src/_modules/server/errors/errors.data-service.ts +13 -9
- package/src/_modules/server/server-status/server-status.control-service.ts +56 -17
- package/src/_modules/server/server-status/server-status.controller.ts +6 -6
- package/src/_services/core/api.service.ts +12 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.data-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/errors/errors.data-service.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EAEU,UAAU,EAAE,eAAe,EACX,WAAW,EAClD,iBAAiB,EAEjB,UAAU,EAEV,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAGvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,qBAAa,wBAAwB,CACnC,OAAO,SAAS,UAAU,EAC1B,cAAc,SAAS,WAAW,CAAC,OAAO,CAAC,CAC3C,SAAQ,iBAAiB,CAAC,cAAc,CAAE,YAAW,2BAA2B,CAAC,OAAO,EAAE,cAAc,CAAC;IAEzG,QAAQ,EAAE,OAAO,CAAS;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAuC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAgBrB,WAAW,CACf,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;cA8IA,iBAAiB,CAC/B,KAAK,EAAE,aAAa,GAAG,GAAG,EAC1B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,CAAC;IA2CpB,mBAAmB,CACvB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;IAoBV,mBAAmB,CACvB,KAAK,EAAE,aAAa,GAAG,GAAG,EAC1B,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.data-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/errors/errors.data-service.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EAEU,UAAU,EAAE,eAAe,EACX,WAAW,EAClD,iBAAiB,EAEjB,UAAU,EAEV,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAGvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,qBAAa,wBAAwB,CACnC,OAAO,SAAS,UAAU,EAC1B,cAAc,SAAS,WAAW,CAAC,OAAO,CAAC,CAC3C,SAAQ,iBAAiB,CAAC,cAAc,CAAE,YAAW,2BAA2B,CAAC,OAAO,EAAE,cAAc,CAAC;IAEzG,QAAQ,EAAE,OAAO,CAAS;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAuC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAgBrB,WAAW,CACf,YAAY,EAAE,cAAc,EAC5B,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;cA8IA,iBAAiB,CAC/B,KAAK,EAAE,aAAa,GAAG,GAAG,EAC1B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,cAAc,CAAC;IA2CpB,mBAAmB,CACvB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;IAoBV,mBAAmB,CACvB,KAAK,EAAE,aAAa,GAAG,GAAG,EAC1B,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;IAwChB,qCAAqC,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,cAAc;IA0C/F,4BAA4B,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM;IAwBtD,iBAAiB,CACrB,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAqBhC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnF,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBtE,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAuB/F,cAAc,CAClB,KAAK,EAAE,iBAAiB,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAuBhC,aAAa,CACjB,KAAK,EAAE,iBAAiB,EACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAyBhC,YAAY,CAChB,WAAW,EAAE,gBAAgB,CAAC,cAAc,CAAC,EAC7C,MAAM,EAAE,MAAM,GACX,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;CAehD"}
|
|
@@ -194,21 +194,28 @@ class DyNTS_Errors_DataService extends data_service_1.DyNTS_DataService {
|
|
|
194
194
|
DyFM_Log.H_error('__ERROR__:', error);
|
|
195
195
|
} */
|
|
196
196
|
await this.recordError(errorsRecord, this.issuer, alwaysRecord);
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
197
|
+
fsm_dynamo_1.DyFM_Error.logSimple(`DyNTS_Error_DataService handling InternalError...`, error);
|
|
198
|
+
/* if (
|
|
199
|
+
DyNTS_global_settings.log_settings.highDetailedLogs ||
|
|
200
|
+
!(error instanceof DyFM_Error)
|
|
201
|
+
) {
|
|
202
|
+
DyFM_Log.H_error(
|
|
203
|
+
`DyNTS_Error_DataService handling InternalError...`,
|
|
204
|
+
`\n ERROR:`, error
|
|
205
|
+
);
|
|
206
|
+
} else {
|
|
207
|
+
error.logSimple(
|
|
208
|
+
`DyNTS_Error_DataService handling InternalError...`
|
|
209
|
+
);
|
|
210
|
+
} */
|
|
204
211
|
}
|
|
205
212
|
catch (error) {
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
else {
|
|
210
|
-
|
|
211
|
-
}
|
|
213
|
+
fsm_dynamo_1.DyFM_Error.logSimple('handleInternalError error', error);
|
|
214
|
+
/* if (error instanceof DyFM_Error) {
|
|
215
|
+
error.logSimple('handleInternalError error');
|
|
216
|
+
} else {
|
|
217
|
+
DyFM_Log.error('handleInternalError error:', error);
|
|
218
|
+
} */
|
|
212
219
|
}
|
|
213
220
|
}
|
|
214
221
|
checkErrorIsStringifyableOrResolvable(error, issuer) {
|
|
@@ -219,12 +226,12 @@ class DyNTS_Errors_DataService extends data_service_1.DyNTS_DataService {
|
|
|
219
226
|
JSON.stringify(error);
|
|
220
227
|
}
|
|
221
228
|
catch (err) {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
else {
|
|
226
|
-
|
|
227
|
-
}
|
|
229
|
+
fsm_dynamo_1.DyFM_Error.logSimple('checkErrorIsStringifyableOrResolvable error', err);
|
|
230
|
+
/* if (err instanceof DyFM_Error) {
|
|
231
|
+
err.logSimple('checkErrorIsStringifyableOrResolvable error');
|
|
232
|
+
} else {
|
|
233
|
+
DyFM_Log.error('checkErrorIsStringifyableOrResolvable error:', err);
|
|
234
|
+
} */
|
|
228
235
|
error = fsm_dynamo_1.DyFM_Object.resolveCirculation(error);
|
|
229
236
|
try {
|
|
230
237
|
JSON.stringify(error);
|
|
@@ -234,13 +241,13 @@ class DyNTS_Errors_DataService extends data_service_1.DyNTS_DataService {
|
|
|
234
241
|
try {
|
|
235
242
|
JSON.stringify(error);
|
|
236
243
|
}
|
|
237
|
-
catch (
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
else {
|
|
242
|
-
|
|
243
|
-
}
|
|
244
|
+
catch (errr) {
|
|
245
|
+
fsm_dynamo_1.DyFM_Error.logSimple('checkErrorIsStringifyableOrResolvable error', errr);
|
|
246
|
+
/* if (err instanceof DyFM_Error) {
|
|
247
|
+
err.logSimple('error data is not stringifyable! resolution failed! will not save!');
|
|
248
|
+
} else {
|
|
249
|
+
DyFM_Log.error('error data is not stringifyable! resolution failed! will not save!', err);
|
|
250
|
+
} */
|
|
244
251
|
return 'UNRESOLVABLE';
|
|
245
252
|
}
|
|
246
253
|
fsm_dynamo_1.DyFM_Log.error('error data was too big to save, removed additionalContent');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/errors/errors.data-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"errors.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/errors/errors.data-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
|
-
import { DyFM_RelativeDate, DyFM_ServerStatus, DyFM_Error, DyFM_Error_Statistics, DyFM_Errors } from '@futdevpro/fsm-dynamo';
|
|
1
|
+
import { DyFM_RelativeDate, DyFM_ServerStatus, DyFM_Error, DyFM_Error_Statistics, DyFM_Errors, DyFM_ServerConnectionCheckResult } from '@futdevpro/fsm-dynamo';
|
|
2
2
|
import { Subscription } from 'rxjs';
|
|
3
3
|
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
|
|
4
4
|
import { DyNTS_Errors_ControlService } from '../errors/errors.control-service';
|
|
5
5
|
import { DyNTS_ServerStatusSnapshot_ControlService } from './server-status-snapshot.control-service';
|
|
6
|
+
import { DyNTS_ApiService_Base } from '../../../_services/base/api.service-base';
|
|
7
|
+
interface DyNTS_ServerConnection {
|
|
8
|
+
name: string;
|
|
9
|
+
apiService: DyNTS_ApiService_Base;
|
|
10
|
+
accessible?: boolean;
|
|
11
|
+
lastCheck?: Date;
|
|
12
|
+
}
|
|
6
13
|
export declare abstract class DyNTS_ServerStatus_ControlService<T_ServerStatus extends DyFM_ServerStatus, T_Error extends DyFM_Error, T_Errors extends DyFM_Errors<T_Error>, T_Errors_ControlService extends DyNTS_Errors_ControlService<T_Error, T_Errors>, T_ServerStatusSnapshot extends DyFM_ServerStatus, T_ServerStatusSnapshot_ControlService extends DyNTS_ServerStatusSnapshot_ControlService<T_ServerStatusSnapshot>> extends DyNTS_SingletonService {
|
|
7
14
|
protected abstract getErrorControlService?(set?: {
|
|
8
15
|
data?: T_Errors;
|
|
@@ -20,11 +27,14 @@ export declare abstract class DyNTS_ServerStatus_ControlService<T_ServerStatus e
|
|
|
20
27
|
protected _latestClientVersionNumeric: number;
|
|
21
28
|
get latestClientVersion(): string;
|
|
22
29
|
get latestClientVersionNumeric(): number;
|
|
30
|
+
protected abstract requiredServerConnections: DyNTS_ServerConnection[];
|
|
31
|
+
protected connectionMaxCheckFrequency: number;
|
|
23
32
|
readonly defaultErrorUserMsg = "Something went wrong";
|
|
24
33
|
readonly overseerTickTime: number;
|
|
25
34
|
overseer: Subscription;
|
|
26
35
|
protected constructor();
|
|
27
|
-
getServerStatus(clientVersion?: string): DyFM_ServerStatus
|
|
36
|
+
getServerStatus(issuer: string, clientVersion?: string): Promise<DyFM_ServerStatus>;
|
|
37
|
+
checkServerConnections(issuer: string): Promise<DyFM_ServerConnectionCheckResult>;
|
|
28
38
|
getErrorStatistics(range: DyFM_RelativeDate, issuer: string): Promise<DyFM_Error_Statistics>;
|
|
29
39
|
protected getVersionNumeric(version: string): number;
|
|
30
40
|
protected clientVersionIsLatest(clientVersion: string): boolean;
|
|
@@ -32,4 +42,5 @@ export declare abstract class DyNTS_ServerStatus_ControlService<T_ServerStatus e
|
|
|
32
42
|
protected triggerCreateSnapshot(issuer: string): Promise<void>;
|
|
33
43
|
getServerStatusSnapshot(issuer: string): Promise<T_ServerStatusSnapshot>;
|
|
34
44
|
}
|
|
45
|
+
export {};
|
|
35
46
|
//# sourceMappingURL=server-status.control-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-status.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":"AAEA,OAAO,EACU,iBAAiB,EAAa,iBAAiB,EAC9D,UAAU,EAAE,qBAAqB,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"server-status.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":"AAEA,OAAO,EACU,iBAAiB,EAAa,iBAAiB,EAC9D,UAAU,EAAE,qBAAqB,EAAE,WAAW,EAG9C,gCAAgC,EACjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAS,MAAM,MAAM,CAAC;AAG3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAEnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,yCAAyC,EAAE,MAAM,0CAA0C,CAAC;AAErG,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,8BAAsB,iCAAiC,CACrD,cAAc,SAAS,iBAAiB,EACxC,OAAO,SAAS,UAAU,EAC1B,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,EACrC,uBAAuB,SAAS,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,EAC9E,sBAAsB,SAAS,iBAAiB,EAChD,qCAAqC,SAAS,yCAAyC,CAAC,sBAAsB,CAAC,CAC/G,SAAQ,sBAAsB;IAE9B,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CACxC,GAAG,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACzC,uBAAuB;IAE1B,SAAS,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CACvD,GAAG,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,cAAc,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,qCAAqC;IAExC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAc;IAEzC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAA0C;IAC1F,IAAI,aAAa,IAAI,MAAM,CAA2B;IACtD,IAAI,oBAAoB,IAAI,MAAM,CAAuC;IAEzE,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,2BAA2B,EAAE,MAAM,CAAC;IAC9C,IAAI,mBAAmB,IAAI,MAAM,CAAsC;IACvE,IAAI,0BAA0B,IAAI,MAAM,CAA6C;IAErF,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,sBAAsB,EAAE,CAAC;IACvE,SAAS,CAAC,2BAA2B,SAAe;IAEpD,SAAkB,mBAAmB,0BAA0B;IAE/D,QAAQ,CAAC,gBAAgB,SAAY;IACrC,QAAQ,EAAE,YAAY,CAAC;IAEvB,SAAS;IAkBH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA6BnF,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gCAAgC,CAAC;IAqBjF,kBAAkB,CACtB,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,CAAC;IA+FjC,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAUpD,SAAS,CAAC,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO;IA4B/D,SAAS,CAAC,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,IAAI;cAO3E,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB9D,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAiB/E"}
|
|
@@ -16,6 +16,7 @@ class DyNTS_ServerStatus_ControlService extends singleton_service_1.DyNTS_Single
|
|
|
16
16
|
_latestClientVersionNumeric;
|
|
17
17
|
get latestClientVersion() { return this._latestClientVersion; }
|
|
18
18
|
get latestClientVersionNumeric() { return this._latestClientVersionNumeric; }
|
|
19
|
+
connectionMaxCheckFrequency = 15 * fsm_dynamo_1.minute;
|
|
19
20
|
defaultErrorUserMsg = 'Something went wrong';
|
|
20
21
|
overseerTickTime = 6 * fsm_dynamo_1.hour;
|
|
21
22
|
overseer;
|
|
@@ -34,20 +35,48 @@ class DyNTS_ServerStatus_ControlService extends singleton_service_1.DyNTS_Single
|
|
|
34
35
|
}
|
|
35
36
|
});
|
|
36
37
|
}
|
|
37
|
-
getServerStatus(clientVersion) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
38
|
+
async getServerStatus(issuer, clientVersion) {
|
|
39
|
+
try {
|
|
40
|
+
return {
|
|
41
|
+
status: 'ready',
|
|
42
|
+
systemName: global_settings_const_1.DyNTS_global_settings.systemName,
|
|
43
|
+
systemShortCode: global_settings_const_1.DyNTS_global_settings.systemShortCodeName,
|
|
44
|
+
clientVersionOk: clientVersion ? this.clientVersionIsLatest(clientVersion) : false,
|
|
45
|
+
latestClientVersion: this.latestClientVersion,
|
|
46
|
+
latestClientVersionNumeric: this.latestClientVersionNumeric,
|
|
47
|
+
serverVersion: this.serverVersion,
|
|
48
|
+
serverNumericVersion: this.serverVersionNumeric,
|
|
49
|
+
uptime: +new Date() - +this.up,
|
|
50
|
+
memoryUsage: process.memoryUsage(),
|
|
51
|
+
cpuUsage: process.cpuUsage(),
|
|
52
|
+
serverConnections: await this.checkServerConnections(issuer),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
57
|
+
...this.getDefaultErrorSettings('getServerStatus', error, issuer),
|
|
58
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-SSCS-GSS0`,
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
async checkServerConnections(issuer) {
|
|
63
|
+
try {
|
|
64
|
+
const connections = {};
|
|
65
|
+
for (const connection of this.requiredServerConnections) {
|
|
66
|
+
if (!connection.accessible || Date.now() - connection.lastCheck.getTime() > this.connectionMaxCheckFrequency) {
|
|
67
|
+
await connection.apiService.checkServerAvailability(issuer);
|
|
68
|
+
connection.accessible = true;
|
|
69
|
+
connection.lastCheck = new Date();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return connections;
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
76
|
+
...this.getDefaultErrorSettings('checkServerConnections', error, issuer),
|
|
77
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-SSCS-CC0`,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
51
80
|
}
|
|
52
81
|
async getErrorStatistics(range, issuer) {
|
|
53
82
|
try {
|
|
@@ -132,7 +161,7 @@ class DyNTS_ServerStatus_ControlService extends singleton_service_1.DyNTS_Single
|
|
|
132
161
|
async getServerStatusSnapshot(issuer) {
|
|
133
162
|
try {
|
|
134
163
|
return ({
|
|
135
|
-
...this.getServerStatus(),
|
|
164
|
+
...(await this.getServerStatus(issuer)),
|
|
136
165
|
});
|
|
137
166
|
}
|
|
138
167
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-status.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"server-status.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,8 +41,8 @@ class DyNTS_ServerStatus_Controller extends controller_service_1.DyNTS_Controlle
|
|
|
41
41
|
type: fsm_dynamo_1.DyFM_HttpCallType.get,
|
|
42
42
|
endpoint: '/status',
|
|
43
43
|
tasks: [
|
|
44
|
-
async (req, res) => {
|
|
45
|
-
res.send(this.server_CS.getServerStatus());
|
|
44
|
+
async (req, res, issuer) => {
|
|
45
|
+
res.send(await this.server_CS.getServerStatus(issuer));
|
|
46
46
|
},
|
|
47
47
|
],
|
|
48
48
|
}),
|
|
@@ -51,8 +51,8 @@ class DyNTS_ServerStatus_Controller extends controller_service_1.DyNTS_Controlle
|
|
|
51
51
|
type: fsm_dynamo_1.DyFM_HttpCallType.get,
|
|
52
52
|
endpoint: '/health',
|
|
53
53
|
tasks: [
|
|
54
|
-
async (req, res) => {
|
|
55
|
-
res.send(this.server_CS.getServerStatus());
|
|
54
|
+
async (req, res, issuer) => {
|
|
55
|
+
res.send(await this.server_CS.getServerStatus(issuer));
|
|
56
56
|
},
|
|
57
57
|
],
|
|
58
58
|
}),
|
|
@@ -61,8 +61,8 @@ class DyNTS_ServerStatus_Controller extends controller_service_1.DyNTS_Controlle
|
|
|
61
61
|
type: fsm_dynamo_1.DyFM_HttpCallType.get,
|
|
62
62
|
endpoint: '/status/:version',
|
|
63
63
|
tasks: [
|
|
64
|
-
async (req, res) => {
|
|
65
|
-
res.send(this.server_CS.getServerStatus(req.params.version));
|
|
64
|
+
async (req, res, issuer) => {
|
|
65
|
+
res.send(await this.server_CS.getServerStatus(issuer, req.params.version));
|
|
66
66
|
},
|
|
67
67
|
],
|
|
68
68
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-status.controller.js","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.controller.ts"],"names":[],"mappings":";;;AAGA,sDAAyH;AAEzH,oFAA+E;AAC/E,iHAAsG;AACtG,uFAAoF;AAKpF;;;;;;;;;;;;GAYG;AACH,MAAsB,6BAepB,SAAQ,qCAAgB;IAQxB,mEAAmE;IAChD,mBAAmB,GAA4B,EAAE,CAAC;IAErE,cAAc;QACZ;;;;;YAKI;QAEJ,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,MAAM,IAAI,uBAAU,CAAC;gBACnB,OAAO,EAAE,iEAAiE;gBAC1E,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;aACxE,CAAC,CAAC;QACL,CAAC;QAED,mDAAmD;QAEnD,IAAI,CAAC,SAAS,GAAG;YACf,IAAI,qDAAqB,CAAC;gBACxB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,8BAAiB,CAAC,GAAG;gBAC3B,QAAQ,EAAE,SAAS;gBACnB,KAAK,EAAE;oBACL,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;
|
|
1
|
+
{"version":3,"file":"server-status.controller.js","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.controller.ts"],"names":[],"mappings":";;;AAGA,sDAAyH;AAEzH,oFAA+E;AAC/E,iHAAsG;AACtG,uFAAoF;AAKpF;;;;;;;;;;;;GAYG;AACH,MAAsB,6BAepB,SAAQ,qCAAgB;IAQxB,mEAAmE;IAChD,mBAAmB,GAA4B,EAAE,CAAC;IAErE,cAAc;QACZ;;;;;YAKI;QAEJ,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,MAAM,IAAI,uBAAU,CAAC;gBACnB,OAAO,EAAE,iEAAiE;gBAC1E,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;aACxE,CAAC,CAAC;QACL,CAAC;QAED,mDAAmD;QAEnD,IAAI,CAAC,SAAS,GAAG;YACf,IAAI,qDAAqB,CAAC;gBACxB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,8BAAiB,CAAC,GAAG;gBAC3B,QAAQ,EAAE,SAAS;gBACnB,KAAK,EAAE;oBACL,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,MAAc,EAAiB,EAAE;wBACnE,GAAG,CAAC,IAAI,CACN,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAC7C,CAAC;oBACJ,CAAC;iBACF;aACF,CAAC;YAEF,IAAI,qDAAqB,CAAC;gBACxB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,8BAAiB,CAAC,GAAG;gBAC3B,QAAQ,EAAE,SAAS;gBACnB,KAAK,EAAE;oBACL,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,MAAc,EAAiB,EAAE;wBACnE,GAAG,CAAC,IAAI,CACN,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAC7C,CAAC;oBACJ,CAAC;iBACF;aACF,CAAC;YAEF,IAAI,qDAAqB,CAAC;gBACxB,IAAI,EAAE,0BAA0B;gBAChC,IAAI,EAAE,8BAAiB,CAAC,GAAG;gBAC3B,QAAQ,EAAE,kBAAkB;gBAC5B,KAAK,EAAE;oBACL,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,MAAc,EAAiB,EAAE;wBAEnE,GAAG,CAAC,IAAI,CACN,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CACjE,CAAC;oBACJ,CAAC;iBACF;aACF,CAAC;YAEF,IAAI,qDAAqB,CAAC;gBACxB,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,8BAAiB,CAAC,GAAG;gBAC3B,QAAQ,EAAE,0BAA0B;gBACpC,KAAK,EAAE;oBACL,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,MAAc,EAAkB,EAAE;wBAEpE,GAAG,CAAC,IAAI,CACN,MAAM,IAAI,CAAC,SAAS,CAAC,kBAAkB,CACrC,GAAG,CAAC,MAAM,CAAC,KAA0B,EACrC,MAAM,CACP,CACF,CAAC;oBACJ,CAAC;iBACF;aACF,CAAC;YAEF,GAAG,IAAI,CAAC,mBAAmB;SAC5B,CAAC;IACJ,CAAC;CACF;AAxGD,sEAwGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,oBAAoB,EACrB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,WAAW,yBAAyB,CAAC,MAAM,GAAG,GAAG;IACrD,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAGH;IAEhC;;;;;;;OAOG;WACiB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IACvD;;;OAGG;IACH,UAAU,EAAE,oBAAoB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAC9C,OAAO,CAAC,UAAU,CAA6B;IAiJlD,OAAO,CAAC,MAAM,CAAC,WAAW;mBAqKL,YAAY;mBA4BZ,MAAM;mBAwBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,gBAAgB;IA2D/B,OAAO,CAAC,MAAM,CAAC,eAAe;IA0D9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAexC"}
|
|
@@ -157,12 +157,14 @@ class DyNTS_ApiService {
|
|
|
157
157
|
let msg = `\n---> API ERROR: "${callParams?.name}" failed (${fsm_dynamo_1.DyFM_Error.getErrorStatus(error)})...` +
|
|
158
158
|
`\n endpoint: ${callParams?.type} "${callParams?.baseUrl}${callParams?.endpoint}"` +
|
|
159
159
|
`\n BE-BE requestStackLocation: "${callParams?.stack}"` +
|
|
160
|
-
`\n error: "${fsm_dynamo_1.DyFM_Error.getAnyMessage(error)}"
|
|
160
|
+
`\n error: "${fsm_dynamo_1.DyFM_Error.getAnyMessage(error)}"` +
|
|
161
|
+
(error?.__localStack ? `\n error localStack: "${error?.__localStack}"` : '') +
|
|
162
|
+
`\n localStack: "${(0, fsm_dynamo_1.DyFM_getLocalStackLocation)(1)}"`;
|
|
161
163
|
if (global_settings_const_1.DyNTS_global_settings.log_settings.detailedErrors) {
|
|
162
|
-
fsm_dynamo_1.DyFM_Log.
|
|
164
|
+
fsm_dynamo_1.DyFM_Log.S_error(`${msg}\ncallParams:`, callParams);
|
|
163
165
|
}
|
|
164
166
|
else {
|
|
165
|
-
fsm_dynamo_1.DyFM_Log.
|
|
167
|
+
fsm_dynamo_1.DyFM_Log.S_error(msg);
|
|
166
168
|
}
|
|
167
169
|
try {
|
|
168
170
|
const strError = JSON.stringify(error);
|
|
@@ -231,7 +233,8 @@ class DyNTS_ApiService {
|
|
|
231
233
|
+error?.message?.match?.(/status code (\d{3})/)?.[1] ||
|
|
232
234
|
500;
|
|
233
235
|
if (error?.message?.includes('status code')) {
|
|
234
|
-
msg +=
|
|
236
|
+
msg += `"${callParams.name}"` +
|
|
237
|
+
`\nendpoint: ${callParams.type} "${callParams.baseUrl}${callParams.endpoint}"` +
|
|
235
238
|
`\nurl: ${url}` +
|
|
236
239
|
`\npathParams: ${inputParams?.pathParams ?
|
|
237
240
|
Object.keys(inputParams.pathParams).join(', ') :
|
|
@@ -251,13 +254,18 @@ class DyNTS_ApiService {
|
|
|
251
254
|
});
|
|
252
255
|
}
|
|
253
256
|
else {
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
257
|
+
fsm_dynamo_1.DyFM_Error.logSimple(`"${callParams.name}" api call was UNSUCCESSFUL`, error);
|
|
258
|
+
/* if (
|
|
259
|
+
DyNTS_global_settings.log_settings.detailedErrors ||
|
|
260
|
+
!(error instanceof DyFM_Error)
|
|
261
|
+
) {
|
|
262
|
+
DyFM_Log.error(
|
|
263
|
+
`"${callParams.name}" api call was UNSUCCESSFUL`,
|
|
264
|
+
'\nERROR:', error
|
|
265
|
+
);
|
|
266
|
+
} else {
|
|
267
|
+
error.logSimple(`"${callParams.name}" api call was UNSUCCESSFUL`);
|
|
268
|
+
} */
|
|
261
269
|
throw error;
|
|
262
270
|
}
|
|
263
271
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":";;;;AACA,qDAA+B;AAE/B,sDAQ+B;AAE/B,oFAAiF;AAkBjF;;GAEG;AACH,MAAa,gBAAgB;IAE3B,MAAM,CAAU,mBAAmB,GACjC,sCAAsC;QACtC,sDAAsD;QACtD,6BAA6B,CAAC;IAEhC;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,YAAY;IAC9B;;;OAGG;IACH,UAAgC;IAChC;;OAEG;IACH,WAA+C;QAE/C,IAAI,GAAW,CAAC;QAEhB,IAAI,CAAC;YACH,IAAI,CAAa,CAAC;YAClB,GAAG,GAAG,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC;YAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAErC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxB,qBAAQ,CAAC,IAAI,CAAC,yCAAyC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;YAC7E,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACzB,qBAAQ,CAAC,IAAI,CAAC,0CAA0C,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;YAC9E,CAAC;YAED,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBACpC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACrC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpC,MAAM,IAAI,uBAAU,CAAC;4BACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,cAAc,EACd,IAAI,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,CACzC;4BACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,iBAAiB;yBACzE,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,UAAU,EAAE,WAAW,EAAE,CAAC;gBAC5B,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC3C,CAAC;YAED,IAAI,WAAW,EAAE,UAAU,EAAE,CAAC;gBAC5B,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAC1D,CAAC;YAED;;gBAEI;YAEJ,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;YAC9C,CAAC;YAED,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,8BAAiB,CAAC,GAAG;oBACxB,IAAI,WAAW,EAAE,IAAI,EAAE,CAAC;wBACtB,qBAAQ,CAAC,IAAI,CAAC,4CAA4C,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;oBAChF,CAAC;oBAED,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAa,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBACvD,MAAM;gBAER,KAAK,8BAAiB,CAAC,MAAM;oBAC3B,IAAI,WAAW,EAAE,IAAI,EAAE,CAAC;wBACtB,qBAAQ,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;oBAC9D,CAAC;oBAED,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAa,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBAC1D,MAAM;gBAER,KAAK,8BAAiB,CAAC,IAAI,CAAC;gBAC5B,KAAK,8BAAiB,CAAC,GAAG,CAAC;gBAC3B,KAAK,8BAAiB,CAAC,KAAK;oBAC1B,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;wBACvB,IAAI,CAAC,WAAW,EAAE,CAAC;4BACjB,WAAW,GAAG,EAAE,CAAC;wBACnB,CAAC;wBAED,WAAW,CAAC,IAAI,GAAG,EAAY,CAAC;oBAClC,CAAC;oBAED,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAqB,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;oBACrF,MAAM;gBAER;oBACE,MAAM,IAAI,uBAAU,CAAC;wBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,cAAc,EACd,IAAI,KAAK,CAAC,0BAA0B,UAAU,CAAC,IAAI,EAAE,CAAC,CACvD;wBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,iBAAiB;wBACxE,iBAAiB,EAAE;4BACjB,UAAU;4BACV,WAAW;yBACZ;qBACF,CAAC,CAAC;YACP,CAAC;YAED,IAAK,CAAgB,EAAE,IAAI,EAAE,QAAQ,CAAC,2BAAc,CAAC,EAAE,CAAC;gBACtD,MAAM,CAAC,CAAC;YACV,CAAC;YAED,OAAO,CAAC,CAAC;YACT;;;;;gBAKI;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAK,KAAoB,EAAE,IAAI,EAAE,QAAQ,CAAC,2BAAc,CAAC,EAAE,CAAC;gBAC1D,MAAM,KAAK,CAAC;gBACd;;;;;;;;;kCASkB;YAClB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,WAAW,CAAS,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;QAsBI;IAEI,MAAM,CAAC,WAAW,CACxB,UAAgC,EAChC,KAAuC,EACvC,WAMC,EACD,GAAW;QAEX,MAAM,QAAQ,GAAW,uBAAU,CAAC,WAAW,CAAE,KAA0B,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5F,uBAAU,CAAC,aAAa,CAAE,KAA0B,EAAE,QAAQ,EAAE,IAAqB,CAAC,CAAC,CAAC;YACxF,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAElC,IAAI,GAAG,GACL,wBAAwB,UAAU,EAAE,IAAI,aAAa,uBAAU,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM;YAC3F,wBAAwB,UAAU,EAAE,IAAI,KAAK,UAAU,EAAE,OAAO,GAAG,UAAU,EAAE,QAAQ,GAAG;YAC1F,2CAA2C,UAAU,EAAE,KAAK,GAAG;YAC/D,sBAAsB,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC;QAE3D,IAAI,6CAAqB,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;YACtD,qBAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,eAAe,EAAE,UAAU,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,qBAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,QAAQ,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;gBAC3B,GAAG,IAAI,kBAAkB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/D,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,qBAAQ,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC1C,CAAC;QAED,IACE,KAAK;YACL,OAAQ,KAAoB,EAAE,KAAK,KAAK,QAAQ;YAChD,UAAU,EAAE,WAAW,EAAE,YAAY,KAAK,kCAAqB,CAAC,IAAI,EACpE,CAAC;YACA,KAAoB,CAAC,KAAK,GAAG,wBAAW,CAAC,qBAAqB,CAC5D,KAAoB,EAAE,KAAsB,CAC9C,CAAC;QACJ,CAAC;QAED,IAAI,uBAAU,CAAC,WAAW,CAAE,KAA0B,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;YACxE,qBAAQ,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YAE9E,MAAM,wBAAwB,GAAI,KAA0B,EAAE,QAAQ,EAAE,IAAqB,CAAC;YAE9F,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,wBAAwB,CACzB;gBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EACL,aAAa,UAAU,CAAC,IAAI,4BAA4B;oBACxD,2BAA2B,QAAQ,EAAE;gBACvC,KAAK,EAAE,wBAAwB;gBAC/B,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QAEL,CAAC;aAAM,IAAK,KAA0B,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YAC7D,qBAAQ,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YAE9E,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,KAAK,CACN;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EAAE,wCAAwC;gBACjD,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QAEL,CAAC;aAAM,IAAK,KAA0B,EAAE,IAAI,KAAK,cAAc,EAAE,CAAC;YAChE,qBAAQ,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YAE9E,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,KAAK,CACN;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EAAE,qCAAqC,UAAU,CAAC,IAAI,KAAK,GAAG,IAAI;gBACzE,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,GAAG,EAAE,GAAG;oBACR,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QAEL,CAAC;aAAM,IAAK,KAA0B,EAAE,MAAM,IAAK,KAA0B,EAAE,OAAO,EAAE,CAAC;YAEvF,IAAI,GAAG,GAAY,KAA0B,EAAE,OAAO,CAAC;YACvD,IAAI,MAAM,GAAY,KAA0B,EAAE,QAAQ,EAAE,MAAM;gBAC/D,KAA0B,EAAE,MAAM;gBACnC,yFAAyF;gBACzF,CAAE,KAA0B,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1E,GAAG,CAAC;YAEN,IAAK,KAA0B,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAClE,GAAG,IAAI,eAAe,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE;oBAC9D,UAAU,GAAG,EAAE;oBACf,iBACE,WAAW,EAAE,UAAU,CAAC,CAAC;wBACvB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;wBAChD,kBACJ,EAAE;oBACF,2BAA2B,UAAU,CAAC,KAAK,EAAE,CAAC;YAClD,CAAC;YAED,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,KAAK,CACN;gBAED,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,GAAG;gBACZ,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IACE,6CAAqB,CAAC,YAAY,CAAC,cAAc;gBACjD,CAAC,CAAC,KAAK,YAAY,uBAAU,CAAC,EAC9B,CAAC;gBACD,qBAAQ,CAAC,KAAK,CACZ,IAAI,UAAU,CAAC,IAAI,6BAA6B,EAChD,UAAU,EAAE,KAAK,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,IAAI,6BAA6B,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,YAAY,CAC/B,KAA0B,EAC1B,UAAgC,EAChC,GAAW,EACX,WAA8C;QAE9C,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CACjC,GAAG,EACH,WAAW,CAAC,IAAI,EAChB,UAAU,CAAC,WAAW,CACvB,CAAC,IAAI,CAAC,CAAC,GAAwB,EAAc,EAAE;YAC9C,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,6CAAqB,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;oBAC5D,qBAAQ,CAAC,OAAO,CAAC,WAAW,UAAU,CAAC,IAAI,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEpF,CAAC;qBAAM,CAAC;oBACN,qBAAQ,CAAC,OAAO,CAAC,WAAW,UAAU,CAAC,IAAI,2BAA2B,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC/B,OAAO,GAAiB,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,CAAC,IAAI,CAAC;YAClB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,MAAM,CACzB,KAA0B,EAC1B,GAAW,EACX,UAAgC;QAEhC,OAAO,MAAM,KAAK,CAAC,MAAM,CAAa,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CACrE,CAAC,GAAwB,EAAc,EAAE;YACvC,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,6CAAqB,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;oBAC5D,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC7E,CAAC;qBAAM,CAAC;oBACN,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC/B,OAAO,GAAiB,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,CAAC,IAAI,CAAC;YAClB,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,GAAG,CACtB,KAA0B,EAC1B,GAAW,EACX,UAAgC;QAEhC,OAAO,MAAM,KAAK,CAAC,GAAG,CAAa,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAClE,CAAC,GAAwB,EAAc,EAAE;YACvC,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,6CAAqB,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;oBAC5D,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC7E,CAAC;qBAAM,CAAC;oBACN,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC/B,OAAO,GAAiB,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,CAAC,IAAI,CAAC;YAClB,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,QAAQ,CACrB,GAAW,EACX,WAA8C,EAC9C,UAAgC;QAEhC,IAAI,6CAAqB,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;YAC3D,qBAAQ,CAAC,GAAG,CACV,8BAA8B,UAAU,EAAE,IAAI,IAAI;gBAClD,MAAM,GAAG,GAAG;gBACZ,SAAS,EAAE,WAAW,EAAE,IAAI,CAC7B,CAAC;QAEJ,CAAC;aAAM,CAAC;YACN,qBAAQ,CAAC,GAAG,CAAC,8BAA8B,UAAU,EAAE,IAAI,GAAG,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,6CAAqB,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;YAC3D,qBAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YACxC,qBAAQ,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC3B,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;gBACxC,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,IAAI;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAC7B,UAAgC,EAChC,KAA0B;QAE1B,+BAA+B;QAC/B,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,qBAAQ,CAAC,KAAK,CACZ,0GAA0G,UAAU,CAAC,IAAI,GAAG,EAC5H,YAAY,EAAE,UAAU,CAAC,KAAK,CAC/B,CAAC;YAEF,OAAO;QACT,CAAC;QAED,cAAc;QACd,IAAI,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;YACpC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC;YAErC,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBACvD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC/C,MAAM,IAAI,uBAAU,CAAC;wBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,cAAc,EACd,IAAI,KAAK,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAC1C;wBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;qBACxE,CAAC,CAAC;gBACL,CAAC;gBAED,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACvF,CAAC;QACH,CAAC;QAED,wCAAwC;QACxC,IAAI,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC;YACvC,KAAK,CAAC,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC;QAChE,CAAC;QAED,IAAI,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC;YACtC,KAAK,CAAC,QAAQ,CAAC,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC;QAC9D,CAAC;QAED,IAAI,UAAU,CAAC,WAAW,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;YAClD,KAAK,CAAC,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC;QAC1D,CAAC;QAED,IAAI,UAAU,CAAC,WAAW,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;YACvD,KAAK,CAAC,QAAQ,CAAC,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC;QACpE,CAAC;QAED,IAAI,UAAU,CAAC,WAAW,EAAE,eAAe,KAAK,SAAS,EAAE,CAAC;YAC1D,KAAK,CAAC,QAAQ,CAAC,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC;QAC1E,CAAC;QAED,IAAI,UAAU,CAAC,WAAW,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;YACvD,KAAK,CAAC,QAAQ,CAAC,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC;QACpE,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,eAAe,CAC5B,UAAwC,EACxC,GAAW;QAEX,KAAK,MAAM,YAAY,IAAI,UAAU,EAAE,CAAC;YACtC,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC7B,MAAM,SAAS,GAAG,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;gBAElD,QAAQ,SAAS,EAAE,CAAC;oBAClB,KAAK,QAAQ;wBACX,GAAG,GAAG,GAAG,CAAC,OAAO,CACf,IAAI,YAAY,EAAE,EAClB,UAAU,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CACpC,CAAC;wBACF,MAAM;oBAER,KAAK,QAAQ;wBACX,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,YAAY,EAAE,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;wBAChE,MAAM;oBAER;wBACE;;;;;;;6BAOK;wBACL,MAAM,IAAI,uBAAU,CAAC;4BACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,iBAAiB,EACjB,IAAI,KAAK,CACP,2BAA2B,YAAY,OAAO,SAAS,GAAG;gCAC1D,KAAK,UAAU,CAAC,YAAY,CAAC,EAAE,CAChC,CACF;4BACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;4BACvE,iBAAiB,EAAE;gCACjB,UAAU,EAAE,UAAU;gCACtB,GAAG,EAAE,GAAG;6BACT;yBACF,CAAC,CAAC;gBACP,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,iBAAiB,EACjB,IAAI,KAAK,CAAC,uBAAuB,YAAY,GAAG,CAAC,CAClD;oBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;iBACxE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,MAAM,CAAC,wBAAwB,CACrC,MAAc,EACd,KAAoB;QAEpB,OAAO;YACL,MAAM,EAAG,KAAoB,EAAE,SAAS,IAAI,GAAG;YAC/C,OAAO,EAAG,KAAe,EAAE,OAAO;gBAC/B,KAAoB,EAAE,QAAQ;gBAC/B,GAAG,MAAM,yBAAyB;YACpC,cAAc,EAAE,CAAE,KAAoB,EAAE,aAAa;YACrD,WAAW,EAAG,KAAoB,EAAE,aAAa,IAAI,IAAI,CAAC,mBAAmB;YAC7E,aAAa,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,IAAI,IAAI,IAAI,EAAE,IAAI,mBAAmB;YAC1E,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;;AAnjBH,4CAojBC"}
|
|
1
|
+
{"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.14.
|
|
3
|
+
"version": "01.14.53",
|
|
4
4
|
"description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
|
|
5
5
|
"DyBu_settings": {
|
|
6
6
|
"packageType": "server-package",
|
|
@@ -271,12 +271,12 @@
|
|
|
271
271
|
},
|
|
272
272
|
"homepage": "https:/futdevpro.hu/projects/dynamo",
|
|
273
273
|
"DISABLED": {
|
|
274
|
-
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.14.
|
|
274
|
+
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.14.24.tgz",
|
|
275
275
|
|
|
276
276
|
"empty": ""
|
|
277
277
|
},
|
|
278
278
|
"peerDependencies": {
|
|
279
|
-
"@futdevpro/fsm-dynamo": "1.14.
|
|
279
|
+
"@futdevpro/fsm-dynamo": "1.14.24",
|
|
280
280
|
|
|
281
281
|
"@types/express": "4.17.21",
|
|
282
282
|
"@types/geoip-lite": "~1.4.1",
|
|
@@ -292,7 +292,7 @@
|
|
|
292
292
|
"ts-node": "~10.9.2"
|
|
293
293
|
},
|
|
294
294
|
"devDependencies": {
|
|
295
|
-
"@futdevpro/dynamo-eslint": "1.14.
|
|
295
|
+
"@futdevpro/dynamo-eslint": "1.14.20",
|
|
296
296
|
"@discordjs/opus": "^0.10.0",
|
|
297
297
|
"@discordjs/voice": "^0.18.0",
|
|
298
298
|
"@types/jasmine": "~4.3.5",
|
|
@@ -279,7 +279,8 @@ export class DyNTS_Errors_DataService<
|
|
|
279
279
|
|
|
280
280
|
await this.recordError(errorsRecord, this.issuer, alwaysRecord);
|
|
281
281
|
|
|
282
|
-
|
|
282
|
+
DyFM_Error.logSimple(`DyNTS_Error_DataService handling InternalError...`, error);
|
|
283
|
+
/* if (
|
|
283
284
|
DyNTS_global_settings.log_settings.highDetailedLogs ||
|
|
284
285
|
!(error instanceof DyFM_Error)
|
|
285
286
|
) {
|
|
@@ -291,13 +292,14 @@ export class DyNTS_Errors_DataService<
|
|
|
291
292
|
error.logSimple(
|
|
292
293
|
`DyNTS_Error_DataService handling InternalError...`
|
|
293
294
|
);
|
|
294
|
-
}
|
|
295
|
+
} */
|
|
295
296
|
} catch (error) {
|
|
296
|
-
|
|
297
|
+
DyFM_Error.logSimple('handleInternalError error', error);
|
|
298
|
+
/* if (error instanceof DyFM_Error) {
|
|
297
299
|
error.logSimple('handleInternalError error');
|
|
298
300
|
} else {
|
|
299
301
|
DyFM_Log.error('handleInternalError error:', error);
|
|
300
|
-
}
|
|
302
|
+
} */
|
|
301
303
|
}
|
|
302
304
|
}
|
|
303
305
|
|
|
@@ -309,11 +311,12 @@ export class DyNTS_Errors_DataService<
|
|
|
309
311
|
|
|
310
312
|
JSON.stringify(error);
|
|
311
313
|
} catch (err) {
|
|
312
|
-
|
|
314
|
+
DyFM_Error.logSimple('checkErrorIsStringifyableOrResolvable error', err);
|
|
315
|
+
/* if (err instanceof DyFM_Error) {
|
|
313
316
|
err.logSimple('checkErrorIsStringifyableOrResolvable error');
|
|
314
317
|
} else {
|
|
315
318
|
DyFM_Log.error('checkErrorIsStringifyableOrResolvable error:', err);
|
|
316
|
-
}
|
|
319
|
+
} */
|
|
317
320
|
|
|
318
321
|
error = DyFM_Object.resolveCirculation(error);
|
|
319
322
|
|
|
@@ -324,12 +327,13 @@ export class DyNTS_Errors_DataService<
|
|
|
324
327
|
|
|
325
328
|
try {
|
|
326
329
|
JSON.stringify(error);
|
|
327
|
-
} catch (
|
|
328
|
-
|
|
330
|
+
} catch (errr) {
|
|
331
|
+
DyFM_Error.logSimple('checkErrorIsStringifyableOrResolvable error', errr);
|
|
332
|
+
/* if (err instanceof DyFM_Error) {
|
|
329
333
|
err.logSimple('error data is not stringifyable! resolution failed! will not save!');
|
|
330
334
|
} else {
|
|
331
335
|
DyFM_Log.error('error data is not stringifyable! resolution failed! will not save!', err);
|
|
332
|
-
}
|
|
336
|
+
} */
|
|
333
337
|
|
|
334
338
|
return 'UNRESOLVABLE';
|
|
335
339
|
}
|
|
@@ -4,7 +4,8 @@ import {
|
|
|
4
4
|
DyFM_Metadata, DyFM_RelativeDate, DyFM_Time, DyFM_ServerStatus, DyFM_ErrorLevel, DyFM_Log,
|
|
5
5
|
DyFM_Error, DyFM_Error_Statistics, DyFM_Errors,
|
|
6
6
|
DyFM_Paged,
|
|
7
|
-
hour
|
|
7
|
+
hour, minute,
|
|
8
|
+
DyFM_ServerConnectionCheckResult
|
|
8
9
|
} from '@futdevpro/fsm-dynamo';
|
|
9
10
|
import { Subscription, timer } from 'rxjs';
|
|
10
11
|
|
|
@@ -14,8 +15,14 @@ import { DyNTS_global_settings } from '../../../_collections/global-settings.con
|
|
|
14
15
|
import { DyNTS_Errors_ControlService } from '../errors/errors.control-service';
|
|
15
16
|
import { DyNTS_ServerStatusSnapshot_ControlService } from './server-status-snapshot.control-service';
|
|
16
17
|
import { DyNTS_GlobalService } from '../../../_services/core/global.service';
|
|
18
|
+
import { DyNTS_ApiService_Base } from '../../../_services/base/api.service-base';
|
|
17
19
|
|
|
18
|
-
|
|
20
|
+
interface DyNTS_ServerConnection {
|
|
21
|
+
name: string,
|
|
22
|
+
apiService: DyNTS_ApiService_Base,
|
|
23
|
+
accessible?: boolean,
|
|
24
|
+
lastCheck?: Date,
|
|
25
|
+
}
|
|
19
26
|
|
|
20
27
|
export abstract class DyNTS_ServerStatus_ControlService<
|
|
21
28
|
T_ServerStatus extends DyFM_ServerStatus,
|
|
@@ -45,6 +52,9 @@ export abstract class DyNTS_ServerStatus_ControlService<
|
|
|
45
52
|
get latestClientVersion(): string { return this._latestClientVersion; }
|
|
46
53
|
get latestClientVersionNumeric(): number { return this._latestClientVersionNumeric; }
|
|
47
54
|
|
|
55
|
+
protected abstract requiredServerConnections: DyNTS_ServerConnection[];
|
|
56
|
+
protected connectionMaxCheckFrequency = 15 * minute;
|
|
57
|
+
|
|
48
58
|
override readonly defaultErrorUserMsg = 'Something went wrong';
|
|
49
59
|
|
|
50
60
|
readonly overseerTickTime = 6 * hour;
|
|
@@ -68,25 +78,54 @@ export abstract class DyNTS_ServerStatus_ControlService<
|
|
|
68
78
|
});
|
|
69
79
|
}
|
|
70
80
|
|
|
71
|
-
getServerStatus(clientVersion?: string): DyFM_ServerStatus {
|
|
72
|
-
|
|
73
|
-
|
|
81
|
+
async getServerStatus(issuer: string, clientVersion?: string): Promise<DyFM_ServerStatus> {
|
|
82
|
+
try {
|
|
83
|
+
return {
|
|
84
|
+
status: 'ready',
|
|
85
|
+
|
|
86
|
+
systemName: DyNTS_global_settings.systemName,
|
|
87
|
+
systemShortCode: DyNTS_global_settings.systemShortCodeName,
|
|
74
88
|
|
|
75
|
-
|
|
76
|
-
|
|
89
|
+
clientVersionOk: clientVersion ? this.clientVersionIsLatest(clientVersion) : false,
|
|
90
|
+
latestClientVersion: this.latestClientVersion,
|
|
91
|
+
latestClientVersionNumeric: this.latestClientVersionNumeric,
|
|
77
92
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
latestClientVersionNumeric: this.latestClientVersionNumeric,
|
|
93
|
+
serverVersion: this.serverVersion,
|
|
94
|
+
serverNumericVersion: this.serverVersionNumeric,
|
|
81
95
|
|
|
82
|
-
|
|
83
|
-
|
|
96
|
+
uptime: +new Date() - +this.up,
|
|
97
|
+
|
|
98
|
+
memoryUsage: process.memoryUsage(),
|
|
99
|
+
cpuUsage: process.cpuUsage(),
|
|
100
|
+
serverConnections: await this.checkServerConnections(issuer),
|
|
101
|
+
}
|
|
102
|
+
} catch (error) {
|
|
103
|
+
throw new DyFM_Error({
|
|
104
|
+
...this.getDefaultErrorSettings('getServerStatus', error, issuer),
|
|
105
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-SSCS-GSS0`,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
}
|
|
84
109
|
|
|
85
|
-
|
|
110
|
+
async checkServerConnections(issuer: string): Promise<DyFM_ServerConnectionCheckResult> {
|
|
111
|
+
try {
|
|
112
|
+
const connections: DyFM_ServerConnectionCheckResult = {};
|
|
113
|
+
|
|
114
|
+
for (const connection of this.requiredServerConnections) {
|
|
115
|
+
if (!connection.accessible || Date.now() - connection.lastCheck.getTime() > this.connectionMaxCheckFrequency) {
|
|
116
|
+
await connection.apiService.checkServerAvailability(issuer);
|
|
117
|
+
connection.accessible = true;
|
|
118
|
+
connection.lastCheck = new Date();
|
|
119
|
+
}
|
|
120
|
+
}
|
|
86
121
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
122
|
+
return connections;
|
|
123
|
+
} catch (error) {
|
|
124
|
+
throw new DyFM_Error({
|
|
125
|
+
...this.getDefaultErrorSettings('checkServerConnections', error, issuer),
|
|
126
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-SSCS-CC0`,
|
|
127
|
+
});
|
|
128
|
+
}
|
|
90
129
|
}
|
|
91
130
|
|
|
92
131
|
async getErrorStatistics(
|
|
@@ -252,7 +291,7 @@ export abstract class DyNTS_ServerStatus_ControlService<
|
|
|
252
291
|
async getServerStatusSnapshot(issuer: string): Promise<T_ServerStatusSnapshot> {
|
|
253
292
|
try {
|
|
254
293
|
return ({
|
|
255
|
-
...this.getServerStatus(),
|
|
294
|
+
...(await this.getServerStatus(issuer)),
|
|
256
295
|
}) as T_ServerStatusSnapshot;
|
|
257
296
|
} catch (error) {
|
|
258
297
|
throw new DyFM_Error({
|
|
@@ -72,9 +72,9 @@ export abstract class DyNTS_ServerStatus_Controller<
|
|
|
72
72
|
type: DyFM_HttpCallType.get,
|
|
73
73
|
endpoint: '/status',
|
|
74
74
|
tasks: [
|
|
75
|
-
async (req: Request, res: Response): Promise<void> => {
|
|
75
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
76
76
|
res.send(
|
|
77
|
-
this.server_CS.getServerStatus()
|
|
77
|
+
await this.server_CS.getServerStatus(issuer)
|
|
78
78
|
);
|
|
79
79
|
},
|
|
80
80
|
],
|
|
@@ -85,9 +85,9 @@ export abstract class DyNTS_ServerStatus_Controller<
|
|
|
85
85
|
type: DyFM_HttpCallType.get,
|
|
86
86
|
endpoint: '/health',
|
|
87
87
|
tasks: [
|
|
88
|
-
async (req: Request, res: Response): Promise<void> => {
|
|
88
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
89
89
|
res.send(
|
|
90
|
-
this.server_CS.getServerStatus()
|
|
90
|
+
await this.server_CS.getServerStatus(issuer)
|
|
91
91
|
);
|
|
92
92
|
},
|
|
93
93
|
],
|
|
@@ -98,10 +98,10 @@ export abstract class DyNTS_ServerStatus_Controller<
|
|
|
98
98
|
type: DyFM_HttpCallType.get,
|
|
99
99
|
endpoint: '/status/:version',
|
|
100
100
|
tasks: [
|
|
101
|
-
async (req: Request, res: Response): Promise<void> => {
|
|
101
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
102
102
|
|
|
103
103
|
res.send(
|
|
104
|
-
this.server_CS.getServerStatus(req.params.version)
|
|
104
|
+
await this.server_CS.getServerStatus(issuer, req.params.version)
|
|
105
105
|
);
|
|
106
106
|
},
|
|
107
107
|
],
|
|
@@ -8,7 +8,8 @@ import {
|
|
|
8
8
|
DyFM_HttpCallType, DyFM_HttpResponseType,
|
|
9
9
|
DyFM_Log,
|
|
10
10
|
DyFM_HttpErrorResponse,
|
|
11
|
-
DyFM_Object
|
|
11
|
+
DyFM_Object,
|
|
12
|
+
DyFM_getLocalStackLocation
|
|
12
13
|
} from '@futdevpro/fsm-dynamo';
|
|
13
14
|
|
|
14
15
|
import { DyNTS_global_settings } from '../../_collections/global-settings.const';
|
|
@@ -222,12 +223,14 @@ export class DyNTS_ApiService {
|
|
|
222
223
|
`\n---> API ERROR: "${callParams?.name}" failed (${DyFM_Error.getErrorStatus(error)})...` +
|
|
223
224
|
`\n endpoint: ${callParams?.type} "${callParams?.baseUrl}${callParams?.endpoint}"` +
|
|
224
225
|
`\n BE-BE requestStackLocation: "${callParams?.stack}"` +
|
|
225
|
-
`\n error: "${DyFM_Error.getAnyMessage(error)}"
|
|
226
|
+
`\n error: "${DyFM_Error.getAnyMessage(error)}"` +
|
|
227
|
+
((error as DyFM_Error)?.__localStack ? `\n error localStack: "${(error as DyFM_Error)?.__localStack}"` : '') +
|
|
228
|
+
`\n localStack: "${DyFM_getLocalStackLocation(1)}"`;
|
|
226
229
|
|
|
227
230
|
if (DyNTS_global_settings.log_settings.detailedErrors) {
|
|
228
|
-
DyFM_Log.
|
|
231
|
+
DyFM_Log.S_error(`${msg}\ncallParams:`, callParams);
|
|
229
232
|
} else {
|
|
230
|
-
DyFM_Log.
|
|
233
|
+
DyFM_Log.S_error(msg);
|
|
231
234
|
}
|
|
232
235
|
|
|
233
236
|
try {
|
|
@@ -321,7 +324,8 @@ export class DyNTS_ApiService {
|
|
|
321
324
|
500;
|
|
322
325
|
|
|
323
326
|
if ((error as Axios.AxiosError)?.message?.includes('status code')) {
|
|
324
|
-
msg +=
|
|
327
|
+
msg += `"${callParams.name}"` +
|
|
328
|
+
`\nendpoint: ${callParams.type} "${callParams.baseUrl}${callParams.endpoint}"` +
|
|
325
329
|
`\nurl: ${url}` +
|
|
326
330
|
`\npathParams: ${
|
|
327
331
|
inputParams?.pathParams ?
|
|
@@ -347,7 +351,8 @@ export class DyNTS_ApiService {
|
|
|
347
351
|
},
|
|
348
352
|
});
|
|
349
353
|
} else {
|
|
350
|
-
|
|
354
|
+
DyFM_Error.logSimple(`"${callParams.name}" api call was UNSUCCESSFUL`, error);
|
|
355
|
+
/* if (
|
|
351
356
|
DyNTS_global_settings.log_settings.detailedErrors ||
|
|
352
357
|
!(error instanceof DyFM_Error)
|
|
353
358
|
) {
|
|
@@ -357,7 +362,7 @@ export class DyNTS_ApiService {
|
|
|
357
362
|
);
|
|
358
363
|
} else {
|
|
359
364
|
error.logSimple(`"${callParams.name}" api call was UNSUCCESSFUL`);
|
|
360
|
-
}
|
|
365
|
+
} */
|
|
361
366
|
|
|
362
367
|
throw error;
|
|
363
368
|
}
|