@futdevpro/nts-dynamo 1.7.21 → 1.7.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futdevpro/nts-dynamo",
-  "version": "01.07.21",
+  "version": "01.07.22",
   "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
   "scripts": {
     "prep": "npm i rimraf nodemon -g",

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

@@ -1,5 +1,5 @@
 
-import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { Dynamo_AnyError, Dynamo_Error, Dynamo_Error_Settings, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 import * as SocketIO from 'socket.io';
 
 /**
@@ -157,16 +157,20 @@ export class DynamoNTS_SocketPresence {
     }
   }
   
-  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error, issuer: string) {
+  private _getDefaultErrorSettings(
+    fnName: string, 
+    error: Dynamo_AnyError, 
+    issuer: string
+  ): Dynamo_Error_Settings {
     return {
       status: (error as Dynamo_Error)?.___status ?? 406,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
-      userMessage: this.defaultErrorUserMsg,
+      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuerService: this.serviceName + ` (${this?.constructor?.name}-DynamoNTS_SocketPresence)`,
-      addECToUserMsg: true,
+      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
       issuer: issuer,
       error: error,
-    }
+    };
   }
 
 }

package/src/_services/base/data.service.ts

@@ -1,6 +1,6 @@
 
 import { 
-  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error, Dynamo_Log 
+  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error, Dynamo_Log, Dynamo_AnyError, Dynamo_Error_Settings 
 } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_DBFilter } from '../../_models/types/db-filter.type';
 import { DynamoNTS_DBUpdate } from '../../_models/types/db-update.type';
@@ -884,13 +884,14 @@ export class DynamoNTS_DataService<T extends Dynamo_Metadata> {
     }
   }
   
-  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error) {
+  private _getDefaultErrorSettings(fnName: string, error: Dynamo_AnyError): Dynamo_Error_Settings {
     return {
       status: (error as Dynamo_Error)?.___status ?? 500,
       message: 
-        (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.dataParams.dataName})`,
-      addECToUserMsg: true,
-      userMessage: this.defaultErrorUserMsg,
+        (error as Error)?.message ?? 
+        `${fnName} was UNSUCCESFUL (NTS; ${this.dataParams.dataName})`,
+      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
+      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuer: this.issuer,
       issuerService: this.serviceName + ` (${this?.constructor?.name}-DynamoNTS_DataService)`,
       error: error,

package/src/_services/base/db.service.ts

@@ -3,7 +3,7 @@ import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
 
 import { 
-  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error, Dynamo_Log 
+  Dynamo_Metadata, Dynamo_DataParams, Dynamo_DataPropertyParams, Dynamo_Error, Dynamo_Log, Dynamo_AnyError, Dynamo_Error_Settings 
 } from '@futdevpro/fsm-dynamo';
 import { DynamoNTS_DBFilter } from '../../_models/types/db-filter.type';
 import { DynamoNTS_DBUpdate } from '../../_models/types/db-update.type';
@@ -901,12 +901,16 @@ export class DynamoNTS_DBService<T extends Dynamo_Metadata> {
     return data;    
   }
 
-  private _getDefaultErrorSettings(fnName: string, error: Dynamo_Error | Error, issuer?: string) {
+  private _getDefaultErrorSettings(
+    fnName: string, 
+    error: Dynamo_AnyError, 
+    issuer?: string
+  ): Dynamo_Error_Settings {
     return {
       status: (error as Dynamo_Error)?.___status ?? 500,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS-DB)`,
-      addECToUserMsg: true,
-      userMessage: this.defaultErrorUserMsg,
+      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
+      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuer: issuer,
       issuerService: this.serviceName,
       error: error,

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

@@ -1,6 +1,8 @@
 
 import * as Axios from 'axios';
-import { Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { 
+  Dynamo_AnyError, Dynamo_Error, Dynamo_Error_Settings, Dynamo_Log 
+} from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoNTS_HttpResponseType } from '../../_enums/http/http-response-type.enum';
@@ -48,7 +50,7 @@ export class DynamoNTS_ApiService {
      * you can pass data and other inputs in this section
      */
     inputParams?: DynamoNTS_ApiCallInputParams<T_Body>
-  ): Promise<T_Response> {
+  ): Promise<T_Response | Axios.AxiosResponse> {
     try {
       let a: T_Response;
       let url: string = callParams.baseUrl + callParams.endPoint;
@@ -107,7 +109,7 @@ export class DynamoNTS_ApiService {
       }
 
       if (callParams.getFullResponse) {
-        return a as Axios.AxiosResponse as T_Response;
+        return a as Axios.AxiosResponse;
 
       } else {
         return a as T_Response;
@@ -390,13 +392,15 @@ export class DynamoNTS_ApiService {
     return url;
   }
 
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  private static _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error) {
+  private static _getDefaultErrorSettings(
+    fnName: string, 
+    error: Dynamo_AnyError
+  ): Dynamo_Error_Settings {
     return {
       status: (error as Dynamo_Error)?.___status ?? 500,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
-      addECToUserMsg: true,
-      userMessage: this.defaultErrorUserMsg,
+      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
+      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuerService: `${this?.constructor?.name}-${this?.name}-DynamoNTS_ApiService`,
       error: error,
     };

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

@@ -5,7 +5,7 @@ import * as NodeMailer from 'nodemailer';
 
 import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
 
-import { Dynamo_Array, Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { Dynamo_AnyError, Dynamo_Array, Dynamo_Error, Dynamo_Error_Settings, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 export interface DynamoNTS_EmailServiceSettings {
   host: string,
@@ -196,6 +196,7 @@ export class DynamoNTS_EmailService {
         throw new Dynamo_Error({
           ...this._getDefaultErrorSettings('sendEmail', error, issuer),
 
+          addECToUserMsg: false,
           errorCode: 'NTS-ES0-SE4',
           userMessage: `Can't send mail to ${set.to}!`,
           message: `sendEmail failed to ${set.to}`,
@@ -365,7 +366,7 @@ export class DynamoNTS_EmailService {
           ...this._getDefaultErrorSettings(
             'setupComponent',
             new Error(
-              `ComponentProperty missing from input! ${propertyKey} for ${component.name}`
+              `ComponentProperty missing from input! '${propertyKey}' for ${component.name}`
             ),
             issuer
           ),
@@ -658,19 +659,17 @@ export class DynamoNTS_EmailService {
       });
     }
   }
-  
-  
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    
   private _getDefaultErrorSettings(
     fnName: string, 
-    error: Error | Dynamo_Error, 
+    error: Dynamo_AnyError, 
     issuer: string
-  )/* : Dynamo_ErrorSettings */ {
+  ): Dynamo_Error_Settings {
     return {
       status: (error as Dynamo_Error)?.___status ?? 500,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS; ${this.serviceName})`,
-      addECToUserMsg: true,
-      userMessage: this.defaultErrorUserMsg,
+      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
+      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuer: issuer,
       issuerService: this.serviceName,
       error: error,

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

@@ -12,7 +12,9 @@ import * as BodyParser from 'body-parser';
 /* import { version } from '../../../package.json'; */
 
 import { 
+  Dynamo_AnyError,
   Dynamo_Array, Dynamo_Error, dynamo_error_default, 
+  Dynamo_Error_Settings, 
   Dynamo_ErrorLevel, Dynamo_Log, second, wait 
 } from '@futdevpro/fsm-dynamo';
 
@@ -1021,7 +1023,9 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
   private async mountOpenRoutes(): Promise<void> {
     if (this.logFn && this.deepLog) Dynamo_Log.log('\nfn:. mountOpenRoutes');
 
-    this.openExpress.use(this.expressErrorHandling);
+    this.openExpress.use(
+      (error, req, res, next): Promise<void> => this.expressErrorHandling(error, req, res, next)
+    );
 
     await Dynamo_Array.asyncForEach(
       this._routingModules, 
@@ -1093,14 +1097,12 @@ export abstract class DynamoNTS_App extends DynamoNTS_SingletonService {
     }
   }
     
-  private _getDefaultErrorSettings(
-    fnName: string, error: Error | Dynamo_Error
-  )/* : Dynamo_ErrorSettings */ {
+  private _getDefaultErrorSettings(fnName: string, error: Dynamo_AnyError): Dynamo_Error_Settings {
     return {
       status: (error as Dynamo_Error)?.___status ?? 500,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
-      addECToUserMsg: true,
-      userMessage: this.defaultErrorUserMsg,
+      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
+      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuerService: `${this?.constructor?.name}-DynamoNTS_App`,
       error: error,
       level: Dynamo_ErrorLevel.fatal,

package/src/_services/socket/socket-server.service.ts

@@ -1,7 +1,7 @@
 
 import * as SocketIO from 'socket.io';
 
-import { Dynamo_Array, Dynamo_Error, Dynamo_Log } from '@futdevpro/fsm-dynamo';
+import { Dynamo_AnyError, Dynamo_Array, Dynamo_Error, Dynamo_Error_Settings, Dynamo_Log } from '@futdevpro/fsm-dynamo';
 
 import { DynamoNTS_SingletonService } from '../base/singleton.service';
 import { dynamoNTS_globalSettings } from '../../_constants/global-settings.const';
@@ -491,6 +491,7 @@ export abstract class DynamoNTS_SocketServerService<
       });
     } catch (error) {
       Dynamo_Log.error(`socket(${this.params.name}) Event Broadcast (${event}) failed`, error);
+      
       throw new Dynamo_Error({
         ...this._getDefaultErrorSettings('broadcastEvent', error),
         
@@ -500,16 +501,20 @@ export abstract class DynamoNTS_SocketServerService<
     }
   }
 
-  private _getDefaultErrorSettings(fnName: string, error: Error | Dynamo_Error, issuer?: string) {
+  private _getDefaultErrorSettings(
+    fnName: string, 
+    error: Dynamo_AnyError, 
+    issuer?: string
+  ): Dynamo_Error_Settings {
     return {
       status: (error as Dynamo_Error)?.___status ?? 500,
       message: (error as Error)?.message ?? `${fnName} was UNSUCCESFUL (NTS)`,
-      addECToUserMsg: true,
-      userMessage: this.defaultErrorUserMsg,
+      addECToUserMsg: !(error as Dynamo_Error)?.__userMessage,
+      userMessage: (error as Dynamo_Error)?.__userMessage ?? this.defaultErrorUserMsg,
       issuer: issuer,
       issuerService: this.constructor?.name,
       error: error,
-    }
+    };
   }
 
   /**