@futdevpro/nts-dynamo 1.7.28 → 1.9.1

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

@@ -1,4 +1,4 @@
-import { delay } from '@futdevpro/fsm-dynamo';
+import { DynamoFM_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 DynamoFM_delay(100);
       
       await app.ready();
     });
@@ -18,7 +18,7 @@ describe('DynamoNTS_AppExtended;', (): void => {
     afterEach(async (): Promise<void> => {
       await app.stop();
 
-      await delay(100);
+      await DynamoFM_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 DynamoFM_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 { DynamoFM_Array, DynamoFM_Error, DynamoFM_Log, second, DynamoFM_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,
+ *         DynamoFM_usageSessionModel_params,
+ *         DynamoFM_customDataModel_params,
  *       ]
  *     });
  *   }
@@ -139,7 +139,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
     super(true);
 
     this.asyncConstructExt().catch((error: any): void => {
-      Dynamo_Log.H_error(
+      DynamoFM_Log.H_error(
         `\nExtended Application: ${this.params?.name} start failed.` +
         `\n`, error, 
         '\n'
@@ -163,7 +163,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
           `\nAll sockets setted up.... sockets using security: ${this.socketSecurity}`
         );
       } else {
-        Dynamo_Log.testWarn(
+        DynamoFM_Log.testWarn(
           'No socketServices setted up while using Extended Application.',
           '\nYou should use DynamoNTS_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}`);
       }
-      Dynamo_Log.H_success(`${this.params.name} started successfully.`);
+      DynamoFM_Log.H_success(`${this.params.name} started successfully.`);
       
     } catch (error) {
-      Dynamo_Log.H_error(
+      DynamoFM_Log.H_error(
         `\nExtended Application: ${this.params?.name} start failed.` +
         `\n`, error,
         '\n'
       );
 
-      throw new Dynamo_Error({
+      throw new DynamoFM_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) {
-      Dynamo_Log.H_error(
+      DynamoFM_Log.H_error(
         `Extended Application: ${this.params?.name} start failed. ERRORS`, 
         this.constructErrors, 
         '\n'
       );
 
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_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 {
-        Dynamo_Log.error(`${this.params.name} APP NOT INITIALIZED while trying to get ready.`);
+        DynamoFM_Log.error(`${this.params.name} APP NOT INITIALIZED while trying to get ready.`);
       }
 
       if (!ready) {
-        await wait(100);
+        await DynamoFM_wait(100);
       }
     }
 
     if (this.constructErrors.length) {
-      Dynamo_Log.H_error(
+      DynamoFM_Log.H_error(
         `Extended Application: ${this.params?.name} start failed. TIMEOUT`, 
         this.constructErrors, 
         '\n'
       );
 
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_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.';
       }      
 
-      Dynamo_Log.error(msg, this.constructErrors, '\n');
+      DynamoFM_Log.error(msg, this.constructErrors, '\n');
 
-      throw new Dynamo_Error({ 
+      throw new DynamoFM_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 Dynamo_Array.asyncForEach(
+      await DynamoFM_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) {
-                Dynamo_Log.error(`\nHTTP socket server close error`, err);
+                DynamoFM_Log.error(`\nHTTP socket server close error`, err);
                 reject(
-                  new Dynamo_Error({
+                  new DynamoFM_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;
 
-      Dynamo_Log.H_info(`${this.params.name} stopped successfully.`);
+      DynamoFM_Log.H_info(`${this.params.name} stopped successfully.`);
     }
   }
 
@@ -404,14 +404,14 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
             errorStack.splice(1, 2);
             error.stack = errorStack.join('\n');
     
-            Dynamo_Log.error(errorMsg);
+            DynamoFM_Log.error(errorMsg);
 
             throw error;
           }
         }
       }
 
-      await Dynamo_Array.asyncForEach(
+      await DynamoFM_Array.asyncForEach(
         this.socketServices, 
         async (service: DynamoNTS_SocketServerService<any>): Promise<void> => {
           try {
@@ -431,7 +431,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               errorStack.splice(1, 4);
               error.stack = errorStack.join('\n');
 
-              Dynamo_Log.error(`\n${error.message}`);
+              DynamoFM_Log.error(`\n${error.message}`);
 
               throw error;
             }
@@ -487,12 +487,12 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               errorStack.splice(1, 4);
               error.stack = errorStack.join('\n');
 
-              Dynamo_Log.error(`\n${error.message}`);
+              DynamoFM_Log.error(`\n${error.message}`);
 
               throw error;
             }
           } catch (error) {
-            Dynamo_Log.error(
+            DynamoFM_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) {
-      Dynamo_Log.error(
+      DynamoFM_Log.error(
         `\nSocket Server services setup failed. (${this.socketServices?.length} services)\n`, 
         error, 
         '\n'

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

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