@futdevpro/nts-dynamo 1.9.21 → 1.9.24
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 +19 -15
- 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 +37 -21
- package/build/_models/control-models/endpoint-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 +4 -51
- package/build/_models/interfaces/global-settings.interface.d.ts.map +1 -1
- package/build/_modules/custom-data/custom-data.controller.js +3 -3
- package/build/_modules/custom-data/custom-data.controller.js.map +1 -1
- package/build/_modules/custom-data/custom-data.data-service.d.ts +1 -1
- package/build/_modules/custom-data/custom-data.data-service.d.ts.map +1 -1
- package/build/_modules/custom-data/custom-data.data-service.js +2 -2
- package/build/_modules/custom-data/custom-data.data-service.js.map +1 -1
- package/build/_modules/custom-data/get-custom-data-routing-module.util.d.ts.map +1 -1
- package/build/_modules/custom-data/get-custom-data-routing-module.util.js +2 -2
- package/build/_modules/custom-data/get-custom-data-routing-module.util.js.map +1 -1
- package/build/_modules/custom-data/index.d.ts +1 -1
- package/build/_modules/custom-data/index.d.ts.map +1 -1
- package/build/_modules/custom-data/index.js +1 -1
- package/build/_modules/custom-data/index.js.map +1 -1
- package/build/_modules/mock/app-extended-server.mock.d.ts +2 -2
- package/build/_modules/mock/app-extended-server.mock.d.ts.map +1 -1
- package/build/_modules/mock/app-extended-server.mock.js +14 -14
- package/build/_modules/mock/app-extended-server.mock.js.map +1 -1
- package/build/_modules/mock/app-server.mock.js +10 -10
- package/build/_modules/mock/app-server.mock.js.map +1 -1
- package/build/_modules/mock/socket-client.mock.d.ts +3 -3
- package/build/_modules/mock/socket-client.mock.d.ts.map +1 -1
- package/build/_modules/mock/socket-client.mock.js +3 -3
- package/build/_modules/mock/socket-client.mock.js.map +1 -1
- package/build/_modules/mock/socket-server.mock.d.ts +4 -4
- package/build/_modules/mock/socket-server.mock.d.ts.map +1 -1
- package/build/_modules/mock/socket-server.mock.js +3 -3
- package/build/_modules/mock/socket-server.mock.js.map +1 -1
- package/build/_modules/socket/_enums/socket-security.enum.d.ts.map +1 -0
- package/build/_modules/socket/_enums/socket-security.enum.js.map +1 -0
- package/build/_modules/socket/_models/socket-client-service-params.control-model.d.ts.map +1 -0
- package/build/_modules/socket/_models/socket-client-service-params.control-model.js.map +1 -0
- package/build/{_models/control-models → _modules/socket/_models}/socket-event.control-model.d.ts +3 -3
- package/build/_modules/socket/_models/socket-event.control-model.d.ts.map +1 -0
- package/build/{_models/control-models → _modules/socket/_models}/socket-event.control-model.js +13 -13
- package/build/_modules/socket/_models/socket-event.control-model.js.map +1 -0
- package/build/_modules/socket/_models/socket-presence.control-model.d.ts.map +1 -0
- package/build/_modules/socket/_models/socket-presence.control-model.js.map +1 -0
- package/build/{_models/control-models → _modules/socket/_models}/socket-server-service-params.control-model.d.ts +1 -1
- package/build/_modules/socket/_models/socket-server-service-params.control-model.d.ts.map +1 -0
- package/build/{_models/control-models → _modules/socket/_models}/socket-server-service-params.control-model.js +2 -2
- package/build/_modules/socket/_models/socket-server-service-params.control-model.js.map +1 -0
- package/build/{_services/server → _modules/socket/_services}/app-extended.server.d.ts +2 -2
- package/build/_modules/socket/_services/app-extended.server.d.ts.map +1 -0
- package/build/{_services/server → _modules/socket/_services}/app-extended.server.js +32 -21
- package/build/_modules/socket/_services/app-extended.server.js.map +1 -0
- package/build/_modules/socket/_services/app-extended.server.spec.d.ts.map +1 -0
- package/build/{_services/server → _modules/socket/_services}/app-extended.server.spec.js +1 -1
- package/build/_modules/socket/_services/app-extended.server.spec.js.map +1 -0
- package/build/{_services/socket → _modules/socket/_services}/socket-client.service.d.ts +3 -3
- package/build/_modules/socket/_services/socket-client.service.d.ts.map +1 -0
- package/build/{_services/socket → _modules/socket/_services}/socket-client.service.js +8 -10
- package/build/_modules/socket/_services/socket-client.service.js.map +1 -0
- package/build/{_services/socket → _modules/socket/_services}/socket-server.service.d.ts +7 -7
- package/build/_modules/socket/_services/socket-server.service.d.ts.map +1 -0
- package/build/{_services/socket → _modules/socket/_services}/socket-server.service.js +18 -15
- package/build/_modules/socket/_services/socket-server.service.js.map +1 -0
- package/build/_modules/socket/_services/socket-server.service.spec.d.ts.map +1 -0
- package/build/{_services/socket → _modules/socket/_services}/socket-server.service.spec.js +1 -1
- package/build/_modules/socket/_services/socket-server.service.spec.js.map +1 -0
- package/build/_modules/socket/index.d.ts +9 -0
- package/build/_modules/socket/index.d.ts.map +1 -0
- package/build/_modules/socket/index.js +15 -0
- package/build/_modules/socket/index.js.map +1 -0
- package/build/_modules/test/get-test-routing-module.util.js +2 -2
- package/build/_modules/test/get-test-routing-module.util.js.map +1 -1
- package/build/_modules/test/index.d.ts +1 -1
- package/build/_modules/test/index.d.ts.map +1 -1
- package/build/_modules/test/index.js +1 -1
- package/build/_modules/test/index.js.map +1 -1
- package/build/_modules/test/test.controller.js +5 -5
- package/build/_modules/test/test.controller.js.map +1 -1
- package/build/_modules/usage/get-usage-routing-module.util.js +2 -2
- package/build/_modules/usage/get-usage-routing-module.util.js.map +1 -1
- package/build/_modules/usage/index.d.ts +1 -1
- package/build/_modules/usage/index.d.ts.map +1 -1
- package/build/_modules/usage/index.js +1 -1
- package/build/_modules/usage/index.js.map +1 -1
- package/build/_modules/usage/usage.controller.d.ts.map +1 -1
- package/build/_modules/usage/usage.controller.js +6 -7
- package/build/_modules/usage/usage.controller.js.map +1 -1
- package/build/_modules/usage/usage.data-service.d.ts +1 -1
- package/build/_modules/usage/usage.data-service.d.ts.map +1 -1
- package/build/_modules/usage/usage.data-service.js +3 -3
- package/build/_modules/usage/usage.data-service.js.map +1 -1
- package/build/_services/core/api.service.d.ts.map +1 -1
- package/build/_services/core/api.service.js +18 -13
- package/build/_services/core/api.service.js.map +1 -1
- package/build/_services/core/email.service.d.ts.map +1 -1
- package/build/_services/core/email.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.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/shared.static-service.d.ts +2 -1
- package/build/_services/shared.static-service.d.ts.map +1 -1
- package/build/_services/shared.static-service.js +2 -2
- package/build/_services/shared.static-service.js.map +1 -1
- package/build/_services/shared.static-service.spec.d.ts +2 -0
- package/build/_services/shared.static-service.spec.d.ts.map +1 -0
- package/build/_services/{shared.service.spec.js → shared.static-service.spec.js} +1 -1
- package/build/_services/shared.static-service.spec.js.map +1 -0
- package/build/index.d.ts +0 -3
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -23
- package/build/index.js.map +1 -1
- package/nodemon.json +2 -4
- package/package.json +20 -82
- package/src/_collections/global-settings.const.ts +23 -17
- package/src/_models/control-models/endpoint-params.control-model.ts +62 -35
- package/src/_models/interfaces/global-log-settings.interface.ts +81 -0
- package/src/_models/interfaces/global-settings.interface.ts +4 -55
- package/src/_modules/custom-data/custom-data.controller.ts +1 -1
- package/src/_modules/custom-data/custom-data.data-service.ts +1 -1
- package/src/_modules/custom-data/get-custom-data-routing-module.util.ts +2 -1
- package/src/_modules/custom-data/index.ts +1 -1
- package/src/_modules/mock/app-extended-server.mock.ts +6 -6
- package/src/_modules/mock/app-server.mock.ts +2 -2
- package/src/_modules/mock/socket-client.mock.ts +5 -3
- package/src/_modules/mock/socket-server.mock.ts +4 -4
- package/src/{_models/control-models → _modules/socket/_models}/socket-event.control-model.ts +14 -14
- package/src/{_models/control-models → _modules/socket/_models}/socket-server-service-params.control-model.ts +3 -3
- package/src/{_services/server → _modules/socket/_services}/app-extended.server.spec.ts +3 -1
- package/src/{_services/server → _modules/socket/_services}/app-extended.server.ts +48 -31
- package/src/{_services/socket → _modules/socket/_services}/socket-client.service.ts +17 -12
- package/src/{_services/socket → _modules/socket/_services}/socket-server.service.spec.ts +1 -1
- package/src/{_services/socket → _modules/socket/_services}/socket-server.service.ts +20 -17
- package/src/_modules/socket/index.ts +19 -0
- package/src/_modules/test/get-test-routing-module.util.ts +1 -1
- package/src/_modules/test/index.ts +1 -1
- package/src/_modules/test/test.controller.ts +1 -1
- package/src/_modules/usage/get-usage-routing-module.util.ts +1 -1
- package/src/_modules/usage/index.ts +1 -1
- package/src/_modules/usage/usage.controller.ts +3 -3
- package/src/_modules/usage/usage.data-service.ts +1 -1
- package/src/_services/core/api.service.ts +29 -17
- package/src/_services/core/email.service.ts +3 -1
- package/src/_services/core/global.service.ts +21 -8
- package/src/_services/route/routing-module.service.ts +10 -6
- package/src/_services/server/app.server.ts +87 -75
- package/src/_services/shared.static-service.ts +2 -1
- package/src/index.ts +1 -27
- package/tsconfig.json +1 -0
- package/build/_enums/socket-security.enum.d.ts.map +0 -1
- package/build/_enums/socket-security.enum.js.map +0 -1
- package/build/_models/control-models/socket-client-service-params.control-model.d.ts.map +0 -1
- package/build/_models/control-models/socket-client-service-params.control-model.js.map +0 -1
- package/build/_models/control-models/socket-event.control-model.d.ts.map +0 -1
- package/build/_models/control-models/socket-event.control-model.js.map +0 -1
- package/build/_models/control-models/socket-presence.control-model.d.ts.map +0 -1
- package/build/_models/control-models/socket-presence.control-model.js.map +0 -1
- package/build/_models/control-models/socket-server-service-params.control-model.d.ts.map +0 -1
- package/build/_models/control-models/socket-server-service-params.control-model.js.map +0 -1
- package/build/_modules/api-service.index.d.ts +0 -6
- package/build/_modules/api-service.index.d.ts.map +0 -1
- package/build/_modules/api-service.index.js +0 -12
- package/build/_modules/api-service.index.js.map +0 -1
- package/build/_modules/app-extended.index.d.ts +0 -18
- package/build/_modules/app-extended.index.d.ts.map +0 -1
- package/build/_modules/app-extended.index.js +0 -26
- package/build/_modules/app-extended.index.js.map +0 -1
- package/build/_modules/app.index.d.ts +0 -14
- package/build/_modules/app.index.d.ts.map +0 -1
- package/build/_modules/app.index.js +0 -22
- package/build/_modules/app.index.js.map +0 -1
- package/build/_modules/auth.index.d.ts +0 -4
- package/build/_modules/auth.index.d.ts.map +0 -1
- package/build/_modules/auth.index.js +0 -9
- package/build/_modules/auth.index.js.map +0 -1
- package/build/_modules/controller.index.d.ts +0 -5
- package/build/_modules/controller.index.d.ts.map +0 -1
- package/build/_modules/controller.index.js +0 -11
- package/build/_modules/controller.index.js.map +0 -1
- package/build/_modules/data-service.index.d.ts +0 -6
- package/build/_modules/data-service.index.d.ts.map +0 -1
- package/build/_modules/data-service.index.js +0 -11
- package/build/_modules/data-service.index.js.map +0 -1
- package/build/_modules/email.index.d.ts +0 -4
- package/build/_modules/email.index.d.ts.map +0 -1
- package/build/_modules/email.index.js +0 -10
- package/build/_modules/email.index.js.map +0 -1
- package/build/_modules/extended.index.d.ts +0 -6
- package/build/_modules/extended.index.d.ts.map +0 -1
- package/build/_modules/extended.index.js +0 -11
- package/build/_modules/extended.index.js.map +0 -1
- package/build/_services/server/app-extended.server.d.ts.map +0 -1
- package/build/_services/server/app-extended.server.js.map +0 -1
- package/build/_services/server/app-extended.server.spec.d.ts.map +0 -1
- package/build/_services/server/app-extended.server.spec.js.map +0 -1
- package/build/_services/shared.service.spec.d.ts +0 -2
- package/build/_services/shared.service.spec.d.ts.map +0 -1
- package/build/_services/shared.service.spec.js.map +0 -1
- package/build/_services/socket/socket-client.service.d.ts.map +0 -1
- package/build/_services/socket/socket-client.service.js.map +0 -1
- package/build/_services/socket/socket-server.service.d.ts.map +0 -1
- package/build/_services/socket/socket-server.service.js.map +0 -1
- package/build/_services/socket/socket-server.service.spec.d.ts.map +0 -1
- package/build/_services/socket/socket-server.service.spec.js.map +0 -1
- package/src/_modules/api-service.index.ts +0 -12
- package/src/_modules/app-extended.index.ts +0 -28
- package/src/_modules/app.index.ts +0 -24
- package/src/_modules/auth.index.ts +0 -7
- package/src/_modules/controller.index.ts +0 -10
- package/src/_modules/data-service.index.ts +0 -9
- package/src/_modules/email.index.ts +0 -8
- package/src/_modules/extended.index.ts +0 -9
- /package/build/{_enums → _modules/socket/_enums}/socket-security.enum.d.ts +0 -0
- /package/build/{_enums → _modules/socket/_enums}/socket-security.enum.js +0 -0
- /package/build/{_models/control-models → _modules/socket/_models}/socket-client-service-params.control-model.d.ts +0 -0
- /package/build/{_models/control-models → _modules/socket/_models}/socket-client-service-params.control-model.js +0 -0
- /package/build/{_models/control-models → _modules/socket/_models}/socket-presence.control-model.d.ts +0 -0
- /package/build/{_models/control-models → _modules/socket/_models}/socket-presence.control-model.js +0 -0
- /package/build/{_services/server → _modules/socket/_services}/app-extended.server.spec.d.ts +0 -0
- /package/build/{_services/socket → _modules/socket/_services}/socket-server.service.spec.d.ts +0 -0
- /package/src/{_enums → _modules/socket/_enums}/socket-security.enum.ts +0 -0
- /package/src/{_models/control-models → _modules/socket/_models}/socket-client-service-params.control-model.ts +0 -0
- /package/src/{_models/control-models → _modules/socket/_models}/socket-presence.control-model.ts +0 -0
- /package/src/_services/{shared.service.spec.ts → shared.static-service.spec.ts} +0 -0
package/src/{_models/control-models → _modules/socket/_models}/socket-event.control-model.ts
RENAMED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
import { DyFM_Array, DyFM_Log } from '@futdevpro/fsm-dynamo';
|
|
3
|
-
import {
|
|
4
|
-
import { DyNTS_SocketEventKey } from '
|
|
3
|
+
import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
|
|
4
|
+
import { DyNTS_SocketEventKey } from '../../../_enums/http/socket-event-type.enum';
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
export type DyNTS_SocketEventPreprocessTask<T = any, R = any> =
|
|
@@ -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,6 +1,6 @@
|
|
|
1
1
|
|
|
2
|
-
import {
|
|
3
|
-
import { DyNTS_SocketSecurity } from '
|
|
2
|
+
import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
|
|
3
|
+
import { DyNTS_SocketSecurity } from '../_enums/socket-security.enum';
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* socket handling and clarification is under development
|
|
@@ -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
|
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { DyFM_delay } from '@futdevpro/fsm-dynamo';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
DyNTS_AppExtendedBase_Mock, DyNTS_AppExtendedFull_Mock, DyNTS_AppWbMock_Mock
|
|
4
|
+
} from '../../mock/app-extended-server.mock';
|
|
3
5
|
|
|
4
6
|
describe('DyNTS_AppExtended;', (): void => {
|
|
5
7
|
describe('a extended-base instance;', (): void => {
|
|
@@ -4,13 +4,14 @@ import * as Http from 'http';
|
|
|
4
4
|
|
|
5
5
|
import { DyFM_Array, DyFM_Error, DyFM_Log, second, DyFM_wait } from '@futdevpro/fsm-dynamo';
|
|
6
6
|
|
|
7
|
-
import { DyNTS_App } from '
|
|
8
|
-
import { DyNTS_RouteSecurity } from '
|
|
9
|
-
import { DyNTS_SocketServerService } from '
|
|
10
|
-
import { DyNTS_SocketSecurity } from '
|
|
7
|
+
import { DyNTS_App } from '../../../_services/server/app.server';
|
|
8
|
+
import { DyNTS_RouteSecurity } from '../../../_enums/route-security.enum';
|
|
9
|
+
import { DyNTS_SocketServerService } from './socket-server.service';
|
|
10
|
+
import { DyNTS_SocketSecurity } from '../_enums/socket-security.enum';
|
|
11
11
|
import {
|
|
12
12
|
DyNTS_AppExtSysControls
|
|
13
|
-
} from '
|
|
13
|
+
} from '../../../_models/control-models/app-ext-system-controls.control-model';
|
|
14
|
+
import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
|
|
14
15
|
|
|
15
16
|
/**
|
|
16
17
|
* This will be the MAIN service of our server project,
|
|
@@ -139,16 +140,25 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
139
140
|
super(true);
|
|
140
141
|
|
|
141
142
|
this.asyncConstructExt().catch((error: any): void => {
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
143
|
+
if (DyNTS_global_settings.log_settings.highDetailedLogs) {
|
|
144
|
+
DyFM_Log.H_error(
|
|
145
|
+
`Extended Application: ${this.params?.name} start failed.` +
|
|
146
|
+
`\nERROR:`, error
|
|
147
|
+
);
|
|
148
|
+
} else {
|
|
149
|
+
DyFM_Log.H_error(
|
|
150
|
+
`Extended Application: ${this.params?.name} start failed.`,
|
|
151
|
+
`\nErrorMessage: ${(error as DyFM_Error)._message}`,
|
|
152
|
+
`\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
|
|
153
|
+
`\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
|
|
154
|
+
`\nStack: ${(error as DyFM_Error).error.stack}`,
|
|
155
|
+
);
|
|
156
|
+
}
|
|
147
157
|
});
|
|
148
158
|
}
|
|
149
159
|
|
|
150
160
|
private async asyncConstructExt(): Promise<void> {
|
|
151
|
-
if (this.
|
|
161
|
+
if (this.fnLogs && this.deepLog) console.log('\nfn:. asyncConstruct-extended');
|
|
152
162
|
try {
|
|
153
163
|
this.systemControlsExt.appExtended.init = true;
|
|
154
164
|
|
|
@@ -178,11 +188,20 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
178
188
|
DyFM_Log.H_success(`${this.params.name} started successfully.`);
|
|
179
189
|
|
|
180
190
|
} catch (error) {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
191
|
+
if (DyNTS_global_settings.log_settings.highDetailedLogs) {
|
|
192
|
+
DyFM_Log.H_error(
|
|
193
|
+
`Extended Application: ${this.params?.name} start failed.` +
|
|
194
|
+
`\nERROR:`, error
|
|
195
|
+
);
|
|
196
|
+
} else {
|
|
197
|
+
DyFM_Log.H_error(
|
|
198
|
+
`Extended Application: ${this.params?.name} start failed.`,
|
|
199
|
+
`\nErrorMessage: ${(error as DyFM_Error)._message}`,
|
|
200
|
+
`\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
|
|
201
|
+
`\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
|
|
202
|
+
`\nStack: ${(error as DyFM_Error).error.stack}`,
|
|
203
|
+
);
|
|
204
|
+
}
|
|
186
205
|
|
|
187
206
|
throw new DyFM_Error({
|
|
188
207
|
errorCode: 'NTS-AES-001',
|
|
@@ -206,7 +225,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
206
225
|
}
|
|
207
226
|
|
|
208
227
|
override async ready(timeout: number = 4 * second): Promise<void> {
|
|
209
|
-
if (this.
|
|
228
|
+
if (this.fnLogs) console.log('\nfn:. ready-extended');
|
|
210
229
|
await super.ready(timeout);
|
|
211
230
|
|
|
212
231
|
let ready: boolean = false;
|
|
@@ -214,15 +233,14 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
214
233
|
|
|
215
234
|
if (this.constructErrors.length) {
|
|
216
235
|
DyFM_Log.H_error(
|
|
217
|
-
`Extended Application: ${this.params?.name} start failed
|
|
218
|
-
this.constructErrors,
|
|
219
|
-
'\n'
|
|
236
|
+
`Extended Application: ${this.params?.name} start failed.`,
|
|
237
|
+
`construct ERRORS:`, this.constructErrors,
|
|
220
238
|
);
|
|
221
239
|
|
|
222
240
|
throw new DyFM_Error({
|
|
223
|
-
message: `${this.params?.name} start failed
|
|
241
|
+
message: `${this.params?.name} start failed.`,
|
|
224
242
|
additionalContent: this.constructErrors,
|
|
225
|
-
error: this.constructErrors?.[0] ?? new Error()
|
|
243
|
+
error: this.constructErrors?.[0] ?? new Error(),
|
|
226
244
|
});
|
|
227
245
|
}
|
|
228
246
|
|
|
@@ -245,21 +263,20 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
245
263
|
if (this.constructErrors.length) {
|
|
246
264
|
DyFM_Log.H_error(
|
|
247
265
|
`Extended Application: ${this.params?.name} start failed. TIMEOUT`,
|
|
248
|
-
this.constructErrors,
|
|
249
|
-
'\n'
|
|
266
|
+
`\nconstruct ERRORS:`, this.constructErrors,
|
|
250
267
|
);
|
|
251
268
|
|
|
252
269
|
throw new DyFM_Error({
|
|
253
270
|
message: `${this.params?.name} start failed. TIMEOUT`,
|
|
254
271
|
additionalContent: this.constructErrors,
|
|
255
|
-
error: this.constructErrors?.[0] ?? new Error()
|
|
272
|
+
error: this.constructErrors?.[0] ?? new Error(),
|
|
256
273
|
});
|
|
257
274
|
}
|
|
258
275
|
|
|
259
276
|
if (ready) {
|
|
260
277
|
this.systemControlsExt.appExtended.started = true;
|
|
261
278
|
|
|
262
|
-
if (this.
|
|
279
|
+
if (this.fnLogs && this.deepLog) console.log('\nfn:. ready-extended: return');
|
|
263
280
|
|
|
264
281
|
return;
|
|
265
282
|
} else {
|
|
@@ -300,13 +317,13 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
300
317
|
httpsSocketServer: this.systemControlsExt.httpsSocketServer.getReady(),
|
|
301
318
|
},
|
|
302
319
|
},
|
|
303
|
-
error: this.constructErrors?.[0] ?? new Error()
|
|
320
|
+
error: this.constructErrors?.[0] ?? new Error(),
|
|
304
321
|
});
|
|
305
322
|
}
|
|
306
323
|
}
|
|
307
324
|
|
|
308
325
|
override async stop(): Promise<void> {
|
|
309
|
-
if (this.
|
|
326
|
+
if (this.fnLogs) console.log('\nfn:. stop-extended');
|
|
310
327
|
|
|
311
328
|
if (this.started) {
|
|
312
329
|
await super.stop(true);
|
|
@@ -325,7 +342,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
325
342
|
new DyFM_Error({
|
|
326
343
|
errorCode: 'NTS-AES-120',
|
|
327
344
|
message: `SocketServer close failed.`,
|
|
328
|
-
error: err
|
|
345
|
+
error: err,
|
|
329
346
|
})
|
|
330
347
|
);
|
|
331
348
|
} else {
|
|
@@ -346,7 +363,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
346
363
|
*
|
|
347
364
|
*/
|
|
348
365
|
private setSocketSecurity(): void {
|
|
349
|
-
if (this.
|
|
366
|
+
if (this.fnLogs) console.log('\nfn:. setSocketSecurity');
|
|
350
367
|
this.socketServices.forEach((service: DyNTS_SocketServerService<any>): void => {
|
|
351
368
|
if (!this.socketSecurity) {
|
|
352
369
|
this.socketSecurity = DyNTS_RouteSecurity[service.security];
|
|
@@ -364,7 +381,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
|
|
|
364
381
|
*/
|
|
365
382
|
private async setupSocketServerServices(): Promise<void> {
|
|
366
383
|
try {
|
|
367
|
-
if (this.
|
|
384
|
+
if (this.fnLogs) console.log('\nfn:. setupSocketServerServices');
|
|
368
385
|
/* let httpServer: Http.Server; */
|
|
369
386
|
|
|
370
387
|
if (this.socketSecurity !== DyNTS_RouteSecurity.secure) {
|
|
@@ -3,14 +3,16 @@
|
|
|
3
3
|
|
|
4
4
|
import * as SocketIO from 'socket.io-client';
|
|
5
5
|
|
|
6
|
-
import { DyNTS_SingletonService } from '
|
|
7
|
-
import {
|
|
6
|
+
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
|
|
7
|
+
import {
|
|
8
|
+
DyFM_Error, DyFM_Log, DyFM_delay, DyFM_Array, DyFM_errorFlag
|
|
9
|
+
} from '@futdevpro/fsm-dynamo';
|
|
8
10
|
import {
|
|
9
11
|
DyNTS_SocketClientService_Params
|
|
10
|
-
} from '
|
|
11
|
-
import {
|
|
12
|
-
import { DyNTS_SocketEvent } from '
|
|
13
|
-
import { DyNTS_SocketEventKey } from '
|
|
12
|
+
} from '../_models/socket-client-service-params.control-model';
|
|
13
|
+
import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
|
|
14
|
+
import { DyNTS_SocketEvent } from '../_models/socket-event.control-model';
|
|
15
|
+
import { DyNTS_SocketEventKey } from '../../../_enums/http/socket-event-type.enum';
|
|
14
16
|
|
|
15
17
|
export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
|
|
16
18
|
|
|
@@ -25,8 +27,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
|
|
|
25
27
|
protected _connected: boolean = false;
|
|
26
28
|
get connected(): boolean { return this._connected; }
|
|
27
29
|
|
|
28
|
-
protected debugLog: boolean =
|
|
29
|
-
protected logFn: boolean;
|
|
30
|
+
protected debugLog: boolean = DyNTS_global_settings.log_settings.setup;
|
|
31
|
+
protected logFn: boolean = DyNTS_global_settings.log_settings.functions;
|
|
30
32
|
|
|
31
33
|
private defaultEvents: DyNTS_SocketEvent<any>[] = [
|
|
32
34
|
new DyNTS_SocketEvent<any>({
|
|
@@ -79,10 +81,13 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
|
|
|
79
81
|
this.asyncConstructor().catch((error: any) => {
|
|
80
82
|
DyFM_Log.error(`socket-client(${this.params?.name}) Service setup failed! ERROR:`, error);
|
|
81
83
|
|
|
82
|
-
if (error?.flag?.includes?.(
|
|
83
|
-
DyFM_Log.error(
|
|
84
|
-
|
|
85
|
-
|
|
84
|
+
if (error?.flag?.includes?.(DyFM_errorFlag)) {
|
|
85
|
+
DyFM_Log.error(
|
|
86
|
+
`ErrorMessage: ${(error as DyFM_Error)._message}`,
|
|
87
|
+
`\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
|
|
88
|
+
`\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
|
|
89
|
+
`\nStack: ${(error as DyFM_Error).error.stack}`
|
|
90
|
+
);
|
|
86
91
|
}
|
|
87
92
|
});
|
|
88
93
|
}
|
|
@@ -5,19 +5,19 @@ import {
|
|
|
5
5
|
DyFM_AnyError, DyFM_Array, DyFM_Error, DyFM_Error_Settings, DyFM_Log
|
|
6
6
|
} from '@futdevpro/fsm-dynamo';
|
|
7
7
|
|
|
8
|
-
import { DyNTS_SingletonService } from '
|
|
9
|
-
import { DyNTS_SocketEventKey } from '
|
|
10
|
-
import { DyNTS_SocketSecurity } from '
|
|
8
|
+
import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
|
|
9
|
+
import { DyNTS_SocketEventKey } from '../../../_enums/http/socket-event-type.enum';
|
|
10
|
+
import { DyNTS_SocketSecurity } from '../_enums/socket-security.enum';
|
|
11
11
|
import {
|
|
12
12
|
DyNTS_SocketServerService_Params
|
|
13
|
-
} from '
|
|
13
|
+
} from '../_models/socket-server-service-params.control-model';
|
|
14
14
|
import {
|
|
15
15
|
DyNTS_SocketPresence
|
|
16
|
-
} from '
|
|
16
|
+
} from '../_models/socket-presence.control-model';
|
|
17
17
|
import {
|
|
18
18
|
DyNTS_SocketEvent, DyNTS_SocketEventPreprocessTask, DyNTS_SocketEventTask
|
|
19
|
-
} from '
|
|
20
|
-
import {
|
|
19
|
+
} from '../_models/socket-event.control-model';
|
|
20
|
+
import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* You need to define the following functions:
|
|
@@ -62,8 +62,12 @@ export abstract class DyNTS_SocketServerService<
|
|
|
62
62
|
): Promise<T_Presence>;
|
|
63
63
|
protected presences: T_Presence[] = [];
|
|
64
64
|
|
|
65
|
-
|
|
66
|
-
|
|
65
|
+
get logSetup(): boolean {
|
|
66
|
+
return DyNTS_global_settings.log_settings.setup;
|
|
67
|
+
}
|
|
68
|
+
get highDetailedLogs(): boolean {
|
|
69
|
+
return DyNTS_global_settings.log_settings.highDetailedLogs;
|
|
70
|
+
}
|
|
67
71
|
|
|
68
72
|
defaultErrorUserMsg =
|
|
69
73
|
`We encountered an unhandled Socket Server Error, ` +
|
|
@@ -82,7 +86,6 @@ export abstract class DyNTS_SocketServerService<
|
|
|
82
86
|
|
|
83
87
|
private async asyncConstructor(): Promise<void> {
|
|
84
88
|
try {
|
|
85
|
-
this.logSetup = DyNTS_globalSettings.logSetup;
|
|
86
89
|
this.params = this.getServiceParams();
|
|
87
90
|
this.incomingEvents = this.getIncomingEvents() ?? [];
|
|
88
91
|
|
|
@@ -147,7 +150,7 @@ export abstract class DyNTS_SocketServerService<
|
|
|
147
150
|
}
|
|
148
151
|
|
|
149
152
|
if (this.getSubscriptionPreProcessess) {
|
|
150
|
-
this.subscriptionEvent.
|
|
153
|
+
this.subscriptionEvent.preProcesses.push(...this.getSubscriptionPreProcessess());
|
|
151
154
|
}
|
|
152
155
|
|
|
153
156
|
if (this.getSubscriptionTasks) {
|
|
@@ -175,7 +178,7 @@ export abstract class DyNTS_SocketServerService<
|
|
|
175
178
|
}
|
|
176
179
|
|
|
177
180
|
if (this.getUnsubscribePreProcessess) {
|
|
178
|
-
this.unsubscribeEvent.
|
|
181
|
+
this.unsubscribeEvent.preProcesses.push(...this.getUnsubscribePreProcessess());
|
|
179
182
|
}
|
|
180
183
|
|
|
181
184
|
if (this.getUnsubscribeTasks) {
|
|
@@ -249,7 +252,7 @@ export abstract class DyNTS_SocketServerService<
|
|
|
249
252
|
successCallback: () => void
|
|
250
253
|
): Promise<SocketIO.Server> {
|
|
251
254
|
try {
|
|
252
|
-
if (this.
|
|
255
|
+
if (this.highDetailedLogs) console.log('\nfn:. setupSocketServer');
|
|
253
256
|
|
|
254
257
|
newSocketServer.on(DyNTS_SocketEventKey.connection, async (socket: SocketIO.Socket) => {
|
|
255
258
|
try {
|
|
@@ -267,7 +270,7 @@ export abstract class DyNTS_SocketServerService<
|
|
|
267
270
|
* but subscribe event is an exception from this,
|
|
268
271
|
* to be able to check content before getPresenceFromSubscrioptionEventContent
|
|
269
272
|
*/
|
|
270
|
-
if (
|
|
273
|
+
if (DyNTS_global_settings.log_settings.socket_eventContent) {
|
|
271
274
|
DyFM_Log.log(
|
|
272
275
|
`--=> incoming socket(${this.params.name}) ` +
|
|
273
276
|
`event: ${DyNTS_SocketEventKey.subscribe};` +
|
|
@@ -325,7 +328,7 @@ export abstract class DyNTS_SocketServerService<
|
|
|
325
328
|
* but unsubscribe event is an exception from this,
|
|
326
329
|
* to be able to check content before getPresenceFromSubscrioptionEventContent
|
|
327
330
|
*/
|
|
328
|
-
if (
|
|
331
|
+
if (DyNTS_global_settings.log_settings.socket_eventContent) {
|
|
329
332
|
DyFM_Log.log(
|
|
330
333
|
`--=> incoming socket(${this.params.name}) ` +
|
|
331
334
|
`event: ${DyNTS_SocketEventKey.unsubscribe};` +
|
|
@@ -385,7 +388,7 @@ export abstract class DyNTS_SocketServerService<
|
|
|
385
388
|
);
|
|
386
389
|
});
|
|
387
390
|
|
|
388
|
-
if (
|
|
391
|
+
if (DyNTS_global_settings.log_settings.socket_mainEvents) {
|
|
389
392
|
DyFM_Log.success(`< > socket(${this.params.name}): new CONNECTION established`);
|
|
390
393
|
}
|
|
391
394
|
} catch (error) {
|
|
@@ -626,7 +629,7 @@ export abstract class DyNTS_SocketServerService<
|
|
|
626
629
|
|
|
627
630
|
presence.emitEvent(event, content, issuer);
|
|
628
631
|
|
|
629
|
-
if (
|
|
632
|
+
if (DyNTS_global_settings.log_settings.socket_eventContent) {
|
|
630
633
|
DyFM_Log.success(
|
|
631
634
|
` <--= emitted socket(${this.params.name}) event for presence: ${event}, ` +
|
|
632
635
|
`\n presenceId: ${id}, sockets: ${presence.sockets.length}` +
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
// ENUMS
|
|
5
|
+
export * from './_enums/socket-security.enum';
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
// MODELS
|
|
9
|
+
export * from './_models/socket-client-service-params.control-model';
|
|
10
|
+
export * from './_models/socket-event.control-model';
|
|
11
|
+
export * from './_models/socket-presence.control-model';
|
|
12
|
+
export * from './_models/socket-server-service-params.control-model';
|
|
13
|
+
|
|
14
|
+
// SERVICES
|
|
15
|
+
export * from './_services/app-extended.server';
|
|
16
|
+
export * from './_services/socket-client.service';
|
|
17
|
+
export * from './_services/socket-server.service';
|
|
18
|
+
|
|
19
|
+
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
import { Request, Response } from 'express';
|
|
3
3
|
|
|
4
|
-
import { DyFM_testModule_settings } from '@futdevpro/fsm-dynamo/test
|
|
4
|
+
import { DyFM_testModule_settings } from '@futdevpro/fsm-dynamo/test';
|
|
5
5
|
|
|
6
6
|
import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
|
|
7
7
|
import { DyNTS_Controller } from '../../_services/route/controller.service';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
import { DyFM_usageModule_settings } from '@futdevpro/fsm-dynamo/usage
|
|
2
|
+
import { DyFM_usageModule_settings } from '@futdevpro/fsm-dynamo/usage';
|
|
3
3
|
import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
|
|
4
4
|
import {
|
|
5
5
|
DyNTS_RoutingModule_Settings
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
|
|
2
2
|
import { Request, Response } from 'express';
|
|
3
3
|
|
|
4
|
+
import { DyFM_RelativeDate } from '@futdevpro/fsm-dynamo';
|
|
4
5
|
import {
|
|
5
|
-
DyFM_usageModule_settings, DyFM_UsageSession
|
|
6
|
-
} from '@futdevpro/fsm-dynamo/usage
|
|
6
|
+
DyFM_usageModule_settings, DyFM_UsageSession
|
|
7
|
+
} from '@futdevpro/fsm-dynamo/usage';
|
|
7
8
|
|
|
8
9
|
import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
|
|
9
10
|
import { DyNTS_AuthService } from '../../_services/core/auth.service';
|
|
@@ -57,7 +58,6 @@ export class DyNTS_Usage_Controller extends DyNTS_Controller {
|
|
|
57
58
|
name: 'updateUsage',
|
|
58
59
|
type: DyNTS_HttpCallType.post,
|
|
59
60
|
endpoint: DyFM_usageModule_settings.endPoints.updateUsage,
|
|
60
|
-
logRequestsContent: false,
|
|
61
61
|
tasks: [
|
|
62
62
|
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
63
63
|
const usageService = new DyNTS_Usage_DataService({
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { Request } from 'express';
|
|
3
3
|
import { DyFM_Error, DyFM_Time, DyFM_RelativeDate } from '@futdevpro/fsm-dynamo';
|
|
4
4
|
import { DyFM_UsageSession, DyFM_usageSessionModel_params, DyFM_UsageData,
|
|
5
|
-
DyFM_DailyUsageData } from '@futdevpro/fsm-dynamo/usage
|
|
5
|
+
DyFM_DailyUsageData } from '@futdevpro/fsm-dynamo/usage';
|
|
6
6
|
|
|
7
7
|
import { DyNTS_DataService } from '../../_services/base/data.service';
|
|
8
8
|
import { DyNTS_Shared } from '../../_services/shared.static-service';
|