@bool-ts/core 1.2.4 → 1.3.0

package/__test/controller.ts

@@ -1,10 +1,18 @@
 import type { IService } from "./interfaces";
 
-import { Controller, Delete, Get, Inject, Options, Patch, Post, Put } from "../src";
+import * as Zod from "zod";
+
+import { Controller, Delete, Get, Inject, Options, Patch, Post, Put, ZodSchema } from "../src";
 import { TestService } from "./service";
 import { Request, Response } from "express";
 
 
+const getAbcSchema = Zod.object({
+    headers: Zod.object({
+        authorization: Zod.string().min(10)
+    })
+});
+
 @Controller("test")
 export class TestController {
     constructor(
@@ -13,7 +21,7 @@ export class TestController {
 
     @Get("abc")
     private _get(
-        req: Request,
+        @ZodSchema(getAbcSchema) req: Request,
         res: Response
     ) {
         console.log("this.testService", this.testService.exec())
@@ -22,7 +30,7 @@ export class TestController {
 
     @Post("abc")
     private _post(
-        req: Request,
+        @ZodSchema(getAbcSchema) req: Request,
         res: Response
     ) {
         console.log("req.body", req.body);
@@ -31,7 +39,7 @@ export class TestController {
 
     @Put()
     private _put(
-        req: Request,
+        @ZodSchema(getAbcSchema) req: Request,
         res: Response
     ) {
         res.json({ test: "success" }).send();
@@ -39,7 +47,7 @@ export class TestController {
 
     @Patch("abc/:id")
     private _patch(
-        req: Request,
+        @ZodSchema(getAbcSchema) req: Request,
         res: Response
     ) {
         console.log(req.params)
@@ -48,7 +56,7 @@ export class TestController {
 
     @Delete()
     private _delete(
-        req: Request,
+        @ZodSchema(getAbcSchema) req: Request,
         res: Response
     ) {
         res.json({ test: "success" }).send();
@@ -56,7 +64,7 @@ export class TestController {
 
     @Options()
     private _options(
-        req: Request,
+        @ZodSchema(getAbcSchema) req: Request,
         res: Response
     ) {
         res.json({ test: "success" }).send();

package/dist/decorators/http.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Options = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.controllerRoutesKey = void 0;
+const http_1 = require("../http");
+const zodSchema_1 = require("./zodSchema");
 exports.controllerRoutesKey = "__bool:controller.routes__";
 /**
  *
@@ -11,6 +13,7 @@ const Get = (path = "/") => (target, methodName, descriptor) => {
     if (typeof descriptor.value !== "function") {
         throw Error("Get decorator only use for method.");
     }
+    // Define controller metadata
     Reflect.defineMetadata(exports.controllerRoutesKey, [
         ...Reflect.getOwnMetadata(exports.controllerRoutesKey, target.constructor) || [],
         {
@@ -20,6 +23,24 @@ const Get = (path = "/") => (target, methodName, descriptor) => {
             descriptor: descriptor
         }
     ], target.constructor);
+    // Define route parameters zod validation
+    const currentMethod = descriptor.value;
+    descriptor.value = function () {
+        const zodSchemaMetadata = Reflect.getOwnMetadata(zodSchema_1.controllerRouteZodSchemaKey, target.constructor, methodName);
+        if (zodSchemaMetadata) {
+            for (const zodSchemaProp in zodSchemaMetadata) {
+                const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+                const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+                if (!validation.success) {
+                    throw new http_1.HttpClientError({
+                        httpCode: 400,
+                        data: validation.error.issues
+                    });
+                }
+            }
+        }
+        return currentMethod.apply(this, arguments);
+    };
 };
 exports.Get = Get;
 /**
@@ -40,6 +61,24 @@ const Post = (path = "/") => (target, methodName, descriptor) => {
             descriptor: descriptor
         }
     ], target.constructor);
+    // Define route parameters zod validation
+    const currentMethod = descriptor.value;
+    descriptor.value = function () {
+        const zodSchemaMetadata = Reflect.getOwnMetadata(zodSchema_1.controllerRouteZodSchemaKey, target.constructor, methodName);
+        if (zodSchemaMetadata) {
+            for (const zodSchemaProp in zodSchemaMetadata) {
+                const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+                const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+                if (!validation.success) {
+                    throw new http_1.HttpClientError({
+                        httpCode: 400,
+                        data: validation.error.issues
+                    });
+                }
+            }
+        }
+        return currentMethod.apply(this, arguments);
+    };
 };
 exports.Post = Post;
 /**
@@ -60,6 +99,24 @@ const Put = (path = "/") => (target, methodName, descriptor) => {
             descriptor: descriptor
         }
     ], target.constructor);
+    // Define route parameters zod validation
+    const currentMethod = descriptor.value;
+    descriptor.value = function () {
+        const zodSchemaMetadata = Reflect.getOwnMetadata(zodSchema_1.controllerRouteZodSchemaKey, target.constructor, methodName);
+        if (zodSchemaMetadata) {
+            for (const zodSchemaProp in zodSchemaMetadata) {
+                const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+                const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+                if (!validation.success) {
+                    throw new http_1.HttpClientError({
+                        httpCode: 400,
+                        data: validation.error.issues
+                    });
+                }
+            }
+        }
+        return currentMethod.apply(this, arguments);
+    };
 };
 exports.Put = Put;
 /**
@@ -80,6 +137,24 @@ const Patch = (path = "/") => (target, methodName, descriptor) => {
             descriptor: descriptor
         }
     ], target.constructor);
+    // Define route parameters zod validation
+    const currentMethod = descriptor.value;
+    descriptor.value = function () {
+        const zodSchemaMetadata = Reflect.getOwnMetadata(zodSchema_1.controllerRouteZodSchemaKey, target.constructor, methodName);
+        if (zodSchemaMetadata) {
+            for (const zodSchemaProp in zodSchemaMetadata) {
+                const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+                const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+                if (!validation.success) {
+                    throw new http_1.HttpClientError({
+                        httpCode: 400,
+                        data: validation.error.issues
+                    });
+                }
+            }
+        }
+        return currentMethod.apply(this, arguments);
+    };
 };
 exports.Patch = Patch;
 /**
@@ -100,6 +175,24 @@ const Delete = (path = "/") => (target, methodName, descriptor) => {
             descriptor: descriptor
         }
     ], target.constructor);
+    // Define route parameters zod validation
+    const currentMethod = descriptor.value;
+    descriptor.value = function () {
+        const zodSchemaMetadata = Reflect.getOwnMetadata(zodSchema_1.controllerRouteZodSchemaKey, target.constructor, methodName);
+        if (zodSchemaMetadata) {
+            for (const zodSchemaProp in zodSchemaMetadata) {
+                const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+                const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+                if (!validation.success) {
+                    throw new http_1.HttpClientError({
+                        httpCode: 400,
+                        data: validation.error.issues
+                    });
+                }
+            }
+        }
+        return currentMethod.apply(this, arguments);
+    };
 };
 exports.Delete = Delete;
 /**
@@ -120,6 +213,24 @@ const Options = (path = "/") => (target, methodName, descriptor) => {
             descriptor: descriptor
         }
     ], target.constructor);
+    // Define route parameters zod validation
+    const currentMethod = descriptor.value;
+    descriptor.value = function () {
+        const zodSchemaMetadata = Reflect.getOwnMetadata(zodSchema_1.controllerRouteZodSchemaKey, target.constructor, methodName);
+        if (zodSchemaMetadata) {
+            for (const zodSchemaProp in zodSchemaMetadata) {
+                const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+                const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+                if (!validation.success) {
+                    throw new http_1.HttpClientError({
+                        httpCode: 400,
+                        data: validation.error.issues
+                    });
+                }
+            }
+        }
+        return currentMethod.apply(this, arguments);
+    };
 };
 exports.Options = Options;
 exports.default = {

package/dist/decorators/index.d.ts

@@ -3,3 +3,4 @@ export { Inject, injectKey } from "./inject";
 export { Injectable, injectableKey } from "./injectable";
 export { Module, moduleKey, type TModuleOptions } from "./module";
 export { Get, Post, Put, Patch, Delete, Options, controllerRoutesKey, type IControllerRoute } from "./http";
+export { ZodSchema, controllerRouteZodSchemaKey } from "./zodSchema";

package/dist/decorators/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.controllerRoutesKey = exports.Options = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.moduleKey = exports.Module = exports.injectableKey = exports.Injectable = exports.injectKey = exports.Inject = exports.controllerKey = exports.Controller = void 0;
+exports.controllerRouteZodSchemaKey = exports.ZodSchema = exports.controllerRoutesKey = exports.Options = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.moduleKey = exports.Module = exports.injectableKey = exports.Injectable = exports.injectKey = exports.Inject = exports.controllerKey = exports.Controller = void 0;
 var controller_1 = require("./controller");
 Object.defineProperty(exports, "Controller", { enumerable: true, get: function () { return controller_1.Controller; } });
 Object.defineProperty(exports, "controllerKey", { enumerable: true, get: function () { return controller_1.controllerKey; } });
@@ -21,3 +21,6 @@ Object.defineProperty(exports, "Patch", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "Delete", { enumerable: true, get: function () { return http_1.Delete; } });
 Object.defineProperty(exports, "Options", { enumerable: true, get: function () { return http_1.Options; } });
 Object.defineProperty(exports, "controllerRoutesKey", { enumerable: true, get: function () { return http_1.controllerRoutesKey; } });
+var zodSchema_1 = require("./zodSchema");
+Object.defineProperty(exports, "ZodSchema", { enumerable: true, get: function () { return zodSchema_1.ZodSchema; } });
+Object.defineProperty(exports, "controllerRouteZodSchemaKey", { enumerable: true, get: function () { return zodSchema_1.controllerRouteZodSchemaKey; } });

package/dist/decorators/inject.d.ts

@@ -1,5 +1,5 @@
 export declare const injectKey = "design:paramtypes";
 export declare const Inject: <T extends Object>(classDefinition: {
     new (...args: any[]): T;
-}) => (target: Object, parameterName: string | Symbol | undefined, parameterIndex: number) => void;
+}) => (target: Object, methodName: string | symbol | undefined, parameterIndex: number) => void;
 export default Inject;

package/dist/decorators/inject.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Inject = exports.injectKey = void 0;
 exports.injectKey = "design:paramtypes";
 const Inject = (classDefinition) => {
-    return (target, parameterName, parameterIndex) => {
+    return (target, methodName, parameterIndex) => {
         const designParameterTypes = Reflect.getMetadata(exports.injectKey, target) || [];
         designParameterTypes[parameterIndex] = classDefinition;
         Reflect.defineMetadata(exports.injectKey, designParameterTypes, target);

package/dist/decorators/zodSchema.d.ts

@@ -0,0 +1,3 @@
+import * as Zod from "zod";
+export declare const controllerRouteZodSchemaKey = "__bool:controller.route.zodSchema__";
+export declare const ZodSchema: (schema: Zod.Schema) => (target: Object, methodName: string | symbol | undefined, parameterIndex: number) => void;

package/dist/decorators/zodSchema.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZodSchema = exports.controllerRouteZodSchemaKey = void 0;
+exports.controllerRouteZodSchemaKey = "__bool:controller.route.zodSchema__";
+const ZodSchema = (schema) => {
+    try {
+        schema.safeParse(undefined);
+    }
+    catch (err) {
+        throw Error("Zod schema parameter do not allow async.");
+    }
+    return (target, methodName, parameterIndex) => {
+        if (!methodName) {
+            return;
+        }
+        const zodSchemasMetadata = Reflect.getOwnMetadata(exports.controllerRouteZodSchemaKey, target.constructor, methodName) || {};
+        zodSchemasMetadata[`paramterIndexes.${parameterIndex}`] = {
+            index: parameterIndex,
+            schema: schema
+        };
+        Reflect.defineMetadata(exports.controllerRouteZodSchemaKey, zodSchemasMetadata, target.constructor, methodName);
+    };
+};
+exports.ZodSchema = ZodSchema;

package/dist/hooks/factory.js

@@ -123,7 +123,19 @@ const BoolFactory = (target, options) => {
             req.body = Object.freeze({});
         }
         next();
-    });
+    }, 
+    // Response time log
+    ResponseTime.default((req, res, time) => {
+        const requestMethod = req.method.toUpperCase();
+        if (!factoryOptions.allowLogsMethods.includes(requestMethod)) {
+            return;
+        }
+        const convertedMethod = `${requestMethod.yellow}`.bgBlue;
+        const convertedPID = `${process.pid}`.yellow;
+        const convertedReqIp = `${req.headers["x-forwarded-for"] || req.headers["x-real-ip"] || req.ip || "<Unknown>"}`.yellow;
+        const convertedTime = `${Math.round((time + Number.EPSILON) * 10 ** 2) / 10 ** 2}ms`.yellow;
+        console.info(`PID: ${convertedPID} - Method: ${convertedMethod} - IP: ${convertedReqIp} - ${req.originalUrl.blue} - Time: ${convertedTime}`);
+    }));
     app.use((req, res, next) => {
         if (!allowOrigins.includes("*")) {
             if (!allowOrigins.includes(req.headers.origin || "*")) {
@@ -149,6 +161,7 @@ const BoolFactory = (target, options) => {
             app.use(routers) : app.use(!metadata.prefix.startsWith("/") ?
             `/${metadata.prefix}` : metadata.prefix, routers);
     }
+    // Register error catcher
     app.use(
     // Error catcher
     (err, req, res, next) => {
@@ -157,19 +170,7 @@ const BoolFactory = (target, options) => {
             return;
         }
         console.error("Headers:", JSON.stringify(req.headers), "\nBody:", JSON.stringify(req.body), "\nError:", JSON.stringify(err));
-    }, 
-    // Response time log
-    ResponseTime.default((req, res, time) => {
-        const requestMethod = req.method.toUpperCase();
-        if (!factoryOptions.allowLogsMethods.includes(requestMethod)) {
-            return;
-        }
-        const convertedMethod = `${requestMethod.yellow}`.bgBlue;
-        const convertedPID = `${process.pid}`.yellow;
-        const convertedReqIp = `${req.headers["x-forwarded-for"] || req.headers["x-real-ip"] || req.ip || "<Unknown>"}`.yellow;
-        const convertedTime = `${Math.round((time + Number.EPSILON) * 10 ** 2) / 10 ** 2}ms`.yellow;
-        console.info(`PID: ${convertedPID} - Method: ${convertedMethod} - IP: ${convertedReqIp} - ${req.originalUrl.blue} - Time: ${convertedTime}`);
-    }));
+    });
     return app;
 };
 exports.BoolFactory = BoolFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bool-ts/core",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -22,7 +22,8 @@
     "express": "^5.0.0-beta.3",
     "qs": "^6.12.1",
     "reflect-metadata": "^0.2.2",
-    "response-time": "^2.3.2"
+    "response-time": "^2.3.2",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",

package/src/decorators/http.ts

@@ -1,3 +1,6 @@
+import { HttpClientError } from "../http";
+import { controllerRouteZodSchemaKey } from "./zodSchema";
+
 export interface IControllerRoute {
     path: string;
     httpMethod: "GET" | "POST" | "PUT" | "PATCH" | "DELETE" | "OPTIONS";
@@ -24,6 +27,7 @@ export const Get = (
             throw Error("Get decorator only use for method.");
         }
 
+        // Define controller metadata
         Reflect.defineMetadata(controllerRoutesKey, [
             ...Reflect.getOwnMetadata(controllerRoutesKey, target.constructor) || [],
             {
@@ -33,6 +37,30 @@ export const Get = (
                 descriptor: descriptor
             }
         ], target.constructor);
+
+        // Define route parameters zod validation
+        const currentMethod = descriptor.value;
+
+        descriptor.value = function () {
+            const zodSchemaMetadata = Reflect.getOwnMetadata(controllerRouteZodSchemaKey, target.constructor, methodName);
+
+            if (zodSchemaMetadata) {
+                for (const zodSchemaProp in zodSchemaMetadata) {
+                    const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+
+                    const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+
+                    if (!validation.success) {
+                        throw new HttpClientError({
+                            httpCode: 400,
+                            data: validation.error.issues
+                        })
+                    }
+                }
+            }
+
+            return currentMethod.apply(this, arguments);
+        }
     }
 
 
@@ -61,6 +89,30 @@ export const Post = (
                 descriptor: descriptor
             }
         ], target.constructor);
+
+        // Define route parameters zod validation
+        const currentMethod = descriptor.value;
+
+        descriptor.value = function () {
+            const zodSchemaMetadata = Reflect.getOwnMetadata(controllerRouteZodSchemaKey, target.constructor, methodName);
+
+            if (zodSchemaMetadata) {
+                for (const zodSchemaProp in zodSchemaMetadata) {
+                    const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+
+                    const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+
+                    if (!validation.success) {
+                        throw new HttpClientError({
+                            httpCode: 400,
+                            data: validation.error.issues
+                        })
+                    }
+                }
+            }
+
+            return currentMethod.apply(this, arguments);
+        }
     }
 
 
@@ -89,6 +141,30 @@ export const Put = (
                 descriptor: descriptor
             }
         ], target.constructor);
+
+        // Define route parameters zod validation
+        const currentMethod = descriptor.value;
+
+        descriptor.value = function () {
+            const zodSchemaMetadata = Reflect.getOwnMetadata(controllerRouteZodSchemaKey, target.constructor, methodName);
+
+            if (zodSchemaMetadata) {
+                for (const zodSchemaProp in zodSchemaMetadata) {
+                    const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+
+                    const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+
+                    if (!validation.success) {
+                        throw new HttpClientError({
+                            httpCode: 400,
+                            data: validation.error.issues
+                        })
+                    }
+                }
+            }
+
+            return currentMethod.apply(this, arguments);
+        }
     }
 
 
@@ -117,6 +193,30 @@ export const Patch = (
                 descriptor: descriptor
             }
         ], target.constructor);
+
+        // Define route parameters zod validation
+        const currentMethod = descriptor.value;
+
+        descriptor.value = function () {
+            const zodSchemaMetadata = Reflect.getOwnMetadata(controllerRouteZodSchemaKey, target.constructor, methodName);
+
+            if (zodSchemaMetadata) {
+                for (const zodSchemaProp in zodSchemaMetadata) {
+                    const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+
+                    const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+
+                    if (!validation.success) {
+                        throw new HttpClientError({
+                            httpCode: 400,
+                            data: validation.error.issues
+                        })
+                    }
+                }
+            }
+
+            return currentMethod.apply(this, arguments);
+        }
     }
 
 
@@ -145,6 +245,30 @@ export const Delete = (
                 descriptor: descriptor
             }
         ], target.constructor);
+
+        // Define route parameters zod validation
+        const currentMethod = descriptor.value;
+
+        descriptor.value = function () {
+            const zodSchemaMetadata = Reflect.getOwnMetadata(controllerRouteZodSchemaKey, target.constructor, methodName);
+
+            if (zodSchemaMetadata) {
+                for (const zodSchemaProp in zodSchemaMetadata) {
+                    const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+
+                    const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+
+                    if (!validation.success) {
+                        throw new HttpClientError({
+                            httpCode: 400,
+                            data: validation.error.issues
+                        })
+                    }
+                }
+            }
+
+            return currentMethod.apply(this, arguments);
+        }
     }
 
 
@@ -173,6 +297,30 @@ export const Options = (
                 descriptor: descriptor
             }
         ], target.constructor);
+
+        // Define route parameters zod validation
+        const currentMethod = descriptor.value;
+
+        descriptor.value = function () {
+            const zodSchemaMetadata = Reflect.getOwnMetadata(controllerRouteZodSchemaKey, target.constructor, methodName);
+
+            if (zodSchemaMetadata) {
+                for (const zodSchemaProp in zodSchemaMetadata) {
+                    const tmpZodMetadata = zodSchemaMetadata[zodSchemaProp];
+
+                    const validation = tmpZodMetadata.schema.safeParse(arguments[tmpZodMetadata.index]);
+
+                    if (!validation.success) {
+                        throw new HttpClientError({
+                            httpCode: 400,
+                            data: validation.error.issues
+                        })
+                    }
+                }
+            }
+
+            return currentMethod.apply(this, arguments);
+        }
     }
 
 export default {

package/src/decorators/index.ts

@@ -3,3 +3,4 @@ export { Inject, injectKey } from "./inject";
 export { Injectable, injectableKey } from "./injectable";
 export { Module, moduleKey, type TModuleOptions } from "./module";
 export { Get, Post, Put, Patch, Delete, Options, controllerRoutesKey, type IControllerRoute } from "./http";
+export { ZodSchema, controllerRouteZodSchemaKey } from "./zodSchema";

package/src/decorators/inject.ts

@@ -5,7 +5,7 @@ export const Inject = <T extends Object>(
 ) => {
     return (
         target: Object,
-        parameterName: string | Symbol | undefined,
+        methodName: string | symbol | undefined,
         parameterIndex: number
     ) => {
         const designParameterTypes: any[] = Reflect.getMetadata(injectKey, target) || [];

package/src/decorators/zodSchema.ts

@@ -0,0 +1,33 @@
+import * as Zod from "zod";
+
+export const controllerRouteZodSchemaKey = "__bool:controller.route.zodSchema__";
+
+export const ZodSchema = (
+    schema: Zod.Schema
+) => {
+    try {
+        schema.safeParse(undefined);
+    }
+    catch (err) {
+        throw Error("Zod schema parameter do not allow async.");
+    }
+
+    return (
+        target: Object,
+        methodName: string | symbol | undefined,
+        parameterIndex: number
+    ) => {
+        if (!methodName) {
+            return;
+        }
+
+        const zodSchemasMetadata = Reflect.getOwnMetadata(controllerRouteZodSchemaKey, target.constructor, methodName) || {};
+
+        zodSchemasMetadata[`paramterIndexes.${parameterIndex}`] = {
+            index: parameterIndex,
+            schema: schema
+        };
+
+        Reflect.defineMetadata(controllerRouteZodSchemaKey, zodSchemasMetadata, target.constructor, methodName);
+    }
+}

package/src/hooks/factory.ts

@@ -136,7 +136,22 @@ export const BoolFactory = (
             }
 
             next();
-        }
+        },
+        // Response time log
+        ResponseTime.default((req: Request, res: Response, time: number) => {
+            const requestMethod = req.method.toUpperCase();
+
+            if (!factoryOptions.allowLogsMethods.includes(requestMethod)) {
+                return;
+            }
+
+            const convertedMethod = `${requestMethod.yellow}`.bgBlue;
+            const convertedPID = `${process.pid}`.yellow;
+            const convertedReqIp = `${req.headers["x-forwarded-for"] || req.headers["x-real-ip"] || req.ip || "<Unknown>"}`.yellow;
+            const convertedTime = `${Math.round((time + Number.EPSILON) * 10 ** 2) / 10 ** 2}ms`.yellow;
+
+            console.info(`PID: ${convertedPID} - Method: ${convertedMethod} - IP: ${convertedReqIp} - ${req.originalUrl.blue} - Time: ${convertedTime}`);
+        })
     );
 
     app.use((req: Request, res: Response, next: NextFunction) => {
@@ -168,6 +183,7 @@ export const BoolFactory = (
                 `/${metadata.prefix}` : metadata.prefix, routers);
     }
 
+    // Register error catcher
     app.use(
         // Error catcher
         (err: Errback, req: Request, res: Response, next: NextFunction) => {
@@ -178,22 +194,7 @@ export const BoolFactory = (
             }
 
             console.error("Headers:", JSON.stringify(req.headers), "\nBody:", JSON.stringify(req.body), "\nError:", JSON.stringify(err));
-        },
-        // Response time log
-        ResponseTime.default((req: Request, res: Response, time: number) => {
-            const requestMethod = req.method.toUpperCase();
-
-            if (!factoryOptions.allowLogsMethods.includes(requestMethod)) {
-                return;
-            }
-
-            const convertedMethod = `${requestMethod.yellow}`.bgBlue;
-            const convertedPID = `${process.pid}`.yellow;
-            const convertedReqIp = `${req.headers["x-forwarded-for"] || req.headers["x-real-ip"] || req.ip || "<Unknown>"}`.yellow;
-            const convertedTime = `${Math.round((time + Number.EPSILON) * 10 ** 2) / 10 ** 2}ms`.yellow;
-
-            console.info(`PID: ${convertedPID} - Method: ${convertedMethod} - IP: ${convertedReqIp} - ${req.originalUrl.blue} - Time: ${convertedTime}`);
-        })
+        }
     );
 
     return app;