@futdevpro/nts-dynamo 1.6.58 → 1.6.71
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/app-extended-server.mock.js +8 -13
- package/lib/_constants/mocks/app-extended-server.mock.js.map +1 -1
- package/lib/_constants/mocks/app-server.mock.js +4 -9
- package/lib/_constants/mocks/app-server.mock.js.map +1 -1
- package/lib/_constants/mocks/auth-service.mock.js +3 -10
- package/lib/_constants/mocks/auth-service.mock.js.map +1 -1
- package/lib/_constants/mocks/data-model.mock.js +17 -0
- package/lib/_constants/mocks/data-model.mock.js.map +1 -1
- package/lib/_constants/mocks/email-service-collection.mock.js +1 -4
- package/lib/_constants/mocks/email-service-collection.mock.js.map +1 -1
- package/lib/_constants/mocks/endpoint.mock.js +12 -13
- package/lib/_constants/mocks/endpoint.mock.js.map +1 -1
- package/lib/_constants/mocks/socket-client.mock.js +2 -3
- package/lib/_constants/mocks/socket-client.mock.js.map +1 -1
- package/lib/_constants/mocks/socket-server.mock.js +2 -5
- package/lib/_constants/mocks/socket-server.mock.js.map +1 -1
- package/lib/_enums/http/socket-event-type.enum.d.ts +1 -0
- package/lib/_enums/http/socket-event-type.enum.d.ts.map +1 -1
- package/lib/_enums/http/socket-event-type.enum.js +1 -0
- package/lib/_enums/http/socket-event-type.enum.js.map +1 -1
- package/lib/_models/control-models/api-call-params.control-model.js +32 -0
- package/lib/_models/control-models/api-call-params.control-model.js.map +1 -1
- package/lib/_models/control-models/app-params.control-model.js +31 -4
- package/lib/_models/control-models/app-params.control-model.js.map +1 -1
- package/lib/_models/control-models/app-system-controls.control-model copy.js +3 -5
- package/lib/_models/control-models/app-system-controls.control-model copy.js.map +1 -1
- package/lib/_models/control-models/app-system-controls.control-model.js +4 -6
- package/lib/_models/control-models/app-system-controls.control-model.js.map +1 -1
- package/lib/_models/control-models/endpoint-params.control-model.js +91 -88
- package/lib/_models/control-models/endpoint-params.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-client-service-params.control-model.js +8 -5
- 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 +35 -34
- 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 +14 -11
- package/lib/_models/control-models/socket-presence.control-model.js.map +1 -1
- package/lib/_models/control-models/socket-server-service-params.control-model.js +3 -0
- package/lib/_models/control-models/socket-server-service-params.control-model.js.map +1 -1
- package/lib/_models/control-models/system-control.control-model.js +3 -5
- package/lib/_models/control-models/system-control.control-model.js.map +1 -1
- package/lib/_modules/custom-data/custom-data.controller.js +6 -7
- package/lib/_modules/custom-data/custom-data.controller.js.map +1 -1
- package/lib/_modules/test/test.controller.js +12 -13
- package/lib/_modules/test/test.controller.js.map +1 -1
- package/lib/_modules/usage/usage.controller.js +15 -14
- package/lib/_modules/usage/usage.controller.js.map +1 -1
- package/lib/_modules/usage/usage.data-service.js +88 -96
- package/lib/_modules/usage/usage.data-service.js.map +1 -1
- package/lib/_services/base/data.service.d.ts +2 -0
- package/lib/_services/base/data.service.d.ts.map +1 -1
- package/lib/_services/base/data.service.js +376 -253
- package/lib/_services/base/data.service.js.map +1 -1
- package/lib/_services/base/db.service.d.ts +1 -0
- package/lib/_services/base/db.service.d.ts.map +1 -1
- package/lib/_services/base/db.service.js +321 -247
- package/lib/_services/base/db.service.js.map +1 -1
- package/lib/_services/base/singleton.service.js +2 -0
- package/lib/_services/base/singleton.service.js.map +1 -1
- package/lib/_services/core/api.service.js +185 -188
- package/lib/_services/core/api.service.js.map +1 -1
- package/lib/_services/core/auth.service.js +3 -3
- package/lib/_services/core/auth.service.js.map +1 -1
- package/lib/_services/core/email.service.js +103 -88
- package/lib/_services/core/email.service.js.map +1 -1
- package/lib/_services/core/global.service.d.ts +1 -1
- package/lib/_services/core/global.service.d.ts.map +1 -1
- package/lib/_services/core/global.service.js +41 -41
- package/lib/_services/core/global.service.js.map +1 -1
- package/lib/_services/route/controller.service.js +28 -0
- package/lib/_services/route/controller.service.js.map +1 -1
- package/lib/_services/route/routing-module.service.js +11 -8
- package/lib/_services/route/routing-module.service.js.map +1 -1
- package/lib/_services/server/app-extended.server.js +241 -247
- package/lib/_services/server/app-extended.server.js.map +1 -1
- package/lib/_services/server/app-extended.server.spec.js +18 -19
- package/lib/_services/server/app-extended.server.spec.js.map +1 -1
- package/lib/_services/server/app.server.d.ts +2 -1
- package/lib/_services/server/app.server.d.ts.map +1 -1
- package/lib/_services/server/app.server.js +413 -410
- package/lib/_services/server/app.server.js.map +1 -1
- package/lib/_services/server/app.server.spec.js +12 -13
- package/lib/_services/server/app.server.spec.js.map +1 -1
- package/lib/_services/shared.static-service.js +15 -17
- package/lib/_services/shared.static-service.js.map +1 -1
- package/lib/_services/socket/socket-client.service.js +134 -145
- package/lib/_services/socket/socket-client.service.js.map +1 -1
- package/lib/_services/socket/socket-server.service.js +294 -263
- package/lib/_services/socket/socket-server.service.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +19 -21
- package/src/_enums/http/socket-event-type.enum.ts +2 -0
- package/src/_models/control-models/socket-presence.control-model.ts +8 -2
- package/src/_services/base/data.service.ts +79 -0
- package/src/_services/base/db.service.ts +47 -28
- package/src/_services/core/global.service.ts +4 -2
- package/src/_services/server/app-extended.server.ts +2 -2
- package/src/_services/server/app.server.ts +18 -4
- package/tsconfig.json +2 -2
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DynamoNTS_EndpointParams = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
6
5
|
const global_settings_const_1 = require("../../_constants/global-settings.const");
|
|
7
6
|
const global_service_1 = require("../../_services/core/global.service");
|
|
@@ -11,11 +10,21 @@ const global_service_1 = require("../../_services/core/global.service");
|
|
|
11
10
|
* triggering events, logging in or out, and much more
|
|
12
11
|
*/
|
|
13
12
|
class DynamoNTS_EndpointParams {
|
|
13
|
+
name;
|
|
14
|
+
security;
|
|
15
|
+
type;
|
|
16
|
+
endpoint;
|
|
17
|
+
pathParams;
|
|
18
|
+
preProcessess;
|
|
19
|
+
tasks;
|
|
20
|
+
logRequest;
|
|
21
|
+
logRequestsParams;
|
|
22
|
+
logRequestsContent;
|
|
23
|
+
logResponseContent;
|
|
14
24
|
constructor(set) {
|
|
15
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
16
25
|
try {
|
|
17
|
-
this.name =
|
|
18
|
-
this.security =
|
|
26
|
+
this.name = set.name ?? set.endpoint;
|
|
27
|
+
this.security = set.security ?? global_settings_const_1.dynamoNTS_globalSettings.defaultRouteSecurity;
|
|
19
28
|
this.type = set.type;
|
|
20
29
|
this.endpoint = set.endpoint;
|
|
21
30
|
if (!this.endpoint) {
|
|
@@ -31,12 +40,12 @@ class DynamoNTS_EndpointParams {
|
|
|
31
40
|
pathParts = pathParts.filter((part) => part[0] === ':');
|
|
32
41
|
pathParts = pathParts.map((part) => part = part.replace(':', ''));
|
|
33
42
|
this.pathParams = pathParts;
|
|
34
|
-
this.preProcessess =
|
|
43
|
+
this.preProcessess = set.preProcessess ?? [];
|
|
35
44
|
this.tasks = set.tasks;
|
|
36
|
-
this.logRequest =
|
|
37
|
-
this.logRequestsParams =
|
|
38
|
-
this.logRequestsContent =
|
|
39
|
-
this.logResponseContent =
|
|
45
|
+
this.logRequest = set.logRequest ?? global_settings_const_1.dynamoNTS_globalSettings.logRequest;
|
|
46
|
+
this.logRequestsParams = set.logRequestsParams ?? global_settings_const_1.dynamoNTS_globalSettings.logRequestsParams;
|
|
47
|
+
this.logRequestsContent = set.logRequestsContent ?? global_settings_const_1.dynamoNTS_globalSettings.logRequestsContent;
|
|
48
|
+
this.logResponseContent = set.logResponseContent ?? global_settings_const_1.dynamoNTS_globalSettings.logResponseContent;
|
|
40
49
|
}
|
|
41
50
|
catch (error) {
|
|
42
51
|
fsm_dynamo_1.Dynamo_Log.error(`\nEndpoint params setup failed: name: '${set.name}' (security: ${set.security}) endpoint: ${set.endpoint}` +
|
|
@@ -49,45 +58,43 @@ class DynamoNTS_EndpointParams {
|
|
|
49
58
|
*
|
|
50
59
|
* @returns
|
|
51
60
|
*/
|
|
52
|
-
preLog(req, res, issuer) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
msg += `\npathParams: ${params}`;
|
|
60
|
-
}
|
|
61
|
-
if (this.logRequestsContent && req.body && 0 < Object.keys(req.body).length) {
|
|
62
|
-
fsm_dynamo_1.Dynamo_Log.info(msg + `\nbody:`, req.body);
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
fsm_dynamo_1.Dynamo_Log.info(msg);
|
|
66
|
-
}
|
|
67
|
-
/* if (this.logRequestsContent) {
|
|
68
|
-
const params = this.getPathParamsLogContent(req);
|
|
69
|
-
|
|
70
|
-
if (req.body && 0 < Object.keys(req.body).length) {
|
|
71
|
-
console.log(
|
|
72
|
-
`===> incoming ${this.name} request... (issuer: ${issuer})` +
|
|
73
|
-
`\npathParams: ${params}` +
|
|
74
|
-
`\nbody:`, req.body
|
|
75
|
-
);
|
|
76
|
-
} else {
|
|
77
|
-
console.log(
|
|
78
|
-
`===> incoming ${this.name} request... (issuer: ${issuer})` +
|
|
79
|
-
`\npathParams: ${params}`
|
|
80
|
-
);
|
|
81
|
-
}
|
|
82
|
-
} else {
|
|
83
|
-
console.log(`===> incoming ${this.name} request...`);
|
|
84
|
-
} */
|
|
61
|
+
async preLog(req, res, issuer) {
|
|
62
|
+
try {
|
|
63
|
+
if (this.logRequest) {
|
|
64
|
+
let msg = `===> incoming ${this.name} request... (issuer: ${issuer})`;
|
|
65
|
+
if (this.logRequestsParams) {
|
|
66
|
+
const params = this.getPathParamsLogContent(req);
|
|
67
|
+
msg += `\npathParams: ${params}`;
|
|
85
68
|
}
|
|
69
|
+
if (this.logRequestsContent && req.body && 0 < Object.keys(req.body).length) {
|
|
70
|
+
fsm_dynamo_1.Dynamo_Log.info(msg + `\nbody:`, req.body);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
fsm_dynamo_1.Dynamo_Log.info(msg);
|
|
74
|
+
}
|
|
75
|
+
/* if (this.logRequestsContent) {
|
|
76
|
+
const params = this.getPathParamsLogContent(req);
|
|
77
|
+
|
|
78
|
+
if (req.body && 0 < Object.keys(req.body).length) {
|
|
79
|
+
console.log(
|
|
80
|
+
`===> incoming ${this.name} request... (issuer: ${issuer})` +
|
|
81
|
+
`\npathParams: ${params}` +
|
|
82
|
+
`\nbody:`, req.body
|
|
83
|
+
);
|
|
84
|
+
} else {
|
|
85
|
+
console.log(
|
|
86
|
+
`===> incoming ${this.name} request... (issuer: ${issuer})` +
|
|
87
|
+
`\npathParams: ${params}`
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
} else {
|
|
91
|
+
console.log(`===> incoming ${this.name} request...`);
|
|
92
|
+
} */
|
|
86
93
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
this.error(req, res, error, issuer);
|
|
97
|
+
}
|
|
91
98
|
}
|
|
92
99
|
/**
|
|
93
100
|
*
|
|
@@ -95,19 +102,18 @@ class DynamoNTS_EndpointParams {
|
|
|
95
102
|
*/
|
|
96
103
|
getFullExecution() {
|
|
97
104
|
let issuer;
|
|
98
|
-
return (req, res) =>
|
|
99
|
-
var _a;
|
|
105
|
+
return async (req, res) => {
|
|
100
106
|
try {
|
|
101
|
-
issuer =
|
|
107
|
+
issuer = global_service_1.DynamoNTS_GlobalService?.getAuthService()?.getIssuerFromRequest(req);
|
|
102
108
|
if (this.logRequest) {
|
|
103
|
-
|
|
109
|
+
await this.preLog(req, res, issuer);
|
|
104
110
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
})
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
})
|
|
111
|
+
await fsm_dynamo_1.Dynamo_Array.asyncForEach(this.preProcessess, async (preProcess) => {
|
|
112
|
+
await preProcess(req, res);
|
|
113
|
+
});
|
|
114
|
+
await fsm_dynamo_1.Dynamo_Array.asyncForEach(this.tasks, async (task) => {
|
|
115
|
+
await task(req, res, issuer);
|
|
116
|
+
});
|
|
111
117
|
if (this.logRequest) {
|
|
112
118
|
if (this.logResponseContent) {
|
|
113
119
|
fsm_dynamo_1.Dynamo_Log.success(` <<<===== ${this.name} result sent.`);
|
|
@@ -121,46 +127,43 @@ class DynamoNTS_EndpointParams {
|
|
|
121
127
|
catch (error) {
|
|
122
128
|
this.error(req, res, error, issuer);
|
|
123
129
|
}
|
|
124
|
-
}
|
|
130
|
+
};
|
|
125
131
|
}
|
|
126
132
|
/**
|
|
127
133
|
*
|
|
128
134
|
* @param res
|
|
129
135
|
* @param error
|
|
130
136
|
*/
|
|
131
|
-
error(req, res, error, issuer) {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}
|
|
153
|
-
else {
|
|
154
|
-
fsm_dynamo_1.Dynamo_Log.error(` <<<===== ${this.name} error sent: ${(_e = error === null || error === void 0 ? void 0 : error._message) !== null && _e !== void 0 ? _e : ''}`);
|
|
155
|
-
}
|
|
137
|
+
async error(req, res, error, issuer) {
|
|
138
|
+
try {
|
|
139
|
+
let msg = `Endpoint catched an error. ${this.name} (${this.endpoint})`;
|
|
140
|
+
msg += this.getPathParamsLogContent(req);
|
|
141
|
+
msg += `\nERROR:`;
|
|
142
|
+
fsm_dynamo_1.Dynamo_Log.error(msg);
|
|
143
|
+
console.log(error?.flag?.includes('DYNAMO') ?
|
|
144
|
+
error.getErrorSimplified() :
|
|
145
|
+
error, '\n');
|
|
146
|
+
await global_service_1.DynamoNTS_GlobalService.globalErrorHandler?.(error, req, res, issuer).catch(err => {
|
|
147
|
+
fsm_dynamo_1.Dynamo_Log.warn('DynamoNTS_GlobalService.globalErrorHandler failed to handle error: ', err);
|
|
148
|
+
fsm_dynamo_1.Dynamo_Log.warn('It will proceed as normal.');
|
|
149
|
+
});
|
|
150
|
+
res.status(error?.___status ?? 501);
|
|
151
|
+
res.send(error);
|
|
152
|
+
if (this.logRequest) {
|
|
153
|
+
if (this.logResponseContent) {
|
|
154
|
+
fsm_dynamo_1.Dynamo_Log.error(` <<<===== ${this.name} error sent: ${error?._message ?? ''}`);
|
|
155
|
+
fsm_dynamo_1.Dynamo_Log.error('sorry, the logResponseContent is not implemented yet.');
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
fsm_dynamo_1.Dynamo_Log.error(` <<<===== ${this.name} error sent: ${error?._message ?? ''}`);
|
|
156
159
|
}
|
|
157
160
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
}
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
console.error(`\n\nDYNAMO MULTILEVEL ERROR:DynamoNTS_EndpointParams:error: (${this.name}, ${this.endpoint})` +
|
|
164
|
+
`\n(DYNAMO MULTILEVEL ERROR means, that the ERRORHANDLING is ALSO FAILED, and the error message was not sent.)` +
|
|
165
|
+
`\nERROR:`, error, '\n');
|
|
166
|
+
}
|
|
164
167
|
}
|
|
165
168
|
getPathParamsLogContent(req) {
|
|
166
169
|
let params = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":";;;AAIA,sDAA+E;AAG/E,kFAAkF;AAClF,wEAA8E;AAE9E;;;;GAIG;AACH,MAAa,wBAAwB;IACnC,IAAI,CAAS;IACb,QAAQ,CAA0B;IAElC,IAAI,CAAyB;IAC7B,QAAQ,CAAS;IAET,UAAU,CAAW;IAErB,aAAa,CAAoD;IACjE,KAAK,CAAsE;IAE3E,UAAU,CAAU;IACpB,iBAAiB,CAAU;IAC3B,kBAAkB,CAAU;IAC5B,kBAAkB,CAAU;IAEpC,YACE,GAkDC;QAED,IAAI;YACF,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;YACrC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,gDAAwB,CAAC,oBAAoB,CAAC;YAE9E,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACrB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAE7B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,IAAI,yBAAY,CAAC;oBACrB,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE,aAAa;oBACxB,cAAc,EAAE,IAAI;oBACpB,OAAO,EAAE,kEAAkE;oBAC3E,WAAW,EAAE,4FAA4F;iBAC1G,CAAC,CAAC;aACJ;YAED,IAAI,SAAS,GAAa,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnD,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;YAChE,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;YAC1E,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAE5B,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;YAC7C,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YAEvB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,IAAI,gDAAwB,CAAC,UAAU,CAAC;YACxE,IAAI,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,IAAI,gDAAwB,CAAC,iBAAiB,CAAC;YAC7F,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC,kBAAkB,IAAI,gDAAwB,CAAC,kBAAkB,CAAC;YAChG,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC,kBAAkB,IAAI,gDAAwB,CAAC,kBAAkB,CAAC;SACjG;QAAC,OAAO,KAAK,EAAE;YACd,uBAAU,CAAC,KAAK,CACd,0CAA0C,GAAG,CAAC,IAAI,gBAAgB,GAAG,CAAC,QAAQ,eAAe,GAAG,CAAC,QAAQ,EAAE;gBAC3G,UAAU;gBACV,IAAI,EAAE,KAAK,CACZ,CAAC;YACF,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,GAAa,EAAE,MAAc;QAC9D,IAAI;YACF,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,IAAI,GAAG,GAAW,mBAAmB,IAAI,CAAC,IAAI,wBAAwB,MAAM,GAAG,CAAC;gBAEhF,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;oBACjD,GAAG,IAAI,iBAAiB,MAAM,EAAE,CAAC;iBAClC;gBAED,IAAI,IAAI,CAAC,kBAAkB,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;oBAC3E,uBAAU,CAAC,IAAI,CAAC,GAAG,GAAG,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;iBAC5C;qBAAM;oBACL,uBAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACtB;gBAED;;;;;;;;;;;;;;;;;oBAiBI;aACL;SAEF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACrC;IACH,CAAC;IAED;;;OAGG;IACH,gBAAgB;QACd,IAAI,MAAc,CAAC;QAEnB,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;YAC3C,IAAI;gBACF,MAAM,GAAG,wCAAuB,EAAE,cAAc,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBAE9E,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;iBACrC;gBAED,MAAM,yBAAY,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAChD,KAAK,EAAE,UAA0D,EAAE,EAAE;oBACnE,MAAM,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAC7B,CAAC,CACF,CAAC;gBAEF,MAAM,yBAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EACxC,KAAK,EAAE,IAAqE,EAAE,EAAE;oBAC9E,MAAM,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC/B,CAAC,CACF,CAAC;gBAEF,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,IAAI,IAAI,CAAC,kBAAkB,EAAE;wBAC3B,uBAAU,CAAC,OAAO,CAAC,gBAAgB,IAAI,CAAC,IAAI,eAAe,CAAC,CAAC;wBAC7D,uBAAU,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;qBAC1E;yBAAM;wBACL,uBAAU,CAAC,OAAO,CAAC,gBAAgB,IAAI,CAAC,IAAI,eAAe,CAAC,CAAC;qBAC9D;iBACF;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;aACrC;QACH,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,KAAK,CAAC,GAAY,EAAE,GAAa,EAAE,KAA2B,EAAE,MAAc;QAC1F,IAAI;YACF,IAAI,GAAG,GAAW,8BAA8B,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,QAAQ,GAAG,CAAC;YAC/E,GAAG,IAAI,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;YACzC,GAAG,IAAI,UAAU,CAAC;YAElB,uBAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,CAAC,GAAG,CACR,KAAsB,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAChD,KAAsB,CAAC,kBAAkB,EAAE,CAAC,CAAC;gBAC9C,KAAK,EACP,IAAI,CACL,CAAC;YAEF,MAAM,wCAAuB,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACtF,uBAAU,CAAC,IAAI,CAAC,qEAAqE,EAAE,GAAG,CAAC,CAAC;gBAC5F,uBAAU,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,MAAM,CAAE,KAAsB,EAAE,SAAS,IAAI,GAAG,CAAC,CAAC;YACtD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEhB,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,IAAI,IAAI,CAAC,kBAAkB,EAAE;oBAC3B,uBAAU,CAAC,KAAK,CACd,gBAAgB,IAAI,CAAC,IAAI,gBAAiB,KAAsB,EAAE,QAAQ,IAAI,EAAE,EAAE,CACnF,CAAC;oBACF,uBAAU,CAAC,KAAK,CACd,uDAAuD,CACxD,CAAC;iBACH;qBAAM;oBACL,uBAAU,CAAC,KAAK,CACd,gBAAgB,IAAI,CAAC,IAAI,gBAAiB,KAAsB,EAAE,QAAQ,IAAI,EAAE,EAAE,CACnF,CAAC;iBACH;aACF;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CACX,gEAAgE,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,QAAQ,GAAG;gBAC9F,+GAA+G;gBAC/G,UAAU,EAAE,KAAK,EAAE,IAAI,CACxB,CAAC;SACH;IACH,CAAC;IAEO,uBAAuB,CAAC,GAAY;QAC1C,IAAI,MAAM,GAAW,EAAE,CAAC;QAExB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,EAAE;YACxC,MAAM,IAAI,KAAK,KAAK,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA9PD,4DA8PC"}
|
|
@@ -6,14 +6,17 @@ const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
|
6
6
|
* socket handling and clarification is under development
|
|
7
7
|
*/
|
|
8
8
|
class DynamoNTS_SocketClientServiceParams {
|
|
9
|
+
service;
|
|
10
|
+
name;
|
|
11
|
+
address = 'ws://localhost';
|
|
12
|
+
port;
|
|
13
|
+
reconnectDelay = fsm_dynamo_1.second * 10;
|
|
14
|
+
reconnect = true;
|
|
15
|
+
socketOptions;
|
|
9
16
|
constructor(set) {
|
|
10
|
-
var _a, _b;
|
|
11
|
-
this.address = 'ws://localhost';
|
|
12
|
-
this.reconnectDelay = fsm_dynamo_1.second * 10;
|
|
13
|
-
this.reconnect = true;
|
|
14
17
|
Object.assign(this, set);
|
|
15
18
|
this.reconnect = !!this.reconnectDelay;
|
|
16
|
-
if (
|
|
19
|
+
if (this.socketOptions?.autoConnect || this.socketOptions?.reconnection) {
|
|
17
20
|
this.reconnect = false;
|
|
18
21
|
}
|
|
19
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-client-service-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-client-service-params.control-model.ts"],"names":[],"mappings":";;;AAGA,sDAA+C;AAE/C;;GAEG;AACH,MAAa,mCAAmC;
|
|
1
|
+
{"version":3,"file":"socket-client-service-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-client-service-params.control-model.ts"],"names":[],"mappings":";;;AAGA,sDAA+C;AAE/C;;GAEG;AACH,MAAa,mCAAmC;IAC9C,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,OAAO,GAAY,gBAAgB,CAAC;IACpC,IAAI,CAAS;IACb,cAAc,GAAY,mBAAM,GAAG,EAAE,CAAC;IACtC,SAAS,GAAa,IAAI,CAAC;IAC3B,aAAa,CAA6D;IAE1E,YACE,GAAwC;QAExC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACvC,IAAI,IAAI,CAAC,aAAa,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE;YACvE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;SACxB;IACH,CAAC;CACF;AAnBD,kFAmBC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DynamoNTS_SocketEvent = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
6
5
|
const global_settings_const_1 = require("../../_constants/global-settings.const");
|
|
7
6
|
const socket_event_type_enum_1 = require("../../_enums/http/socket-event-type.enum");
|
|
@@ -9,14 +8,20 @@ const socket_event_type_enum_1 = require("../../_enums/http/socket-event-type.en
|
|
|
9
8
|
* socket handling and clarification is under development
|
|
10
9
|
*/
|
|
11
10
|
class DynamoNTS_SocketEvent {
|
|
11
|
+
socketName;
|
|
12
|
+
eventKey;
|
|
13
|
+
serviceName;
|
|
14
|
+
preProcessess;
|
|
15
|
+
tasks;
|
|
16
|
+
logEvent;
|
|
17
|
+
logEventContent;
|
|
12
18
|
constructor(set) {
|
|
13
|
-
var _a, _b, _c, _d;
|
|
14
19
|
try {
|
|
15
|
-
this.socketName =
|
|
20
|
+
this.socketName = set.name ?? set.eventKey;
|
|
16
21
|
this.eventKey = set.eventKey;
|
|
17
|
-
this.serviceName =
|
|
18
|
-
this.preProcessess =
|
|
19
|
-
this.tasks =
|
|
22
|
+
this.serviceName = set.serviceName ?? 'UnkwownSocketService';
|
|
23
|
+
this.preProcessess = set.preProcessess ?? [];
|
|
24
|
+
this.tasks = set.tasks ?? [];
|
|
20
25
|
if (set.logEvent !== undefined) {
|
|
21
26
|
this.logEvent = set.logEvent;
|
|
22
27
|
}
|
|
@@ -44,43 +49,39 @@ class DynamoNTS_SocketEvent {
|
|
|
44
49
|
*
|
|
45
50
|
* @returns
|
|
46
51
|
*/
|
|
47
|
-
getPreLog(content, issuer) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.serviceName}) event: ${this.eventKey};
|
|
52
|
+
async getPreLog(content, issuer) {
|
|
53
|
+
try {
|
|
54
|
+
if (this.logEventContent && this.eventKey !== socket_event_type_enum_1.DynamoNTS_SocketEventKey.connection) {
|
|
55
|
+
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.serviceName}) event: ${this.eventKey};
|
|
52
56
|
\ncontent:`, content);
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.serviceName}) event: ${this.eventKey}...`);
|
|
56
|
-
}
|
|
57
57
|
}
|
|
58
|
-
|
|
59
|
-
fsm_dynamo_1.Dynamo_Log.
|
|
58
|
+
else {
|
|
59
|
+
fsm_dynamo_1.Dynamo_Log.log(`---> incoming socket(${this.serviceName}) event: ${this.eventKey}...`);
|
|
60
60
|
}
|
|
61
|
-
}
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
fsm_dynamo_1.Dynamo_Log.error(`PreLog failed... (socket: ${this.serviceName})`, error);
|
|
64
|
+
}
|
|
62
65
|
}
|
|
63
66
|
/**
|
|
64
67
|
*
|
|
65
68
|
* @returns
|
|
66
69
|
*/
|
|
67
|
-
executeEventTasks(content, issuer) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
yield this.getPreLog(content, issuer);
|
|
72
|
-
}
|
|
73
|
-
yield fsm_dynamo_1.Dynamo_Array.asyncForEach(this.preProcessess, (preProcess) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
content = yield preProcess(content);
|
|
75
|
-
}));
|
|
76
|
-
yield fsm_dynamo_1.Dynamo_Array.asyncForEach(this.tasks, (task) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
77
|
-
yield task(content, issuer);
|
|
78
|
-
}));
|
|
79
|
-
}
|
|
80
|
-
catch (error) {
|
|
81
|
-
fsm_dynamo_1.Dynamo_Log.error(`Socket Event tasks failed to execute on ${this.serviceName}.... (${this.eventKey})`, error, 'content:', content);
|
|
70
|
+
async executeEventTasks(content, issuer) {
|
|
71
|
+
try {
|
|
72
|
+
if (this.logEvent || this.logEventContent) {
|
|
73
|
+
await this.getPreLog(content, issuer);
|
|
82
74
|
}
|
|
83
|
-
|
|
75
|
+
await fsm_dynamo_1.Dynamo_Array.asyncForEach(this.preProcessess, async (preProcess) => {
|
|
76
|
+
content = await preProcess(content);
|
|
77
|
+
});
|
|
78
|
+
await fsm_dynamo_1.Dynamo_Array.asyncForEach(this.tasks, async (task) => {
|
|
79
|
+
await task(content, issuer);
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
fsm_dynamo_1.Dynamo_Log.error(`Socket Event tasks failed to execute on ${this.serviceName}.... (${this.eventKey})`, error, 'content:', content);
|
|
84
|
+
}
|
|
84
85
|
}
|
|
85
86
|
}
|
|
86
87
|
exports.DynamoNTS_SocketEvent = DynamoNTS_SocketEvent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-event.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-event.control-model.ts"],"names":[],"mappings":"
|
|
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,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAM;IACjC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAY;gBAGhD,GAAG,EAAE,wBAAwB;IA6B/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,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAM;IACjC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAY;gBAGhD,GAAG,EAAE,wBAAwB;IA6B/B;;;;OAIG;IACH,SAAS,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;CAkEvC"}
|
|
@@ -6,11 +6,12 @@ const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
|
6
6
|
* socket handling and clarification is under development
|
|
7
7
|
*/
|
|
8
8
|
class DynamoNTS_SocketPresence {
|
|
9
|
+
issuerId;
|
|
10
|
+
serviceName;
|
|
11
|
+
sockets = [];
|
|
12
|
+
onDestroy = id => { };
|
|
9
13
|
constructor(set) {
|
|
10
|
-
|
|
11
|
-
this.sockets = [];
|
|
12
|
-
this.onDestroy = id => { };
|
|
13
|
-
if (!(set === null || set === void 0 ? void 0 : set.issuerId)) {
|
|
14
|
+
if (!set?.issuerId) {
|
|
14
15
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
15
16
|
status: 406,
|
|
16
17
|
errorCode: 'NTS-SD0-C00',
|
|
@@ -20,9 +21,9 @@ class DynamoNTS_SocketPresence {
|
|
|
20
21
|
});
|
|
21
22
|
}
|
|
22
23
|
this.issuerId = set.issuerId;
|
|
23
|
-
this.serviceName =
|
|
24
|
-
this.onDestroy =
|
|
25
|
-
if (!
|
|
24
|
+
this.serviceName = set.serviceName ?? 'unknown';
|
|
25
|
+
this.onDestroy = set.onDestroy ?? (id => { });
|
|
26
|
+
if (!set?.sockets?.length) {
|
|
26
27
|
throw new fsm_dynamo_1.Dynamo_Error({
|
|
27
28
|
status: 406,
|
|
28
29
|
errorCode: 'NTS-SD0-C01',
|
|
@@ -44,7 +45,8 @@ class DynamoNTS_SocketPresence {
|
|
|
44
45
|
const inactiveSockets = [];
|
|
45
46
|
this.sockets.forEach((socket, index) => {
|
|
46
47
|
if (!socket.connected) {
|
|
47
|
-
fsm_dynamo_1.Dynamo_Log.
|
|
48
|
+
fsm_dynamo_1.Dynamo_Log.warn(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!` +
|
|
49
|
+
`\nERROR: socket[${socket.id}] is not connected! (it will be removed...)`);
|
|
48
50
|
/* errors.push(
|
|
49
51
|
new Dynamo_Error({
|
|
50
52
|
status: 500,
|
|
@@ -55,13 +57,14 @@ class DynamoNTS_SocketPresence {
|
|
|
55
57
|
})
|
|
56
58
|
); */
|
|
57
59
|
inactiveSockets.push(socket);
|
|
58
|
-
socket
|
|
60
|
+
socket?.disconnect(true);
|
|
59
61
|
}
|
|
60
62
|
});
|
|
61
|
-
this.sockets = this.sockets.filter(socket => !inactiveSockets.includes(socket) &&
|
|
63
|
+
this.sockets = this.sockets.filter(socket => !inactiveSockets.includes(socket) && socket?.connected);
|
|
62
64
|
this.sockets.forEach((socket, index) => {
|
|
63
65
|
const success = socket.emit(event, content, error => {
|
|
64
|
-
fsm_dynamo_1.Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!(0)
|
|
66
|
+
fsm_dynamo_1.Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!(0)` +
|
|
67
|
+
`\nerror:`, error);
|
|
65
68
|
errors.push(error);
|
|
66
69
|
});
|
|
67
70
|
if (!success) {
|
|
@@ -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;
|
|
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;IACnC,QAAQ,CAAS;IACjB,WAAW,CAAU;IACrB,OAAO,GAAuB,EAAE,CAAC;IACjC,SAAS,GAAgC,EAAE,CAAC,EAAE,GAAE,CAAC,CAAC;IAElD,YACE,GAA6B;QAE7B,IAAI,CAAC,GAAG,EAAE,QAAQ,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,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,SAAS,CAAC;QAChD,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,CAAC,EAAE,CAAC,EAAE,GAAE,CAAC,CAAC,CAAC;QAE7C,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,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,qCAAqC;QACrC,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,eAAe,GAAsB,EAAE,CAAC;QAE9C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAuB,EAAE,KAAa,EAAE,EAAE;YAC9D,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrB,uBAAU,CAAC,IAAI,CACb,mBAAmB,KAAK,eAAe,IAAI,CAAC,WAAW,MAAM,KAAK,WAAW;oBAC7E,mBAAmB,MAAM,CAAC,EAAE,6CAA6C,CAC1E,CAAC;gBAEF;;;;;;;;qBAQK;gBAEL,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC7B,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,SAAS,CAAC,CAAC;QAErG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAuB,EAAE,KAAa,EAAE,EAAE;YAC9D,MAAM,OAAO,GAAY,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE;gBAC3D,uBAAU,CAAC,KAAK,CACd,mBAAmB,KAAK,eAAe,IAAI,CAAC,WAAW,MAAM,KAAK,cAAc;oBAChF,UAAU,EAAE,KAAK,CAClB,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,EAAE;gBACZ,uBAAU,CAAC,KAAK,CAAC,mBAAmB,KAAK,eAAe,IAAI,CAAC,WAAW,MAAM,KAAK,cAAc,CAAC,CAAC;aACpG;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;YACrB,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,mBAAmB,KAAK,kBAAkB,IAAI,CAAC,WAAW,WAAW;gBAC9E,WAAW,EAAE,4FAA4F;gBACzG,iBAAiB,EAAE;oBACjB,eAAe,EAAE,eAAe;oBAChC,MAAM,EAAE,MAAM;iBACf;aACF,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,MAAM,IAAI,yBAAY,CAAC;gBACrB,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,aAAa;gBACxB,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,mBAAmB,KAAK,kBAAkB,IAAI,CAAC,WAAW,2CAA2C;gBAC9G,WAAW,EAAE,4FAA4F;aAC1G,CAAC,CAAC;SACJ;IACH,CAAC;CAEF;AA3GD,4DA2GC"}
|
|
@@ -6,6 +6,9 @@ const global_settings_const_1 = require("../../_constants/global-settings.const"
|
|
|
6
6
|
* socket handling and clarification is under development
|
|
7
7
|
*/
|
|
8
8
|
class DynamoNTS_SocketServerServiceParams {
|
|
9
|
+
name;
|
|
10
|
+
port;
|
|
11
|
+
security;
|
|
9
12
|
constructor(set) {
|
|
10
13
|
this.name = set.name;
|
|
11
14
|
this.port = set.port;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-server-service-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-server-service-params.control-model.ts"],"names":[],"mappings":";;;AACA,kFAAkF;AAGlF;;GAEG;AACH,MAAa,mCAAmC;
|
|
1
|
+
{"version":3,"file":"socket-server-service-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-server-service-params.control-model.ts"],"names":[],"mappings":";;;AACA,kFAAkF;AAGlF;;GAEG;AACH,MAAa,mCAAmC;IAC9C,IAAI,CAAS;IACb,IAAI,CAAS;IACb,QAAQ,CAA4B;IAEpC,YACE,GAA2C;QAE3C,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,gDAAwB,CAAC,qBAAqB,CAAC;IAC/F,CAAC;CACF;AAZD,kFAYC"}
|
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DynamoNTS_SystemControl = void 0;
|
|
4
4
|
class DynamoNTS_SystemControl {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
this.started = false;
|
|
9
|
-
}
|
|
5
|
+
init = false;
|
|
6
|
+
/* failed: boolean = false; */
|
|
7
|
+
started = false;
|
|
10
8
|
getReady() {
|
|
11
9
|
return this.init ? this.started : true;
|
|
12
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-control.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/system-control.control-model.ts"],"names":[],"mappings":";;;AAGA,MAAa,uBAAuB;
|
|
1
|
+
{"version":3,"file":"system-control.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/system-control.control-model.ts"],"names":[],"mappings":";;;AAGA,MAAa,uBAAuB;IAClC,IAAI,GAAY,KAAK,CAAC;IACtB,8BAA8B;IAC9B,OAAO,GAAY,KAAK,CAAC;IAEzB,QAAQ;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;CACF;AARD,0DAQC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CustomDataController = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
6
5
|
const http_call_type_enum_1 = require("../../_enums/http/http-call-type.enum");
|
|
7
6
|
const controller_service_1 = require("../../_services/route/controller.service");
|
|
@@ -19,16 +18,16 @@ class CustomDataController extends controller_service_1.DynamoNTS_Controller {
|
|
|
19
18
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.get,
|
|
20
19
|
endpoint: fsm_dynamo_1.customDataModuleSettings.endPoints.getCustomData,
|
|
21
20
|
tasks: [
|
|
22
|
-
(req, res) =>
|
|
21
|
+
async (req, res) => {
|
|
23
22
|
const customDataService = new custom_data_data_service_1.Dynamo_CustomDataService({ _id: req.params.customId });
|
|
24
|
-
|
|
23
|
+
await customDataService.getDataById();
|
|
25
24
|
res.send({
|
|
26
25
|
url: req.url,
|
|
27
26
|
result: 'get custom call was successful!',
|
|
28
27
|
response: customDataService.data,
|
|
29
28
|
request: `.../custom/get/${req.params.customId}`
|
|
30
29
|
});
|
|
31
|
-
}
|
|
30
|
+
}
|
|
32
31
|
]
|
|
33
32
|
}),
|
|
34
33
|
new endpoint_params_control_model_1.DynamoNTS_EndpointParams({
|
|
@@ -36,9 +35,9 @@ class CustomDataController extends controller_service_1.DynamoNTS_Controller {
|
|
|
36
35
|
type: http_call_type_enum_1.DynamoNTS_HttpCallType.post,
|
|
37
36
|
endpoint: fsm_dynamo_1.customDataModuleSettings.endPoints.modifyCustomData,
|
|
38
37
|
tasks: [
|
|
39
|
-
(req, res, issuer) =>
|
|
38
|
+
async (req, res, issuer) => {
|
|
40
39
|
const customDataService = new custom_data_data_service_1.Dynamo_CustomDataService(req.body, issuer);
|
|
41
|
-
|
|
40
|
+
await customDataService.saveData();
|
|
42
41
|
res.send({
|
|
43
42
|
url: req.url,
|
|
44
43
|
result: 'post custom call was successful!',
|
|
@@ -46,7 +45,7 @@ class CustomDataController extends controller_service_1.DynamoNTS_Controller {
|
|
|
46
45
|
warning: 'keep in mind that this is a playground DB, and it will be cleared out from time to time',
|
|
47
46
|
request: req.body
|
|
48
47
|
});
|
|
49
|
-
}
|
|
48
|
+
}
|
|
50
49
|
]
|
|
51
50
|
}),
|
|
52
51
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-data.controller.js","sourceRoot":"","sources":["../../../src/_modules/custom-data/custom-data.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"custom-data.controller.js","sourceRoot":"","sources":["../../../src/_modules/custom-data/custom-data.controller.ts"],"names":[],"mappings":";;;AAGA,sDAAiE;AAEjE,+EAA+E;AAC/E,iFAAgF;AAChF,yEAAsE;AACtE,8GAAsG;AAEtG,MAAa,oBAAqB,SAAQ,yCAAoB;IAE1D,MAAM,CAAC,WAAW;QAChB,OAAO,oBAAoB,CAAC,oBAAoB,EAAE,CAAC;IACrD,CAAC;IAED,cAAc;QACV,IAAI,CAAC,SAAS,GAAG;YACb,cAAc;YACd,IAAI,wDAAwB,CAAC;gBAC3B,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,4CAAsB,CAAC,GAAG;gBAChC,QAAQ,EAAE,qCAAwB,CAAC,SAAS,CAAC,aAAa;gBAC1D,KAAK,EAAE;oBACH,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;wBAClC,MAAM,iBAAiB,GAAG,IAAI,mDAAwB,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAErF,MAAM,iBAAiB,CAAC,WAAW,EAAE,CAAC;wBAEtC,GAAG,CAAC,IAAI,CAAC;4BACL,GAAG,EAAE,GAAG,CAAC,GAAG;4BACZ,MAAM,EAAE,iCAAiC;4BACzC,QAAQ,EAAE,iBAAiB,CAAC,IAAI;4BAChC,OAAO,EAAE,kBAAkB,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;yBACnD,CAAC,CAAC;oBACP,CAAC;iBACJ;aACJ,CAAC;YAEF,IAAI,wDAAwB,CAAC;gBACzB,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,4CAAsB,CAAC,IAAI;gBACjC,QAAQ,EAAE,qCAAwB,CAAC,SAAS,CAAC,gBAAgB;gBAC7D,KAAK,EAAE;oBACH,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,MAAc,EAAE,EAAE;wBAClD,MAAM,iBAAiB,GAAG,IAAI,mDAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;wBAEzE,MAAM,iBAAiB,CAAC,QAAQ,EAAE,CAAC;wBAEnC,GAAG,CAAC,IAAI,CAAC;4BACL,GAAG,EAAE,GAAG,CAAC,GAAG;4BACZ,MAAM,EAAE,kCAAkC;4BAC1C,QAAQ,EAAE,iBAAiB,CAAC,IAAI;4BAChC,OAAO,EAAE,yFAAyF;4BAClG,OAAO,EAAE,GAAG,CAAC,IAAI;yBACpB,CAAC,CAAC;oBACP,CAAC;iBACJ;aACJ,CAAC;SACH,CAAC;IACN,CAAC;CACJ;AAnDD,oDAmDC"}
|