@futdevpro/nts-dynamo 1.6.3 → 1.6.5

package/src/_models/control-models/dynamo-nts-socket-presence.model.ts

@@ -7,15 +7,11 @@ import * as SocketIO from 'socket.io';
  */
 export class DynamoNTS_SocketPresence {
   issuerId: string;
-  sockets: SocketIO.Socket[];
-  onDestroy: (issuerId: string) => void;
+  sockets?: SocketIO.Socket[] = [];
+  onDestroy?: (issuerId: string) => void = id => {};
 
   constructor(
-    set: {
-      issuerId: string,
-      sockets: SocketIO.Socket[],
-      onDestroy?: (issuerId: string) => void,
-    }
+    set: DynamoNTS_SocketPresence
   ) {
     if (!set?.issuerId) {
       throw new Dynamo_Error({ 
@@ -48,7 +44,7 @@ export class DynamoNTS_SocketPresence {
    * @param event 
    * @param content 
    */
-  emitEvent(event: string, content: any) {
+  emitEvent?(event: string, content: any) {
     this.sockets.forEach((socket: SocketIO.Socket) => {
       socket.emit(event, content);
     });

package/src/_models/control-models/dynamo-nts-socket-server-service-params.model.ts

@@ -6,29 +6,22 @@ import { DynamoNTS_SocketSecurity } from '../../_enums/dynamo-nts-socket-securit
 /**
  * socket handling and clarification is under development
  */
-export class DynamoNTS_SocketServerServiceParams {
+export class DynamoNTS_SocketServerServiceParams<T = any> {
   name: string;
   port: number;
   security?: DynamoNTS_SocketSecurity;
-  groupActiveSocketsBy?: string;
+  /* groupActiveSocketsBy?: string; */
 
-  getIdFromSubscrioption?: (content: any) => string;
+  /* getIdFromSubscrioption?: (content: T) => Promise<string>; */
 
   constructor(
-    set: {
-      name: string,
-      port: number,
-      security?: DynamoNTS_SocketSecurity,
-      groupActiveSocketsBy?: string,
-      
-      getIdFromSubscrioption?: (content: any) => string,
-    }
+    set: DynamoNTS_SocketServerServiceParams<T>
   ) {
     this.name = set.name;
     this.port = set.port;
     this.security = set.security ? set.security : dynamoNTS_GlobalSettings.defaultSocketSecurity;
     
-    if (set.getIdFromSubscrioption) {
+    /* if (set.getIdFromSubscrioption) {
       this.getIdFromSubscrioption = set.getIdFromSubscrioption;
       
       if (set.groupActiveSocketsBy) {
@@ -38,6 +31,6 @@ export class DynamoNTS_SocketServerServiceParams {
       }
     } else if (set.groupActiveSocketsBy) {
       this.getIdFromSubscrioption = content => content[set.groupActiveSocketsBy];
-    }  
+    }   */
   }
 }

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

@@ -96,9 +96,12 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
     if (this.log) console.log(`Setup Socket Events... (${this.params.name})`);
 
     this.incomingEvents.forEach((event: DynamoNTS_SocketEvent<any>) => {
+      if (!event.socketName) {
+        event.socketName = this.name;
+      }
       this.socket.on(event.eventType, async (content: any) => { 
         try {
-          await event.executeEventTasks(this.params.service, content);
+          await event.executeEventTasks(content, this.params.service);
         } catch (error) {
           Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
           this.emitEvent(DynamoNTS_SocketEventType.error, error);
@@ -108,7 +111,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
   }
   
   private connectSocket(): void {
-    console.log(`${this.params.name} Socket Client connecting to ${this.params.address}:${this.params.port}`);
+    console.log(`${this.params.name} Socket Client connecting to ${this.params.address}:${this.params.port} ...`);
 
     this.socket.connect();
 

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

@@ -14,7 +14,7 @@ import { DynamoNTS_SocketEvent, DynamoNTS_SocketEventPreprocessTask, DynamoNTS_S
 /**
  * 
  */
-export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS_SocketPresence, T_Content = any> extends DynamoNTS_SingletonService {
+export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS_SocketPresence, T_SubscriptionContent = any, T_ErrorContent = any> extends DynamoNTS_SingletonService {
   protected params: DynamoNTS_SocketServerServiceParams;
   get name(): string { return this.params.name; }
   get port(): number { return this.params.port; }
@@ -29,7 +29,7 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
   /**
    * You need to setup a function that converts subscription event content to presence
    */
-  protected getPresenceFromSubscrioptionEventContent?: (socketSubscription: T_Content) => Promise<T_Presence>;
+  protected abstract getPresenceFromSubscrioptionEventContent?: (socketSubscription: T_SubscriptionContent, socket: SocketIO.Socket) => Promise<T_Presence>;
   protected presences: T_Presence[] = [];
 
   protected log: boolean = dynamoNTS_GlobalSettings.logSetup;
@@ -77,7 +77,7 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
           `in case you need additional steps for your subscripotions.`
         );
       } else {
-        this.subscriptionEvent = new DynamoNTS_SocketEvent<SocketIO.Socket>({ 
+        this.subscriptionEvent = new DynamoNTS_SocketEvent<T_SubscriptionContent>({ 
           eventType: DynamoNTS_SocketEventType.subscribe 
         });
       }
@@ -93,7 +93,7 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
         this.incomingEvents[disconnectEventIndex].tasks.push(this.removeSubscriptionOnDisconnect);
       } else {
         this.incomingEvents.push(
-          new DynamoNTS_SocketEvent<SocketIO.Socket>({
+          new DynamoNTS_SocketEvent({
             eventType: DynamoNTS_SocketEventType.disconnect,
             tasks: [
               this.removeSubscriptionOnDisconnect
@@ -104,7 +104,7 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
 
       const errorEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventType === DynamoNTS_SocketEventType.error);
       if (errorEventIndex == -1 && this.errorHandling) {
-        this.incomingEvents.push(new DynamoNTS_SocketEvent<SocketIO.Socket>({
+        this.incomingEvents.push(new DynamoNTS_SocketEvent<T_ErrorContent>({
           eventType: DynamoNTS_SocketEventType.error,
           tasks: [
             this.errorHandling
@@ -136,11 +136,11 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
       if (this.getPresenceFromSubscrioptionEventContent) {
         socket.on(DynamoNTS_SocketEventType.subscribe, async (content: any) => {
           try {
-            const presence: T_Presence = await this.getPresenceFromSubscrioptionEventContent(content);
+            const presence: T_Presence = await this.getPresenceFromSubscrioptionEventContent(content, socket);
             issuer = presence.issuerId;
   
             this.socketSubscription(presence);
-            await this.subscriptionEvent.executeEventTasks(issuer, content);
+            await this.subscriptionEvent.executeEventTasks(content, issuer);
           } catch (error) {
             Dynamo_Log.error(`Socket Subscription failed: ${this.params.name} (${this.params.port})`, error);
             socket.emit(DynamoNTS_SocketEventType.error, error);
@@ -151,7 +151,7 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
       this.incomingEvents.forEach((event: DynamoNTS_SocketEvent<any>) => {
         socket.on(event.eventType, async (content: any) => { 
           try {
-            await event.executeEventTasks(issuer, content);
+            await event.executeEventTasks(content, issuer);
           } catch (error) {
             Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
             socket.emit(DynamoNTS_SocketEventType.error, error);
@@ -248,15 +248,15 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
   /**
    * You can setup tasks for the subscription event in this function
    */
-  protected getSubscriptionTasks?(): DynamoNTS_SocketEventTask[];
+  protected getSubscriptionTasks?(): DynamoNTS_SocketEventTask<T_SubscriptionContent>[];
 
   /**
    * You can setup preprocessess for the subscription event in this function
    */
-  protected getSubscriptionPreProcessess?(): DynamoNTS_SocketEventPreprocessTask<T_Content>[];
+  protected getSubscriptionPreProcessess?(): DynamoNTS_SocketEventPreprocessTask[];
 
   /**
    * You can setup tasks for the error event in this function
    */
-  protected errorHandling?: DynamoNTS_SocketEventTask;
+  protected errorHandling?: DynamoNTS_SocketEventTask<T_ErrorContent>;
 }

package/src/_services/index.ts

@@ -17,6 +17,5 @@ export * from './dynamo-nts-routing-module.service';
 export * from './dynamo-nts-shared.service';
 export * from './dynamo-nts-singleton.service';
 export * from './dynamo-nts-socket-client.service';
-export * from './dynamo-nts-socket-server-service-collection.service';
 export * from './dynamo-nts-socket-server.service';
 

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

@@ -1,16 +0,0 @@
-
-import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
-import { DynamoNTS_SocketServerService } from './dynamo-nts-socket-server.service';
-
-/**
- * 
- */
-/* export class DynamoNTS_SocketServiceCollection extends DynamoNTS_SingletonService {
-  
-  static getInstance(): DynamoNTS_SocketServiceCollection {
-    return DynamoNTS_SocketServiceCollection.getSingletonInstance();
-  }
-
-  [service: string]: DynamoNTS_SocketService<any>;
-  
-} */