@futdevpro/nts-dynamo 1.7.27 → 1.8.5

package/src/_services/socket/socket-client.service.ts

@@ -5,26 +5,28 @@ import * as SocketIO from 'socket.io-client';
 
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
 import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
-import { delay, Dynamo_Array } from '@futdevpro/fsm-dynamo/utils';
-import { DynamoNTS_SocketClientServiceParams } from '../../_models/control-models/socket-client-service-params.control-model';
-import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
+import { Dynamo_delay, Dynamo_Array } from '@futdevpro/fsm-dynamo/utils';
+import { 
+  DynamoNTS_SocketClientService_Params 
+} from '../../_models/control-models/socket-client-service-params.control-model';
+import { DynamoNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DynamoNTS_SocketEvent } from '../../_models/control-models/socket-event.control-model';
 import { DynamoNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 
 export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonService {
 
-  private _params: DynamoNTS_SocketClientServiceParams;
-  protected get params(): DynamoNTS_SocketClientServiceParams { return this._params; }
+  private _params: DynamoNTS_SocketClientService_Params;
+  protected get params(): DynamoNTS_SocketClientService_Params { return this._params; }
   get name(): string { return this.params.name; }
 
-  protected socket: SocketIO.Socket
+  protected socket: SocketIO.Socket;
   
   protected incomingEvents: DynamoNTS_SocketEvent<any>[];
   
   protected _connected: boolean = false;
   get connected(): boolean { return this._connected; }
 
-  protected debugLog: boolean = dynamoNTS_globalSettings.logSetup;
+  protected debugLog: boolean = DynamoNTS_globalSettings.logSetup;
   protected logFn: boolean;
 
   private defaultEvents: DynamoNTS_SocketEvent<any>[] = [
@@ -34,8 +36,8 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         async () => {
           this._connected = true;
           Dynamo_Log.success(`<   >  socket-client(${this.params.name}) connected!`);
-        }
-      ]
+        },
+      ],
     }),
 
     new DynamoNTS_SocketEvent<any>({
@@ -46,11 +48,11 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
           Dynamo_Log.warn(`<x  >  socket-client(${this.params.name}) disconnected!`);
 
           if (this._params.reconnect) {
-            await delay(this._params.reconnectDelay);
+            await Dynamo_delay(this._params.reconnectDelay);
             this.connectSocket();
           }
-        }
-      ]
+        },
+      ],
     }),
 
     new DynamoNTS_SocketEvent<any>({
@@ -58,8 +60,8 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       tasks: [
         async () => {
           Dynamo_Log.success(`<=-->  socket-client(${this.params.name}) subscription successful!`);
-        }
-      ]
+        },
+      ],
     }),
 
     new DynamoNTS_SocketEvent<any>({
@@ -67,8 +69,8 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       tasks: [
         async (content: any) => {
           Dynamo_Log.error(`=-->   socket-client(${this.params.name}) ERROR!:`, content);
-        }
-      ]
+        },
+      ],
     }),
   ];
 
@@ -84,7 +86,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
     try {
       this._params = this.getParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
-      this.socket = SocketIO.io(`${this.params.address}:${this.params.port}`/* , this._params.socketOptions */);
+      this.socket = SocketIO.io(`${this.params.address}:${this.params.port}`);
       
       await this.setupDefaultEvents();
 
@@ -95,6 +97,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       await this.connectSocket();
     } catch (error) {
       Dynamo_Log.error(`socket-client(${this.params?.name}) Service setup failed!`, error);
+
       throw new Dynamo_Error({
         errorCode: 'NTS-SCS-001',
         error: error,        
@@ -108,7 +111,10 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
 
       this.defaultEvents.forEach((defaultEvent: DynamoNTS_SocketEvent<any>) => {
         defaultEvent.serviceName = this.params.name;
-        const eventDeclared = this.incomingEvents.find((event: DynamoNTS_SocketEvent<any>) => event.eventKey === defaultEvent.eventKey);
+        const eventDeclared = this.incomingEvents.find(
+          (event: DynamoNTS_SocketEvent<any>) => event.eventKey === defaultEvent.eventKey
+        );
+
         if (!eventDeclared) {
           this.incomingEvents.push(defaultEvent);
         } else {
@@ -116,7 +122,11 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         }
       });
     } catch (error) {
-      Dynamo_Log.error(`socket-client(${this.params.name}) Service Setup Default Events failed, ERROR:`, error);
+      Dynamo_Log.error(
+        `socket-client(${this.params.name}) Service Setup Default Events failed, ` +
+        `ERROR:`, error
+      );
+
       throw error;
     }
   }
@@ -125,26 +135,36 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
     try {
       if (this.debugLog) console.log(`Setup socket-client(${this.params.name}) Events...`);
 
-      await Dynamo_Array.asyncForEach(this.incomingEvents, async (event: DynamoNTS_SocketEvent<any>) => {
-        event.serviceName = this.params.name;
-        this.socket.on(event.eventKey, async (content: any) => { 
-          try {
-            await event.executeEventTasks(content, this.params.service);
-          } catch (error) {
-            Dynamo_Log.error(`socket-client(${this.params.name}) Event failed, ERROR:`, error);
-            await this.emitEvent(DynamoNTS_SocketEventKey.error, error);
-          }
-        });
-      });
+      await Dynamo_Array.asyncForEach(
+        this.incomingEvents, 
+        async (event: DynamoNTS_SocketEvent<any>) => {
+          event.serviceName = this.params.name;
+          this.socket.on(event.eventKey, async (content: any) => { 
+            try {
+              await event.executeEventTasks(content, this.params.service);
+            } catch (error) {
+              Dynamo_Log.error(`socket-client(${this.params.name}) Event failed, ERROR:`, error);
+              await this.emitEvent(DynamoNTS_SocketEventKey.error, error);
+            }
+          });
+        }
+      );
     } catch (error) {
-      Dynamo_Log.error(`socket-client(${this.params.name}) Service Setup Socket Events failed, ERROR:`, error);
+      Dynamo_Log.error(
+        `socket-client(${this.params.name}) Service Setup Socket Events failed, ` +
+        `ERROR:`, error
+      );
+
       throw error;
     }
   }
   
   private async connectSocket(): Promise<void> {
     try {
-      Dynamo_Log.info(`< .. > socket-client(${this.params.name}) connecting to ${this.params.address}:${this.params.port} ...`);
+      Dynamo_Log.info(
+        `< .. > socket-client(${this.params.name}) ` +
+        `connecting to ${this.params.address}:${this.params.port} ...`
+      );
 
       this.socket.connect();
 
@@ -152,7 +172,11 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         await this.tryReconnectIfNeeded();
       }
     } catch (error) {
-      Dynamo_Log.error(`socket-client(${this.params.name}) Service Connect Socket failed, ERROR:`, error);
+      Dynamo_Log.error(
+        `socket-client(${this.params.name}) Service Connect Socket failed, ` +
+        `ERROR:`, error
+      );
+
       throw error;
     }
   }
@@ -160,13 +184,17 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
   private async tryReconnectIfNeeded(): Promise<void> {
     try {
       if (this.logFn) console.log(`\nFn:. tryReconnectIfNeeded`);
-      await delay(this._params.reconnectDelay);
+      await Dynamo_delay(this._params.reconnectDelay);
       
       if (!this._connected) {
         await this.connectSocket();
       }
     } catch (error) {
-      Dynamo_Log.error(`socket-client(${this.params.name}) Service Try Reconnect failed, ERROR:`, error);
+      Dynamo_Log.error(
+        `socket-client(${this.params.name}) Service Try Reconnect failed, ` +
+        `ERROR:`, error
+      );
+
       throw error;
     }
   }
@@ -181,7 +209,11 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       Dynamo_Log.log(`<=--   outgoing socket-client(${this.params.name}) event: ${eventType}`);
       this.socket.emit(eventType, content);
     } catch (error) {
-      Dynamo_Log.error(`socket-client(${this.params.name}) Service Emit Event failed: ${this.params?.name} (${this.params?.port})`, error);
+      Dynamo_Log.error(
+        `socket-client(${this.params.name}) ` +
+        `Service Emit Event failed: ${this.params?.name} (${this.params?.port})`, error
+      );
+
       throw error;
     }
   }
@@ -189,7 +221,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
   /**
    * You must setup params for the service in this function
    */
-  abstract getParams(): DynamoNTS_SocketClientServiceParams;
+  abstract getParams(): DynamoNTS_SocketClientService_Params;
 
   /**
    * You must setup events and required services in this function

package/src/_services/socket/socket-server.service.ts

@@ -6,11 +6,11 @@ import {
 } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
-import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DynamoNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DynamoNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 import { DynamoNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 import { 
-  DynamoNTS_SocketServerServiceParams 
+  DynamoNTS_SocketServerService_Params 
 } from '../../_models/control-models/socket-server-service-params.control-model';
 import { 
   DynamoNTS_SocketPresence 
@@ -38,7 +38,7 @@ export abstract class DynamoNTS_SocketServerService<
       T_ErrorContent = any
     > extends DynamoNTS_SingletonService {
 
-  protected params: DynamoNTS_SocketServerServiceParams;
+  protected params: DynamoNTS_SocketServerService_Params;
   get name(): string { return this.params.name; }
   get port(): number { return this.params.port; }
   get security(): DynamoNTS_SocketSecurity { return this.params.security; }
@@ -82,7 +82,7 @@ export abstract class DynamoNTS_SocketServerService<
 
   private async asyncConstructor(): Promise<void> {
     try {
-      this.logSetup = dynamoNTS_globalSettings.logSetup;
+      this.logSetup = DynamoNTS_globalSettings.logSetup;
       this.params = this.getServiceParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
 
@@ -267,7 +267,7 @@ export abstract class DynamoNTS_SocketServerService<
                    * but subscribe event is an exception from this, 
                    * to be able to check content before getPresenceFromSubscrioptionEventContent 
                    */
-                  if (dynamoNTS_globalSettings.logSocketEventContent) {
+                  if (DynamoNTS_globalSettings.logSocketEventContent) {
                     Dynamo_Log.log(
                       `--=>   incoming socket(${this.params.name}) ` +
                       `event: ${DynamoNTS_SocketEventKey.subscribe};` +
@@ -325,7 +325,7 @@ export abstract class DynamoNTS_SocketServerService<
                    * but unsubscribe event is an exception from this, 
                    * to be able to check content before getPresenceFromSubscrioptionEventContent 
                    */
-                  if (dynamoNTS_globalSettings.logSocketEventContent) {
+                  if (DynamoNTS_globalSettings.logSocketEventContent) {
                     Dynamo_Log.log(
                       `--=>   incoming socket(${this.params.name}) ` +
                       `event: ${DynamoNTS_SocketEventKey.unsubscribe};` +
@@ -385,7 +385,7 @@ export abstract class DynamoNTS_SocketServerService<
             );
           });
 
-          if (dynamoNTS_globalSettings.logMainSocketEvents) {
+          if (DynamoNTS_globalSettings.logMainSocketEvents) {
             Dynamo_Log.success(`<   >  socket(${this.params.name}): new CONNECTION established`);
           }
         } catch (error) {
@@ -626,7 +626,7 @@ export abstract class DynamoNTS_SocketServerService<
 
       presence.emitEvent(event, content, issuer);
 
-      if (dynamoNTS_globalSettings.logSocketEventContent) {
+      if (DynamoNTS_globalSettings.logSocketEventContent) {
         Dynamo_Log.success(
           ` <--=  emitted socket(${this.params.name}) event for presence: ${event}, ` +
           `\n  presenceId: ${id}, sockets: ${presence.sockets.length}` +
@@ -722,7 +722,7 @@ export abstract class DynamoNTS_SocketServerService<
   /**
    * You must setup params for the service in this function
    */
-  protected abstract getServiceParams(): DynamoNTS_SocketServerServiceParams;
+  protected abstract getServiceParams(): DynamoNTS_SocketServerService_Params;
 
   /**
    * You must setup events and required services in this function

package/tsconfig.json

@@ -18,6 +18,7 @@
     "moduleResolution": "node", 
     "esModuleInterop": true,
     "skipLibCheck": true,
+    "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true 
   },

package/lib/_models/control-models/app-system-controls.control-model copy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-system-controls.control-model copy.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/app-system-controls.control-model copy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,qBAAa,2BAA2B;IACtC,WAAW,EAAE,uBAAuB,CAAiC;IACrE,gBAAgB,EAAE,uBAAuB,CAAiC;IAC1E,iBAAiB,EAAE,uBAAuB,CAAiC;CAC5E"}

package/lib/_models/control-models/app-system-controls.control-model copy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-system-controls.control-model copy.js","sourceRoot":"","sources":["../../../src/_models/control-models/app-system-controls.control-model copy.ts"],"names":[],"mappings":";;;AAEA,iFAAyE;AAEzE,MAAa,2BAA2B;IACtC,WAAW,GAA4B,IAAI,sDAAuB,EAAE,CAAC;IACrE,gBAAgB,GAA4B,IAAI,sDAAuB,EAAE,CAAC;IAC1E,iBAAiB,GAA4B,IAAI,sDAAuB,EAAE,CAAC;CAC5E;AAJD,kEAIC"}