@futdevpro/nts-dynamo 1.6.48 → 1.6.50

package/src/_constants/global-settings.const.ts

@@ -14,9 +14,9 @@ export const dynamoNTS_globalSettings: DynamoNTS_GlobalSettings = {
   logRequestsContent: false,
   logResponseContent: false,
 
-  logMainSocketEvents: true,
   logAllSocketEvent: true,
-  logSocketEventContent: true,
+  logMainSocketEvents: true,
+  logSocketEventContent: false,
 
   logDetailedApiEvents: true,
 };

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

@@ -13,6 +13,7 @@ export type DynamoNTS_SocketEventTask<T> = (content?: T, issuer?: string) => Pro
 export class DynamoNTS_SocketEvent<T>{
   socketName?: string;
   eventKey: DynamoNTS_SocketEventKey | string;
+  serviceName?: string;
   
   preProcessess?: DynamoNTS_SocketEventPreprocessTask<any, any>[];
   tasks?: DynamoNTS_SocketEventTask<T>[];
@@ -32,6 +33,10 @@ export class DynamoNTS_SocketEvent<T>{
        * connection, connect, disconnect, message, error, or anything else
        */
       eventKey: DynamoNTS_SocketEventKey | string,
+      /**
+       * serviceName is the name of the service that will be used for logging
+       */
+      serviceName?: string,
       /**
        * preprocesses are the functions the service needs to run before the actual function,
        * these can be used for authentications, or translating data
@@ -56,6 +61,7 @@ export class DynamoNTS_SocketEvent<T>{
     try {
       this.socketName = set.name ?? set.eventKey;
       this.eventKey = set.eventKey;
+      this.serviceName = set.serviceName ?? 'UnkwownSocketService';
 
       this.preProcessess = set.preProcessess ?? [];
       this.tasks = set.tasks ?? [];
@@ -78,7 +84,7 @@ export class DynamoNTS_SocketEvent<T>{
       this.logEventContent = set.logEventContent !== undefined ? set.logEventContent : dynamoNTS_globalSettings.logSocketEventContent;
     } catch (error) {
       Dynamo_Log.error(
-        `\nSocket Event params setup failed (${this.socketName}): ${set.eventKey}`, error);
+        `\nSocket Event params setup failed (${this.serviceName}): ${set.eventKey}`, error);
       throw error;
     }
   }
@@ -90,12 +96,12 @@ export class DynamoNTS_SocketEvent<T>{
   private async getPreLog(content: T, issuer?: string): Promise<void> {
     try {
       if (this.logEventContent && this.eventKey !== DynamoNTS_SocketEventKey.connection) {
-        Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.eventKey};\ncontent:`, content);
+        Dynamo_Log.log(`--->   incoming socket(${this.serviceName}) event: ${this.eventKey};\ncontent:`, content);
       } else {
-        Dynamo_Log.log(`---> incoming socket(${this.socketName}) event: ${this.eventKey}...`);
+        Dynamo_Log.log(`--->   incoming socket(${this.serviceName}) event: ${this.eventKey}...`);
       }
     } catch (error) {
-      Dynamo_Log.error(`PreLog failed... (socket:  ${this.socketName})`, error);
+      Dynamo_Log.error(`PreLog failed... (socket:  ${this.serviceName})`, error);
     }
   }
 
@@ -117,7 +123,7 @@ export class DynamoNTS_SocketEvent<T>{
         await task(content, issuer);
       });
     } catch (error) {
-      Dynamo_Log.error(`Socket Event tasks failed to execute on ${this.socketName}.... (${this.eventKey})`, error, 'content:', content);
+      Dynamo_Log.error(`Socket Event tasks failed to execute on ${this.serviceName}.... (${this.eventKey})`, error, 'content:', content);
     }
   }
 }

package/src/_models/interfaces/global-settings.interface.ts

@@ -45,11 +45,11 @@ export interface DynamoNTS_GlobalSettings {
   /**
    * this is an application wide default setting for socket debug logs
    */
-  logMainSocketEvents?: boolean;
+  logAllSocketEvent?: boolean;
   /**
    * this is an application wide default setting for socket debug logs
    */
-  logAllSocketEvent?: boolean;
+  logMainSocketEvents?: boolean;
   /**
    * this is an application wide default setting for socket debug logs
    */

package/src/_services/base/db.service.ts

@@ -103,7 +103,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     if (typeof newData._id !== 'string' || typeof newData._id === 'object') {
       newData._id = `${newData._id}`;
       if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.createData)')
       }
     }
     data._id = newData._id;
@@ -151,7 +151,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     if (typeof newData._id !== 'string' || typeof newData._id === 'object') {
       newData._id = `${newData._id}`;
       if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.modifyData)')
       }
     }
     data._id = newData._id;
@@ -180,7 +180,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
       data._id = `${data._id}`;
       if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataById)')
       }
     }
     return data;
@@ -220,7 +220,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
       data._id = `${data._id}`;
       if (typeof data._id !== 'string' || typeof data._id === 'object') {
-        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+        Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataByDependencyId)')
       }
     }
     return data;
@@ -262,7 +262,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
           data._id = `${data._id}`;
           if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataListByDependencyId)')
           }
         }
       });
@@ -307,7 +307,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
           data._id = `${data._id}`;
           if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getDataListByDependencyIds)')
           }
         }
       });
@@ -340,7 +340,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
           data._id = `${data._id}`;
           if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.getAll)')
           }
         }
       });
@@ -481,7 +481,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
           data._id = `${data._id}`;
           if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.searchData)')
           }
         }
       });
@@ -583,7 +583,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
           data._id = `${data._id}`;
           if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.find)')
           }
         }
       });
@@ -645,7 +645,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
         if (data && (typeof data._id !== 'string' || typeof data._id === 'object')) {
           data._id = `${data._id}`;
           if (typeof data._id !== 'string' || typeof data._id === 'object') {
-            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+            Dynamo_Log.error('data._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findWithPaging)')
           }
         }
       });
@@ -682,7 +682,7 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     if (typeof newData._id !== 'string' || typeof newData._id === 'object') {
       newData._id = `${newData._id}`;
       if (typeof newData._id !== 'string' || typeof newData._id === 'object') {
-        Dynamo_Log.error('newData._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findOne)')
+        Dynamo_Log.error('newData._id stringifying failed! Please notfiy the developer! (DynamoNTS_DBService.findByIdAndUpdate)')
       }
     }
 

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

@@ -29,7 +29,6 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
 
   private defaultEvents: DynamoNTS_SocketEvent<any>[] = [
     new DynamoNTS_SocketEvent<any>({
-      name: 'connect',
       eventKey: DynamoNTS_SocketEventKey.connect,
       tasks: [
         async () => {
@@ -38,8 +37,8 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         }
       ]
     }),
+
     new DynamoNTS_SocketEvent<any>({
-      name: 'disconnect',
       eventKey: DynamoNTS_SocketEventKey.disconnect,
       tasks: [
         async () => {
@@ -53,8 +52,17 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         }
       ]
     }),
+
+    new DynamoNTS_SocketEvent<any>({
+      eventKey: DynamoNTS_SocketEventKey.subscriptionSuccessful,
+      tasks: [
+        async () => {
+          Dynamo_Log.success(`Socket Client subscription successful: ${this.params.name}`);
+        }
+      ]
+    }),
+
     new DynamoNTS_SocketEvent<any>({
-      name: 'error',
       eventKey: DynamoNTS_SocketEventKey.error,
       tasks: [
         async (content: any) => {
@@ -96,7 +104,8 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
 
   private async setupDefaultEvents(): Promise<void> {
     try {
-      if (this.logFn) console.log('\nFn:. setupDefaultEvents')
+      if (this.logFn) console.log('\nFn:. setupDefaultEvents');
+
       this.defaultEvents.forEach((defaultEvent: DynamoNTS_SocketEvent<any>) => {
         const eventDeclared = this.incomingEvents.find((event: DynamoNTS_SocketEvent<any>) => event.eventKey === defaultEvent.eventKey);
         if (!eventDeclared) {
@@ -170,7 +179,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
    */
   protected async emitEvent(eventType: string, content: any): Promise<void> {
     try {
-      Dynamo_Log.log(`\n<-=- outgoing ${this.name} socket event: ${eventType}`);
+      Dynamo_Log.log(`<-=-   outgoing ${this.name} socket event: ${eventType}`);
       this.socket.emit(eventType, content);
     } catch (error) {
       Dynamo_Log.error(`Socket Client Service Emit Event failed: ${this.params?.name} (${this.params?.port})`, error);

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

@@ -88,6 +88,7 @@ export abstract class DynamoNTS_SocketServerService<
    */
   private async prepareEvents(): Promise<void> {
     try {
+      /** Setup connect event */
       const connectEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventKey === DynamoNTS_SocketEventKey.connection);
       if (0 <= connectEventIndex) {
         this.connectEvent = this.incomingEvents.splice(connectEventIndex)[0];
@@ -96,8 +97,9 @@ export abstract class DynamoNTS_SocketServerService<
           eventKey: DynamoNTS_SocketEventKey.connection,
         });
       }
-      this.connectEvent.socketName = this.params.name;
+      this.connectEvent.serviceName = this.params.name;
 
+      /** Setup subscription event */
       if (this.getPresenceFromSubscrioptionEventContent) {
         const subscriptionEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventKey === DynamoNTS_SocketEventKey.subscribe);
         if (0 <= subscriptionEventIndex) {
@@ -118,13 +120,17 @@ export abstract class DynamoNTS_SocketServerService<
         if (this.getSubscriptionTasks) {
           this.subscriptionEvent.tasks.push(...this.getSubscriptionTasks());
         }
+        this.subscriptionEvent.serviceName = this.params.name;
 
+        /** Setup disconnect event */
         const disconnectEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventKey === DynamoNTS_SocketEventKey.disconnect);
         if (0 <= disconnectEventIndex) {
+          this.incomingEvents[disconnectEventIndex].serviceName = this.params.name;
           this.incomingEvents[disconnectEventIndex].tasks.push(this.removeSubscription);
         } else {
           this.incomingEvents.push(
             new DynamoNTS_SocketEvent({
+              serviceName: this.params.name,
               eventKey: DynamoNTS_SocketEventKey.disconnect,
               tasks: [
                 this.removeSubscription
@@ -133,9 +139,11 @@ export abstract class DynamoNTS_SocketServerService<
           );
         }
 
+        /** Setup error event */
         const errorEventIndex = this.incomingEvents.findIndex((event: DynamoNTS_SocketEvent<any>) => event.eventKey === DynamoNTS_SocketEventKey.error);
         if (errorEventIndex == -1 && this.errorHandling) {
           this.incomingEvents.push(new DynamoNTS_SocketEvent<T_ErrorContent>({
+            serviceName: this.params.name,
             eventKey: DynamoNTS_SocketEventKey.error,
             tasks: [
               this.errorHandling
@@ -148,8 +156,9 @@ export abstract class DynamoNTS_SocketServerService<
         Dynamo_Log.error('getPresenceFromSubscrioptionEventContent is not set', `${this.params.name} (${this.params.port})`);
       }
 
+      /** Set incoming events serviceName */
       this.incomingEvents.forEach((event: DynamoNTS_SocketEvent<any>) => {
-        event.socketName = this.params.name;
+        event.serviceName = this.params.name;
       });
     } catch (error) {
       Dynamo_Log.error(`Socket Server Service - Event Preparation setup failed: ${this.params?.name} (${this.params?.port})`, error);
@@ -176,9 +185,9 @@ export abstract class DynamoNTS_SocketServerService<
                  * to be able to check content before getPresenceFromSubscrioptionEventContent 
                  */
                 if (dynamoNTS_globalSettings.logMainSocketEvents || dynamoNTS_globalSettings.logAllSocketEvent || dynamoNTS_globalSettings.logSocketEventContent) {
-                  Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe};\ncontent:`, content);
+                  Dynamo_Log.log(`--->   incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe};\ncontent:`, content);
                 } else {
-                  Dynamo_Log.log(`---> incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe}`);
+                  Dynamo_Log.log(`--->   incoming socket(${this.params.name}) event: ${DynamoNTS_SocketEventKey.subscribe}`);
                 }
 
                 const presence: T_Presence = await this.getPresenceFromSubscrioptionEventContent(content, socket);
@@ -191,7 +200,7 @@ export abstract class DynamoNTS_SocketServerService<
                   Dynamo_Log.error(`Emitting subscriptionSuccessful event failed!\nerror:`, error);
                 });
                 
-                Dynamo_Log.success(`<===> socket subscription successfull (${issuer})`);
+                Dynamo_Log.success(`<===>  socket subscription successfull (${issuer})`);
               } catch (error) {
                 Dynamo_Log.error(`Socket Subscription failed: ${this.params.name} (${this.params.port}) will disconnect now...`, error);
                 socket.emit(DynamoNTS_SocketEventKey.error, error);
@@ -212,7 +221,7 @@ export abstract class DynamoNTS_SocketServerService<
           });
 
           if (dynamoNTS_globalSettings.logMainSocketEvents) {
-            Dynamo_Log.success(`<   > Socket (${this.params.name}): new CONNECTION established`);
+            Dynamo_Log.success(`<   >  Socket (${this.params.name}): new CONNECTION established`);
           }
         } catch (error) {
           Dynamo_Log.error(`Socket Connection failed: ${this.params.name} (${this.params.port}) will disconnect now...`, error);
@@ -328,7 +337,7 @@ export abstract class DynamoNTS_SocketServerService<
 
   emitServerEvent(event: string, content: any): void {
     try {
-      Dynamo_Log.log(` <=-- emitting server socket event: ${event} (${this.params.name})`);
+      Dynamo_Log.log(` <=--  emitting server socket event: ${event} (${this.params.name})`);
       this.openSocketServer.emit(event, content, error => {
         Dynamo_Log.error(`Emitting server event '${event}' failed!\nerror:`, error);
       });
@@ -382,14 +391,7 @@ export abstract class DynamoNTS_SocketServerService<
     try {
       const presence: DynamoNTS_SocketPresence = this.presences.find((pres: DynamoNTS_SocketPresence) => pres.issuerId === id);
 
-      if (presence) {
-        presence.emitEvent(event, content);
-        if (dynamoNTS_globalSettings.logSocketEventContent) {
-          Dynamo_Log.log(` <--- emitted socket event for presence: ${event} (${this.params.name}, presenceId: ${id}) \ncontent:`, content);
-        } else {
-          Dynamo_Log.log(` <--- emitted socket event for presence: ${event} (${this.params.name}, presenceId: ${id})`);
-        }
-      } else {
+      if (!presence) {
         throw new Dynamo_Error({ 
           ...this._getDefaultErrorSettings(
             'sendEventForId',
@@ -401,8 +403,15 @@ export abstract class DynamoNTS_SocketServerService<
           errorCode: 'NTS-SSS-301',
         });
       }
-    } catch (error) {
 
+      presence.emitEvent(event, content);
+
+      if (dynamoNTS_globalSettings.logSocketEventContent) {
+        Dynamo_Log.log(` <---  emitted socket event for presence: ${event} (${this.params.name}, presenceId: ${id}) \ncontent:`, content);
+      } else {
+        Dynamo_Log.log(` <---  emitted socket event for presence: ${event} (${this.params.name}, presenceId: ${id})`);
+      }
+    } catch (error) {
       try {
         if (error.flag.includes('DYNAMO') && error?.accitionalInfo?.inactiveSockets) {
           const sockets: SocketIO.Socket[] = error.accitionalInfo.inactiveSockets;
@@ -410,6 +419,20 @@ export abstract class DynamoNTS_SocketServerService<
           await Dynamo_Array.asyncForEach(sockets, async (socket: SocketIO.Socket) => {
             await this.removeSubscription(socket);
           });
+
+          const presence: DynamoNTS_SocketPresence = this.presences.find((pres: DynamoNTS_SocketPresence) => pres.issuerId === id);
+          if (!presence) {
+            throw new Dynamo_Error({ 
+              ...this._getDefaultErrorSettings(
+                'sendEventForId',
+                new Error(`No active socket with this specific ID: ${id}`),
+                content?.source
+              ),
+
+              status: 404, 
+              errorCode: 'NTS-SSS-302',
+            });
+          }
         }
       } catch (error) {
         throw new Dynamo_Error({