@futdevpro/nts-dynamo 1.10.11 → 1.10.14
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/error/error.controller.d.ts +25 -2
- package/build/_modules/server/error/error.controller.d.ts.map +1 -1
- package/build/_modules/server/error/error.controller.js +23 -1
- package/build/_modules/server/error/error.controller.js.map +1 -1
- package/build/_modules/server/error/error.data-service.d.ts +15 -7
- package/build/_modules/server/error/error.data-service.d.ts.map +1 -1
- package/build/_modules/server/error/error.data-service.js +7 -26
- package/build/_modules/server/error/error.data-service.js.map +1 -1
- package/build/_modules/server/server-status/server-status.control-service.d.ts +4 -4
- 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.map +1 -1
- package/build/_modules/server/server-status/server-status.controller.d.ts +16 -1
- package/build/_modules/server/server-status/server-status.controller.d.ts.map +1 -1
- package/build/_modules/server/server-status/server-status.controller.js +13 -0
- package/build/_modules/server/server-status/server-status.controller.js.map +1 -1
- package/package.json +3 -3
- package/src/_modules/server/error/error.controller.ts +26 -4
- package/src/_modules/server/error/error.data-service.ts +36 -52
- package/src/_modules/server/server-status/server-status.control-service.ts +27 -25
- package/src/_modules/server/server-status/server-status.controller.ts +26 -4
|
@@ -1,8 +1,31 @@
|
|
|
1
|
-
import { DyFM_Errors } from '@futdevpro/fsm-dynamo';
|
|
1
|
+
import { DyFM_Error, DyFM_Errors } from '@futdevpro/fsm-dynamo';
|
|
2
2
|
import { DyNTS_Controller } from '../../../_services/route/controller.service';
|
|
3
3
|
import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-params.control-model';
|
|
4
4
|
import { DyNTS_Error_DataService } from './error.data-service';
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
* Endpoints:
|
|
7
|
+
*
|
|
8
|
+
* logError
|
|
9
|
+
* POST /error/log
|
|
10
|
+
*
|
|
11
|
+
* markErrorDone
|
|
12
|
+
* GET /error/mark-done/:errorId
|
|
13
|
+
*
|
|
14
|
+
* markAllErrorDone
|
|
15
|
+
* GET /error/mark-all-done
|
|
16
|
+
*
|
|
17
|
+
* getErrors
|
|
18
|
+
* GET /error/get-range/:range
|
|
19
|
+
*
|
|
20
|
+
* getErrorsPaged
|
|
21
|
+
* GET /error/get-paged/:range/:pageSize/:pageIndex
|
|
22
|
+
*
|
|
23
|
+
* getLastErrors
|
|
24
|
+
* GET /error/get-last-paged/:range/:pageSize/:pageIndex
|
|
25
|
+
*
|
|
26
|
+
*
|
|
27
|
+
*/
|
|
28
|
+
export declare abstract class DyNTS_Error_Controller<T_Error extends DyFM_Error, T_Errors extends DyFM_Errors<T_Error>, T_ErrorDataService extends DyNTS_Error_DataService<T_Error, T_Errors>> extends DyNTS_Controller {
|
|
6
29
|
protected abstract getErrorDataService?(set?: {
|
|
7
30
|
data?: T_Error;
|
|
8
31
|
issuer?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.controller.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.controller.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"error.controller.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,UAAU,EAAqB,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AACtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAG/D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,8BAAsB,sBAAsB,CAC1C,OAAO,SAAS,UAAU,EAC1B,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,EACrC,kBAAkB,SAAS,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CACrE,SAAQ,gBAAgB;IAOxB,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CACrC,GAAG,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACxC,kBAAkB;IACrB,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,qBAAqB,EAAE,CAAM;IAErE,cAAc,IAAI,IAAI;CAkLvB"}
|
|
@@ -5,6 +5,29 @@ const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
|
5
5
|
const controller_service_1 = require("../../../_services/route/controller.service");
|
|
6
6
|
const endpoint_params_control_model_1 = require("../../../_models/control-models/endpoint-params.control-model");
|
|
7
7
|
const global_settings_const_1 = require("../../../_collections/global-settings.const");
|
|
8
|
+
/**
|
|
9
|
+
* Endpoints:
|
|
10
|
+
*
|
|
11
|
+
* logError
|
|
12
|
+
* POST /error/log
|
|
13
|
+
*
|
|
14
|
+
* markErrorDone
|
|
15
|
+
* GET /error/mark-done/:errorId
|
|
16
|
+
*
|
|
17
|
+
* markAllErrorDone
|
|
18
|
+
* GET /error/mark-all-done
|
|
19
|
+
*
|
|
20
|
+
* getErrors
|
|
21
|
+
* GET /error/get-range/:range
|
|
22
|
+
*
|
|
23
|
+
* getErrorsPaged
|
|
24
|
+
* GET /error/get-paged/:range/:pageSize/:pageIndex
|
|
25
|
+
*
|
|
26
|
+
* getLastErrors
|
|
27
|
+
* GET /error/get-last-paged/:range/:pageSize/:pageIndex
|
|
28
|
+
*
|
|
29
|
+
*
|
|
30
|
+
*/
|
|
8
31
|
class DyNTS_Error_Controller extends controller_service_1.DyNTS_Controller {
|
|
9
32
|
additionalEndpoints = [];
|
|
10
33
|
setupEndpoints() {
|
|
@@ -31,7 +54,6 @@ class DyNTS_Error_Controller extends controller_service_1.DyNTS_Controller {
|
|
|
31
54
|
data: req.body,
|
|
32
55
|
issuer: issuer ?? req.body?.issuer ?? 'unknown-client',
|
|
33
56
|
});
|
|
34
|
-
await error_DS.preProcessWBError();
|
|
35
57
|
await error_DS.recordError();
|
|
36
58
|
res.send({
|
|
37
59
|
result: 'error logged',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.controller.js","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.controller.ts"],"names":[],"mappings":";;;AAGA,sDAA+F;AAC/F,oFAA+E;AAC/E,iHAAsG;AAEtG,uFAAoF;AAEpF,MAAsB,
|
|
1
|
+
{"version":3,"file":"error.controller.js","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
import { DyNTS_DataService } from '../../../_services/base/data.service';
|
|
2
|
-
import { DyFM_AnyError, DyFM_Errors } from '@futdevpro/fsm-dynamo';
|
|
3
|
-
export declare class
|
|
2
|
+
import { DyFM_AnyError, DyFM_Error, DyFM_ErrorLevel, DyFM_Errors } from '@futdevpro/fsm-dynamo';
|
|
3
|
+
export declare abstract class DyNTS_Error_ControlService<T_Error extends DyFM_Error, T_Errors extends DyFM_Errors<T_Error>> {
|
|
4
4
|
debugLog: boolean;
|
|
5
5
|
readonly version: string;
|
|
6
|
-
|
|
7
|
-
recordError(data?:
|
|
8
|
-
|
|
6
|
+
duplicationCounter: number;
|
|
7
|
+
abstract recordError(data?: T_Errors, alwaysRecord?: boolean): Promise<void>;
|
|
8
|
+
abstract handleInternalError(error: DyFM_AnyError | any, issuer: string, alwaysRecord?: boolean): Promise<void>;
|
|
9
|
+
abstract checkErrorIsStringifyableOrResolvable(error: T_Error): T_Error | 'UNRESOLVABLE';
|
|
10
|
+
abstract getPriorityMultiplierByLevel(level: DyFM_ErrorLevel): number;
|
|
11
|
+
}
|
|
12
|
+
export declare class DyNTS_Error_DataService<T_Error extends DyFM_Error, T_Errors extends DyFM_Errors<T_Error>> extends DyNTS_DataService<T_Errors> implements DyNTS_Error_ControlService<T_Error, T_Errors> {
|
|
13
|
+
debugLog: boolean;
|
|
14
|
+
readonly version: string;
|
|
15
|
+
duplicationCounter: number;
|
|
16
|
+
recordError(data?: T_Errors, alwaysRecord?: boolean): Promise<void>;
|
|
9
17
|
handleInternalError(error: DyFM_AnyError | any, issuer: string, alwaysRecord?: boolean): Promise<void>;
|
|
10
|
-
|
|
11
|
-
|
|
18
|
+
checkErrorIsStringifyableOrResolvable(error: T_Error): T_Error | 'UNRESOLVABLE';
|
|
19
|
+
getPriorityMultiplierByLevel(level: DyFM_ErrorLevel): number;
|
|
12
20
|
}
|
|
13
21
|
//# sourceMappingURL=error.data-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.data-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.data-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EACL,aAAa,
|
|
1
|
+
{"version":3,"file":"error.data-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.data-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EACL,aAAa,EAEU,UAAU,EAAE,eAAe,EACC,WAAW,EAC/D,MAAM,uBAAuB,CAAC;AAE/B,8BAAsB,0BAA0B,CAC9C,OAAO,SAAS,UAAU,EAC1B,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC;IAErC,QAAQ,EAAE,OAAO,CAAS;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAuC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE5E,QAAQ,CAAC,mBAAmB,CAC1B,KAAK,EAAE,aAAa,GAAG,GAAG,EAC1B,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;IAEhB,QAAQ,CAAC,qCAAqC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,cAAc;IAExF,QAAQ,CAAC,4BAA4B,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM;CACtE;AAED,qBAAa,uBAAuB,CAClC,OAAO,SAAS,UAAU,EAC1B,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,CACrC,SAAQ,iBAAiB,CAAC,QAAQ,CAAE,YAAW,0BAA0B,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE5F,QAAQ,EAAE,OAAO,CAAS;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAuC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAgBrB,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsInE,mBAAmB,CACvB,KAAK,EAAE,aAAa,GAAG,GAAG,EAC1B,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,IAAI,CAAC;IAuEhB,qCAAqC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,cAAc;IA4B/E,4BAA4B,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM;CAwB7D"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DyNTS_Error_DataService = void 0;
|
|
3
|
+
exports.DyNTS_Error_DataService = exports.DyNTS_Error_ControlService = void 0;
|
|
4
4
|
const global_settings_const_1 = require("../../../_collections/global-settings.const");
|
|
5
5
|
const data_service_1 = require("../../../_services/base/data.service");
|
|
6
6
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
7
|
+
class DyNTS_Error_ControlService {
|
|
8
|
+
debugLog = false;
|
|
9
|
+
version = global_settings_const_1.DyNTS_global_settings.systemVersion;
|
|
10
|
+
duplicationCounter;
|
|
11
|
+
}
|
|
12
|
+
exports.DyNTS_Error_ControlService = DyNTS_Error_ControlService;
|
|
7
13
|
class DyNTS_Error_DataService extends data_service_1.DyNTS_DataService {
|
|
8
14
|
debugLog = false;
|
|
9
15
|
version = global_settings_const_1.DyNTS_global_settings.systemVersion;
|
|
@@ -123,31 +129,6 @@ class DyNTS_Error_DataService extends data_service_1.DyNTS_DataService {
|
|
|
123
129
|
}); */
|
|
124
130
|
}
|
|
125
131
|
}
|
|
126
|
-
async preProcessWBError() {
|
|
127
|
-
try {
|
|
128
|
-
const innerError = this.data?.error;
|
|
129
|
-
if (innerError &&
|
|
130
|
-
!innerError?.message &&
|
|
131
|
-
!innerError?.userMessage &&
|
|
132
|
-
!innerError?.d_error?.message &&
|
|
133
|
-
!innerError?.d_error?.userMessage) {
|
|
134
|
-
delete this.data.error;
|
|
135
|
-
}
|
|
136
|
-
const innerDError = this.data?.d_error;
|
|
137
|
-
if (innerDError &&
|
|
138
|
-
!innerDError?._message &&
|
|
139
|
-
!innerDError?.__userMessage &&
|
|
140
|
-
!innerDError?._errorCode) {
|
|
141
|
-
delete this.data.d_error;
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
catch (error) {
|
|
145
|
-
throw new fsm_dynamo_1.DyFM_Error({
|
|
146
|
-
...this.getDefaultErrorSettings('preProcessWBError', error),
|
|
147
|
-
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|FDPNTS-EDS-PPE0`,
|
|
148
|
-
});
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
132
|
async handleInternalError(error, issuer, alwaysRecord) {
|
|
152
133
|
try {
|
|
153
134
|
if (this.debugLog)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.data-service.ts"],"names":[],"mappings":";;;AAIA,uFAAoF;AAEpF,uEAAyE;AAEzE,sDAK+B;
|
|
1
|
+
{"version":3,"file":"error.data-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/error/error.data-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { DyFM_RelativeDate, DyFM_ServerStatus, DyFM_Error_Statistics, DyFM_Errors } from '@futdevpro/fsm-dynamo';
|
|
1
|
+
import { DyFM_RelativeDate, DyFM_ServerStatus, DyFM_Error, DyFM_Error_Statistics, DyFM_Errors } from '@futdevpro/fsm-dynamo';
|
|
2
2
|
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
|
|
3
3
|
import { DyNTS_Error_DataService } from '../error/error.data-service';
|
|
4
|
-
export declare abstract class DyNTS_ServerStatus_ControlService<T_Error extends
|
|
4
|
+
export declare abstract class DyNTS_ServerStatus_ControlService<T_Error extends DyFM_Error, T_Errors extends DyFM_Errors<T_Error>, T_ServerStatus extends DyFM_ServerStatus, T_ErrorDataService extends DyNTS_Error_DataService<T_Error, T_Errors>> extends DyNTS_SingletonService {
|
|
5
5
|
protected abstract getErrorDataService?(set?: {
|
|
6
|
-
data?:
|
|
6
|
+
data?: T_Errors;
|
|
7
7
|
issuer?: string;
|
|
8
|
-
}):
|
|
8
|
+
}): T_ErrorDataService;
|
|
9
9
|
protected readonly up: Date;
|
|
10
10
|
protected readonly _serverVersionNumeric: number;
|
|
11
11
|
get serverVersion(): string;
|
|
@@ -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,
|
|
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,EAC/C,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,8BAAsB,iCAAiC,CACrD,OAAO,SAAS,UAAU,EAC1B,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,EACrC,cAAc,SAAS,iBAAiB,EACxC,kBAAkB,SAAS,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CACrE,SAAQ,sBAAsB;IAkB9B,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CACrC,GAAG,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACzC,kBAAkB;IAIrB,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,SAAkB,mBAAmB,0BAA0B;IAI/D,eAAe,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,iBAAiB;IAkBpD,kBAAkB,CACtB,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,CAAC;IAgGjC,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;CAM5F"}
|
|
@@ -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,sDAG+B;AAE/B,2DAAqE;AACrE,iFAAmF;AAEnF,uFAAoF;AAGpF,MAAsB,
|
|
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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"}
|
|
@@ -1,7 +1,22 @@
|
|
|
1
|
+
import { DyFM_Error, DyFM_Errors, DyFM_ServerStatus } from '@futdevpro/fsm-dynamo';
|
|
1
2
|
import { DyNTS_ServerStatus_ControlService } from './server-status.control-service';
|
|
2
3
|
import { DyNTS_Controller } from '../../../_services/route/controller.service';
|
|
3
4
|
import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-params.control-model';
|
|
4
|
-
|
|
5
|
+
import { DyNTS_Error_DataService } from '../error/error.data-service';
|
|
6
|
+
/**
|
|
7
|
+
* Endpoints:
|
|
8
|
+
*
|
|
9
|
+
* getServerStatus
|
|
10
|
+
* GET /status
|
|
11
|
+
*
|
|
12
|
+
* getServerStatusForClient
|
|
13
|
+
* GET /status/:version
|
|
14
|
+
*
|
|
15
|
+
* getErrorStatistics
|
|
16
|
+
* GET /statistics/error/:range
|
|
17
|
+
*
|
|
18
|
+
*/
|
|
19
|
+
export declare abstract class DyNTS_ServerStatus_Controller<T_Error extends DyFM_Error, T_Errors extends DyFM_Errors<T_Error>, T_ServerStatus extends DyFM_ServerStatus, T_ServerStatusService extends DyNTS_ServerStatus_ControlService<T_Error, T_Errors, T_ServerStatus, DyNTS_Error_DataService<T_Error, T_Errors>>> extends DyNTS_Controller {
|
|
5
20
|
protected abstract readonly server_CS: T_ServerStatusService;
|
|
6
21
|
protected readonly additionalEndpoints: DyNTS_Endpoint_Params[];
|
|
7
22
|
setupEndpoints(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-status.controller.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server-status.controller.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAwC,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACzH,OAAO,EAAE,iCAAiC,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AAEtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAGtE;;;;;;;;;;;;GAYG;AACH,8BAAsB,6BAA6B,CACjD,OAAO,SAAS,UAAU,EAC1B,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,EACrC,cAAc,SAAS,iBAAiB,EACxC,qBAAqB,SAAS,iCAAiC,CAC7D,OAAO,EACP,QAAQ,EACR,cAAc,EACd,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAC3C,CACD,SAAQ,gBAAgB;IAMxB,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC;IAG7D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,qBAAqB,EAAE,CAAM;IAErE,cAAc,IAAI,IAAI;CAiEvB"}
|
|
@@ -5,6 +5,19 @@ const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
|
5
5
|
const controller_service_1 = require("../../../_services/route/controller.service");
|
|
6
6
|
const endpoint_params_control_model_1 = require("../../../_models/control-models/endpoint-params.control-model");
|
|
7
7
|
const global_settings_const_1 = require("../../../_collections/global-settings.const");
|
|
8
|
+
/**
|
|
9
|
+
* Endpoints:
|
|
10
|
+
*
|
|
11
|
+
* getServerStatus
|
|
12
|
+
* GET /status
|
|
13
|
+
*
|
|
14
|
+
* getServerStatusForClient
|
|
15
|
+
* GET /status/:version
|
|
16
|
+
*
|
|
17
|
+
* getErrorStatistics
|
|
18
|
+
* GET /statistics/error/:range
|
|
19
|
+
*
|
|
20
|
+
*/
|
|
8
21
|
class DyNTS_ServerStatus_Controller extends controller_service_1.DyNTS_Controller {
|
|
9
22
|
/* protected abstract getServerService(): T_ServerStatusService; */
|
|
10
23
|
additionalEndpoints = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-status.controller.js","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.controller.ts"],"names":[],"mappings":";;;AAGA,
|
|
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;AAIpF;;;;;;;;;;;;GAYG;AACH,MAAsB,6BAUpB,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;wBACnD,GAAG,CAAC,IAAI,CACN,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CACjC,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,EAAiB,EAAE;wBAEnD,GAAG,CAAC,IAAI,CACN,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CACnD,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;AAtFD,sEAsFC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.10.
|
|
3
|
+
"version": "01.10.14",
|
|
4
4
|
"description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"prep": "npm i rimraf nodemon -g",
|
|
@@ -96,11 +96,11 @@
|
|
|
96
96
|
},
|
|
97
97
|
"homepage": "https:/futdevpro.hu/projects/dynamo",
|
|
98
98
|
"DISABLED": {
|
|
99
|
-
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.10.
|
|
99
|
+
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.10.23.tgz",
|
|
100
100
|
"empty": ""
|
|
101
101
|
},
|
|
102
102
|
"peerDependencies": {
|
|
103
|
-
"@futdevpro/fsm-dynamo": "1.10.
|
|
103
|
+
"@futdevpro/fsm-dynamo": "1.10.23",
|
|
104
104
|
|
|
105
105
|
"@types/express": "~4.17.17",
|
|
106
106
|
"@types/geoip-lite": "~1.4.1",
|
|
@@ -7,9 +7,33 @@ import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-
|
|
|
7
7
|
import { DyNTS_Error_DataService } from './error.data-service';
|
|
8
8
|
import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
|
|
9
9
|
|
|
10
|
+
/**
|
|
11
|
+
* Endpoints:
|
|
12
|
+
*
|
|
13
|
+
* logError
|
|
14
|
+
* POST /error/log
|
|
15
|
+
*
|
|
16
|
+
* markErrorDone
|
|
17
|
+
* GET /error/mark-done/:errorId
|
|
18
|
+
*
|
|
19
|
+
* markAllErrorDone
|
|
20
|
+
* GET /error/mark-all-done
|
|
21
|
+
*
|
|
22
|
+
* getErrors
|
|
23
|
+
* GET /error/get-range/:range
|
|
24
|
+
*
|
|
25
|
+
* getErrorsPaged
|
|
26
|
+
* GET /error/get-paged/:range/:pageSize/:pageIndex
|
|
27
|
+
*
|
|
28
|
+
* getLastErrors
|
|
29
|
+
* GET /error/get-last-paged/:range/:pageSize/:pageIndex
|
|
30
|
+
*
|
|
31
|
+
*
|
|
32
|
+
*/
|
|
10
33
|
export abstract class DyNTS_Error_Controller<
|
|
11
|
-
T_Error extends
|
|
12
|
-
|
|
34
|
+
T_Error extends DyFM_Error,
|
|
35
|
+
T_Errors extends DyFM_Errors<T_Error>,
|
|
36
|
+
T_ErrorDataService extends DyNTS_Error_DataService<T_Error, T_Errors>
|
|
13
37
|
> extends DyNTS_Controller {
|
|
14
38
|
|
|
15
39
|
/* static getInstance(): FDPNTS_Error_Controller {
|
|
@@ -49,8 +73,6 @@ export abstract class DyNTS_Error_Controller<
|
|
|
49
73
|
issuer: issuer ?? req.body?.issuer ?? 'unknown-client',
|
|
50
74
|
});
|
|
51
75
|
|
|
52
|
-
await error_DS.preProcessWBError();
|
|
53
|
-
|
|
54
76
|
await error_DS.recordError();
|
|
55
77
|
|
|
56
78
|
res.send({
|
|
@@ -13,14 +13,35 @@ import {
|
|
|
13
13
|
DyFM_Log, DyFM_Shared, DyFM_clone, DyFM_errorFlag, DyFM_Errors
|
|
14
14
|
} from '@futdevpro/fsm-dynamo';
|
|
15
15
|
|
|
16
|
+
export abstract class DyNTS_Error_ControlService<
|
|
17
|
+
T_Error extends DyFM_Error,
|
|
18
|
+
T_Errors extends DyFM_Errors<T_Error>
|
|
19
|
+
> {
|
|
20
|
+
debugLog: boolean = false;
|
|
21
|
+
readonly version: string = DyNTS_global_settings.systemVersion;
|
|
22
|
+
duplicationCounter: number;
|
|
23
|
+
|
|
24
|
+
abstract recordError(data?: T_Errors, alwaysRecord?: boolean): Promise<void>;
|
|
25
|
+
|
|
26
|
+
abstract handleInternalError(
|
|
27
|
+
error: DyFM_AnyError | any,
|
|
28
|
+
issuer: string,
|
|
29
|
+
alwaysRecord?: boolean,
|
|
30
|
+
): Promise<void>;
|
|
31
|
+
|
|
32
|
+
abstract checkErrorIsStringifyableOrResolvable(error: T_Error): T_Error | 'UNRESOLVABLE';
|
|
33
|
+
|
|
34
|
+
abstract getPriorityMultiplierByLevel(level: DyFM_ErrorLevel): number;
|
|
35
|
+
}
|
|
16
36
|
|
|
17
37
|
export class DyNTS_Error_DataService<
|
|
18
|
-
T_Error extends
|
|
19
|
-
|
|
38
|
+
T_Error extends DyFM_Error,
|
|
39
|
+
T_Errors extends DyFM_Errors<T_Error>
|
|
40
|
+
> extends DyNTS_DataService<T_Errors> implements DyNTS_Error_ControlService<T_Error, T_Errors> {
|
|
20
41
|
|
|
21
42
|
debugLog: boolean = false;
|
|
22
43
|
readonly version: string = DyNTS_global_settings.systemVersion;
|
|
23
|
-
|
|
44
|
+
duplicationCounter: number;
|
|
24
45
|
|
|
25
46
|
/* constructor(
|
|
26
47
|
set: {
|
|
@@ -36,7 +57,7 @@ export class DyNTS_Error_DataService<
|
|
|
36
57
|
);
|
|
37
58
|
} */
|
|
38
59
|
|
|
39
|
-
async recordError(data?:
|
|
60
|
+
async recordError(data?: T_Errors, alwaysRecord?: boolean): Promise<void> {
|
|
40
61
|
try {
|
|
41
62
|
if (
|
|
42
63
|
!alwaysRecord &&
|
|
@@ -74,12 +95,12 @@ export class DyNTS_Error_DataService<
|
|
|
74
95
|
data.message += '\n' + data.exception.split('() (at <')[0];
|
|
75
96
|
}
|
|
76
97
|
|
|
77
|
-
const duplicateError:
|
|
98
|
+
const duplicateError: T_Errors = await this.findData({
|
|
78
99
|
version: data.version,
|
|
79
100
|
message: data.message,
|
|
80
|
-
} as DyFM_DBFilter<
|
|
101
|
+
} as DyFM_DBFilter<T_Errors>, true);
|
|
81
102
|
|
|
82
|
-
data.d_error = this.checkErrorIsStringifyableOrResolvable(data.d_error) as
|
|
103
|
+
data.d_error = this.checkErrorIsStringifyableOrResolvable(data.d_error) as T_Error;
|
|
83
104
|
|
|
84
105
|
try {
|
|
85
106
|
JSON.stringify(data);
|
|
@@ -113,10 +134,10 @@ export class DyNTS_Error_DataService<
|
|
|
113
134
|
this.duplicationCounter = duplicateError.count + 1;
|
|
114
135
|
|
|
115
136
|
await this.updateData({
|
|
116
|
-
filterBy: { _id: duplicateError._id } as DyFM_DBFilter<
|
|
137
|
+
filterBy: { _id: duplicateError._id } as DyFM_DBFilter<T_Errors>,
|
|
117
138
|
update: {
|
|
118
139
|
$inc: { count: 1, priority: this.getPriorityMultiplierByLevel(data?.level) },
|
|
119
|
-
} as DyNTS_DBUpdate<
|
|
140
|
+
} as DyNTS_DBUpdate<T_Errors>,
|
|
120
141
|
});
|
|
121
142
|
|
|
122
143
|
// ezt majd ha leülepedett, hogy biztos nem kellenek a deep duplication-ök
|
|
@@ -170,43 +191,6 @@ export class DyNTS_Error_DataService<
|
|
|
170
191
|
}
|
|
171
192
|
}
|
|
172
193
|
|
|
173
|
-
async preProcessWBError(): Promise<void> {
|
|
174
|
-
try {
|
|
175
|
-
const innerError = this.data?.error;
|
|
176
|
-
|
|
177
|
-
if (
|
|
178
|
-
innerError &&
|
|
179
|
-
!innerError?.message &&
|
|
180
|
-
!innerError?.userMessage &&
|
|
181
|
-
!innerError?.d_error?.message &&
|
|
182
|
-
!innerError?.d_error?.userMessage
|
|
183
|
-
) {
|
|
184
|
-
delete this.data.error;
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
const innerDError: DyFM_Error = this.data?.d_error;
|
|
188
|
-
|
|
189
|
-
if (
|
|
190
|
-
innerDError &&
|
|
191
|
-
!innerDError?._message &&
|
|
192
|
-
!innerDError?.__userMessage &&
|
|
193
|
-
!innerDError?._errorCode
|
|
194
|
-
) {
|
|
195
|
-
delete this.data.d_error;
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
} catch (error) {
|
|
199
|
-
throw new DyFM_Error({
|
|
200
|
-
...this.getDefaultErrorSettings(
|
|
201
|
-
'preProcessWBError',
|
|
202
|
-
error
|
|
203
|
-
),
|
|
204
|
-
|
|
205
|
-
errorCode: `${DyNTS_global_settings.systemShortCodeName}|FDPNTS-EDS-PPE0`,
|
|
206
|
-
});
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
|
|
210
194
|
async handleInternalError(
|
|
211
195
|
error: DyFM_AnyError | any,
|
|
212
196
|
issuer: string,
|
|
@@ -233,7 +217,7 @@ export class DyNTS_Error_DataService<
|
|
|
233
217
|
),
|
|
234
218
|
|
|
235
219
|
additionalContent: (error as DyFM_Error)?.additionalContent,
|
|
236
|
-
}) as
|
|
220
|
+
}) as T_Errors;
|
|
237
221
|
} else {
|
|
238
222
|
this.data = new DyFM_Errors({
|
|
239
223
|
issuer: issuer,
|
|
@@ -247,7 +231,7 @@ export class DyNTS_Error_DataService<
|
|
|
247
231
|
|
|
248
232
|
message: (error as Error)?.message,
|
|
249
233
|
exceptionObj: (error as Error)?.stack?.split('\n'),
|
|
250
|
-
}) as
|
|
234
|
+
}) as T_Errors;
|
|
251
235
|
}
|
|
252
236
|
|
|
253
237
|
/* if (!(error as FDP_Error)?.flag?.includes('WB-ERROR-OBJECT')) {
|
|
@@ -282,13 +266,13 @@ export class DyNTS_Error_DataService<
|
|
|
282
266
|
}
|
|
283
267
|
}
|
|
284
268
|
|
|
285
|
-
|
|
269
|
+
checkErrorIsStringifyableOrResolvable(error: T_Error): T_Error | 'UNRESOLVABLE' {
|
|
286
270
|
try {
|
|
287
271
|
JSON.stringify(error);
|
|
288
272
|
} catch (err) {
|
|
289
273
|
DyFM_Log.error('error data is not stringifyable! trying to resolve...');
|
|
290
274
|
|
|
291
|
-
error = DyFM_Shared.resolveCirculation(error) as
|
|
275
|
+
error = DyFM_Shared.resolveCirculation(error) as T_Error;
|
|
292
276
|
|
|
293
277
|
try {
|
|
294
278
|
JSON.stringify(error);
|
|
@@ -307,10 +291,10 @@ export class DyNTS_Error_DataService<
|
|
|
307
291
|
}
|
|
308
292
|
}
|
|
309
293
|
|
|
310
|
-
return error;
|
|
294
|
+
return error as T_Error;
|
|
311
295
|
}
|
|
312
296
|
|
|
313
|
-
|
|
297
|
+
getPriorityMultiplierByLevel(level: DyFM_ErrorLevel): number {
|
|
314
298
|
switch (level) {
|
|
315
299
|
case DyFM_ErrorLevel.critical:
|
|
316
300
|
case DyFM_ErrorLevel.fatal:
|
|
@@ -12,8 +12,10 @@ import { DyNTS_global_settings } from '../../../_collections/global-settings.con
|
|
|
12
12
|
import { DyNTS_Error_DataService } from '../error/error.data-service';
|
|
13
13
|
|
|
14
14
|
export abstract class DyNTS_ServerStatus_ControlService<
|
|
15
|
-
T_Error extends
|
|
16
|
-
|
|
15
|
+
T_Error extends DyFM_Error,
|
|
16
|
+
T_Errors extends DyFM_Errors<T_Error>,
|
|
17
|
+
T_ServerStatus extends DyFM_ServerStatus,
|
|
18
|
+
T_ErrorDataService extends DyNTS_Error_DataService<T_Error, T_Errors>
|
|
17
19
|
> extends DyNTS_SingletonService {
|
|
18
20
|
|
|
19
21
|
/* static getInstance(): FDPNTS_ServerStatus_ControlService {
|
|
@@ -33,8 +35,8 @@ export abstract class DyNTS_ServerStatus_ControlService<
|
|
|
33
35
|
} */
|
|
34
36
|
|
|
35
37
|
protected abstract getErrorDataService?(
|
|
36
|
-
set?: { data?:
|
|
37
|
-
):
|
|
38
|
+
set?: { data?: T_Errors, issuer?: string }
|
|
39
|
+
): T_ErrorDataService;
|
|
38
40
|
|
|
39
41
|
/* protected abstract error_DS: FDPNTS_Error_DataService<T_Error>; */
|
|
40
42
|
|
|
@@ -76,12 +78,12 @@ export abstract class DyNTS_ServerStatus_ControlService<
|
|
|
76
78
|
issuer: string
|
|
77
79
|
): Promise<DyFM_Error_Statistics> {
|
|
78
80
|
try {
|
|
79
|
-
const error_DS:
|
|
81
|
+
const error_DS: T_ErrorDataService =
|
|
80
82
|
this.getErrorDataService({ issuer: issuer });
|
|
81
83
|
/* new FDPNTS_Error_DataService({ issuer: issuer }); */
|
|
82
84
|
|
|
83
85
|
const from: Date = DyFM_Time.getDateByRelativeDate(range);
|
|
84
|
-
const errors:
|
|
86
|
+
const errors: T_Errors[] = await error_DS.findDataList({
|
|
85
87
|
__created: { $gte: from },
|
|
86
88
|
});
|
|
87
89
|
|
|
@@ -90,71 +92,71 @@ export abstract class DyNTS_ServerStatus_ControlService<
|
|
|
90
92
|
|
|
91
93
|
allErrors: errors.length,
|
|
92
94
|
allAllErrors: errors.reduce(
|
|
93
|
-
(sum: number, error:
|
|
95
|
+
(sum: number, error: T_Errors): number => sum + error.count,
|
|
94
96
|
0
|
|
95
97
|
),
|
|
96
98
|
|
|
97
99
|
serverErrors:
|
|
98
100
|
errors.filter(
|
|
99
|
-
(error:
|
|
101
|
+
(error: T_Errors): boolean => error.source.includes('SERVER')
|
|
100
102
|
).length,
|
|
101
103
|
clientErrors:
|
|
102
104
|
errors.filter(
|
|
103
|
-
(error:
|
|
105
|
+
(error: T_Errors): boolean => !error.source.includes('SERVER')
|
|
104
106
|
).length,
|
|
105
107
|
allServerErrors:
|
|
106
108
|
errors.filter(
|
|
107
|
-
(error:
|
|
109
|
+
(error: T_Errors): boolean => error.source.includes('SERVER')
|
|
108
110
|
).reduce(
|
|
109
|
-
(sum: number, error:
|
|
111
|
+
(sum: number, error: T_Errors): number => sum + error.count, 0
|
|
110
112
|
),
|
|
111
113
|
allClientErrors:
|
|
112
114
|
errors.filter(
|
|
113
|
-
(error:
|
|
115
|
+
(error: T_Errors): boolean => !error.source.includes('SERVER')
|
|
114
116
|
).reduce(
|
|
115
|
-
(sum: number, error:
|
|
117
|
+
(sum: number, error: T_Errors): number => sum + error.count, 0
|
|
116
118
|
),
|
|
117
119
|
|
|
118
120
|
infoErrors:
|
|
119
121
|
errors.filter(
|
|
120
|
-
(error:
|
|
122
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.info
|
|
121
123
|
).length,
|
|
122
124
|
warningErrors:
|
|
123
125
|
errors.filter(
|
|
124
|
-
(error:
|
|
126
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.warning
|
|
125
127
|
).length,
|
|
126
128
|
errorErrors:
|
|
127
129
|
errors.filter(
|
|
128
|
-
(error:
|
|
130
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.error
|
|
129
131
|
).length,
|
|
130
132
|
criticalErrors:
|
|
131
133
|
errors.filter(
|
|
132
|
-
(error:
|
|
134
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.critical
|
|
133
135
|
).length,
|
|
134
136
|
|
|
135
137
|
allInfoErrors:
|
|
136
138
|
errors.filter(
|
|
137
|
-
(error:
|
|
139
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.info
|
|
138
140
|
).reduce(
|
|
139
|
-
(sum: number, error:
|
|
141
|
+
(sum: number, error: T_Errors): number => sum + error.count, 0
|
|
140
142
|
),
|
|
141
143
|
allWarningErrors:
|
|
142
144
|
errors.filter(
|
|
143
|
-
(error:
|
|
145
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.warning
|
|
144
146
|
).reduce(
|
|
145
|
-
(sum: number, error:
|
|
147
|
+
(sum: number, error: T_Errors): number => sum + error.count, 0
|
|
146
148
|
),
|
|
147
149
|
allErrorErrors:
|
|
148
150
|
errors.filter(
|
|
149
|
-
(error:
|
|
151
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.error
|
|
150
152
|
).reduce(
|
|
151
|
-
(sum: number, error:
|
|
153
|
+
(sum: number, error: T_Errors): number => sum + error.count, 0
|
|
152
154
|
),
|
|
153
155
|
allCriticalErrors:
|
|
154
156
|
errors.filter(
|
|
155
|
-
(error:
|
|
157
|
+
(error: T_Errors): boolean => error.level === DyFM_ErrorLevel.critical
|
|
156
158
|
).reduce(
|
|
157
|
-
(sum: number, error:
|
|
159
|
+
(sum: number, error: T_Errors): number => sum + error.count, 0
|
|
158
160
|
),
|
|
159
161
|
} as DyFM_Error_Statistics;
|
|
160
162
|
} catch (error) {
|
|
@@ -1,15 +1,37 @@
|
|
|
1
1
|
|
|
2
2
|
import { Request, Response } from 'express';
|
|
3
3
|
|
|
4
|
-
import { DyFM_Error, DyFM_HttpCallType, DyFM_RelativeDate } from '@futdevpro/fsm-dynamo';
|
|
4
|
+
import { DyFM_Error, DyFM_Errors, DyFM_HttpCallType, DyFM_RelativeDate, DyFM_ServerStatus } from '@futdevpro/fsm-dynamo';
|
|
5
5
|
import { DyNTS_ServerStatus_ControlService } from './server-status.control-service';
|
|
6
6
|
import { DyNTS_Controller } from '../../../_services/route/controller.service';
|
|
7
7
|
import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-params.control-model';
|
|
8
8
|
import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
import { DyNTS_Error_DataService } from '../error/error.data-service';
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Endpoints:
|
|
14
|
+
*
|
|
15
|
+
* getServerStatus
|
|
16
|
+
* GET /status
|
|
17
|
+
*
|
|
18
|
+
* getServerStatusForClient
|
|
19
|
+
* GET /status/:version
|
|
20
|
+
*
|
|
21
|
+
* getErrorStatistics
|
|
22
|
+
* GET /statistics/error/:range
|
|
23
|
+
*
|
|
24
|
+
*/
|
|
11
25
|
export abstract class DyNTS_ServerStatus_Controller<
|
|
12
|
-
|
|
26
|
+
T_Error extends DyFM_Error,
|
|
27
|
+
T_Errors extends DyFM_Errors<T_Error>,
|
|
28
|
+
T_ServerStatus extends DyFM_ServerStatus,
|
|
29
|
+
T_ServerStatusService extends DyNTS_ServerStatus_ControlService<
|
|
30
|
+
T_Error,
|
|
31
|
+
T_Errors,
|
|
32
|
+
T_ServerStatus,
|
|
33
|
+
DyNTS_Error_DataService<T_Error, T_Errors>
|
|
34
|
+
>
|
|
13
35
|
> extends DyNTS_Controller {
|
|
14
36
|
|
|
15
37
|
/* static getInstance(): FDPNTS_ServerStatus_Controller {
|