@futdevpro/nts-dynamo 1.9.19 → 1.9.23

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

@@ -11,6 +11,7 @@ import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 import { 
   DyNTS_AppExtSysControls 
 } from '../../_models/control-models/app-ext-system-controls.control-model';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 /**
  * This will be the MAIN service of our server project,
@@ -139,16 +140,25 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
     super(true);
 
     this.asyncConstructExt().catch((error: any): void => {
-      DyFM_Log.H_error(
-        `\nExtended Application: ${this.params?.name} start failed.` +
-        `\n`, error, 
-        '\n'
-      );
+      if (DyNTS_global_settings.log_settings.highDetailedLogs) {
+        DyFM_Log.H_error(
+          `Extended Application: ${this.params?.name} start failed.` +
+          `\nERROR:`, 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}`,
+        );
+      }
     });
   }
 
   private async asyncConstructExt(): Promise<void> {
-    if (this.logFn && this.deepLog) console.log('\nfn:. asyncConstruct-extended');
+    if (this.fnLogs && this.deepLog) console.log('\nfn:. asyncConstruct-extended');
     try {
       this.systemControlsExt.appExtended.init = true;
     
@@ -178,11 +188,20 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
       DyFM_Log.H_success(`${this.params.name} started successfully.`);
       
     } catch (error) {
-      DyFM_Log.H_error(
-        `\nExtended Application: ${this.params?.name} start failed.` +
-        `\n`, error,
-        '\n'
-      );
+      if (DyNTS_global_settings.log_settings.highDetailedLogs) {
+        DyFM_Log.H_error(
+          `Extended Application: ${this.params?.name} start failed.` +
+          `\nERROR:`, 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}`,
+        );
+      }
 
       throw new DyFM_Error({
         errorCode: 'NTS-AES-001',
@@ -206,7 +225,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
   }
 
   override async ready(timeout: number = 4 * second): Promise<void> {
-    if (this.logFn) console.log('\nfn:. ready-extended');
+    if (this.fnLogs) console.log('\nfn:. ready-extended');
     await super.ready(timeout);
 
     let ready: boolean = false;
@@ -214,15 +233,14 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
 
     if (this.constructErrors.length) {
       DyFM_Log.H_error(
-        `Extended Application: ${this.params?.name} start failed. ERRORS`, 
-        this.constructErrors, 
-        '\n'
+        `Extended Application: ${this.params?.name} start failed.`,
+        `construct ERRORS:`, this.constructErrors, 
       );
 
       throw new DyFM_Error({ 
-        message: `${this.params?.name} start failed. ERRORS`,
+        message: `${this.params?.name} start failed.`,
         additionalContent: this.constructErrors,
-        error: this.constructErrors?.[0] ?? new Error()
+        error: this.constructErrors?.[0] ?? new Error(),
       });
     }
 
@@ -245,21 +263,20 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
     if (this.constructErrors.length) {
       DyFM_Log.H_error(
         `Extended Application: ${this.params?.name} start failed. TIMEOUT`, 
-        this.constructErrors, 
-        '\n'
+        `\nconstruct ERRORS:`, this.constructErrors, 
       );
 
       throw new DyFM_Error({ 
         message: `${this.params?.name} start failed. TIMEOUT`,
         additionalContent: this.constructErrors,
-        error: this.constructErrors?.[0] ?? new Error()
+        error: this.constructErrors?.[0] ?? new Error(),
       });
     }
 
     if (ready) {
       this.systemControlsExt.appExtended.started = true;
       
-      if (this.logFn && this.deepLog) console.log('\nfn:. ready-extended: return');
+      if (this.fnLogs && this.deepLog) console.log('\nfn:. ready-extended: return');
 
       return;
     } else {
@@ -300,13 +317,13 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
             httpsSocketServer: this.systemControlsExt.httpsSocketServer.getReady(),
           },
         },
-        error: this.constructErrors?.[0] ?? new Error()
+        error: this.constructErrors?.[0] ?? new Error(),
       });
     }
   }
 
   override async stop(): Promise<void> {
-    if (this.logFn) console.log('\nfn:. stop-extended');
+    if (this.fnLogs) console.log('\nfn:. stop-extended');
     
     if (this.started) {
       await super.stop(true);
@@ -325,7 +342,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
                   new DyFM_Error({
                     errorCode: 'NTS-AES-120',
                     message: `SocketServer close failed.`,
-                    error: err
+                    error: err,
                   })
                 );
               } else {
@@ -346,7 +363,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
    * 
    */
   private setSocketSecurity(): void {
-    if (this.logFn) console.log('\nfn:. setSocketSecurity');
+    if (this.fnLogs) console.log('\nfn:. setSocketSecurity');
     this.socketServices.forEach((service: DyNTS_SocketServerService<any>): void => {
       if (!this.socketSecurity) {
         this.socketSecurity = DyNTS_RouteSecurity[service.security];
@@ -364,7 +381,7 @@ export abstract class DyNTS_AppExtended extends DyNTS_App {
    */
   private async setupSocketServerServices(): Promise<void> {
     try {
-      if (this.logFn) console.log('\nfn:. setupSocketServerServices');
+      if (this.fnLogs) console.log('\nfn:. setupSocketServerServices');
       /* let httpServer: Http.Server; */
 
       if (this.socketSecurity !== DyNTS_RouteSecurity.secure) {

package/src/_services/server/app.server.spec.ts

@@ -1,8 +1,6 @@
 
 import { DyFM_Log, DyFM_delay } from '@futdevpro/fsm-dynamo';
-import { 
-  DyNTS_AppBase_Mock, DyNTS_AppFull_Mock 
-} from '../../_constants/mocks/app-server.mock';
+import { DyNTS_AppBase_Mock, DyNTS_AppFull_Mock } from '../../_modules/mock/app-server.mock';
 
 describe('DyNTS_App AND DyNTS_AppExtended?;', (): void => {
   // jasmine.DEFAULT_TIMEOUT_INTERVAL = 15 * second;

package/src/_services/server/app.server.ts

@@ -15,7 +15,8 @@ import {
   DyFM_AnyError,
   DyFM_Array, DyFM_Error, DyFM_error_defaults, 
   DyFM_Error_Settings, 
-  DyFM_ErrorLevel, DyFM_Log, second, DyFM_wait 
+  DyFM_ErrorLevel, DyFM_Log, second, DyFM_wait, 
+  DyFM_errorFlag
 } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_SingletonService } from '../base/singleton.service';
@@ -29,7 +30,6 @@ import {
 import { 
   DyNTS_GlobalService_Settings 
 } from '../../_models/interfaces/global-service-settings.interface';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 import { 
   DyNTS_Endpoint_Params 
@@ -37,7 +37,7 @@ import {
 import { 
   DyNTS_AppSystemControls 
 } from '../../_models/control-models/app-system-controls.control-model';
-
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 /**
  * This will be the MAIN service of our server project,
@@ -198,8 +198,6 @@ import {
  */
 export abstract class DyNTS_App extends DyNTS_SingletonService {
 
-  // TODO: rename all DyNTS_ > DyNTS_ ------------------------------------------------------------------------------------------------------------------------------------
-
   protected systemControls: DyNTS_AppSystemControls = new DyNTS_AppSystemControls();
   get started(): boolean { 
     return this.systemControls.app.started; 
@@ -256,13 +254,16 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
     `\nplease contact the responsible development team.\n` +
     `\n(Internal Server error)`;
 
-  /**
-   * setting this value to true, enables this service debug logs
-   */
-  protected logSetup: boolean;
-  protected deepLog: boolean;
-  protected logFn: boolean;
-  protected debugLog: boolean;
+  get logSetup(): boolean {
+    return DyNTS_global_settings.log_settings.setup;
+  }
+  get deepLog(): boolean {
+    return DyNTS_global_settings.log_settings.deep;
+  }
+  get fnLogs(): boolean {
+    return DyNTS_global_settings.log_settings.functions;
+  }
+  debugLog: boolean = DyNTS_global_settings.log_settings.server_debug;
 
   constructor(extended?: boolean){
     super();
@@ -293,21 +294,25 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
     });
 
     this.asyncConstruct(extended).catch((error: any): void => {
-      DyFM_Log.error(
-        `\nApplication: ${this._params.name} start failed.` +
-        `\n`, error
-      );
-
-      if (error?.flag?.includes?.('DYNAMO-ERROR-OBJECT')) {
-        DyFM_Log.error(`\nErrorMessage: ${(error as DyFM_Error)._message}`);
-        DyFM_Log.error(`ErrorCode: ${(error as DyFM_Error)._errorCode}`);
-        DyFM_Log.error(`UserMessage: ${(error as DyFM_Error).__userMessage}`);
+      if (DyNTS_global_settings.log_settings.highDetailedLogs) {
+        DyFM_Log.H_error(
+          `Application: ${this.params?.name} start failed.` +
+          `\nERROR:`, error
+        );
+      } else {
+        DyFM_Log.H_error(
+          `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}`,
+        );
       }
     });
   }
 
   private async asyncConstruct(extended?: boolean): Promise<void> {
-    if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. asyncConstruct');
+    if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. asyncConstruct');
     try {
       this.systemControls.app.init = true;
       this._params = this.getAppParams();  
@@ -330,9 +335,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
 
       DyFM_error_defaults.issuerSystem = this._params.systemName;  
       
-      this.overrideDynamoNTSGlobalSettings?.();    
-
-      this.logSetup = DyNTS_globalSettings.logSetup;
+      this.overrideDynamoNTSGlobalSettings?.();
       
       this.globalService = DyNTS_GlobalService.getInstance();
       await DyNTS_GlobalService.setServices(this.getGlobalServiceCollection());
@@ -391,9 +394,12 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
       }
     } catch (error) {
       this.constructErrors.push(error);
+
       DyFM_Log.error(
-        `${this._params.name} start failed. ERRORS`, 
+        `${this._params.name} start failed (in asyncConstruct). `,
+        `\nERRORS:`, 
         this.constructErrors,
+        '\nlast error:',
         error
       );
 
@@ -419,20 +425,20 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
   }
 
   async ready(timeout: number = 4 * second): Promise<void> {
-    if (this.logFn) DyFM_Log.log('\nfn:. ready');
+    if (this.fnLogs) DyFM_Log.log('\nfn:. ready');
     let ready: boolean = false;
     const start: number = +new Date();
 
     if (this.constructErrors.length) {
       DyFM_Log.error(
-        `${this._params.name} start failed. \nERRORS:`, 
-        this.constructErrors
+        `${this._params.name} start failed.`,
+        `\nconstruct ERRORS:`, this.constructErrors
       );
 
       throw new DyFM_Error({ 
         ...this._getDefaultErrorSettings(
           'ready',
-          new Error(`${this._params.name} start failed. ERRORS`)
+          new Error(`${this._params.name} start failed.`)
         ),
 
         errorCode: 'NTS-AS0-R01',
@@ -460,7 +466,10 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
     }
 
     if (timeout < +new Date() - start) {
-      DyFM_Log.error(`${this._params.name} start failed. TIMEOUT`, this.constructErrors);
+      DyFM_Log.error(
+        `${this._params.name} start failed. TIMEOUT`, 
+        `\nconstruct ERRORS:`, this.constructErrors
+      );
 
       throw new DyFM_Error({
         ...this._getDefaultErrorSettings(
@@ -482,12 +491,15 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
     }
 
     if (this.constructErrors.length) {
-      DyFM_Log.error(`${this._params.name} start failed. ERROR`, this.constructErrors);
+      DyFM_Log.error(
+        `${this._params.name} start failed.`,
+        `\nconstruct ERRORS:`, this.constructErrors
+      );
       
       throw new DyFM_Error({
         ...this._getDefaultErrorSettings(
           'ready',
-          new Error(`${this._params.name} start failed. ERROR`)
+          new Error(`${this._params.name} start failed.`)
         ),
 
         errorCode: 'NTS-AS0-R03',
@@ -498,48 +510,48 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
     if (ready) {
       this.systemControls.app.started = true;
       
-      if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. ready: return');
+      if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. ready: return');
 
       return;
-    } else {
-      this.systemControls.app.started = false;
-      
-      let msg: string = `${this._params.name} start failed. UNKNOWN`;
-
-      if (this.systemControls.mongoose.init && !this.systemControls.mongoose.started) {
-        msg += `\nMongoose start failed.`;
-      }
+    }
 
-      if (this.systemControls.httpServer.init && !this.systemControls.httpServer.started) {
-        msg += `\nHTTP Server start failed.`;
-      }
+    this.systemControls.app.started = false;
+    
+    let msg: string = `${this._params.name} start failed. UNKNOWN`;
 
-      if (this.systemControls.httpsServer.init && !this.systemControls.httpsServer.started) {
-        msg += `\nHTTPS Server start failed.`;
-      }
+    if (this.systemControls.mongoose.init && !this.systemControls.mongoose.started) {
+      msg += `\nMongoose start failed.`;
+    }
 
-      DyFM_Log.error(msg, this.constructErrors);
+    if (this.systemControls.httpServer.init && !this.systemControls.httpServer.started) {
+      msg += `\nHTTP Server start failed.`;
+    }
 
-      throw new DyFM_Error({ 
-        ...this._getDefaultErrorSettings(
-          'ready',
-          new Error(msg)
-        ),
+    if (this.systemControls.httpsServer.init && !this.systemControls.httpsServer.started) {
+      msg += `\nHTTPS Server start failed.`;
+    }
 
-        errorCode: 'NTS-AS0-R04',
-        additionalContent: {
-          constructErrors: this.constructErrors,
-          systemControls: this.systemControls,
-          systemReadies: {
-            app: this.systemControls.app.getReady(),
-            mongoose: this.systemControls.mongoose.getReady(),
-            httpServer: this.systemControls.httpServer.getReady(),
-            httpsServer: this.systemControls.httpsServer.getReady(),
-          },
+    DyFM_Log.error(msg, this.constructErrors);
+
+    throw new DyFM_Error({ 
+      ...this._getDefaultErrorSettings(
+        'ready',
+        new Error(msg)
+      ),
+
+      errorCode: 'NTS-AS0-R04',
+      additionalContent: {
+        constructErrors: this.constructErrors,
+        systemControls: this.systemControls,
+        systemReadies: {
+          app: this.systemControls.app.getReady(),
+          mongoose: this.systemControls.mongoose.getReady(),
+          httpServer: this.systemControls.httpServer.getReady(),
+          httpsServer: this.systemControls.httpsServer.getReady(),
         },
-        error: this.constructErrors?.[0] ?? new Error(),
-      });
-    }
+      },
+      error: this.constructErrors?.[0] ?? new Error(),
+    });
   }
 
   async stop(dontLog?: boolean): Promise<void> {
@@ -631,7 +643,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   private async startDB(): Promise<void> {
-    if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. startDB');
+    if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. startDB');
 
     await new Promise<void>(
       (resolve, reject): void => {
@@ -699,7 +711,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   private async initExpresses(): Promise<void> {
-    if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. initExpresses');
+    if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. initExpresses');
 
     if (this._security && this._security !== DyNTS_RouteSecurity.secure) {
       if (!this._portSettings.httpPort) {
@@ -781,7 +793,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   protected async initOpenExpress(): Promise<void> {
-    if (this.logFn) DyFM_Log.log('\nfn:. initOpenExpress');
+    if (this.fnLogs) DyFM_Log.log('\nfn:. initOpenExpress');
     this.openExpress = Express();    
     this.openExpress.use(BodyParser.urlencoded(this._portSettings.httpUrlencoded));
     this.openExpress.use(BodyParser.json(this._portSettings.httpJson));
@@ -791,7 +803,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   protected async initSecureExpress(): Promise<void> {
-    if (this.logFn) DyFM_Log.log('\nfn:. initSecureExpress');
+    if (this.fnLogs) DyFM_Log.log('\nfn:. initSecureExpress');
     this.secureExpress = Express();    
     this.secureExpress.use(BodyParser.urlencoded(this._portSettings.httpsUrlencoded));
     this.secureExpress.use(BodyParser.json(this._portSettings.httpsJson));
@@ -808,7 +820,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   private async startExpresses(): Promise<void> {
-    if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. startExpresses');
+    if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. startExpresses');
     try {
       if (this._security && this._security !== DyNTS_RouteSecurity.open) {
         await new Promise<void>((resolve, reject): void => {
@@ -994,7 +1006,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   private async mountSecureRoutes (): Promise<void> {
-    if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. mountSecureRoutes');
+    if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. mountSecureRoutes');
     
     this.openExpress.use(
       (error, req, res, next): Promise<void> => this.expressErrorHandling(error, req, res, next)
@@ -1042,7 +1054,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   private async mountOpenRoutes(): Promise<void> {
-    if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. mountOpenRoutes');
+    if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. mountOpenRoutes');
 
     this.openExpress.use(
       (error, req, res, next): Promise<void> => this.expressErrorHandling(error, req, res, next)
@@ -1090,7 +1102,7 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
    * 
    */
   private setSecurity(): void {
-    if (this.logFn && this.deepLog) DyFM_Log.log('\nfn:. setSecurity');
+    if (this.fnLogs && this.deepLog) DyFM_Log.log('\nfn:. setSecurity');
     this._routingModules.forEach((module: DyNTS_RoutingModule): void => {
       if (!module.security) {
         DyFM_Log.warn(`RoutingModule security is not set for ${module.route}\n`);

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

@@ -4,12 +4,11 @@
 import * as SocketIO from 'socket.io-client';
 
 import { DyNTS_SingletonService } from '../base/singleton.service';
-import { DyFM_Error, DyFM_Log } from '@futdevpro/fsm-dynamo';
-import { DyFM_delay, DyFM_Array } from '@futdevpro/fsm-dynamo/utils';
+import { DyFM_Error, DyFM_Log, DyFM_delay, DyFM_Array, DyFM_errorFlag } from '@futdevpro/fsm-dynamo';
 import { 
   DyNTS_SocketClientService_Params 
 } from '../../_models/control-models/socket-client-service-params.control-model';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_SocketEvent } from '../../_models/control-models/socket-event.control-model';
 import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 
@@ -26,8 +25,8 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
   protected _connected: boolean = false;
   get connected(): boolean { return this._connected; }
 
-  protected debugLog: boolean = DyNTS_globalSettings.logSetup;
-  protected logFn: boolean;
+  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>({
@@ -80,10 +79,13 @@ export abstract class DyNTS_SocketClientService extends DyNTS_SingletonService {
     this.asyncConstructor().catch((error: any) => {
       DyFM_Log.error(`socket-client(${this.params?.name}) Service setup failed! ERROR:`, error);
       
-      if (error?.flag?.includes?.('DYNAMO-ERROR-OBJECT')) {
-        DyFM_Log.error(`\nErrorMessage: ${(error as DyFM_Error)._message}`);
-        DyFM_Log.error(`ErrorCode: ${(error as DyFM_Error)._errorCode}`);
-        DyFM_Log.error(`UserMessage: ${(error as DyFM_Error).__userMessage}`);
+      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}`
+        );
       }
     });
   }

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

@@ -1,6 +1,6 @@
+import { DyNTS_SocketServer_Mock } from '../../_modules/mock/socket-server.mock';
 
 
-import { DyNTS_SocketServer_Mock } from '../../_constants/mocks/socket-server.mock';
 
 describe('DyNTS_SocketServerService', () => {
   it('should create an instance', () => {

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

@@ -6,7 +6,6 @@ import {
 } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_SingletonService } from '../base/singleton.service';
-import { DyNTS_globalSettings } from '../../_constants/global-settings.const';
 import { DyNTS_SocketEventKey } from '../../_enums/http/socket-event-type.enum';
 import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 import { 
@@ -18,6 +17,7 @@ import {
 import { 
   DyNTS_SocketEvent, DyNTS_SocketEventPreprocessTask, DyNTS_SocketEventTask 
 } from '../../_models/control-models/socket-event.control-model';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 /**
  * You need to define the following functions:
@@ -62,8 +62,12 @@ export abstract class DyNTS_SocketServerService<
   ): Promise<T_Presence>;
   protected presences: T_Presence[] = [];
 
-  protected logSetup: boolean;
-  protected logFn: boolean;
+  get logSetup(): boolean {
+    return DyNTS_global_settings.log_settings.setup;
+  }
+  get highDetailedLogs(): boolean {
+    return DyNTS_global_settings.log_settings.highDetailedLogs;
+  }
 
   defaultErrorUserMsg = 
     `We encountered an unhandled Socket Server Error, ` +
@@ -82,7 +86,6 @@ export abstract class DyNTS_SocketServerService<
 
   private async asyncConstructor(): Promise<void> {
     try {
-      this.logSetup = DyNTS_globalSettings.logSetup;
       this.params = this.getServiceParams();
       this.incomingEvents = this.getIncomingEvents() ?? [];
 
@@ -147,7 +150,7 @@ export abstract class DyNTS_SocketServerService<
         }
 
         if (this.getSubscriptionPreProcessess) {
-          this.subscriptionEvent.preProcessess.push(...this.getSubscriptionPreProcessess());
+          this.subscriptionEvent.preProcesses.push(...this.getSubscriptionPreProcessess());
         }
 
         if (this.getSubscriptionTasks) {
@@ -175,7 +178,7 @@ export abstract class DyNTS_SocketServerService<
         }
 
         if (this.getUnsubscribePreProcessess) {
-          this.unsubscribeEvent.preProcessess.push(...this.getUnsubscribePreProcessess());
+          this.unsubscribeEvent.preProcesses.push(...this.getUnsubscribePreProcessess());
         }
 
         if (this.getUnsubscribeTasks) {
@@ -249,7 +252,7 @@ export abstract class DyNTS_SocketServerService<
     successCallback: () => void
   ): Promise<SocketIO.Server> {
     try {
-      if (this.logFn) console.log('\nfn:. setupSocketServer');
+      if (this.highDetailedLogs) console.log('\nfn:. setupSocketServer');
 
       newSocketServer.on(DyNTS_SocketEventKey.connection, async (socket: SocketIO.Socket) => {
         try {
@@ -267,7 +270,7 @@ export abstract class DyNTS_SocketServerService<
                    * but subscribe event is an exception from this, 
                    * to be able to check content before getPresenceFromSubscrioptionEventContent 
                    */
-                  if (DyNTS_globalSettings.logSocketEventContent) {
+                  if (DyNTS_global_settings.log_settings.socket_eventContent) {
                     DyFM_Log.log(
                       `--=>   incoming socket(${this.params.name}) ` +
                       `event: ${DyNTS_SocketEventKey.subscribe};` +
@@ -325,7 +328,7 @@ export abstract class DyNTS_SocketServerService<
                    * but unsubscribe event is an exception from this, 
                    * to be able to check content before getPresenceFromSubscrioptionEventContent 
                    */
-                  if (DyNTS_globalSettings.logSocketEventContent) {
+                  if (DyNTS_global_settings.log_settings.socket_eventContent) {
                     DyFM_Log.log(
                       `--=>   incoming socket(${this.params.name}) ` +
                       `event: ${DyNTS_SocketEventKey.unsubscribe};` +
@@ -385,7 +388,7 @@ export abstract class DyNTS_SocketServerService<
             );
           });
 
-          if (DyNTS_globalSettings.logMainSocketEvents) {
+          if (DyNTS_global_settings.log_settings.socket_mainEvents) {
             DyFM_Log.success(`<   >  socket(${this.params.name}): new CONNECTION established`);
           }
         } catch (error) {
@@ -626,7 +629,7 @@ export abstract class DyNTS_SocketServerService<
 
       presence.emitEvent(event, content, issuer);
 
-      if (DyNTS_globalSettings.logSocketEventContent) {
+      if (DyNTS_global_settings.log_settings.socket_eventContent) {
         DyFM_Log.success(
           ` <--=  emitted socket(${this.params.name}) event for presence: ${event}, ` +
           `\n  presenceId: ${id}, sockets: ${presence.sockets.length}` +