@futdevpro/nts-dynamo 1.9.16 → 1.9.18

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

@@ -2,14 +2,14 @@
 import * as SocketIO from 'socket.io';
 import * as Http from 'http';
 
-import { DynamoFM_Array, DynamoFM_Error, DynamoFM_Log, second, DynamoFM_wait } from '@futdevpro/fsm-dynamo';
+import { DyFM_Array, DyFM_Error, DyFM_Log, second, DyFM_wait } from '@futdevpro/fsm-dynamo';
 
-import { DynamoNTS_App } from './app.server';
-import { DynamoNTS_RouteSecurity } from '../../_enums/route-security.enum';
-import { DynamoNTS_SocketServerService } from '../socket/socket-server.service';
-import { DynamoNTS_SocketSecurity } from '../../_enums/socket-security.enum';
+import { DyNTS_App } from './app.server';
+import { DyNTS_RouteSecurity } from '../../_enums/route-security.enum';
+import { DyNTS_SocketServerService } from '../socket/socket-server.service';
+import { DyNTS_SocketSecurity } from '../../_enums/socket-security.enum';
 import { 
-  DynamoNTS_AppExtSysControls 
+  DyNTS_AppExtSysControls 
 } from '../../_models/control-models/app-ext-system-controls.control-model';
 
 /**
@@ -24,13 +24,13 @@ import {
  * You need to add socketService definitions to setupRoutingModules
  * 
  * @example
- * export class App extends DynamoNTS_AppExtended {
+ * export class App extends DyNTS_AppExtended {
  *   
  *   ...
  *   
  * // Setting up App params, and preparing project global settings
  *   setupAppParams(): void {
- *     this.params = new DynamoNTS_AppParams({
+ *     this.params = new DyNTS_AppParams({
  *       name: 'Warbots Server',
  *       title: warbotsTitleLog,
  *       version: version,
@@ -44,7 +44,7 @@ import {
  * 
  *   // Setting up DBServices
  *   setGlobalServiceCollection(): void {
- *     DynamoNTS_GlobalService.setServices({
+ *     DyNTS_GlobalService.setServices({
  *       authService: AuthService.getInstance(),
  *       emailServiceCollection: EmailServiceCollectionService.getInstance(),
  *       dbModels: [
@@ -58,8 +58,8 @@ import {
  *         matchStatisticsModelParams,
  *         matchDataModelParams,
 
- *         DynamoFM_usageSessionModel_params,
- *         DynamoFM_customDataModel_params,
+ *         DyFM_usageSessionModel_params,
+ *         DyFM_customDataModel_params,
  *       ]
  *     });
  *   }
@@ -71,7 +71,7 @@ import {
  *     this.httpPort = env.port;
 
  *     this.routingModules = [
- *       new DynamoNTS_RoutingModule({
+ *       new DyNTS_RoutingModule({
  *         route: '/user',
  *         controllers: [ 
  *           UserController.getInstance(),
@@ -82,7 +82,7 @@ import {
  *           UserNotificationsController.getInstance()
  *         ]
  *       }),
- *       new DynamoNTS_RoutingModule({
+ *       new DyNTS_RoutingModule({
  *         route: '/match',
  *         controllers: [ 
  *           MatchController.getInstance(),
@@ -90,7 +90,7 @@ import {
  *           MatchStatisticsController.getInstance(),
  *         ]
  *       }),
- *       new DynamoNTS_RoutingModule({
+ *       new DyNTS_RoutingModule({
  *         route: '/server',
  *         controllers: [ 
  *           ServerController.getInstance(),
@@ -112,14 +112,14 @@ import {
  *   }
  * }
  */
-export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
+export abstract class DyNTS_AppExtended extends DyNTS_App {
   
-  private systemControlsExt: DynamoNTS_AppExtSysControls = new DynamoNTS_AppExtSysControls();
+  private systemControlsExt: DyNTS_AppExtSysControls = new DyNTS_AppExtSysControls();
   override get started(): boolean { return this.systemControlsExt.appExtended.started; }
   private httpsSocketSettingUpCount: number = 0;
   private httpSocketSettingUpCount: number = 0;
 
-  private socketSecurity: DynamoNTS_RouteSecurity;
+  private socketSecurity: DyNTS_RouteSecurity;
 
   private httpSocketServer: Http.Server;
   
@@ -132,14 +132,14 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
    *   ...
    * ];
    */
-  protected socketServices: DynamoNTS_SocketServerService<any>[];
+  protected socketServices: DyNTS_SocketServerService<any>[];
   private allSocketServers: SocketIO.Server[] = [];
 
   constructor(){
     super(true);
 
     this.asyncConstructExt().catch((error: any): void => {
-      DynamoFM_Log.H_error(
+      DyFM_Log.H_error(
         `\nExtended Application: ${this.params?.name} start failed.` +
         `\n`, error, 
         '\n'
@@ -163,9 +163,9 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
           `\nAll sockets setted up.... sockets using security: ${this.socketSecurity}`
         );
       } else {
-        DynamoFM_Log.testWarn(
+        DyFM_Log.testWarn(
           'No socketServices setted up while using Extended Application.',
-          '\nYou should use DynamoNTS_App if you don`t need socket services.' 
+          '\nYou should use DyNTS_App if you don`t need socket services.' 
         );
       }
 
@@ -175,16 +175,16 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
         console.log(this.params.title);
         console.log(`Version: ${this.params.version}`);
       }
-      DynamoFM_Log.H_success(`${this.params.name} started successfully.`);
+      DyFM_Log.H_success(`${this.params.name} started successfully.`);
       
     } catch (error) {
-      DynamoFM_Log.H_error(
+      DyFM_Log.H_error(
         `\nExtended Application: ${this.params?.name} start failed.` +
         `\n`, error,
         '\n'
       );
 
-      throw new DynamoFM_Error({
+      throw new DyFM_Error({
         errorCode: 'NTS-AES-001',
         error: error,
         additionalContent: {
@@ -213,13 +213,13 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
     const start: number = +new Date();
 
     if (this.constructErrors.length) {
-      DynamoFM_Log.H_error(
+      DyFM_Log.H_error(
         `Extended Application: ${this.params?.name} start failed. ERRORS`, 
         this.constructErrors, 
         '\n'
       );
 
-      throw new DynamoFM_Error({ 
+      throw new DyFM_Error({ 
         message: `${this.params?.name} start failed. ERRORS`,
         additionalContent: this.constructErrors,
         error: this.constructErrors?.[0] ?? new Error()
@@ -234,22 +234,22 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
           this.systemControlsExt.httpsSocketServer.getReady()
         );
       } else {
-        DynamoFM_Log.error(`${this.params.name} APP NOT INITIALIZED while trying to get ready.`);
+        DyFM_Log.error(`${this.params.name} APP NOT INITIALIZED while trying to get ready.`);
       }
 
       if (!ready) {
-        await DynamoFM_wait(100);
+        await DyFM_wait(100);
       }
     }
 
     if (this.constructErrors.length) {
-      DynamoFM_Log.H_error(
+      DyFM_Log.H_error(
         `Extended Application: ${this.params?.name} start failed. TIMEOUT`, 
         this.constructErrors, 
         '\n'
       );
 
-      throw new DynamoFM_Error({ 
+      throw new DyFM_Error({ 
         message: `${this.params?.name} start failed. TIMEOUT`,
         additionalContent: this.constructErrors,
         error: this.constructErrors?.[0] ?? new Error()
@@ -281,9 +281,9 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
         msg += '\nhttpsSocketServer start failed.';
       }      
 
-      DynamoFM_Log.error(msg, this.constructErrors, '\n');
+      DyFM_Log.error(msg, this.constructErrors, '\n');
 
-      throw new DynamoFM_Error({ 
+      throw new DyFM_Error({ 
         errorCode: 'NTS-AES-110',
         message: msg,
         additionalContent: {
@@ -313,16 +313,16 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
 
       this.systemControlsExt.httpSocketServer.started = false;
       this.systemControlsExt.httpsSocketServer.started = false;
-      await DynamoFM_Array.asyncForEach(
+      await DyFM_Array.asyncForEach(
         this.allSocketServers, 
         async (socketServer: SocketIO.Server): Promise<void> => {
           await new Promise<void>((resolve, reject): void => {
             socketServer.disconnectSockets(true);
             socketServer.close((err): void => {
               if (err) {
-                DynamoFM_Log.error(`\nHTTP socket server close error`, err);
+                DyFM_Log.error(`\nHTTP socket server close error`, err);
                 reject(
-                  new DynamoFM_Error({
+                  new DyFM_Error({
                     errorCode: 'NTS-AES-120',
                     message: `SocketServer close failed.`,
                     error: err
@@ -338,7 +338,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       this.systemControlsExt.httpSocketServer.init = false;
       this.systemControlsExt.httpsSocketServer.init = false;
 
-      DynamoFM_Log.H_info(`${this.params.name} stopped successfully.`);
+      DyFM_Log.H_info(`${this.params.name} stopped successfully.`);
     }
   }
 
@@ -347,14 +347,14 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
    */
   private setSocketSecurity(): void {
     if (this.logFn) console.log('\nfn:. setSocketSecurity');
-    this.socketServices.forEach((service: DynamoNTS_SocketServerService<any>): void => {
+    this.socketServices.forEach((service: DyNTS_SocketServerService<any>): void => {
       if (!this.socketSecurity) {
-        this.socketSecurity = DynamoNTS_RouteSecurity[service.security];
+        this.socketSecurity = DyNTS_RouteSecurity[service.security];
       } else if (
-        this.socketSecurity !== DynamoNTS_RouteSecurity.both && 
-        this.socketSecurity !== DynamoNTS_RouteSecurity[service.security]
+        this.socketSecurity !== DyNTS_RouteSecurity.both && 
+        this.socketSecurity !== DyNTS_RouteSecurity[service.security]
       ) {
-        this.socketSecurity = DynamoNTS_RouteSecurity.both;
+        this.socketSecurity = DyNTS_RouteSecurity.both;
       }
     });
   }
@@ -367,7 +367,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       if (this.logFn) console.log('\nfn:. setupSocketServerServices');
       /* let httpServer: Http.Server; */
 
-      if (this.socketSecurity !== DynamoNTS_RouteSecurity.secure) {
+      if (this.socketSecurity !== DyNTS_RouteSecurity.secure) {
         if (!this.openExpress) {
           await this.initOpenExpress();
         }
@@ -377,7 +377,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
         }
       }
 
-      if (this.socketSecurity !== DynamoNTS_RouteSecurity.open) {
+      if (this.socketSecurity !== DyNTS_RouteSecurity.open) {
         if (!this.httpsServer) {
           if (this.cert) {
             await this.initSecureExpress();
@@ -392,8 +392,8 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               `\nin DynamoBEServer - setupRoutingModules() to enable secure routes.`;
               
             errorMsg += '\n\nThe socket services setted to use secure server:';
-            this.socketServices.forEach((service: DynamoNTS_SocketServerService<any>): void => {
-              if (service.security != DynamoNTS_SocketSecurity.open) {
+            this.socketServices.forEach((service: DyNTS_SocketServerService<any>): void => {
+              if (service.security != DyNTS_SocketSecurity.open) {
                 errorMsg += `\n  ${service?.name} (port: ${service.port})`;
               }
             });
@@ -404,20 +404,20 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
             errorStack.splice(1, 2);
             error.stack = errorStack.join('\n');
     
-            DynamoFM_Log.error(errorMsg);
+            DyFM_Log.error(errorMsg);
 
             throw error;
           }
         }
       }
 
-      await DynamoFM_Array.asyncForEach(
+      await DyFM_Array.asyncForEach(
         this.socketServices, 
-        async (service: DynamoNTS_SocketServerService<any>): Promise<void> => {
+        async (service: DyNTS_SocketServerService<any>): Promise<void> => {
           try {
             this.systemControlsExt.httpSocketServer.init = true;
-            const existingPorts: DynamoNTS_SocketServerService<any>[] = this.socketServices.filter(
-              (mod: DynamoNTS_SocketServerService<any>): boolean => mod.port === service.port
+            const existingPorts: DyNTS_SocketServerService<any>[] = this.socketServices.filter(
+              (mod: DyNTS_SocketServerService<any>): boolean => mod.port === service.port
             );
 
             if (
@@ -431,12 +431,12 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               errorStack.splice(1, 4);
               error.stack = errorStack.join('\n');
 
-              DynamoFM_Log.error(`\n${error.message}`);
+              DyFM_Log.error(`\n${error.message}`);
 
               throw error;
             }
 
-            if (service.security === DynamoNTS_SocketSecurity.open) {
+            if (service.security === DyNTS_SocketSecurity.open) {
               if (this.logSetup) console.log(
                 `\nsocket setup (open): ${service?.name}:${service.port}`
               );
@@ -446,7 +446,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               this.allSocketServers.push(
                 await service.setupSocketServer(
                   new SocketIO.Server(this.httpSocketServer), 
-                  DynamoNTS_SocketSecurity.open, 
+                  DyNTS_SocketSecurity.open, 
                   (): void => { 
                     this.httpSocketSettingUpCount--;
 
@@ -457,7 +457,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
                 )
               );
 
-            } else if (service.security === DynamoNTS_SocketSecurity.secure) {
+            } else if (service.security === DyNTS_SocketSecurity.secure) {
               if (this.logSetup) console.log(
                 `\nsocket setup (secure): ${service?.name}:${service.port}`
               );
@@ -467,7 +467,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               this.allSocketServers.push(
                 await service.setupSocketServer(
                   new SocketIO.Server(this.httpsServer), 
-                  DynamoNTS_SocketSecurity.secure, 
+                  DyNTS_SocketSecurity.secure, 
                   (): void => {
                     this.httpsSocketSettingUpCount--;
 
@@ -487,12 +487,12 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               errorStack.splice(1, 4);
               error.stack = errorStack.join('\n');
 
-              DynamoFM_Log.error(`\n${error.message}`);
+              DyFM_Log.error(`\n${error.message}`);
 
               throw error;
             }
           } catch (error) {
-            DynamoFM_Log.error(
+            DyFM_Log.error(
               `\nSocket Server service setup failed. (${service?.name})\n`, 
               error, 
               '\n'
@@ -503,7 +503,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
         }
       );
     } catch (error) {
-      DynamoFM_Log.error(
+      DyFM_Log.error(
         `\nSocket Server services setup failed. (${this.socketServices?.length} services)\n`, 
         error, 
         '\n'
@@ -516,5 +516,5 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
   /**
    * MISSING Description (TODO)
    */
-  abstract getSocketServices(): DynamoNTS_SocketServerService<any>[];
+  abstract getSocketServices(): DyNTS_SocketServerService<any>[];
 }

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

@@ -1,31 +1,31 @@
 
-import { DynamoFM_Log, DynamoFM_delay } from '@futdevpro/fsm-dynamo';
+import { DyFM_Log, DyFM_delay } from '@futdevpro/fsm-dynamo';
 import { 
-  DynamoNTS_AppBase_Mock, DynamoNTS_AppFull_Mock 
+  DyNTS_AppBase_Mock, DyNTS_AppFull_Mock 
 } from '../../_constants/mocks/app-server.mock';
 
-describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', (): void => {
+describe('DyNTS_App AND DyNTS_AppExtended?;', (): void => {
   // jasmine.DEFAULT_TIMEOUT_INTERVAL = 15 * second;
 
   describe('a base instance;', (): void => {
-    let app: DynamoNTS_AppBase_Mock;
+    let app: DyNTS_AppBase_Mock;
 
     beforeEach(async (): Promise<void> => {
       try {
-        app = new DynamoNTS_AppBase_Mock();
+        app = new DyNTS_AppBase_Mock();
 
-        await DynamoFM_delay(100);
+        await DyFM_delay(100);
         
         await app.ready();
       } catch (error) {
-        DynamoFM_Log.test('error', error);
+        DyFM_Log.test('error', error);
       }
     });
 
     afterEach(async (): Promise<void> => {
       await app.stop();
 
-      await DynamoFM_delay(100);
+      await DyFM_delay(100);
     });
 
     it('should be created', (): void => {
@@ -38,21 +38,21 @@ describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', (): void => {
   });
 
   describe('a full instance;', (): void => {
-    let app: DynamoNTS_AppFull_Mock;
+    let app: DyNTS_AppFull_Mock;
 
     beforeEach(async (): Promise<void> => {
       try {
-        app = new DynamoNTS_AppFull_Mock();
+        app = new DyNTS_AppFull_Mock();
         await app.ready();
       } catch (error) {
-        DynamoFM_Log.test('error', error);
+        DyFM_Log.test('error', error);
       }
     });
 
     afterEach(async (): Promise<void> => {
       await app.stop();
 
-      await DynamoFM_delay(100);
+      await DyFM_delay(100);
     });
 
     it('should be created', (): void => {