@futdevpro/nts-dynamo 1.5.40 → 1.5.45

package/src/_services/dynamo-nts-routing-module.service.ts

@@ -91,7 +91,7 @@ export class DynamoNTS_RoutingModule {
       } catch (error) {
         throw new DynamoNTS_Error({ 
           message: `DYNAMOBEERROR: Failed to mount routes.`, 
-          userMessage: `We encountered an uncought BackEnd Build Error, please contact the responsible development team. errorcode: 900-456-100`, 
+          userMessage: `We encountered an uncought BackEnd Build Error, please contact the responsible development team. \nerrorCode: 900-456-100`, 
           error 
         })
       }
@@ -127,7 +127,7 @@ export class DynamoNTS_RoutingModule {
       default:
         throw new DynamoNTS_Error({ 
           message: `DYNAMOBEERROR: INVALID route type: ${endpointParams.type} - ${endpointParams.name}` ,
-          userMessage: `We encountered an uncought BackEnd Build Error, please contact the responsible development team. errorcode: 900-456-200`, 
+          userMessage: `We encountered an uncought BackEnd Build Error, please contact the responsible development team. \nerrorCode: 900-456-200`, 
           error: new Error()
         })
     }
@@ -162,7 +162,7 @@ export class DynamoNTS_RoutingModule {
       default:
         throw new DynamoNTS_Error({ 
           message: `DYNAMOBEERROR: INVALID route type: ${endpointParams.type} - ${endpointParams.name}`,
-          userMessage: `We encountered an uncought BackEnd Build Error, please contact the responsible development team. errorcode: 900-456-300`, 
+          userMessage: `We encountered an uncought BackEnd Build Error, please contact the responsible development team. \nerrorCode: 900-456-300`, 
           error: new Error()
         })
     }

package/src/_services/dynamo-nts-shared.service.ts

@@ -35,6 +35,15 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
     return GeoIp.lookup(this.getIpFromRequest(request));
   }
 
+  /**
+   * 
+   * @param request 
+   * @returns 
+   */
+  static getLocationByIp(ip: string): GeoIpLocation {
+    return GeoIp.lookup(ip);
+  }
+
   /**
    * 
    * @param question 

package/src/_services/dynamo-nts-socket-service-collection.service.ts

@@ -11,6 +11,6 @@ export class DynamoNTS_SocketServiceCollection extends DynamoNTS_SingletonServic
     return DynamoNTS_SocketServiceCollection.getSingletonInstance();
   }
 
-  [service: string]: DynamoNTS_SocketService;
+  [service: string]: DynamoNTS_SocketService<any>;
   
 }

package/src/_services/dynamo-nts-socket.service.ts

@@ -3,23 +3,19 @@ import * as SocketIO from 'socket.io';
 
 import { dynamoNTS_GlobalSettings } from '../_constants/dynamo-nts-global-settings';
 import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
-import { DynamoNTS_SocketServiceParams } from '../_models';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_SocketEventParams } from '../_models/dynamo-nts-socket-event-params';
 import { DynamoNTS_SocketEvent } from '../_enums/http/socket-event.enum';
 import { DynamoNTS_GlobalService } from './dynamo-nts-global.service';
 import { DynamoNTS_Error } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_SocketSecurity } from '../_enums';
-
-export interface DynamoNTS_SocketDictionary {
-  id?: string;
-  sockets: SocketIO.Socket[];
-}
+import { DynamoNTS_SocketServiceParams } from '../_models/dynamo-nts-socket-service-params';
+import { DynamoNTS_SocketDictionary } from '../_models/dynamo-nts-socket-dictionary';
+import { DynamoNTS_SocketSecurity } from '../_enums/dynamo-nts-socket-security.enum';
 
 /**
  * 
  */
-export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService {
+export abstract class DynamoNTS_SocketService<T extends DynamoNTS_SocketDictionary> extends DynamoNTS_SingletonService {
   protected params: DynamoNTS_SocketServiceParams;
   get name(): string { return this.params.name; }
   get port(): number { return this.params.port; }
@@ -31,8 +27,8 @@ export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService
   protected incomingEvents: DynamoNTS_SocketEventParams<any>[];
 
   private subscriptionEvent: DynamoNTS_SocketEventParams<any>;
-  private getIdFromSubscrioption?: <T>(content: T) => Promise<string>;
-  private activeSockets: DynamoNTS_SocketDictionary[] = [];
+  private getDicFromSubscrioption?: (content: any) => Promise<T>;
+  protected activeSockets: T[] = [];
 
   protected log: boolean = dynamoNTS_GlobalSettings.logSetup;
 
@@ -69,8 +65,9 @@ export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService
         tasks: []
       });
     }
+    this.connectEvent.socketName = this.params.name;
 
-    if (this.getIdFromSubscrioption) {
+    if (this.getDicFromSubscrioption) {
       const subscriptionEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEventParams<any>) => event.event === DynamoNTS_SocketEvent.subscribe);
       if (0 <= subscriptionEventIndex) {
         this.subscriptionEvent = this.incomingEvents.splice(subscriptionEventIndex)[0];
@@ -92,7 +89,13 @@ export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService
           ]
         }));
       }      
+
+      this.subscriptionEvent.socketName = this.params.name;
     }
+
+    this.incomingEvents.forEach((event: DynamoNTS_SocketEventParams<any>) => {
+      event.socketName = this.params.name;
+    });
   }
 
   async setupSocketServer(newSocketServer: SocketIO.Server): Promise<void> {
@@ -108,11 +111,12 @@ export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService
         await this.connectEvent.tasks[i](socket);        
       }
 
-      if (this.getIdFromSubscrioption) {
+      if (this.getDicFromSubscrioption) {
         socket.on(DynamoNTS_SocketEvent.subscribe, async (content: any) => {
-          issuer = await this.getIdFromSubscrioption(content);
+          const dic: T = await this.getDicFromSubscrioption(content);
+          issuer = dic.issuerId;
 
-          this.socketSubscription(socket, issuer);
+          this.socketSubscription(dic);
           this.subscriptionEvent.getFullExecution(issuer)(content);
         })
       }
@@ -124,18 +128,18 @@ export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService
 
     this.socketServer.listen(this.params.port);
 
-    if (this.log) console.log(
+    console.log(
       `\nsocket service setup finished: ${this.params.name}` + 
       `\nsocket server listening on port: ${this.params.port}`
     );
   }
 
-  private async socketSubscription(newSocket: SocketIO.Socket, id: string): Promise<void> {
-    const activeSocket: DynamoNTS_SocketDictionary = this.activeSockets.find((dic: DynamoNTS_SocketDictionary) => dic.id === id);
+  private async socketSubscription(dictionary: T): Promise<void> {
+    const activeSocket: T = this.activeSockets.find((dic: T) => dic.issuerId === dictionary.issuerId);
     if (activeSocket) {
-      activeSocket.sockets.push(newSocket);
+      activeSocket.sockets.push(dictionary.sockets[0]);
     } else {
-      this.activeSockets.push({ id, sockets: [ newSocket ] });
+      this.activeSockets.push(dictionary);
     }
   }
 
@@ -155,15 +159,13 @@ export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService
   }
 
   idIsSubscribed(id: string): boolean {
-    return !!this.activeSockets.find((dic: DynamoNTS_SocketDictionary) => dic.id === id);
+    return !!this.activeSockets.find((dic: DynamoNTS_SocketDictionary) => dic.issuerId === id);
   }
 
   async sendEventForId(id: string, event: string, content: any, error?: (err: any) => void): Promise<void> {
-    const dic: DynamoNTS_SocketDictionary = this.activeSockets.find((dic: DynamoNTS_SocketDictionary) => dic.id === id);
+    const dic: DynamoNTS_SocketDictionary = this.activeSockets.find((dic: DynamoNTS_SocketDictionary) => dic.issuerId === id);
     if (dic) {
-      dic.sockets.forEach((socket: SocketIO.Socket) => {
-        socket.emit(event, content);
-      });
+      dic.emitEvent(event, content);
     } else {
       if (error)
       throw new DynamoNTS_Error({ status: 404, message: `No active socket whit this specific ID: ${id}` });
@@ -172,9 +174,7 @@ export abstract class DynamoNTS_SocketService extends DynamoNTS_SingletonService
 
   broadcastEvent(event: string, content: any): void {
     this.activeSockets.forEach((dic: DynamoNTS_SocketDictionary) => {
-      dic.sockets.forEach((socket: SocketIO.Socket) => {
-        socket.emit(event, content);
-      })
+      dic.emitEvent(event, content);
     })
   }