response-standardizer 1.2.9 → 1.3.0

package/dist/index.d.ts

@@ -23,18 +23,17 @@ export declare const error: (message: string, meta?: any) => void;
 export declare const warn: (message: string, meta?: any) => void;
 export declare const info: (message: string, meta?: any) => void;
 export declare const log: (level: "INFO" | "WARN" | "ERROR", message: string, meta?: any) => void;
-export declare const handleRestException: (req: Request, res: Response, err: Error) => void;
-export declare const handleRestResponse: (req: Request, res: Response, response: ServiceResponse) => void;
+export declare const response: (req: Request, res: Response, response: ServiceResponse, handler?: <T>(eq: Request, res: Response, data: T) => void) => void;
 export declare const handleServiceException: (message: string, err: any) => ServiceResponse;
-export declare const handleValidationException: (error: any) => never;
-export declare class ServiceException extends Error {
-    status: number;
-    errors: any;
-    constructor(message: string, status?: number, errors?: any);
+export interface ServiceResponse {
 }
-export declare class ServiceResponse {
+export declare class ServiceException implements ServiceResponse {
     code: number;
     message: string;
     errors?: ErrorFields | undefined;
     constructor(code: number, message: string, errors?: ErrorFields | undefined);
 }
+export declare class ServiceResponseSuccess implements ServiceResponse {
+    entity: any;
+    constructor(entity: any);
+}

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceResponse = exports.ServiceException = exports.handleValidationException = exports.handleServiceException = exports.handleRestResponse = exports.handleRestException = exports.log = exports.info = exports.warn = exports.error = exports.RestMiddleware = exports.RestResponse = exports.protect = exports.initKeycloak = void 0;
+exports.ServiceResponseSuccess = exports.ServiceException = exports.handleServiceException = exports.response = exports.log = exports.info = exports.warn = exports.error = exports.RestMiddleware = exports.RestResponse = exports.protect = exports.initKeycloak = void 0;
 const utils_1 = require("./utils");
 const axios_1 = __importDefault(require("axios"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
@@ -179,31 +179,8 @@ const log = (level, message, meta) => {
     console.log(`${color}[${timestamp}][${location}][${level}] ${message}${metaStr}${colors.RESET}`);
 };
 exports.log = log;
-const handleRestException = (req, res, err) => {
-    if (err instanceof ServiceException) {
-        if (err?.status === 401) {
-            exports.RestResponse.unauthorized(req, res, err.message);
-        }
-        else if (err?.status === 403) {
-            exports.RestResponse.accessDenied(req, res, err.message);
-        }
-        else if (err?.status === 400) {
-            exports.RestResponse.validationError(req, res, err.errors);
-        }
-        else if (err?.status === 500) {
-            exports.RestResponse.exceptionError(req, res, err.message);
-        }
-        else if (err?.status === 404) {
-            exports.RestResponse.notFound(req, res, err.message);
-        }
-    }
-    else if (err instanceof Error) {
-        exports.RestResponse.exceptionError(req, res, err.message);
-    }
-};
-exports.handleRestException = handleRestException;
-const handleRestResponse = (req, res, response) => {
-    if (response instanceof ServiceResponse) {
+const response = (req, res, response, handler = (eq, res, data) => { }) => {
+    if (response instanceof ServiceException) {
         if (response?.code === 401) {
             return exports.RestResponse.unauthorized(req, res, response?.message);
         }
@@ -219,10 +196,11 @@ const handleRestResponse = (req, res, response) => {
         else if (response?.code === 404) {
             return exports.RestResponse.notFound(req, res, response.message);
         }
+        return exports.RestResponse.exceptionError(req, res, response.message);
     }
-    return exports.RestResponse.exceptionError(req, res, response.message);
+    return handler(req, res, response);
 };
-exports.handleRestResponse = handleRestResponse;
+exports.response = response;
 const handleServiceException = (message, err) => {
     if (err instanceof zod_1.ZodError) {
         const zodError = err;
@@ -234,7 +212,7 @@ const handleServiceException = (message, err) => {
                     validationErrors[key] = [];
                 validationErrors[key].push(i.message);
             });
-            return new ServiceResponse(400, "Validation error", validationErrors);
+            return new ServiceException(400, "Validation error", validationErrors);
         }
     }
     else if (err?.isAxiosError && err?.response && err.response.status) {
@@ -243,44 +221,26 @@ const handleServiceException = (message, err) => {
             statusText: err.response.statusText,
             error: err.response.data
         });
-        return new ServiceResponse(err.response.status, err.response.data?.error_description);
+        return new ServiceException(err.response.status, err.response.data?.error_description);
     }
     else if (err instanceof Error) {
         (0, exports.error)(message, { error: err });
-        return new ServiceResponse(500, err?.message);
+        return new ServiceException(500, err?.message);
     }
-    return new ServiceResponse(500, "Internal server error");
+    return new ServiceException(500, "Internal server error");
 };
 exports.handleServiceException = handleServiceException;
-const handleValidationException = (error) => {
-    const zodError = error;
-    if (zodError.issues) {
-        const validationErrors = {};
-        zodError.issues.forEach((i) => {
-            const key = i.path[0];
-            if (!validationErrors[key])
-                validationErrors[key] = [];
-            validationErrors[key].push(i.message);
-        });
-        throw new ServiceException("Validation error", 400, validationErrors);
-    }
-    throw new ServiceException("Internal server error", 500, error);
-};
-exports.handleValidationException = handleValidationException;
-class ServiceException extends Error {
-    constructor(message, status = 400, errors = null) {
-        super(message);
-        this.name = "ServiceException";
-        this.status = status;
-        this.errors = errors;
-    }
-}
-exports.ServiceException = ServiceException;
-class ServiceResponse {
+class ServiceException {
     constructor(code, message, errors) {
         this.code = code;
         this.message = message;
         this.errors = errors;
     }
 }
-exports.ServiceResponse = ServiceResponse;
+exports.ServiceException = ServiceException;
+class ServiceResponseSuccess {
+    constructor(entity) {
+        this.entity = entity;
+    }
+}
+exports.ServiceResponseSuccess = ServiceResponseSuccess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "response-standardizer",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "Express middleware to standardize API responses",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -227,27 +227,13 @@ export const log = (level: "INFO" | "WARN" | "ERROR", message: string, meta?: an
     // چاپ لاگ
     console.log(`${color}[${timestamp}][${location}][${level}] ${message}${metaStr}${colors.RESET}`);
 };
-
-export const handleRestException = (req: Request, res: Response, err: Error) => {
-    if(err instanceof ServiceException){
-        if(err?.status === 401){
-            RestResponse.unauthorized(req, res, err.message)
-        }else if(err?.status === 403){
-            RestResponse.accessDenied(req, res, err.message)
-        }else if(err?.status === 400){
-            RestResponse.validationError(req, res, err.errors)
-        }else if(err?.status === 500){
-            RestResponse.exceptionError(req, res, err.message)
-        }else if(err?.status === 404){
-            RestResponse.notFound(req, res, err.message)
-        }
-    }else if(err instanceof Error){
-        RestResponse.exceptionError(req, res, err.message)
-    }
-}
-
-export const handleRestResponse = (req: Request, res: Response, response: ServiceResponse) => {
-    if(response instanceof ServiceResponse){
+export const response = (
+    req: Request, 
+    res: Response, 
+    response: ServiceResponse, 
+    handler = <T>(eq: Request, res: Response, data: T) => {}
+) => {
+    if(response instanceof ServiceException){
         if(response?.code === 401){
             return RestResponse.unauthorized(req, res, response?.message)
         }else if(response?.code === 403){
@@ -259,8 +245,9 @@ export const handleRestResponse = (req: Request, res: Response, response: Servic
         }else if(response?.code === 404){
             return RestResponse.notFound(req, res, response.message)
         }
+        return RestResponse.exceptionError(req, res, response.message)
     }
-    return RestResponse.exceptionError(req, res, response.message)
+    return handler(req, res, response)
 }
 export const handleServiceException = (message: string, err: any) : ServiceResponse => {
     if(err instanceof ZodError){
@@ -272,7 +259,7 @@ export const handleServiceException = (message: string, err: any) : ServiceRespo
                 if (!validationErrors[key]) validationErrors[key] = [];
                 validationErrors[key].push(i.message);
             });
-            return new ServiceResponse(400, "Validation error", validationErrors)
+            return new ServiceException(400, "Validation error", validationErrors)
         }
     }else if((err as any)?.isAxiosError && (err as any)?.response && (err as any).response.status){
         error(message, {
@@ -280,37 +267,20 @@ export const handleServiceException = (message: string, err: any) : ServiceRespo
             statusText: (err as any).response.statusText,
             error: (err as any).response.data
         })
-        return new ServiceResponse((err as any).response.status, (err as any).response.data?.error_description);
+        return new ServiceException((err as any).response.status, (err as any).response.data?.error_description);
     }else if(err instanceof Error){
         error(message, { error: err })
-        return new ServiceResponse(500, err?.message);
+        return new ServiceException(500, err?.message);
     }
-    return new ServiceResponse(500, "Internal server error");
-}
-export const handleValidationException = (error: any) => {
-    const zodError = error as ZodError;
-    if (zodError.issues) {
-        const validationErrors: any = {};
-        zodError.issues.forEach((i) => {
-            const key = i.path[0];
-            if (!validationErrors[key]) validationErrors[key] = [];
-            validationErrors[key].push(i.message);
-        });
-        throw new ServiceException("Validation error", 400, validationErrors);
-    }
-    throw new ServiceException("Internal server error", 500, error);
+    return new ServiceException(500, "Internal server error");
 }
 
-export class ServiceException extends Error {
-    status: number;
-    errors: any
-    constructor(message: string, status: number = 400, errors: any = null) {
-        super(message);
-        this.name = "ServiceException";
-        this.status = status;
-        this.errors = errors;
-    }
+export interface ServiceResponse{
+
 }
-export class ServiceResponse {
+export class ServiceException implements ServiceResponse {
     constructor(public code: number, public message: string, public errors?: ErrorFields) {}
-}
+}
+export class ServiceResponseSuccess implements ServiceResponse {
+    constructor(public entity: any) {}
+}