@futdevpro/nts-dynamo 1.7.4 → 1.7.7

package/src/_constants/mocks/app-extended-server.mock.ts

@@ -5,7 +5,7 @@ import { customDataModelParams } from '@futdevpro/fsm-dynamo/custom-data-module'
 
 import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
 import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
-import { DynamoNTS_PortSettings } from '../../_models/interfaces/port-settings.interface';
+import { DynamoNTS_HttpSettings } from '../../_models/control-models/http-settings.control-model';
 import { getTestRoutingModule } from '../../_modules/test';
 import { getUsageRoutingModule } from '../../_modules/usage';
 import { DynamoNTS_SingletonService } from '../../_services';
@@ -40,7 +40,7 @@ export class DynamoNTS_AppExtendedBase_Mock extends DynamoNTS_AppExtended {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {};
   }
 
@@ -89,7 +89,7 @@ export class DynamoNTS_AppExtendedFull_Mock extends DynamoNTS_AppExtended {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 53535,
     };
@@ -159,7 +159,7 @@ export class DynamoNTS_AppWbMock_Mock extends DynamoNTS_AppExtended {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 53535,
     };

package/src/_constants/mocks/app-server.mock.ts

@@ -5,7 +5,7 @@ import { customDataModelParams } from '@futdevpro/fsm-dynamo/custom-data-module'
 
 import { DynamoNTS_AppParams } from '../../_models/control-models/app-params.control-model';
 import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
-import { DynamoNTS_PortSettings } from '../../_models/interfaces/port-settings.interface';
+import { DynamoNTS_HttpSettings } from '../../_models/control-models/http-settings.control-model';
 import { getTestRoutingModule } from '../../_modules/test';
 import { getUsageRoutingModule } from '../../_modules/usage';
 import { DynamoNTS_SingletonService } from '../../_services';
@@ -34,7 +34,7 @@ export class DynamoNTS_AppBase_Mock extends DynamoNTS_App {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {};
   }
 
@@ -79,7 +79,7 @@ export class DynamoNTS_AppFull_Mock extends DynamoNTS_App {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 10101,
     };
@@ -114,7 +114,7 @@ export class DynamoNTS_AppTEST_Mock extends DynamoNTS_App {
     overrides: {
       getAppParams?(): DynamoNTS_AppParams;
       getGlobalServiceCollection?(): DynamoNTS_GlobalServiceSettings;
-      getPortSettings?(): DynamoNTS_PortSettings;
+      getPortSettings?(): DynamoNTS_HttpSettings;
       getRoutingModules?(): DynamoNTS_RoutingModule[];
       getRootServices?(): Promise<DynamoNTS_SingletonService[]>;
     }
@@ -161,7 +161,7 @@ export class DynamoNTS_AppTEST_Mock extends DynamoNTS_App {
     };
   }
 
-  getPortSettings(): DynamoNTS_PortSettings {
+  getPortSettings(): DynamoNTS_HttpSettings {
     return {
       httpPort: 10203,
     };

package/src/_constants/mocks/socket-server.mock.ts

@@ -26,8 +26,9 @@ export class DynamoNTS_SocketServer_Mock extends DynamoNTS_SocketServerService<D
   protected async getPresenceFromSubscrioptionEventContent(socketSubscription: any, socket: Socket): Promise<DynamoNTS_SocketPresence> {
     return new DynamoNTS_SocketPresence({ 
       issuerId: socketSubscription.issuerId, 
-      sockets: [ socket ] 
-    }, 'ISSUER');
+      sockets: [ socket ],
+      issuer: 'ISSUER socketServer_Mock',
+    });
   }
 }
 

package/src/_models/control-models/endpoint-params.control-model.ts

@@ -185,9 +185,11 @@ export class DynamoNTS_EndpointParams{
         }
       } catch (error) {
         Dynamo_Log.error(
-          'UNCATCHED getFullExecution ERROR', 
+          `UNCATCHED endpoint ERROR (${this.name}, ${this.endpoint})`,
+          '\nError:', error,
           '\nRequest:', req,
-          '\nResponse:', res, error, issuer
+          '\nResponse:', res, 
+          '\nissuer:', issuer
         );
       }
     };
@@ -234,10 +236,11 @@ export class DynamoNTS_EndpointParams{
         }
       }
     } catch (error) {
-      Dynamo_Log.error(
+      Dynamo_Log.H_error(
         `\n\nDYNAMO MULTILEVEL ERROR:DynamoNTS_EndpointParams: error: (${this.name}, ${this.endpoint})` +
         `\n(DYNAMO MULTILEVEL ERROR means, that the ERRORHANDLING is ALSO FAILED, and the error message was not sent.)` + 
-        `\nERROR:`, error, '\n'
+        `\nERROR:`, error, 
+        '\n'
       );
     }
   }

package/src/_models/{interfaces/port-settings.interface.ts → control-models/http-settings.control-model.ts}

@@ -1,6 +1,6 @@
 
 import * as BodyParser from 'body-parser';
-export class DynamoNTS_PortSettings {
+export class DynamoNTS_HttpSettings {
   httpPort?: number;
   httpsPort?: number;
 
@@ -20,7 +20,7 @@ export class DynamoNTS_PortSettings {
   };
 
   constructor(
-    set: DynamoNTS_PortSettings
+    set: DynamoNTS_HttpSettings
   ) {
     Object.assign(this, set);
   }

package/src/_models/control-models/socket-presence.control-model.ts

@@ -17,8 +17,16 @@ export class DynamoNTS_SocketPresence {
   sockets?: SocketIO.Socket[] = [];
   
   constructor(
-    set: DynamoNTS_SocketPresence,
-    issuer: string
+    set: {
+      issuerId: string,
+      serviceName?: string,
+      onDestroy?: (issuerId: string) => void,
+
+      defaultErrorUserMsg?: string,
+      sockets?: SocketIO.Socket[],
+
+      issuer: string,
+    },
   ) {
     if (!set?.issuerId) {
       throw new Dynamo_Error({ 
@@ -28,7 +36,7 @@ export class DynamoNTS_SocketPresence {
             `trying to create DynamoNTS_SocketPresence without a valid issuerId!` +
             `\nset: ${JSON.stringify(set)}`
           ),
-          issuer
+          set?.issuer
         ),
 
         errorCode: 'NTS-SD0-C00',
@@ -55,7 +63,7 @@ export class DynamoNTS_SocketPresence {
             `trying to create DynamoNTS_SocketPresence without a single active socket!` +
             `\nissuerId: ${this.issuerId}`
           ),
-          issuer
+          set?.issuer
         ),
 
         errorCode: 'NTS-SD0-C01',
@@ -149,7 +157,7 @@ export class DynamoNTS_SocketPresence {
     }
   }
   
-  private _getDefaultErrorSettings?(fnName: string, error: Error | Dynamo_Error, issuer: string) {
+  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error, issuer: string) {
     return {
       status: (error as Dynamo_Error)?.___status ?? 406,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,

package/src/_models/interfaces/index.ts

@@ -1,7 +1,7 @@
 
 // INTERFACES
 export * from './global-service-settings.interface';
-export * from './port-settings.interface';
+export * from '../control-models/http-settings.control-model';
 export * from './certification-settings.interface';
 export * from './global-settings.interface';
 export * from './routing-module-settings.interface';

package/src/_modules/app-extended.index.ts

@@ -9,7 +9,7 @@ export * from '../_services/socket/socket-server.service';
 
 // INTERFACES
 export * from '../_models/interfaces/global-service-settings.interface';
-export * from '../_models/interfaces/port-settings.interface';
+export * from '../_models/control-models/http-settings.control-model';
 export * from '../_models/interfaces/certification-settings.interface';
 export * from '../_models/interfaces/global-settings.interface';
 export * from '../_models/interfaces/routing-module-settings.interface';

package/src/_modules/app.index.ts

@@ -7,7 +7,7 @@ export * from '../_services/shared.static-service';
 
 // INTERFACES
 export * from '../_models/interfaces/global-service-settings.interface';
-export * from '../_models/interfaces/port-settings.interface';
+export * from '../_models/control-models/http-settings.control-model';
 export * from '../_models/interfaces/certification-settings.interface';
 export * from '../_models/interfaces/global-settings.interface';
 export * from '../_models/interfaces/routing-module-settings.interface';

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

@@ -383,7 +383,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
               (mod: DynamoNTS_SocketServerService<any>) => mod.port === service.port
             );
 
-            if (1 < existingPorts.length || this.ports.httpPort === service.port || this.ports.httpsPort === 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');
               errorStack.splice(1, 4);

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

@@ -7,15 +7,13 @@ import * as Https from 'https';
 import * as FileSystem from 'fs';
 import * as BodyParser from 'body-parser';
 
-import { ErrorRequestHandler } from 'express';
-
 import { Dynamo_Array, Dynamo_Error, dynamo_error_default, Dynamo_Log, second, 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_PortSettings } from '../../_models/interfaces/port-settings.interface';
+import { DynamoNTS_HttpSettings } from '../../_models/control-models/http-settings.control-model';
 import { DynamoNTS_CertificationSettings } from '../../_models/interfaces/certification-settings.interface';
 import { DynamoNTS_GlobalServiceSettings } from '../../_models/interfaces/global-service-settings.interface';
 import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
@@ -197,8 +195,8 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private _security: DynamoNTS_RouteSecurity;
   protected get security(): DynamoNTS_RouteSecurity { return this._security; }
 
-  protected _portSettings: DynamoNTS_PortSettings;
-  protected get ports(): DynamoNTS_PortSettings { return this._portSettings; }
+  protected _portSettings: DynamoNTS_HttpSettings;
+  protected get portSettings(): DynamoNTS_HttpSettings { return this._portSettings; }
 
   private _cert?: DynamoNTS_CertificationSettings;
   protected get cert(): DynamoNTS_CertificationSettings { return this._cert; }
@@ -745,11 +743,50 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     }
   }
 
+  private async expressErrorHandling(err, req, res, next): Promise<void> {
+    try {
+      if (err) {
+        if (DynamoNTS_GlobalService.globalErrorHandler) {
+          Dynamo_Log.error('unhandled express ERROR (must be a parsing error...)');
+          await DynamoNTS_GlobalService.globalErrorHandler?.(err, req, res);
+        } else {
+          Dynamo_Log.error('unhandled express ERROR (must be a parsing error...)', err);          
+        }
+      } else {
+        Dynamo_Log.H_error(
+          'WTF??? express error; without error?...' + 
+          '\nerr:', err,
+          '\nreq:', req,
+          '\nres:', res
+        );
+      }
+
+      res.status(err?.status || 500);
+      res.render('error', {
+        message: err?.message,
+      });
+      res.send(err);
+    } catch (error) {
+      Dynamo_Log.H_error(
+        'MULTILEVEL ERROR (expressErrorHandling)....', error
+      );
+      
+      res.status(err?.status || 500);
+      res.render('error', {
+        message: err?.message,
+      });
+      res.send(err);
+    }
+  }
+
   /**
    * 
    */
   private async mountSecureRoutes (): Promise<void> {
     if (this.logFn && this.deepLog) console.log('\nfn:. mountSecureRoutes');
+    
+    this.openExpress.use(this.expressErrorHandling);
+
     await Dynamo_Array.asyncForEach(this._routingModules, async (module: DynamoNTS_RoutingModule) => {
       if (module.security !== DynamoNTS_RouteSecurity.open) {
         if (this.logSetup) { 
@@ -789,16 +826,7 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private async mountOpenRoutes(): Promise<void> {
     if (this.logFn && this.deepLog) console.log('\nfn:. mountOpenRoutes');
 
-    this.openExpress.use((err, req, res, next) => {
-      if (err) {
-        Dynamo_Log.error('openExpress ERROR', err);
-        DynamoNTS_GlobalService.globalErrorHandler?.(err, req, res);
-      } else {
-        Dynamo_Log.H_error('WTF', err, req, res);
-      }
-
-      next();
-    })
+    this.openExpress.use(this.expressErrorHandling);
 
     await Dynamo_Array.asyncForEach(this._routingModules, async (module: DynamoNTS_RoutingModule) => {
       if (module.security !== DynamoNTS_RouteSecurity.secure) {
@@ -875,51 +903,19 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   }
 
   /**
-   * #OUTDATED
-   * Setting up App params, and preparing project global settings
-   * You must setup app params in this function like this:
-   * 
-   * @example
-   * setupAppParams(): void {
-   *   this.params = new DynamoBEAppParams({
-   *     name: 'Sample Server',
-   *     title: 'A BIG nice header that will be logged on start',
-   *     version: version,
-   *     dbName: 'sampleapp',
-   *   });
-   *  
-   *   DBE_Global_S.setGlobalSettings({
-   *     defaultRouteSecurity: DynamoBERouteSecurity.secure,
-   *     logSetup: true,
-   *   });
-   * }
+   * MISSING Description (TODO)
    */
   abstract getAppParams(): DynamoNTS_AppParams;
 
   /**
-   * #OUTDATED
-   * Setting up DBServices
-   * You must setup globalServiceCollection and dbServices in this function
-   * 
-   * @example
-   * setGlobalServiceCollection(): void {
-   *   DBE_Global_S.setServices({
-   *     authService: AuthService.getInstance(),
-   *     emailServiceCollection: EmailServiceCollectionService.getInstance(),
-   *     dbModels: [
-   *       accountModelParams,
-   *       projectModelParams,
-   *       ...
-   *     ]
-   *   });
-   * }
+   * MISSING Description (TODO)
    */
   abstract getGlobalServiceCollection(): DynamoNTS_GlobalServiceSettings;
   
   /**
    * MISSING Description (TODO)
    */
-  abstract getPortSettings(): DynamoNTS_PortSettings;
+  abstract getPortSettings(): DynamoNTS_HttpSettings;
 
   /**
    * MISSING Description (TODO)

package/lib/_models/interfaces/port-settings.interface.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"port-settings.interface.d.ts","sourceRoot":"","sources":["../../../src/_models/interfaces/port-settings.interface.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,qBAAa,sBAAsB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,kBAAkB,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAG/C;IACF,gBAAgB,CAAC,EAAE,UAAU,CAAC,WAAW,CAEvC;IACF,mBAAmB,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAGhD;IACF,iBAAiB,CAAC,EAAE,UAAU,CAAC,WAAW,CAExC;gBAGA,GAAG,EAAE,sBAAsB;CAI9B"}

package/lib/_models/interfaces/port-settings.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"port-settings.interface.js","sourceRoot":"","sources":["../../../src/_models/interfaces/port-settings.interface.ts"],"names":[],"mappings":";;;AAEA,MAAa,sBAAsB;IACjC,QAAQ,CAAU;IAClB,SAAS,CAAU;IAEnB,kBAAkB,GAAkC;QAClD,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,gBAAgB,GAA4B;QAC1C,KAAK,EAAE,MAAM;KACd,CAAC;IACF,mBAAmB,GAAkC;QACnD,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,iBAAiB,GAA4B;QAC3C,KAAK,EAAE,MAAM;KACd,CAAC;IAEF,YACE,GAA2B;QAE3B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAxBD,wDAwBC"}