@futdevpro/nts-dynamo 1.7.28 → 1.9.1

package/src/_services/shared.static-service.ts

@@ -3,12 +3,12 @@ import * as ReadLine from 'readline';
 import * as GeoIp from 'geoip-lite';
 import { Request } from 'express';
 
-import { GeoIpLocation, Dynamo_Shared } from '@futdevpro/fsm-dynamo/shared-service';
+import { DynamoFM_GeoIpLocation, DynamoFM_Shared } from '@futdevpro/fsm-dynamo/shared-service';
 
 /**
  * 
  */
-export class DynamoNTS_Shared extends Dynamo_Shared {
+export class DynamoNTS_Shared extends DynamoFM_Shared {
 
   /**
    * 
@@ -17,13 +17,16 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
    */
   static getIpFromRequest(request: Request): string {
     let ip: string;
+
     if (request.headers['x-forwarded-for']) {
       const route: string[] = (request.headers['x-forwarded-for'] as string).split(', ');
+
       console.log('TESTTTT route:', route);
       ip = route[route.length - 1];
     } else {
       ip = request.socket.remoteAddress;
     }
+
     return ip;
   }
 
@@ -32,7 +35,7 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
    * @param request 
    * @returns 
    */
-  static getLocationDataByRequest(request: Request): GeoIpLocation {
+  static getLocationDataByRequest(request: Request): DynamoFM_GeoIpLocation {
     return GeoIp.lookup(this.getIpFromRequest(request));
   }
 
@@ -41,7 +44,7 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
    * @param request 
    * @returns 
    */
-  static getLocationByIp(ip: string): GeoIpLocation {
+  static getLocationByIp(ip: string): DynamoFM_GeoIpLocation {
     return GeoIp.lookup(ip);
   }
 
@@ -53,7 +56,7 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
   static async prompt(question: string): Promise<string> {
     const readLine = ReadLine.createInterface({ 
       input: process.stdin, 
-      output: process.stdout 
+      output: process.stdout,
     });
     
     return new Promise((resolve, reject) => {

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

@@ -4,27 +4,29 @@
 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 { DynamoFM_Error, DynamoFM_Log } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_delay, DynamoFM_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>[] = [
@@ -33,9 +35,9 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       tasks: [
         async () => {
           this._connected = true;
-          Dynamo_Log.success(`<   >  socket-client(${this.params.name}) connected!`);
-        }
-      ]
+          DynamoFM_Log.success(`<   >  socket-client(${this.params.name}) connected!`);
+        },
+      ],
     }),
 
     new DynamoNTS_SocketEvent<any>({
@@ -43,32 +45,32 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       tasks: [
         async () => {
           this._connected = false;
-          Dynamo_Log.warn(`<x  >  socket-client(${this.params.name}) disconnected!`);
+          DynamoFM_Log.warn(`<x  >  socket-client(${this.params.name}) disconnected!`);
 
           if (this._params.reconnect) {
-            await delay(this._params.reconnectDelay);
+            await DynamoFM_delay(this._params.reconnectDelay);
             this.connectSocket();
           }
-        }
-      ]
+        },
+      ],
     }),
 
     new DynamoNTS_SocketEvent<any>({
       eventKey: DynamoNTS_SocketEventKey.subscriptionSuccessful,
       tasks: [
         async () => {
-          Dynamo_Log.success(`<=-->  socket-client(${this.params.name}) subscription successful!`);
-        }
-      ]
+          DynamoFM_Log.success(`<=-->  socket-client(${this.params.name}) subscription successful!`);
+        },
+      ],
     }),
 
     new DynamoNTS_SocketEvent<any>({
       eventKey: DynamoNTS_SocketEventKey.error,
       tasks: [
         async (content: any) => {
-          Dynamo_Log.error(`=-->   socket-client(${this.params.name}) ERROR!:`, content);
-        }
-      ]
+          DynamoFM_Log.error(`=-->   socket-client(${this.params.name}) ERROR!:`, content);
+        },
+      ],
     }),
   ];
 
@@ -76,7 +78,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
     super();
 
     this.asyncConstructor().catch((error: any) => {
-      Dynamo_Log.error(`socket-client(${this.params?.name}) Service setup failed! ERROR:`, error);
+      DynamoFM_Log.error(`socket-client(${this.params?.name}) Service setup failed! ERROR:`, error);
     });
   }
 
@@ -84,18 +86,19 @@ 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();
 
       await this.setupSocketEvents();
 
-      Dynamo_Log.success(`\nsocket-client(${this.params?.name}) Service setup finished`);
+      DynamoFM_Log.success(`\nsocket-client(${this.params?.name}) Service setup finished`);
       
       await this.connectSocket();
     } catch (error) {
-      Dynamo_Log.error(`socket-client(${this.params?.name}) Service setup failed!`, error);
-      throw new Dynamo_Error({
+      DynamoFM_Log.error(`socket-client(${this.params?.name}) Service setup failed!`, error);
+
+      throw new DynamoFM_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);
+      DynamoFM_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 DynamoFM_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) {
+              DynamoFM_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);
+      DynamoFM_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} ...`);
+      DynamoFM_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);
+      DynamoFM_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 DynamoFM_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);
+      DynamoFM_Log.error(
+        `socket-client(${this.params.name}) Service Try Reconnect failed, ` +
+        `ERROR:`, error
+      );
+
       throw error;
     }
   }
@@ -178,10 +206,14 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
    */
   protected async emitEvent(eventType: string, content: any): Promise<void> {
     try {
-      Dynamo_Log.log(`<=--   outgoing socket-client(${this.params.name}) event: ${eventType}`);
+      DynamoFM_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);
+      DynamoFM_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