@futdevpro/nts-dynamo 1.6.2 → 1.6.4

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.
Files changed (31) hide show
  1. package/lib/_enums/http/dynamo-nts-socket-event-type.enum.d.ts +3 -0
  2. package/lib/_enums/http/dynamo-nts-socket-event-type.enum.d.ts.map +1 -1
  3. package/lib/_enums/http/dynamo-nts-socket-event-type.enum.js +3 -0
  4. package/lib/_enums/http/dynamo-nts-socket-event-type.enum.js.map +1 -1
  5. package/lib/_models/control-models/dynamo-nts-socket-client-service-params.model.d.ts +2 -0
  6. package/lib/_models/control-models/dynamo-nts-socket-client-service-params.model.d.ts.map +1 -1
  7. package/lib/_models/control-models/dynamo-nts-socket-client-service-params.model.js +5 -5
  8. package/lib/_models/control-models/dynamo-nts-socket-client-service-params.model.js.map +1 -1
  9. package/lib/_models/control-models/dynamo-nts-socket-event.model.d.ts +8 -15
  10. package/lib/_models/control-models/dynamo-nts-socket-event.model.d.ts.map +1 -1
  11. package/lib/_models/control-models/dynamo-nts-socket-event.model.js +4 -4
  12. package/lib/_models/control-models/dynamo-nts-socket-event.model.js.map +1 -1
  13. package/lib/_models/control-models/dynamo-nts-socket-server-service-params.model.d.ts +3 -9
  14. package/lib/_models/control-models/dynamo-nts-socket-server-service-params.model.d.ts.map +1 -1
  15. package/lib/_models/control-models/dynamo-nts-socket-server-service-params.model.js.map +1 -1
  16. package/lib/_services/dynamo-nts-socket-client.service.d.ts +3 -2
  17. package/lib/_services/dynamo-nts-socket-client.service.d.ts.map +1 -1
  18. package/lib/_services/dynamo-nts-socket-client.service.js +18 -22
  19. package/lib/_services/dynamo-nts-socket-client.service.js.map +1 -1
  20. package/lib/_services/dynamo-nts-socket-server.service.d.ts +5 -5
  21. package/lib/_services/dynamo-nts-socket-server.service.d.ts.map +1 -1
  22. package/lib/_services/dynamo-nts-socket-server.service.js +2 -2
  23. package/lib/_services/dynamo-nts-socket-server.service.js.map +1 -1
  24. package/lib/tsconfig.tsbuildinfo +1 -1
  25. package/package.json +1 -1
  26. package/src/_enums/http/dynamo-nts-socket-event-type.enum.ts +4 -0
  27. package/src/_models/control-models/dynamo-nts-socket-client-service-params.model.ts +4 -4
  28. package/src/_models/control-models/dynamo-nts-socket-event.model.ts +12 -21
  29. package/src/_models/control-models/dynamo-nts-socket-server-service-params.model.ts +3 -10
  30. package/src/_services/dynamo-nts-socket-client.service.ts +18 -22
  31. package/src/_services/dynamo-nts-socket-server.service.ts +10 -10
@@ -1,5 +1,8 @@
1
1
  export declare enum DynamoNTS_SocketEventType {
2
+ /** incoming connection */
2
3
  connection = "connection",
4
+ /** outgoing connection */
5
+ connect = "connect",
3
6
  subscribe = "subscribe",
4
7
  subscriptionSuccessful = "subscriptionSuccessful",
5
8
  unsubscribe = "unsubscribe",
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-event-type.enum.d.ts","sourceRoot":"","sources":["../../../src/_enums/http/dynamo-nts-socket-event-type.enum.ts"],"names":[],"mappings":"AACA,oBAAY,yBAAyB;IACnC,UAAU,eAAe;IACzB,SAAS,cAAc;IACvB,sBAAsB,2BAA2B;IACjD,WAAW,gBAAgB;IAC3B,UAAU,kBAAkB;IAC5B,KAAK,UAAU;IACf,KAAK,UAAU;CAChB"}
1
+ {"version":3,"file":"dynamo-nts-socket-event-type.enum.d.ts","sourceRoot":"","sources":["../../../src/_enums/http/dynamo-nts-socket-event-type.enum.ts"],"names":[],"mappings":"AACA,oBAAY,yBAAyB;IACnC,0BAA0B;IAC1B,UAAU,eAAe;IACzB,0BAA0B;IAC1B,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,sBAAsB,2BAA2B;IACjD,WAAW,gBAAgB;IAC3B,UAAU,kBAAkB;IAC5B,KAAK,UAAU;IACf,KAAK,UAAU;CAChB"}
@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DynamoNTS_SocketEventType = void 0;
4
4
  var DynamoNTS_SocketEventType;
5
5
  (function (DynamoNTS_SocketEventType) {
6
+ /** incoming connection */
6
7
  DynamoNTS_SocketEventType["connection"] = "connection";
8
+ /** outgoing connection */
9
+ DynamoNTS_SocketEventType["connect"] = "connect";
7
10
  DynamoNTS_SocketEventType["subscribe"] = "subscribe";
8
11
  DynamoNTS_SocketEventType["subscriptionSuccessful"] = "subscriptionSuccessful";
9
12
  DynamoNTS_SocketEventType["unsubscribe"] = "unsubscribe";
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-event-type.enum.js","sourceRoot":"","sources":["../../../src/_enums/http/dynamo-nts-socket-event-type.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,yBAQX;AARD,WAAY,yBAAyB;IACnC,sDAAyB,CAAA;IACzB,oDAAuB,CAAA;IACvB,8EAAiD,CAAA;IACjD,wDAA2B,CAAA;IAC3B,yDAA4B,CAAA;IAC5B,4CAAe,CAAA;IACf,4CAAe,CAAA;AACjB,CAAC,EARW,yBAAyB,yCAAzB,yBAAyB,QAQpC"}
1
+ {"version":3,"file":"dynamo-nts-socket-event-type.enum.js","sourceRoot":"","sources":["../../../src/_enums/http/dynamo-nts-socket-event-type.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,yBAWX;AAXD,WAAY,yBAAyB;IACnC,0BAA0B;IAC1B,sDAAyB,CAAA;IACzB,0BAA0B;IAC1B,gDAAmB,CAAA;IACnB,oDAAuB,CAAA;IACvB,8EAAiD,CAAA;IACjD,wDAA2B,CAAA;IAC3B,yDAA4B,CAAA;IAC5B,4CAAe,CAAA;IACf,4CAAe,CAAA;AACjB,CAAC,EAXW,yBAAyB,yCAAzB,yBAAyB,QAWpC"}
@@ -1,3 +1,4 @@
1
+ import * as SocketIO from 'socket.io-client';
1
2
  /**
2
3
  * socket handling and clarification is under development
3
4
  */
@@ -8,6 +9,7 @@ export declare class DynamoNTS_SocketClientServiceParams {
8
9
  port: number;
9
10
  reconnectDelay?: number;
10
11
  reconnect?: boolean;
12
+ socketOptions?: Partial<SocketIO.ManagerOptions & SocketIO.SocketOptions>;
11
13
  constructor(set: DynamoNTS_SocketClientServiceParams);
12
14
  }
13
15
  //# sourceMappingURL=dynamo-nts-socket-client-service-params.model.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-client-service-params.model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-client-service-params.model.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,qBAAa,mCAAmC;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAqB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAe;IACtC,SAAS,CAAC,EAAE,OAAO,CAAQ;gBAIzB,GAAG,EAAE,mCAAmC;CAS3C"}
1
+ {"version":3,"file":"dynamo-nts-socket-client-service-params.model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-client-service-params.model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAI7C;;GAEG;AACH,qBAAa,mCAAmC;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAe;IACtC,SAAS,CAAC,EAAE,OAAO,CAAQ;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAGxE,GAAG,EAAE,mCAAmC;CAS3C"}
@@ -6,16 +6,16 @@ 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
- /* socketOptions?: Partial<SocketIO.ManagerOptions & SocketIO.SocketOptions> */
10
9
  constructor(set) {
11
- this.address = 'ws://localhost:';
10
+ var _a, _b;
11
+ this.address = 'ws://localhost';
12
12
  this.reconnectDelay = fsm_dynamo_1.second * 10;
13
13
  this.reconnect = true;
14
14
  Object.assign(this, set);
15
15
  this.reconnect = !!this.reconnectDelay;
16
- /* if (this.socketOptions?.autoConnect || this.socketOptions?.reconnection) {
17
- this.reconnect = false;
18
- } */
16
+ if (((_a = this.socketOptions) === null || _a === void 0 ? void 0 : _a.autoConnect) || ((_b = this.socketOptions) === null || _b === void 0 ? void 0 : _b.reconnection)) {
17
+ this.reconnect = false;
18
+ }
19
19
  }
20
20
  }
21
21
  exports.DynamoNTS_SocketClientServiceParams = DynamoNTS_SocketClientServiceParams;
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-client-service-params.model.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-client-service-params.model.ts"],"names":[],"mappings":";;;AAGA,sDAA+C;AAE/C;;GAEG;AACH,MAAa,mCAAmC;IAO9C,+EAA+E;IAE/E,YACE,GAAwC;QAP1C,YAAO,GAAY,iBAAiB,CAAC;QAErC,mBAAc,GAAY,mBAAM,GAAG,EAAE,CAAC;QACtC,cAAS,GAAa,IAAI,CAAC;QAMzB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACvC;;YAEI;IACN,CAAC;CACF;AAnBD,kFAmBC"}
1
+ {"version":3,"file":"dynamo-nts-socket-client-service-params.model.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-client-service-params.model.ts"],"names":[],"mappings":";;;AAGA,sDAA+C;AAE/C;;GAEG;AACH,MAAa,mCAAmC;IAS9C,YACE,GAAwC;;QAP1C,YAAO,GAAY,gBAAgB,CAAC;QAEpC,mBAAc,GAAY,mBAAM,GAAG,EAAE,CAAC;QACtC,cAAS,GAAa,IAAI,CAAC;QAMzB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QACvC,IAAI,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,WAAW,MAAI,MAAA,IAAI,CAAC,aAAa,0CAAE,YAAY,CAAA,EAAE;YACvE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;SACxB;IACH,CAAC;CACF;AAnBD,kFAmBC"}
@@ -1,33 +1,26 @@
1
1
  import { DynamoNTS_SocketEventType } from '../../_enums/http/dynamo-nts-socket-event-type.enum';
2
- export type DynamoNTS_SocketEventPreprocessTask<T_EventContent> = (content?: any, issuer?: string) => Promise<T_EventContent>;
3
- export type DynamoNTS_SocketEventTask = (content?: any, issuer?: string) => Promise<void>;
2
+ export type DynamoNTS_SocketEventPreprocessTask<T = any, R = any> = (content?: T, issuer?: string) => Promise<R>;
3
+ export type DynamoNTS_SocketEventTask<T> = (content?: T, issuer?: string) => Promise<void>;
4
4
  /**
5
5
  * socket handling and clarification is under development
6
6
  */
7
- export declare class DynamoNTS_SocketEvent<T_EventContent> {
7
+ export declare class DynamoNTS_SocketEvent<T> {
8
8
  socketName?: string;
9
9
  eventType: DynamoNTS_SocketEventType | string;
10
- preProcessess?: DynamoNTS_SocketEventPreprocessTask<T_EventContent>[];
11
- tasks: DynamoNTS_SocketEventTask[];
10
+ preProcessess?: DynamoNTS_SocketEventPreprocessTask<any, any>[];
11
+ tasks?: DynamoNTS_SocketEventTask<T>[];
12
12
  logEvent?: boolean;
13
13
  logEventContent?: boolean;
14
- constructor(set: {
15
- socketName?: string;
16
- eventType: DynamoNTS_SocketEventType | string;
17
- preProcessess?: DynamoNTS_SocketEventPreprocessTask<T_EventContent>[];
18
- tasks?: DynamoNTS_SocketEventTask[];
19
- logEvent?: boolean;
20
- logEventContent?: boolean;
21
- });
14
+ constructor(set: DynamoNTS_SocketEvent<T>);
22
15
  /**
23
16
  *
24
17
  * @returns
25
18
  */
26
- getPreLog(): DynamoNTS_SocketEventPreprocessTask<T_EventContent>;
19
+ getPreLog?(): DynamoNTS_SocketEventPreprocessTask;
27
20
  /**
28
21
  *
29
22
  * @returns
30
23
  */
31
- executeEventTasks(issuer?: string, content?: T_EventContent): Promise<void>;
24
+ executeEventTasks?(content?: T, issuer?: string): Promise<void>;
32
25
  }
33
26
  //# sourceMappingURL=dynamo-nts-socket-event.model.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-event.model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-event.model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAGhG,MAAM,MAAM,mCAAmC,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAC9H,MAAM,MAAM,yBAAyB,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1F;;GAEG;AACH,qBAAa,qBAAqB,CAAC,cAAc;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,yBAAyB,GAAG,MAAM,CAAC;IAE9C,aAAa,CAAC,EAAE,mCAAmC,CAAC,cAAc,CAAC,EAAE,CAAC;IACtE,KAAK,EAAE,yBAAyB,EAAE,CAAC;IAEnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,yBAAyB,GAAG,MAAM,CAAC;QAE9C,aAAa,CAAC,EAAE,mCAAmC,CAAC,cAAc,CAAC,EAAE,CAAC;QACtE,KAAK,CAAC,EAAE,yBAAyB,EAAE,CAAC;QAEpC,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IA4BH;;;OAGG;IACH,SAAS,IAAI,mCAAmC,CAAC,cAAc,CAAC;IAiBhE;;;OAGG;IACG,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAalF"}
1
+ {"version":3,"file":"dynamo-nts-socket-event.model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-event.model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC;AAGhG,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,SAAS,EAAE,yBAAyB,GAAG,MAAM,CAAC;IAE9C,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,qBAAqB,CAAC,CAAC,CAAC;IA4B/B;;;OAGG;IACH,SAAS,CAAC,IAAI,mCAAmC;IAiBjD;;;OAGG;IACG,iBAAiB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAatE"}
@@ -19,7 +19,7 @@ class DynamoNTS_SocketEvent {
19
19
  if (set.logEvent !== undefined) {
20
20
  this.logEvent = set.logEvent;
21
21
  }
22
- else if (this.eventType === dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.connection || this.eventType === dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.disconnect) {
22
+ else if ([dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.connection, dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.connect, dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.disconnect].includes(this.eventType)) {
23
23
  this.logEvent = dynamo_nts_global_settings_const_1.dynamoNTS_GlobalSettings.logMainSocketEvent;
24
24
  }
25
25
  else {
@@ -44,10 +44,10 @@ class DynamoNTS_SocketEvent {
44
44
  try {
45
45
  if (this.logEvent) {
46
46
  if (this.logEventContent) {
47
- console.log(`==> incoming ${this.socketName} socket event: ${this.eventType} content:`, content);
47
+ console.log(`\n==> incoming ${this.socketName} socket event: ${this.eventType} content:`, content);
48
48
  }
49
49
  else {
50
- console.log(`==> incoming ${this.socketName} socket event: ${this.eventType}...`);
50
+ console.log(`\n==> incoming ${this.socketName} socket event: ${this.eventType}...`);
51
51
  }
52
52
  }
53
53
  return content;
@@ -61,7 +61,7 @@ class DynamoNTS_SocketEvent {
61
61
  *
62
62
  * @returns
63
63
  */
64
- executeEventTasks(issuer, content) {
64
+ executeEventTasks(content, issuer) {
65
65
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
66
66
  try {
67
67
  for (let i = 0; i < this.preProcessess.length; i++) {
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-event.model.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-event.model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dynamo-nts-socket-event.model.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-event.model.ts"],"names":[],"mappings":"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"}
@@ -2,18 +2,12 @@ import { DynamoNTS_SocketSecurity } from '../../_enums/dynamo-nts-socket-securit
2
2
  /**
3
3
  * socket handling and clarification is under development
4
4
  */
5
- export declare class DynamoNTS_SocketServerServiceParams {
5
+ export declare class DynamoNTS_SocketServerServiceParams<T = any> {
6
6
  name: string;
7
7
  port: number;
8
8
  security?: DynamoNTS_SocketSecurity;
9
9
  groupActiveSocketsBy?: string;
10
- getIdFromSubscrioption?: (content: any) => string;
11
- constructor(set: {
12
- name: string;
13
- port: number;
14
- security?: DynamoNTS_SocketSecurity;
15
- groupActiveSocketsBy?: string;
16
- getIdFromSubscrioption?: (content: any) => string;
17
- });
10
+ getIdFromSubscrioption?: (content: T) => Promise<string>;
11
+ constructor(set: DynamoNTS_SocketServerServiceParams<T>);
18
12
  }
19
13
  //# sourceMappingURL=dynamo-nts-socket-server-service-params.model.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-server-service-params.model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-server-service-params.model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AAExF;;GAEG;AACH,qBAAa,mCAAmC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,sBAAsB,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,CAAC;gBAGhD,GAAG,EAAE;QACH,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,wBAAwB,CAAC;QACpC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAE9B,sBAAsB,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,CAAC;KACnD;CAkBJ"}
1
+ {"version":3,"file":"dynamo-nts-socket-server-service-params.model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-server-service-params.model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AAExF;;GAEG;AACH,qBAAa,mCAAmC,CAAC,CAAC,GAAG,GAAG;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,sBAAsB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;gBAGvD,GAAG,EAAE,mCAAmC,CAAC,CAAC,CAAC;CAkB9C"}
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-server-service-params.model.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-server-service-params.model.ts"],"names":[],"mappings":";;;AACA,sDAAmD;AACnD,wGAA6F;AAG7F;;GAEG;AACH,MAAa,mCAAmC;IAQ9C,YACE,GAOC;QAED,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,2DAAwB,CAAC,qBAAqB,CAAC;QAE7F,IAAI,GAAG,CAAC,sBAAsB,EAAE;YAC9B,IAAI,CAAC,sBAAsB,GAAG,GAAG,CAAC,sBAAsB,CAAC;YAEzD,IAAI,GAAG,CAAC,oBAAoB,EAAE;gBAC5B,uBAAU,CAAC,KAAK,CACd,4DAA4D,IAAI,CAAC,IAAI,uBAAuB;oBAC5F,yEAAyE,CAAC,CAAA;aAC7E;SACF;aAAM,IAAI,GAAG,CAAC,oBAAoB,EAAE;YACnC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAC5E;IACH,CAAC;CACF;AAlCD,kFAkCC"}
1
+ {"version":3,"file":"dynamo-nts-socket-server-service-params.model.js","sourceRoot":"","sources":["../../../src/_models/control-models/dynamo-nts-socket-server-service-params.model.ts"],"names":[],"mappings":";;;AACA,sDAAmD;AACnD,wGAA6F;AAG7F;;GAEG;AACH,MAAa,mCAAmC;IAQ9C,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,2DAAwB,CAAC,qBAAqB,CAAC;QAE7F,IAAI,GAAG,CAAC,sBAAsB,EAAE;YAC9B,IAAI,CAAC,sBAAsB,GAAG,GAAG,CAAC,sBAAsB,CAAC;YAEzD,IAAI,GAAG,CAAC,oBAAoB,EAAE;gBAC5B,uBAAU,CAAC,KAAK,CACd,4DAA4D,IAAI,CAAC,IAAI,uBAAuB;oBAC5F,yEAAyE,CAAC,CAAA;aAC7E;SACF;aAAM,IAAI,GAAG,CAAC,oBAAoB,EAAE;YACnC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAC5E;IACH,CAAC;CACF;AA3BD,kFA2BC"}
@@ -5,6 +5,7 @@ import { DynamoNTS_SocketEvent } from '../_models/control-models/dynamo-nts-sock
5
5
  export declare abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonService {
6
6
  private _params;
7
7
  protected get params(): DynamoNTS_SocketClientServiceParams;
8
+ get name(): string;
8
9
  protected log: boolean;
9
10
  protected socket: SocketIO.Socket;
10
11
  protected incomingEvents: DynamoNTS_SocketEvent<any>[];
@@ -18,10 +19,10 @@ export declare abstract class DynamoNTS_SocketClientService extends DynamoNTS_Si
18
19
  private tryReconnectIfNeeded;
19
20
  /**
20
21
  * Emit event to the socket
21
- * @param event event name
22
+ * @param eventType event name
22
23
  * @param content event content
23
24
  */
24
- protected emitEvent(event: string, content: any): void;
25
+ protected emitEvent(eventType: string, content: any): void;
25
26
  /**
26
27
  * You must setup params for the service in this function
27
28
  */
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-client.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-client.service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,EAAE,mCAAmC,EAAE,MAAM,yEAAyE,CAAC;AAE9H,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAIhG,8BAAsB,6BAA8B,SAAQ,0BAA0B;IAEpF,OAAO,CAAC,OAAO,CAAsC;IACrD,SAAS,KAAK,MAAM,IAAI,mCAAmC,CAAyB;IAEpF,SAAS,CAAC,GAAG,EAAE,OAAO,CAAqC;IAE3D,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAA;IAEjC,SAAS,CAAC,cAAc,EAAE,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;IAEvD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAS;IACtC,IAAI,SAAS,IAAI,OAAO,CAA4B;IAEpD,OAAO,CAAC,aAAa,CAyCnB;IAGF,SAAS;IAoBT,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;YAUP,oBAAoB;IAQlC;;;;OAIG;IACH,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAItD;;OAEG;IACH,QAAQ,CAAC,SAAS,IAAI,mCAAmC;IAEzD;;OAEG;IACH,QAAQ,CAAC,iBAAiB,IAAI,qBAAqB,CAAC,GAAG,CAAC,EAAE;CAC3D"}
1
+ {"version":3,"file":"dynamo-nts-socket-client.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-client.service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,EAAE,mCAAmC,EAAE,MAAM,yEAAyE,CAAC;AAE9H,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAIhG,8BAAsB,6BAA8B,SAAQ,0BAA0B;IAEpF,OAAO,CAAC,OAAO,CAAsC;IACrD,SAAS,KAAK,MAAM,IAAI,mCAAmC,CAAyB;IACpF,IAAI,IAAI,IAAI,MAAM,CAA6B;IAE/C,SAAS,CAAC,GAAG,EAAE,OAAO,CAAqC;IAE3D,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAA;IAEjC,SAAS,CAAC,cAAc,EAAE,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;IAEvD,SAAS,CAAC,UAAU,EAAE,OAAO,CAAS;IACtC,IAAI,SAAS,IAAI,OAAO,CAA4B;IAEpD,OAAO,CAAC,aAAa,CAgCnB;IAGF,SAAS;IAoBT,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,aAAa;YAUP,oBAAoB;IAQlC;;;;OAIG;IACH,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAK1D;;OAEG;IACH,QAAQ,CAAC,SAAS,IAAI,mCAAmC;IAEzD;;OAEG;IACH,QAAQ,CAAC,iBAAiB,IAAI,qBAAqB,CAAC,GAAG,CAAC,EAAE;CAC3D"}
@@ -10,6 +10,7 @@ const dynamo_nts_socket_event_model_1 = require("../_models/control-models/dynam
10
10
  const dynamo_nts_socket_event_type_enum_1 = require("../_enums/http/dynamo-nts-socket-event-type.enum");
11
11
  class DynamoNTS_SocketClientService extends dynamo_nts_singleton_service_1.DynamoNTS_SingletonService {
12
12
  get params() { return this._params; }
13
+ get name() { return this.params.name; }
13
14
  get connected() { return this._connected; }
14
15
  constructor() {
15
16
  var _a, _b;
@@ -18,20 +19,11 @@ class DynamoNTS_SocketClientService extends dynamo_nts_singleton_service_1.Dynam
18
19
  this._connected = false;
19
20
  this.defaultEvents = [
20
21
  new dynamo_nts_socket_event_model_1.DynamoNTS_SocketEvent({
21
- eventType: dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.connection,
22
+ eventType: dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.connect,
22
23
  tasks: [
23
24
  () => tslib_1.__awaiter(this, void 0, void 0, function* () {
24
25
  this._connected = true;
25
- console.log(`Socket Client connected: ${this.params.name} (${this.params.port})!!!!!!!!!!!!!!!!!!!!!!!!!!!!`);
26
- })
27
- ]
28
- }),
29
- new dynamo_nts_socket_event_model_1.DynamoNTS_SocketEvent({
30
- eventType: 'connect',
31
- tasks: [
32
- () => tslib_1.__awaiter(this, void 0, void 0, function* () {
33
- this._connected = true;
34
- console.log(`Socket Client connected: ${this.params.name} (${this.params.port})!!!!!!!!!!!!!!!!!!!!!!!!!!!!`);
26
+ console.log(`Socket Client connected: ${this.params.name}`);
35
27
  })
36
28
  ]
37
29
  }),
@@ -40,7 +32,7 @@ class DynamoNTS_SocketClientService extends dynamo_nts_singleton_service_1.Dynam
40
32
  tasks: [
41
33
  () => tslib_1.__awaiter(this, void 0, void 0, function* () {
42
34
  this._connected = false;
43
- console.log(`Socket Client disconnected: ${this.params.name} (${this.params.port})`);
35
+ console.log(`Socket Client disconnected: ${this.params.name}`);
44
36
  if (this._params.reconnect) {
45
37
  yield (0, fsm_dynamo_1.delay)(this._params.reconnectDelay);
46
38
  this.connectSocket();
@@ -52,7 +44,7 @@ class DynamoNTS_SocketClientService extends dynamo_nts_singleton_service_1.Dynam
52
44
  eventType: dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.error,
53
45
  tasks: [
54
46
  (content) => tslib_1.__awaiter(this, void 0, void 0, function* () {
55
- console.log(`Socket Client error: ${this.params.name} (${this.params.port})`, content);
47
+ console.log(`Socket Client error: ${this.params.name}`, content);
56
48
  })
57
49
  ]
58
50
  }),
@@ -63,11 +55,11 @@ class DynamoNTS_SocketClientService extends dynamo_nts_singleton_service_1.Dynam
63
55
  this.socket = SocketIO.io(`${this.params.address}:${this.params.port}` /* , this._params.socketOptions */);
64
56
  this.setupDefaultEvents();
65
57
  this.setupSocketEvents();
66
- console.log(`\nSocket Client Service setup finished: ${(_b = this.params) === null || _b === void 0 ? void 0 : _b.name}: (${this.params.port})`);
58
+ console.log(`\n${(_b = this.params) === null || _b === void 0 ? void 0 : _b.name} Socket Client Service setup finished`);
67
59
  this.connectSocket();
68
60
  }
69
61
  catch (error) {
70
- fsm_dynamo_1.Dynamo_Log.error(`Socket Client Service setup failed: ${this.params.name} (${this.params.port})`, error);
62
+ fsm_dynamo_1.Dynamo_Log.error(`${this.params.name} Socket Client Service setup failed!`, error);
71
63
  }
72
64
  }
73
65
  setupDefaultEvents() {
@@ -83,21 +75,24 @@ class DynamoNTS_SocketClientService extends dynamo_nts_singleton_service_1.Dynam
83
75
  }
84
76
  setupSocketEvents() {
85
77
  if (this.log)
86
- console.log(`Setup Socket Events... ${this.params.name}`);
78
+ console.log(`Setup Socket Events... (${this.params.name})`);
87
79
  this.incomingEvents.forEach((event) => {
80
+ if (!event.socketName) {
81
+ event.socketName = this.name;
82
+ }
88
83
  this.socket.on(event.eventType, (content) => tslib_1.__awaiter(this, void 0, void 0, function* () {
89
84
  try {
90
- yield event.executeEventTasks(this.params.service, content);
85
+ yield event.executeEventTasks(content, this.params.service);
91
86
  }
92
87
  catch (error) {
93
88
  fsm_dynamo_1.Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
94
- this.socket.emit(dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.error, error);
89
+ this.emitEvent(dynamo_nts_socket_event_type_enum_1.DynamoNTS_SocketEventType.error, error);
95
90
  }
96
91
  }));
97
92
  });
98
93
  }
99
94
  connectSocket() {
100
- console.log(`Socket Client connecting... ${this.params.name}: ${this.params.address}:${this.params.port}`);
95
+ console.log(`${this.params.name} Socket Client connecting to ${this.params.address}:${this.params.port} ...`);
101
96
  this.socket.connect();
102
97
  if (this.params.reconnect) {
103
98
  this.tryReconnectIfNeeded();
@@ -113,11 +108,12 @@ class DynamoNTS_SocketClientService extends dynamo_nts_singleton_service_1.Dynam
113
108
  }
114
109
  /**
115
110
  * Emit event to the socket
116
- * @param event event name
111
+ * @param eventType event name
117
112
  * @param content event content
118
113
  */
119
- emitEvent(event, content) {
120
- this.socket.emit(event, content);
114
+ emitEvent(eventType, content) {
115
+ console.log(`\n<== outgoing ${this.name} socket event: ${eventType}`);
116
+ this.socket.emit(eventType, content);
121
117
  }
122
118
  }
123
119
  exports.DynamoNTS_SocketClientService = DynamoNTS_SocketClientService;
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-client.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-client.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dynamo-nts-socket-client.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-client.service.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ import { DynamoNTS_SocketEvent, DynamoNTS_SocketEventPreprocessTask, DynamoNTS_S
7
7
  /**
8
8
  *
9
9
  */
10
- export declare abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS_SocketPresence, T_Content = any> extends DynamoNTS_SingletonService {
10
+ export declare abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS_SocketPresence, T_SubscriptionContent = any, T_ErrorContent = any> extends DynamoNTS_SingletonService {
11
11
  protected params: DynamoNTS_SocketServerServiceParams;
12
12
  get name(): string;
13
13
  get port(): number;
@@ -19,7 +19,7 @@ export declare abstract class DynamoNTS_SocketServerService<T_Presence extends D
19
19
  /**
20
20
  * You need to setup a function that converts subscription event content to presence
21
21
  */
22
- protected getPresenceFromSubscrioptionEventContent?: (socketSubscription: T_Content) => Promise<T_Presence>;
22
+ protected getPresenceFromSubscrioptionEventContent?: (socketSubscription: any) => Promise<T_Presence>;
23
23
  protected presences: T_Presence[];
24
24
  protected log: boolean;
25
25
  defaultErrorUserMsg: string;
@@ -47,14 +47,14 @@ export declare abstract class DynamoNTS_SocketServerService<T_Presence extends D
47
47
  /**
48
48
  * You can setup tasks for the subscription event in this function
49
49
  */
50
- protected getSubscriptionTasks?(): DynamoNTS_SocketEventTask[];
50
+ protected getSubscriptionTasks?(): DynamoNTS_SocketEventTask<T_SubscriptionContent>[];
51
51
  /**
52
52
  * You can setup preprocessess for the subscription event in this function
53
53
  */
54
- protected getSubscriptionPreProcessess?(): DynamoNTS_SocketEventPreprocessTask<T_Content>[];
54
+ protected getSubscriptionPreProcessess?(): DynamoNTS_SocketEventPreprocessTask[];
55
55
  /**
56
56
  * You can setup tasks for the error event in this function
57
57
  */
58
- protected errorHandling?: DynamoNTS_SocketEventTask;
58
+ protected errorHandling?: DynamoNTS_SocketEventTask<T_ErrorContent>;
59
59
  }
60
60
  //# sourceMappingURL=dynamo-nts-socket-server.service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-server.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-server.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AAItC,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAG5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,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;;GAEG;AACH,8BAAsB,6BAA6B,CAAC,UAAU,SAAS,wBAAwB,EAAE,SAAS,GAAG,GAAG,CAAE,SAAQ,0BAA0B;IAClJ,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,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;IAExC,OAAO,CAAC,YAAY,CAAyC;IAC7D,SAAS,CAAC,cAAc,EAAE,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;IAEvD,OAAO,CAAC,iBAAiB,CAA6B;IACtD;;OAEG;IACH,SAAS,CAAC,wCAAwC,CAAC,EAAE,CAAC,kBAAkB,EAAE,SAAS,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5G,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,CAAM;IAEvC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAqC;IAE3D,mBAAmB,SAEoC;;IAiBvD;;OAEG;IACH,OAAO,CAAC,aAAa;IAgEf,iBAAiB,CAAC,eAAe,EAAE,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAiDxD,kBAAkB,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAS5D,8BAA8B;IAqB5C,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAI5C,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAInC,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAI/C,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAMjD;;OAEG;IACH,QAAQ,CAAC,gBAAgB,IAAI,mCAAmC;IAEhE;;OAEG;IACH,QAAQ,CAAC,iBAAiB,IAAI,qBAAqB,CAAC,GAAG,CAAC,EAAE;IAE1D;;OAEG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,yBAAyB,EAAE;IAE9D;;OAEG;IACH,SAAS,CAAC,4BAA4B,CAAC,IAAI,mCAAmC,CAAC,SAAS,CAAC,EAAE;IAE3F;;OAEG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,yBAAyB,CAAC;CACrD"}
1
+ {"version":3,"file":"dynamo-nts-socket-server.service.d.ts","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-server.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AAItC,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAG5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,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;;GAEG;AACH,8BAAsB,6BAA6B,CAAC,UAAU,SAAS,wBAAwB,EAAE,qBAAqB,GAAG,GAAG,EAAE,cAAc,GAAG,GAAG,CAAE,SAAQ,0BAA0B;IACpL,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,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;IAExC,OAAO,CAAC,YAAY,CAAyC;IAC7D,SAAS,CAAC,cAAc,EAAE,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC;IAEvD,OAAO,CAAC,iBAAiB,CAA6B;IACtD;;OAEG;IACH,SAAS,CAAC,wCAAwC,CAAC,EAAE,CAAC,kBAAkB,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACtG,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,CAAM;IAEvC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAqC;IAE3D,mBAAmB,SAEoC;;IAiBvD;;OAEG;IACH,OAAO,CAAC,aAAa;IAgEf,iBAAiB,CAAC,eAAe,EAAE,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAiDxD,kBAAkB,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAS5D,8BAA8B;IAqB5C,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAI5C,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAInC,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAI/C,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAMjD;;OAEG;IACH,QAAQ,CAAC,gBAAgB,IAAI,mCAAmC;IAEhE;;OAEG;IACH,QAAQ,CAAC,iBAAiB,IAAI,qBAAqB,CAAC,GAAG,CAAC,EAAE;IAE1D;;OAEG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,yBAAyB,CAAC,qBAAqB,CAAC,EAAE;IAErF;;OAEG;IACH,SAAS,CAAC,4BAA4B,CAAC,IAAI,mCAAmC,EAAE;IAEhF;;OAEG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,yBAAyB,CAAC,cAAc,CAAC,CAAC;CACrE"}
@@ -109,7 +109,7 @@ class DynamoNTS_SocketServerService extends dynamo_nts_singleton_service_1.Dynam
109
109
  const presence = yield this.getPresenceFromSubscrioptionEventContent(content);
110
110
  issuer = presence.issuerId;
111
111
  this.socketSubscription(presence);
112
- yield this.subscriptionEvent.executeEventTasks(issuer, content);
112
+ yield this.subscriptionEvent.executeEventTasks(content, issuer);
113
113
  }
114
114
  catch (error) {
115
115
  fsm_dynamo_1.Dynamo_Log.error(`Socket Subscription failed: ${this.params.name} (${this.params.port})`, error);
@@ -120,7 +120,7 @@ class DynamoNTS_SocketServerService extends dynamo_nts_singleton_service_1.Dynam
120
120
  this.incomingEvents.forEach((event) => {
121
121
  socket.on(event.eventType, (content) => tslib_1.__awaiter(this, void 0, void 0, function* () {
122
122
  try {
123
- yield event.executeEventTasks(issuer, content);
123
+ yield event.executeEventTasks(content, issuer);
124
124
  }
125
125
  catch (error) {
126
126
  fsm_dynamo_1.Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
@@ -1 +1 @@
1
- {"version":3,"file":"dynamo-nts-socket-server.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-server.service.ts"],"names":[],"mappings":";;;;AAGA,sDAAiE;AAEjE,iFAA4E;AAC5E,qGAA0F;AAC1F,wGAA6F;AAI7F,2GAAgK;AAEhK;;GAEG;AACH,MAAsB,6BAA4F,SAAQ,yDAA0B;IAElJ,IAAI,IAAI,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,IAAI,IAAI,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,IAAI,QAAQ,KAA+B,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAoBzE;;QACE,KAAK,EAAE,CAAC;QATA,cAAS,GAAiB,EAAE,CAAC;QAE7B,QAAG,GAAY,2DAAwB,CAAC,QAAQ,CAAC;QAE3D,wBAAmB,GACjB,4CAA4C;YAC5C,oDAAoD,CAAC;QAKrD,IAAI;YACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtC,IAAI,CAAC,cAAc,GAAG,MAAA,IAAI,CAAC,iBAAiB,EAAE,mCAAI,EAAE,CAAC;YAErD,IAAI,CAAC,aAAa,EAAE,CAAC;YAErB,IAAI,IAAI,CAAC,GAAG;gBAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,eAAe,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;SAC1I;QAAC,OAAO,KAAK,EAAE;YACd,uBAAU,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;SACtG;IACH,CAAC;IAED;;OAEG;IACK,aAAa;QACnB,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,UAAU,CAAC,CAAC;QACzJ,IAAI,CAAC,IAAI,iBAAiB,EAAE;YAC1B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;SACtE;aAAM;YACL,IAAI,CAAC,YAAY,GAAG,IAAI,qDAAqB,CAAC;gBAC5C,SAAS,EAAE,6DAAyB,CAAC,UAAU;gBAC/C,KAAK,EAAE,EAAE;aACV,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAEhD,IAAI,IAAI,CAAC,wCAAwC,EAAE;YACjD,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,SAAS,CAAC,CAAC;YAC7J,IAAI,CAAC,IAAI,sBAAsB,EAAE;gBAC/B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/E,uBAAU,CAAC,KAAK,CACd,0EAA0E;oBAC1E,4DAA4D,CAC7D,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,iBAAiB,GAAG,IAAI,qDAAqB,CAAkB;oBAClE,SAAS,EAAE,6DAAyB,CAAC,SAAS;iBAC/C,CAAC,CAAC;aACJ;YACD,IAAI,IAAI,CAAC,4BAA4B,EAAE;gBACrC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;aACnF;YACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;aACnE;YAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,UAAU,CAAC,CAAC;YAC5J,IAAI,CAAC,IAAI,oBAAoB,EAAE;gBAC7B,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;aAC3F;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,IAAI,qDAAqB,CAAkB;oBACzC,SAAS,EAAE,6DAAyB,CAAC,UAAU;oBAC/C,KAAK,EAAE;wBACL,IAAI,CAAC,8BAA8B;qBACpC;iBACF,CAAC,CACH,CAAC;aACH;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,KAAK,CAAC,CAAC;YAClJ,IAAI,eAAe,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC/C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,qDAAqB,CAAkB;oBAClE,SAAS,EAAE,6DAAyB,CAAC,KAAK;oBAC1C,KAAK,EAAE;wBACL,IAAI,CAAC,aAAa;qBACnB;iBACF,CAAC,CAAC,CAAC;aACL;YAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SACtD;QAED,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,KAAiC,EAAE,EAAE;YAChE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAEK,iBAAiB,CAAC,eAAgC;;YACtD,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;YACpC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,6DAAyB,CAAC,UAAU,EAAE,CAAO,MAAuB,EAAE,EAAE;gBAC3F,IAAI,MAAc,CAAC;gBAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC/D,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;iBAClD;gBAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACvD,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;iBAC1C;gBAED,IAAI,IAAI,CAAC,wCAAwC,EAAE;oBACjD,MAAM,CAAC,EAAE,CAAC,6DAAyB,CAAC,SAAS,EAAE,CAAO,OAAY,EAAE,EAAE;wBACpE,IAAI;4BACF,MAAM,QAAQ,GAAe,MAAM,IAAI,CAAC,wCAAwC,CAAC,OAAO,CAAC,CAAC;4BAC1F,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC;4BAE3B,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;4BAClC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;yBACjE;wBAAC,OAAO,KAAK,EAAE;4BACd,uBAAU,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;4BACjG,MAAM,CAAC,IAAI,CAAC,6DAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;yBACrD;oBACH,CAAC,CAAA,CAAC,CAAA;iBACH;gBAED,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,KAAiC,EAAE,EAAE;oBAChE,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAO,OAAY,EAAE,EAAE;wBAChD,IAAI;4BACF,MAAM,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;yBAChD;wBAAC,OAAO,KAAK,EAAE;4BACd,uBAAU,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;4BAC1F,MAAM,CAAC,IAAI,CAAC,6DAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;yBACrD;oBACH,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YAEL,CAAC,CAAA,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE3C,OAAO,CAAC,GAAG,CACT,oCAAoC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBACtD,sCAAsC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CACzD,CAAC;QACJ,CAAC;KAAA;IAEe,kBAAkB,CAAC,WAAuB;;YACxD,MAAM,cAAc,GAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrH,IAAI,cAAc,EAAE;gBAClB,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;aACrD;iBAAM;gBACL,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAClC;QACH,CAAC;KAAA;IAEa,8BAA8B,CAAC,MAAuB,EAAE,MAAe;;YACnF,MAAM,mBAAmB,GAAW,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAChI,IAAI,CAAC,IAAI,mBAAmB,EAAE;gBAC5B,MAAM,cAAc,GAA6B,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBACrF,IAAI,cAAc,CAAC,QAAQ,KAAK,MAAM,EAAE;oBACtC,uBAAU,CAAC,KAAK,CAAC,2BAA2B,MAAM,QAAQ,cAAc,CAAC,QAAQ,kBAAkB,CAAC,CAAC;iBACtG;gBAED,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAkB,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;gBAC3F,IAAI,CAAC,IAAI,WAAW,EAAE;oBACpB,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;iBAC5C;qBAAM;oBACL,uBAAU,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;iBAChE;gBAED,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;oBACvC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;iBAC5C;aACF;QACH,CAAC;KAAA;IAED,SAAS,CAAC,KAAa,EAAE,OAAY;QACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,cAAc,CAAC,EAAU;QACvB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAkC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;IACjG,CAAC;IAED,SAAS,CAAC,gBAAwB,EAAE,KAAU;QAC5C,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,6DAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChF,CAAC;IAEK,cAAc,CAAC,EAAU,EAAE,KAAa,EAAE,OAAY,EAAE,KAA0B;;YACtF,MAAM,QAAQ,GAA6B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;YACzH,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aACpC;iBAAM;gBACL,IAAI,KAAK,EAAE;oBAET,MAAM,IAAI,yBAAY,CAAC;wBACrB,MAAM,EAAE,GAAG;wBACX,SAAS,EAAE,aAAa;wBACxB,cAAc,EAAE,IAAI;wBACpB,OAAO,EAAE,2CAA2C,EAAE,EAAE;wBACxD,WAAW,EAAE,IAAI,CAAC,mBAAmB;qBACtC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC;KAAA;IAED,cAAc,CAAC,KAAa,EAAE,OAAY;QACxC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAkC,EAAE,EAAE;YAC5D,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CAAA;IACJ,CAAC;CA0BF;AArPD,sEAqPC"}
1
+ {"version":3,"file":"dynamo-nts-socket-server.service.js","sourceRoot":"","sources":["../../src/_services/dynamo-nts-socket-server.service.ts"],"names":[],"mappings":";;;;AAGA,sDAAiE;AAEjE,iFAA4E;AAC5E,qGAA0F;AAC1F,wGAA6F;AAI7F,2GAAgK;AAEhK;;GAEG;AACH,MAAsB,6BAA8H,SAAQ,yDAA0B;IAEpL,IAAI,IAAI,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,IAAI,IAAI,KAAa,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,IAAI,QAAQ,KAA+B,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAoBzE;;QACE,KAAK,EAAE,CAAC;QATA,cAAS,GAAiB,EAAE,CAAC;QAE7B,QAAG,GAAY,2DAAwB,CAAC,QAAQ,CAAC;QAE3D,wBAAmB,GACjB,4CAA4C;YAC5C,oDAAoD,CAAC;QAKrD,IAAI;YACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtC,IAAI,CAAC,cAAc,GAAG,MAAA,IAAI,CAAC,iBAAiB,EAAE,mCAAI,EAAE,CAAC;YAErD,IAAI,CAAC,aAAa,EAAE,CAAC;YAErB,IAAI,IAAI,CAAC,GAAG;gBAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,eAAe,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;SAC1I;QAAC,OAAO,KAAK,EAAE;YACd,uBAAU,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;SACtG;IACH,CAAC;IAED;;OAEG;IACK,aAAa;QACnB,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,UAAU,CAAC,CAAC;QACzJ,IAAI,CAAC,IAAI,iBAAiB,EAAE;YAC1B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;SACtE;aAAM;YACL,IAAI,CAAC,YAAY,GAAG,IAAI,qDAAqB,CAAC;gBAC5C,SAAS,EAAE,6DAAyB,CAAC,UAAU;gBAC/C,KAAK,EAAE,EAAE;aACV,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAEhD,IAAI,IAAI,CAAC,wCAAwC,EAAE;YACjD,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,SAAS,CAAC,CAAC;YAC7J,IAAI,CAAC,IAAI,sBAAsB,EAAE;gBAC/B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/E,uBAAU,CAAC,KAAK,CACd,0EAA0E;oBAC1E,4DAA4D,CAC7D,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,iBAAiB,GAAG,IAAI,qDAAqB,CAAwB;oBACxE,SAAS,EAAE,6DAAyB,CAAC,SAAS;iBAC/C,CAAC,CAAC;aACJ;YACD,IAAI,IAAI,CAAC,4BAA4B,EAAE;gBACrC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC,CAAC;aACnF;YACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;gBAC7B,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;aACnE;YAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,UAAU,CAAC,CAAC;YAC5J,IAAI,CAAC,IAAI,oBAAoB,EAAE;gBAC7B,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;aAC3F;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,IAAI,qDAAqB,CAAC;oBACxB,SAAS,EAAE,6DAAyB,CAAC,UAAU;oBAC/C,KAAK,EAAE;wBACL,IAAI,CAAC,8BAA8B;qBACpC;iBACF,CAAC,CACH,CAAC;aACH;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,6DAAyB,CAAC,KAAK,CAAC,CAAC;YAClJ,IAAI,eAAe,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC/C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,qDAAqB,CAAiB;oBACjE,SAAS,EAAE,6DAAyB,CAAC,KAAK;oBAC1C,KAAK,EAAE;wBACL,IAAI,CAAC,aAAa;qBACnB;iBACF,CAAC,CAAC,CAAC;aACL;YAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SACtD;QAED,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,KAAiC,EAAE,EAAE;YAChE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;IAEK,iBAAiB,CAAC,eAAgC;;YACtD,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;YACpC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,6DAAyB,CAAC,UAAU,EAAE,CAAO,MAAuB,EAAE,EAAE;gBAC3F,IAAI,MAAc,CAAC;gBAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC/D,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;iBAClD;gBAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACvD,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;iBAC1C;gBAED,IAAI,IAAI,CAAC,wCAAwC,EAAE;oBACjD,MAAM,CAAC,EAAE,CAAC,6DAAyB,CAAC,SAAS,EAAE,CAAO,OAAY,EAAE,EAAE;wBACpE,IAAI;4BACF,MAAM,QAAQ,GAAe,MAAM,IAAI,CAAC,wCAAwC,CAAC,OAAO,CAAC,CAAC;4BAC1F,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC;4BAE3B,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;4BAClC,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;yBACjE;wBAAC,OAAO,KAAK,EAAE;4BACd,uBAAU,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;4BACjG,MAAM,CAAC,IAAI,CAAC,6DAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;yBACrD;oBACH,CAAC,CAAA,CAAC,CAAA;iBACH;gBAED,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,KAAiC,EAAE,EAAE;oBAChE,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAO,OAAY,EAAE,EAAE;wBAChD,IAAI;4BACF,MAAM,KAAK,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;yBAChD;wBAAC,OAAO,KAAK,EAAE;4BACd,uBAAU,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAC;4BAC1F,MAAM,CAAC,IAAI,CAAC,6DAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;yBACrD;oBACH,CAAC,CAAA,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YAEL,CAAC,CAAA,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE3C,OAAO,CAAC,GAAG,CACT,oCAAoC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBACtD,sCAAsC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CACzD,CAAC;QACJ,CAAC;KAAA;IAEe,kBAAkB,CAAC,WAAuB;;YACxD,MAAM,cAAc,GAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,CAAC,CAAC;YACrH,IAAI,cAAc,EAAE;gBAClB,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;aACrD;iBAAM;gBACL,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAClC;QACH,CAAC;KAAA;IAEa,8BAA8B,CAAC,MAAuB,EAAE,MAAe;;YACnF,MAAM,mBAAmB,GAAW,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAChI,IAAI,CAAC,IAAI,mBAAmB,EAAE;gBAC5B,MAAM,cAAc,GAA6B,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBACrF,IAAI,cAAc,CAAC,QAAQ,KAAK,MAAM,EAAE;oBACtC,uBAAU,CAAC,KAAK,CAAC,2BAA2B,MAAM,QAAQ,cAAc,CAAC,QAAQ,kBAAkB,CAAC,CAAC;iBACtG;gBAED,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAkB,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;gBAC3F,IAAI,CAAC,IAAI,WAAW,EAAE;oBACpB,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;iBAC5C;qBAAM;oBACL,uBAAU,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;iBAChE;gBAED,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;oBACvC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;iBAC5C;aACF;QACH,CAAC;KAAA;IAED,SAAS,CAAC,KAAa,EAAE,OAAY;QACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,cAAc,CAAC,EAAU;QACvB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAkC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;IACjG,CAAC;IAED,SAAS,CAAC,gBAAwB,EAAE,KAAU;QAC5C,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,6DAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChF,CAAC;IAEK,cAAc,CAAC,EAAU,EAAE,KAAa,EAAE,OAAY,EAAE,KAA0B;;YACtF,MAAM,QAAQ,GAA6B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;YACzH,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aACpC;iBAAM;gBACL,IAAI,KAAK,EAAE;oBAET,MAAM,IAAI,yBAAY,CAAC;wBACrB,MAAM,EAAE,GAAG;wBACX,SAAS,EAAE,aAAa;wBACxB,cAAc,EAAE,IAAI;wBACpB,OAAO,EAAE,2CAA2C,EAAE,EAAE;wBACxD,WAAW,EAAE,IAAI,CAAC,mBAAmB;qBACtC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC;KAAA;IAED,cAAc,CAAC,KAAa,EAAE,OAAY;QACxC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAkC,EAAE,EAAE;YAC5D,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CAAA;IACJ,CAAC;CA0BF;AArPD,sEAqPC"}