@futdevpro/nts-dynamo 1.5.55 → 1.5.58

package/src/_services/dynamo-nts-app.ts

@@ -6,12 +6,12 @@ import * as Https from 'https';
 import * as FileSystem from 'fs';
 import * as BodyParser from 'body-parser';
 
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
 import { DynamoNTS_RoutingModule } from './dynamo-nts-routing-module.service';
 import { DynamoNTS_EndpointParams } from '../_models/dynamo-nts-endpoint-params';
 import { dynamoNTS_GlobalSettings } from '../_constants';
+import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 /**
  * This will be the MAIN service of our server project,
@@ -27,10 +27,10 @@ import { dynamoNTS_GlobalSettings } from '../_constants';
  *   
  *   ...
  *   
- * // Setting up App params, and preparing project global settings
+ *   // Setting up App params, and preparing project global settings
  *   setupAppParams(): void {
  *     this.params = new DynamoNTS_AppParams({
- *       name: 'Warbots Distribution Server',
+ *       name: 'Warbots Server',
  *       title: warbotsTitleLog,
  *       version: version,
  *       dbName: 'warbots',
@@ -125,15 +125,36 @@ import { dynamoNTS_GlobalSettings } from '../_constants';
  */
 export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
 
+  /**
+   * Setup this in the setupAppParams(), which will be called first in the constuctor
+   * 
+   * @example
+   * 
+   * this.params = new DynamoNTS_AppParams({
+   *   name: 'Warbots Server',
+   *   title: warbotsTitleLog,
+   *   version: version,
+   *   dbName: 'warbots',
+   * });
+   */
   protected params: DynamoNTS_AppParams;
   
   protected mongoose = Mongoose;
 
   protected security: DynamoNTS_RouteSecurity;
 
+  /**
+   * setup this in the setupRoutingModules()
+   */
   protected httpPort?: number;
+  /**
+   * setup this in the setupRoutingModules()
+   */
   protected httpsPort?: number;
 
+  /**
+   * setup this in the setupRoutingModules()
+   */
   protected cert?: {
     keyPath: FileSystem.PathLike,
     certPath: FileSystem.PathLike,
@@ -143,9 +164,15 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private secureExpress: Express.Application;
   protected httpsServer: Https.Server;
 
+  /**
+   * setup this in the setupRoutingModules()
+   */
   protected routingModules: DynamoNTS_RoutingModule[];
 
-  protected log: boolean;
+  /**
+   * setting this value to true, enables this service debug logs
+   */
+  protected debugLog: boolean;
 
   constructor(){
     super();
@@ -158,7 +185,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
       this.startDB();
 
       this.setGlobalServiceCollection();
-      this.log = dynamoNTS_GlobalSettings.logSetup;
+      this.debugLog = dynamoNTS_GlobalSettings.logSetup;
 
       this.setupRoutingModules();
       this.setSecurity();
@@ -174,10 +201,10 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
           this.mountSecureRoutes();
         }
 
-        if (this.log) console.log(`\nRoutes mounted.... server using security: ${this.security}`);
+        if (this.debugLog) console.log(`\nRoutes mounted.... server using security: ${this.security}`);
       }
     } catch (error) {
-      DynamoNTS_Shared.logError('\nApplication start failed.\n', error);
+      Dynamo_Log.logError('\nApplication start failed.\n', error);
     }
   }
 
@@ -187,10 +214,10 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private startDB(): void {
     this.mongoose.connection
       .on('error', (error) => {
-        DynamoNTS_Shared.logError('\nUnable to connect to MongoDB server, ERROR: ', error);
+        Dynamo_Log.logError('\nUnable to connect to MongoDB server, ERROR: ', error);
       })
       .once('open', () => {
-        DynamoNTS_Shared.logSuccess('\nConnected to MongoDB\n');
+        Dynamo_Log.logSuccess('\nConnected to MongoDB\n');
       });
 
     this.mongoose.connect(
@@ -224,7 +251,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
             });
           }
         });
-        DynamoNTS_Shared.logError(errorMsg);
+        Dynamo_Log.logError(errorMsg);
 
         let error = new Error('Open routes cannot be established!');
         let errorStack: string[] = error.stack.split('\n');
@@ -261,7 +288,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
             });
           }
         });
-        DynamoNTS_Shared.logError(errorMsg);
+        Dynamo_Log.logError(errorMsg);
 
         let error = new Error('Secure routes cannot be established!');
         let errorStack: string[] = error.stack.split('\n');
@@ -307,30 +334,30 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
       if (this.security !== DynamoNTS_RouteSecurity.open) {
         this.httpsServer
           .listen(this.httpsPort, 'localhost', 0, () => {
-            DynamoNTS_Shared.logSuccess(`\nHTTPS (secure) server is listening on port ${this.httpsPort}\n`);
+            Dynamo_Log.logSuccess(`\nHTTPS (secure) server is listening on port ${this.httpsPort}\n`);
           })
           .on('error', (error) => {
-            DynamoNTS_Shared.logError(`\nHTTPS (secure) server ERROR`, error);
+            Dynamo_Log.logError(`\nHTTPS (secure) server ERROR`, error);
           })
           .on('uncaughtException', (ex) => {
-            DynamoNTS_Shared.logWarning(`\nHTTPS (secure) server uncaughtException`, ex);
+            Dynamo_Log.logWarning(`\nHTTPS (secure) server uncaughtException`, ex);
           });
       }
 
       if (this.security !== DynamoNTS_RouteSecurity.secure) {
         this.openExpress
           .listen(this.httpPort, () => {
-            DynamoNTS_Shared.logSuccess(`\nHTTP  (-open-) server is listening on port ${this.httpPort}\n`);
+            Dynamo_Log.logSuccess(`\nHTTP  (-open-) server is listening on port ${this.httpPort}\n`);
           })
           .on('error', (error) => {
-            DynamoNTS_Shared.logError(`\nHTTP  (-open-) server ERROR`, error);
+            Dynamo_Log.logError(`\nHTTP  (-open-) server ERROR`, error);
           })
           .on('uncaughtException', (ex) => {
-            DynamoNTS_Shared.logWarning(`\nHTTP  (-open-) server uncaughtException`, ex);
+            Dynamo_Log.logWarning(`\nHTTP  (-open-) server uncaughtException`, ex);
           });
       }
     } catch (error) {
-      DynamoNTS_Shared.logError(`startExpresses failed...`, error);
+      Dynamo_Log.logError(`startExpresses failed...`, error);
     }
   }
 
@@ -340,7 +367,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private mountSecureRoutes (): void {
     this.routingModules.forEach((module: DynamoNTS_RoutingModule) => {
       if (module.security !== DynamoNTS_RouteSecurity.open) {
-        if (this.log) console.log(`route mount (secure): ${module.route}`);
+        if (this.debugLog) console.log(`route mount (secure): ${module.route}`);
         const existingRoutes: DynamoNTS_RoutingModule[] = this.routingModules.filter(
             (mod: DynamoNTS_RoutingModule) => mod.route === module.route);
         if (1 < existingRoutes.length) {
@@ -362,7 +389,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private mountOpenRoutes (): void {
     this.routingModules.forEach((module: DynamoNTS_RoutingModule) => {
       if (module.security !== DynamoNTS_RouteSecurity.secure) {
-        if (this.log) console.log(`route mount (open): ${module.route}`);
+        if (this.debugLog) console.log(`route mount (open): ${module.route}`);
         const existingRoutes: DynamoNTS_RoutingModule[] = this.routingModules.filter(
             (mod: DynamoNTS_RoutingModule) => mod.route === module.route);
         if (1 < existingRoutes.length) {

package/src/_services/dynamo-nts-auth.service.ts

@@ -65,7 +65,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *     let token = AuthService.getTokenFromRequest(req);
    *     token = await AuthService.verifyToken(token);
    * 
-   *     DynamoNTS_Shared.logSuccess('token authenticated');
+   *     Dynamo_Log.logSuccess('token authenticated');
    *     res.setHeader('authorization', `Bearer ${token}`);
    *     next();
    *   } catch (error) {
@@ -76,7 +76,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *       userMessage: `Authorization failed.`, 
    *       error 
    *     });
-   *     DynamoNTS_Shared.logError(error?.message, error);
+   *     Dynamo_Log.logError(error?.message, error);
    * 
    *     res.status(error.status);
    *     res.send(error);
@@ -99,7 +99,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *   try {
    *     let token = AuthService.getTokenFromRequest(req);
    *     token = await AuthService.verifyTokenSelf(token, req?.params?.userId);
-   *     DynamoNTS_Shared.logSuccess('selftoken authenticated');
+   *     Dynamo_Log.logSuccess('selftoken authenticated');
    * 
    *     res.setHeader('authorization', `Bearer ${token}`);
    *     next();
@@ -111,7 +111,7 @@ export abstract class DynamoNTS_AuthService extends DynamoNTS_SingletonService {
    *       userMessage: `Authorization failed.`, 
    *       error 
    *     });
-   *     DynamoNTS_Shared.logError(error?.message, error);
+   *     Dynamo_Log.logError(error?.message, error);
    * 
    *     res.status(error.status);
    *     res.send(error);

package/src/_services/dynamo-nts-controller.service.ts

@@ -1,7 +1,7 @@
 
 
+import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_EndpointParams } from '../_models/dynamo-nts-endpoint-params';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 
 /**
@@ -46,6 +46,33 @@ import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
  */
 export abstract class DynamoNTS_Controller extends DynamoNTS_SingletonService {
 
+  /**
+   * setup this in the setupEndpoints(), which will be called on the construcion
+   * 
+   * @example
+   * 
+   * this.endpoints = [
+   *   new DynamoNTS_EndpointParams({
+   *     name: 'getUserMatchStatistics',
+   *     type: HttpCallType.get,
+   *     endpoint: '/get/user-match-statistics/:userId',
+   *     preProcessess: [ this.authService.authenticateTokenSelf ],
+   *     tasks: [ 
+   *       async (req: Request, res: Response) => {
+   *         const userMatchStatistics = new UserMatchStatisticsService({ 
+   *           data: { userId: req.params.userId }
+   *         });
+   * 
+   *         await userMatchStatistics.getDataByDependencyId();
+   *         
+   *         res.send(
+   *           userMatchStatistics.data
+   *         );
+   *       }
+   *     ]
+   *   }),
+   * ];
+   */
   endpoints: DynamoNTS_EndpointParams[];
 
   protected constructor(){
@@ -54,12 +81,40 @@ export abstract class DynamoNTS_Controller extends DynamoNTS_SingletonService {
     try {
       this.setupEndpoints();
     } catch (error) {
-      DynamoNTS_Shared.logError(`DynamoBEController ERROR setup failed:`, error);
+      Dynamo_Log.logError(`DynamoBEController ERROR setup failed:`, error);
     }
   }
 
   /**
    * You must setup endpoints and required services in this function
+   * 
+   * @example
+   * 
+   * setupEndpoints(): void {
+   *   this.authService = AuthService.getInstance();
+   *
+   *   this.endpoints = [
+   *     new DynamoNTS_EndpointParams({
+   *       name: 'getUserMatchStatistics',
+   *       type: HttpCallType.get,
+   *       endpoint: '/get/user-match-statistics/:userId',
+   *       preProcessess: [ this.authService.authenticateTokenSelf ],
+   *       tasks: [ 
+   *         async (req: Request, res: Response) => {
+   *           const userMatchStatistics = new UserMatchStatisticsService({ 
+   *             data: { userId: req.params.userId }
+   *           });
+   *
+   *           await userMatchStatistics.getDataByDependencyId();
+   *             
+   *           res.send(
+   *             userMatchStatistics.data
+   *           );
+   *         }
+   *       ]
+   *     }),
+   *   ];
+   * }
    */
   abstract setupEndpoints(): void
 }

package/src/_services/dynamo-nts-data.service.ts

@@ -1,9 +1,8 @@
 
-import { Dynamo_Metadata, DynamoNTS_DataParams, DynamoNTS_DataPropertyParams, Dynamo_Error, Dynamo_Shared } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Metadata, DynamoNTS_DataParams, DynamoNTS_DataPropertyParams, Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_DBService } from './dynamo-nts-db.service';
 import { DynamoNTS_GlobalService } from './dynamo-nts-global.service';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 
 /**
  * Basic Data Service that is connected to the relevant DBServices
@@ -40,8 +39,17 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
   defaultValidationErrorUserMsg = `We encountered an unhandled Validation Error, please contact the responsible development team.`; 
 
   constructor(
+    /**
+     * Initial data, this will be used by functions on default
+     */
     data: T,
+    /**
+     * DB data prams will be used to connect to usable dbService on GlobalService
+     */
     dataParams: DynamoNTS_DataParams,
+    /**
+     * Initial set for issuer to be able to follow the issuer's activity
+     */
     issuer: string,
   ) {
     this.dataDBService = DynamoNTS_GlobalService.getDBService<T>(dataParams);
@@ -58,7 +66,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataListExists: T[] = await this.dataDBService.getAll().catch(error => {
         if (error?.errorCodes?.includes('NTS-DBS-GA1')) {
-          Dynamo_Shared.logWarning(`getAll ${this.dataParams.dataName} didn't found any.`);
+          Dynamo_Log.logWarning(`getAll ${this.dataParams.dataName} didn't found any.`);
           return [];
         } else {
           throw error;
@@ -110,7 +118,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       const dataExists: T = await this.dataDBService.getDataById(id ?? this.data._id).catch(error => {
         if (error?.errorCodes?.includes('NTS-DBS-GI1')) {
-          Dynamo_Shared.logWarning(`getDataById ${this.dataParams.dataName} (${id ?? this.data._id}) didn't found any.`);
+          Dynamo_Log.logWarning(`getDataById ${this.dataParams.dataName} (${id ?? this.data._id}) didn't found any.`);
           return null;
         } else {
           throw error;
@@ -165,7 +173,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       const dataExists: T = await this.dataDBService.getDataByDependencyId(dependencyId ?? this.data[this.depKey]).catch(error => {
         if (error?.errorCodes?.includes('NTS-DBS-GD2')) {
-          Dynamo_Shared.logWarning(`getDataByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
+          Dynamo_Log.logWarning(`getDataByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
           return null;
         } else {
           throw error;
@@ -220,7 +228,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       const dataListExists: T[] = await this.dataDBService.getDataListByDependencyId(dependencyId ?? this.data[this.depKey]).catch(error => {
         if (error?.errorCodes?.includes('NTS-DBS-GLD2')) {
-          Dynamo_Shared.logWarning(`getDataListByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
+          Dynamo_Log.logWarning(`getDataListByDependencyId ${this.dataParams.dataName} (${this.depKey}: ${dependencyId ?? this.data[this.depKey]}) didn't found any.`);
           return [];
         } else {
           throw error;
@@ -281,7 +289,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataExists: T = await this.dataDBService.findOne(findBy).catch(error => {
         if (error?.errorCodes?.includes('NTS-DBS-FO1')) {
-          Dynamo_Shared.logWarning(`findData ${this.dataParams.dataName} didn't found any.`);
+          Dynamo_Log.logWarning(`findData ${this.dataParams.dataName} didn't found any.`);
           return null;
         } else {
           throw error;
@@ -338,7 +346,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     try {
       const dataListExists: T[] = await this.dataDBService.find(findBy).catch(error => {
         if (error?.errorCodes?.includes('NTS-DBS-F1')) {
-          Dynamo_Shared.logWarning(`findDatas ${this.dataParams.dataName} didn't found any.`);
+          Dynamo_Log.logWarning(`findDatas ${this.dataParams.dataName} didn't found any.`);
           return [];
         } else {
           throw error;

package/src/_services/dynamo-nts-email.service.ts

@@ -3,9 +3,7 @@ import * as FileSystem from 'fs';
 import * as Path from 'path';
 import * as NodeMailer from 'nodemailer';
 import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
-import { Dynamo_Error } from '@futdevpro/fsm-dynamo';
-
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
+import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 /**
  * 
@@ -57,7 +55,7 @@ export class DynamoNTS_EmailService {
         this.constructionFinished();
       }
     } catch (error) {
-      DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR, The emailService construction failed for ${set.email}.`, new Error());
+      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, The emailService construction failed for ${set.email}.`, new Error());
     }
   }
 
@@ -65,7 +63,7 @@ export class DynamoNTS_EmailService {
    * 
    */
   private constructionFinished(): void { 
-    DynamoNTS_Shared.logSuccess(`\nEmailService construction (${this.senderName}) Finished!\n`) 
+    Dynamo_Log.logSuccess(`\nEmailService construction (${this.senderName}) Finished!\n`) 
   }
 
   /**
@@ -87,15 +85,25 @@ export class DynamoNTS_EmailService {
 
       if (set.content) {
         content = set.content
-      } else if (set.useTemplate) {
-        if (!this.templates[set.useTemplate]) {
+      } else {
+        if (!set.useTemplate) {
           throw new Dynamo_Error({ 
             errorCode: 'NTS-ES4-101',
             addECToUserMsg: true,
+            message: 'No content setting passsed to emailSending!',
+            userMessage: this.defaultErrorUserMsg,
+          });
+        }
+
+        if (!this.templates[set.useTemplate]) {
+          throw new Dynamo_Error({ 
+            errorCode: 'NTS-ES4-102',
+            addECToUserMsg: true,
             message: `No email template found with this parameter! (${set.useTemplate})`,
             userMessage: this.defaultErrorUserMsg
           });
         }
+
         content = this.templates[set.useTemplate];
 
         if (0 < this.templatePropertyKeys[set.useTemplate].length) {
@@ -104,9 +112,10 @@ export class DynamoNTS_EmailService {
             this.templatePropertyKeys[set.useTemplate].forEach((key: string, index: number) => {
               props += `${key}${index != this.templatePropertyKeys[set.useTemplate].length - 1 ? ', ' : ''}`;
             });
-            DynamoNTS_Shared.logError('\nDynamoBEEmailService ERROR: INVALID sendEmail settings', set);
+            Dynamo_Log.logError('\nDynamoBEEmailService ERROR: INVALID sendEmail settings', set);
+            
             throw new Dynamo_Error({ 
-              errorCode: 'NTS-ES4-102',
+              errorCode: 'NTS-ES4-103',
               addECToUserMsg: true,
               message: `TemplateProperties missing! properties needed: ${props}`,
               userMessage: this.defaultErrorUserMsg
@@ -114,19 +123,12 @@ export class DynamoNTS_EmailService {
           }
           this.templatePropertyKeys[set.useTemplate].forEach((propertyKey: string) => {
             if (!set.templateProperties[propertyKey]) {
-              DynamoNTS_Shared.logError(`TemplateProperty missing! (${propertyKey})`);
+              Dynamo_Log.logError(`TemplateProperty missing! (${propertyKey})`);
             }
             const reg = new RegExp(`{{${propertyKey}}}`, 'g')
             content = content.replace(reg, set.templateProperties[propertyKey]);
           });
         }
-      } else {
-        throw new Dynamo_Error({ 
-          errorCode: 'NTS-ES4-100',
-          addECToUserMsg: true,
-          message: 'No content setting passsed to emailSending!',
-          userMessage: this.defaultErrorUserMsg,
-        });
       }
 
       let mailOptions: MailOptions = {
@@ -148,8 +150,13 @@ export class DynamoNTS_EmailService {
         });
       });
     } catch (error) {
-      DynamoNTS_Shared.logError('\nDynamoBEEmailService ERROR: email sending error', error);
-      throw error;
+      throw new Dynamo_Error({ 
+        errorCode: 'NTS-ES4-100',
+        addECToUserMsg: true,
+        message: `SendEmail failed!`,
+        userMessage: this.defaultErrorUserMsg,
+        error
+      });
     }
   }
 
@@ -167,7 +174,7 @@ export class DynamoNTS_EmailService {
         templatePath = Path.join(rootPath, templatePath);
         FileSystem.readFile(templatePath, 'utf8' , (err, template) => {
           if (err) {
-            DynamoNTS_Shared.logError(`\nDynamoBEEmailService readFile ERROR (0), Couldn't load email template; ${templateName} from ${templatePath}\nerror:\n`, err, '\n');
+            Dynamo_Log.logError(`\nDynamoBEEmailService readFile ERROR (0), Couldn't load email template; ${templateName} from ${templatePath}\nerror:\n`, err, '\n');
             reject(err);
             return;
           } else {
@@ -183,7 +190,7 @@ export class DynamoNTS_EmailService {
         });
       });
     } catch (error) {
-      DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR (1), Couldn't load email template; ${templateName} from ${templatePath}`, new Error());
+      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR (1), Couldn't load email template; ${templateName} from ${templatePath}`, new Error());
     }
   }
 
@@ -197,9 +204,10 @@ export class DynamoNTS_EmailService {
       const propertyKeys: string[] = [];
       let propertyOpenTagIndex = template.indexOf('{{');
       let propertyCloseTagIndex = template.indexOf('}}', propertyOpenTagIndex + 2);
+
       while (propertyOpenTagIndex >= 0) {
         if (propertyCloseTagIndex === -1) {
-          DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR, missing closing tag from email template! (${propertyOpenTagIndex} -)`, propertyKeys);
+          Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, missing closing tag from email template! (${propertyOpenTagIndex} -)`, propertyKeys);
           throw new Dynamo_Error({ 
             errorCode: 'NTS-ES4-200',
             addECToUserMsg: true,
@@ -207,17 +215,19 @@ export class DynamoNTS_EmailService {
             userMessage: this.defaultErrorUserMsg
           });
         }
+
         const newKey: string = template.substring(propertyOpenTagIndex + 2, propertyCloseTagIndex);
         if (!propertyKeys.includes(newKey)) {
           propertyKeys.push(newKey);
         }
+
         propertyOpenTagIndex = template.indexOf('{{', propertyOpenTagIndex + 2);
         propertyCloseTagIndex = template.indexOf('}}', propertyOpenTagIndex + 2);
       }
       // console.log('\n\n\nTEST propertyKeys: ', propertyKeys);
       return propertyKeys;
     } catch (error) {
-      DynamoNTS_Shared.logError(`\nDynamoBEEmailService ERROR, getTemplatePropertyKeys ERROR`, new Error(), '\ntemplate:\n', template);
+      Dynamo_Log.logError(`\nDynamoBEEmailService ERROR, getTemplatePropertyKeys ERROR`, new Error(), '\ntemplate:\n', template);
     }
   }
 }

package/src/_services/dynamo-nts-global.service.ts

@@ -1,12 +1,11 @@
 
 
-import { Dynamo_Metadata, DynamoNTS_DataParams } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Metadata, DynamoNTS_DataParams, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_AuthService } from './dynamo-nts-auth.service';
 import { DynamoNTS_DBServiceCollection } from './dynamo-nts-db-service-collection.service';
 import { DynamoNTS_DBService } from './dynamo-nts-db.service';
 import { DynamoNTS_EmailServiceCollection } from './dynamo-nts-email-service-collection.service';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_SocketServiceCollection } from './dynamo-nts-socket-service-collection.service';
 import { DynamoNTS_SocketService } from './dynamo-nts-socket.service';
@@ -57,14 +56,14 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
         try {
           this.instance.dbServiceCollection[dbModel.dataName] = new DynamoNTS_DBService(dbModel);
         } catch (error) {
-          DynamoNTS_Shared.logError(`\nFailed to create DynamoBEDBService (${dbModel.dataName}).\n`, dbModel, `\n`, error);
+          Dynamo_Log.logError(`\nFailed to create DynamoBEDBService (${dbModel.dataName}).\n`, dbModel, `\n`, error);
         }
       });
 
       this.instance.authService = set.authService;
       this.instance.emailServiceCollection = set.emailServiceCollection;
     } catch (error) {
-      DynamoNTS_Shared.logError('\nsetServices failed on DBE_Global_S.\n', error);
+      Dynamo_Log.logError('\nsetServices failed on DBE_Global_S.\n', error);
     }
   }
 

package/src/_services/dynamo-nts-routing-module.service.ts

@@ -1,13 +1,12 @@
 
 import { Router } from 'express';
-import { Dynamo_Error } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { dynamoNTS_GlobalSettings } from '../_constants/dynamo-nts-global-settings';
 import { DynamoNTS_RouteSecurity } from '../_enums/dynamo-nts-route-security.enum';
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
 import { DynamoNTS_EndpointParams } from '../_models/dynamo-nts-endpoint-params';
 import { DynamoNTS_Controller } from './dynamo-nts-controller.service';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_RoutingModuleSettings } from '../_models/dynamo-nts-routing-module-settings';
 
 /**
@@ -78,7 +77,7 @@ export class DynamoNTS_RoutingModule {
 
       if (this.log) console.log(`routing module setup done: ${this.route} serurity: ${this.security}\n`);
     } catch (error) {
-      DynamoNTS_Shared.logError(`Routing module setup failed (${this.route})`, error);
+      Dynamo_Log.logError(`Routing module setup failed (${this.route})`, error);
     }
   }
 

package/src/_services/dynamo-nts-socket.service.ts

@@ -2,12 +2,11 @@
 import * as SocketIO from 'socket.io';
 
 import { dynamoNTS_GlobalSettings } from '../_constants/dynamo-nts-global-settings';
-import { DynamoNTS_Shared } from './dynamo-nts-shared.service';
 import { DynamoNTS_SingletonService } from './dynamo-nts-singleton.service';
 import { DynamoNTS_SocketEventParams } from '../_models/dynamo-nts-socket-event-params';
 import { DynamoNTS_SocketEvent } from '../_enums/http/socket-event.enum';
 import { DynamoNTS_GlobalService } from './dynamo-nts-global.service';
-import { Dynamo_Error } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_SocketServiceParams } from '../_models/dynamo-nts-socket-service-params';
 import { DynamoNTS_SocketDictionary } from '../_models/dynamo-nts-socket-dictionary';
 import { DynamoNTS_SocketSecurity } from '../_enums/dynamo-nts-socket-security.enum';
@@ -46,7 +45,7 @@ export abstract class DynamoNTS_SocketService<T extends DynamoNTS_SocketDictiona
 
       if (this.log) console.log(`Socket Controller setup done: ${this.params.name} (${this.params.port}) serurity: ${this.params.security}\n`);
     } catch (error) {
-      DynamoNTS_Shared.logError(`Socket Controller setup failed: ${this.params.name} (${this.params.port})`, error);
+      Dynamo_Log.logError(`Socket Controller setup failed: ${this.params.name} (${this.params.port})`, error);
     }
   }
 

package/src/version.json

@@ -1,2 +0,0 @@
-
-"v01.04.03"