@futdevpro/nts-dynamo 1.6.52 → 1.6.53

package/src/_models/control-models/endpoint-params.control-model.ts

@@ -117,23 +117,16 @@ export class DynamoNTS_EndpointParams{
    * 
    * @returns 
    */
-  private async preLog(req: Request, res: Response): Promise<void> {
+  private async preLog(req: Request, res: Response, issuer: string): Promise<void> {
     try {
       if (this.logRequest) {
         if (this.logRequestsContent) {
           const params = this.getPathParamsLogContent(req);
-          /* let params = '';
-          for(let i = 0; i < this.pathParams.length; i++) {
-            params += `\n  ${this.pathParams[i]}: ${req.params[this.pathParams[i]]}`;
-            if (i + 1 < this.pathParams.length) {
-              params += ',';
-            }
-          } */
 
           if (req.body && 0 < Object.keys(req.body).length) {
-            console.log(`===> incoming ${this.name} request...\npathParams:${params}\nbody:`, req.body);
+            console.log(`===> incoming ${this.name} request... (issuer: ${issuer})\npathParams:${params}\nbody:`, req.body);
           } else {
-            console.log(`===> incoming ${this.name} request...\npathParams:${params}`);
+            console.log(`===> incoming ${this.name} request... (issuer: ${issuer})\npathParams:${params}`);
           }
         } else {
           console.log(`===> incoming ${this.name} request...`);
@@ -152,8 +145,10 @@ export class DynamoNTS_EndpointParams{
   getFullExecution(): (req: Request, res: Response) => Promise<void> {
     return async (req: Request, res: Response) => {
       try {
+        const issuer: string = DynamoNTS_GlobalService?.getAuthService()?.getIssuerFromRequest(req);
+        
         if (this.logRequest) {
-          await this.preLog(req, res);
+          await this.preLog(req, res, issuer);
         }
 
         await Dynamo_Array.asyncForEach(this.preProcessess, 
@@ -161,8 +156,6 @@ export class DynamoNTS_EndpointParams{
             await preProcess(req, res);
           }
         );
-        
-        const issuer: string = DynamoNTS_GlobalService?.getAuthService()?.getIssuerFromRequest(req);
   
         await Dynamo_Array.asyncForEach(this.tasks,
           async (task: (req: Request, res: Response, issuer?: string) => Promise<void>) => {
@@ -192,9 +185,6 @@ export class DynamoNTS_EndpointParams{
   private error(req: Request, res: Response, error: Error | Dynamo_Error): void {
     try {
       let msg: string = `Endpoint catched an error. ${this.name} (${this.endpoint})`;
-      /* this.pathParams.forEach((param: string) => {
-        msg += `\n${param}: ${req.params[param]}`;
-      }); */
       msg += this.getPathParamsLogContent(req);
       msg += `\nERROR:`;
 
@@ -206,11 +196,6 @@ export class DynamoNTS_EndpointParams{
         '\n'
       );
 
-      /* if (this.logRequest && req.body && 0 < Object.keys(req.body).length) {
-        console.log('body: ');
-        console.log(req.body, '\n');
-      } */
-
       res.status((error as Dynamo_Error)?.___status ?? 501);
       res.send(error);
 

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

@@ -47,27 +47,26 @@ export class DynamoNTS_SocketPresence {
    * @param content 
    */
   emitEvent?(event: string, content: any) {
-    let anyFailed: boolean = false;
+    /* let anyFailed: boolean = false; */
     const errors = [];
     const inactiveSockets: SocketIO.Socket[] = [];
 
     this.sockets.forEach((socket: SocketIO.Socket, index: number) => {
       if (!socket.connected) {
-        Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed! socket[${socket.id}] is not connected! (it will be removed...)`);
-        anyFailed = true;
+        Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!\nERROR: socket[${socket.id}] is not connected! (it will be removed...)`);
 
-        errors.push(
+        /* errors.push(
           new Dynamo_Error({
             status: 500,
             errorCode: 'NTS-SPC-EE1',
             addECToUserMsg: true,
-            message: `Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed! socket[${socket.id}] is not connected!`,
+            message: `Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!\nERROR: socket[${socket.id}] is not connected!`,
             userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.',
           })
-        );
+        ); */
 
         inactiveSockets.push(socket);
-        socket.disconnect(true);
+        socket?.disconnect(true);
       }
     });
 
@@ -75,30 +74,35 @@ export class DynamoNTS_SocketPresence {
 
     this.sockets.forEach((socket: SocketIO.Socket, index: number) => {
       const success: boolean = socket.emit(event, content, error => {
-        Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed! (0)\nerror:`, error);
+        Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!(0)\nerror:`, error);
         errors.push(error);
-        anyFailed = true;
       });
 
       if (!success) {
-        Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed! (1)`);
-        anyFailed = true;
+        Dynamo_Log.error(`Emitting event '${event}' on socket(${this.serviceName})-(${index}) failed!(1)`);
       }
     });
 
-    if (anyFailed) {
+    if (0 < errors.length) {
       throw new Dynamo_Error({
         status: 500,
         errorCode: 'NTS-SPC-EE2',
         addECToUserMsg: true,
         message: `Emitting event '${event}' on socket(s)(${this.serviceName}) failed!`,
         userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.',
-        /* errors: errors, */
         additionalContent: {
           inactiveSockets: inactiveSockets,
           errors: errors,
         }
       });
+    } else if (this.sockets.length === 0) {
+      throw new Dynamo_Error({
+        status: 404,
+        errorCode: 'NTS-SPC-EE3',
+        addECToUserMsg: true,
+        message: `Emitting event '${event}' on socket(s)(${this.serviceName}) failed! No more sockets left connected!`,
+        userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.',
+      });
     }
   }
 

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

@@ -24,7 +24,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
   protected _connected: boolean = false;
   get connected(): boolean { return this._connected; }
 
-  protected log: boolean = dynamoNTS_globalSettings.logSetup;
+  protected debugLog: boolean = dynamoNTS_globalSettings.logSetup;
   protected logFn: boolean;
 
   private defaultEvents: DynamoNTS_SocketEvent<any>[] = [
@@ -33,7 +33,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       tasks: [
         async () => {
           this._connected = true;
-          Dynamo_Log.success(`Socket Client connected: ${this.params.name}`);
+          Dynamo_Log.success(`<   >  socket-client(${this.params.name}) connected!`);
         }
       ]
     }),
@@ -43,7 +43,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       tasks: [
         async () => {
           this._connected = false;
-          Dynamo_Log.warn(`Socket Client disconnected: ${this.params.name}`);
+          Dynamo_Log.warn(`< x >  socket-client(${this.params.name}) disconnected!`);
 
           if (this._params.reconnect) {
             await delay(this._params.reconnectDelay);
@@ -57,7 +57,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       eventKey: DynamoNTS_SocketEventKey.subscriptionSuccessful,
       tasks: [
         async () => {
-          Dynamo_Log.success(`Socket Client subscription successful: ${this.params.name}`);
+          Dynamo_Log.success(`<-=->  socket-client(${this.params.name}) subscription successful!`);
         }
       ]
     }),
@@ -66,7 +66,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       eventKey: DynamoNTS_SocketEventKey.error,
       tasks: [
         async (content: any) => {
-          Dynamo_Log.error(`Socket Client error: ${this.params.name}`, content);
+          Dynamo_Log.error(`--->   socket-client(${this.params.name}) ERROR!:`, content);
         }
       ]
     }),
@@ -76,7 +76,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
     super();
 
     this.asyncConstructor().catch((error: any) => {
-      Dynamo_Log.error(`${this.params?.name} Socket Client Service setup failed!`, error);
+      Dynamo_Log.error(`socket-client(${this.params?.name}) Service setup failed! ERROR:`, error);
     });
   }
 
@@ -90,11 +90,11 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
 
       await this.setupSocketEvents();
 
-      Dynamo_Log.log(`\n${this.params?.name} Socket Client Service setup finished`);
+      Dynamo_Log.success(`\nsocket-client(${this.params?.name}) Service setup finished`);
       
       await this.connectSocket();
     } catch (error) {
-      Dynamo_Log.error(`${this.params?.name} Socket Client Service setup failed!`, error);
+      Dynamo_Log.error(`socket-client(${this.params?.name}) Service setup failed!`, error);
       throw new Dynamo_Error({
         errorCode: 'NTS-SCS-001',
         error: error,        
@@ -107,6 +107,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
       if (this.logFn) console.log('\nFn:. setupDefaultEvents');
 
       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);
         if (!eventDeclared) {
           this.incomingEvents.push(defaultEvent);
@@ -115,37 +116,35 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         }
       });
     } catch (error) {
-      Dynamo_Log.error(`Socket Client Service Setup Default Events failed: ${this.params?.name} (${this.params?.port})`, error);
+      Dynamo_Log.error(`socket-client(${this.params.name}) Service Setup Default Events failed, ERROR:`, error);
       throw error;
     }
   }
 
   private async setupSocketEvents(): Promise<void> {
     try {
-      if (this.log) console.log(`Setup Socket Events... (${this.params.name})`);
+      if (this.debugLog) console.log(`Setup socket-client(${this.params.name}) Events...`);
 
       await Dynamo_Array.asyncForEach(this.incomingEvents, async (event: DynamoNTS_SocketEvent<any>) => {
-        if (!event.socketName) {
-          event.socketName = this.name;
-        }
+        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 Event failed: ${this.params.name} (${this.params.port})`, error);
+            Dynamo_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 Service Setup Socket Events failed: ${this.params?.name} (${this.params?.port})`, error);
+      Dynamo_Log.error(`socket-client(${this.params.name}) Service Setup Socket Events failed, ERROR:`, error);
       throw error;
     }
   }
   
   private async connectSocket(): Promise<void> {
     try {
-      Dynamo_Log.log(`${this.params.name} Socket Client connecting to ${this.params.address}:${this.params.port} ...`);
+      Dynamo_Log.info(`< .. > socket-client(${this.params.name}) connecting to ${this.params.address}:${this.params.port} ...`);
 
       this.socket.connect();
 
@@ -153,7 +152,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         await this.tryReconnectIfNeeded();
       }
     } catch (error) {
-      Dynamo_Log.error(`Socket Client Service Connect Socket failed: ${this.params?.name} (${this.params?.port})`, error);
+      Dynamo_Log.error(`socket-client(${this.params.name}) Service Connect Socket failed, ERROR:`, error);
       throw error;
     }
   }
@@ -167,7 +166,7 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
         await this.connectSocket();
       }
     } catch (error) {
-      Dynamo_Log.error(`Socket Client Service Try Reconnect failed: ${this.params?.name} (${this.params?.port})`, error);
+      Dynamo_Log.error(`socket-client(${this.params.name}) Service Try Reconnect failed, ERROR:`, error);
       throw error;
     }
   }
@@ -179,10 +178,10 @@ export abstract class DynamoNTS_SocketClientService extends DynamoNTS_SingletonS
    */
   protected async emitEvent(eventType: string, content: any): Promise<void> {
     try {
-      Dynamo_Log.log(`<-=-   outgoing ${this.name} socket event: ${eventType}`);
+      Dynamo_Log.log(`<-=-   outgoing socket-client(${this.params.name}) 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);
+      Dynamo_Log.error(`socket-client(${this.params.name}) Service Emit Event failed: ${this.params?.name} (${this.params?.port})`, error);
       throw error;
     }
   }

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

@@ -355,9 +355,10 @@ export abstract class DynamoNTS_SocketServerService<
     }
   }
 
-  emitServerEvent(event: string, content: any): void {
+  /* emitServerEvent(event: string, content: any): void {
     try {
       Dynamo_Log.log(` <=--  emitting server socket(${this.params.name}) event: ${event}`);
+
       this.openSocketServer.emit(event, content, error => {
         Dynamo_Log.error(`Emitting server event '${event}' failed!\nerror:`, error);
       });
@@ -372,7 +373,7 @@ export abstract class DynamoNTS_SocketServerService<
         message: `socket(${this.params.name}) Event Emit (${event}) failed: ${this.params?.name}`,
       });
     }
-  }
+  } */
 
   idIsSubscribed(id: string): boolean {
     try {