@futdevpro/nts-dynamo 1.9.25 → 1.9.28

package/src/_modules/socket/_services/app-extended.server.ts

@@ -2,7 +2,7 @@
 import * as SocketIO from 'socket.io';
 import * as Http from 'http';
 
-import { DyFM_Array, DyFM_Error, DyFM_Log, second, DyFM_wait } from '@futdevpro/fsm-dynamo';
+import { DyFM_Array, DyFM_Error, DyFM_Log, second, DyFM_wait, DyFM_AnyError } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_App } from '../../../_services/server/app.server';
 import { DyNTS_RouteSecurity } from '../../../_enums/route-security.enum';
@@ -139,19 +139,20 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
   constructor(){
     super(true);
 
-    this.asyncConstructExt().catch((error: any): void => {
-      if (DyNTS_global_settings.log_settings.highDetailedLogs) {
+    this.asyncConstructExt().catch((error: DyFM_AnyError): void => {
+      if (
+        DyNTS_global_settings.log_settings.highDetailedLogs ||
+        !(error instanceof DyFM_Error)
+      ) {
         DyFM_Log.H_error(
-          `Extended Application: ${this.params?.name} start failed.` +
-          `\nERROR:`, error
+          `Extended Application: ${this.params?.name} start failed. ` +
+          `(DyNTS_AppExtended constructor catch)`,
+          `\n    ERROR:`, error
         );
       } else {
-        DyFM_Log.H_error(
-          `Extended Application: ${this.params?.name} start failed.`,
-          `\nErrorMessage: ${(error as DyFM_Error)._message}`,
-          `\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
-          `\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
-          `\nStack: ${(error as DyFM_Error).error.stack}`,
+        error.logSimple(
+          `Extended Application: "${this.params?.name}" start failed. ` +
+          `(DyNTS_AppExtended constructor catch)`
         );
       }
     });
@@ -188,18 +189,17 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
       DyFM_Log.H_success(`${this.params.name} started successfully.`);
       
     } catch (error) {
-      if (DyNTS_global_settings.log_settings.highDetailedLogs) {
+      if (
+        DyNTS_global_settings.log_settings.highDetailedLogs ||
+        !(error instanceof DyFM_Error)
+      ) {
         DyFM_Log.H_error(
-          `Extended Application: ${this.params?.name} start failed.` +
-          `\nERROR:`, error
+          `Extended Application: ${this.params?.name} start failed. (asyncConstructExt catch)` +
+          `\n    ERROR:`, error
         );
       } else {
-        DyFM_Log.H_error(
-          `Extended Application: ${this.params?.name} start failed.`,
-          `\nErrorMessage: ${(error as DyFM_Error)._message}`,
-          `\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
-          `\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
-          `\nStack: ${(error as DyFM_Error).error.stack}`,
+        error.logSimple(
+          `Extended Application: "${this.params?.name}" start failed. (asyncConstructExt catch)`
         );
       }
 
@@ -233,8 +233,15 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
 
     if (this.constructErrors.length) {
       DyFM_Log.H_error(
-        `Extended Application: ${this.params?.name} start failed.`,
-        `construct ERRORS:`, this.constructErrors, 
+        `Extended Application: ${this.params?.name} start failed. (ready constructErrors check)`,
+        `\n    construct ERRORS:\n`, 
+        this.constructErrors.map((error: any): any => {
+          if (error instanceof DyFM_Error) {
+            return error.getErrorSimplified();
+          } else {
+            return error;
+          }
+        }), 
       );
 
       throw new DyFM_Error({ 
@@ -262,8 +269,15 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
 
     if (this.constructErrors.length) {
       DyFM_Log.H_error(
-        `Extended Application: ${this.params?.name} start failed. TIMEOUT`, 
-        `\nconstruct ERRORS:`, this.constructErrors, 
+        `Extended Application: ${this.params?.name} start failed. (ready TIMEOUT check)`, 
+        `\n    construct ERRORS:\n`, 
+        this.constructErrors.map((error: any): any => {
+          if (error instanceof DyFM_Error) {
+            return error.getErrorSimplified();
+          } else {
+            return error;
+          }
+        }), 
       );
 
       throw new DyFM_Error({ 

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

@@ -1,28 +1,28 @@
 
 
 
-import * as SocketIO from 'socket.io-client';
+import * as SocketIOClient from 'socket.io-client';
 
-import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
 import { 
   DyFM_Error, DyFM_Log, DyFM_delay, DyFM_Array, DyFM_errorFlag 
 } from '@futdevpro/fsm-dynamo';
+import { DyFM_SocketEvent, DyFM_SocketEvent_Key } from '@futdevpro/fsm-dynamo/socket';
+
+import { DyNTS_SingletonService } from '../../../_services/base/singleton.service';
+import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
 import { 
   DyNTS_SocketClientService_Params 
 } from '../_models/socket-client-service-params.control-model';
-import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
-import { DyNTS_SocketEvent } from '../_models/socket-event.control-model';
-import { DyNTS_SocketEventKey } from '../_enums/socket-event-key.enum';
 
-export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
+export abstract class DyNTS_SocketClient_ServiceBase extends DyNTS_SingletonService /* DyFM_SocketClient_ServiceBase */ {
 
   private _params: DyNTS_SocketClientService_Params;
   protected get params(): DyNTS_SocketClientService_Params { return this._params; }
   get name(): string { return this.params.name; }
 
-  protected socket: SocketIO.Socket;
+  protected socket: SocketIOClient.Socket;
   
-  protected incomingEvents: DyNTS_SocketEvent<any>[];
+  protected incomingEvents: DyFM_SocketEvent<any>[];
   
   protected _connected: boolean = false;
   get connected(): boolean { return this._connected; }
@@ -30,9 +30,9 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
   protected debugLog: boolean = DyNTS_global_settings.log_settings.setup;
   protected logFn: boolean = DyNTS_global_settings.log_settings.functions;
 
-  private defaultEvents: DyNTS_SocketEvent<any>[] = [
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.connect,
+  private defaultEvents: DyFM_SocketEvent<any>[] = [
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.connect,
       tasks: [
         async () => {
           this._connected = true;
@@ -41,8 +41,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
       ],
     }),
 
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.disconnect,
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.disconnect,
       tasks: [
         async () => {
           this._connected = false;
@@ -56,8 +56,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
       ],
     }),
 
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.subscriptionSuccessful,
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.subscriptionSuccessful,
       tasks: [
         async () => {
           DyFM_Log.success(`<=-->  socket-client(${this.params.name}) subscription successful!`);
@@ -65,8 +65,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
       ],
     }),
 
-    new DyNTS_SocketEvent<any>({
-      eventKey: DyNTS_SocketEventKey.error,
+    new DyFM_SocketEvent<any>({
+      eventKey: DyFM_SocketEvent_Key.error,
       tasks: [
         async (content: any) => {
           DyFM_Log.error(`=-->   socket-client(${this.params.name}) ERROR!:`, content);
@@ -79,14 +79,19 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
     super();
 
     this.asyncConstructor().catch((error: any) => {
-      DyFM_Log.error(`socket-client(${this.params?.name}) Service setup failed! ERROR:`, error);
-      
-      if (error?.flag?.includes?.(DyFM_errorFlag)) {
-        DyFM_Log.error(
-          `ErrorMessage: ${(error as DyFM_Error)._message}`,
-          `\nErrorCode: ${(error as DyFM_Error)._errorCode}`,
-          `\nUserMessage: ${(error as DyFM_Error).__userMessage}`,
-          `\nStack: ${(error as DyFM_Error).error.stack}`
+      if (
+        DyNTS_global_settings.log_settings.highDetailedLogs ||
+        !(error instanceof DyFM_Error)
+      ) {
+        DyFM_Log.H_error(
+          `socket-client "${this.params?.name}" Service setup failed! ` +
+          `(DyNTS_SocketClientService constructor catch)`,
+          `\n    ERROR:`, error
+        );
+      } else {
+        error.logSimple(
+          `socket-client "${this.params?.name}" Service setup failed! ` +
+          `(DyNTS_SocketClientService constructor catch)`
         );
       }
     });
@@ -96,7 +101,14 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
     try {
       this._params = this.getParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
-      this.socket = SocketIO.io(`${this.params.address}:${this.params.port}`);
+      this.socket = SocketIOClient.io(
+        `${this.params.address}:${this.params.port}`,
+        {
+          reconnection: this.params.reconnect,
+          reconnectionDelay: this.params.reconnectDelay,
+          ...this.params.socketOptions,
+        }
+      );
       
       await this.setupDefaultEvents();
 
@@ -119,10 +131,10 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
     try {
       if (this.logFn) console.log('\nFn:. setupDefaultEvents');
 
-      this.defaultEvents.forEach((defaultEvent: DyNTS_SocketEvent<any>) => {
+      this.defaultEvents.forEach((defaultEvent: DyFM_SocketEvent<any>) => {
         defaultEvent.serviceName = this.params.name;
         const eventDeclared = this.incomingEvents.find(
-          (event: DyNTS_SocketEvent<any>) => event.eventKey === defaultEvent.eventKey
+          (event: DyFM_SocketEvent<any>) => event.eventKey === defaultEvent.eventKey
         );
 
         if (!eventDeclared) {
@@ -147,14 +159,14 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
 
       await DyFM_Array.asyncForEach(
         this.incomingEvents, 
-        async (event: DyNTS_SocketEvent<any>) => {
+        async (event: DyFM_SocketEvent<any>) => {
           event.serviceName = this.params.name;
           this.socket.on(event.eventKey, async (content: any) => { 
             try {
               await event.executeEventTasks(content, this.params.service);
             } catch (error) {
               DyFM_Log.error(`socket-client(${this.params.name}) Event failed, ERROR:`, error);
-              await this.emitEvent(DyNTS_SocketEventKey.error, error);
+              await this.emitEvent(DyFM_SocketEvent_Key.error, error);
             }
           });
         }
@@ -236,5 +248,5 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
   /**
    * You must setup events and required services in this function
    */
-  abstract getIncomingEvents(): DyNTS_SocketEvent<any>[];
+  abstract getIncomingEvents(): DyFM_SocketEvent<any>[];
 }