tezx 1.0.35 → 1.0.37

package/cjs/core/context.js

@@ -82,7 +82,7 @@ class Context {
     #status = 200;
     state = new state_1.State();
     #params = {};
-    body = {};
+    #resBody;
     #localAddress = {};
     #remoteAddress = {};
     constructor(req, connInfo) {
@@ -98,7 +98,7 @@ class Context {
         return this;
     }
     get cookies() {
-        const c = this.headers.getAll("cookie");
+        const c = this.req.headers.getAll("cookie");
         let cookies = {};
         if (Array.isArray(c) && c.length != 0) {
             const cookieHeader = c.join("; ").split(";");
@@ -167,8 +167,8 @@ class Context {
         else if (typeof args[0] === "object") {
             headers = args[0];
         }
-        if (!headers["Content-Type"]) {
-            if (typeof body === "string") {
+        if (!headers["Content-Type"] && !headers["content-type"]) {
+            if (typeof body === "string" || typeof body == "number") {
                 headers["Content-Type"] = "text/plain;";
             }
             else if (typeof body === "object" && body !== null) {
@@ -388,6 +388,7 @@ class Context {
             headers,
         });
         let clone = response.clone();
+        this.body = body;
         this.res = response;
         return clone;
     }
@@ -397,6 +398,12 @@ class Context {
     set params(params) {
         this.#params = params;
     }
+    set body(body) {
+        this.#resBody = body;
+    }
+    get body() {
+        return this.#resBody;
+    }
     get params() {
         return this.#params;
     }

package/cjs/core/request.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-const environment_1 = require("./environment");
-const header_1 = require("./header");
 const formData_1 = require("../utils/formData");
 const url_1 = require("../utils/url");
+const environment_1 = require("./environment");
+const header_1 = require("./header");
 class Request {
-    headers = new header_1.HeadersParser();
+    #headers = new header_1.HeadersParser();
     url;
     method;
     urlRef = {
@@ -27,13 +27,13 @@ class Request {
     remoteAddress = {};
     constructor(req, params, remoteAddress) {
         this.remoteAddress = remoteAddress;
-        this.headers = new header_1.HeadersParser(req?.headers);
+        this.#headers = new header_1.HeadersParser(req?.headers);
         this.method = req?.method?.toUpperCase();
         this.params = params;
         this.rawRequest = req;
         if (environment_1.EnvironmentDetector.getEnvironment == "node") {
             const protocol = environment_1.EnvironmentDetector.detectProtocol(req);
-            const host = environment_1.EnvironmentDetector.getHost(this.headers);
+            const host = environment_1.EnvironmentDetector.getHost(this.#headers);
             this.url = `${protocol}://${host}${req.url}`;
         }
         else {
@@ -42,11 +42,40 @@ class Request {
         this.urlRef = (0, url_1.urlParse)(this.url);
         this.query = this.urlRef.query;
     }
+    get headers() {
+        let requestHeaders = this.#headers;
+        return {
+            get: function get(key) {
+                return requestHeaders.get(key.toLowerCase());
+            },
+            getAll: function getAll(key) {
+                return requestHeaders.get(key.toLowerCase()) || [];
+            },
+            has: function has(key) {
+                return requestHeaders.has(key.toLowerCase());
+            },
+            entries: function entries() {
+                return requestHeaders.entries();
+            },
+            keys: function keys() {
+                return requestHeaders.keys();
+            },
+            values: function values() {
+                return requestHeaders.values();
+            },
+            forEach: function forEach(callback) {
+                return requestHeaders.forEach(callback);
+            },
+            toObject: function toObject() {
+                return requestHeaders.toObject();
+            },
+        };
+    }
     async text() {
         return await (0, formData_1.parseTextBody)(this.rawRequest);
     }
     async json() {
-        const contentType = this.headers.get("content-type") || "";
+        const contentType = this.#headers.get("content-type") || "";
         if (contentType.includes("application/json")) {
             return await (0, formData_1.parseJsonBody)(this.rawRequest);
         }
@@ -55,7 +84,7 @@ class Request {
         }
     }
     async formData(options) {
-        const contentType = this.headers.get("content-type") || "";
+        const contentType = this.#headers.get("content-type") || "";
         if (!contentType) {
             throw Error("Invalid Content-Type");
         }

package/cjs/core/router.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
-const config_1 = require("./config");
-const MiddlewareConfigure_1 = require("./MiddlewareConfigure");
 const staticFile_1 = require("../utils/staticFile");
 const url_1 = require("../utils/url");
+const config_1 = require("./config");
+const MiddlewareConfigure_1 = require("./MiddlewareConfigure");
 class TrieRouter {
     children = new Map();
     handlers = new Map();

package/cjs/core/server.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TezX = void 0;
+const colors_1 = require("../utils/colors");
 const config_1 = require("./config");
 const context_1 = require("./context");
 const router_1 = require("./router");
-const colors_1 = require("../utils/colors");
 const params_1 = require("../utils/params");
 class TezX extends router_1.Router {
     constructor({ basePath = "/", env = {}, debugMode = false, allowDuplicateMw = false, overwriteMethod = true, } = {}) {
@@ -86,10 +86,14 @@ class TezX extends router_1.Router {
                 }
             };
             const response = await next();
-            if (!response) {
+            if (response instanceof Response) {
+                return response;
+            }
+            if (!response && !ctx.body) {
                 throw new Error(`Handler did not return a response or next() was not called. Path: ${ctx.pathname}, Method: ${ctx.method}`);
             }
-            return response;
+            const resBody = response || ctx.body;
+            return ctx.send(resBody, ctx.headers.toObject());
         };
     }
     #findMiddleware(pathname) {
@@ -129,7 +133,7 @@ class TezX extends router_1.Router {
                     return (await this.#createHandler(middlewares, callback)(ctx));
                 }
                 else {
-                    let res = await config_1.GlobalConfig.notFound(ctx);
+                    let res = (await config_1.GlobalConfig.notFound(ctx));
                     ctx.setStatus = res.status;
                     return res;
                 }

package/cjs/index.js

@@ -7,4 +7,4 @@ var server_1 = require("./core/server");
 Object.defineProperty(exports, "TezX", { enumerable: true, get: function () { return server_1.TezX; } });
 var params_1 = require("./utils/params");
 Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return params_1.useParams; } });
-exports.version = "1.0.35";
+exports.version = "1.0.37";

package/cjs/middleware/i18nMiddleware.js

@@ -4,12 +4,12 @@ exports.i18nMiddleware = void 0;
 const config_1 = require("../core/config");
 const i18nMiddleware = (options) => {
     const { loadTranslations, defaultCacheDuration = 3600000, isCacheValid = (cached) => cached.expiresAt > Date.now(), detectLanguage = (ctx) => ctx.req.query.lang ||
-        ctx.cookies?.get('lang') ||
-        ctx.headers.get('accept-language')?.split(',')[0] ||
+        ctx.cookies?.get("lang") ||
+        ctx.req.headers.get("accept-language")?.split(",")[0] ||
         options.defaultLanguage ||
-        'en', defaultLanguage = 'en', fallbackChain = [], translationFunctionKey = 't', formatMessage = (message, options = {}) => {
-        return Object.entries(options).reduce((msg, [key, value]) => msg.replace(new RegExp(`{{${key}}}`, 'g'), String(value)), message);
-    }, cacheTranslations = true } = options;
+        "en", defaultLanguage = "en", fallbackChain = [], translationFunctionKey = "t", formatMessage = (message, options = {}) => {
+        return Object.entries(options).reduce((msg, [key, value]) => msg.replace(new RegExp(`{{${key}}}`, "g"), String(value)), message);
+    }, cacheTranslations = true, } = options;
     const translationCache = {};
     return async (ctx, next) => {
         try {
@@ -17,12 +17,12 @@ const i18nMiddleware = (options) => {
             const languageChain = [
                 detectedLanguage,
                 ...fallbackChain,
-                defaultLanguage
+                defaultLanguage,
             ].filter(Boolean);
             let translations = null;
             let selectedLanguage = defaultLanguage;
             for (const lang of languageChain) {
-                const normalizedLang = lang.split('-')[0].toLowerCase();
+                const normalizedLang = lang.split("-")[0].toLowerCase();
                 if (cacheTranslations && translationCache[normalizedLang]) {
                     const cached = translationCache[normalizedLang];
                     if (isCacheValid(cached, normalizedLang)) {
@@ -38,7 +38,7 @@ const i18nMiddleware = (options) => {
                     if (expiresAt instanceof Date) {
                         expirationTime = expiresAt.getTime();
                     }
-                    else if (typeof expiresAt === 'number') {
+                    else if (typeof expiresAt === "number") {
                         expirationTime = expiresAt;
                     }
                     translations = loadedTranslations;
@@ -56,13 +56,13 @@ const i18nMiddleware = (options) => {
                 }
             }
             if (!translations) {
-                throw new Error('No translations available');
+                throw new Error("No translations available");
             }
             ctx[translationFunctionKey] = (key, options) => {
-                const value = key.split('.').reduce((acc, k) => {
-                    return (acc && typeof acc === 'object') ? acc[k] : undefined;
+                const value = key.split(".").reduce((acc, k) => {
+                    return acc && typeof acc === "object" ? acc[k] : undefined;
                 }, translations);
-                const message = typeof value === 'string' ? value : key;
+                const message = typeof value === "string" ? value : key;
                 return formatMessage(message, options);
             };
             ctx.language = selectedLanguage;
@@ -70,7 +70,7 @@ const i18nMiddleware = (options) => {
             return await next();
         }
         catch (error) {
-            config_1.GlobalConfig.debugging.error('i18n processing error:', error);
+            config_1.GlobalConfig.debugging.error("i18n processing error:", error);
             ctx.setStatus = 500;
             throw error;
         }

package/cjs/middleware/lazyLoadModules.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazyLoadModules = void 0;
 const config_1 = require("../core/config");
-;
 const lazyLoadModules = (options) => {
-    const { moduleKey = (ctx) => ctx.req.params[queryKeyModule] || ctx.req.query[queryKeyModule], getModuleLoader, queryKeyModule = "module", moduleContextKey = "module", cacheTTL = 3600000, dependencies = {}, enableCache = true, cacheStorage = new Map(), lifecycleHooks = {}, validateModule } = options;
+    const { moduleKey = (ctx) => ctx.req.params[queryKeyModule] || ctx.req.query[queryKeyModule], getModuleLoader, queryKeyModule = "module", moduleContextKey = "module", cacheTTL = 3600000, dependencies = {}, enableCache = true, cacheStorage = new Map(), lifecycleHooks = {}, validateModule, } = options;
     return async (ctx, next) => {
-        let moduleName = moduleKey(ctx) || ctx.req.params[queryKeyModule] || ctx.req.query[queryKeyModule];
+        let moduleName = moduleKey(ctx) ||
+            ctx.req.params[queryKeyModule] ||
+            ctx.req.query[queryKeyModule];
         if (!moduleName) {
             config_1.GlobalConfig.debugging.warn("No module specified for lazy loading.");
             return await next();
@@ -43,7 +44,7 @@ const lazyLoadModules = (options) => {
             if (enableCache) {
                 cacheStorage.set(moduleName, {
                     module,
-                    expiresAt: Date.now() + cacheTTL
+                    expiresAt: Date.now() + cacheTTL,
                 });
                 lifecycleHooks.onCacheSet?.(moduleName, module, ctx);
             }

package/cjs/middleware/pagination.js

@@ -12,40 +12,40 @@ const paginationHandler = (options = {}) => {
         ctx.pagination = {
             page,
             limit,
-            offset: offset,
+            offset,
             queryKeyPage,
-            queryKeyLimit
+            queryKeyLimit,
         };
         if (getDataSource) {
-            try {
-                const dataSourceResponse = await getDataSource(ctx, { page, limit, offset });
-                const total = dataSourceResponse?.[countKey];
-                const data = dataSourceResponse?.[dataKey];
-                if (typeof total !== "number" || !Array.isArray(data)) {
-                    throw new Error("Invalid data structure returned by getDataSource.");
-                }
-                ctx.body = {
-                    [dataKey]: data,
-                    [countKey]: total,
-                    pagination: {
-                        page,
-                        limit,
-                        totalItems: total,
-                        totalPages: Math.ceil(total / limit),
-                        hasNextPage: page < Math.ceil(total / limit),
-                        hasPrevPage: page > 1,
-                        nextPage: page < Math.ceil(total / limit) ? page + 1 : null,
-                        prevPage: page > 1 ? page - 1 : null,
-                    },
-                };
-            }
-            catch (error) {
-                ctx.setStatus = 500;
-                ctx.body = { error: "Internal Server Error", };
-                throw new Error("Error fetching or processing data:", error?.message);
+            const dataSourceResponse = await getDataSource(ctx, {
+                page,
+                limit,
+                offset,
+            });
+            const total = dataSourceResponse?.[countKey];
+            const data = dataSourceResponse?.[dataKey];
+            const pagination = {
+                page,
+                limit,
+                totalItems: total,
+                totalPages: Math.ceil(total / limit),
+                hasNextPage: page < Math.ceil(total / limit),
+                hasPrevPage: page > 1,
+                nextPage: page < Math.ceil(total / limit) ? page + 1 : null,
+                prevPage: page > 1 ? page - 1 : null,
+            };
+            ctx.pagination = pagination;
+            const body = {
+                [dataKey]: data,
+                [countKey]: total,
+                pagination,
+            };
+            if (next) {
+                ctx.body = body;
+                return await next();
             }
+            return (ctx.body = body);
         }
-        return await next();
     };
 };
 exports.paginationHandler = paginationHandler;

package/cjs/middleware/rateLimiter.js

@@ -2,21 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rateLimiter = void 0;
 const rateLimiter = (options) => {
-    const { maxRequests, windowMs, keyGenerator = (ctx) => `${ctx.req.remoteAddress.address}:${ctx.req.remoteAddress.port}`, onError = (ctx, retryAfter, error) => {
+    const { maxRequests, windowMs, keyGenerator = (ctx) => `${ctx.req.remoteAddress.address}:${ctx.req.remoteAddress.port}`, cacheStorage = new Map(), onError = (ctx, retryAfter, error) => {
         ctx.setStatus = 429;
         throw new Error(`Rate limit exceeded. Try again in ${retryAfter} seconds.`);
     }, } = options;
-    const memoryStore = new Map();
     return async (ctx, next) => {
         const key = keyGenerator(ctx);
         let requestCount;
         let resetTime;
-        for (const [key, entry] of memoryStore.entries()) {
+        for (const [key, entry] of cacheStorage.entries()) {
             if (Date.now() >= entry.resetTime) {
-                memoryStore.delete(key);
+                cacheStorage.delete(key);
             }
         }
-        const entry = memoryStore.get(key);
+        const entry = cacheStorage.get(key);
         if (entry && Date.now() < entry.resetTime) {
             requestCount = entry.count + 1;
             resetTime = entry.resetTime;
@@ -24,7 +23,7 @@ const rateLimiter = (options) => {
         else {
             requestCount = 1;
             resetTime = Date.now() + windowMs;
-            memoryStore.set(key, { count: requestCount, resetTime });
+            cacheStorage.set(key, { count: requestCount, resetTime });
         }
         if (requestCount > maxRequests) {
             const retryAfter = Math.ceil((resetTime - Date.now()) / 1000);

package/cjs/middleware/xssProtection.js

@@ -14,7 +14,7 @@ const xssProtection = (options = {}) => {
         ctx.headers.set("X-XSS-Protection", xssHeaderValue);
         config_1.GlobalConfig.debugging.warn(`🟢 X-XSS-Protection set to: ${xssHeaderValue}`);
         if (fallbackCSP) {
-            const existingCSP = ctx.headers.get("Content-Security-Policy");
+            const existingCSP = ctx.req.headers.get("Content-Security-Policy");
             if (!existingCSP) {
                 ctx.headers.set("Content-Security-Policy", fallbackCSP);
                 config_1.GlobalConfig.debugging.warn(`🟣 Fallback CSP set to: ${fallbackCSP}`);

package/core/context.d.ts

@@ -51,7 +51,6 @@ export declare class Context<T extends Record<string, any> = {}> {
      * @type {State}
      */
     state: State;
-    body: Record<string, any>;
     constructor(req: any, connInfo: ConnAddress);
     /**
      * Cookie handling utility with get/set/delete operations
@@ -192,5 +191,17 @@ export declare class Context<T extends Record<string, any> = {}> {
      */
     get req(): Request;
     protected set params(params: Record<string, any>);
+    /**
+     * Sets the HTTP response body to be returned to the client.
+     * This can be a string, object, or any serializable data.
+     * @param body - The response payload to be stored internally.
+     */
+    set body(body: any | undefined);
+    /**
+     * Retrieves the current response body set for the outgoing HTTP response.
+     * This value will be used when sending the final response.
+     * @returns The internally stored response payload.
+     */
+    get body(): any | undefined;
     protected get params(): Record<string, any>;
 }

package/core/context.js

@@ -79,7 +79,7 @@ export class Context {
     #status = 200;
     state = new State();
     #params = {};
-    body = {};
+    #resBody;
     #localAddress = {};
     #remoteAddress = {};
     constructor(req, connInfo) {
@@ -95,7 +95,7 @@ export class Context {
         return this;
     }
     get cookies() {
-        const c = this.headers.getAll("cookie");
+        const c = this.req.headers.getAll("cookie");
         let cookies = {};
         if (Array.isArray(c) && c.length != 0) {
             const cookieHeader = c.join("; ").split(";");
@@ -164,8 +164,8 @@ export class Context {
         else if (typeof args[0] === "object") {
             headers = args[0];
         }
-        if (!headers["Content-Type"]) {
-            if (typeof body === "string") {
+        if (!headers["Content-Type"] && !headers["content-type"]) {
+            if (typeof body === "string" || typeof body == "number") {
                 headers["Content-Type"] = "text/plain;";
             }
             else if (typeof body === "object" && body !== null) {
@@ -385,6 +385,7 @@ export class Context {
             headers,
         });
         let clone = response.clone();
+        this.body = body;
         this.res = response;
         return clone;
     }
@@ -394,6 +395,12 @@ export class Context {
     set params(params) {
         this.#params = params;
     }
+    set body(body) {
+        this.#resBody = body;
+    }
+    get body() {
+        return this.#resBody;
+    }
     get params() {
         return this.#params;
     }

package/core/request.d.ts

@@ -1,4 +1,3 @@
-import { HeadersParser } from "./header";
 import { UrlRef } from "../utils/url";
 export type FormDataOptions = {
     maxSize?: number;
@@ -19,7 +18,7 @@ export type ConnAddress = {
 };
 export type HTTPMethod = "GET" | "POST" | "PUT" | "DELETE" | "OPTIONS" | "PATCH" | "HEAD" | "ALL" | "TRACE" | "CONNECT" | string;
 export declare class Request {
-    headers: HeadersParser;
+    #private;
     /**
      * Full request URL including protocol and query string
      * @type {string}
@@ -57,6 +56,81 @@ export declare class Request {
      */
     remoteAddress: AddressType;
     constructor(req: any, params: Record<string, any>, remoteAddress: AddressType);
+    get headers(): {
+        /**
+         * Retrieves the first value of a specific header.
+         * @param key - Header name to search for.
+         * @returns The first header value or undefined if not found.
+         * @example
+         * get('content-type') // returns 'application/json'
+         */
+        get: (key: string) => string | undefined;
+        /**
+         * Retrieves all values of a specific header.
+         * If multiple values exist for a header, all will be returned as an array.
+         * @param key - Header name to search for.
+         * @returns An array of all header values associated with the key.
+         * @example
+         * getAll('accept-language') // returns ['en-US', 'fr-CA']
+         */
+        getAll: (key: string) => string | never[];
+        /**
+         * Checks if a header exists in the request.
+         * @param key - Header name to check for existence.
+         * @returns True if the header exists, false otherwise.
+         * @example
+         * has('Authorization') // returns true if 'Authorization' header exists
+         */
+        has: (key: string) => boolean;
+        /**
+         * Returns an iterator over all header entries.
+         * Each entry is a [key, value] pair where the value can be an array of strings.
+         * @returns IterableIterator for iterating over header key-value pairs.
+         * @example
+         * for (let [key, value] of headers.entries()) {
+         *   console.log(key, value);
+         * }
+         */
+        entries: () => IterableIterator<[string, string[]]>;
+        /**
+         * Returns an iterator over all header keys.
+         * This allows iteration over the names of all headers in the request.
+         * @returns IterableIterator of header names.
+         * @example
+         * for (let key of headers.keys()) {
+         *   console.log(key);
+         * }
+         */
+        keys: () => IterableIterator<string>;
+        /**
+         * Returns an iterator over all header values.
+         * This allows iteration over the values of all headers, with each value being an array of strings.
+         * @returns IterableIterator of header values.
+         * @example
+         * for (let value of headers.values()) {
+         *   console.log(value);
+         * }
+         */
+        values: () => IterableIterator<string[]>;
+        /**
+         * Iterates over each header and executes a callback for every header found.
+         * @param callback - Function to execute for each header. Receives the value array and key.
+         * @example
+         * headers.forEach((value, key) => {
+         *   console.log(key, value);
+         * });
+         */
+        forEach: (callback: (value: string[], key: string) => void) => void;
+        /**
+         * Converts all headers into a plain JavaScript object.
+         * Single-value headers are represented as a string, and multi-value headers as an array.
+         * @returns A plain object with header names as keys and their values as strings or arrays.
+         * @example
+         * const headersObject = headers.toObject();
+         * console.log(headersObject);
+         */
+        toObject: () => Record<string, string | string[]>;
+    };
     /**
      * Parses the request body as plain text.
      * @returns {Promise<string>} The text content of the request body.

package/core/request.js

@@ -1,9 +1,9 @@
-import { EnvironmentDetector } from "./environment";
-import { HeadersParser } from "./header";
 import { parseJsonBody, parseMultipartBody, parseTextBody, parseUrlEncodedBody, } from "../utils/formData";
 import { urlParse } from "../utils/url";
+import { EnvironmentDetector } from "./environment";
+import { HeadersParser } from "./header";
 export class Request {
-    headers = new HeadersParser();
+    #headers = new HeadersParser();
     url;
     method;
     urlRef = {
@@ -24,13 +24,13 @@ export class Request {
     remoteAddress = {};
     constructor(req, params, remoteAddress) {
         this.remoteAddress = remoteAddress;
-        this.headers = new HeadersParser(req?.headers);
+        this.#headers = new HeadersParser(req?.headers);
         this.method = req?.method?.toUpperCase();
         this.params = params;
         this.rawRequest = req;
         if (EnvironmentDetector.getEnvironment == "node") {
             const protocol = EnvironmentDetector.detectProtocol(req);
-            const host = EnvironmentDetector.getHost(this.headers);
+            const host = EnvironmentDetector.getHost(this.#headers);
             this.url = `${protocol}://${host}${req.url}`;
         }
         else {
@@ -39,11 +39,40 @@ export class Request {
         this.urlRef = urlParse(this.url);
         this.query = this.urlRef.query;
     }
+    get headers() {
+        let requestHeaders = this.#headers;
+        return {
+            get: function get(key) {
+                return requestHeaders.get(key.toLowerCase());
+            },
+            getAll: function getAll(key) {
+                return requestHeaders.get(key.toLowerCase()) || [];
+            },
+            has: function has(key) {
+                return requestHeaders.has(key.toLowerCase());
+            },
+            entries: function entries() {
+                return requestHeaders.entries();
+            },
+            keys: function keys() {
+                return requestHeaders.keys();
+            },
+            values: function values() {
+                return requestHeaders.values();
+            },
+            forEach: function forEach(callback) {
+                return requestHeaders.forEach(callback);
+            },
+            toObject: function toObject() {
+                return requestHeaders.toObject();
+            },
+        };
+    }
     async text() {
         return await parseTextBody(this.rawRequest);
     }
     async json() {
-        const contentType = this.headers.get("content-type") || "";
+        const contentType = this.#headers.get("content-type") || "";
         if (contentType.includes("application/json")) {
             return await parseJsonBody(this.rawRequest);
         }
@@ -52,7 +81,7 @@ export class Request {
         }
     }
     async formData(options) {
-        const contentType = this.headers.get("content-type") || "";
+        const contentType = this.#headers.get("content-type") || "";
         if (!contentType) {
             throw Error("Invalid Content-Type");
         }

package/core/router.d.ts

@@ -3,8 +3,9 @@ import MiddlewareConfigure, { DuplicateMiddlewares, UniqueMiddlewares } from "./
 import { HTTPMethod } from "./request";
 export type NextCallback = () => Promise<any>;
 export type ctx<T extends Record<string, any> = {}> = Context<T> & T;
-export type Callback<T extends Record<string, any> = {}> = (ctx: ctx<T>) => Promise<Response> | Response;
-export type Middleware<T extends Record<string, any> = {}> = (ctx: ctx<T>, next: NextCallback) => NextCallback | Promise<NextCallback | Response> | Response;
+export type CallbackReturnType = Promise<Response> | Response | string | Record<string, any>;
+export type Callback<T extends Record<string, any> = {}> = (ctx: ctx<T>) => CallbackReturnType;
+export type Middleware<T extends Record<string, any> = {}> = (ctx: ctx<T>, next: NextCallback) => NextCallback | Promise<NextCallback | Response> | Response | string | Record<string, any>;
 export type RouterConfig = {
     /**
      * `env` allows you to define environment variables for the router.
@@ -75,64 +76,72 @@ export declare class Router<T extends Record<string, any> = {}> extends Middlewa
      * app.get('/admin', [authMiddleware, adminMiddleware], (ctx) => { ... });
      */
     get(path: string, callback: Callback<T>): this;
+    get(path: string, middleware: Middleware<T>): this;
+    get(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     get(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    get(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Registers a POST route with optional middleware(s)
      * @param path - URL path pattern
      * @param args - Handler callback or middleware(s) + handler
      */
     post(path: string, callback: Callback<T>): this;
+    post(path: string, middleware: Middleware<T>): this;
+    post(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     post(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    post(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Registers a PUT route with optional middleware(s)
      * @param path - URL path pattern
      * @param args - Handler callback or middleware(s) + handler
      */
     put(path: string, callback: Callback<T>): this;
+    put(path: string, middleware: Middleware<T>): this;
+    put(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     put(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    put(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Registers a PATCH route with optional middleware(s)
      * @param path - URL path pattern
      * @param args - Handler callback or middleware(s) + handler
      */
     patch(path: string, callback: Callback<T>): this;
+    patch(path: string, middleware: Middleware<T>): this;
+    patch(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     patch(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    patch(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Registers a DELETE route with optional middleware(s)
      * @param path - URL path pattern
      * @param args - Handler callback or middleware(s) + handler
      */
     delete(path: string, callback: Callback<T>): this;
+    delete(path: string, middleware: Middleware<T>): this;
+    delete(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     delete(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    delete(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Registers an OPTIONS route (primarily for CORS preflight requests)
      * @param path - URL path pattern
      * @param args - Handler callback or middleware(s) + handler
      */
     options(path: string, callback: Callback<T>): this;
+    options(path: string, middleware: Middleware<T>): this;
+    options(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     options(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    options(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Registers a HEAD route (returns headers only)
      * @param path - URL path pattern
      * @param args - Handler callback or middleware(s) + handler
      */
     head(path: string, callback: Callback<T>): this;
+    head(path: string, middleware: Middleware<T>): this;
+    head(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     head(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    head(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Registers a route that responds to all HTTP methods
      * @param path - URL path pattern
      * @param args - Handler callback or middleware(s) + handler
      */
     all(path: string, callback: Callback<T>): this;
+    all(path: string, middleware: Middleware<T>): this;
+    all(path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     all(path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    all(path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Generic method registration for custom HTTP methods
      * @param method - HTTP method name (e.g., 'PURGE')
@@ -144,8 +153,9 @@ export declare class Router<T extends Record<string, any> = {}> extends Middlewa
      * server.addRoute('PURGE', '/cache', purgeHandler);
      */
     addRoute(method: HTTPMethod, path: string, callback: Callback<T>): this;
+    addRoute(method: HTTPMethod, path: string, middleware: Middleware<T>): this;
+    addRoute(method: HTTPMethod, path: string, middleware: Middleware<T>, callback: Callback<T>): this;
     addRoute(method: HTTPMethod, path: string, middlewares: Middleware<T>[], callback: Callback<T>): this;
-    addRoute(method: HTTPMethod, path: string, middlewares: Middleware<T>, callback: Callback<T>): this;
     /**
      * Mount a sub-router at specific path prefix
      * @param path - Base path for the sub-router

package/core/router.js

@@ -1,7 +1,7 @@
-import { GlobalConfig } from "./config";
-import MiddlewareConfigure, { TriMiddleware, } from "./MiddlewareConfigure";
 import { getFiles } from "../utils/staticFile";
 import { sanitizePathSplit } from "../utils/url";
+import { GlobalConfig } from "./config";
+import MiddlewareConfigure, { TriMiddleware, } from "./MiddlewareConfigure";
 class TrieRouter {
     children = new Map();
     handlers = new Map();

package/core/server.js

@@ -1,7 +1,7 @@
+import { COLORS } from "../utils/colors";
 import { GlobalConfig } from "./config";
 import { Context, httpStatusMap } from "./context";
 import { Router } from "./router";
-import { COLORS } from "../utils/colors";
 import { useParams } from "../utils/params";
 export class TezX extends Router {
     constructor({ basePath = "/", env = {}, debugMode = false, allowDuplicateMw = false, overwriteMethod = true, } = {}) {
@@ -83,10 +83,14 @@ export class TezX extends Router {
                 }
             };
             const response = await next();
-            if (!response) {
+            if (response instanceof Response) {
+                return response;
+            }
+            if (!response && !ctx.body) {
                 throw new Error(`Handler did not return a response or next() was not called. Path: ${ctx.pathname}, Method: ${ctx.method}`);
             }
-            return response;
+            const resBody = response || ctx.body;
+            return ctx.send(resBody, ctx.headers.toObject());
         };
     }
     #findMiddleware(pathname) {
@@ -126,7 +130,7 @@ export class TezX extends Router {
                     return (await this.#createHandler(middlewares, callback)(ctx));
                 }
                 else {
-                    let res = await GlobalConfig.notFound(ctx);
+                    let res = (await GlobalConfig.notFound(ctx));
                     ctx.setStatus = res.status;
                     return res;
                 }

package/index.js

@@ -1,4 +1,4 @@
 export { Router } from "./core/router";
 export { TezX } from "./core/server";
 export { useParams } from "./utils/params";
-export let version = "1.0.35";
+export let version = "1.0.37";

package/middleware/i18nMiddleware.d.ts

@@ -8,10 +8,10 @@ export type loadTranslations = (language: string) => Promise<{
 }>;
 export type I18nOptions = {
     /**
-      * 🌐 Function to load translations dynamically
-      * @param language - Language code to load (e.g., "en-US")
-      * @returns Promise with translations map and optional expiration
-      */
+     * 🌐 Function to load translations dynamically
+     * @param language - Language code to load (e.g., "en-US")
+     * @returns Promise with translations map and optional expiration
+     */
     loadTranslations: (language: string) => Promise<{
         translations: TranslationMap;
         expiresAt?: Date | number;

package/middleware/i18nMiddleware.js

@@ -1,12 +1,12 @@
 import { GlobalConfig } from "../core/config";
 export const i18nMiddleware = (options) => {
     const { loadTranslations, defaultCacheDuration = 3600000, isCacheValid = (cached) => cached.expiresAt > Date.now(), detectLanguage = (ctx) => ctx.req.query.lang ||
-        ctx.cookies?.get('lang') ||
-        ctx.headers.get('accept-language')?.split(',')[0] ||
+        ctx.cookies?.get("lang") ||
+        ctx.req.headers.get("accept-language")?.split(",")[0] ||
         options.defaultLanguage ||
-        'en', defaultLanguage = 'en', fallbackChain = [], translationFunctionKey = 't', formatMessage = (message, options = {}) => {
-        return Object.entries(options).reduce((msg, [key, value]) => msg.replace(new RegExp(`{{${key}}}`, 'g'), String(value)), message);
-    }, cacheTranslations = true } = options;
+        "en", defaultLanguage = "en", fallbackChain = [], translationFunctionKey = "t", formatMessage = (message, options = {}) => {
+        return Object.entries(options).reduce((msg, [key, value]) => msg.replace(new RegExp(`{{${key}}}`, "g"), String(value)), message);
+    }, cacheTranslations = true, } = options;
     const translationCache = {};
     return async (ctx, next) => {
         try {
@@ -14,12 +14,12 @@ export const i18nMiddleware = (options) => {
             const languageChain = [
                 detectedLanguage,
                 ...fallbackChain,
-                defaultLanguage
+                defaultLanguage,
             ].filter(Boolean);
             let translations = null;
             let selectedLanguage = defaultLanguage;
             for (const lang of languageChain) {
-                const normalizedLang = lang.split('-')[0].toLowerCase();
+                const normalizedLang = lang.split("-")[0].toLowerCase();
                 if (cacheTranslations && translationCache[normalizedLang]) {
                     const cached = translationCache[normalizedLang];
                     if (isCacheValid(cached, normalizedLang)) {
@@ -35,7 +35,7 @@ export const i18nMiddleware = (options) => {
                     if (expiresAt instanceof Date) {
                         expirationTime = expiresAt.getTime();
                     }
-                    else if (typeof expiresAt === 'number') {
+                    else if (typeof expiresAt === "number") {
                         expirationTime = expiresAt;
                     }
                     translations = loadedTranslations;
@@ -53,13 +53,13 @@ export const i18nMiddleware = (options) => {
                 }
             }
             if (!translations) {
-                throw new Error('No translations available');
+                throw new Error("No translations available");
             }
             ctx[translationFunctionKey] = (key, options) => {
-                const value = key.split('.').reduce((acc, k) => {
-                    return (acc && typeof acc === 'object') ? acc[k] : undefined;
+                const value = key.split(".").reduce((acc, k) => {
+                    return acc && typeof acc === "object" ? acc[k] : undefined;
                 }, translations);
-                const message = typeof value === 'string' ? value : key;
+                const message = typeof value === "string" ? value : key;
                 return formatMessage(message, options);
             };
             ctx.language = selectedLanguage;
@@ -67,7 +67,7 @@ export const i18nMiddleware = (options) => {
             return await next();
         }
         catch (error) {
-            GlobalConfig.debugging.error('i18n processing error:', error);
+            GlobalConfig.debugging.error("i18n processing error:", error);
             ctx.setStatus = 500;
             throw error;
         }

package/middleware/index.d.ts

@@ -9,4 +9,4 @@ export * from "./sanitizeHeader";
 export * from "./rateLimiter";
 export * from "./pagination";
 export * from "./i18nMiddleware";
-export * from './lazyLoadModules';
+export * from "./lazyLoadModules";

package/middleware/index.js

@@ -8,4 +8,4 @@ export * from "./sanitizeHeader";
 export * from "./rateLimiter";
 export * from "./pagination";
 export * from "./i18nMiddleware";
-export * from './lazyLoadModules';
+export * from "./lazyLoadModules";

package/middleware/lazyLoadModules.d.ts

@@ -42,7 +42,6 @@ interface LazyLoadOptions<T> {
         get: (key: string) => CacheItem<T> | undefined;
         set: (key: string, value: CacheItem<T>) => void;
         delete: (key: string) => void;
-        clear?: () => void;
     };
     /**
      * ⏳ Cache Time-To-Live (TTL) in milliseconds. This determines how long cached modules are valid.

package/middleware/lazyLoadModules.js

@@ -1,9 +1,10 @@
 import { GlobalConfig } from "../core/config";
-;
 export const lazyLoadModules = (options) => {
-    const { moduleKey = (ctx) => ctx.req.params[queryKeyModule] || ctx.req.query[queryKeyModule], getModuleLoader, queryKeyModule = "module", moduleContextKey = "module", cacheTTL = 3600000, dependencies = {}, enableCache = true, cacheStorage = new Map(), lifecycleHooks = {}, validateModule } = options;
+    const { moduleKey = (ctx) => ctx.req.params[queryKeyModule] || ctx.req.query[queryKeyModule], getModuleLoader, queryKeyModule = "module", moduleContextKey = "module", cacheTTL = 3600000, dependencies = {}, enableCache = true, cacheStorage = new Map(), lifecycleHooks = {}, validateModule, } = options;
     return async (ctx, next) => {
-        let moduleName = moduleKey(ctx) || ctx.req.params[queryKeyModule] || ctx.req.query[queryKeyModule];
+        let moduleName = moduleKey(ctx) ||
+            ctx.req.params[queryKeyModule] ||
+            ctx.req.query[queryKeyModule];
         if (!moduleName) {
             GlobalConfig.debugging.warn("No module specified for lazy loading.");
             return await next();
@@ -40,7 +41,7 @@ export const lazyLoadModules = (options) => {
             if (enableCache) {
                 cacheStorage.set(moduleName, {
                     module,
-                    expiresAt: Date.now() + cacheTTL
+                    expiresAt: Date.now() + cacheTTL,
                 });
                 lifecycleHooks.onCacheSet?.(moduleName, module, ctx);
             }

package/middleware/pagination.d.ts

@@ -1,4 +1,5 @@
-import { Context, Middleware } from "..";
+import { Context } from "..";
+import { Middleware } from "../core/router";
 export type PaginationOptions = {
     /**
      * 🔢 Default page number when not specified
@@ -52,7 +53,7 @@ export type PaginationOptions = {
      *   return db.find().skip((page-1)*limit).limit(limit);
      * }
      */
-    getDataSource?: (ctx: Context, pagination: {
+    getDataSource?: <T extends Record<string, any> = {}>(ctx: Context<T>, pagination: {
         page: number;
         limit: number;
         offset: number;
@@ -60,6 +61,19 @@ export type PaginationOptions = {
         [key: string]: any;
     }>;
 };
+export type PaginationBodyType = {
+    [x: string]: any;
+    pagination: {
+        page: number;
+        limit: number;
+        totalItems: any;
+        totalPages: number;
+        hasNextPage: boolean;
+        hasPrevPage: boolean;
+        nextPage: number | null;
+        prevPage: number | null;
+    };
+};
 /**
  * 🗂️ Advanced pagination middleware with dynamic data fetching
  *
@@ -69,12 +83,12 @@ export type PaginationOptions = {
  * - Comprehensive pagination metadata
  * - Built-in error handling
  *
- * @param {PaginationOptions} [options={}] - Configuration options
- * @returns {Middleware} Configured middleware
+ * @param {PaginationOptions} [options={}] - Configuration options for pagination behavior
+ * @returns {Callback} Middleware function that processes pagination and sets response
  *
  * @example
  * // Basic usage
- * app.get('/users', paginationHandler(), getUsers);
+ * app.get('/users', paginationHandler());
  *
  * // With dynamic data source
  * app.get('/products', paginationHandler({

package/middleware/pagination.js

@@ -9,39 +9,39 @@ export const paginationHandler = (options = {}) => {
         ctx.pagination = {
             page,
             limit,
-            offset: offset,
+            offset,
             queryKeyPage,
-            queryKeyLimit
+            queryKeyLimit,
         };
         if (getDataSource) {
-            try {
-                const dataSourceResponse = await getDataSource(ctx, { page, limit, offset });
-                const total = dataSourceResponse?.[countKey];
-                const data = dataSourceResponse?.[dataKey];
-                if (typeof total !== "number" || !Array.isArray(data)) {
-                    throw new Error("Invalid data structure returned by getDataSource.");
-                }
-                ctx.body = {
-                    [dataKey]: data,
-                    [countKey]: total,
-                    pagination: {
-                        page,
-                        limit,
-                        totalItems: total,
-                        totalPages: Math.ceil(total / limit),
-                        hasNextPage: page < Math.ceil(total / limit),
-                        hasPrevPage: page > 1,
-                        nextPage: page < Math.ceil(total / limit) ? page + 1 : null,
-                        prevPage: page > 1 ? page - 1 : null,
-                    },
-                };
-            }
-            catch (error) {
-                ctx.setStatus = 500;
-                ctx.body = { error: "Internal Server Error", };
-                throw new Error("Error fetching or processing data:", error?.message);
+            const dataSourceResponse = await getDataSource(ctx, {
+                page,
+                limit,
+                offset,
+            });
+            const total = dataSourceResponse?.[countKey];
+            const data = dataSourceResponse?.[dataKey];
+            const pagination = {
+                page,
+                limit,
+                totalItems: total,
+                totalPages: Math.ceil(total / limit),
+                hasNextPage: page < Math.ceil(total / limit),
+                hasPrevPage: page > 1,
+                nextPage: page < Math.ceil(total / limit) ? page + 1 : null,
+                prevPage: page > 1 ? page - 1 : null,
+            };
+            ctx.pagination = pagination;
+            const body = {
+                [dataKey]: data,
+                [countKey]: total,
+                pagination,
+            };
+            if (next) {
+                ctx.body = body;
+                return await next();
             }
+            return (ctx.body = body);
         }
-        return await next();
     };
 };

package/middleware/rateLimiter.d.ts

@@ -24,13 +24,35 @@ export type RateLimiterOptions = {
       //  * ⚠️ (Future) Storage backend - currently memory only
       //  * @todo Implement Redis storage
       //  */
+    /**
+     * 🔄 Custom cache storage implementation (e.g., using `Map`, `Redis`, etc.).
+     * By default, it uses a `Map<string, { count: number; resetTime: number }>`.
+     */
+    cacheStorage?: {
+        get: (key: string) => {
+            count: number;
+            resetTime: number;
+        } | undefined;
+        set: (key: string, value: {
+            count: number;
+            resetTime: number;
+        }) => void;
+        delete: (key: string) => void;
+        entries: () => IterableIterator<[
+            string,
+            {
+                count: number;
+                resetTime: number;
+            }
+        ]>;
+    };
     /**
      * 🛑 Custom rate limit exceeded handler
      * @default Sends 429 status with Retry-After header
      * @example
      * onError: (ctx, retryAfter) => {
      *   ctx.status = 429;
-     *   ctx.body = { error: `Try again in ${retryAfter} seconds` };
+     *   throw new Error( `Rate limit exceeded. Try again in ${retryAfter} seconds.`);
      * }
      */
     onError?: (ctx: Context, retryAfter: number, error: Error) => void;

package/middleware/rateLimiter.js

@@ -1,19 +1,18 @@
 export const rateLimiter = (options) => {
-    const { maxRequests, windowMs, keyGenerator = (ctx) => `${ctx.req.remoteAddress.address}:${ctx.req.remoteAddress.port}`, onError = (ctx, retryAfter, error) => {
+    const { maxRequests, windowMs, keyGenerator = (ctx) => `${ctx.req.remoteAddress.address}:${ctx.req.remoteAddress.port}`, cacheStorage = new Map(), onError = (ctx, retryAfter, error) => {
         ctx.setStatus = 429;
         throw new Error(`Rate limit exceeded. Try again in ${retryAfter} seconds.`);
     }, } = options;
-    const memoryStore = new Map();
     return async (ctx, next) => {
         const key = keyGenerator(ctx);
         let requestCount;
         let resetTime;
-        for (const [key, entry] of memoryStore.entries()) {
+        for (const [key, entry] of cacheStorage.entries()) {
             if (Date.now() >= entry.resetTime) {
-                memoryStore.delete(key);
+                cacheStorage.delete(key);
             }
         }
-        const entry = memoryStore.get(key);
+        const entry = cacheStorage.get(key);
         if (entry && Date.now() < entry.resetTime) {
             requestCount = entry.count + 1;
             resetTime = entry.resetTime;
@@ -21,7 +20,7 @@ export const rateLimiter = (options) => {
         else {
             requestCount = 1;
             resetTime = Date.now() + windowMs;
-            memoryStore.set(key, { count: requestCount, resetTime });
+            cacheStorage.set(key, { count: requestCount, resetTime });
         }
         if (requestCount > maxRequests) {
             const retryAfter = Math.ceil((resetTime - Date.now()) / 1000);

package/middleware/xssProtection.js

@@ -11,7 +11,7 @@ export const xssProtection = (options = {}) => {
         ctx.headers.set("X-XSS-Protection", xssHeaderValue);
         GlobalConfig.debugging.warn(`🟢 X-XSS-Protection set to: ${xssHeaderValue}`);
         if (fallbackCSP) {
-            const existingCSP = ctx.headers.get("Content-Security-Policy");
+            const existingCSP = ctx.req.headers.get("Content-Security-Policy");
             if (!existingCSP) {
                 ctx.headers.set("Content-Security-Policy", fallbackCSP);
                 GlobalConfig.debugging.warn(`🟣 Fallback CSP set to: ${fallbackCSP}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tezx",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "TezX is a high-performance, lightweight JavaScript framework designed for speed, scalability, and flexibility. It enables efficient routing, middleware management, and static file serving with minimal configuration. Fully compatible with Node.js, Deno, and Bun.",
   "main": "cjs/index.js",
   "module": "index.js",