@futdevpro/nts-dynamo 1.7.28 → 1.9.1
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/.copilot/patterns.json +1 -1
- package/.eslintrc.json +9 -1
- package/lib/_constants/global-settings.const.d.ts +2 -2
- package/lib/_constants/global-settings.const.d.ts.map +1 -1
- package/lib/_constants/global-settings.const.js +2 -2
- package/lib/_constants/global-settings.const.js.map +1 -1
- package/lib/_constants/mocks/app-extended-server.mock.d.ts +12 -12
- package/lib/_constants/mocks/app-extended-server.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/app-extended-server.mock.js +16 -16
- package/lib/_constants/mocks/app-extended-server.mock.js.map +1 -1
- package/lib/_constants/mocks/app-params.mock.d.ts +2 -2
- package/lib/_constants/mocks/app-params.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/app-params.mock.js +1 -1
- package/lib/_constants/mocks/app-params.mock.js.map +1 -1
- package/lib/_constants/mocks/app-server.mock.d.ts +15 -15
- package/lib/_constants/mocks/app-server.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/app-server.mock.js +10 -10
- package/lib/_constants/mocks/app-server.mock.js.map +1 -1
- package/lib/_constants/mocks/data-model.mock.d.ts +5 -5
- package/lib/_constants/mocks/data-model.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/data-model.mock.js +24 -24
- package/lib/_constants/mocks/data-model.mock.js.map +1 -1
- package/lib/_constants/mocks/email-service-collection.mock.d.ts +2 -2
- package/lib/_constants/mocks/email-service-collection.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/email-service-collection.mock.js +1 -1
- package/lib/_constants/mocks/email-service-collection.mock.js.map +1 -1
- package/lib/_constants/mocks/endpoint.mock.d.ts +8 -8
- package/lib/_constants/mocks/endpoint.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/endpoint.mock.js +18 -18
- package/lib/_constants/mocks/endpoint.mock.js.map +1 -1
- package/lib/_constants/mocks/socket-client.mock.d.ts +2 -2
- package/lib/_constants/mocks/socket-client.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/socket-client.mock.js +1 -1
- package/lib/_constants/mocks/socket-client.mock.js.map +1 -1
- package/lib/_constants/mocks/socket-server.mock.d.ts +2 -2
- package/lib/_constants/mocks/socket-server.mock.d.ts.map +1 -1
- package/lib/_constants/mocks/socket-server.mock.js +1 -1
- package/lib/_constants/mocks/socket-server.mock.js.map +1 -1
- package/lib/_enums/data-model-type.enum.d.ts +1 -0
- package/lib/_enums/data-model-type.enum.d.ts.map +1 -1
- package/lib/_enums/data-model-type.enum.js +1 -0
- package/lib/_enums/data-model-type.enum.js.map +1 -1
- package/lib/_models/control-models/api-call-params.control-model.d.ts +3 -3
- package/lib/_models/control-models/api-call-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/api-call-params.control-model.js +6 -6
- package/lib/_models/control-models/api-call-params.control-model.js.map +1 -1
- package/lib/_models/control-models/{app-system-controls.control-model copy.d.ts → app-ext-system-controls.control-model.d.ts} +1 -1
- package/lib/_models/control-models/app-ext-system-controls.control-model.d.ts.map +1 -0
- package/lib/_models/control-models/{app-system-controls.control-model copy.js → app-ext-system-controls.control-model.js} +1 -1
- package/lib/_models/control-models/app-ext-system-controls.control-model.js.map +1 -0
- package/lib/_models/control-models/app-params.control-model.d.ts +2 -2
- package/lib/_models/control-models/app-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/app-params.control-model.js +3 -3
- package/lib/_models/control-models/app-params.control-model.js.map +1 -1
- package/lib/_models/control-models/endpoint-params.control-model.d.ts +1 -1
- package/lib/_models/control-models/endpoint-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/endpoint-params.control-model.js +25 -25
- package/lib/_models/control-models/endpoint-params.control-model.js.map +1 -1
- package/lib/_models/control-models/http-settings.control-model.d.ts +2 -2
- package/lib/_models/control-models/http-settings.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/http-settings.control-model.js +3 -3
- package/lib/_models/control-models/http-settings.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-client-service-params.control-model.d.ts +2 -2
- package/lib/_models/control-models/socket-client-service-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-client-service-params.control-model.js +3 -3
- package/lib/_models/control-models/socket-client-service-params.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-event.control-model.js +11 -11
- package/lib/_models/control-models/socket-event.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-presence.control-model.d.ts +12 -0
- package/lib/_models/control-models/socket-presence.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-presence.control-model.js +12 -8
- package/lib/_models/control-models/socket-presence.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-server-service-params.control-model.d.ts +2 -2
- package/lib/_models/control-models/socket-server-service-params.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-server-service-params.control-model.js +4 -4
- package/lib/_models/control-models/socket-server-service-params.control-model.js.map +1 -1
- package/lib/_models/interfaces/certification-settings.interface.d.ts +1 -1
- package/lib/_models/interfaces/certification-settings.interface.d.ts.map +1 -1
- package/lib/_models/interfaces/global-service-settings.interface.d.ts +6 -6
- package/lib/_models/interfaces/global-service-settings.interface.d.ts.map +1 -1
- package/lib/_models/interfaces/global-settings.interface.d.ts +1 -1
- package/lib/_models/interfaces/global-settings.interface.d.ts.map +1 -1
- package/lib/_models/interfaces/routing-module-settings.interface.d.ts +1 -1
- package/lib/_models/interfaces/routing-module-settings.interface.d.ts.map +1 -1
- package/lib/_models/types/db-filter.type.d.ts.map +1 -1
- package/lib/_models/types/db-update.type.d.ts +2 -1
- package/lib/_models/types/db-update.type.d.ts.map +1 -1
- package/lib/_modules/custom-data/custom-data.controller.d.ts +2 -2
- package/lib/_modules/custom-data/custom-data.controller.d.ts.map +1 -1
- package/lib/_modules/custom-data/custom-data.controller.js +18 -16
- package/lib/_modules/custom-data/custom-data.controller.js.map +1 -1
- package/lib/_modules/custom-data/custom-data.data-service.d.ts +3 -3
- package/lib/_modules/custom-data/custom-data.data-service.d.ts.map +1 -1
- package/lib/_modules/custom-data/custom-data.data-service.js +4 -4
- package/lib/_modules/custom-data/custom-data.data-service.js.map +1 -1
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.d.ts +1 -1
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.d.ts.map +1 -1
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.js +5 -5
- package/lib/_modules/custom-data/get-custom-data-routing-module.util.js.map +1 -1
- package/lib/_modules/test/get-test-routing-module.util.d.ts +1 -1
- package/lib/_modules/test/get-test-routing-module.util.d.ts.map +1 -1
- package/lib/_modules/test/get-test-routing-module.util.js +5 -5
- package/lib/_modules/test/get-test-routing-module.util.js.map +1 -1
- package/lib/_modules/test/test.controller.d.ts +2 -2
- package/lib/_modules/test/test.controller.d.ts.map +1 -1
- package/lib/_modules/test/test.controller.js +33 -33
- package/lib/_modules/test/test.controller.js.map +1 -1
- package/lib/_modules/usage/get-usage-routing-module.util.d.ts +1 -1
- package/lib/_modules/usage/get-usage-routing-module.util.d.ts.map +1 -1
- package/lib/_modules/usage/get-usage-routing-module.util.js +5 -5
- package/lib/_modules/usage/get-usage-routing-module.util.js.map +1 -1
- package/lib/_modules/usage/usage.controller.d.ts +2 -2
- package/lib/_modules/usage/usage.controller.d.ts.map +1 -1
- package/lib/_modules/usage/usage.controller.js +17 -17
- package/lib/_modules/usage/usage.controller.js.map +1 -1
- package/lib/_modules/usage/usage.data-service.d.ts +8 -8
- package/lib/_modules/usage/usage.data-service.d.ts.map +1 -1
- package/lib/_modules/usage/usage.data-service.js +11 -11
- package/lib/_modules/usage/usage.data-service.js.map +1 -1
- package/lib/_services/base/data.service.d.ts +4 -4
- package/lib/_services/base/data.service.d.ts.map +1 -1
- package/lib/_services/base/data.service.js +50 -50
- package/lib/_services/base/data.service.js.map +1 -1
- package/lib/_services/base/db.service.d.ts +6 -6
- package/lib/_services/base/db.service.d.ts.map +1 -1
- package/lib/_services/base/db.service.js +41 -37
- package/lib/_services/base/db.service.js.map +1 -1
- package/lib/_services/core/api.service.d.ts +4 -4
- package/lib/_services/core/api.service.d.ts.map +1 -1
- package/lib/_services/core/api.service.js +34 -34
- package/lib/_services/core/api.service.js.map +1 -1
- package/lib/_services/core/auth.service.d.ts +6 -6
- package/lib/_services/core/auth.service.js +2 -2
- package/lib/_services/core/auth.service.js.map +1 -1
- package/lib/_services/core/email.service.d.ts +4 -4
- package/lib/_services/core/email.service.d.ts.map +1 -1
- package/lib/_services/core/email.service.js +23 -23
- package/lib/_services/core/email.service.js.map +1 -1
- package/lib/_services/core/global.service.d.ts +13 -13
- package/lib/_services/core/global.service.d.ts.map +1 -1
- package/lib/_services/core/global.service.js +20 -7
- package/lib/_services/core/global.service.js.map +1 -1
- package/lib/_services/core/service-collection.service.d.ts +1 -1
- package/lib/_services/core/service-collection.service.d.ts.map +1 -1
- package/lib/_services/core/service-collection.service.js +3 -3
- package/lib/_services/core/service-collection.service.js.map +1 -1
- package/lib/_services/route/controller.service.d.ts +2 -2
- package/lib/_services/route/controller.service.d.ts.map +1 -1
- package/lib/_services/route/controller.service.js +1 -1
- package/lib/_services/route/controller.service.js.map +1 -1
- package/lib/_services/route/routing-module.service.d.ts +4 -4
- package/lib/_services/route/routing-module.service.d.ts.map +1 -1
- package/lib/_services/route/routing-module.service.js +10 -10
- package/lib/_services/route/routing-module.service.js.map +1 -1
- package/lib/_services/server/app-extended.server.d.ts +2 -2
- package/lib/_services/server/app-extended.server.js +27 -27
- package/lib/_services/server/app-extended.server.js.map +1 -1
- package/lib/_services/server/app-extended.server.spec.js +3 -3
- package/lib/_services/server/app-extended.server.spec.js.map +1 -1
- package/lib/_services/server/app.server.d.ts +16 -16
- package/lib/_services/server/app.server.d.ts.map +1 -1
- package/lib/_services/server/app.server.js +91 -90
- package/lib/_services/server/app.server.js.map +1 -1
- package/lib/_services/server/app.server.spec.js +5 -5
- package/lib/_services/server/app.server.spec.js.map +1 -1
- package/lib/_services/shared.static-service.d.ts +4 -4
- package/lib/_services/shared.static-service.d.ts.map +1 -1
- package/lib/_services/shared.static-service.js +2 -2
- package/lib/_services/shared.static-service.js.map +1 -1
- package/lib/_services/socket/socket-client.service.d.ts +3 -3
- package/lib/_services/socket/socket-client.service.d.ts.map +1 -1
- package/lib/_services/socket/socket-client.service.js +35 -29
- package/lib/_services/socket/socket-client.service.js.map +1 -1
- package/lib/_services/socket/socket-server.service.d.ts +3 -3
- package/lib/_services/socket/socket-server.service.d.ts.map +1 -1
- package/lib/_services/socket/socket-server.service.js +51 -51
- package/lib/_services/socket/socket-server.service.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +233 -230
- package/src/_constants/global-settings.const.ts +2 -2
- package/src/_constants/mocks/app-extended-server.mock.ts +34 -35
- package/src/_constants/mocks/app-params.mock.ts +2 -2
- package/src/_constants/mocks/app-server.mock.ts +30 -30
- package/src/_constants/mocks/data-model.mock.ts +25 -25
- package/src/_constants/mocks/email-service-collection.mock.ts +2 -2
- package/src/_constants/mocks/endpoint.mock.ts +22 -22
- package/src/_constants/mocks/socket-client.mock.ts +3 -3
- package/src/_constants/mocks/socket-server.mock.ts +3 -3
- package/src/_enums/data-model-type.enum.ts +1 -0
- package/src/_models/control-models/api-call-params.control-model.ts +5 -5
- package/src/_models/control-models/app-params.control-model.ts +2 -2
- package/src/_models/control-models/endpoint-params.control-model.ts +35 -35
- package/src/_models/control-models/http-settings.control-model.ts +2 -2
- package/src/_models/control-models/socket-client-service-params.control-model.ts +2 -2
- package/src/_models/control-models/socket-event.control-model.ts +13 -13
- package/src/_models/control-models/socket-presence.control-model.ts +26 -14
- package/src/_models/control-models/socket-server-service-params.control-model.ts +4 -4
- package/src/_models/interfaces/certification-settings.interface.ts +1 -1
- package/src/_models/interfaces/global-service-settings.interface.ts +6 -6
- package/src/_models/interfaces/global-settings.interface.ts +1 -1
- package/src/_models/interfaces/routing-module-settings.interface.ts +1 -1
- package/src/_models/types/db-filter.type.ts +5 -2
- package/src/_models/types/db-update.type.ts +3 -2
- package/src/_modules/custom-data/custom-data.controller.ts +20 -18
- package/src/_modules/custom-data/custom-data.data-service.ts +8 -6
- package/src/_modules/custom-data/get-custom-data-routing-module.util.ts +7 -7
- package/src/_modules/test/get-test-routing-module.util.ts +7 -7
- package/src/_modules/test/test.controller.ts +34 -34
- package/src/_modules/usage/get-usage-routing-module.util.ts +7 -7
- package/src/_modules/usage/usage.controller.ts +20 -21
- package/src/_modules/usage/usage.data-service.ts +28 -28
- package/src/_services/base/data.service.ts +62 -61
- package/src/_services/base/db.service.ts +53 -50
- package/src/_services/core/api.service.ts +54 -54
- package/src/_services/core/auth.service.ts +9 -9
- package/src/_services/core/email.service.ts +33 -33
- package/src/_services/core/global.service.ts +37 -23
- package/src/_services/core/service-collection.service.ts +1 -1
- package/src/_services/route/controller.service.ts +4 -4
- package/src/_services/route/routing-module.service.ts +21 -21
- package/src/_services/server/app-extended.server.spec.ts +4 -4
- package/src/_services/server/app-extended.server.ts +27 -27
- package/src/_services/server/app.server.spec.ts +6 -6
- package/src/_services/server/app.server.ts +118 -116
- package/src/_services/shared.static-service.ts +8 -5
- package/src/_services/socket/socket-client.service.ts +79 -47
- package/src/_services/socket/socket-server.service.ts +61 -61
- package/tsconfig.json +8 -7
- package/lib/_models/control-models/app-system-controls.control-model copy.d.ts.map +0 -1
- package/lib/_models/control-models/app-system-controls.control-model copy.js.map +0 -1
- /package/src/_models/control-models/{app-system-controls.control-model copy.ts → app-ext-system-controls.control-model.ts} +0 -0
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
import * as SocketIO from 'socket.io';
|
|
3
3
|
|
|
4
4
|
import {
|
|
5
|
-
|
|
5
|
+
DynamoFM_AnyError, DynamoFM_Array, DynamoFM_Error, DynamoFM_Error_Settings, DynamoFM_Log
|
|
6
6
|
} from '@futdevpro/fsm-dynamo';
|
|
7
7
|
|
|
8
8
|
import { DynamoNTS_SingletonService } from '../base/singleton.service';
|
|
9
|
-
import {
|
|
9
|
+
import { DynamoNTS_globalSettings } from '../../_constants/global-settings.const';
|
|
10
10
|
import { DynamoNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
|
|
11
11
|
import { DynamoNTS_SocketSecurity } from '../../_enums/socket-security.enum';
|
|
12
12
|
import {
|
|
13
|
-
|
|
13
|
+
DynamoNTS_SocketServerService_Params
|
|
14
14
|
} from '../../_models/control-models/socket-server-service-params.control-model';
|
|
15
15
|
import {
|
|
16
16
|
DynamoNTS_SocketPresence
|
|
@@ -38,7 +38,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
38
38
|
T_ErrorContent = any
|
|
39
39
|
> extends DynamoNTS_SingletonService {
|
|
40
40
|
|
|
41
|
-
protected params:
|
|
41
|
+
protected params: DynamoNTS_SocketServerService_Params;
|
|
42
42
|
get name(): string { return this.params.name; }
|
|
43
43
|
get port(): number { return this.params.port; }
|
|
44
44
|
get security(): DynamoNTS_SocketSecurity { return this.params.security; }
|
|
@@ -73,7 +73,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
73
73
|
super();
|
|
74
74
|
|
|
75
75
|
this.asyncConstructor().catch((error: any) => {
|
|
76
|
-
|
|
76
|
+
DynamoFM_Log.error(
|
|
77
77
|
`Socket Server Service setup failed: ${this.params?.name} (${this.params?.port})`,
|
|
78
78
|
error
|
|
79
79
|
);
|
|
@@ -82,7 +82,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
82
82
|
|
|
83
83
|
private async asyncConstructor(): Promise<void> {
|
|
84
84
|
try {
|
|
85
|
-
this.logSetup =
|
|
85
|
+
this.logSetup = DynamoNTS_globalSettings.logSetup;
|
|
86
86
|
this.params = this.getServiceParams();
|
|
87
87
|
this.incomingEvents = this.getIncomingEvents() ?? [];
|
|
88
88
|
|
|
@@ -93,12 +93,12 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
93
93
|
`serurity: ${this.params.security}\n`
|
|
94
94
|
);
|
|
95
95
|
} catch (error) {
|
|
96
|
-
|
|
96
|
+
DynamoFM_Log.error(
|
|
97
97
|
`Socket Server Service setup failed: ${this.params?.name} (${this.params?.port})`,
|
|
98
98
|
error
|
|
99
99
|
);
|
|
100
100
|
|
|
101
|
-
throw new
|
|
101
|
+
throw new DynamoFM_Error({
|
|
102
102
|
errorCode: 'NTS-SSS-001',
|
|
103
103
|
error: error,
|
|
104
104
|
});
|
|
@@ -135,7 +135,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
135
135
|
|
|
136
136
|
if (0 <= subscriptionEventIndex) {
|
|
137
137
|
this.subscriptionEvent = this.incomingEvents.splice(subscriptionEventIndex)[0];
|
|
138
|
-
|
|
138
|
+
DynamoFM_Log.error(
|
|
139
139
|
`You should not set the subscription event, but the subscriptions tasks, ` +
|
|
140
140
|
`in case you need additional steps for your subscriptions.`,
|
|
141
141
|
`${this.params.name} (${this.params.port})`
|
|
@@ -163,7 +163,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
163
163
|
|
|
164
164
|
if (0 <= unsubscribeEventIndex) {
|
|
165
165
|
this.unsubscribeEvent = this.incomingEvents.splice(unsubscribeEventIndex)[0];
|
|
166
|
-
|
|
166
|
+
DynamoFM_Log.error(
|
|
167
167
|
`You should not set the unsubscribe event, but the unsubscribe tasks, ` +
|
|
168
168
|
`in case you need additional steps for your unsubscribe.`,
|
|
169
169
|
`${this.params.name} (${this.params.port})`
|
|
@@ -221,7 +221,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
221
221
|
|
|
222
222
|
this.subscriptionEvent.socketName = this.params.name;
|
|
223
223
|
} else {
|
|
224
|
-
|
|
224
|
+
DynamoFM_Log.error(
|
|
225
225
|
'getPresenceFromSubscrioptionEventContent is not set',
|
|
226
226
|
`${this.params.name} (${this.params.port})`
|
|
227
227
|
);
|
|
@@ -232,7 +232,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
232
232
|
event.serviceName = this.params.name;
|
|
233
233
|
});
|
|
234
234
|
} catch (error) {
|
|
235
|
-
|
|
235
|
+
DynamoFM_Log.error(
|
|
236
236
|
`Socket Server Service - Event Preparation setup failed: ` +
|
|
237
237
|
`${this.params?.name} (${this.params?.port})`,
|
|
238
238
|
error
|
|
@@ -267,14 +267,14 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
267
267
|
* but subscribe event is an exception from this,
|
|
268
268
|
* to be able to check content before getPresenceFromSubscrioptionEventContent
|
|
269
269
|
*/
|
|
270
|
-
if (
|
|
271
|
-
|
|
270
|
+
if (DynamoNTS_globalSettings.logSocketEventContent) {
|
|
271
|
+
DynamoFM_Log.log(
|
|
272
272
|
`--=> incoming socket(${this.params.name}) ` +
|
|
273
273
|
`event: ${DynamoNTS_SocketEventKey.subscribe};` +
|
|
274
274
|
`\ncontent:`, content
|
|
275
275
|
);
|
|
276
276
|
} else {
|
|
277
|
-
|
|
277
|
+
DynamoFM_Log.log(
|
|
278
278
|
`--=> incoming socket(${this.params.name}) ` +
|
|
279
279
|
`event: ${DynamoNTS_SocketEventKey.subscribe}`
|
|
280
280
|
);
|
|
@@ -294,18 +294,18 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
294
294
|
DynamoNTS_SocketEventKey.subscriptionSuccessful,
|
|
295
295
|
'subscribe was successful',
|
|
296
296
|
error => {
|
|
297
|
-
|
|
297
|
+
DynamoFM_Log.error(
|
|
298
298
|
`Emitting subscriptionSuccessful event failed!` +
|
|
299
299
|
`\nerror:`, error
|
|
300
300
|
);
|
|
301
301
|
}
|
|
302
302
|
);
|
|
303
303
|
|
|
304
|
-
|
|
304
|
+
DynamoFM_Log.success(
|
|
305
305
|
`<-==> socket(${this.params.name}) subscription successfull (${issuer})`
|
|
306
306
|
);
|
|
307
307
|
} catch (error) {
|
|
308
|
-
|
|
308
|
+
DynamoFM_Log.error(
|
|
309
309
|
`Socket Subscription failed: ${this.params.name} ` ,
|
|
310
310
|
`(${this.params.port}) will disconnect now...`,
|
|
311
311
|
error
|
|
@@ -325,14 +325,14 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
325
325
|
* but unsubscribe event is an exception from this,
|
|
326
326
|
* to be able to check content before getPresenceFromSubscrioptionEventContent
|
|
327
327
|
*/
|
|
328
|
-
if (
|
|
329
|
-
|
|
328
|
+
if (DynamoNTS_globalSettings.logSocketEventContent) {
|
|
329
|
+
DynamoFM_Log.log(
|
|
330
330
|
`--=> incoming socket(${this.params.name}) ` +
|
|
331
331
|
`event: ${DynamoNTS_SocketEventKey.unsubscribe};` +
|
|
332
332
|
`\ncontent:`, issuer
|
|
333
333
|
);
|
|
334
334
|
} else {
|
|
335
|
-
|
|
335
|
+
DynamoFM_Log.log(
|
|
336
336
|
`--=> incoming socket(${this.params.name}) ` +
|
|
337
337
|
`event: ${DynamoNTS_SocketEventKey.unsubscribe}`
|
|
338
338
|
);
|
|
@@ -346,18 +346,18 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
346
346
|
DynamoNTS_SocketEventKey.unsubscribeSuccessful,
|
|
347
347
|
'unsubscribe was successful',
|
|
348
348
|
error => {
|
|
349
|
-
|
|
349
|
+
DynamoFM_Log.error(
|
|
350
350
|
`Emitting unsubscribeSuccessful event failed!` +
|
|
351
351
|
`\nerror:`, error
|
|
352
352
|
);
|
|
353
353
|
}
|
|
354
354
|
);
|
|
355
355
|
|
|
356
|
-
|
|
356
|
+
DynamoFM_Log.success(
|
|
357
357
|
`< x > socket(${this.params.name}) unsubscribe successfull (${issuer})`
|
|
358
358
|
);
|
|
359
359
|
} catch (error) {
|
|
360
|
-
|
|
360
|
+
DynamoFM_Log.error(
|
|
361
361
|
`Socket unsubscribe failed: ${this.params.name} ` ,
|
|
362
362
|
`(${this.params.port}) will disconnect now...`,
|
|
363
363
|
error
|
|
@@ -375,7 +375,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
375
375
|
try {
|
|
376
376
|
await event.executeEventTasks(content, issuer);
|
|
377
377
|
} catch (error) {
|
|
378
|
-
|
|
378
|
+
DynamoFM_Log.error(
|
|
379
379
|
`Socket Event failed: ${this.params.name} (${this.params.port})`,
|
|
380
380
|
error
|
|
381
381
|
);
|
|
@@ -385,11 +385,11 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
385
385
|
);
|
|
386
386
|
});
|
|
387
387
|
|
|
388
|
-
if (
|
|
389
|
-
|
|
388
|
+
if (DynamoNTS_globalSettings.logMainSocketEvents) {
|
|
389
|
+
DynamoFM_Log.success(`< > socket(${this.params.name}): new CONNECTION established`);
|
|
390
390
|
}
|
|
391
391
|
} catch (error) {
|
|
392
|
-
|
|
392
|
+
DynamoFM_Log.error(
|
|
393
393
|
`Socket Connection failed: ${this.params.name} ` +
|
|
394
394
|
`(${this.params.port}) will disconnect now...`,
|
|
395
395
|
error
|
|
@@ -401,7 +401,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
401
401
|
|
|
402
402
|
newSocketServer.listen(this.params.port);
|
|
403
403
|
|
|
404
|
-
|
|
404
|
+
DynamoFM_Log.success(
|
|
405
405
|
`\nsocket server setup finished: ${this.params.name}` +
|
|
406
406
|
`\nsocket server listening on port: ${this.params.port}`
|
|
407
407
|
);
|
|
@@ -418,7 +418,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
418
418
|
return this.secureSocketServer;
|
|
419
419
|
}
|
|
420
420
|
} catch (error) {
|
|
421
|
-
|
|
421
|
+
DynamoFM_Log.error(
|
|
422
422
|
`Socket Server Service - Deep Setup failed: ${this.params?.name} ` +
|
|
423
423
|
`(${this.params?.port})`,
|
|
424
424
|
error
|
|
@@ -440,7 +440,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
440
440
|
this.presences.push(newPresence);
|
|
441
441
|
}
|
|
442
442
|
} catch (error) {
|
|
443
|
-
|
|
443
|
+
DynamoFM_Log.error(
|
|
444
444
|
`Socket Subscription failed: ${this.params?.name} (${this.params?.port})`,
|
|
445
445
|
error
|
|
446
446
|
);
|
|
@@ -453,9 +453,9 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
453
453
|
try {
|
|
454
454
|
await this.removeSubscription(socket, issuer);
|
|
455
455
|
|
|
456
|
-
|
|
456
|
+
DynamoFM_Log.info(`< x > socket(${this.params.name}) disconnected (${issuer})`);
|
|
457
457
|
} catch (error) {
|
|
458
|
-
throw new
|
|
458
|
+
throw new DynamoFM_Error({
|
|
459
459
|
...this._getDefaultErrorSettings(
|
|
460
460
|
'disconnectBaseTask',
|
|
461
461
|
error,
|
|
@@ -474,7 +474,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
474
474
|
);
|
|
475
475
|
|
|
476
476
|
if (activePresenceIndex === -1) {
|
|
477
|
-
throw new
|
|
477
|
+
throw new DynamoFM_Error({
|
|
478
478
|
...this._getDefaultErrorSettings(
|
|
479
479
|
'sendEventForId',
|
|
480
480
|
new Error(
|
|
@@ -490,7 +490,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
490
490
|
const activePresence: DynamoNTS_SocketPresence = this.presences[activePresenceIndex];
|
|
491
491
|
|
|
492
492
|
if (activePresence.issuerId !== issuer) {
|
|
493
|
-
throw new
|
|
493
|
+
throw new DynamoFM_Error({
|
|
494
494
|
...this._getDefaultErrorSettings(
|
|
495
495
|
'sendEventForId',
|
|
496
496
|
new Error(
|
|
@@ -506,7 +506,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
506
506
|
const socketIndex = activePresence.sockets.findIndex((s: SocketIO.Socket) => s === socket);
|
|
507
507
|
|
|
508
508
|
if (socketIndex === -1) {
|
|
509
|
-
throw new
|
|
509
|
+
throw new DynamoFM_Error({
|
|
510
510
|
...this._getDefaultErrorSettings(
|
|
511
511
|
'sendEventForId',
|
|
512
512
|
new Error(
|
|
@@ -522,7 +522,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
522
522
|
activePresence.sockets.splice(socketIndex);
|
|
523
523
|
|
|
524
524
|
if (this.getSubscriptionCloseTasks) {
|
|
525
|
-
await
|
|
525
|
+
await DynamoFM_Array.asyncForEach(
|
|
526
526
|
this.getSubscriptionCloseTasks(),
|
|
527
527
|
async (task: DynamoNTS_SocketEventTask<null>) => {
|
|
528
528
|
await task(null, issuer);
|
|
@@ -535,9 +535,9 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
535
535
|
}
|
|
536
536
|
|
|
537
537
|
socket.disconnect();
|
|
538
|
-
|
|
538
|
+
DynamoFM_Log.info(`<x==> socket(${this.params.name}) unsubscription successfull (${issuer})`);
|
|
539
539
|
} catch (error) {
|
|
540
|
-
throw new
|
|
540
|
+
throw new DynamoFM_Error({
|
|
541
541
|
...this._getDefaultErrorSettings(
|
|
542
542
|
'sendEventForId',
|
|
543
543
|
error,
|
|
@@ -552,13 +552,13 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
552
552
|
|
|
553
553
|
/* emitServerEvent(event: string, content: any): void {
|
|
554
554
|
try {
|
|
555
|
-
|
|
555
|
+
DynamoFM_Log.log(` <=-- emitting server socket(${this.params.name}) event: ${event}`);
|
|
556
556
|
|
|
557
557
|
this.openSocketServer.emit(event, content, error => {
|
|
558
|
-
|
|
558
|
+
DynamoFM_Log.error(`Emitting server event '${event}' failed!\nerror:`, error);
|
|
559
559
|
});
|
|
560
560
|
} catch (error) {
|
|
561
|
-
throw new
|
|
561
|
+
throw new DynamoFM_Error({
|
|
562
562
|
...this._getDefaultErrorSettings(
|
|
563
563
|
'emitEvent',
|
|
564
564
|
error
|
|
@@ -576,7 +576,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
576
576
|
(presence: DynamoNTS_SocketPresence) => presence.issuerId === id
|
|
577
577
|
);
|
|
578
578
|
} catch (error) {
|
|
579
|
-
throw new
|
|
579
|
+
throw new DynamoFM_Error({
|
|
580
580
|
...this._getDefaultErrorSettings(
|
|
581
581
|
'idIsSubscribed',
|
|
582
582
|
error
|
|
@@ -592,7 +592,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
592
592
|
try {
|
|
593
593
|
await this.sendEventForId(presenceIssuerId, DynamoNTS_SocketEventKey.error, error, issuer);
|
|
594
594
|
} catch (error) {
|
|
595
|
-
throw new
|
|
595
|
+
throw new DynamoFM_Error({
|
|
596
596
|
...this._getDefaultErrorSettings(
|
|
597
597
|
'emitError',
|
|
598
598
|
error,
|
|
@@ -612,7 +612,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
612
612
|
);
|
|
613
613
|
|
|
614
614
|
if (!presence) {
|
|
615
|
-
throw new
|
|
615
|
+
throw new DynamoFM_Error({
|
|
616
616
|
...this._getDefaultErrorSettings(
|
|
617
617
|
'sendEventForId',
|
|
618
618
|
new Error(`No active socket with this specific ID: ${id}`),
|
|
@@ -626,14 +626,14 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
626
626
|
|
|
627
627
|
presence.emitEvent(event, content, issuer);
|
|
628
628
|
|
|
629
|
-
if (
|
|
630
|
-
|
|
629
|
+
if (DynamoNTS_globalSettings.logSocketEventContent) {
|
|
630
|
+
DynamoFM_Log.success(
|
|
631
631
|
` <--= emitted socket(${this.params.name}) event for presence: ${event}, ` +
|
|
632
632
|
`\n presenceId: ${id}, sockets: ${presence.sockets.length}` +
|
|
633
633
|
`\n content:`, content
|
|
634
634
|
);
|
|
635
635
|
} else {
|
|
636
|
-
|
|
636
|
+
DynamoFM_Log.success(
|
|
637
637
|
` <--= emitted socket(${this.params.name}) event for presence: ${event}, ` +
|
|
638
638
|
`\n presenceId: ${id}, sockets: ${presence.sockets.length}`
|
|
639
639
|
);
|
|
@@ -643,7 +643,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
643
643
|
if (error.flag.includes('DYNAMO') && error?.accitionalInfo?.inactiveSockets) {
|
|
644
644
|
const sockets: SocketIO.Socket[] = error.accitionalInfo.inactiveSockets;
|
|
645
645
|
|
|
646
|
-
await
|
|
646
|
+
await DynamoFM_Array.asyncForEach(sockets, async (socket: SocketIO.Socket) => {
|
|
647
647
|
await this.removeSubscription(socket);
|
|
648
648
|
});
|
|
649
649
|
|
|
@@ -652,7 +652,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
652
652
|
);
|
|
653
653
|
|
|
654
654
|
if (!presence) {
|
|
655
|
-
throw new
|
|
655
|
+
throw new DynamoFM_Error({
|
|
656
656
|
...this._getDefaultErrorSettings(
|
|
657
657
|
'sendEventForId',
|
|
658
658
|
new Error(`No active socket(${this.params.name}) with this specific ID: ${id}`),
|
|
@@ -665,7 +665,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
665
665
|
}
|
|
666
666
|
}
|
|
667
667
|
} catch (error) {
|
|
668
|
-
throw new
|
|
668
|
+
throw new DynamoFM_Error({
|
|
669
669
|
...this._getDefaultErrorSettings('sendEventForId', error, content?.source),
|
|
670
670
|
|
|
671
671
|
errorCode: 'NTS-SSS-310',
|
|
@@ -675,7 +675,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
675
675
|
});
|
|
676
676
|
}
|
|
677
677
|
|
|
678
|
-
throw new
|
|
678
|
+
throw new DynamoFM_Error({
|
|
679
679
|
...this._getDefaultErrorSettings('sendEventForId', error, content?.source),
|
|
680
680
|
|
|
681
681
|
errorCode: 'NTS-SSS-310',
|
|
@@ -686,15 +686,15 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
686
686
|
|
|
687
687
|
broadcastEvent(event: string, content: any, issuer: string): void {
|
|
688
688
|
try {
|
|
689
|
-
|
|
689
|
+
DynamoFM_Log.log(` <=-== broadcasting socket(${this.params.name}) event: ${event}`);
|
|
690
690
|
|
|
691
691
|
this.presences.forEach((presence: DynamoNTS_SocketPresence) => {
|
|
692
692
|
presence.emitEvent(event, content, issuer);
|
|
693
693
|
});
|
|
694
694
|
} catch (error) {
|
|
695
|
-
|
|
695
|
+
DynamoFM_Log.error(`socket(${this.params.name}) Event Broadcast (${event}) failed`, error);
|
|
696
696
|
|
|
697
|
-
throw new
|
|
697
|
+
throw new DynamoFM_Error({
|
|
698
698
|
...this._getDefaultErrorSettings('broadcastEvent', error),
|
|
699
699
|
|
|
700
700
|
errorCode: 'NTS-SSS-400',
|
|
@@ -705,14 +705,14 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
705
705
|
|
|
706
706
|
private _getDefaultErrorSettings(
|
|
707
707
|
fnName: string,
|
|
708
|
-
error:
|
|
708
|
+
error: DynamoFM_AnyError,
|
|
709
709
|
issuer?: string
|
|
710
|
-
):
|
|
710
|
+
): DynamoFM_Error_Settings {
|
|
711
711
|
return {
|
|
712
|
-
status: (error as
|
|
712
|
+
status: (error as DynamoFM_Error)?.___status ?? 500,
|
|
713
713
|
message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
|
|
714
|
-
addECToUserMsg: !(error as
|
|
715
|
-
userMessage: (error as
|
|
714
|
+
addECToUserMsg: !(error as DynamoFM_Error)?.__userMessage,
|
|
715
|
+
userMessage: (error as DynamoFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
|
|
716
716
|
issuer: issuer,
|
|
717
717
|
issuerService: this.constructor?.name,
|
|
718
718
|
error: error,
|
|
@@ -722,7 +722,7 @@ export abstract class DynamoNTS_SocketServerService<
|
|
|
722
722
|
/**
|
|
723
723
|
* You must setup params for the service in this function
|
|
724
724
|
*/
|
|
725
|
-
protected abstract getServiceParams():
|
|
725
|
+
protected abstract getServiceParams(): DynamoNTS_SocketServerService_Params;
|
|
726
726
|
|
|
727
727
|
/**
|
|
728
728
|
* You must setup events and required services in this function
|
package/tsconfig.json
CHANGED
|
@@ -1,23 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"compilerOptions": {
|
|
3
|
-
"incremental": true,
|
|
4
|
-
"module": "commonjs",
|
|
5
|
-
"target": "es2022",
|
|
3
|
+
"incremental": true,
|
|
4
|
+
"module": "commonjs",
|
|
5
|
+
"target": "es2022",
|
|
6
6
|
"lib": [
|
|
7
7
|
"es6",
|
|
8
8
|
"es2018",
|
|
9
9
|
"es2022",
|
|
10
10
|
"dom"
|
|
11
|
-
],
|
|
11
|
+
],
|
|
12
12
|
"allowJs": true,
|
|
13
13
|
"declaration": true,
|
|
14
|
-
"declarationMap": true,
|
|
14
|
+
"declarationMap": true,
|
|
15
15
|
"sourceMap": true,
|
|
16
16
|
"outDir": "lib",
|
|
17
|
-
"importHelpers": true,
|
|
18
|
-
"moduleResolution": "node",
|
|
17
|
+
"importHelpers": true,
|
|
18
|
+
"moduleResolution": "node",
|
|
19
19
|
"esModuleInterop": true,
|
|
20
20
|
"skipLibCheck": true,
|
|
21
|
+
"allowSyntheticDefaultImports": true,
|
|
21
22
|
"forceConsistentCasingInFileNames": true,
|
|
22
23
|
"resolveJsonModule": true
|
|
23
24
|
},
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app-system-controls.control-model copy.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/app-system-controls.control-model copy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,qBAAa,2BAA2B;IACtC,WAAW,EAAE,uBAAuB,CAAiC;IACrE,gBAAgB,EAAE,uBAAuB,CAAiC;IAC1E,iBAAiB,EAAE,uBAAuB,CAAiC;CAC5E"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app-system-controls.control-model copy.js","sourceRoot":"","sources":["../../../src/_models/control-models/app-system-controls.control-model copy.ts"],"names":[],"mappings":";;;AAEA,iFAAyE;AAEzE,MAAa,2BAA2B;IACtC,WAAW,GAA4B,IAAI,sDAAuB,EAAE,CAAC;IACrE,gBAAgB,GAA4B,IAAI,sDAAuB,EAAE,CAAC;IAC1E,iBAAiB,GAA4B,IAAI,sDAAuB,EAAE,CAAC;CAC5E;AAJD,kEAIC"}
|