@futdevpro/fsm-dynamo 1.10.18 → 1.10.19
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/build/_collections/utils/stack.util.js +2 -2
- package/build/_collections/utils/stack.util.js.map +1 -1
- package/build/_modules/socket/_enums/sck-event-key.enum.d.ts +4 -4
- package/build/_modules/socket/_enums/sck-event-key.enum.d.ts.map +1 -1
- package/build/_modules/socket/_enums/sck-event-key.enum.js +4 -4
- package/build/_modules/socket/_enums/sck-event-key.enum.js.map +1 -1
- package/build/_modules/socket/_models/sck-socket-event.control-model.js +3 -3
- package/build/_modules/socket/_models/sck-socket-event.control-model.js.map +1 -1
- package/build/_modules/socket/_models/sck-socket-event.control-model.spec.js +3 -3
- package/build/_modules/socket/_models/sck-socket-event.control-model.spec.js.map +1 -1
- package/build/_modules/socket/_services/sck-client.service-base.js +1 -1
- package/build/_modules/socket/_services/sck-client.service-base.js.map +1 -1
- package/build/_modules/socket/_services/sck-client.service-base.spec.js +1 -1
- package/build/_modules/socket/_services/sck-client.service-base.spec.js.map +1 -1
- package/build/_modules/usage/_models/usg-session.data-model.js +1 -1
- package/build/_modules/usage/_models/usg-session.data-model.js.map +1 -1
- package/build/_modules/usage/_models/usg-session.data-model.spec.js +1 -1
- package/build/_modules/usage/_models/usg-session.data-model.spec.js.map +1 -1
- package/futdevpro-fsm-dynamo-01.10.19.tgz +0 -0
- package/package.json +1 -1
- package/src/_collections/utils/stack.util.ts +2 -2
- package/src/_modules/socket/_enums/sck-event-key.enum.ts +4 -4
- package/src/_modules/socket/_models/sck-socket-event.control-model.spec.ts +3 -3
- package/src/_modules/socket/_models/sck-socket-event.control-model.ts +3 -3
- package/src/_modules/socket/_services/sck-client.service-base.spec.ts +1 -1
- package/src/_modules/socket/_services/sck-client.service-base.ts +1 -1
- package/src/_modules/usage/_models/usg-session.data-model.spec.ts +1 -1
- package/src/_modules/usage/_models/usg-session.data-model.ts +1 -1
- package/futdevpro-fsm-dynamo-01.10.18.tgz +0 -0
|
@@ -16,13 +16,13 @@ function DyFM_getStackLocation() {
|
|
|
16
16
|
let constructorLine = stackLines?.find(line => !line.includes('getStackLocation') &&
|
|
17
17
|
!line.includes('at new'));
|
|
18
18
|
if (!constructorLine) {
|
|
19
|
-
log_util_1.DyFM_Log.warn('No constructor line found');
|
|
19
|
+
log_util_1.DyFM_Log.warn('No constructor line found\n' + stack);
|
|
20
20
|
return '';
|
|
21
21
|
}
|
|
22
22
|
// Remove the 'constructorLine at ... (' and the ')'
|
|
23
23
|
constructorLine = constructorLine.split('(')[1]?.split(')')[0];
|
|
24
24
|
if (!constructorLine) {
|
|
25
|
-
log_util_1.DyFM_Log.warn('No constructor line found');
|
|
25
|
+
log_util_1.DyFM_Log.warn('No constructor line found\n' + stack);
|
|
26
26
|
return '';
|
|
27
27
|
}
|
|
28
28
|
return constructorLine;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC;;;;GAIG;AACH,SAAgB,qBAAqB;IACnC,IAAI,KAAK,GAAW,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC;IAEtC,gEAAgE;IAChE,MAAM,UAAU,GAAG,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhD,mDAAmD;IACnD,oEAAoE;IACpE,IAAI,eAAe,GAAG,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAC5C,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAClC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACzB,CAAC;IACF,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,mBAAQ,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"stack.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC;;;;GAIG;AACH,SAAgB,qBAAqB;IACnC,IAAI,KAAK,GAAW,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC;IAEtC,gEAAgE;IAChE,MAAM,UAAU,GAAG,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhD,mDAAmD;IACnD,oEAAoE;IACpE,IAAI,eAAe,GAAG,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAC5C,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAClC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACzB,CAAC;IACF,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,mBAAQ,CAAC,IAAI,CAAC,6BAA6B,GAAG,KAAK,CAAC,CAAC;QACrD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wDAAwD;IACxD,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,mBAAQ,CAAC,IAAI,CAAC,6BAA6B,GAAG,KAAK,CAAC,CAAC;QACrD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAzBD,sDAyBC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare enum DyFM_SocketEvent_Key {
|
|
2
|
-
/** incoming connection */
|
|
3
|
-
|
|
4
|
-
/** outgoing connection */
|
|
5
|
-
|
|
2
|
+
/** incoming connection in socket.io */
|
|
3
|
+
incomingNewConnection = "connection",
|
|
4
|
+
/** outgoing connection in socket.io */
|
|
5
|
+
outgoingNewConnection = "connect",
|
|
6
6
|
subscribe = "subscribe",
|
|
7
7
|
subscriptionSuccessful = "subscriptionSuccessful",
|
|
8
8
|
unsubscribe = "unsubscribe",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-event-key.enum.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_enums/sck-event-key.enum.ts"],"names":[],"mappings":"AACA,oBAAY,oBAAoB;IAC9B,
|
|
1
|
+
{"version":3,"file":"sck-event-key.enum.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_enums/sck-event-key.enum.ts"],"names":[],"mappings":"AACA,oBAAY,oBAAoB;IAC9B,uCAAuC;IACvC,qBAAqB,eAAe;IACpC,uCAAuC;IACvC,qBAAqB,YAAY;IAEjC,SAAS,cAAc;IACvB,sBAAsB,2BAA2B;IACjD,WAAW,gBAAgB;IAC3B,qBAAqB,0BAA0B;IAC/C,UAAU,kBAAkB;IAE5B,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;CAChB"}
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DyFM_SocketEvent_Key = void 0;
|
|
4
4
|
var DyFM_SocketEvent_Key;
|
|
5
5
|
(function (DyFM_SocketEvent_Key) {
|
|
6
|
-
/** incoming connection */
|
|
7
|
-
DyFM_SocketEvent_Key["
|
|
8
|
-
/** outgoing connection */
|
|
9
|
-
DyFM_SocketEvent_Key["
|
|
6
|
+
/** incoming connection in socket.io */
|
|
7
|
+
DyFM_SocketEvent_Key["incomingNewConnection"] = "connection";
|
|
8
|
+
/** outgoing connection in socket.io */
|
|
9
|
+
DyFM_SocketEvent_Key["outgoingNewConnection"] = "connect";
|
|
10
10
|
DyFM_SocketEvent_Key["subscribe"] = "subscribe";
|
|
11
11
|
DyFM_SocketEvent_Key["subscriptionSuccessful"] = "subscriptionSuccessful";
|
|
12
12
|
DyFM_SocketEvent_Key["unsubscribe"] = "unsubscribe";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-event-key.enum.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_enums/sck-event-key.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,oBAeX;AAfD,WAAY,oBAAoB;IAC9B,
|
|
1
|
+
{"version":3,"file":"sck-event-key.enum.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_enums/sck-event-key.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,oBAeX;AAfD,WAAY,oBAAoB;IAC9B,uCAAuC;IACvC,4DAAoC,CAAA;IACpC,uCAAuC;IACvC,yDAAiC,CAAA;IAEjC,+CAAuB,CAAA;IACvB,yEAAiD,CAAA;IACjD,mDAA2B,CAAA;IAC3B,uEAA+C,CAAA;IAC/C,oDAA4B,CAAA;IAE5B,qCAAa,CAAA;IACb,uCAAe,CAAA;IACf,uCAAe,CAAA;AACjB,CAAC,EAfW,oBAAoB,oCAApB,oBAAoB,QAe/B"}
|
|
@@ -33,8 +33,8 @@ class DyFM_SocketEvent {
|
|
|
33
33
|
this.logEvent = false;
|
|
34
34
|
}
|
|
35
35
|
else if ([
|
|
36
|
-
sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
37
|
-
sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
36
|
+
sck_event_key_enum_1.DyFM_SocketEvent_Key.incomingNewConnection,
|
|
37
|
+
sck_event_key_enum_1.DyFM_SocketEvent_Key.outgoingNewConnection,
|
|
38
38
|
sck_event_key_enum_1.DyFM_SocketEvent_Key.disconnect,
|
|
39
39
|
].includes(this.eventKey)) {
|
|
40
40
|
this.logEvent = global_settings_const_1.DyFM_global_settings.log_settings.socket_allEvents ||
|
|
@@ -57,7 +57,7 @@ class DyFM_SocketEvent {
|
|
|
57
57
|
*/
|
|
58
58
|
async getPreLog(content) {
|
|
59
59
|
try {
|
|
60
|
-
if (this.logEventContent && this.eventKey !== sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
60
|
+
if (this.logEventContent && this.eventKey !== sck_event_key_enum_1.DyFM_SocketEvent_Key.incomingNewConnection) {
|
|
61
61
|
log_util_1.DyFM_Log.log(`---> incoming socket(${this.serviceName}) event: ${this.eventKey};
|
|
62
62
|
\ncontent:`, content);
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-socket-event.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.ts"],"names":[],"mappings":";;;AACA,iGAA6F;AAC7F,uEAAoE;AACpE,mEAAgE;AAChE,uEAA+E;AAE/E,qEAAoE;AAMpE;;GAEG;AACH,MAAa,gBAAgB;IAC3B,IAAI,CAAU;IACd,QAAQ,CAAgC;IACxC,WAAW,CAAU;IAErB,YAAY,CAA8C;IAC1D,KAAK,CAA6B;IAElC,QAAQ,CAAW;IACnB,eAAe,CAAW;IAEjB,aAAa,CAAU;IAEhC,YACE,GAkCC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;YACrC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,sBAAsB,CAAC;YAE7D,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC;YAC3C,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAE7B,IAAI,CAAC,aAAa,GAAG,IAAA,kCAAqB,GAAE,CAAC;YAE7C,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC/B,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAC/B,CAAC;iBAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,yCAAoB,CAAC,SAAS,EAAE,CAAC;gBAC5D,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACxB,CAAC;iBAAM,IACJ;gBACC,yCAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"sck-socket-event.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,13 @@ describe('DyFM_SocketEvent', () => {
|
|
|
8
8
|
let socketEvent;
|
|
9
9
|
beforeEach(() => {
|
|
10
10
|
socketEvent = new sck_socket_event_control_model_1.DyFM_SocketEvent({
|
|
11
|
-
eventKey: sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
11
|
+
eventKey: sck_event_key_enum_1.DyFM_SocketEvent_Key.outgoingNewConnection,
|
|
12
12
|
preProcesses: [],
|
|
13
13
|
tasks: [],
|
|
14
14
|
});
|
|
15
15
|
});
|
|
16
16
|
it('should initialize with default values', () => {
|
|
17
|
-
expect(socketEvent.name).toBe(sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
17
|
+
expect(socketEvent.name).toBe(sck_event_key_enum_1.DyFM_SocketEvent_Key.outgoingNewConnection);
|
|
18
18
|
expect(socketEvent.serviceName).toBe('UnknownSocketService');
|
|
19
19
|
expect(socketEvent.preProcesses).toEqual([]);
|
|
20
20
|
expect(socketEvent.tasks).toEqual([]);
|
|
@@ -43,7 +43,7 @@ describe('DyFM_SocketEvent', () => {
|
|
|
43
43
|
socketEvent.tasks = [mockTask];
|
|
44
44
|
spyOn(log_util_1.DyFM_Log, 'error');
|
|
45
45
|
await socketEvent.executeEventTasks('testContent', 'testIssuer');
|
|
46
|
-
expect(log_util_1.DyFM_Log.error).toHaveBeenCalledWith(`Socket Event tasks failed to execute on UnknownSocketService.... (${sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
46
|
+
expect(log_util_1.DyFM_Log.error).toHaveBeenCalledWith(`Socket Event tasks failed to execute on UnknownSocketService.... (${sck_event_key_enum_1.DyFM_SocketEvent_Key.outgoingNewConnection})`, jasmine.any(Error), 'content:', 'testContent');
|
|
47
47
|
});
|
|
48
48
|
});
|
|
49
49
|
//# sourceMappingURL=sck-socket-event.control-model.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-socket-event.control-model.spec.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.spec.ts"],"names":[],"mappings":";;AACA,iGAA6F;AAC7F,mEAAgE;AAChE,qEAAoE;AACpE,qFAA0H;AAE1H,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAI,WAAkC,CAAC;IAEvC,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,IAAI,iDAAgB,CAAC;YACjC,QAAQ,EAAE,yCAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"sck-socket-event.control-model.spec.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ class DyFM_SocketClient_ServiceBase {
|
|
|
35
35
|
logFn = global_settings_const_1.DyFM_global_settings.log_settings.functions;
|
|
36
36
|
defaultEvents = [
|
|
37
37
|
new sck_socket_event_control_model_1.DyFM_SocketEvent({
|
|
38
|
-
eventKey: sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
38
|
+
eventKey: sck_event_key_enum_1.DyFM_SocketEvent_Key.outgoingNewConnection,
|
|
39
39
|
tasks: [
|
|
40
40
|
async () => {
|
|
41
41
|
this._connected_BS.next(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-client.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.ts"],"names":[],"mappings":";;;;AACA,yEAAmD;AACnD,+BAAuC;AAEvC,iGAE+D;AAC/D,uEAAoE;AACpE,mEAAgE;AAChE,+EAAwE;AACxE,6FAAiF;AAEjF,qEAAoE;AAEpE,8FAA6E;AAE7E,MAAsB,6BAA6B;IAEzC,OAAO,CAA2B;IAC1C,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAES,MAAM,CAAwB;IAE9B,cAAc,CAA0B;IAExC,aAAa,GAA6B,IAAI,sBAAe,CAAU,KAAK,CAAC,CAAC;IACxF,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;IAClC,CAAC;IACQ,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;IAEvC,cAAc,GAA6B,IAAI,sBAAe,CAAU,KAAK,CAAC,CAAC;IAChG,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;IACnC,CAAC;IACQ,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;IAEhD,QAAQ,GAAY,4CAAoB,CAAC,YAAY,CAAC,KAAK,CAAC;IAC5D,KAAK,GAAY,4CAAoB,CAAC,YAAY,CAAC,SAAS,CAAC;IAEtD,aAAa,GAA4B;QACxD,IAAI,iDAAgB,CAAM;YACxB,QAAQ,EAAE,yCAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"sck-client.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ xdescribe('DyFM_SocketClient_ServiceBase', () => {
|
|
|
37
37
|
spyOn(log_util_1.DyFM_Log, 'warn');
|
|
38
38
|
await service['setupDefaultEvents']();
|
|
39
39
|
await service['setupSocketEvents']();
|
|
40
|
-
service['socket'].emit(sck_event_key_enum_1.DyFM_SocketEvent_Key.
|
|
40
|
+
service['socket'].emit(sck_event_key_enum_1.DyFM_SocketEvent_Key.outgoingNewConnection);
|
|
41
41
|
expect(service.connected).toBeTrue();
|
|
42
42
|
expect(log_util_1.DyFM_Log.success).toHaveBeenCalledWith('< > socket-client(testService) connected!');
|
|
43
43
|
service['socket'].emit(sck_event_key_enum_1.DyFM_SocketEvent_Key.disconnect);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-client.service-base.spec.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.spec.ts"],"names":[],"mappings":";;AACA,mEAAgE;AAChE,qEAAoE;AAGpE,uEAA0E;AAE1E,MAAM,uBAAwB,SAAQ,uDAA6B;IACjE,SAAS;QACP,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,kBAAkB;YAC3B,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI;YACf,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,EAAE;SAClB,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAED,SAAS,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC9C,IAAI,OAAgC,CAAC;IAErC;;;UAGM;IAEN,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,SAAS,EAAE,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,KAAK,CAAC,mBAAQ,EAAE,SAAS,CAAC,CAAC;QAC3B,KAAK,CAAC,mBAAQ,EAAE,MAAM,CAAC,CAAC;QAExB,MAAM,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACtC,MAAM,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAErC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,yCAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"sck-client.service-base.spec.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ class DyFM_UsageSession extends metadata_data_model_1.DyFM_Metadata {
|
|
|
25
25
|
}
|
|
26
26
|
exports.DyFM_UsageSession = DyFM_UsageSession;
|
|
27
27
|
exports.DyFM_usageSession_dataParams = new data_model_params_control_model_1.DyFM_DataModel_Params({
|
|
28
|
-
dataName: '
|
|
28
|
+
dataName: 'usage_session',
|
|
29
29
|
properties: {
|
|
30
30
|
date: { key: 'date', type: 'string',
|
|
31
31
|
required: true, index: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usg-session.data-model.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.ts"],"names":[],"mappings":";;;AACA,qHAEyE;AACzE,0FAAiF;AAKjF,MAAa,iBAAkB,SAAQ,mCAAa;IAClD,IAAI,CAAU;IACd,YAAY,CAAQ;IACpB,UAAU,CAAQ;IAClB,OAAO,CAAU;IACjB,MAAM,CAAU;IAChB,YAAY,CAAsB;IAElC,SAAS,GAAsB,EAAE,CAAC;IAClC,gBAAgB,CAAU;IAC1B,UAAU,CAAU;IAEpB,YACE,GAAuB;QAEvB,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;gBAClC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAzBD,8CAyBC;AAEY,QAAA,4BAA4B,GACvC,IAAI,uDAAqB,CAAoB;IAC3C,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"usg-session.data-model.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.ts"],"names":[],"mappings":";;;AACA,qHAEyE;AACzE,0FAAiF;AAKjF,MAAa,iBAAkB,SAAQ,mCAAa;IAClD,IAAI,CAAU;IACd,YAAY,CAAQ;IACpB,UAAU,CAAQ;IAClB,OAAO,CAAU;IACjB,MAAM,CAAU;IAChB,YAAY,CAAsB;IAElC,SAAS,GAAsB,EAAE,CAAC;IAClC,gBAAgB,CAAU;IAC1B,UAAU,CAAU;IAEpB,YACE,GAAuB;QAEvB,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;gBAClC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;CACF;AAzBD,8CAyBC;AAEY,QAAA,4BAA4B,GACvC,IAAI,uDAAqB,CAAoB;IAC3C,QAAQ,EAAE,eAAe;IACzB,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ;YACjC,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI;SAC5B;QACD,YAAY,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM;YAC/C,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI;SAC5B;QACD,UAAU,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE;QAC/C,OAAO,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3C,MAAM,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzC,YAAY,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,EAAE;QAC5D,SAAS,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE;QACpD,gBAAgB,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC7D,UAAU,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;KAClD;CACF,CAAC,CAAC"}
|
|
@@ -48,7 +48,7 @@ describe('DyFM_UsageSession', () => {
|
|
|
48
48
|
});
|
|
49
49
|
describe('DyFM_usageSession_dataParams', () => {
|
|
50
50
|
it('should have the correct dataName', () => {
|
|
51
|
-
expect(usg_session_data_model_1.DyFM_usageSession_dataParams.dataName).toBe('
|
|
51
|
+
expect(usg_session_data_model_1.DyFM_usageSession_dataParams.dataName).toBe('usage_session');
|
|
52
52
|
});
|
|
53
53
|
it('should have the correct properties configuration', () => {
|
|
54
54
|
const properties = usg_session_data_model_1.DyFM_usageSession_dataParams.properties;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usg-session.data-model.spec.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"usg-session.data-model.spec.js","sourceRoot":"","sources":["../../../../src/_modules/usage/_models/usg-session.data-model.spec.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/fsm-dynamo",
|
|
3
|
-
"version": "01.10.
|
|
3
|
+
"version": "01.10.19",
|
|
4
4
|
"description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"prep": "npm i pnpm -g && npm i rimraf nodemon -g",
|
|
@@ -18,14 +18,14 @@ export function DyFM_getStackLocation(): string {
|
|
|
18
18
|
!line.includes('at new')
|
|
19
19
|
);
|
|
20
20
|
if (!constructorLine) {
|
|
21
|
-
DyFM_Log.warn('No constructor line found');
|
|
21
|
+
DyFM_Log.warn('No constructor line found\n' + stack);
|
|
22
22
|
return '';
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
// Remove the 'constructorLine at ... (' and the ')'
|
|
26
26
|
constructorLine = constructorLine.split('(')[1]?.split(')')[0];
|
|
27
27
|
if (!constructorLine) {
|
|
28
|
-
DyFM_Log.warn('No constructor line found');
|
|
28
|
+
DyFM_Log.warn('No constructor line found\n' + stack);
|
|
29
29
|
return '';
|
|
30
30
|
}
|
|
31
31
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
|
|
2
2
|
export enum DyFM_SocketEvent_Key {
|
|
3
|
-
/** incoming connection */
|
|
4
|
-
|
|
5
|
-
/** outgoing connection */
|
|
6
|
-
|
|
3
|
+
/** incoming connection in socket.io */
|
|
4
|
+
incomingNewConnection = 'connection',
|
|
5
|
+
/** outgoing connection in socket.io */
|
|
6
|
+
outgoingNewConnection = 'connect',
|
|
7
7
|
|
|
8
8
|
subscribe = 'subscribe',
|
|
9
9
|
subscriptionSuccessful = 'subscriptionSuccessful',
|
|
@@ -9,14 +9,14 @@ describe('DyFM_SocketEvent', () => {
|
|
|
9
9
|
|
|
10
10
|
beforeEach(() => {
|
|
11
11
|
socketEvent = new DyFM_SocketEvent({
|
|
12
|
-
eventKey: DyFM_SocketEvent_Key.
|
|
12
|
+
eventKey: DyFM_SocketEvent_Key.outgoingNewConnection,
|
|
13
13
|
preProcesses: [],
|
|
14
14
|
tasks: [],
|
|
15
15
|
});
|
|
16
16
|
});
|
|
17
17
|
|
|
18
18
|
it('should initialize with default values', () => {
|
|
19
|
-
expect(socketEvent.name).toBe(DyFM_SocketEvent_Key.
|
|
19
|
+
expect(socketEvent.name).toBe(DyFM_SocketEvent_Key.outgoingNewConnection);
|
|
20
20
|
expect(socketEvent.serviceName).toBe('UnknownSocketService');
|
|
21
21
|
expect(socketEvent.preProcesses).toEqual([]);
|
|
22
22
|
expect(socketEvent.tasks).toEqual([]);
|
|
@@ -57,7 +57,7 @@ describe('DyFM_SocketEvent', () => {
|
|
|
57
57
|
await socketEvent.executeEventTasks('testContent', 'testIssuer');
|
|
58
58
|
|
|
59
59
|
expect(DyFM_Log.error).toHaveBeenCalledWith(
|
|
60
|
-
`Socket Event tasks failed to execute on UnknownSocketService.... (${DyFM_SocketEvent_Key.
|
|
60
|
+
`Socket Event tasks failed to execute on UnknownSocketService.... (${DyFM_SocketEvent_Key.outgoingNewConnection})`,
|
|
61
61
|
jasmine.any(Error),
|
|
62
62
|
'content:',
|
|
63
63
|
'testContent'
|
|
@@ -79,8 +79,8 @@ export class DyFM_SocketEvent<T>{
|
|
|
79
79
|
this.logEvent = false;
|
|
80
80
|
} else if (
|
|
81
81
|
([
|
|
82
|
-
DyFM_SocketEvent_Key.
|
|
83
|
-
DyFM_SocketEvent_Key.
|
|
82
|
+
DyFM_SocketEvent_Key.incomingNewConnection,
|
|
83
|
+
DyFM_SocketEvent_Key.outgoingNewConnection,
|
|
84
84
|
DyFM_SocketEvent_Key.disconnect,
|
|
85
85
|
] as string[]).includes(this.eventKey)
|
|
86
86
|
) {
|
|
@@ -107,7 +107,7 @@ export class DyFM_SocketEvent<T>{
|
|
|
107
107
|
*/
|
|
108
108
|
private async getPreLog(content: T): Promise<void> {
|
|
109
109
|
try {
|
|
110
|
-
if (this.logEventContent && this.eventKey !== DyFM_SocketEvent_Key.
|
|
110
|
+
if (this.logEventContent && this.eventKey !== DyFM_SocketEvent_Key.incomingNewConnection) {
|
|
111
111
|
DyFM_Log.log(
|
|
112
112
|
`---> incoming socket(${this.serviceName}) event: ${this.eventKey};
|
|
113
113
|
\ncontent:`, content
|
|
@@ -47,7 +47,7 @@ xdescribe('DyFM_SocketClient_ServiceBase', () => {
|
|
|
47
47
|
await service['setupDefaultEvents']();
|
|
48
48
|
await service['setupSocketEvents']();
|
|
49
49
|
|
|
50
|
-
service['socket'].emit(DyFM_SocketEvent_Key.
|
|
50
|
+
service['socket'].emit(DyFM_SocketEvent_Key.outgoingNewConnection);
|
|
51
51
|
expect(service.connected).toBeTrue();
|
|
52
52
|
expect(DyFM_Log.success).toHaveBeenCalledWith('< > socket-client(testService) connected!');
|
|
53
53
|
|
|
@@ -45,7 +45,7 @@ export abstract class DyFM_SocketClient_ServiceBase<T_SubscriptionContent = any>
|
|
|
45
45
|
|
|
46
46
|
private readonly defaultEvents: DyFM_SocketEvent<any>[] = [
|
|
47
47
|
new DyFM_SocketEvent<any>({
|
|
48
|
-
eventKey: DyFM_SocketEvent_Key.
|
|
48
|
+
eventKey: DyFM_SocketEvent_Key.outgoingNewConnection,
|
|
49
49
|
tasks: [
|
|
50
50
|
async (): Promise<void> => {
|
|
51
51
|
this._connected_BS.next(true);
|
|
@@ -55,7 +55,7 @@ describe('DyFM_UsageSession', () => {
|
|
|
55
55
|
|
|
56
56
|
describe('DyFM_usageSession_dataParams', () => {
|
|
57
57
|
it('should have the correct dataName', () => {
|
|
58
|
-
expect(DyFM_usageSession_dataParams.dataName).toBe('
|
|
58
|
+
expect(DyFM_usageSession_dataParams.dataName).toBe('usage_session');
|
|
59
59
|
});
|
|
60
60
|
|
|
61
61
|
it('should have the correct properties configuration', () => {
|
|
@@ -36,7 +36,7 @@ export class DyFM_UsageSession extends DyFM_Metadata {
|
|
|
36
36
|
|
|
37
37
|
export const DyFM_usageSession_dataParams: DyFM_DataModel_Params<DyFM_UsageSession> =
|
|
38
38
|
new DyFM_DataModel_Params<DyFM_UsageSession>({
|
|
39
|
-
dataName: '
|
|
39
|
+
dataName: 'usage_session',
|
|
40
40
|
properties: {
|
|
41
41
|
date: { key: 'date', type: 'string',
|
|
42
42
|
required: true, index: true,
|
|
Binary file
|