@futdevpro/nts-dynamo 1.5.94 → 1.5.96

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

@@ -13,18 +13,18 @@ export type DynamoNTS_SocketEventTask = (content?: any, issuer?: string) => Prom
  */
 export class DynamoNTS_SocketEvent<T_EventContent>{
   socketName?: string;
-  event: DynamoNTS_SocketEventType | string;
+  eventType: DynamoNTS_SocketEventType | string;
   
   preProcessess?: DynamoNTS_SocketEventPreprocessTask<T_EventContent>[];
   tasks: DynamoNTS_SocketEventTask[];
 
-  logEvent: boolean;
-  logEventContent: boolean;
+  logEvent?: boolean;
+  logEventContent?: boolean;
 
   constructor(
     set: {
       socketName?: string,
-      event: DynamoNTS_SocketEventType | string,
+      eventType: DynamoNTS_SocketEventType | string,
 
       preProcessess?: DynamoNTS_SocketEventPreprocessTask<T_EventContent>[],
       tasks?: DynamoNTS_SocketEventTask[],
@@ -35,14 +35,14 @@ export class DynamoNTS_SocketEvent<T_EventContent>{
   ) {
     try {
       this.socketName = set.socketName;
-      this.event = set.event;
+      this.eventType = set.eventType;
 
       this.preProcessess = set.preProcessess ?? [];
       this.tasks = set.tasks ?? [];
 
       if (set.logEvent !== undefined) {
         this.logEvent = set.logEvent;
-      } else if (this.event === DynamoNTS_SocketEventType.connection || this.event === DynamoNTS_SocketEventType.disconnect) {
+      } else if (this.eventType === DynamoNTS_SocketEventType.connection || this.eventType === DynamoNTS_SocketEventType.disconnect) {
         this.logEvent = dynamoNTS_GlobalSettings.logMainSocketEvent;
       } else {
         this.logEvent = dynamoNTS_GlobalSettings.logAllSocketEvent;
@@ -54,7 +54,7 @@ export class DynamoNTS_SocketEvent<T_EventContent>{
       }
     } catch (error) {
       Dynamo_Log.error(
-        `\nSocket Event params setup failed (${this.socketName}): ${set.event}`, error);
+        `\nSocket Event params setup failed (${this.socketName}): ${set.eventType}`, error);
       throw error;
     }
   }
@@ -68,9 +68,9 @@ export class DynamoNTS_SocketEvent<T_EventContent>{
       try {
         if (this.logEvent) {
           if (this.logEventContent) {
-            console.log(`==> incoming ${this.socketName} socket event: ${this.event} content:`, content);
+            console.log(`==> incoming ${this.socketName} socket event: ${this.eventType} content:`, content);
           } else {
-            console.log(`==> incoming ${this.socketName} socket event: ${this.event}...`);
+            console.log(`==> incoming ${this.socketName} socket event: ${this.eventType}...`);
           }
         }
         return content;
@@ -94,7 +94,7 @@ export class DynamoNTS_SocketEvent<T_EventContent>{
         await this.tasks[i](content, issuer);
       }
     } catch (error) {
-      console.error(`Socket Event tasks failed to execute on ${this.socketName}.... (${this.event})`, error, 'content:', content);
+      console.error(`Socket Event tasks failed to execute on ${this.socketName}.... (${this.eventType})`, error, 'content:', content);
     }
   }
 }

package/src/_modules/app-extended.index.ts

@@ -1,6 +1,6 @@
 
 // SERVICES
-export * from '../_services/dynamo-nts-app-extended';
+export * from '../_services/dynamo-nts-app-extended.server';
 export * from '../_services/dynamo-nts-global.service';
 export * from '../_services/dynamo-nts-routing-module.service';
 export * from '../_services/dynamo-nts-shared.service';

package/src/_modules/app.index.ts

@@ -1,6 +1,6 @@
 
 // SERVICES
-export * from '../_services/dynamo-nts-app';
+export * from '../_services/dynamo-nts-app.server';
 export * from '../_services/dynamo-nts-global.service';
 export * from '../_services/dynamo-nts-routing-module.service';
 export * from '../_services/dynamo-nts-shared.service';

package/src/_services/{dynamo-nts-app-extended.ts → dynamo-nts-app-extended.server.ts}

@@ -4,7 +4,7 @@ import * as Http from 'http';
 
 import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
-import { DynamoNTS_App } from './dynamo-nts-app';
+import { DynamoNTS_App } from './dynamo-nts-app.server';
 import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
 import { DynamoNTS_SocketServerService } from './dynamo-nts-socket-server.service';
 import { DynamoNTS_SocketSecurity } from '../_enums/dynamo-nts-socket-security.enum';

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

@@ -21,38 +21,63 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
   protected socket: SocketIO.Socket
   
   protected incomingEvents: DynamoNTS_SocketEvent<any>[];
+  private defaultEvents: DynamoNTS_SocketEventType[] = [
+    DynamoNTS_SocketEventType.disconnect,
+  ];
 
-  private constructor() {
+  protected constructor() {
     super();
 
     try {
+      this._params = this.getParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
       
+      this.setupDefaultEvents();
+
       this.connectSocket();
 
-      if (this.log) console.log(`Socket Controller setup done: ${this.params.name} (${this.params.port})\n`);
+      console.log(`Socket Client Service setup finished: ${this.params?.name}: (${this.params.port})\n`);
     } catch (error) {
-      Dynamo_Log.error(`Socket Client setup failed: ${this.params.name} (${this.params.port})`, error);
+      Dynamo_Log.error(`Socket Client Service setup failed: ${this.params.name} (${this.params.port})`, error);
     }
   }
+
+  private setupDefaultEvents(): void {
+    this.defaultEvents.forEach((eventType: DynamoNTS_SocketEventType) => {
+      if (!this.incomingEvents.find((event: DynamoNTS_SocketEvent<any>) => event.eventType === eventType)) {
+        this.incomingEvents.push(new DynamoNTS_SocketEvent<any>({
+          eventType: eventType,
+        }));
+      }
+    });
+  }
   
   private connectSocket(): void {
-    this.socket = SocketIO.connect(`${this.params.address}:${this.params.port}`).on('connect', () => {
-      this.incomingEvents.forEach((event: DynamoNTS_SocketEvent<any>) => {
-        this.socket.on(event.event, async (content: any) => { 
-          try {
-            await event.executeEventTasks(this.params.service, content);
-          } catch (error) {
-            Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
-            this.socket.emit(DynamoNTS_SocketEventType.error, error);
-          }
-        });
-      });
+    if (this.log) console.log(`Socket Client connecting... ${this.params.name}`);
+    this.socket = SocketIO.io(`${this.params.address}:${this.params.port}`);
+    
+    this.socket.on('connect', () => {
+      console.log(`Socket Client connected: ${this.params.name} (${this.params.port})`);
+    });
 
-      if (this.log) console.log(`Socket Client connected: ${this.params.name} (${this.params.port})`);
+    this.incomingEvents.forEach((event: DynamoNTS_SocketEvent<any>) => {
+      this.socket.on(event.eventType, async (content: any) => { 
+        try {
+          await event.executeEventTasks(this.params.service, content);
+        } catch (error) {
+          Dynamo_Log.error(`Socket Event failed: ${this.params.name} (${this.params.port})`, error);
+          this.socket.emit(DynamoNTS_SocketEventType.error, error);
+        }
+      });
     });
+    this.socket.connect()
   }
 
+  /**
+   * Emit event to the socket
+   * @param event event name
+   * @param content event content
+   */
   protected emitEvent(event: string, content: any): void {
     this.socket.emit(event, content);
   }

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

@@ -45,7 +45,6 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
       this.params = this.getServiceParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
       
-      /* this.attachToGlobalCollection(); */
       this.prepareEvents();
 
       if (this.log) console.log(`Socket Controller setup done: ${this.params.name} (${this.params.port}) serurity: ${this.params.security}\n`);
@@ -54,27 +53,23 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
     }
   }
 
-  /* private attachToGlobalCollection(): void {
-    DynamoNTS_GlobalService.attachNewSocketService(this);
-  } */
-
   /**
    * You must setup events and required services for this function
    */
   private prepareEvents(): void {
-    const connectEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.event === DynamoNTS_SocketEventType.connection);
+    const connectEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventType === DynamoNTS_SocketEventType.connection);
     if (0 <= connectEventIndex) {
       this.connectEvent = this.incomingEvents.splice(connectEventIndex)[0];
     } else {
       this.connectEvent = new DynamoNTS_SocketEvent({
-        event: DynamoNTS_SocketEventType.connection,
+        eventType: DynamoNTS_SocketEventType.connection,
         tasks: []
       });
     }
     this.connectEvent.socketName = this.params.name;
 
     if (this.getPresenceFromSubscrioptionEventContent) {
-      const subscriptionEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.event === DynamoNTS_SocketEventType.subscribe);
+      const subscriptionEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventType === DynamoNTS_SocketEventType.subscribe);
       if (0 <= subscriptionEventIndex) {
         this.subscriptionEvent = this.incomingEvents.splice(subscriptionEventIndex)[0];
         Dynamo_Log.error(
@@ -83,7 +78,7 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
         );
       } else {
         this.subscriptionEvent = new DynamoNTS_SocketEvent<SocketIO.Socket>({ 
-          event: DynamoNTS_SocketEventType.subscribe 
+          eventType: DynamoNTS_SocketEventType.subscribe 
         });
       }
       if (this.getSubscriptionPreProcessess) {
@@ -93,13 +88,13 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
         this.subscriptionEvent.tasks.push(...this.getSubscriptionTasks());
       }
 
-      const disconnectEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.event === DynamoNTS_SocketEventType.disconnect);
+      const disconnectEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventType === DynamoNTS_SocketEventType.disconnect);
       if (0 <= disconnectEventIndex) {
         this.incomingEvents[disconnectEventIndex].tasks.push(this.removeSubscriptionOnDisconnect);
       } else {
         this.incomingEvents.push(
           new DynamoNTS_SocketEvent<SocketIO.Socket>({
-            event: DynamoNTS_SocketEventType.disconnect,
+            eventType: DynamoNTS_SocketEventType.disconnect,
             tasks: [
               this.removeSubscriptionOnDisconnect
             ]
@@ -107,10 +102,10 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
         );
       }
 
-      const errorEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.event === DynamoNTS_SocketEventType.error);
+      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>({
-          event: DynamoNTS_SocketEventType.error,
+          eventType: DynamoNTS_SocketEventType.error,
           tasks: [
             this.errorHandling
           ]
@@ -154,7 +149,7 @@ export abstract class DynamoNTS_SocketServerService<T_Presence extends DynamoNTS
       }
 
       this.incomingEvents.forEach((event: DynamoNTS_SocketEvent<any>) => {
-        socket.on(event.event, async (content: any) => { 
+        socket.on(event.eventType, async (content: any) => { 
           try {
             await event.executeEventTasks(issuer, content);
           } catch (error) {

package/src/_services/index.ts

@@ -3,8 +3,8 @@
 
 // SERVICES
 export * from './dynamo-nts-api.service';
-export * from './dynamo-nts-app';
-export * from './dynamo-nts-app-extended';
+export * from './dynamo-nts-app.server';
+export * from './dynamo-nts-app-extended.server';
 export * from './dynamo-nts-auth.service';
 export * from './dynamo-nts-controller.service';
 export * from './dynamo-nts-data.service';