@futdevpro/nts-dynamo 1.7.16 → 1.7.20

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

@@ -8,7 +8,9 @@ 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 { DynamoNTS_AppExtSysControls } from '../../_models/control-models/app-system-controls.control-model copy';
+import { 
+  DynamoNTS_AppExtSysControls 
+} from '../../_models/control-models/app-system-controls.control-model copy';
 
 /**
  * This will be the MAIN service of our server project,
@@ -136,8 +138,8 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
   constructor(){
     super(true);
 
-    this.asyncConstructExt().catch((error: any) => {
-      Dynamo_Log.error(
+    this.asyncConstructExt().catch((error: any): void => {
+      Dynamo_Log.H_error(
         `\nExtended Application: ${this.params?.name} start failed.` +
         `\n`, error, 
         '\n'
@@ -156,7 +158,10 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
         this.setSocketSecurity();
 
         await this.setupSocketServerServices();
-        if (this.logSetup) console.log(`\nAll sockets setted up.... sockets using security: ${this.socketSecurity}`);
+
+        if (this.logSetup) console.log(
+          `\nAll sockets setted up.... sockets using security: ${this.socketSecurity}`
+        );
       } else {
         Dynamo_Log.testWarn(
           'No socketServices setted up while using Extended Application.',
@@ -173,11 +178,12 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       Dynamo_Log.H_success(`${this.params.name} started successfully.`);
       
     } catch (error) {
-      Dynamo_Log.error(
+      Dynamo_Log.H_error(
         `\nExtended Application: ${this.params?.name} start failed.` +
         `\n`, error,
         '\n'
       );
+
       throw new Dynamo_Error({
         errorCode: 'NTS-AES-001',
         error: error,
@@ -207,7 +213,12 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
     const start: number = +new Date();
 
     if (this.constructErrors.length) {
-      Dynamo_Log.error(`Extended Application: ${this.params?.name} start failed. ERRORS`, this.constructErrors, '\n');
+      Dynamo_Log.H_error(
+        `Extended Application: ${this.params?.name} start failed. ERRORS`, 
+        this.constructErrors, 
+        '\n'
+      );
+
       throw new Dynamo_Error({ 
         message: `${this.params?.name} start failed. ERRORS`,
         additionalContent: this.constructErrors,
@@ -232,7 +243,12 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
     }
 
     if (this.constructErrors.length) {
-      Dynamo_Log.error(`Extended Application: ${this.params?.name} start failed. TIMEOUT`, this.constructErrors, '\n');
+      Dynamo_Log.H_error(
+        `Extended Application: ${this.params?.name} start failed. TIMEOUT`, 
+        this.constructErrors, 
+        '\n'
+      );
+
       throw new Dynamo_Error({ 
         message: `${this.params?.name} start failed. TIMEOUT`,
         additionalContent: this.constructErrors,
@@ -244,19 +260,29 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       this.systemControlsExt.appExtended.started = true;
       
       if (this.logFn && this.deepLog) console.log('\nfn:. ready-extended: return');
+
       return;
     } else {
       this.systemControlsExt.appExtended.started = false;
       
       let msg: string = `${this.params?.name} start failed. UNKNOWN`;
-      if (this.systemControlsExt.httpSocketServer.init && !this.systemControlsExt.httpSocketServer.started) {
+
+      if (
+        this.systemControlsExt.httpSocketServer.init && 
+        !this.systemControlsExt.httpSocketServer.started
+      ) {
         msg += '\nhttpSocketServer start failed.';
       }
-      if (this.systemControlsExt.httpsSocketServer.init && !this.systemControlsExt.httpsSocketServer.started) {
+
+      if (
+        this.systemControlsExt.httpsSocketServer.init && 
+        !this.systemControlsExt.httpsSocketServer.started
+      ) {
         msg += '\nhttpsSocketServer start failed.';
       }      
 
       Dynamo_Log.error(msg, this.constructErrors, '\n');
+
       throw new Dynamo_Error({ 
         errorCode: 'NTS-AES-110',
         message: msg,
@@ -281,30 +307,34 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
 
   override async stop(): Promise<void> {
     if (this.logFn) console.log('\nfn:. stop-extended');
+    
     if (this.started) {
       await super.stop(true);
 
       this.systemControlsExt.httpSocketServer.started = false;
       this.systemControlsExt.httpsSocketServer.started = false;
-      await Dynamo_Array.asyncForEach(this.allSocketServers, async (socketServer: SocketIO.Server) => {
-        await new Promise<void>((resolve, reject) => {
-          socketServer.disconnectSockets(true);
-          socketServer.close((err) => {
-            if (err) {
-              Dynamo_Log.error(`\nHTTP socket server close error`, err);
-              reject(
-                new Dynamo_Error({
-                  errorCode: 'NTS-AES-120',
-                  message: `SocketServer close failed.`,
-                  error: err
-                })
-              );
-            } else {
-              resolve();
-            }
+      await Dynamo_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);
+                reject(
+                  new Dynamo_Error({
+                    errorCode: 'NTS-AES-120',
+                    message: `SocketServer close failed.`,
+                    error: err
+                  })
+                );
+              } else {
+                resolve();
+              }
+            });
           });
-        });
-      });
+        }
+      );
       this.systemControlsExt.httpSocketServer.init = false;
       this.systemControlsExt.httpsSocketServer.init = false;
 
@@ -317,10 +347,13 @@ 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>) => {
+    this.socketServices.forEach((service: DynamoNTS_SocketServerService<any>): void => {
       if (!this.socketSecurity) {
         this.socketSecurity = DynamoNTS_RouteSecurity[service.security];
-      } else if (this.socketSecurity !== DynamoNTS_RouteSecurity.both && this.socketSecurity !== DynamoNTS_RouteSecurity[service.security]) {
+      } else if (
+        this.socketSecurity !== DynamoNTS_RouteSecurity.both && 
+        this.socketSecurity !== DynamoNTS_RouteSecurity[service.security]
+      ) {
         this.socketSecurity = DynamoNTS_RouteSecurity.both;
       }
     });
@@ -333,10 +366,12 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
     try {
       if (this.logFn) console.log('\nfn:. setupSocketServerServices');
       /* let httpServer: Http.Server; */
+
       if (this.socketSecurity !== DynamoNTS_RouteSecurity.secure) {
         if (!this.openExpress) {
           await this.initOpenExpress();
         }
+
         if (!this.httpSocketServer) {
           this.httpSocketServer = Http.createServer(this.openExpress);
         }
@@ -357,18 +392,20 @@ 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>) => {
+            this.socketServices.forEach((service: DynamoNTS_SocketServerService<any>): void => {
               if (service.security != DynamoNTS_SocketSecurity.open) {
                 errorMsg += `\n  ${service?.name} (port: ${service.port})`;
               }
             });
     
-            let error = new Error('Secure routes cannot be established!');
-            let errorStack: string[] = error.stack.split('\n');
+            const error = new Error('Secure routes cannot be established!');
+            const errorStack: string[] = error.stack.split('\n');
+
             errorStack.splice(1, 2);
             error.stack = errorStack.join('\n');
     
             Dynamo_Log.error(errorMsg);
+
             throw error;
           }
         }
@@ -376,25 +413,33 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
 
       await Dynamo_Array.asyncForEach(
         this.socketServices, 
-        async (service: DynamoNTS_SocketServerService<any>) => {
+        async (service: DynamoNTS_SocketServerService<any>): Promise<void> => {
           try {
             this.systemControlsExt.httpSocketServer.init = true;
             const existingPorts: DynamoNTS_SocketServerService<any>[] = this.socketServices.filter(
-              (mod: DynamoNTS_SocketServerService<any>) => mod.port === service.port
+              (mod: DynamoNTS_SocketServerService<any>): boolean => mod.port === service.port
             );
 
-            if (1 < existingPorts.length || this.portSettings.httpPort === service.port || this.portSettings.httpsPort === service.port) {
-              let error = new Error(`PORT DUPLICATION: ${service.port}`);
-              let errorStack: string[] = error.stack.split('\n');
+            if (
+              1 < existingPorts.length || 
+              this.portSettings.httpPort === service.port || 
+              this.portSettings.httpsPort === service.port
+            ) {
+              const error = new Error(`PORT DUPLICATION: ${service.port}`);
+              const errorStack: string[] = error.stack.split('\n');
+
               errorStack.splice(1, 4);
               error.stack = errorStack.join('\n');
 
               Dynamo_Log.error(`\n${error.message}`);
+
               throw error;
             }
 
             if (service.security === DynamoNTS_SocketSecurity.open) {
-              if (this.logSetup) console.log(`\nsocket setup (open): ${service?.name}:${service.port}`);
+              if (this.logSetup) console.log(
+                `\nsocket setup (open): ${service?.name}:${service.port}`
+              );
               this.httpSocketSettingUpCount++;
               this.systemControlsExt.httpSocketServer.started = false;
 
@@ -402,8 +447,9 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
                 await service.setupSocketServer(
                   new SocketIO.Server(this.httpSocketServer), 
                   DynamoNTS_SocketSecurity.open, 
-                  () => { 
+                  (): void => { 
                     this.httpSocketSettingUpCount--;
+
                     if (this.httpSocketSettingUpCount === 0) {
                       this.systemControlsExt.httpSocketServer.started = true;
                     }
@@ -412,7 +458,9 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               );
 
             } else if (service.security === DynamoNTS_SocketSecurity.secure) {
-              if (this.logSetup) console.log(`\nsocket setup (secure): ${service?.name}:${service.port}`);
+              if (this.logSetup) console.log(
+                `\nsocket setup (secure): ${service?.name}:${service.port}`
+              );
               this.httpsSocketSettingUpCount++;
               this.systemControlsExt.httpsSocketServer.started = false;
 
@@ -420,8 +468,9 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
                 await service.setupSocketServer(
                   new SocketIO.Server(this.httpsServer), 
                   DynamoNTS_SocketSecurity.secure, 
-                  () => {
+                  (): void => {
                     this.httpsSocketSettingUpCount--;
+
                     if (this.httpsSocketSettingUpCount === 0) {
                       this.systemControlsExt.httpsSocketServer.started = true;
                     }
@@ -430,22 +479,36 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               );
               
             } else {
-              let error = new Error(`INVALID Socket Service security: ${service.security} on ${service?.name}`);
-              let errorStack: string[] = error.stack.split('\n');
+              const error = new Error(
+                `INVALID Socket Service security: ${service.security} on ${service?.name}`
+              );
+              const errorStack: string[] = error.stack.split('\n');
+
               errorStack.splice(1, 4);
               error.stack = errorStack.join('\n');
 
               Dynamo_Log.error(`\n${error.message}`);
+
               throw error;
             }
           } catch (error) {
-            Dynamo_Log.error(`\nSocket Server service setup failed. (${service?.name})\n`, error, '\n');
+            Dynamo_Log.error(
+              `\nSocket Server service setup failed. (${service?.name})\n`, 
+              error, 
+              '\n'
+            );
+
             throw error;
           }
         }
       );
     } catch (error) {
-      Dynamo_Log.error(`\nSocket Server services setup failed. (${this.socketServices?.length} services)\n`, error, '\n');
+      Dynamo_Log.error(
+        `\nSocket Server services setup failed. (${this.socketServices?.length} services)\n`, 
+        error, 
+        '\n'
+      );
+
       throw error;
     } 
   }

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

@@ -1,41 +1,46 @@
 
 import { Dynamo_Log, delay } from '@futdevpro/fsm-dynamo';
-import { DynamoNTS_AppBase_Mock, DynamoNTS_AppFull_Mock } from '../../_constants/mocks/app-server.mock';
+import { 
+  DynamoNTS_AppBase_Mock, DynamoNTS_AppFull_Mock 
+} from '../../_constants/mocks/app-server.mock';
 
-describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', () => {
+describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', (): void => {
   // jasmine.DEFAULT_TIMEOUT_INTERVAL = 15 * second;
 
-  describe('a base instance;', () => {
+  describe('a base instance;', (): void => {
     let app: DynamoNTS_AppBase_Mock;
 
-    beforeEach(async () => {
+    beforeEach(async (): Promise<void> => {
       try {
         app = new DynamoNTS_AppBase_Mock();
+
+        await delay(100);
+        
         await app.ready();
       } catch (error) {
         Dynamo_Log.test('error', error);
       }
     });
 
-    afterEach(async () => {
+    afterEach(async (): Promise<void> => {
       await app.stop();
 
       await delay(100);
     });
 
-    it('should be created', () => {
+    it('should be created', (): void => {
       expect(app).toBeDefined();
     });
 
-    it('should be started', () => {
+    it('should be started', (): void => {
       expect(app.started).toBeTrue();
     });
   });
 
-  describe('a full instance;', () => {
+  describe('a full instance;', (): void => {
     let app: DynamoNTS_AppFull_Mock;
 
-    beforeEach(async () => {
+    beforeEach(async (): Promise<void> => {
       try {
         app = new DynamoNTS_AppFull_Mock();
         await app.ready();
@@ -44,17 +49,17 @@ describe('DynamoNTS_App AND DynamoNTS_AppExtended?;', () => {
       }
     });
 
-    afterEach(async () => {
+    afterEach(async (): Promise<void> => {
       await app.stop();
 
       await delay(100);
     });
 
-    it('should be created', () => {
+    it('should be created', (): void => {
       expect(app).toBeDefined();
     });
       
-    it('should be started', () => {
+    it('should be started', (): void => {
       expect(app.started).toBeTrue();
     });
   });