@futdevpro/nts-dynamo 1.6.17 → 1.6.19

package/src/_services/{global.service.ts → core/global.service.ts}

@@ -1,17 +1,17 @@
 
 
-import { Dynamo_Metadata, Dynamo_DataParams, Dynamo_Log } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_AppParams } from '../_models/control-models/app-params.control-model';
+import { Dynamo_Metadata, Dynamo_DataParams, Dynamo_Log, Dynamo_Error } from '@futdevpro/fsm-dynamo';
+import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
 
-import { DynamoNTS_GlobalServiceSettings } from '../_models/interfaces/global-service-settings.interface';
+import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
 
 import { DynamoNTS_AuthService } from './auth.service';
 /* import { DynamoNTS_DBServiceCollection } from './db-service-collection.service'; */
-import { DynamoNTS_DBService } from './db.service';
+import { DynamoNTS_DBService } from '../base/db.service';
 import { DynamoNTS_EmailService } from './email.service';
 import { DynamoNTS_ServiceCollection } from './service-collection.service';
 /* import { DynamoNTS_EmailServiceCollection } from './email-service-collection.service'; */
-import { DynamoNTS_SingletonService } from './singleton.service';
+import { DynamoNTS_SingletonService } from '../base/singleton.service';
 
 /**
  * This is the main Global/Core Service Collection used by DynamoBE, 
@@ -38,7 +38,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   /**
    * You need to setup global Services through this function
    */
-  static setServices(set: DynamoNTS_GlobalServiceSettings): void {
+  static async setServices(set: DynamoNTS_GlobalServiceSettings): Promise<void> {
     this.getInstance();
 
     try {
@@ -47,14 +47,24 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
         try {
           this.instance.dbServiceCollection[dbModel.dataName] = new DynamoNTS_DBService(dbModel);
         } catch (error) {
-          Dynamo_Log.error(`\nFailed to create DynamoBEDBService (${dbModel.dataName}).\n`, dbModel, `\n`, error);
+          error = new Dynamo_Error({
+            message: `Failed to create DynamoNTS_DBService (${dbModel.dataName}).\n` + dbModel, 
+            issuerService: 'DynamoNTS_GlobalService',
+            error: error
+          });
+          throw error;
         }
       });
 
       this.instance.authService = set.authService;
       this.instance.emailServiceCollection = set.emailServiceCollection;
     } catch (error) {
-      Dynamo_Log.error('\nsetServices failed on DynamoNTS_GlobalService.\n', error);
+      Dynamo_Log.error(`Failed to create DynamoNTS_GlobalService.`, error);
+      /* error = new Dynamo_Error({
+        message: `Failed to create DynamoNTS_GlobalService.`,
+        error: error
+      });
+      throw error; */
     }
   }
 
@@ -69,9 +79,10 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   static getAuthService(): DynamoNTS_AuthService {
     if (!this.instance?.authService?.authenticateToken) {
       throw new Error(
-        `\nUnique Authentication Service missing!` + 
-        `\nPlease create a Unique Authentication Service extending DynamoNTS_AuthService, ` + 
-        `and Setup with "DynamoNTS_GlobalServiceC.setServices(...)"`);
+        `\n  Unique Authentication Service missing!` + 
+        `\n    Please create a Unique Authentication Service extending DynamoNTS_AuthService, ` + 
+        `\n      and Setup with DynamoNTS_GlobalServiceC.setServices(...)\n`
+      );
     }
 
     return this.instance.authService;
@@ -84,9 +95,10 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   static getDBServiceCollection(): DynamoNTS_ServiceCollection<DynamoNTS_DBService<any>> {
     if (!this.instance?.dbServiceCollection) {
       throw new Error(
-        `\nUnique DataBase Service Collection missing!` + 
-        `\nPlease create a Unique DataBase Service Collection extending DynamoNTS_DBServiceCollection, ` + 
-        `and Setup with "DynamoNTS_GlobalServiceC.setServices(...)"`);
+        `\n  Unique DataBase Service Collection missing!` + 
+        `\n    Please create a Unique DataBase Service Collection extending DynamoNTS_DBServiceCollection, ` + 
+        `\n      and Setup with DynamoNTS_GlobalServiceC.setServices(...)\n`
+      );
     }
 
     return this.instance.dbServiceCollection;
@@ -115,10 +127,11 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
       keys = keys.replace(/,/g, '\n                ');
 
       throw new Error(
-        `\nDynamoNTS_GlobalService.getDBService failed, ERROR: 
-        no dbService on collection with this key: ${key}!
-        The available dbServices on collection:
-                ${keys}\n`);
+        `\n  DynamoNTS_GlobalService.getDBService failed, ERROR: ` +
+        `\n    no dbService on collection with this key: ${key}!` +
+        `\n      The available dbServices on collection:` +
+        `\n        ${keys}\n`
+      );
     }
   }
 
@@ -129,9 +142,10 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   static getEmailServiceCollection(): DynamoNTS_ServiceCollection<DynamoNTS_EmailService> {
     if (!this.instance?.emailServiceCollection) {
       throw new Error(
-        `Unique Email Service Collection missing!` + 
-        `\nPlease create a Unique Email Service Collection extending DynamoBEEmailServiceCollection, ` + 
-        `and Setup with "DynamoNTS_GlobalServiceC.setServices(...)"`);
+        `\n  Unique Email Service Collection missing!` + 
+        `\n    Please create a Unique Email Service Collection extending DynamoBEEmailServiceCollection, ` + 
+        `\n      and Setup with DynamoNTS_GlobalServiceC.setServices(...)\n`
+      );
     }
 
     return this.instance.emailServiceCollection;

package/src/_services/{service-collection.service.ts → core/service-collection.service.ts}

@@ -1,4 +1,4 @@
-import { DynamoNTS_SingletonService } from './singleton.service';
+import { DynamoNTS_SingletonService } from '../base/singleton.service';
 
 export class DynamoNTS_ServiceCollection<T> extends DynamoNTS_SingletonService {
   [service: string]: T;

package/src/_services/index.ts

@@ -2,18 +2,18 @@
 
 
 // SERVICES
-export * from './api.service';
-export * from './app.server';
-export * from './auth.service';
-export * from './controller.service';
-export * from './data.service';
-export * from './db.service';
-export * from './email.service';
-export * from './global.service';
-export * from './routing-module.service';
-export * from './service-collection.service';
+export * from './core/api.service';
+export * from './server/app.server';
+export * from './core/auth.service';
+export * from './route/controller.service';
+export * from './base/data.service';
+export * from './base/db.service';
+export * from './core/email.service';
+export * from './core/global.service';
+export * from './route/routing-module.service';
+export * from './core/service-collection.service';
 export * from './shared.static-service';
-export * from './singleton.service';
+export * from './base/singleton.service';
 
 // these are using socket.io therefore they are not included in the service index
 // export * from './app-extended.server';

package/src/_services/{controller.service.ts → route/controller.service.ts}

@@ -1,9 +1,9 @@
 
 
 import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_EndpointParams } from '../_models/control-models/endpoint-params.control-model';
+import { DynamoNTS_EndpointParams } from '../../_models/control-models/endpoint-params.control-model';
 
-import { DynamoNTS_SingletonService } from './singleton.service';
+import { DynamoNTS_SingletonService } from '../base/singleton.service';
 
 /**
  * Basic controller for endpoint handlings
@@ -82,7 +82,7 @@ export abstract class DynamoNTS_Controller extends DynamoNTS_SingletonService {
     try {
       this.setupEndpoints();
     } catch (error) {
-      Dynamo_Log.error(`DynamoBEController ERROR setup failed:`, error);
+      Dynamo_Log.error(`\nDynamoNTS_Controller ERROR setup failed`, error);
     }
   }
 

package/src/_services/{routing-module.service.ts → route/routing-module.service.ts}

@@ -3,12 +3,12 @@ import { Router } from 'express';
 
 import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
-import { dynamoNTS_GlobalSettings } from '../_constants/global-settings.const';
-import { DynamoNTS_RouteSecurity } from '../_enums/route-security.enum';
-import { DynamoNTS_HttpCallType } from '../_enums/http/http-call-type.enum';
+import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
+import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_Controller } from './controller.service';
-import { DynamoNTS_RoutingModuleSettings } from '../_models/interfaces/routing-module-settings.interface';
-import { DynamoNTS_EndpointParams } from '../_models/control-models/endpoint-params.control-model';
+import { DynamoNTS_RoutingModuleSettings } from '../../_models/interfaces/routing-module-settings.interface';
+import { DynamoNTS_EndpointParams } from '../../_models/control-models/endpoint-params.control-model';
 
 /**
  * Routing Module
@@ -53,6 +53,8 @@ import { DynamoNTS_EndpointParams } from '../_models/control-models/endpoint-par
  *   }
  */
 export class DynamoNTS_RoutingModule {
+
+  serviceName: string;
   
   security: DynamoNTS_RouteSecurity;
   route: string;
@@ -63,7 +65,7 @@ export class DynamoNTS_RoutingModule {
   openRouter: Router = Router();
   secureRouter: Router = Router();
 
-  protected log: boolean = dynamoNTS_GlobalSettings.logSetup;
+  protected log: boolean = dynamoNTS_globalSettings.logSetup;
 
   defaultErrorUserMsg = 
     `We encountered an uncought BackEnd Build Error, ` +
@@ -73,14 +75,15 @@ export class DynamoNTS_RoutingModule {
     set: DynamoNTS_RoutingModuleSettings
   ){
     try {
-      this.route = dynamoNTS_GlobalSettings.baseUrl + set.route;
-      this.controllers = set.controllers;
+      this.serviceName = set.route.replace('/', '') + 'RoutingModule';
+      this.route = dynamoNTS_globalSettings.baseUrl + set.route;
+      this.controllers = set.controllers ?? [];
       this.setupRoutes();
       this.mountRoutes(set.securityOverride);
 
       if (this.log) console.log(`routing module setup done: ${this.route} serurity: ${this.security}\n`);
     } catch (error) {
-      Dynamo_Log.error(`Routing module setup failed (${this.route})`, error);
+      Dynamo_Log.error(`\nRouting module setup failed (${this.route})`, error);
     }
   }
 
@@ -106,7 +109,9 @@ export class DynamoNTS_RoutingModule {
       if (securityOverride) {
         endpoint.security = securityOverride;
       } else {
-        if (!this.security) {
+        if (!endpoint.security) {
+          Dynamo_Log.error(`Endpoint security not set: ${endpoint.endpoint}\n`);
+        } else if (!this.security) {
           this.security = endpoint.security;
         } else if (this.security !== endpoint.security) {
           this.security = DynamoNTS_RouteSecurity.both;
@@ -139,6 +144,7 @@ export class DynamoNTS_RoutingModule {
           addECToUserMsg: true,
           message: `DYNAMO-NTS ERROR: Failed to mount routes.`, 
           userMessage: this.defaultErrorUserMsg, 
+          issuerService: this.serviceName + ' - ' + this.route,
           error 
         })
       }
@@ -151,32 +157,44 @@ export class DynamoNTS_RoutingModule {
    */
   private mountOpenRoute(endpointParams: DynamoNTS_EndpointParams): void {
     switch(endpointParams.type) {
+
       case DynamoNTS_HttpCallType.get:
         this.openRouter.get(endpointParams.endpoint, 
-          endpointParams.preProcessess, endpointParams.getTasksExecution());
+          endpointParams.preProcessess, endpointParams.getTasksExecution()
+        );
         break;
+
       case DynamoNTS_HttpCallType.post:
           this.openRouter.post(endpointParams.endpoint, 
-            endpointParams.preProcessess, endpointParams.getTasksExecution());
+            endpointParams.preProcessess, endpointParams.getTasksExecution()
+          );
         break;
+
       case DynamoNTS_HttpCallType.put:
         this.openRouter.put(endpointParams.endpoint, 
-          endpointParams.preProcessess, endpointParams.getTasksExecution());
+          endpointParams.preProcessess, endpointParams.getTasksExecution()
+        );
         break;
+
       case DynamoNTS_HttpCallType.patch:
         this.openRouter.patch(endpointParams.endpoint, 
-          endpointParams.preProcessess, endpointParams.getTasksExecution());
+          endpointParams.preProcessess, endpointParams.getTasksExecution()
+        );
         break;
+
       case DynamoNTS_HttpCallType.delete:
         this.openRouter.delete(endpointParams.endpoint, 
-          endpointParams.preProcessess, endpointParams.getTasksExecution());
+          endpointParams.preProcessess, endpointParams.getTasksExecution()
+        );
         break;
+
       default:
         throw new Dynamo_Error({ 
           errorCode: 'NTS-RM9-200',
           addECToUserMsg: true,
           message: `DYNAMO-NTS ERROR: INVALID route type: ${endpointParams.type} - ${endpointParams.name}` ,
           userMessage: this.defaultErrorUserMsg, 
+          issuerService: this.serviceName + ' - ' + this.route,
           error: new Error()
         })
     }
@@ -192,28 +210,34 @@ export class DynamoNTS_RoutingModule {
         this.secureRouter.get(endpointParams.endpoint, 
           endpointParams.preProcessess, endpointParams.getTasksExecution());
         break;
+
       case DynamoNTS_HttpCallType.post:
         this.secureRouter.post(endpointParams.endpoint, 
           endpointParams.preProcessess, endpointParams.getTasksExecution());
         break;
+
       case DynamoNTS_HttpCallType.put:
         this.secureRouter.put(endpointParams.endpoint, 
           endpointParams.preProcessess, endpointParams.getTasksExecution());
         break;
+
       case DynamoNTS_HttpCallType.patch:
         this.secureRouter.patch(endpointParams.endpoint, 
           endpointParams.preProcessess, endpointParams.getTasksExecution());
         break;
+
       case DynamoNTS_HttpCallType.delete:
         this.secureRouter.delete(endpointParams.endpoint, 
           endpointParams.preProcessess, endpointParams.getTasksExecution());
         break;
+
       default:
         throw new Dynamo_Error({ 
           errorCode: 'NTS-RM9-300',
           addECToUserMsg: true,
           message: `DYNAMO-NTS ERROR: INVALID route type: ${endpointParams.type} - ${endpointParams.name}`,
           userMessage: this.defaultErrorUserMsg, 
+          issuerService: this.serviceName + ' - ' + this.route,
           error: new Error()
         })
     }

package/src/_services/{app-extended.server.ts → server/app-extended.server.ts}

@@ -5,9 +5,9 @@ import * as Http from 'http';
 import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_App } from './app.server';
-import { DynamoNTS_RouteSecurity } from '../_enums/route-security.enum';
-import { DynamoNTS_SocketServerService } from './socket-server.service';
-import { DynamoNTS_SocketSecurity } from '../_enums/socket-security.enum';
+import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
+import { DynamoNTS_SocketServerService } from '../socket/socket-server.service';
+import { DynamoNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 
 /**
  * This will be the MAIN service of our server project,

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

@@ -0,0 +1,49 @@
+
+import { delay } from '@futdevpro/fsm-dynamo';
+import { DynamoNTS_AppBase_Mock, DynamoNTS_AppFull_Mock } from '../../_constants/mocks/app-server.mock';
+
+describe('DynamoNTS_App;', () => {
+  describe('a base instance;', () => {
+    let app: DynamoNTS_AppBase_Mock;
+
+    beforeEach(async () => {
+      app = new DynamoNTS_AppBase_Mock();
+      await app.ready();
+    });
+
+    afterEach(async () => {
+      await app.stop();
+    });
+
+    it('should be created', () => {
+      expect(app).toBeDefined();
+    });
+
+    it('should be started', () => {
+      expect(app.started).toBeTrue();
+    });
+  });
+
+  describe('a full instance;', () => {
+    let app: DynamoNTS_AppFull_Mock;
+
+    beforeEach(async () => {
+      app = new DynamoNTS_AppFull_Mock();
+      await app.ready();
+    });
+
+    afterEach(async () => {
+      await app.stop();
+    });
+
+    it('should be created', () => {
+      expect(app).toBeDefined();
+    });
+      
+    it('should be started', () => {
+      expect(app.started).toBeTrue();
+    });
+
+  });
+});
+