@futdevpro/nts-dynamo 1.9.32 → 1.9.33

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

@@ -171,7 +171,7 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
           });
         }
 
-        content = this.compileTemplateComponent(
+        content = await this.compileTemplateComponent(
           set.templateComponentName, 
           set.templateProperties, 
           issuer
@@ -217,11 +217,11 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
     }
   }
 
-  private compileTemplateComponent<T>(
+  private async compileTemplateComponent<T>(
     componentName: string, 
     componentProperties:T, 
     issuer: string
-  ): string {
+  ): Promise<string> {
     try {
       if (!this.componentsByName[componentName]) {
         throw new DyFM_Error({
@@ -233,7 +233,7 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
 
           errorCode: 'NTS-ES0-SC1',
           additionalContent: {
-            availableComponenets: Object.keys(this.componentsByName),
+            availableComponents: Object.keys(this.componentsByName),
           },
         });
       }
@@ -242,20 +242,23 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
       let template: string = this.compileHTMLMainFrame(component);
 
       template = template.replace('<nts-content>', '');
-      template = this.compileComponentProperties<T>(
+      template = await this.compileComponentProperties<T>(
         component, 
         componentProperties, 
         template, 
         issuer
       );
 
-      component.subComponentSelectors.forEach((subComponentSelector: string): void => {
-        while (template.includes(`<nts-${subComponentSelector}`)) {
-          template = this.compileSubComponent<T>(
-            subComponentSelector, componentProperties, template, issuer
-          );
+      await DyFM_Array.asyncForEach(
+        component.subComponentSelectors,
+        async (subComponentSelector: string): Promise<void> => {
+          while (template.includes(`<nts-${subComponentSelector}`)) {
+            template = await this.compileSubComponent<T>(
+              subComponentSelector, componentProperties, template, issuer
+            );
+          }
         }
-      });
+      );
 
       template = this.templateTrim(template);
       
@@ -325,9 +328,9 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
 
   /** trims all rows and remove everything between /*...*\/  */
   private styleTrim(style: string): string {
-    let result: string = style.split('\n').map((row: string): string => row.trim()).join('');
+    let result: string = style?.split('\n').map((row: string): string => row.trim()).join('');
 
-    while (result.includes('/*')) {
+    while (result?.includes('/*')) {
       const start = result.indexOf('/*');
       const end = result.indexOf('*/', start) + 2;
 
@@ -358,44 +361,53 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
     return b / 1024;
   }
 
-  private compileComponentProperties<T>(
+  private async compileComponentProperties<T>(
     component: DyNTS_EmailTemplateComponent, 
     componentProperties: T, 
     template: string, 
     issuer: string
-  ): string {
-    component.properties.forEach((propertyKey: string): void => {
-      if (!componentProperties[propertyKey]) {
-        throw new DyFM_Error({
-          ...this._getDefaultErrorSettings(
-            'setupComponent',
-            new Error(
-              `ComponentProperty missing from input! '${propertyKey}' for ${component.name}`
+  ): Promise<string> {
+    try {
+      component.properties.forEach((propertyKey: string): void => {
+        if (!componentProperties[propertyKey]) {
+          throw new DyFM_Error({
+            ...this._getDefaultErrorSettings(
+              'setupComponent',
+              new Error(
+                `ComponentProperty missing from input! '${propertyKey}' for ${component.name}`
+              ),
+              issuer
             ),
-            issuer
-          ),
 
-          errorCode: 'NTS-ES0-SC4',
-          additionalContent: {
-            componentProperties: Object.keys(componentProperties),
-          },
-        });
-      }
+            errorCode: 'NTS-ES0-SC4',
+            additionalContent: {
+              componentProperties: Object.keys(componentProperties),
+            },
+          });
+        }
 
-      const propReg = new RegExp(`{{${propertyKey}}}`, 'g');
+        const propReg = new RegExp(`{{${propertyKey}}}`, 'g');
 
-      template = template.replace(propReg, componentProperties[propertyKey]);
-    });
+        template = template.replace(propReg, componentProperties[propertyKey]);
+      });
 
-    return template;
+      return template;
+    } catch (error) {
+      throw new DyFM_Error({
+        ...this._getDefaultErrorSettings('setupComponent', error, issuer),
+
+        errorCode: 'NTS-ES0-SC3',
+      });
+    }
   }
 
-  private compileSubComponent<T>(
+  private async compileSubComponent<T>(
     subComponentSelector: string, 
     componentProperties: T,
     template: string,
     issuer: string
-  ): string {
+  ): Promise<string> {
+
     const subComponent: DyNTS_EmailTemplateComponent = 
       this.componentsBySelector[subComponentSelector];
 
@@ -428,7 +440,7 @@ export class DyNTS_EmailService /* extends DyNTS_SingletonService */ {
     const contentReg = new RegExp(`<nts-content>`, 'g');
 
     subComponentTemplate = subComponentTemplate.replace(contentReg, componentContent);
-    subComponentTemplate = this.compileComponentProperties<T>(
+    subComponentTemplate = await this.compileComponentProperties<T>(
       subComponent, 
       componentProperties, 
       subComponentTemplate, 

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

@@ -9,6 +9,7 @@ import {
 import { DyNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 
 import { 
+  DyNTS_GlobalErrorHandlerFn,
   DyNTS_GlobalService_Settings 
 } from '../../_models/interfaces/global-service-settings.interface';
 
@@ -62,14 +63,32 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
   static async setServices(set: DyNTS_GlobalService_Settings): Promise<void> {
     this.getInstance();
 
+    try {
+      await this.setDBServices(set?.dbModels);
+
+      await this.setAuthService(set?.authService);
+
+      await this.setEmailServices(set?.emailServiceCollection);
+
+      await this.setErrorHandler(set?.errorHandler);
+    } catch (error) {
+      throw new DyFM_Error({
+        message: `Failed to setServices on DyNTS_GlobalService.`,
+        error: error,
+        errorCode: 'NTS-GS0-SS0',
+      });
+    }
+  }
+
+  private static async setDBServices(dbModels?: DyFM_DataModel_Params[]): Promise<void> {    
     try {
       this.instance.dbServiceCollection = {};
-      set.dbModels?.forEach((dbModel: DyFM_DataModel_Params): void => {
+      dbModels?.forEach((dbModel: DyFM_DataModel_Params): void => {
         if (!dbModel.constructed) {
           throw new DyFM_Error({
             message: `DyNTS_GlobalService.setServices failed, ` +
               `ERROR: dbModel is not constructed!`,
-            errorCode: 'NTS-GS0-SS1',
+            errorCode: 'NTS-GS0-SDBS1',
             additionalContent: {
               dbModel: dbModel,
             },
@@ -91,14 +110,36 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
           });
         }
       });
+    } catch (error) {
+      throw new DyFM_Error({
+        message: `Failed to set dbServiceCollections on DyNTS_GlobalService.`,
+        error: error,
+        errorCode: 'NTS-GS0-SDBS0',
+      });
+    }
+  }
 
-      if (!set.authService) {
+  private static async setAuthService(authService?: DyNTS_AuthService): Promise<void> {
+    try {
+      if (!authService) {
         DyFM_Log.warn(`Authentication Service missing!`);
       } else {
-        this.instance.authService = set.authService;
+        this.instance.authService = authService;
       }
+    } catch (error) {
+      throw new DyFM_Error({
+        message: `Failed to set authService on DyNTS_GlobalService.`,
+        error: error,
+        errorCode: 'NTS-GS0-SAS0',
+      });
+    }
+  }
 
-      this.instance.emailServiceCollection = set.emailServiceCollection ?? {};
+  private static async setEmailServices(
+    emailServiceCollection?: DyNTS_Service_Collection<DyNTS_EmailService>
+  ): Promise<void> {    
+    try {
+      this.instance.emailServiceCollection = emailServiceCollection ?? {};
       await DyFM_Array.asyncForEach(
         Object.keys(this.instance.emailServiceCollection),
         async (key: string): Promise<void> => {
@@ -107,34 +148,51 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
           ).asyncPostConstruct();
         }
       );
-      
+    } catch (error) {
+      throw new DyFM_Error({
+        message: `Failed to set emailServiceCollections on DyNTS_GlobalService.`,
+        error: error,
+        errorCode: 'NTS-GS0-SS4',
+      });
+    }
+  }
+
+  private static async setErrorHandler(errorHandler?: DyNTS_GlobalErrorHandlerFn): Promise<void> {
+    try {
       DyNTS_GlobalService.globalErrorHandler = 
-        set.errorHandler ?? 
+        errorHandler ?? 
         (async (error: any): Promise<void> => {
-          DyFM_Log.warn(
-            `globalErrorHandler not set! (set in app.getGlobalServiceCollection)`,
-            '\nwill use default-logging',
-          );
-
-          if (
-            DyNTS_global_settings.log_settings.highDetailedLogs ||
-            !(error instanceof DyFM_Error)
-          ) {
-            DyFM_Log.H_error(
-              `Error caught by globalErrorHandler.`,
-              `\n    ERROR:`, error
+          try {
+            DyFM_Log.warn(
+              `globalErrorHandler not set! (set in app.getGlobalServiceCollection)`,
+              '\nwill use default-logging',
             );
-          } else {
-            error.logSimple(
-              `Error caught by globalErrorHandler.`
+  
+            if (
+              DyNTS_global_settings.log_settings.highDetailedLogs ||
+              !(error instanceof DyFM_Error)
+            ) {
+              DyFM_Log.H_error(
+                `Error caught by globalErrorHandler.`,
+                `\n    ERROR:`, error
+              );
+            } else {
+              error.logSimple(
+                `Error caught by globalErrorHandler.`
+              );
+            }
+          } catch (error) {
+            DyFM_Log.error(
+              `NTS GLOBAL MULTILEVEL ERROR: \nFailed to handle error on globalErrorHandler.`,
+              error
             );
           }
         });
     } catch (error) {
       throw new DyFM_Error({
-        message: `Failed to setServices on DyNTS_GlobalService.`,
+        message: `Failed to set errorHandler on DyNTS_GlobalService.`,
         error: error,
-        errorCode: 'NTS-GS0-SS0',
+        errorCode: 'NTS-GS0-SEH0',
       });
     }
   }