@futdevpro/nts-dynamo 1.7.27 → 1.8.5

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

@@ -3,19 +3,19 @@
 import { Request, Response } from 'express';
 
 import { 
-  Dynamo_Metadata, Dynamo_DataParams, Dynamo_Log, Dynamo_Error, Dynamo_Array 
+  Dynamo_Metadata, Dynamo_DataModel_Params, Dynamo_Log, Dynamo_Error, Dynamo_Array 
 } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
+import { DynamoNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 
 import { 
-  DynamoNTS_GlobalServiceSettings 
+  DynamoNTS_GlobalService_Settings 
 } 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 '../base/db.service';
 import { DynamoNTS_EmailService } from './email.service';
-import { DynamoNTS_ServiceCollection } from './service-collection.service';
+import { DynamoNTS_Service_Collection } from './service-collection.service';
 /* import { DynamoNTS_EmailServiceCollection } from './email-service-collection.service'; */
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
 
@@ -30,8 +30,8 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
     return DynamoNTS_GlobalService.getSingletonInstance();
   }
 
-  private static _params: DynamoNTS_AppParams;
-  static get params(): DynamoNTS_AppParams { 
+  private static _params: DynamoNTS_App_Params;
+  static get params(): DynamoNTS_App_Params { 
     return this._params; 
   }
 
@@ -44,8 +44,8 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   }
 
   authService: DynamoNTS_AuthService;
-  dbServiceCollection: DynamoNTS_ServiceCollection<DynamoNTS_DBService<any>>;
-  emailServiceCollection: DynamoNTS_ServiceCollection<DynamoNTS_EmailService>; 
+  dbServiceCollection: DynamoNTS_Service_Collection<DynamoNTS_DBService<any>>;
+  emailServiceCollection: DynamoNTS_Service_Collection<DynamoNTS_EmailService>; 
 
   static globalErrorHandler?: (
     err: any, 
@@ -57,21 +57,35 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
   /**
    * You need to setup global Services through this function
    */
-  static async setServices(set: DynamoNTS_GlobalServiceSettings): Promise<void> {
+  static async setServices(set: DynamoNTS_GlobalService_Settings): Promise<void> {
     this.getInstance();
 
     try {
       this.instance.dbServiceCollection = {};
-      set.dbModels?.forEach((dbModel: Dynamo_DataParams): void => {
+      set.dbModels?.forEach((dbModel: Dynamo_DataModel_Params): void => {
+        if (!dbModel.constructed) {
+          throw new Dynamo_Error({
+            message: `DynamoNTS_GlobalService.setServices failed, ` +
+              `ERROR: dbModel is not constructed!`,
+            errorCode: 'NTS-GS0-SS1',
+            additionalContent: {
+              dbModel: dbModel,
+            },
+          });  
+        }
+
         try {
           this.instance.dbServiceCollection[dbModel.dataName] = new DynamoNTS_DBService(dbModel);
         } catch (error) {
           Dynamo_Log.error(`Failed to create DynamoNTS_DBService (${dbModel.dataName}).`, error);
           
           throw new Dynamo_Error({
-            message: `Failed to create DynamoNTS_DBService (${dbModel.dataName}).\n` + dbModel, 
+            message: `Failed to create DynamoNTS_DBService (${dbModel.dataName}).`, 
             issuerService: 'DynamoNTS_GlobalService',
             error: error,
+            additionalContent: {
+              dbModel: dbModel,
+            },
           });
         }
       });
@@ -102,7 +116,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
     }
   }
 
-  static setParams(params: DynamoNTS_AppParams): void {
+  static setParams(params: DynamoNTS_App_Params): void {
     this._params = params;
   }
 
@@ -126,7 +140,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
    * 
    * @returns 
    */
-  static getDBServiceCollection(): DynamoNTS_ServiceCollection<DynamoNTS_DBService<any>> {
+  static getDBServiceCollection(): DynamoNTS_Service_Collection<DynamoNTS_DBService<any>> {
     if (!this.instance?.dbServiceCollection) {
       throw new Error(
         `\n  Unique DataBase Service Collection missing!` + 
@@ -145,7 +159,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
    * @returns 
    */
   static getDBService<T extends Dynamo_Metadata>(
-    dataParams: Dynamo_DataParams
+    dataParams: Dynamo_DataModel_Params
   ): DynamoNTS_DBService<T> {
     return this.getDBServiceByKey<T>(dataParams.dataName);
   }
@@ -178,7 +192,7 @@ export class DynamoNTS_GlobalService extends DynamoNTS_SingletonService {
    * 
    * @returns 
    */
-  static getEmailServiceCollection(): DynamoNTS_ServiceCollection<DynamoNTS_EmailService> {
+  static getEmailServiceCollection(): DynamoNTS_Service_Collection<DynamoNTS_EmailService> {
     if (!this.instance?.emailServiceCollection) {
       throw new Error(
         `\n  Unique Email Service Collection missing!` + 

package/src/_services/core/service-collection.service.ts

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

package/src/_services/route/controller.service.ts

@@ -2,7 +2,7 @@
 
 import { Dynamo_Log } from '@futdevpro/fsm-dynamo';
 import { 
-  DynamoNTS_EndpointParams 
+  DynamoNTS_Endpoint_Params 
 } from '../../_models/control-models/endpoint-params.control-model';
 
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
@@ -76,7 +76,7 @@ export abstract class DynamoNTS_Controller extends DynamoNTS_SingletonService {
    *   }),
    * ];
    */
-  endpoints: DynamoNTS_EndpointParams[];
+  endpoints: DynamoNTS_Endpoint_Params[];
 
   protected constructor(){
     super();

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

@@ -3,15 +3,15 @@ import { Router } from 'express';
 
 import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
-import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
+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 
+  DynamoNTS_RoutingModule_Settings 
 } from '../../_models/interfaces/routing-module-settings.interface';
 import { 
-  DynamoNTS_EndpointParams 
+  DynamoNTS_Endpoint_Params 
 } from '../../_models/control-models/endpoint-params.control-model';
 
 /**
@@ -64,23 +64,23 @@ export class DynamoNTS_RoutingModule {
   route: string;
 
   private controllers: DynamoNTS_Controller[];
-  endpoints: DynamoNTS_EndpointParams[] = [];
+  endpoints: DynamoNTS_Endpoint_Params[] = [];
 
   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, ` +
     `\nplease contact the responsible development team.`;
 
   constructor(
-    set: DynamoNTS_RoutingModuleSettings
+    set: DynamoNTS_RoutingModule_Settings
   ){
     try {
       this.serviceName = set.route.replace('/', '') + 'RoutingModule';
-      this.route = dynamoNTS_globalSettings.baseUrl + set.route;
+      this.route = DynamoNTS_globalSettings.baseUrl + set.route;
       this.controllers = set.controllers ?? [];
       this.setupRoutes();
       this.mountRoutes(set.securityOverride);
@@ -111,7 +111,7 @@ export class DynamoNTS_RoutingModule {
       this.security = securityOverride;
     }
 
-    this.endpoints.forEach((endpoint: DynamoNTS_EndpointParams): void => {
+    this.endpoints.forEach((endpoint: DynamoNTS_Endpoint_Params): void => {
       if (securityOverride) {
         endpoint.security = securityOverride;
       } else {
@@ -127,8 +127,8 @@ export class DynamoNTS_RoutingModule {
       if (this.log) console.log(
         `endpoint mount (${endpoint.security}): ${this.route}${endpoint.endpoint}`
       );
-      const existingEndPoints: DynamoNTS_EndpointParams[] = this.endpoints
-        .filter((ep: DynamoNTS_EndpointParams): boolean => ep.endpoint === endpoint.endpoint);
+      const existingEndPoints: DynamoNTS_Endpoint_Params[] = this.endpoints
+        .filter((ep: DynamoNTS_Endpoint_Params): boolean => ep.endpoint === endpoint.endpoint);
         
       if (1 < existingEndPoints.length) {
         const error = new Error(`ENDPOINT DUPLICATION: ${endpoint.endpoint}`);
@@ -167,7 +167,7 @@ export class DynamoNTS_RoutingModule {
    * 
    * @param endpointParams 
    */
-  private mountOpenRoute(endpointParams: DynamoNTS_EndpointParams): void {
+  private mountOpenRoute(endpointParams: DynamoNTS_Endpoint_Params): void {
     switch(endpointParams.type) {
 
       case DynamoNTS_HttpCallType.get:
@@ -209,7 +209,7 @@ export class DynamoNTS_RoutingModule {
    * 
    * @param endpointParams 
    */
-  private mountSecureRoute(endpointParams: DynamoNTS_EndpointParams): void {
+  private mountSecureRoute(endpointParams: DynamoNTS_Endpoint_Params): void {
     switch(endpointParams.type) {
       case DynamoNTS_HttpCallType.get:
         this.secureRouter.get(endpointParams.endpoint, endpointParams.getFullExecution());

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

@@ -1,4 +1,4 @@
-import { delay } from '@futdevpro/fsm-dynamo';
+import { Dynamo_delay } from '@futdevpro/fsm-dynamo';
 import { 
   DynamoNTS_AppExtendedBase_Mock, DynamoNTS_AppExtendedFull_Mock, DynamoNTS_AppWbMock_Mock 
 } from '../../_constants/mocks/app-extended-server.mock';
@@ -10,7 +10,7 @@ describe('DynamoNTS_AppExtended;', (): void => {
     beforeEach(async (): Promise<void> => {
       app = new DynamoNTS_AppExtendedBase_Mock();
 
-      await delay(100);
+      await Dynamo_delay(100);
       
       await app.ready();
     });
@@ -18,7 +18,7 @@ describe('DynamoNTS_AppExtended;', (): void => {
     afterEach(async (): Promise<void> => {
       await app.stop();
 
-      await delay(100);
+      await Dynamo_delay(100);
     });
 
     it('should be created', (): void => {
@@ -62,7 +62,7 @@ describe('DynamoNTS_AppExtended;', (): void => {
     afterEach(async (): Promise<void> => {
       await app.stop();
 
-      await delay(100);
+      await Dynamo_delay(100);
     });
 
     it('should be created', (): void => {

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

@@ -2,7 +2,7 @@
 import * as SocketIO from 'socket.io';
 import * as Http from 'http';
 
-import { delay, Dynamo_Array, Dynamo_Error, Dynamo_Log, second, wait } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Array, Dynamo_Error, Dynamo_Log, second, Dynamo_wait } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_App } from './app.server';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
@@ -10,7 +10,7 @@ import { DynamoNTS_SocketServerService } from '../socket/socket-server.service';
 import { DynamoNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 import { 
   DynamoNTS_AppExtSysControls 
-} from '../../_models/control-models/app-system-controls.control-model copy';
+} from '../../_models/control-models/app-ext-system-controls.control-model';
 
 /**
  * This will be the MAIN service of our server project,
@@ -58,8 +58,8 @@ import {
  *         matchStatisticsModelParams,
  *         matchDataModelParams,
 
- *         usageSessionModelParams,
- *         customDataModelParams,
+ *         Dynamo_usageSessionModel_params,
+ *         Dynamo_customDataModel_params,
  *       ]
  *     });
  *   }
@@ -238,7 +238,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       }
 
       if (!ready) {
-        await wait(100);
+        await Dynamo_wait(100);
       }
     }
 

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

@@ -1,5 +1,5 @@
 
-import { Dynamo_Log, delay } from '@futdevpro/fsm-dynamo';
+import { Dynamo_Log, Dynamo_delay } from '@futdevpro/fsm-dynamo';
 import { 
   DynamoNTS_AppBase_Mock, DynamoNTS_AppFull_Mock 
 } from '../../_constants/mocks/app-server.mock';
@@ -14,7 +14,7 @@ describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', (): void => {
       try {
         app = new DynamoNTS_AppBase_Mock();
 
-        await delay(100);
+        await Dynamo_delay(100);
         
         await app.ready();
       } catch (error) {
@@ -25,7 +25,7 @@ describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', (): void => {
     afterEach(async (): Promise<void> => {
       await app.stop();
 
-      await delay(100);
+      await Dynamo_delay(100);
     });
 
     it('should be created', (): void => {
@@ -52,7 +52,7 @@ describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', (): void => {
     afterEach(async (): Promise<void> => {
       await app.stop();
 
-      await delay(100);
+      await Dynamo_delay(100);
     });
 
     it('should be created', (): void => {

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

@@ -13,26 +13,26 @@ import * as BodyParser from 'body-parser';
 
 import { 
   Dynamo_AnyError,
-  Dynamo_Array, Dynamo_Error, dynamo_error_default, 
+  Dynamo_Array, Dynamo_Error, Dynamo_error_defaults, 
   Dynamo_Error_Settings, 
-  Dynamo_ErrorLevel, Dynamo_Log, second, wait 
+  Dynamo_ErrorLevel, Dynamo_Log, second, Dynamo_wait 
 } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
 import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
 import { DynamoNTS_RoutingModule } from '../route/routing-module.service';
 import { DynamoNTS_GlobalService } from '../core/global.service';
-import { DynamoNTS_HttpSettings } from '../../_models/control-models/http-settings.control-model';
+import { DynamoNTS_Http_Settings } from '../../_models/control-models/http-settings.control-model';
 import { 
-  DynamoNTS_CertificationSettings 
+  DynamoNTS_Certification_Settings 
 } from '../../_models/interfaces/certification-settings.interface';
 import { 
-  DynamoNTS_GlobalServiceSettings 
+  DynamoNTS_GlobalService_Settings 
 } from '../../_models/interfaces/global-service-settings.interface';
-import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
-import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
+import { DynamoNTS_globalSettings } from '../../_constants/global-settings.const';
+import { DynamoNTS_App_Params } from '../../_models/control-models/app-params.control-model';
 import { 
-  DynamoNTS_EndpointParams 
+  DynamoNTS_Endpoint_Params 
 } from '../../_models/control-models/endpoint-params.control-model';
 import { 
   DynamoNTS_AppSystemControls 
@@ -83,8 +83,8 @@ import {
  *         matchStatisticsModelParams,
  *         matchDataModelParams,
 
- *         usageSessionModelParams,
- *         customDataModelParams,
+ *         Dynamo_usageSessionModel_params,
+ *         Dynamo_customDataModel_params,
  *       ]
  *     });
  *   }
@@ -217,8 +217,8 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     return this.params.name; 
   }
 
-  private _params: DynamoNTS_AppParams;
-  protected get params(): DynamoNTS_AppParams { 
+  private _params: DynamoNTS_App_Params;
+  protected get params(): DynamoNTS_App_Params { 
     return this._params; 
   }
   
@@ -229,13 +229,13 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     return this._security; 
   }
 
-  protected _portSettings: DynamoNTS_HttpSettings = new DynamoNTS_HttpSettings();
-  protected get portSettings(): DynamoNTS_HttpSettings { 
+  protected _portSettings: DynamoNTS_Http_Settings = new DynamoNTS_Http_Settings();
+  protected get portSettings(): DynamoNTS_Http_Settings { 
     return this._portSettings; 
   }
 
-  private _cert?: DynamoNTS_CertificationSettings;
-  protected get cert(): DynamoNTS_CertificationSettings { 
+  private _cert?: DynamoNTS_Certification_Settings;
+  protected get cert(): DynamoNTS_Certification_Settings { 
     return this._cert; 
   }
 
@@ -315,11 +315,11 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
         String.fromCharCode(7)
       );
 
-      dynamo_error_default.issuerSystem = this._params.systemName;  
+      Dynamo_error_defaults.issuerSystem = this._params.systemName;  
       
       this.overrideDynamoNTSGlobalSettings?.();    
 
-      this.logSetup = dynamoNTS_globalSettings.logSetup;
+      this.logSetup = DynamoNTS_globalSettings.logSetup;
       
       this.globalService = DynamoNTS_GlobalService.getInstance();
       await DynamoNTS_GlobalService.setServices(this.getGlobalServiceCollection());
@@ -436,7 +436,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
       }
 
       if (!ready) {
-        await wait(100);
+        await Dynamo_wait(100);
       }
     }
 
@@ -541,7 +541,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
           tryCount++ < 10
         ) {
           Dynamo_Log.warn(`Mongoose not even started yet....`);
-          await wait(second);
+          await Dynamo_wait(second);
         }
         this.systemControls.mongoose.started = false;
 
@@ -568,7 +568,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
             !this.constructErrors.length
           ) {
             Dynamo_Log.warn(`\nMongoose still not disconnected....`);
-            await wait(second);
+            await Dynamo_wait(second);
           }
         } else {
           Dynamo_Log.error(`\nMongoose not found.`);
@@ -694,7 +694,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
           if (module.security != DynamoNTS_RouteSecurity.secure) {
             errorMsg += `\n  ${module.route} (security: ${module.security})`;
             errorMsg += `\n  subroutes using open sever:`;
-            module.endpoints.forEach((endpoint: DynamoNTS_EndpointParams): void => {
+            module.endpoints.forEach((endpoint: DynamoNTS_Endpoint_Params): void => {
               if (endpoint.security != DynamoNTS_RouteSecurity.secure) {
                 errorMsg += `\n    ${endpoint.endpoint} (security: ${endpoint.security})`;
               }
@@ -735,7 +735,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
           if (module.security && module.security !== DynamoNTS_RouteSecurity.open) {
             errorMsg += `\n  ${module.route} (security: ${module.security})`;
             errorMsg += `\n  subroutes using secure sever:`;
-            module.endpoints.forEach((endpoint: DynamoNTS_EndpointParams): void => {
+            module.endpoints.forEach((endpoint: DynamoNTS_Endpoint_Params): void => {
               if (endpoint.security && endpoint.security !== DynamoNTS_RouteSecurity.open) {
                 errorMsg += `\n    ${endpoint.endpoint} (security: ${endpoint.security})`;
               }
@@ -1112,17 +1112,17 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   /**
    * MISSING Description (TODO)
    */
-  abstract getAppParams(): DynamoNTS_AppParams;
+  abstract getAppParams(): DynamoNTS_App_Params;
 
   /**
    * MISSING Description (TODO)
    */
-  abstract getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings;
+  abstract getGlobalServiceCollection(): DynamoNTS_GlobalService_Settings;
   
   /**
    * MISSING Description (TODO)
    */
-  abstract getPortSettings(): DynamoNTS_HttpSettings;
+  abstract getPortSettings(): DynamoNTS_Http_Settings;
 
   /**
    * MISSING Description (TODO)
@@ -1142,7 +1142,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   /**
    * MISSING Description (TODO)
    */
-  getCertificationSettings?(): DynamoNTS_CertificationSettings;
+  getCertificationSettings?(): DynamoNTS_Certification_Settings;
 
   /**
    * MISSING Description (TODO)

package/src/_services/shared.static-service.ts

@@ -3,7 +3,7 @@ import * as ReadLine from 'readline';
 import * as GeoIp from 'geoip-lite';
 import { Request } from 'express';
 
-import { GeoIpLocation, Dynamo_Shared } from '@futdevpro/fsm-dynamo/shared-service';
+import { Dynamo_GeoIpLocation, Dynamo_Shared } from '@futdevpro/fsm-dynamo/shared-service';
 
 /**
  * 
@@ -17,13 +17,16 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
    */
   static getIpFromRequest(request: Request): string {
     let ip: string;
+
     if (request.headers['x-forwarded-for']) {
       const route: string[] = (request.headers['x-forwarded-for'] as string).split(', ');
+
       console.log('TESTTTT route:', route);
       ip = route[route.length - 1];
     } else {
       ip = request.socket.remoteAddress;
     }
+
     return ip;
   }
 
@@ -32,7 +35,7 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
    * @param request 
    * @returns 
    */
-  static getLocationDataByRequest(request: Request): GeoIpLocation {
+  static getLocationDataByRequest(request: Request): Dynamo_GeoIpLocation {
     return GeoIp.lookup(this.getIpFromRequest(request));
   }
 
@@ -41,7 +44,7 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
    * @param request 
    * @returns 
    */
-  static getLocationByIp(ip: string): GeoIpLocation {
+  static getLocationByIp(ip: string): Dynamo_GeoIpLocation {
     return GeoIp.lookup(ip);
   }
 
@@ -53,7 +56,7 @@ export class DynamoNTS_Shared extends Dynamo_Shared {
   static async prompt(question: string): Promise<string> {
     const readLine = ReadLine.createInterface({ 
       input: process.stdin, 
-      output: process.stdout 
+      output: process.stdout,
     });
     
     return new Promise((resolve, reject) => {