@bool-ts/core 1.6.12 → 1.6.14

package/dist/entities/route.d.ts

@@ -1,9 +1,9 @@
 import type { THttpMethods } from "../http";
-export type TRouteModel<T = unknown> = Readonly<Required<{
+export type TRouteModel<T = unknown> = Readonly<{
     class: new (...args: Array<any>) => T;
     funcName: string | symbol;
     func: (...args: Array<any>) => unknown;
-}>>;
+}>;
 export declare class Route {
     static rootPattern: string;
     readonly alias: string;
@@ -46,41 +46,41 @@ export declare class Route {
      * @param handlers
      * @returns
      */
-    connect(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<Required<{
+    connect(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<{
         class: new (...args: Array<any>) => unknown;
         funcName: string | symbol;
         func: (...args: Array<any>) => unknown;
-    }>>>;
+    }>>;
     /**
      *
      * @param handlers
      * @returns
      */
-    options(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<Required<{
+    options(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<{
         class: new (...args: Array<any>) => unknown;
         funcName: string | symbol;
         func: (...args: Array<any>) => unknown;
-    }>>>;
+    }>>;
     /**
      *
      * @param handlers
      * @returns
      */
-    trace(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<Required<{
+    trace(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<{
         class: new (...args: Array<any>) => unknown;
         funcName: string | symbol;
         func: (...args: Array<any>) => unknown;
-    }>>>;
+    }>>;
     /**
      *
      * @param handlers
      * @returns
      */
-    patch(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<Required<{
+    patch(handler: TRouteModel): this | Map<keyof THttpMethods, Readonly<{
         class: new (...args: Array<any>) => unknown;
         funcName: string | symbol;
         func: (...args: Array<any>) => unknown;
-    }>>>;
+    }>>;
     /**
      *
      * @param handlers

package/dist/hooks/factory.js

@@ -180,7 +180,7 @@ export const BoolFactory = async (target, options) => {
             });
         Bun.serve({
             port: options.port,
-            fetch: async (request) => {
+            fetch: async (request, server) => {
                 const { headers } = request;
                 const start = performance.now();
                 const url = new URL(request.url);
@@ -320,7 +320,7 @@ export const BoolFactory = async (target, options) => {
                         });
                     }
                     context[paramsArgsKey] = result.parameters;
-                    context[routeModelArgsKey] = result;
+                    context[routeModelArgsKey] = result.model;
                     let responseBody = undefined;
                     // Execute before dispatcher(s)
                     for (let i = 0; i < beforeDispatcherGroup.length; i++) {
@@ -509,7 +509,10 @@ export const BoolFactory = async (target, options) => {
                         const end = performance.now();
                         const convertedPID = `${process.pid}`.yellow;
                         const convertedMethod = `${request.method.yellow}`.bgBlue;
-                        const convertedReqIp = `${request.headers.get("x-forwarded-for") || request.headers.get("x-real-ip") || "<Unknown>"}`.yellow;
+                        const convertedReqIp = `${request.headers.get("x-forwarded-for") ||
+                            request.headers.get("x-real-ip") ||
+                            server.requestIP(request)?.address ||
+                            "<Unknown>"}`.yellow;
                         const convertedTime = `${Math.round((end - start + Number.EPSILON) * 10 ** 2) / 10 ** 2}ms`.yellow;
                         allowLogsMethods.includes(request.method.toUpperCase()) &&
                             console.info(`PID: ${convertedPID} - Method: ${convertedMethod} - IP: ${convertedReqIp} - ${url.pathname.blue} - Time: ${convertedTime}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bool-ts/core",
-    "version": "1.6.12",
+    "version": "1.6.14",
     "description": "",
     "main": "dist/index.js",
     "scripts": {

package/src/entities/route.ts

@@ -2,13 +2,11 @@
 
 import type { THttpMethods } from "../http";
 
-export type TRouteModel<T = unknown> = Readonly<
-    Required<{
-        class: new (...args: Array<any>) => T;
-        funcName: string | symbol;
-        func: (...args: Array<any>) => unknown;
-    }>
->;
+export type TRouteModel<T = unknown> = Readonly<{
+    class: new (...args: Array<any>) => T;
+    funcName: string | symbol;
+    func: (...args: Array<any>) => unknown;
+}>;
 
 export class Route {
     public static rootPattern = ":([a-z0-9A-Z_.-]{1,})";

package/src/hooks/factory.ts

@@ -268,7 +268,7 @@ export const BoolFactory = async (target: new (...args: any[]) => unknown, optio
 
         Bun.serve({
             port: options.port,
-            fetch: async (request) => {
+            fetch: async (request, server) => {
                 const { headers } = request;
                 const start = performance.now();
                 const url = new URL(request.url);
@@ -475,7 +475,7 @@ export const BoolFactory = async (target: new (...args: any[]) => unknown, optio
                     }
 
                     context[paramsArgsKey] = result.parameters;
-                    context[routeModelArgsKey] = result;
+                    context[routeModelArgsKey] = result.model;
 
                     let responseBody = undefined;
 
@@ -785,7 +785,10 @@ export const BoolFactory = async (target: new (...args: any[]) => unknown, optio
                         const convertedPID = `${process.pid}`.yellow;
                         const convertedMethod = `${request.method.yellow}`.bgBlue;
                         const convertedReqIp = `${
-                            request.headers.get("x-forwarded-for") || request.headers.get("x-real-ip") || "<Unknown>"
+                            request.headers.get("x-forwarded-for") ||
+                            request.headers.get("x-real-ip") ||
+                            server.requestIP(request)?.address ||
+                            "<Unknown>"
                         }`.yellow;
                         const convertedTime = `${Math.round((end - start + Number.EPSILON) * 10 ** 2) / 10 ** 2}ms`.yellow;