connectfy-shared 0.0.67 → 0.0.68

package/dist/index.cjs

@@ -9517,7 +9517,8 @@ module.exports = __toCommonJS(index_exports);
 // src/class/server/base.exception.ts
 var import_microservices = require("@nestjs/microservices");
 var BaseException = class extends import_microservices.RpcException {
-  constructor(message = ExceptionMessages.INTERNAL_SERVER_ERROR_MESSAGE, statusCode = 500 /* INTERNAL_SERVER_ERROR */, error = ExceptionTypes.INTERNAL_SERVER_ERROR, additional) {
+  constructor(messageOrFunc = ExceptionMessages.INTERNAL_SERVER_ERROR_MESSAGE, statusCode = 500 /* INTERNAL_SERVER_ERROR */, error = ExceptionTypes.INTERNAL_SERVER_ERROR, additional) {
+    const message = typeof messageOrFunc === "function" ? messageOrFunc() : messageOrFunc;
     super({ message, statusCode, error, additional });
   }
 };
@@ -11097,17 +11098,17 @@ var AllExceptionsFilter = class {
     let statusCode = import_common3.HttpStatus.INTERNAL_SERVER_ERROR;
     let errorType = ExceptionTypes.INTERNAL_SERVER_ERROR;
     let additional;
-    console.log("\n");
-    if (exception.stack) this.logger.error("Exception stack", exception.stack);
-    this.logger.error("Exception caught", JSON.stringify(exception, null, 2));
-    if (exception instanceof import_microservices2.RpcException) {
-      const error = exception.getError();
-      if (typeof error === "object") {
-        message = error?.message || message;
-        statusCode = error?.statusCode || statusCode;
-        errorType = error?.error || errorType;
-        additional = error?.additional;
-      } else message = error;
+    const isRpcException = exception instanceof import_microservices2.RpcException || exception && typeof exception === "object" && "error" in exception && typeof exception.getError === "function" || exception && typeof exception === "object" && "error" in exception && typeof exception.error === "object";
+    if (isRpcException) {
+      const errorObj = typeof exception.getError === "function" ? exception.getError() : exception.error;
+      if (typeof errorObj === "object" && errorObj !== null) {
+        message = errorObj?.message || message;
+        statusCode = errorObj?.statusCode || statusCode;
+        errorType = errorObj?.error || errorType;
+        additional = errorObj?.additional;
+      } else if (typeof errorObj === "string") {
+        message = errorObj;
+      }
     } else if (exception instanceof import_common2.HttpException) {
       const response = exception.getResponse();
       const resObj = typeof response === "string" ? { message: response } : response;
@@ -11115,14 +11116,21 @@ var AllExceptionsFilter = class {
       statusCode = exception.getStatus();
       errorType = resObj.error || exception.name;
       additional = resObj?.additional;
+    } else if (exception instanceof Error) {
+      if (message === ExceptionMessages.INTERNAL_SERVER_ERROR_MESSAGE("en" /* EN */)) {
+        message = exception.message;
+      }
     }
     const lastResult = {
       status: "error",
       message,
+      // This will now be the correct string from Step 1
       statusCode,
-      error: errorType
+      error: errorType,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      // Good practice to add
+      ...additional ? { additional } : {}
     };
-    if (additional) lastResult["additional"] = additional;
     return (0, import_rxjs.throwError)(() => lastResult);
   }
 };

package/dist/index.d.cts

@@ -8,7 +8,7 @@ import * as rxjs from 'rxjs';
 import { Observable } from 'rxjs';
 
 declare class BaseException extends RpcException {
-    constructor(message?: any, statusCode?: HttpStatus, error?: string, additional?: Record<string, any>);
+    constructor(messageOrFunc?: string | ((...args: any[]) => string), statusCode?: HttpStatus, error?: string, additional?: Record<string, any>);
 }
 
 interface ICountry {

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import * as rxjs from 'rxjs';
 import { Observable } from 'rxjs';
 
 declare class BaseException extends RpcException {
-    constructor(message?: any, statusCode?: HttpStatus, error?: string, additional?: Record<string, any>);
+    constructor(messageOrFunc?: string | ((...args: any[]) => string), statusCode?: HttpStatus, error?: string, additional?: Record<string, any>);
 }
 
 interface ICountry {

package/dist/index.mjs

@@ -9432,7 +9432,8 @@ var require_cjs = __commonJS({
 // src/class/server/base.exception.ts
 import { RpcException } from "@nestjs/microservices";
 var BaseException = class extends RpcException {
-  constructor(message = ExceptionMessages.INTERNAL_SERVER_ERROR_MESSAGE, statusCode = 500 /* INTERNAL_SERVER_ERROR */, error = ExceptionTypes.INTERNAL_SERVER_ERROR, additional) {
+  constructor(messageOrFunc = ExceptionMessages.INTERNAL_SERVER_ERROR_MESSAGE, statusCode = 500 /* INTERNAL_SERVER_ERROR */, error = ExceptionTypes.INTERNAL_SERVER_ERROR, additional) {
+    const message = typeof messageOrFunc === "function" ? messageOrFunc() : messageOrFunc;
     super({ message, statusCode, error, additional });
   }
 };
@@ -11058,17 +11059,17 @@ var AllExceptionsFilter = class {
     let statusCode = HttpStatus2.INTERNAL_SERVER_ERROR;
     let errorType = ExceptionTypes.INTERNAL_SERVER_ERROR;
     let additional;
-    console.log("\n");
-    if (exception.stack) this.logger.error("Exception stack", exception.stack);
-    this.logger.error("Exception caught", JSON.stringify(exception, null, 2));
-    if (exception instanceof RpcException2) {
-      const error = exception.getError();
-      if (typeof error === "object") {
-        message = error?.message || message;
-        statusCode = error?.statusCode || statusCode;
-        errorType = error?.error || errorType;
-        additional = error?.additional;
-      } else message = error;
+    const isRpcException = exception instanceof RpcException2 || exception && typeof exception === "object" && "error" in exception && typeof exception.getError === "function" || exception && typeof exception === "object" && "error" in exception && typeof exception.error === "object";
+    if (isRpcException) {
+      const errorObj = typeof exception.getError === "function" ? exception.getError() : exception.error;
+      if (typeof errorObj === "object" && errorObj !== null) {
+        message = errorObj?.message || message;
+        statusCode = errorObj?.statusCode || statusCode;
+        errorType = errorObj?.error || errorType;
+        additional = errorObj?.additional;
+      } else if (typeof errorObj === "string") {
+        message = errorObj;
+      }
     } else if (exception instanceof HttpException) {
       const response = exception.getResponse();
       const resObj = typeof response === "string" ? { message: response } : response;
@@ -11076,14 +11077,21 @@ var AllExceptionsFilter = class {
       statusCode = exception.getStatus();
       errorType = resObj.error || exception.name;
       additional = resObj?.additional;
+    } else if (exception instanceof Error) {
+      if (message === ExceptionMessages.INTERNAL_SERVER_ERROR_MESSAGE("en" /* EN */)) {
+        message = exception.message;
+      }
     }
     const lastResult = {
       status: "error",
       message,
+      // This will now be the correct string from Step 1
       statusCode,
-      error: errorType
+      error: errorType,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      // Good practice to add
+      ...additional ? { additional } : {}
     };
-    if (additional) lastResult["additional"] = additional;
     return (0, import_rxjs.throwError)(() => lastResult);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "connectfy-shared",
-  "version": "0.0.67",
+  "version": "0.0.68",
   "private": false,
   "type": "module",
   "exports": {