@futdevpro/nts-dynamo 1.9.21 → 1.9.23
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/.eslintrc.json +2 -2
- package/build/_collections/global-settings.const.d.ts +1 -1
- package/build/_collections/global-settings.const.d.ts.map +1 -1
- package/build/_collections/global-settings.const.js +18 -14
- package/build/_collections/global-settings.const.js.map +1 -1
- package/build/_models/control-models/endpoint-params.control-model.d.ts +4 -4
- package/build/_models/control-models/endpoint-params.control-model.d.ts.map +1 -1
- package/build/_models/control-models/endpoint-params.control-model.js +14 -13
- package/build/_models/control-models/endpoint-params.control-model.js.map +1 -1
- package/build/_models/control-models/socket-event.control-model.d.ts +2 -2
- package/build/_models/control-models/socket-event.control-model.d.ts.map +1 -1
- package/build/_models/control-models/socket-event.control-model.js +11 -11
- package/build/_models/control-models/socket-event.control-model.js.map +1 -1
- package/build/_models/control-models/socket-server-service-params.control-model.js +1 -1
- package/build/_models/control-models/socket-server-service-params.control-model.js.map +1 -1
- package/build/_models/interfaces/global-log-settings.interface.d.ts +62 -0
- package/build/_models/interfaces/global-log-settings.interface.d.ts.map +1 -0
- package/build/_models/interfaces/global-log-settings.interface.js +3 -0
- package/build/_models/interfaces/global-log-settings.interface.js.map +1 -0
- package/build/_models/interfaces/global-settings.interface.d.ts +3 -50
- package/build/_models/interfaces/global-settings.interface.d.ts.map +1 -1
- package/build/_modules/mock/app-extended-server.mock.js +1 -1
- package/build/_modules/mock/app-extended-server.mock.js.map +1 -1
- package/build/_modules/usage/usage.controller.d.ts.map +1 -1
- package/build/_modules/usage/usage.controller.js +0 -1
- package/build/_modules/usage/usage.controller.js.map +1 -1
- package/build/_services/core/api.service.js +10 -10
- package/build/_services/core/api.service.js.map +1 -1
- package/build/_services/core/global.service.d.ts.map +1 -1
- package/build/_services/core/global.service.js +9 -6
- package/build/_services/core/global.service.js.map +1 -1
- package/build/_services/route/routing-module.service.d.ts +1 -1
- package/build/_services/route/routing-module.service.d.ts.map +1 -1
- package/build/_services/route/routing-module.service.js +6 -4
- package/build/_services/route/routing-module.service.js.map +1 -1
- package/build/_services/server/app-extended.server.d.ts.map +1 -1
- package/build/_services/server/app-extended.server.js +28 -17
- package/build/_services/server/app-extended.server.js.map +1 -1
- package/build/_services/server/app.server.d.ts +4 -7
- package/build/_services/server/app.server.d.ts.map +1 -1
- package/build/_services/server/app.server.js +59 -60
- package/build/_services/server/app.server.js.map +1 -1
- package/build/_services/socket/socket-client.service.d.ts.map +1 -1
- package/build/_services/socket/socket-client.service.js +4 -6
- package/build/_services/socket/socket-client.service.js.map +1 -1
- package/build/_services/socket/socket-server.service.d.ts +2 -2
- package/build/_services/socket/socket-server.service.d.ts.map +1 -1
- package/build/_services/socket/socket-server.service.js +13 -10
- package/build/_services/socket/socket-server.service.js.map +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +0 -12
- package/build/index.js.map +1 -1
- package/nodemon.json +2 -4
- package/package.json +10 -10
- package/src/_collections/global-settings.const.ts +22 -16
- package/src/_models/control-models/endpoint-params.control-model.ts +28 -20
- package/src/_models/control-models/socket-event.control-model.ts +13 -13
- package/src/_models/control-models/socket-server-service-params.control-model.ts +2 -2
- package/src/_models/interfaces/global-log-settings.interface.ts +81 -0
- package/src/_models/interfaces/global-settings.interface.ts +3 -54
- package/src/_modules/mock/app-extended-server.mock.ts +2 -2
- package/src/_modules/usage/usage.controller.ts +0 -1
- package/src/_services/core/api.service.ts +11 -11
- package/src/_services/core/global.service.ts +21 -8
- package/src/_services/route/routing-module.service.ts +7 -5
- package/src/_services/server/app-extended.server.ts +43 -26
- package/src/_services/server/app.server.ts +87 -75
- package/src/_services/socket/socket-client.service.ts +11 -8
- package/src/_services/socket/socket-server.service.ts +14 -11
- package/src/index.ts +0 -15
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,sCAAsC,CAAC;AAIrD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qCAAqC,CAAC;AACpD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qCAAqC,CAAC;AAGpD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AAKrD,cAAc,wDAAwD,CAAC;AACvE,cAAc,uDAAuD,CAAC;AACtE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,wDAAwD,CAAC;AAGvE,cAAc,wDAAwD,CAAC;AACvE,cAAc,mDAAmD,CAAC;AAClE,cAAc,sDAAsD,CAAC;AACrE,cAAc,wDAAwD,CAAC;AACvE,cAAc,qEAAqE,CAAC;AACpF,cAAc,qDAAqD,CAAC;AAOpE,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,sCAAsC,CAAC;AAIrD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qCAAqC,CAAC;AACpD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qCAAqC,CAAC;AAGpD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AAKrD,cAAc,wDAAwD,CAAC;AACvE,cAAc,uDAAuD,CAAC;AACtE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,wDAAwD,CAAC;AAGvE,cAAc,wDAAwD,CAAC;AACvE,cAAc,mDAAmD,CAAC;AAClE,cAAc,sDAAsD,CAAC;AACrE,cAAc,wDAAwD,CAAC;AACvE,cAAc,qEAAqE,CAAC;AACpF,cAAc,qDAAqD,CAAC;AAOpE,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;AAI/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,0CAA0C,CAAC;AACzD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -32,18 +32,6 @@ tslib_1.__exportStar(require("./_models/control-models/socket-event.control-mode
|
|
|
32
32
|
// models/TYPES
|
|
33
33
|
tslib_1.__exportStar(require("./_models/types/db-filter.type"), exports);
|
|
34
34
|
tslib_1.__exportStar(require("./_models/types/db-update.type"), exports);
|
|
35
|
-
// MODULES
|
|
36
|
-
/* export * from './_modules/test/index'; */
|
|
37
|
-
// TEST MODULE
|
|
38
|
-
/* export * from './test.controller';
|
|
39
|
-
export * from './get-test-routing-module.util';
|
|
40
|
-
export * from '@futdevpro/fsm-dynamo/test-module'; */
|
|
41
|
-
/* export * from './_modules/usage/index'; */
|
|
42
|
-
// USAGE MODULE
|
|
43
|
-
/* export * from './usage.controller';
|
|
44
|
-
export * from './usage.data-service';
|
|
45
|
-
export * from './get-usage-routing-module.util';
|
|
46
|
-
export * from '@futdevpro/fsm-dynamo/usage-module'; */
|
|
47
35
|
// SERVICES
|
|
48
36
|
tslib_1.__exportStar(require("./_services/core/api.service"), exports);
|
|
49
37
|
tslib_1.__exportStar(require("./_services/server/app.server"), exports);
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,cAAc;AACd,+EAAqD;AAGrD,QAAQ;AACR,wEAA8C;AAC9C,8EAAoD;AACpD,uEAA6C;AAC7C,wEAA8C;AAC9C,8EAAoD;AAEpD,aAAa;AACb,4EAAkD;AAClD,gFAAsD;AACtD,+EAAqD;AAGrD,6CAA6C;AAC7C,oBAAoB;AACpB,iGAAuE;AACvE,gGAAsE;AACtE,yFAA+D;AAC/D,iGAAuE;AAEvE,wBAAwB;AACxB,iGAAuE;AACvE,4FAAkE;AAClE,+FAAqE;AACrE,iGAAuE;AACvE,8GAAoF;AACpF,8FAAoE;AAEpE,iFAAiF;AACjF,gEAAgE;AAChE,mDAAmD;AAEnD,eAAe;AACf,yEAA+C;AAC/C,yEAA+C;AAG/C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,cAAc;AACd,+EAAqD;AAGrD,QAAQ;AACR,wEAA8C;AAC9C,8EAAoD;AACpD,uEAA6C;AAC7C,wEAA8C;AAC9C,8EAAoD;AAEpD,aAAa;AACb,4EAAkD;AAClD,gFAAsD;AACtD,+EAAqD;AAGrD,6CAA6C;AAC7C,oBAAoB;AACpB,iGAAuE;AACvE,gGAAsE;AACtE,yFAA+D;AAC/D,iGAAuE;AAEvE,wBAAwB;AACxB,iGAAuE;AACvE,4FAAkE;AAClE,+FAAqE;AACrE,iGAAuE;AACvE,8GAAoF;AACpF,8FAAoE;AAEpE,iFAAiF;AACjF,gEAAgE;AAChE,mDAAmD;AAEnD,eAAe;AACf,yEAA+C;AAC/C,yEAA+C;AAG/C,WAAW;AACX,uEAA6C;AAC7C,wEAA8C;AAC9C,wEAA8C;AAC9C,+EAAqD;AACrD,wEAA8C;AAC9C,sEAA4C;AAC5C,yEAA+C;AAC/C,0EAAgD;AAChD,+EAAqD;AACrD,mFAAyD;AACzD,sFAA4D;AAC5D,4EAAkD;AAClD,6EAAmD;AAEnD,iFAAiF;AACjF,yCAAyC;AACzC,2CAA2C;AAC3C,2CAA2C"}
|
package/nodemon.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.09.
|
|
3
|
+
"version": "01.09.23",
|
|
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",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"types": "./build/index.d.ts",
|
|
32
32
|
"typings": "./build/index.d.ts"
|
|
33
33
|
},
|
|
34
|
-
"./custom-data
|
|
34
|
+
"./custom-data": {
|
|
35
35
|
"default": "./build/_modules/custom-data/index.js",
|
|
36
36
|
"module": "./build/_modules/custom-data/index.js",
|
|
37
37
|
"types": "./build/_modules/custom-data/index.d.ts",
|
|
@@ -43,13 +43,13 @@
|
|
|
43
43
|
"types": "./build/_mock/index.d.ts",
|
|
44
44
|
"typings": "./build/_mock/index.d.ts"
|
|
45
45
|
},
|
|
46
|
-
"./test
|
|
46
|
+
"./test": {
|
|
47
47
|
"default": "./build/_modules/test/index.js",
|
|
48
48
|
"module": "./build/_modules/test/index.js",
|
|
49
49
|
"types": "./build/_modules/test/index.d.ts",
|
|
50
50
|
"typings": "./build/_modules/test/index.d.ts"
|
|
51
51
|
},
|
|
52
|
-
"./usage
|
|
52
|
+
"./usage": {
|
|
53
53
|
"default": "./build/_modules/usage/index.js",
|
|
54
54
|
"module": "./build/_modules/usage/index.js",
|
|
55
55
|
"types": "./build/_modules/usage/index.d.ts",
|
|
@@ -106,16 +106,16 @@
|
|
|
106
106
|
},
|
|
107
107
|
"typesVersions": {
|
|
108
108
|
"*": {
|
|
109
|
-
"custom-data
|
|
109
|
+
"custom-data": [
|
|
110
110
|
"build/_modules/custom-data/index.d.ts"
|
|
111
111
|
],
|
|
112
112
|
"mock": [
|
|
113
113
|
"build/_modules/mock/index.d.ts"
|
|
114
114
|
],
|
|
115
|
-
"test
|
|
115
|
+
"test": [
|
|
116
116
|
"build/_modules/test/index.d.ts"
|
|
117
117
|
],
|
|
118
|
-
"usage
|
|
118
|
+
"usage": [
|
|
119
119
|
"build/_modules/usage/index.d.ts"
|
|
120
120
|
],
|
|
121
121
|
"app": [
|
|
@@ -163,10 +163,11 @@
|
|
|
163
163
|
},
|
|
164
164
|
"homepage": "https:/futdevpro.hu/projects/dynamo",
|
|
165
165
|
"DISABLED": {
|
|
166
|
-
"
|
|
166
|
+
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.09.20.tgz",
|
|
167
|
+
"empty": ""
|
|
167
168
|
},
|
|
168
169
|
"peerDependencies": {
|
|
169
|
-
"@futdevpro/fsm-dynamo": "~1.9.
|
|
170
|
+
"@futdevpro/fsm-dynamo": "~1.9.20",
|
|
170
171
|
"@types/express": "~4.17.17",
|
|
171
172
|
"@types/geoip-lite": "~1.4.1",
|
|
172
173
|
"@types/node": "~20.5.7",
|
|
@@ -191,7 +192,6 @@
|
|
|
191
192
|
"eslint-plugin-unused-imports": "~3.0.0",
|
|
192
193
|
"jasmine": "~5.0.2",
|
|
193
194
|
"jasmine-ts": "~0.4.0",
|
|
194
|
-
"nodemon": "~3.0.1",
|
|
195
195
|
"socket.io": "~4.5.2",
|
|
196
196
|
"socket.io-client": "~4.7.4",
|
|
197
197
|
"tslib": "~2.6.2",
|
|
@@ -3,25 +3,31 @@ import { DyNTS_RouteSecurity } from '../_enums/route-security.enum';
|
|
|
3
3
|
import { DyNTS_SocketSecurity } from '../_enums/socket-security.enum';
|
|
4
4
|
import { DyNTS_Global_Settings } from '../_models/interfaces/global-settings.interface';
|
|
5
5
|
|
|
6
|
-
export const
|
|
6
|
+
export const DyNTS_global_settings: DyNTS_Global_Settings = {
|
|
7
7
|
baseUrl: '/api',
|
|
8
8
|
defaultRouteSecurity: DyNTS_RouteSecurity.open,
|
|
9
9
|
defaultSocketSecurity: DyNTS_SocketSecurity.open,
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
log_settings: {
|
|
12
|
+
highDetailedLogs: false,
|
|
13
|
+
|
|
14
|
+
setup: false,
|
|
15
|
+
|
|
16
|
+
request: true,
|
|
17
|
+
requestsContent: false,
|
|
18
|
+
responseContent: false,
|
|
19
|
+
|
|
20
|
+
socket_allEvents: true,
|
|
21
|
+
socket_mainEvents: true,
|
|
22
|
+
socket_eventContent: false,
|
|
23
|
+
|
|
24
|
+
api_events: true,
|
|
25
|
+
api_requestContents: false,
|
|
26
|
+
api_requestSettings: false,
|
|
27
|
+
api_responseContents: false,
|
|
28
|
+
|
|
29
|
+
detailedErrors: false,
|
|
12
30
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
logResponseContent: false,
|
|
16
|
-
|
|
17
|
-
logAllSocketEvent: true,
|
|
18
|
-
logMainSocketEvents: true,
|
|
19
|
-
logSocketEventContent: false,
|
|
20
|
-
|
|
21
|
-
logApiEvents: true,
|
|
22
|
-
logApiRequestContents: false,
|
|
23
|
-
logApiRequestSettings: false,
|
|
24
|
-
logApiResponseContents: false,
|
|
25
|
-
|
|
26
|
-
logDetailedErrors: false,
|
|
31
|
+
server_debug: false,
|
|
32
|
+
},
|
|
27
33
|
};
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
import { Request, Response } from 'express';
|
|
4
4
|
|
|
5
|
-
import { DyFM_Array, DyFM_Error, DyFM_Log } from '@futdevpro/fsm-dynamo';
|
|
5
|
+
import { DyFM_Array, DyFM_Error, DyFM_errorFlag, DyFM_Log } from '@futdevpro/fsm-dynamo';
|
|
6
6
|
import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
|
|
7
7
|
import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
|
|
8
|
-
import {
|
|
8
|
+
import { DyNTS_global_settings } from '../../_collections/global-settings.const';
|
|
9
9
|
import { DyNTS_GlobalService } from '../../_services/core/global.service';
|
|
10
10
|
|
|
11
11
|
/**
|
|
@@ -66,30 +66,38 @@ export class DyNTS_Endpoint_Params {
|
|
|
66
66
|
tasks: ((req: Request, res: Response, issuer?: string) => Promise<void>)[],
|
|
67
67
|
|
|
68
68
|
/**
|
|
69
|
-
*
|
|
69
|
+
* log settings for request and response
|
|
70
70
|
*/
|
|
71
71
|
logRequest?: boolean,
|
|
72
72
|
/**
|
|
73
|
-
*
|
|
73
|
+
* log settings for request params
|
|
74
74
|
*/
|
|
75
75
|
logRequestsParams?: boolean,
|
|
76
76
|
/**
|
|
77
|
-
*
|
|
77
|
+
* log settings for request content
|
|
78
78
|
*/
|
|
79
79
|
logRequestsContent?: boolean,
|
|
80
80
|
/**
|
|
81
|
-
*
|
|
81
|
+
* log settings for response content
|
|
82
82
|
*/
|
|
83
83
|
logResponseContent?: boolean,
|
|
84
84
|
}
|
|
85
85
|
) {
|
|
86
86
|
try {
|
|
87
87
|
this.name = set.name ?? set.endpoint;
|
|
88
|
-
this.security = set.security ??
|
|
88
|
+
this.security = set.security ?? DyNTS_global_settings.defaultRouteSecurity;
|
|
89
89
|
|
|
90
90
|
this.type = set.type;
|
|
91
91
|
this.endpoint = set.endpoint;
|
|
92
92
|
|
|
93
|
+
this.logRequest = set.logRequest ?? DyNTS_global_settings.log_settings.request;
|
|
94
|
+
this.logRequestsParams =
|
|
95
|
+
set.logRequestsParams ?? DyNTS_global_settings.log_settings.requestsParams;
|
|
96
|
+
this.logRequestsContent =
|
|
97
|
+
set.logRequestsContent ?? DyNTS_global_settings.log_settings.requestsContent;
|
|
98
|
+
this.logResponseContent =
|
|
99
|
+
set.logResponseContent ?? DyNTS_global_settings.log_settings.responseContent;
|
|
100
|
+
|
|
93
101
|
if (!this.endpoint) {
|
|
94
102
|
throw new DyFM_Error({
|
|
95
103
|
status: 406,
|
|
@@ -105,19 +113,12 @@ export class DyNTS_Endpoint_Params {
|
|
|
105
113
|
|
|
106
114
|
let pathParts: string[] = this.endpoint.split('/');
|
|
107
115
|
|
|
108
|
-
pathParts = pathParts.filter((part: string): boolean => part
|
|
116
|
+
pathParts = pathParts.filter((part: string): boolean => part.startsWith(':'));
|
|
109
117
|
pathParts = pathParts.map((part: string): string => part.replace(':', ''));
|
|
110
118
|
this.pathParams = pathParts;
|
|
111
119
|
|
|
112
120
|
this.preProcesses = set.preProcesses ?? [];
|
|
113
121
|
this.tasks = set.tasks ?? [];
|
|
114
|
-
|
|
115
|
-
this.logRequest = set.logRequest ?? DyNTS_globalSettings.logRequest;
|
|
116
|
-
this.logRequestsParams = set.logRequestsParams ?? DyNTS_globalSettings.logRequestsParams;
|
|
117
|
-
this.logRequestsContent =
|
|
118
|
-
set.logRequestsContent ?? DyNTS_globalSettings.logRequestsContent;
|
|
119
|
-
this.logResponseContent =
|
|
120
|
-
set.logResponseContent ?? DyNTS_globalSettings.logResponseContent;
|
|
121
122
|
} catch (error) {
|
|
122
123
|
DyFM_Log.error(
|
|
123
124
|
`\nEndpoint params setup failed: name: '${set.name}' ` +
|
|
@@ -145,7 +146,11 @@ export class DyNTS_Endpoint_Params {
|
|
|
145
146
|
msg += `\npathParams: ${params}`;
|
|
146
147
|
}
|
|
147
148
|
|
|
148
|
-
if (
|
|
149
|
+
if (
|
|
150
|
+
this.logRequestsContent &&
|
|
151
|
+
req.body &&
|
|
152
|
+
0 < Object.keys(req.body).length
|
|
153
|
+
) {
|
|
149
154
|
DyFM_Log.info(msg + `\nbody:`, req.body);
|
|
150
155
|
} else {
|
|
151
156
|
DyFM_Log.info(msg);
|
|
@@ -285,10 +290,13 @@ export class DyNTS_Endpoint_Params {
|
|
|
285
290
|
'\n'
|
|
286
291
|
);
|
|
287
292
|
|
|
288
|
-
if (error?.flag?.includes?.(
|
|
289
|
-
DyFM_Log.error(
|
|
290
|
-
|
|
291
|
-
|
|
293
|
+
if (error?.flag?.includes?.(DyFM_errorFlag)) {
|
|
294
|
+
DyFM_Log.error(
|
|
295
|
+
`ErrorMessage: ${(error as DyFM_Error)._message}`,
|
|
296
|
+
`\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
|
|
297
|
+
`\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
|
|
298
|
+
`\nStack: ${(error as DyFM_Error).error.stack}`
|
|
299
|
+
);
|
|
292
300
|
}
|
|
293
301
|
}
|
|
294
302
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { DyFM_Array, DyFM_Log } from '@futdevpro/fsm-dynamo';
|
|
3
|
-
import {
|
|
3
|
+
import { DyNTS_global_settings } from '../../_collections/global-settings.const';
|
|
4
4
|
import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
|
|
5
5
|
|
|
6
6
|
|
|
@@ -16,7 +16,7 @@ export class DyNTS_SocketEvent<T>{
|
|
|
16
16
|
eventKey: DyNTS_SocketEventKey | string;
|
|
17
17
|
serviceName?: string;
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
preProcesses?: DyNTS_SocketEventPreprocessTask<any, any>[];
|
|
20
20
|
tasks?: DyNTS_SocketEventTask<T>[];
|
|
21
21
|
|
|
22
22
|
logEvent?: boolean;
|
|
@@ -44,7 +44,7 @@ export class DyNTS_SocketEvent<T>{
|
|
|
44
44
|
*
|
|
45
45
|
* the last function in the array should return the content in the type(T) of the socket<T>
|
|
46
46
|
*/
|
|
47
|
-
|
|
47
|
+
preProcesses?: DyNTS_SocketEventPreprocessTask<any, any>[],
|
|
48
48
|
/**
|
|
49
49
|
* tasks are the functions the service needs to run
|
|
50
50
|
*/
|
|
@@ -62,9 +62,9 @@ export class DyNTS_SocketEvent<T>{
|
|
|
62
62
|
try {
|
|
63
63
|
this.socketName = set.name ?? set.eventKey;
|
|
64
64
|
this.eventKey = set.eventKey;
|
|
65
|
-
this.serviceName = set.serviceName ?? '
|
|
65
|
+
this.serviceName = set.serviceName ?? 'UnknownSocketService';
|
|
66
66
|
|
|
67
|
-
this.
|
|
67
|
+
this.preProcesses = set.preProcesses ?? [];
|
|
68
68
|
this.tasks = set.tasks ?? [];
|
|
69
69
|
|
|
70
70
|
if (set.logEvent !== undefined) {
|
|
@@ -78,13 +78,13 @@ export class DyNTS_SocketEvent<T>{
|
|
|
78
78
|
DyNTS_SocketEventKey.disconnect,
|
|
79
79
|
] as string[]).includes(this.eventKey)
|
|
80
80
|
) {
|
|
81
|
-
this.logEvent =
|
|
82
|
-
|
|
81
|
+
this.logEvent = DyNTS_global_settings.log_settings.socket_mainEvents ||
|
|
82
|
+
DyNTS_global_settings.log_settings.socket_allEvents;
|
|
83
83
|
} else {
|
|
84
|
-
this.logEvent =
|
|
84
|
+
this.logEvent = DyNTS_global_settings.log_settings.socket_allEvents;
|
|
85
85
|
}
|
|
86
|
-
this.logEventContent = set.logEventContent
|
|
87
|
-
|
|
86
|
+
this.logEventContent = set.logEventContent ??
|
|
87
|
+
DyNTS_global_settings.log_settings.socket_eventContent;
|
|
88
88
|
} catch (error) {
|
|
89
89
|
DyFM_Log.error(
|
|
90
90
|
`\nSocket Event params setup failed (${this.serviceName}): ${set.eventKey}`,
|
|
@@ -99,7 +99,7 @@ export class DyNTS_SocketEvent<T>{
|
|
|
99
99
|
*
|
|
100
100
|
* @returns
|
|
101
101
|
*/
|
|
102
|
-
private async getPreLog(content: T
|
|
102
|
+
private async getPreLog(content: T): Promise<void> {
|
|
103
103
|
try {
|
|
104
104
|
if (this.logEventContent && this.eventKey !== DyNTS_SocketEventKey.connection) {
|
|
105
105
|
DyFM_Log.log(
|
|
@@ -121,11 +121,11 @@ export class DyNTS_SocketEvent<T>{
|
|
|
121
121
|
async executeEventTasks(content?: T, issuer?: string): Promise<void> {
|
|
122
122
|
try {
|
|
123
123
|
if (this.logEvent || this.logEventContent) {
|
|
124
|
-
await this.getPreLog(content
|
|
124
|
+
await this.getPreLog(content);
|
|
125
125
|
}
|
|
126
126
|
|
|
127
127
|
await DyFM_Array.asyncForEach(
|
|
128
|
-
this.
|
|
128
|
+
this.preProcesses,
|
|
129
129
|
async (preProcess: DyNTS_SocketEventPreprocessTask<any, any>) => {
|
|
130
130
|
content = await preProcess(content);
|
|
131
131
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
import {
|
|
2
|
+
import { DyNTS_global_settings } from '../../_collections/global-settings.const';
|
|
3
3
|
import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
|
|
4
4
|
|
|
5
5
|
/**
|
|
@@ -15,6 +15,6 @@ export class DyNTS_SocketServerService_Params<T = any> {
|
|
|
15
15
|
) {
|
|
16
16
|
this.name = set.name;
|
|
17
17
|
this.port = set.port;
|
|
18
|
-
this.security = set.security ? set.security :
|
|
18
|
+
this.security = set.security ? set.security : DyNTS_global_settings.defaultSocketSecurity;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
|
|
2
|
+
export interface DyNTS_GlobalLog_Settings {
|
|
3
|
+
/**
|
|
4
|
+
* this setting will set which logs will be shown
|
|
5
|
+
*/
|
|
6
|
+
highDetailedLogs?: boolean;
|
|
7
|
+
|
|
8
|
+
deep?: boolean;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* this setting will enable debug logs for setting up the application
|
|
12
|
+
*/
|
|
13
|
+
setup?: boolean;
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* this is an application wide default setting for route debug logs
|
|
17
|
+
*/
|
|
18
|
+
request?: boolean;
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* this is an application wide default setting for route debug logs
|
|
22
|
+
*/
|
|
23
|
+
requestsParams?: boolean;
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* this is an application wide default setting for route debug logs
|
|
27
|
+
*/
|
|
28
|
+
requestsContent?: boolean;
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* this is an application wide default setting for route debug logs
|
|
32
|
+
*/
|
|
33
|
+
responseContent?: boolean;
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* this is an application wide default setting for socket debug logs
|
|
38
|
+
*/
|
|
39
|
+
socket_allEvents?: boolean;
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* this is an application wide default setting for socket debug logs
|
|
43
|
+
*/
|
|
44
|
+
socket_mainEvents?: boolean;
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* this is an application wide default setting for socket debug logs
|
|
48
|
+
*/
|
|
49
|
+
socket_eventContent?: boolean;
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* this is an application wide default setting for api debug logs
|
|
54
|
+
*/
|
|
55
|
+
api_events?: boolean;
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* this is an application wide default setting for api debug logs
|
|
59
|
+
*/
|
|
60
|
+
api_requestContents?: boolean;
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* this is an application wide default setting for api debug logs
|
|
64
|
+
*/
|
|
65
|
+
api_requestSettings?: boolean;
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* this is an application wide default setting for api debug logs
|
|
69
|
+
*/
|
|
70
|
+
api_responseContents?: boolean;
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* this is an application wide default setting for detailed error logs
|
|
75
|
+
*/
|
|
76
|
+
detailedErrors?: boolean;
|
|
77
|
+
|
|
78
|
+
server_debug?: boolean;
|
|
79
|
+
|
|
80
|
+
functions?: boolean;
|
|
81
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
|
|
2
2
|
import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
|
|
3
|
+
import { DyNTS_GlobalLog_Settings } from './global-log-settings.interface';
|
|
3
4
|
|
|
4
5
|
/**
|
|
5
6
|
*
|
|
@@ -25,59 +26,7 @@ export interface DyNTS_Global_Settings {
|
|
|
25
26
|
defaultSocketSecurity: DyNTS_SocketSecurity;
|
|
26
27
|
|
|
27
28
|
/**
|
|
28
|
-
* this setting will
|
|
29
|
+
* this setting will set which logs will be shown
|
|
29
30
|
*/
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
/**
|
|
33
|
-
* this is an application wide default setting for route debug logs
|
|
34
|
-
*/
|
|
35
|
-
logRequest?: boolean;
|
|
36
|
-
/**
|
|
37
|
-
* this is an application wide default setting for route debug logs
|
|
38
|
-
*/
|
|
39
|
-
logRequestsParams?: boolean;
|
|
40
|
-
/**
|
|
41
|
-
* this is an application wide default setting for route debug logs
|
|
42
|
-
*/
|
|
43
|
-
logRequestsContent?: boolean;
|
|
44
|
-
/**
|
|
45
|
-
* this is an application wide default setting for route debug logs
|
|
46
|
-
*/
|
|
47
|
-
logResponseContent?: boolean;
|
|
48
|
-
|
|
49
|
-
/**
|
|
50
|
-
* this is an application wide default setting for socket debug logs
|
|
51
|
-
*/
|
|
52
|
-
logAllSocketEvent?: boolean;
|
|
53
|
-
/**
|
|
54
|
-
* this is an application wide default setting for socket debug logs
|
|
55
|
-
*/
|
|
56
|
-
logMainSocketEvents?: boolean;
|
|
57
|
-
/**
|
|
58
|
-
* this is an application wide default setting for socket debug logs
|
|
59
|
-
*/
|
|
60
|
-
logSocketEventContent?: boolean;
|
|
61
|
-
|
|
62
|
-
/**
|
|
63
|
-
* this is an application wide default setting for api debug logs
|
|
64
|
-
*/
|
|
65
|
-
logApiEvents?: boolean;
|
|
66
|
-
/**
|
|
67
|
-
* this is an application wide default setting for api debug logs
|
|
68
|
-
*/
|
|
69
|
-
logApiRequestContents?: boolean;
|
|
70
|
-
/**
|
|
71
|
-
* this is an application wide default setting for api debug logs
|
|
72
|
-
*/
|
|
73
|
-
logApiRequestSettings?: boolean;
|
|
74
|
-
/**
|
|
75
|
-
* this is an application wide default setting for api debug logs
|
|
76
|
-
*/
|
|
77
|
-
logApiResponseContents?: boolean;
|
|
78
|
-
|
|
79
|
-
/**
|
|
80
|
-
* this is an application wide default setting for detailed error logs
|
|
81
|
-
*/
|
|
82
|
-
logDetailedErrors?: boolean;
|
|
31
|
+
log_settings: DyNTS_GlobalLog_Settings;
|
|
83
32
|
}
|
|
@@ -22,7 +22,7 @@ import { DyNTS_AppExtended } from '../../_services/server/app-extended.server';
|
|
|
22
22
|
import { DyNTS_SocketServerService } from '../../_services/socket/socket-server.service';
|
|
23
23
|
import { DyNTS_SocketServer_Mock } from './socket-server.mock';
|
|
24
24
|
import { SocketClient_Mock } from './socket-client.mock';
|
|
25
|
-
import {
|
|
25
|
+
import { DyNTS_global_settings } from '../../_collections/global-settings.const';
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
28
|
*
|
|
@@ -144,7 +144,7 @@ export class DyNTS_AppWbMock_Mock extends DyNTS_AppExtended {
|
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
override overrideDynamoNTSGlobalSettings(): void {
|
|
147
|
-
|
|
147
|
+
DyNTS_global_settings.log_settings.requestsContent = true;
|
|
148
148
|
DyFM_error_defaults.issuerSystem = '-test-wb-mock-';
|
|
149
149
|
}
|
|
150
150
|
|
|
@@ -57,7 +57,6 @@ export class DyNTS_Usage_Controller extends DyNTS_Controller {
|
|
|
57
57
|
name: 'updateUsage',
|
|
58
58
|
type: DyNTS_HttpCallType.post,
|
|
59
59
|
endpoint: DyFM_usageModule_settings.endPoints.updateUsage,
|
|
60
|
-
logRequestsContent: false,
|
|
61
60
|
tasks: [
|
|
62
61
|
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
63
62
|
const usageService = new DyNTS_Usage_DataService({
|
|
@@ -9,7 +9,7 @@ import { DyNTS_HttpResponseType } from '../../_enums/http/http-response-type.enu
|
|
|
9
9
|
import {
|
|
10
10
|
DyNTS_ApiCall_Params
|
|
11
11
|
} from '../../_models/control-models/api-call-params.control-model';
|
|
12
|
-
import {
|
|
12
|
+
import { DyNTS_global_settings } from '../../_collections/global-settings.const';
|
|
13
13
|
|
|
14
14
|
export interface DyNTS_ApiCallInput_Params<T_Body = any> {
|
|
15
15
|
pathParams?: {
|
|
@@ -70,7 +70,7 @@ export class DyNTS_ApiService {
|
|
|
70
70
|
this.setupQueryParams<T_Body>(inputParams, callParams);
|
|
71
71
|
} */
|
|
72
72
|
|
|
73
|
-
if (
|
|
73
|
+
if (DyNTS_global_settings.log_settings.api_events) {
|
|
74
74
|
this.logEvent(url, inputParams, callParams);
|
|
75
75
|
}
|
|
76
76
|
|
|
@@ -172,7 +172,7 @@ export class DyNTS_ApiService {
|
|
|
172
172
|
`\n${callParams?.baseUrl}${callParams?.endPoint}`
|
|
173
173
|
);
|
|
174
174
|
|
|
175
|
-
if (
|
|
175
|
+
if (DyNTS_global_settings.log_settings.detailedErrors) {
|
|
176
176
|
DyFM_Log.error(`\ncallParams:`, callParams);
|
|
177
177
|
}
|
|
178
178
|
|
|
@@ -269,8 +269,8 @@ export class DyNTS_ApiService {
|
|
|
269
269
|
inputParams.body,
|
|
270
270
|
callParams.httpOptions
|
|
271
271
|
).then((res: Axios.AxiosResponse): T_Response => {
|
|
272
|
-
if (
|
|
273
|
-
if (
|
|
272
|
+
if (DyNTS_global_settings.log_settings.api_events) {
|
|
273
|
+
if (DyNTS_global_settings.log_settings.api_responseContents) {
|
|
274
274
|
DyFM_Log.success(`---> '${callParams.name}' api call was successful`, res.data);
|
|
275
275
|
|
|
276
276
|
} else {
|
|
@@ -293,8 +293,8 @@ export class DyNTS_ApiService {
|
|
|
293
293
|
): Promise<T_Response> {
|
|
294
294
|
return await axios.delete<T_Response>(url, callParams.httpOptions).then(
|
|
295
295
|
(res: Axios.AxiosResponse): T_Response => {
|
|
296
|
-
if (
|
|
297
|
-
if (
|
|
296
|
+
if (DyNTS_global_settings.log_settings.api_events) {
|
|
297
|
+
if (DyNTS_global_settings.log_settings.api_responseContents) {
|
|
298
298
|
DyFM_Log.success(`'${callParams.name}' was successful`, res.data);
|
|
299
299
|
} else {
|
|
300
300
|
DyFM_Log.success(`'${callParams.name}' was successful`);
|
|
@@ -315,8 +315,8 @@ export class DyNTS_ApiService {
|
|
|
315
315
|
): Promise<T_Response> {
|
|
316
316
|
return await axios.get<T_Response>(url, callParams.httpOptions).then(
|
|
317
317
|
(res: Axios.AxiosResponse): T_Response => {
|
|
318
|
-
if (
|
|
319
|
-
if (
|
|
318
|
+
if (DyNTS_global_settings.log_settings.api_events) {
|
|
319
|
+
if (DyNTS_global_settings.log_settings.api_responseContents) {
|
|
320
320
|
DyFM_Log.success(`'${callParams.name}' was successful`, res.data);
|
|
321
321
|
} else {
|
|
322
322
|
DyFM_Log.success(`'${callParams.name}' was successful`);
|
|
@@ -337,7 +337,7 @@ export class DyNTS_ApiService {
|
|
|
337
337
|
inputParams: DyNTS_ApiCallInput_Params<T_Body>,
|
|
338
338
|
callParams: DyNTS_ApiCall_Params
|
|
339
339
|
): void {
|
|
340
|
-
if (
|
|
340
|
+
if (DyNTS_global_settings.log_settings.api_requestContents) {
|
|
341
341
|
DyFM_Log.log(
|
|
342
342
|
`<--- outgoing API call: '${callParams?.name}' ` +
|
|
343
343
|
`\n(${url})` +
|
|
@@ -348,7 +348,7 @@ export class DyNTS_ApiService {
|
|
|
348
348
|
DyFM_Log.log(`<--- outgoing API call: '${callParams?.name}'`);
|
|
349
349
|
}
|
|
350
350
|
|
|
351
|
-
if (
|
|
351
|
+
if (DyNTS_global_settings.log_settings.api_requestSettings) {
|
|
352
352
|
DyFM_Log.log(`callParams:`, callParams);
|
|
353
353
|
DyFM_Log.log('inputParams:', {
|
|
354
354
|
pathParams: inputParams.pathParams ?? {},
|