@futdevpro/nts-dynamo 1.6.45 → 1.6.47
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/lib/_constants/mocks/socket-client.mock.js +1 -1
- package/lib/_constants/mocks/socket-client.mock.js.map +1 -1
- package/lib/_enums/http/socket-event-type.enum.d.ts +1 -1
- package/lib/_enums/http/socket-event-type.enum.d.ts.map +1 -1
- package/lib/_enums/http/socket-event-type.enum.js +12 -12
- package/lib/_enums/http/socket-event-type.enum.js.map +1 -1
- package/lib/_models/control-models/socket-event.control-model.d.ts +6 -5
- package/lib/_models/control-models/socket-event.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-event.control-model.js +15 -19
- package/lib/_models/control-models/socket-event.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-presence.control-model.d.ts.map +1 -1
- package/lib/_models/control-models/socket-presence.control-model.js +10 -2
- package/lib/_models/control-models/socket-presence.control-model.js.map +1 -1
- package/lib/_services/socket/socket-client.service.js +6 -6
- package/lib/_services/socket/socket-client.service.js.map +1 -1
- package/lib/_services/socket/socket-server.service.d.ts +1 -1
- package/lib/_services/socket/socket-server.service.d.ts.map +1 -1
- package/lib/_services/socket/socket-server.service.js +40 -31
- package/lib/_services/socket/socket-server.service.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/_constants/mocks/socket-client.mock.ts +2 -2
- package/src/_enums/http/socket-event-type.enum.ts +2 -2
- package/src/_models/control-models/socket-event.control-model.ts +18 -22
- package/src/_models/control-models/socket-presence.control-model.ts +11 -2
- package/src/_services/socket/socket-client.service.ts +7 -7
- package/src/_services/socket/socket-server.service.ts +46 -28
|
@@ -16,7 +16,7 @@ class SocketClient_Mock extends app_extended_index_1.DynamoNTS_SocketClientServi
|
|
|
16
16
|
return [
|
|
17
17
|
new _models_1.DynamoNTS_SocketEvent({
|
|
18
18
|
name: 'connect',
|
|
19
|
-
|
|
19
|
+
eventKey: _enums_1.DynamoNTS_SocketEventKey.connect,
|
|
20
20
|
tasks: [
|
|
21
21
|
(content, issuer) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
console.log('SocketClient_Mock: connect event received');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-client.mock.js","sourceRoot":"","sources":["../../../src/_constants/mocks/socket-client.mock.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"socket-client.mock.js","sourceRoot":"","sources":["../../../src/_constants/mocks/socket-client.mock.ts"],"names":[],"mappings":";;;;AAAA,yCAAwD;AACxD,2CAA2F;AAC3F,0EAAkF;AAIlF,MAAa,iBAAkB,SAAQ,kDAA6B;IAElE;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;IAClD,CAAC;IAED,iBAAiB;QACf,OAAO;YACL,IAAI,+BAAqB,CAAC;gBACxB,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,iCAAwB,CAAC,OAAO;gBAC1C,KAAK,EAAE;oBACL,CAAO,OAAY,EAAE,MAAc,EAAE,EAAE;wBACrC,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;oBAC3D,CAAC,CAAA;iBACF;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,IAAI,6CAAmC,CAAC;YAC7C,OAAO,EAAE,sBAAsB;YAC/B,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,KAAK;YACX,aAAa,EAAE;gBACb,YAAY,EAAE,IAAI;aACnB;SACF,CAAC,CAAC;IACL,CAAC;CAEF;AAnCD,8CAmCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-event-type.enum.d.ts","sourceRoot":"","sources":["../../../src/_enums/http/socket-event-type.enum.ts"],"names":[],"mappings":"AACA,oBAAY,
|
|
1
|
+
{"version":3,"file":"socket-event-type.enum.d.ts","sourceRoot":"","sources":["../../../src/_enums/http/socket-event-type.enum.ts"],"names":[],"mappings":"AACA,oBAAY,wBAAwB;IAClC,0BAA0B;IAC1B,UAAU,eAAe;IACzB,0BAA0B;IAC1B,OAAO,YAAY;IAEnB,SAAS,cAAc;IACvB,sBAAsB,2BAA2B;IACjD,WAAW,gBAAgB;IAC3B,UAAU,kBAAkB;IAC5B,KAAK,UAAU;IACf,KAAK,UAAU;CAChB"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
var
|
|
5
|
-
(function (
|
|
3
|
+
exports.DynamoNTS_SocketEventKey = void 0;
|
|
4
|
+
var DynamoNTS_SocketEventKey;
|
|
5
|
+
(function (DynamoNTS_SocketEventKey) {
|
|
6
6
|
/** incoming connection */
|
|
7
|
-
|
|
7
|
+
DynamoNTS_SocketEventKey["connection"] = "connection";
|
|
8
8
|
/** outgoing connection */
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
})(
|
|
9
|
+
DynamoNTS_SocketEventKey["connect"] = "connect";
|
|
10
|
+
DynamoNTS_SocketEventKey["subscribe"] = "subscribe";
|
|
11
|
+
DynamoNTS_SocketEventKey["subscriptionSuccessful"] = "subscriptionSuccessful";
|
|
12
|
+
DynamoNTS_SocketEventKey["unsubscribe"] = "unsubscribe";
|
|
13
|
+
DynamoNTS_SocketEventKey["disconnect"] = "disconnection";
|
|
14
|
+
DynamoNTS_SocketEventKey["event"] = "event";
|
|
15
|
+
DynamoNTS_SocketEventKey["error"] = "error";
|
|
16
|
+
})(DynamoNTS_SocketEventKey || (exports.DynamoNTS_SocketEventKey = DynamoNTS_SocketEventKey = {}));
|
|
17
17
|
//# sourceMappingURL=socket-event-type.enum.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-event-type.enum.js","sourceRoot":"","sources":["../../../src/_enums/http/socket-event-type.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,
|
|
1
|
+
{"version":3,"file":"socket-event-type.enum.js","sourceRoot":"","sources":["../../../src/_enums/http/socket-event-type.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,wBAYX;AAZD,WAAY,wBAAwB;IAClC,0BAA0B;IAC1B,qDAAyB,CAAA;IACzB,0BAA0B;IAC1B,+CAAmB,CAAA;IAEnB,mDAAuB,CAAA;IACvB,6EAAiD,CAAA;IACjD,uDAA2B,CAAA;IAC3B,wDAA4B,CAAA;IAC5B,2CAAe,CAAA;IACf,2CAAe,CAAA;AACjB,CAAC,EAZW,wBAAwB,wCAAxB,wBAAwB,QAYnC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { DynamoNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
|
|
2
2
|
export type DynamoNTS_SocketEventPreprocessTask<T = any, R = any> = (content?: T, issuer?: string) => Promise<R>;
|
|
3
3
|
export type DynamoNTS_SocketEventTask<T> = (content?: T, issuer?: string) => Promise<void>;
|
|
4
4
|
/**
|
|
@@ -6,21 +6,22 @@ export type DynamoNTS_SocketEventTask<T> = (content?: T, issuer?: string) => Pro
|
|
|
6
6
|
*/
|
|
7
7
|
export declare class DynamoNTS_SocketEvent<T> {
|
|
8
8
|
socketName?: string;
|
|
9
|
-
|
|
9
|
+
eventKey: DynamoNTS_SocketEventKey | string;
|
|
10
10
|
preProcessess?: DynamoNTS_SocketEventPreprocessTask<any, any>[];
|
|
11
11
|
tasks?: DynamoNTS_SocketEventTask<T>[];
|
|
12
12
|
logEvent?: boolean;
|
|
13
13
|
logEventContent?: boolean;
|
|
14
14
|
constructor(set: {
|
|
15
15
|
/**
|
|
16
|
-
* naming the socket will help to follow events on service
|
|
16
|
+
* naming the socket will help to follow events on service,
|
|
17
|
+
* if not set, the eventKey will be used
|
|
17
18
|
*/
|
|
18
|
-
name
|
|
19
|
+
name?: string;
|
|
19
20
|
/**
|
|
20
21
|
* define socket event type such as;
|
|
21
22
|
* connection, connect, disconnect, message, error, or anything else
|
|
22
23
|
*/
|
|
23
|
-
|
|
24
|
+
eventKey: DynamoNTS_SocketEventKey | string;
|
|
24
25
|
/**
|
|
25
26
|
* preprocesses are the functions the service needs to run before the actual function,
|
|
26
27
|
* these can be used for authentications, or translating data
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-event.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/socket-event.control-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"socket-event.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/socket-event.control-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAGpF,MAAM,MAAM,mCAAmC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AACjH,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3F;;GAEG;AACH,qBAAa,qBAAqB,CAAC,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,wBAAwB,GAAG,MAAM,CAAC;IAE5C,aAAa,CAAC,EAAE,mCAAmC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;IAChE,KAAK,CAAC,EAAE,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;WAGG;QACH,QAAQ,EAAE,wBAAwB,GAAG,MAAM,CAAC;QAC5C;;;;;WAKG;QACH,aAAa,CAAC,EAAE,mCAAmC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;QAChE;;WAEG;QACH,KAAK,CAAC,EAAE,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;WAEG;QACH,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IAgCH;;;OAGG;YACW,SAAS;IAYvB;;;OAGG;IACG,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBrE"}
|
|
@@ -10,36 +10,32 @@ const socket_event_type_enum_1 = require("../../_enums/http/socket-event-type.en
|
|
|
10
10
|
*/
|
|
11
11
|
class DynamoNTS_SocketEvent {
|
|
12
12
|
constructor(set) {
|
|
13
|
-
var _a, _b;
|
|
13
|
+
var _a, _b, _c;
|
|
14
14
|
try {
|
|
15
|
-
this.socketName = set.name;
|
|
16
|
-
this.
|
|
17
|
-
this.preProcessess = (
|
|
18
|
-
this.tasks = (
|
|
15
|
+
this.socketName = (_a = set.name) !== null && _a !== void 0 ? _a : set.eventKey;
|
|
16
|
+
this.eventKey = set.eventKey;
|
|
17
|
+
this.preProcessess = (_b = set.preProcessess) !== null && _b !== void 0 ? _b : [];
|
|
18
|
+
this.tasks = (_c = set.tasks) !== null && _c !== void 0 ? _c : [];
|
|
19
19
|
if (set.logEvent !== undefined) {
|
|
20
20
|
this.logEvent = set.logEvent;
|
|
21
21
|
}
|
|
22
|
-
else if (this.
|
|
22
|
+
else if (this.eventKey === socket_event_type_enum_1.DynamoNTS_SocketEventKey.subscribe) {
|
|
23
23
|
this.logEvent = false;
|
|
24
24
|
}
|
|
25
25
|
else if ([
|
|
26
|
-
socket_event_type_enum_1.
|
|
27
|
-
socket_event_type_enum_1.
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
].includes(this.eventType)) {
|
|
26
|
+
socket_event_type_enum_1.DynamoNTS_SocketEventKey.connection,
|
|
27
|
+
socket_event_type_enum_1.DynamoNTS_SocketEventKey.connect,
|
|
28
|
+
socket_event_type_enum_1.DynamoNTS_SocketEventKey.disconnect,
|
|
29
|
+
].includes(this.eventKey)) {
|
|
31
30
|
this.logEvent = global_settings_const_1.dynamoNTS_globalSettings.logMainSocketEvents || global_settings_const_1.dynamoNTS_globalSettings.logAllSocketEvent;
|
|
32
31
|
}
|
|
33
32
|
else {
|
|
34
33
|
this.logEvent = global_settings_const_1.dynamoNTS_globalSettings.logAllSocketEvent;
|
|
35
34
|
}
|
|
36
35
|
this.logEventContent = set.logEventContent !== undefined ? set.logEventContent : global_settings_const_1.dynamoNTS_globalSettings.logSocketEventContent;
|
|
37
|
-
/* if (this.logEvent) {
|
|
38
|
-
this.preProcessess.unshift(this.getPreLog());
|
|
39
|
-
} */
|
|
40
36
|
}
|
|
41
37
|
catch (error) {
|
|
42
|
-
fsm_dynamo_1.Dynamo_Log.error(`\nSocket Event params setup failed (${this.socketName}): ${set.
|
|
38
|
+
fsm_dynamo_1.Dynamo_Log.error(`\nSocket Event params setup failed (${this.socketName}): ${set.eventKey}`, error);
|
|
43
39
|
throw error;
|
|
44
40
|
}
|
|
45
41
|
}
|
|
@@ -50,11 +46,11 @@ class DynamoNTS_SocketEvent {
|
|
|
50
46
|
getPreLog(content, issuer) {
|
|
51
47
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
52
48
|
try {
|
|
53
|
-
if (this.logEventContent && this.
|
|
54
|
-
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.
|
|
49
|
+
if (this.logEventContent && this.eventKey !== socket_event_type_enum_1.DynamoNTS_SocketEventKey.connection) {
|
|
50
|
+
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.eventKey};\ncontent:`, content);
|
|
55
51
|
}
|
|
56
52
|
else {
|
|
57
|
-
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.
|
|
53
|
+
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.eventKey}...`);
|
|
58
54
|
}
|
|
59
55
|
}
|
|
60
56
|
catch (error) {
|
|
@@ -80,7 +76,7 @@ class DynamoNTS_SocketEvent {
|
|
|
80
76
|
}));
|
|
81
77
|
}
|
|
82
78
|
catch (error) {
|
|
83
|
-
fsm_dynamo_1.Dynamo_Log.error(`Socket Event tasks failed to execute on ${this.socketName}.... (${this.
|
|
79
|
+
fsm_dynamo_1.Dynamo_Log.error(`Socket Event tasks failed to execute on ${this.socketName}.... (${this.eventKey})`, error, 'content:', content);
|
|
84
80
|
}
|
|
85
81
|
});
|
|
86
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-event.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-event.control-model.ts"],"names":[],"mappings":";;;;AACA,sDAAiE;AACjE,kFAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"socket-event.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-event.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-presence.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/socket-presence.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AAEtC;;GAEG;AACH,qBAAa,wBAAwB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAM;IACjC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAY;gBAGhD,GAAG,EAAE,wBAAwB;IA4B/B;;;;OAIG;IACH,SAAS,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;
|
|
1
|
+
{"version":3,"file":"socket-presence.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/socket-presence.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AAEtC;;GAEG;AACH,qBAAa,wBAAwB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAM;IACjC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAY;gBAGhD,GAAG,EAAE,wBAAwB;IA4B/B;;;;OAIG;IACH,SAAS,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;CAkDvC"}
|
|
@@ -40,16 +40,19 @@ class DynamoNTS_SocketPresence {
|
|
|
40
40
|
emitEvent(event, content) {
|
|
41
41
|
let anyFailed = false;
|
|
42
42
|
const errors = [];
|
|
43
|
+
const inactiveSockets = [];
|
|
43
44
|
this.sockets.forEach((socket, index) => {
|
|
44
45
|
if (!socket.connected) {
|
|
45
|
-
fsm_dynamo_1.Dynamo_Log.error(`Emitting event '${event}' on socket(${index}) failed! socket[${socket}] is not connected!`);
|
|
46
|
+
fsm_dynamo_1.Dynamo_Log.error(`Emitting event '${event}' on socket(${index}) failed! socket[${socket.id}] is not connected!`);
|
|
47
|
+
anyFailed = true;
|
|
46
48
|
errors.push(new fsm_dynamo_1.Dynamo_Error({
|
|
47
49
|
status: 500,
|
|
48
50
|
errorCode: 'NTS-SPC-EE1',
|
|
49
51
|
addECToUserMsg: true,
|
|
50
|
-
message: `Emitting event '${event}' on socket(${index}) failed! socket[${socket}] is not connected!`,
|
|
52
|
+
message: `Emitting event '${event}' on socket(${index}) failed! socket[${socket.id}] is not connected!`,
|
|
51
53
|
userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.',
|
|
52
54
|
}));
|
|
55
|
+
inactiveSockets.push(socket);
|
|
53
56
|
}
|
|
54
57
|
const success = socket.emit(event, content, error => {
|
|
55
58
|
fsm_dynamo_1.Dynamo_Log.error(`Emitting event '${event}' on socket(${index}) failed! (0)\nerror:`, error);
|
|
@@ -62,6 +65,7 @@ class DynamoNTS_SocketPresence {
|
|
|
62
65
|
}
|
|
63
66
|
});
|
|
64
67
|
if (anyFailed) {
|
|
68
|
+
/* this.sockets = this.sockets.filter(socket => !inactiveSockets.includes(socket)); */
|
|
65
69
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
66
70
|
status: 500,
|
|
67
71
|
errorCode: 'NTS-SPC-EE2',
|
|
@@ -69,6 +73,10 @@ class DynamoNTS_SocketPresence {
|
|
|
69
73
|
message: `Emitting event '${event}' on socket(s) failed!`,
|
|
70
74
|
userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.',
|
|
71
75
|
/* errors: errors, */
|
|
76
|
+
additionalContent: {
|
|
77
|
+
inactiveSockets: inactiveSockets,
|
|
78
|
+
errors: errors,
|
|
79
|
+
}
|
|
72
80
|
});
|
|
73
81
|
}
|
|
74
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-presence.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-presence.control-model.ts"],"names":[],"mappings":";;;AACA,sDAAiE;AAGjE;;GAEG;AACH,MAAa,wBAAwB;IAKnC,YACE,GAA6B;;QAJ/B,YAAO,GAAuB,EAAE,CAAC;QACjC,cAAS,GAAgC,EAAE,CAAC,EAAE,GAAE,CAAC,CAAC;QAKhD,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,EAAE;YAClB,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,qEAAqE;gBAC9E,WAAW,EAAE,4FAA4F;aAC1G,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAA,GAAG,CAAC,SAAS,mCAAI,CAAC,EAAE,CAAC,EAAE,GAAE,CAAC,CAAC,CAAC;QAE7C,IAAI,CAAC,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,MAAM,CAAA,EAAE;YACzB,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,2EAA2E;gBACpF,WAAW,EAAE,4FAA4F;aAC1G,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAE,KAAa,EAAE,OAAY;QACpC,IAAI,SAAS,GAAY,KAAK,CAAC;QAC/B,MAAM,MAAM,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"socket-presence.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-presence.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ class DynamoNTS_SocketClientService extends singleton_service_1.DynamoNTS_Single
|
|
|
20
20
|
this.defaultEvents = [
|
|
21
21
|
new socket_event_control_model_1.DynamoNTS_SocketEvent({
|
|
22
22
|
name: 'connect',
|
|
23
|
-
|
|
23
|
+
eventKey: socket_event_type_enum_1.DynamoNTS_SocketEventKey.connect,
|
|
24
24
|
tasks: [
|
|
25
25
|
() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
26
|
this._connected = true;
|
|
@@ -30,7 +30,7 @@ class DynamoNTS_SocketClientService extends singleton_service_1.DynamoNTS_Single
|
|
|
30
30
|
}),
|
|
31
31
|
new socket_event_control_model_1.DynamoNTS_SocketEvent({
|
|
32
32
|
name: 'disconnect',
|
|
33
|
-
|
|
33
|
+
eventKey: socket_event_type_enum_1.DynamoNTS_SocketEventKey.disconnect,
|
|
34
34
|
tasks: [
|
|
35
35
|
() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
36
|
this._connected = false;
|
|
@@ -44,7 +44,7 @@ class DynamoNTS_SocketClientService extends singleton_service_1.DynamoNTS_Single
|
|
|
44
44
|
}),
|
|
45
45
|
new socket_event_control_model_1.DynamoNTS_SocketEvent({
|
|
46
46
|
name: 'error',
|
|
47
|
-
|
|
47
|
+
eventKey: socket_event_type_enum_1.DynamoNTS_SocketEventKey.error,
|
|
48
48
|
tasks: [
|
|
49
49
|
(content) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
50
50
|
fsm_dynamo_1.Dynamo_Log.error(`Socket Client error: ${this.params.name}`, content);
|
|
@@ -85,7 +85,7 @@ class DynamoNTS_SocketClientService extends singleton_service_1.DynamoNTS_Single
|
|
|
85
85
|
if (this.logFn)
|
|
86
86
|
console.log('\nFn:. setupDefaultEvents');
|
|
87
87
|
this.defaultEvents.forEach((defaultEvent) => {
|
|
88
|
-
const eventDeclared = this.incomingEvents.find((event) => event.
|
|
88
|
+
const eventDeclared = this.incomingEvents.find((event) => event.eventKey === defaultEvent.eventKey);
|
|
89
89
|
if (!eventDeclared) {
|
|
90
90
|
this.incomingEvents.push(defaultEvent);
|
|
91
91
|
}
|
|
@@ -110,13 +110,13 @@ class DynamoNTS_SocketClientService extends singleton_service_1.DynamoNTS_Single
|
|
|
110
110
|
if (!event.socketName) {
|
|
111
111
|
event.socketName = this.name;
|
|
112
112
|
}
|
|
113
|
-
this.socket.on(event.
|
|
113
|
+
this.socket.on(event.eventKey, (content) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
114
114
|
try {
|
|
115
115
|
yield event.executeEventTasks(content, this.params.service);
|
|
116
116
|
}
|
|
117
117
|
catch (error) {
|
|
118
118
|
fsm_dynamo_1.Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
|
|
119
|
-
yield this.emitEvent(socket_event_type_enum_1.
|
|
119
|
+
yield this.emitEvent(socket_event_type_enum_1.DynamoNTS_SocketEventKey.error, error);
|
|
120
120
|
}
|
|
121
121
|
}));
|
|
122
122
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-client.service.js","sourceRoot":"","sources":["../../../src/_services/socket/socket-client.service.ts"],"names":[],"mappings":";;;;AAGA,mEAA6C;AAE7C,iEAAuE;AACvE,sDAAiE;AACjE,uDAAkE;AAElE,kFAAkF;AAClF,wGAAgG;AAChG,
|
|
1
|
+
{"version":3,"file":"socket-client.service.js","sourceRoot":"","sources":["../../../src/_services/socket/socket-client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ export declare abstract class DynamoNTS_SocketServerService<T_Presence extends D
|
|
|
44
44
|
private prepareEvents;
|
|
45
45
|
setupSocketServer(newSocketServer: SocketIO.Server, security: DynamoNTS_SocketSecurity.open | DynamoNTS_SocketSecurity.secure, successCallback: () => void): Promise<SocketIO.Server>;
|
|
46
46
|
protected addSocketToPresence(newPresence: T_Presence): Promise<void>;
|
|
47
|
-
private
|
|
47
|
+
private removeSubscription;
|
|
48
48
|
emitServerEvent(event: string, content: any): void;
|
|
49
49
|
idIsSubscribed(id: string): boolean;
|
|
50
50
|
emitError(presenceIssuerId: string, error: any): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-server.service.d.ts","sourceRoot":"","sources":["../../../src/_services/socket/socket-server.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AAItC,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAGvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,mCAAmC,EAAE,MAAM,yEAAyE,CAAC;AAC9H,OAAO,EAAE,wBAAwB,EAAE,MAAM,4DAA4D,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,yDAAyD,CAAC;AAEhK;;;;;;;;;;;;GAYG;AACH,8BAAsB,6BAA6B,CAC7C,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,EACtE,qBAAqB,GAAG,GAAG,EAC3B,cAAc,GAAG,GAAG,CACpB,SAAQ,0BAA0B;IAEtC,SAAS,CAAC,MAAM,EAAE,mCAAmC,CAAC;IACtD,IAAI,IAAI,IAAI,MAAM,CAA6B;IAC/C,IAAI,IAAI,IAAI,MAAM,CAA6B;IAC/C,IAAI,QAAQ,IAAI,wBAAwB,CAAiC;IAEzE,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC;IAC5C,SAAS,CAAC,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC;IAE9C,OAAO,CAAC,YAAY,CAAyC;IAC7D,SAAS,CAAC,cAAc,EAAE,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;IAEvD,OAAO,CAAC,iBAAiB,CAA6B;IAEtD;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,wCAAwC,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IACpJ,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,CAAM;IAEvC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC;IAEzB,mBAAmB,SAEoC;;YAUzC,gBAAgB;IAkB9B;;OAEG;YACW,aAAa;
|
|
1
|
+
{"version":3,"file":"socket-server.service.d.ts","sourceRoot":"","sources":["../../../src/_services/socket/socket-server.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,19 +62,18 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
62
62
|
var _a, _b;
|
|
63
63
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
64
|
try {
|
|
65
|
-
const connectEventIndex = this.incomingEvents.findIndex((event) => event.
|
|
65
|
+
const connectEventIndex = this.incomingEvents.findIndex((event) => event.eventKey === socket_event_type_enum_1.DynamoNTS_SocketEventKey.connection);
|
|
66
66
|
if (0 <= connectEventIndex) {
|
|
67
67
|
this.connectEvent = this.incomingEvents.splice(connectEventIndex)[0];
|
|
68
68
|
}
|
|
69
69
|
else {
|
|
70
70
|
this.connectEvent = new socket_event_control_model_1.DynamoNTS_SocketEvent({
|
|
71
|
-
|
|
72
|
-
eventType: socket_event_type_enum_1.DynamoNTS_SocketEventType.connection,
|
|
71
|
+
eventKey: socket_event_type_enum_1.DynamoNTS_SocketEventKey.connection,
|
|
73
72
|
});
|
|
74
73
|
}
|
|
75
74
|
this.connectEvent.socketName = this.params.name;
|
|
76
75
|
if (this.getPresenceFromSubscrioptionEventContent) {
|
|
77
|
-
const subscriptionEventIndex = this.incomingEvents.findIndex((event) => event.
|
|
76
|
+
const subscriptionEventIndex = this.incomingEvents.findIndex((event) => event.eventKey === socket_event_type_enum_1.DynamoNTS_SocketEventKey.subscribe);
|
|
78
77
|
if (0 <= subscriptionEventIndex) {
|
|
79
78
|
this.subscriptionEvent = this.incomingEvents.splice(subscriptionEventIndex)[0];
|
|
80
79
|
fsm_dynamo_1.Dynamo_Log.error(`You should not set the subscription event, but the subscriptions tasks, ` +
|
|
@@ -82,8 +81,7 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
82
81
|
}
|
|
83
82
|
else {
|
|
84
83
|
this.subscriptionEvent = new socket_event_control_model_1.DynamoNTS_SocketEvent({
|
|
85
|
-
|
|
86
|
-
eventType: socket_event_type_enum_1.DynamoNTS_SocketEventType.subscribe
|
|
84
|
+
eventKey: socket_event_type_enum_1.DynamoNTS_SocketEventKey.subscribe
|
|
87
85
|
});
|
|
88
86
|
}
|
|
89
87
|
if (this.getSubscriptionPreProcessess) {
|
|
@@ -92,24 +90,22 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
92
90
|
if (this.getSubscriptionTasks) {
|
|
93
91
|
this.subscriptionEvent.tasks.push(...this.getSubscriptionTasks());
|
|
94
92
|
}
|
|
95
|
-
const disconnectEventIndex = this.incomingEvents.findIndex((event) => event.
|
|
93
|
+
const disconnectEventIndex = this.incomingEvents.findIndex((event) => event.eventKey === socket_event_type_enum_1.DynamoNTS_SocketEventKey.disconnect);
|
|
96
94
|
if (0 <= disconnectEventIndex) {
|
|
97
|
-
this.incomingEvents[disconnectEventIndex].tasks.push(this.
|
|
95
|
+
this.incomingEvents[disconnectEventIndex].tasks.push(this.removeSubscription);
|
|
98
96
|
}
|
|
99
97
|
else {
|
|
100
98
|
this.incomingEvents.push(new socket_event_control_model_1.DynamoNTS_SocketEvent({
|
|
101
|
-
|
|
102
|
-
eventType: socket_event_type_enum_1.DynamoNTS_SocketEventType.disconnect,
|
|
99
|
+
eventKey: socket_event_type_enum_1.DynamoNTS_SocketEventKey.disconnect,
|
|
103
100
|
tasks: [
|
|
104
|
-
this.
|
|
101
|
+
this.removeSubscription
|
|
105
102
|
]
|
|
106
103
|
}));
|
|
107
104
|
}
|
|
108
|
-
const errorEventIndex = this.incomingEvents.findIndex((event) => event.
|
|
105
|
+
const errorEventIndex = this.incomingEvents.findIndex((event) => event.eventKey === socket_event_type_enum_1.DynamoNTS_SocketEventKey.error);
|
|
109
106
|
if (errorEventIndex == -1 && this.errorHandling) {
|
|
110
107
|
this.incomingEvents.push(new socket_event_control_model_1.DynamoNTS_SocketEvent({
|
|
111
|
-
|
|
112
|
-
eventType: socket_event_type_enum_1.DynamoNTS_SocketEventType.error,
|
|
108
|
+
eventKey: socket_event_type_enum_1.DynamoNTS_SocketEventKey.error,
|
|
113
109
|
tasks: [
|
|
114
110
|
this.errorHandling
|
|
115
111
|
]
|
|
@@ -136,12 +132,12 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
136
132
|
try {
|
|
137
133
|
if (this.logFn)
|
|
138
134
|
console.log('\nfn:. setupSocketServer');
|
|
139
|
-
newSocketServer.on(socket_event_type_enum_1.
|
|
135
|
+
newSocketServer.on(socket_event_type_enum_1.DynamoNTS_SocketEventKey.connection, (socket) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
140
136
|
try {
|
|
141
137
|
let issuer;
|
|
142
138
|
yield this.connectEvent.executeEventTasks(socket);
|
|
143
139
|
if (this.getPresenceFromSubscrioptionEventContent) {
|
|
144
|
-
socket.on(socket_event_type_enum_1.
|
|
140
|
+
socket.on(socket_event_type_enum_1.DynamoNTS_SocketEventKey.subscribe, (content) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
145
141
|
try {
|
|
146
142
|
/**
|
|
147
143
|
* usually socket logs are in event.executeEventTasks(),
|
|
@@ -149,35 +145,35 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
149
145
|
* to be able to check content before getPresenceFromSubscrioptionEventContent
|
|
150
146
|
*/
|
|
151
147
|
if (global_settings_const_1.dynamoNTS_globalSettings.logMainSocketEvents || global_settings_const_1.dynamoNTS_globalSettings.logAllSocketEvent || global_settings_const_1.dynamoNTS_globalSettings.logSocketEventContent) {
|
|
152
|
-
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${socket_event_type_enum_1.
|
|
148
|
+
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${socket_event_type_enum_1.DynamoNTS_SocketEventKey.subscribe};\ncontent:`, content);
|
|
153
149
|
}
|
|
154
150
|
else {
|
|
155
|
-
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${socket_event_type_enum_1.
|
|
151
|
+
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${socket_event_type_enum_1.DynamoNTS_SocketEventKey.subscribe}`);
|
|
156
152
|
}
|
|
157
153
|
const presence = yield this.getPresenceFromSubscrioptionEventContent(content, socket);
|
|
158
154
|
issuer = presence.issuerId;
|
|
159
155
|
this.addSocketToPresence(presence);
|
|
160
156
|
yield this.subscriptionEvent.executeEventTasks(content, issuer);
|
|
161
|
-
socket.emit(socket_event_type_enum_1.
|
|
157
|
+
socket.emit(socket_event_type_enum_1.DynamoNTS_SocketEventKey.subscriptionSuccessful, 'subscribe was successful', error => {
|
|
162
158
|
fsm_dynamo_1.Dynamo_Log.error(`Emitting subscriptionSuccessful event failed!\nerror:`, error);
|
|
163
159
|
});
|
|
164
160
|
fsm_dynamo_1.Dynamo_Log.success(`<===> socket subscription successfull (${issuer})`);
|
|
165
161
|
}
|
|
166
162
|
catch (error) {
|
|
167
163
|
fsm_dynamo_1.Dynamo_Log.error(`Socket Subscription failed: ${this.params.name} (${this.params.port}) will disconnect now...`, error);
|
|
168
|
-
socket.emit(socket_event_type_enum_1.
|
|
164
|
+
socket.emit(socket_event_type_enum_1.DynamoNTS_SocketEventKey.error, error);
|
|
169
165
|
socket.disconnect();
|
|
170
166
|
}
|
|
171
167
|
}));
|
|
172
168
|
}
|
|
173
169
|
this.incomingEvents.forEach((event) => {
|
|
174
|
-
socket.on(event.
|
|
170
|
+
socket.on(event.eventKey, (content) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
175
171
|
try {
|
|
176
172
|
yield event.executeEventTasks(content, issuer);
|
|
177
173
|
}
|
|
178
174
|
catch (error) {
|
|
179
175
|
fsm_dynamo_1.Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
|
|
180
|
-
socket.emit(socket_event_type_enum_1.
|
|
176
|
+
socket.emit(socket_event_type_enum_1.DynamoNTS_SocketEventKey.error, error);
|
|
181
177
|
}
|
|
182
178
|
}));
|
|
183
179
|
});
|
|
@@ -187,7 +183,7 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
187
183
|
}
|
|
188
184
|
catch (error) {
|
|
189
185
|
fsm_dynamo_1.Dynamo_Log.error(`Socket Connection failed: ${this.params.name} (${this.params.port}) will disconnect now...`, error);
|
|
190
|
-
socket.emit(socket_event_type_enum_1.
|
|
186
|
+
socket.emit(socket_event_type_enum_1.DynamoNTS_SocketEventKey.error, error);
|
|
191
187
|
socket.disconnect();
|
|
192
188
|
}
|
|
193
189
|
}));
|
|
@@ -228,7 +224,7 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
228
224
|
}
|
|
229
225
|
});
|
|
230
226
|
}
|
|
231
|
-
|
|
227
|
+
removeSubscription(socket, issuer) {
|
|
232
228
|
var _a, _b;
|
|
233
229
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
234
230
|
try {
|
|
@@ -253,6 +249,7 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
253
249
|
if (activePresence.sockets.length === 0) {
|
|
254
250
|
this.presences.splice(activePresenceIndex);
|
|
255
251
|
}
|
|
252
|
+
socket.disconnect();
|
|
256
253
|
}
|
|
257
254
|
catch (error) {
|
|
258
255
|
throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('sendEventForId', error, issuer)), { errorCode: 'NTS-SSS-200', message: `Socket Subscription Removal failed: ${(_a = this.params) === null || _a === void 0 ? void 0 : _a.name} (${(_b = this.params) === null || _b === void 0 ? void 0 : _b.port})` }));
|
|
@@ -283,14 +280,14 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
283
280
|
emitError(presenceIssuerId, error) {
|
|
284
281
|
var _a, _b;
|
|
285
282
|
try {
|
|
286
|
-
this.sendEventForId(presenceIssuerId, socket_event_type_enum_1.
|
|
283
|
+
this.sendEventForId(presenceIssuerId, socket_event_type_enum_1.DynamoNTS_SocketEventKey.error, error);
|
|
287
284
|
}
|
|
288
285
|
catch (error) {
|
|
289
286
|
throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('emitError', error, presenceIssuerId)), { errorCode: 'NTS-SSS-700', message: `Socket Error Emit (id: ${presenceIssuerId}) failed: ${(_a = this.params) === null || _a === void 0 ? void 0 : _a.name} (${(_b = this.params) === null || _b === void 0 ? void 0 : _b.port})` }));
|
|
290
287
|
}
|
|
291
288
|
}
|
|
292
289
|
sendEventForId(id, event, content /* , error?: (err: any) => void */) {
|
|
293
|
-
var _a, _b;
|
|
290
|
+
var _a, _b, _c, _d, _e;
|
|
294
291
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
295
292
|
try {
|
|
296
293
|
const presence = this.presences.find((pres) => pres.issuerId === id);
|
|
@@ -308,7 +305,19 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
308
305
|
}
|
|
309
306
|
}
|
|
310
307
|
catch (error) {
|
|
311
|
-
|
|
308
|
+
try {
|
|
309
|
+
if (error.flag.includes('DYNAMO') && ((_a = error === null || error === void 0 ? void 0 : error.accitionalInfo) === null || _a === void 0 ? void 0 : _a.inactiveSockets)) {
|
|
310
|
+
const sockets = error.accitionalInfo.inactiveSockets;
|
|
311
|
+
yield fsm_dynamo_1.Dynamo_Array.asyncForEach(sockets, (socket) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
312
|
+
yield this.removeSubscription(socket);
|
|
313
|
+
}));
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
catch (error) {
|
|
317
|
+
throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('sendEventForId', error, content === null || content === void 0 ? void 0 : content.source)), { errorCode: 'NTS-SSS-310', message: `Error handling of inactive sockets failed!` +
|
|
318
|
+
`\n(Socket Event Emit for id (${id}, ${event}) failed: ${(_b = this.params) === null || _b === void 0 ? void 0 : _b.name} (${(_c = this.params) === null || _c === void 0 ? void 0 : _c.port}))` }));
|
|
319
|
+
}
|
|
320
|
+
throw new fsm_dynamo_1.Dynamo_Error(Object.assign(Object.assign({}, this._getDefaultErrorSettings('sendEventForId', error, content === null || content === void 0 ? void 0 : content.source)), { errorCode: 'NTS-SSS-310', message: `Socket Event Emit for id (${id}, ${event}) failed: ${(_d = this.params) === null || _d === void 0 ? void 0 : _d.name} (${(_e = this.params) === null || _e === void 0 ? void 0 : _e.port})` }));
|
|
312
321
|
}
|
|
313
322
|
});
|
|
314
323
|
}
|
|
@@ -326,14 +335,14 @@ class DynamoNTS_SocketServerService extends singleton_service_1.DynamoNTS_Single
|
|
|
326
335
|
}
|
|
327
336
|
}
|
|
328
337
|
_getDefaultErrorSettings(fnName, error, issuer) {
|
|
329
|
-
var _a, _b;
|
|
338
|
+
var _a, _b, _c;
|
|
330
339
|
return {
|
|
331
|
-
status: 417,
|
|
332
|
-
message: (
|
|
340
|
+
status: (_a = error === null || error === void 0 ? void 0 : error.___status) !== null && _a !== void 0 ? _a : 417,
|
|
341
|
+
message: (_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : `${fnName} was UNSUCCESFUL (NTS)`,
|
|
333
342
|
addECToUserMsg: true,
|
|
334
343
|
userMessage: this.defaultErrorUserMsg,
|
|
335
344
|
issuer: issuer,
|
|
336
|
-
issuerService: (
|
|
345
|
+
issuerService: (_c = this.constructor) === null || _c === void 0 ? void 0 : _c.name,
|
|
337
346
|
error: error,
|
|
338
347
|
};
|
|
339
348
|
}
|