@futdevpro/nts-dynamo 1.7.2 → 1.7.5

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_PortSettings } from '../../_models/control-models/port-settings.control-model';
 import { getTestRoutingModule } from '../../_modules/test';
 import { getUsageRoutingModule } from '../../_modules/usage';
 import { DynamoNTS_SingletonService } from '../../_services';

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_PortSettings } from '../../_models/control-models/port-settings.control-model';
 import { getTestRoutingModule } from '../../_modules/test';
 import { getUsageRoutingModule } from '../../_modules/usage';
 import { DynamoNTS_SingletonService } from '../../_services';

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

@@ -24,7 +24,10 @@ 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 ] });
+    return new DynamoNTS_SocketPresence({ 
+      issuerId: socketSubscription.issuerId, 
+      sockets: [ socket ] 
+    }, 'ISSUER socketServer_Mock');
   }
 }
 

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

@@ -141,25 +141,6 @@ export class DynamoNTS_EndpointParams{
         } else {
           Dynamo_Log.info(msg);
         }
-
-        /* if (this.logRequestsContent) {
-          const params = this.getPathParamsLogContent(req);
-
-          if (req.body && 0 < Object.keys(req.body).length) {
-            console.log(
-              `===>   incoming ${this.name} request... (issuer: ${issuer})` +
-              `\npathParams: ${params}` +
-              `\nbody:`, req.body
-            );
-          } else {
-            console.log(
-              `===>   incoming ${this.name} request... (issuer: ${issuer})` +
-              `\npathParams: ${params}`
-            );
-          }
-        } else {
-          console.log(`===>   incoming ${this.name} request...`);
-        } */
       }
 
     } catch (error) {
@@ -203,7 +184,13 @@ export class DynamoNTS_EndpointParams{
           }
         }
       } catch (error) {
-        this.error(req, res, error, issuer);
+        Dynamo_Log.error(
+          `UNCATCHED endpoint ERROR (${this.name}, ${this.endpoint})`,
+          '\nError:', error,
+          '\nRequest:', req,
+          '\nResponse:', res, 
+          '\nissuer:', issuer
+        );
       }
     };
   }
@@ -217,10 +204,9 @@ export class DynamoNTS_EndpointParams{
     try {
       let msg: string = `Endpoint catched an error. ${this.name} (${this.endpoint})`;
       msg += this.getPathParamsLogContent(req);
-      msg += `\nERROR:`;
 
       Dynamo_Log.error(msg);
-      console.log(
+      Dynamo_Log.log('ERROR:',
         (error as Dynamo_Error)?.flag?.includes('DYNAMO') ? 
           (error as Dynamo_Error).getErrorSimplified() : 
           error, 
@@ -250,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/control-models/port-settings.control-model.ts

@@ -0,0 +1,27 @@
+
+import * as BodyParser from 'body-parser';
+export class DynamoNTS_PortSettings {
+  httpPort?: number;
+  httpsPort?: number;
+
+  httpEncodeSettings?: BodyParser.OptionsUrlencoded = {
+    limit: '50mb', 
+    extended: true,
+  };
+  httpJsonSettings?: BodyParser.OptionsJson = {
+    limit: '50mb',
+  };
+  httpsEncodeSettings?: BodyParser.OptionsUrlencoded = {
+    limit: '50mb', 
+    extended: true,
+  };
+  httpsJsonSettings?: BodyParser.OptionsJson = {
+    limit: '50mb',
+  };
+
+  constructor(
+    set: DynamoNTS_PortSettings
+  ) {
+    Object.assign(this, set);
+  }
+}

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

@@ -7,34 +7,58 @@ import * as SocketIO from 'socket.io';
  */
 export class DynamoNTS_SocketPresence {
   issuerId: string;
-  serviceName?: string;
-  sockets?: SocketIO.Socket[] = [];
+  serviceName?: string = 'unknown';
   onDestroy?: (issuerId: string) => void = id => {};
-
+  
+  defaultErrorUserMsg?: string = 
+  `We encountered an unhandled Socket Error, ` +
+  `\nplease contact the responsible development team.`; 
+  
+  sockets?: SocketIO.Socket[] = [];
+  
   constructor(
-    set: DynamoNTS_SocketPresence
+    set: DynamoNTS_SocketPresence,
+    issuer: string
   ) {
     if (!set?.issuerId) {
       throw new Dynamo_Error({ 
-        status: 406, 
+        ...this._getDefaultErrorSettings(
+          'constructor',
+          new Error(
+            `trying to create DynamoNTS_SocketPresence without a valid issuerId!` +
+            `\nset: ${JSON.stringify(set)}`
+          ),
+          issuer
+        ),
+
         errorCode: 'NTS-SD0-C00',
-        addECToUserMsg: true,
-        message: 'trying to create DynamoNTS_SocketPresence without a valid issuerId!',
-        userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.'
       });
     }
 
     this.issuerId = set.issuerId;
-    this.serviceName = set.serviceName ?? 'unknown';
-    this.onDestroy = set.onDestroy ?? (id => {});
+    
+    if (set.serviceName) {
+      this.serviceName = set.serviceName;
+    }
+    if (set.onDestroy) {
+      this.onDestroy = set.onDestroy;
+    }
+    if (set.defaultErrorUserMsg) {
+      this.defaultErrorUserMsg = set.defaultErrorUserMsg;
+    }
 
     if (!set?.sockets?.length) {
       throw new Dynamo_Error({ 
-        status: 406, 
+        ...this._getDefaultErrorSettings(
+          'constructor',
+          new Error(
+            `trying to create DynamoNTS_SocketPresence without a single active socket!` +
+            `\nissuerId: ${this.issuerId}`
+          ),
+          issuer
+        ),
+
         errorCode: 'NTS-SD0-C01',
-        addECToUserMsg: true,
-        message: 'trying to create DynamoNTS_SocketPresence without a single active socket!',
-        userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.'
       });
     }
 
@@ -46,7 +70,7 @@ export class DynamoNTS_SocketPresence {
    * @param event 
    * @param content 
    */
-  emitEvent?(event: string, content: any) {
+  emitEvent?(event: string, content: any, issuer: string) {
     /* let anyFailed: boolean = false; */
     const errors = [];
     const inactiveSockets: SocketIO.Socket[] = [];
@@ -91,26 +115,51 @@ export class DynamoNTS_SocketPresence {
 
     if (0 < errors.length) {
       throw new Dynamo_Error({
+        ...this._getDefaultErrorSettings(
+          'emitEvent',
+          new Error(
+            `Emitting event '${event}' on socket(s)(${this.serviceName}) failed!`+
+            `\n${errors.length} errors occured!`
+          ),
+          issuer
+        ),
+
         status: 500,
         errorCode: 'NTS-SPC-EE2',
-        addECToUserMsg: true,
-        message: `Emitting event '${event}' on socket(s)(${this.serviceName}) failed!`,
-        userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.',
         additionalContent: {
           inactiveSockets: inactiveSockets,
           errors: errors,
         }
       });
+
     } else if (this.sockets.length === 0) {
       throw new Dynamo_Error({
+        ...this._getDefaultErrorSettings(
+          'emitEvent',
+          new Error(
+            `Emitting event '${event}' on socket(s)(${this.serviceName}) failed!`+ 
+            `\n  No more sockets left connected!`
+          ),
+          issuer
+        ),
+
         status: 404,
         errorCode: 'NTS-SPC-EE3',
-        addECToUserMsg: true,
-        message: `Emitting event '${event}' on socket(s)(${this.serviceName}) failed! No more sockets left connected!`,
-        userMessage: 'We encountered an unhandled Server Error, please contact the responsible development team.',
       });
     }
   }
+  
+  private _getDefaultErrorSettings?(fnName: string, error: Error | Dynamo_Error, issuer: string): any {
+    return {
+      status: (error as Dynamo_Error)?.___status ?? 406,
+      message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
+      userMessage: this.defaultErrorUserMsg,
+      issuerService: this.serviceName + ` (${this?.constructor?.name}-DynamoNTS_SocketPresence)`,
+      addECToUserMsg: true,
+      issuer: issuer,
+      error: error,
+    }
+  }
 
 }
 

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/port-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/port-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/port-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/base/data.service.ts

@@ -548,7 +548,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
    * (when you simultaneously trying to change the same data's 
    * different values from different flows)
    */
-  async saveData(): Promise<void> {
+  async saveData(): Promise<T> {
     try {
       if (!this.data) {
         throw new Dynamo_Error({ 
@@ -561,7 +561,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       if (!this.data._id && (!this.depKey || !this.data[this.depKey])) {
         // if ID of dependencyID is not present, data not exists, create new data
         this.data = await this.dataDBService.createData(this.data, this.issuer);
-        return;
+        return this.data;
       }
 
       let dataExists: T;
@@ -569,10 +569,12 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       // check if data already exists with the specific ID
       if (this.data._id) {
         dataExists = await this.getDataById(null, true);
+
         if (dataExists) {
           // if data exists do modify
           this.data = await this.dataDBService.modifyData(this.data, this.issuer);
-          return;
+          return this.data;
+
         } else {
           throw new Dynamo_Error({ 
             ...this._getDefaultErrorSettings(
@@ -603,7 +605,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
           if (dataExists) {
             // if data exists do modify
             this.data = await this.dataDBService.modifyData(this.data, this.issuer);
-            return;
+            return this.data;
           } else {
             // if data not exists check that dependency already exists for this
             const dependencyExists = await this.getDependencyDataDBService().getDataById(this.data[this.depKey]);
@@ -623,6 +625,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
 
       // if data not exists create new data
       this.data = await this.dataDBService.createData(this.data, this.issuer);
+      return this.data;
 
     } catch (error) {
       if (['NTS-DS0-SD1', 'NTS-DS0-SD2'].includes(error?.errorCode)) {
@@ -784,7 +787,7 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
       addECToUserMsg: true,
       userMessage: this.defaultErrorUserMsg,
       issuer: this.issuer,
-      issuerService: this.serviceName,
+      issuerService: this.serviceName + ` (${this?.constructor?.name}-DynamoNTS_DataService)`,
       error: error,
     }
   }

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

@@ -205,49 +205,53 @@ export class DynamoNTS_ApiService {
             Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL`/* , new Error() */);
 
             throw new Dynamo_Error({
-                errorCode: 'NTS-API-002',
-                addECToUserMsg: true,
+                ...this._getDefaultErrorSettings(
+                    callParams.name + ' startApiCall',
+                    error.response.data
+                ),
+
+                errorCode: 'NTS-API-SAC1',
                 message: 'API call failed on the other end! error response found...', 
-                userMessage: this.defaultErrorUserMsg, 
-                issuerService: this.name,
-                error: error.response.data,
             });
 
         } else if (error.code === 'ENOTFOUND') {
             Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL`/* , new Error() */);
 
             throw new Dynamo_Error({ 
+                ...this._getDefaultErrorSettings(
+                    callParams.name + ' startApiCall',
+                    error
+                ),
+
                 status: 404, 
-                errorCode: 'NTS-API-003',
-                addECToUserMsg: true,
+                errorCode: 'NTS-API-SAC2',
                 message: 'DNS error; address cannot be resolved!', 
-                userMessage: this.defaultErrorUserMsg, 
-                issuerService: this.name,
-                error 
             });
 
         } else if (error.code === 'ECONNREFUSED') {
             Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL`/* , new Error() */);
 
             throw new Dynamo_Error({ 
+                ...this._getDefaultErrorSettings(
+                    callParams.name + ' startApiCall',
+                    error
+                ),
+
                 status: 404, 
-                errorCode: 'NTS-API-004',
-                addECToUserMsg: true,
-                message: 'Authentication error!', 
-                userMessage: this.defaultErrorUserMsg, 
-                issuerService: this.name,
-                error 
+                errorCode: 'NTS-API-SAC3',
+                message: `Can't connect to the endpoin!`, 
             });
 
         } else if (error.config && error.message) {
 
             throw new Dynamo_Error({ 
+                ...this._getDefaultErrorSettings(
+                    callParams.name + ' startApiCall',
+                    error
+                ),
+
                 status: +error.message.substring(error.message.length - 4, 3), 
-                errorCode: 'NTS-API-005',
-                addECToUserMsg: true,
-                userMessage: this.defaultErrorUserMsg, 
-                issuerService: this/* .constructor */.name,
-                error 
+                errorCode: 'NTS-API-SAC4',
             });
         } else {
             Dynamo_Log.error(`\n${callParams.name} was UNSUCCESSFUL`, error/*, '\n\n' , new Error() */);
@@ -256,5 +260,16 @@ export class DynamoNTS_ApiService {
         }
     }
   }
+    
+  private static _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error) {
+    return {
+      status: (error as Dynamo_Error)?.___status ?? 500,
+      message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
+      addECToUserMsg: true,
+      userMessage: this.defaultErrorUserMsg,
+      issuerService: `${this?.constructor?.name}-${this?.name}-DynamoNTS_ApiService`,
+      error: error,
+    }
+  }
 }
 

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

@@ -114,8 +114,8 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
   
   private systemControlsExt: DynamoNTS_AppExtSysControls = new DynamoNTS_AppExtSysControls();
   override get started(): boolean { return this.systemControlsExt.appExtended.started; }
-  private httpsSocketCount: number = 0;
-  private httpSocketCount: number = 0;
+  private httpsSocketSettingUpCount: number = 0;
+  private httpSocketSettingUpCount: number = 0;
 
   private socketSecurity: DynamoNTS_RouteSecurity;
 
@@ -137,7 +137,11 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
     super(true);
 
     this.asyncConstructExt().catch((error: any) => {
-      Dynamo_Log.error(`\nExtended Application: ${this.params?.name} start failed.\n`, error, '\n');
+      Dynamo_Log.error(
+        `\nExtended Application: ${this.params?.name} start failed.` +
+        `\n`, error, 
+        '\n'
+      );
     });
   }
 
@@ -169,7 +173,11 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
       Dynamo_Log.H_success(`${this.params.name} started successfully.`);
       
     } catch (error) {
-      Dynamo_Log.error(`\nExtended Application: ${this.params?.name} start failed.\n`, error, '\n');
+      Dynamo_Log.error(
+        `\nExtended Application: ${this.params?.name} start failed.` +
+        `\n`, error,
+        '\n'
+      );
       throw new Dynamo_Error({
         errorCode: 'NTS-AES-001',
         error: error,
@@ -375,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);
@@ -387,7 +395,7 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
 
             if (service.security === DynamoNTS_SocketSecurity.open) {
               if (this.logSetup) console.log(`\nsocket setup (open): ${service?.name}:${service.port}`);
-              this.httpSocketCount++;
+              this.httpSocketSettingUpCount++;
               this.systemControlsExt.httpSocketServer.started = false;
 
               this.allSocketServers.push(
@@ -395,8 +403,8 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
                   new SocketIO.Server(this.httpSocketServer), 
                   DynamoNTS_SocketSecurity.open, 
                   () => { 
-                    this.httpSocketCount--;
-                    if (this.httpSocketCount === 0) {
+                    this.httpSocketSettingUpCount--;
+                    if (this.httpSocketSettingUpCount === 0) {
                       this.systemControlsExt.httpSocketServer.started = true;
                     }
                   }
@@ -405,7 +413,7 @@ 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}`);
-              this.httpsSocketCount++;
+              this.httpsSocketSettingUpCount++;
               this.systemControlsExt.httpsSocketServer.started = false;
 
               this.allSocketServers.push(
@@ -413,8 +421,8 @@ export abstract class DynamoNTS_AppExtended extends DynamoNTS_App {
                   new SocketIO.Server(this.httpsServer), 
                   DynamoNTS_SocketSecurity.secure, 
                   () => {
-                    this.httpsSocketCount--;
-                    if (this.httpsSocketCount === 0) {
+                    this.httpsSocketSettingUpCount--;
+                    if (this.httpsSocketSettingUpCount === 0) {
                       this.systemControlsExt.httpsSocketServer.started = true;
                     }
                   }