@futdevpro/nts-dynamo 1.9.21 → 1.9.24

package/src/_services/core/api.service.ts

@@ -9,7 +9,7 @@ import { DyNTS_HttpResponseType } from '../../_enums/http/http-response-type.enu
 import {
   DyNTS_ApiCall_Params
 } from '../../_models/control-models/api-call-params.control-model';
-import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 export interface DyNTS_ApiCallInput_Params<T_Body = any> {
   pathParams?: {
@@ -70,7 +70,7 @@ export class DyNTS_ApiService {
         this.setupQueryParams<T_Body>(inputParams, callParams);
       } */
 
-      if (DyNTS_globalSettings.logApiEvents) {
+      if (DyNTS_global_settings.log_settings.api_events) {
         this.logEvent(url, inputParams, callParams);
       }
 
@@ -172,7 +172,7 @@ export class DyNTS_ApiService {
       `\n${callParams?.baseUrl}${callParams?.endPoint}`
     );
 
-    if (DyNTS_globalSettings.logDetailedErrors) {
+    if (DyNTS_global_settings.log_settings.detailedErrors) {
       DyFM_Log.error(`\ncallParams:`, callParams);
     }
 
@@ -249,10 +249,23 @@ export class DyNTS_ApiService {
         },
       });
     } else {
-      DyFM_Log.error(
-        `\n${callParams.name} was UNSUCCESSFUL`, 
-        error /*, '\n\n' , new Error() */
-      );
+      if (
+        DyNTS_global_settings.log_settings.detailedErrors ||
+        !(error instanceof DyFM_Error)
+      ) {
+        DyFM_Log.error(
+          `\n${callParams.name} was UNSUCCESSFUL`, 
+          '\nERROR:', error
+        );
+      } else {
+        DyFM_Log.error(
+          `\n${callParams.name} was UNSUCCESSFUL`,
+          `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}`
+        );
+      }
 
       throw error;
     }
@@ -269,8 +282,8 @@ export class DyNTS_ApiService {
       inputParams.body,
       callParams.httpOptions
     ).then((res: Axios.AxiosResponse): T_Response => {
-      if (DyNTS_globalSettings.logApiEvents) {
-        if (DyNTS_globalSettings.logApiResponseContents) {
+      if (DyNTS_global_settings.log_settings.api_events) {
+        if (DyNTS_global_settings.log_settings.api_responseContents) {
           DyFM_Log.success(`--->   '${callParams.name}' api call was successful`, res.data);
 
         } else {
@@ -293,8 +306,8 @@ export class DyNTS_ApiService {
   ): Promise<T_Response> {
     return await axios.delete<T_Response>(url, callParams.httpOptions).then(
       (res: Axios.AxiosResponse): T_Response => {
-        if (DyNTS_globalSettings.logApiEvents) {
-          if (DyNTS_globalSettings.logApiResponseContents) {
+        if (DyNTS_global_settings.log_settings.api_events) {
+          if (DyNTS_global_settings.log_settings.api_responseContents) {
             DyFM_Log.success(`'${callParams.name}' was successful`, res.data);
           } else {
             DyFM_Log.success(`'${callParams.name}' was successful`);
@@ -315,8 +328,8 @@ export class DyNTS_ApiService {
   ): Promise<T_Response> {
     return await axios.get<T_Response>(url, callParams.httpOptions).then(
       (res: Axios.AxiosResponse): T_Response => {
-        if (DyNTS_globalSettings.logApiEvents) {
-          if (DyNTS_globalSettings.logApiResponseContents) {
+        if (DyNTS_global_settings.log_settings.api_events) {
+          if (DyNTS_global_settings.log_settings.api_responseContents) {
             DyFM_Log.success(`'${callParams.name}' was successful`, res.data);
           } else {
             DyFM_Log.success(`'${callParams.name}' was successful`);
@@ -337,7 +350,7 @@ export class DyNTS_ApiService {
     inputParams: DyNTS_ApiCallInput_Params<T_Body>,
     callParams: DyNTS_ApiCall_Params
   ): void {
-    if (DyNTS_globalSettings.logApiRequestContents) {
+    if (DyNTS_global_settings.log_settings.api_requestContents) {
       DyFM_Log.log(
         `<---   outgoing API call: '${callParams?.name}' ` +
         `\n(${url})` +
@@ -348,7 +361,7 @@ export class DyNTS_ApiService {
       DyFM_Log.log(`<---   outgoing API call: '${callParams?.name}'`);
     }
 
-    if (DyNTS_globalSettings.logApiRequestSettings) {
+    if (DyNTS_global_settings.log_settings.api_requestSettings) {
       DyFM_Log.log(`callParams:`, callParams);
       DyFM_Log.log('inputParams:', {
         pathParams: inputParams.pathParams ?? {},
@@ -420,7 +433,6 @@ export class DyNTS_ApiService {
                 url: url,
               },
             });
-            break;
         }
       } else {
         throw new DyFM_Error({
@@ -442,7 +454,7 @@ export class DyNTS_ApiService {
   ): DyFM_Error_Settings {
     return {
       status: (error as DyFM_Error)?.___status ?? 500,
-      message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
+      message: (error as Error)?.message ?? `${fnName} was UNSUCCESSFUL (NTS)`,
       addECToUserMsg: !(error as DyFM_Error)?.__userMessage,
       userMessage: (error as DyFM_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuerService: `${this?.constructor?.name}-${this?.name}-DyNTS_ApiService`,

package/src/_services/core/email.service.ts

@@ -5,7 +5,9 @@ import * as NodeMailer from 'nodemailer';
 
 import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
 
-import { DyFM_AnyError, DyFM_Array, DyFM_Error, DyFM_Error_Settings, DyFM_Log } from '@futdevpro/fsm-dynamo';
+import { 
+  DyFM_AnyError, DyFM_Array, DyFM_Error, DyFM_Error_Settings, DyFM_Log 
+} from '@futdevpro/fsm-dynamo';
 
 export interface DyNTS_EmailService_Settings {
   host: string,

package/src/_services/core/global.service.ts

@@ -3,7 +3,8 @@
 import { Request, Response } from 'express';
 
 import { 
-  DyFM_Metadata, DyFM_DataModel_Params, DyFM_Log, DyFM_Error, DyFM_Array 
+  DyFM_Metadata, DyFM_DataModel_Params, DyFM_Log, DyFM_Error, DyFM_Array, 
+  DyFM_errorFlag
 } from '@futdevpro/fsm-dynamo';
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 
@@ -18,7 +19,7 @@ import { DyNTS_EmailService } from './email.service';
 import { DyNTS_Service_Collection } from './service-collection.service';
 /* import { DyNTS_EmailServiceCollection } from './email-service-collection.service'; */
 import { DyNTS_SingletonService } from '../base/singleton.service';
-import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 /**
  * This is the main Global/Core Service Collection used by DynamoBE, 
@@ -112,14 +113,26 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
         (async (error: any): Promise<void> => {
           DyFM_Log.warn(`globalErrorHandler not set! (set in app.getGlobalServiceCollection)`);
 
-          if (DyNTS_globalSettings.logDetailedErrors) {
-            DyFM_Log.error(`ERROR:\n`, error);
+          if (DyNTS_global_settings.log_settings.detailedErrors) {
+            if (DyNTS_global_settings.log_settings.highDetailedLogs) {
+              DyFM_Log.H_error(`ERROR:\n`, error);
+            } else {
+              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 (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}`
+            );
           }
         });
     } catch (error) {

package/src/_services/route/routing-module.service.ts

@@ -1,9 +1,11 @@
 
 import { Router } from 'express';
 
-import { DyFM_AnyError, DyFM_Error, DyFM_ErrorLevel, DyFM_Error_Settings, DyFM_Log } from '@futdevpro/fsm-dynamo';
+import { 
+  DyFM_AnyError, DyFM_Error, DyFM_ErrorLevel, DyFM_Error_Settings, DyFM_Log 
+} from '@futdevpro/fsm-dynamo';
 
-import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DyNTS_Controller } from './controller.service';
@@ -69,7 +71,9 @@ export class DyNTS_RoutingModule {
   openRouter: Router = Router();
   secureRouter: Router = Router();
 
-  protected log: boolean = DyNTS_globalSettings.logSetup;
+  get logSetup(): boolean {
+    return DyNTS_global_settings.log_settings.setup;
+  }
 
   defaultErrorUserMsg = 
     `We encountered an uncaught BackEnd Build Error, ` +
@@ -80,12 +84,12 @@ export class DyNTS_RoutingModule {
   ){
     try {
       /* this.serviceName = set.route.replace('/', '') + 'RoutingModule'; */
-      this.route = DyNTS_globalSettings.baseUrl + set.route;
+      this.route = DyNTS_global_settings.baseUrl + set.route;
       this.controllers = set.controllers ?? [];
       this.setupRoutes();
       this.mountRoutes(set.securityOverride);
 
-      if (this.log) console.log(
+      if (this.logSetup) console.log(
         `routing module setup done: ${this.route} security: ${this.security}\n`
       );
     } catch (error) {
@@ -149,7 +153,7 @@ export class DyNTS_RoutingModule {
         }
       }
 
-      if (this.log) console.log(
+      if (this.logSetup) console.log(
         `endpoint mount (${endpoint.security}): ${this.route}${endpoint.endpoint}`
       );
       const existingEndPoints: DyNTS_Endpoint_Params[] = this.endpoints.filter(

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';
@@ -36,8 +37,7 @@ import {
 import { 
   DyNTS_AppSystemControls 
 } from '../../_models/control-models/app-system-controls.control-model';
-import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
-
+import { DyNTS_global_settings } from '../../_collections/global-settings.const';
 
 /**
  * This will be the MAIN service of our server project,
@@ -198,8 +198,6 @@ import { DyNTS_globalSettings } from '../../_collections/global-settings.const';
  */
 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/shared.static-service.ts

@@ -3,7 +3,8 @@ import * as ReadLine from 'readline';
 import * as GeoIp from 'geoip-lite';
 import { Request } from 'express';
 
-import { DyFM_GeoIpLocation, DyFM_Shared } from '@futdevpro/fsm-dynamo/shared-service';
+import { DyFM_Shared } from '@futdevpro/fsm-dynamo';
+import { DyFM_GeoIpLocation } from '@futdevpro/fsm-dynamo/location';
 
 /**
  * 

package/src/index.ts

@@ -1,5 +1,5 @@
 
-// collections
+// COLLECTIONS
 export * from './_collections/global-settings.const';
 
 
@@ -7,7 +7,6 @@ export * from './_collections/global-settings.const';
 export * from './_enums/data-model-type.enum';
 export * from './_enums/data-service-function.enum';
 export * from './_enums/route-security.enum';
-export * from './_enums/socket-security.enum';
 export * from './_enums/predefined-data-types.enum';
 
 // enums/HTTP
@@ -28,33 +27,12 @@ export * from './_models/control-models/api-call-params.control-model';
 export * from './_models/control-models/app-params.control-model';
 export * from './_models/control-models/http-settings.control-model';
 export * from './_models/control-models/endpoint-params.control-model';
-export * from './_models/control-models/socket-client-service-params.control-model';
-export * from './_models/control-models/socket-event.control-model';
-
-// these are using socket.io therefore they are not included in the service index
-// export * from './socket-server-service-params.control-model';
-// export * from './socket-presence.control-model';
 
 // models/TYPES
 export * from './_models/types/db-filter.type';
 export * from './_models/types/db-update.type';
 
 
-// MODULES
-/* export * from './_modules/test/index'; */
-// TEST MODULE
-/* export * from './test.controller';
-export * from './get-test-routing-module.util';
-export * from '@futdevpro/fsm-dynamo/test-module'; */
-
-/* export * from './_modules/usage/index'; */
-// USAGE MODULE
-/* export * from './usage.controller';
-export * from './usage.data-service';
-export * from './get-usage-routing-module.util';
-export * from '@futdevpro/fsm-dynamo/usage-module'; */
-
-
 // SERVICES
 export * from './_services/core/api.service';
 export * from './_services/server/app.server';
@@ -70,10 +48,6 @@ export * from './_services/core/service-collection.service';
 export * from './_services/shared.static-service';
 export * from './_services/base/singleton.service';
 
-// these are using socket.io therefore they are not included in the service index
-// export * from './app-extended.server';
-// export * from './socket-client.service';
-// export * from './socket-server.service';
 
 
 

package/tsconfig.json

@@ -14,6 +14,7 @@
     "declarationMap": true,
     "sourceMap": true,
     "outDir": "./build",
+    "rootDir": "./src",
     "importHelpers": true,
     "moduleResolution": "node",
     "esModuleInterop": true,

package/build/_enums/socket-security.enum.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket-security.enum.d.ts","sourceRoot":"","sources":["../../src/_enums/socket-security.enum.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AACH,oBAAY,oBAAoB;IAC9B,IAAI,SAAS;IACb,MAAM,WAAW;CAClB"}

package/build/_enums/socket-security.enum.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket-security.enum.js","sourceRoot":"","sources":["../../src/_enums/socket-security.enum.ts"],"names":[],"mappings":";;;AACA;;;;;GAKG;AACH,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,yCAAiB,CAAA;AACnB,CAAC,EAHW,oBAAoB,oCAApB,oBAAoB,QAG/B"}

package/build/_models/control-models/socket-client-service-params.control-model.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket-client-service-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/socket-client-service-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAI7C;;GAEG;AACH,qBAAa,gCAAgC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAe;IACtC,SAAS,CAAC,EAAE,OAAO,CAAQ;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAGxE,GAAG,EAAE,gCAAgC;CAUxC"}

package/build/_models/control-models/socket-client-service-params.control-model.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket-client-service-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-client-service-params.control-model.ts"],"names":[],"mappings":";;;AAGA,sDAA+C;AAE/C;;GAEG;AACH,MAAa,gCAAgC;IAC3C,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,OAAO,GAAY,gBAAgB,CAAC;IACpC,IAAI,CAAS;IACb,cAAc,GAAY,mBAAM,GAAG,EAAE,CAAC;IACtC,SAAS,GAAa,IAAI,CAAC;IAC3B,aAAa,CAA6D;IAE1E,YACE,GAAqC;QAErC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QAEvC,IAAI,IAAI,CAAC,aAAa,EAAE,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC;YACxE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACzB,CAAC;IACH,CAAC;CACF;AApBD,4EAoBC"}

package/build/_models/control-models/socket-event.control-model.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket-event.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/socket-event.control-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAGhF,MAAM,MAAM,+BAA+B,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,IAC1D,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAC/C,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvF;;GAEG;AACH,qBAAa,iBAAiB,CAAC,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,oBAAoB,GAAG,MAAM,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,aAAa,CAAC,EAAE,+BAA+B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;IAC5D,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;WAGG;QACH,QAAQ,EAAE,oBAAoB,GAAG,MAAM,CAAC;QACxC;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB;;;;;WAKG;QACH,aAAa,CAAC,EAAE,+BAA+B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;QAC5D;;WAEG;QACH,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;WAEG;QACH,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B;IAsCH;;;OAGG;YACW,SAAS;IAevB;;;OAGG;IACG,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBrE"}

package/build/_models/control-models/socket-event.control-model.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"socket-event.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/socket-event.control-model.ts"],"names":[],"mappings":";;;AACA,sDAA6D;AAC7D,oFAAgF;AAChF,qFAAgF;AAOhF;;GAEG;AACH,MAAa,iBAAiB;IAC5B,UAAU,CAAU;IACpB,QAAQ,CAAgC;IACxC,WAAW,CAAU;IAErB,aAAa,CAA+C;IAC5D,KAAK,CAA8B;IAEnC,QAAQ,CAAW;IACnB,eAAe,CAAW;IAE1B,YACE,GAkCC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;YAC3C,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,sBAAsB,CAAC;YAE7D,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;YAC7C,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;YAE7B,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC/B,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;YAC/B,CAAC;iBAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,6CAAoB,CAAC,SAAS,EAAE,CAAC;gBAC5D,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACxB,CAAC;iBAAM,IACJ;gBACC,6CAAoB,CAAC,UAAU;gBAC/B,6CAAoB,CAAC,OAAO;gBAC5B,6CAAoB,CAAC,UAAU;aACnB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EACtC,CAAC;gBACD,IAAI,CAAC,QAAQ,GAAG,4CAAoB,CAAC,mBAAmB;oBACtD,4CAAoB,CAAC,iBAAiB,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,GAAG,4CAAoB,CAAC,iBAAiB,CAAC;YACzD,CAAC;YACD,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC;gBACxD,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,4CAAoB,CAAC,qBAAqB,CAAC;QACrE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qBAAQ,CAAC,KAAK,CACZ,uCAAuC,IAAI,CAAC,WAAW,MAAM,GAAG,CAAC,QAAQ,EAAE,EAC3E,KAAK,CACN,CAAC;YAEF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,SAAS,CAAC,OAAU,EAAE,MAAe;QACjD,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,QAAQ,KAAK,6CAAoB,CAAC,UAAU,EAAE,CAAC;gBAC9E,qBAAQ,CAAC,GAAG,CACV,0BAA0B,IAAI,CAAC,WAAW,YAAY,IAAI,CAAC,QAAQ;qBACxD,EAAE,OAAO,CACrB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,qBAAQ,CAAC,GAAG,CAAC,0BAA0B,IAAI,CAAC,WAAW,YAAY,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qBAAQ,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,WAAW,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iBAAiB,CAAC,OAAW,EAAE,MAAe;QAClD,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC1C,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxC,CAAC;YAED,MAAM,uBAAU,CAAC,YAAY,CAC3B,IAAI,CAAC,aAAa,EAClB,KAAK,EAAE,UAAqD,EAAE,EAAE;gBAC9D,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC,CACF,CAAC;YAEF,MAAM,uBAAU,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAA8B,EAAE,EAAE;gBACjF,MAAM,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qBAAQ,CAAC,KAAK,CACZ,2CAA2C,IAAI,CAAC,WAAW,SAAS,IAAI,CAAC,QAAQ,GAAG,EACpF,KAAK,EACL,UAAU,EACV,OAAO,CACR,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AApID,8CAoIC"}