tezx 1.0.60 → 1.0.62

package/adapter/node.js

@@ -4,7 +4,7 @@ import { Context } from "../core/context.js";
 export function nodeAdapter(TezX, options = {}) {
     function listen(...arg) {
         let ssl = options?.enableSSL;
-        import(ssl ? "node:https" : 'node:http')
+        import(ssl ? "node:https" : "node:http")
             .then((r) => {
             GlobalConfig.adapter = "node";
             let server = r.createServer(options, async (req, res) => {
@@ -39,11 +39,10 @@ export function nodeAdapter(TezX, options = {}) {
                 if (!(response instanceof Response)) {
                     throw new Error("Invalid response from TezX.serve");
                 }
-                const headers = Object.fromEntries(await response.headers.entries());
                 if (statusText) {
                     res.statusMessage = statusText;
                 }
-                res.writeHead(response.status, headers);
+                res.writeHead(response.status, [...response.headers.entries()]);
                 const { Readable } = await import("node:stream");
                 if (response.body instanceof Readable) {
                     return response.body.pipe(res);
@@ -61,7 +60,9 @@ export function nodeAdapter(TezX, options = {}) {
             const port = typeof arg[0] === "function" ? undefined : arg[0];
             const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
             server.listen(options?.unix || port || 0, () => {
-                const protocol = ssl ? "\x1b[1;35mhttps\x1b[0m" : "\x1b[1;34mhttp\x1b[0m";
+                const protocol = ssl
+                    ? "\x1b[1;35mhttps\x1b[0m"
+                    : "\x1b[1;34mhttp\x1b[0m";
                 const address = server.address();
                 const message = typeof address === "string"
                     ? `\x1b[1mNodeJS TezX Server running at unix://${address}\x1b[0m`

package/cjs/adapter/node.js

@@ -7,7 +7,7 @@ const context_js_1 = require("../core/context.js");
 function nodeAdapter(TezX, options = {}) {
     function listen(...arg) {
         let ssl = options?.enableSSL;
-        Promise.resolve(`${ssl ? "node:https" : 'node:http'}`).then(s => require(s)).then((r) => {
+        Promise.resolve(`${ssl ? "node:https" : "node:http"}`).then(s => require(s)).then((r) => {
             config_js_1.GlobalConfig.adapter = "node";
             let server = r.createServer(options, async (req, res) => {
                 let address = {};
@@ -41,11 +41,10 @@ function nodeAdapter(TezX, options = {}) {
                 if (!(response instanceof Response)) {
                     throw new Error("Invalid response from TezX.serve");
                 }
-                const headers = Object.fromEntries(await response.headers.entries());
                 if (statusText) {
                     res.statusMessage = statusText;
                 }
-                res.writeHead(response.status, headers);
+                res.writeHead(response.status, [...response.headers.entries()]);
                 const { Readable } = await Promise.resolve().then(() => require("node:stream"));
                 if (response.body instanceof Readable) {
                     return response.body.pipe(res);
@@ -63,7 +62,9 @@ function nodeAdapter(TezX, options = {}) {
             const port = typeof arg[0] === "function" ? undefined : arg[0];
             const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
             server.listen(options?.unix || port || 0, () => {
-                const protocol = ssl ? "\x1b[1;35mhttps\x1b[0m" : "\x1b[1;34mhttp\x1b[0m";
+                const protocol = ssl
+                    ? "\x1b[1;35mhttps\x1b[0m"
+                    : "\x1b[1;34mhttp\x1b[0m";
                 const address = server.address();
                 const message = typeof address === "string"
                     ? `\x1b[1mNodeJS TezX Server running at unix://${address}\x1b[0m`

package/cjs/core/header.js

@@ -80,6 +80,13 @@ class HeadersParser {
         }
         return obj;
     }
+    toJSON() {
+        const obj = {};
+        for (const [key, value] of this.headers.entries()) {
+            obj[key] = Array.isArray(value) ? value.join(", ") : value;
+        }
+        return obj;
+    }
 }
 exports.HeadersParser = HeadersParser;
 Object.defineProperty(HeadersParser, "name", { value: "Headers" });

package/cjs/core/request.js

@@ -54,6 +54,9 @@ class Request {
             forEach: function forEach(callback) {
                 return requestHeaders.forEach(callback);
             },
+            toJSON() {
+                return requestHeaders.toJSON();
+            },
             toObject: function toObject() {
                 return requestHeaders.toObject();
             },

package/cjs/core/server.js

@@ -76,18 +76,24 @@ class TezX extends router_js_1.Router {
         }
         return null;
     }
-    #createHandler(middlewares, finalCallback) {
+    #createHandler(middlewares) {
         return async (ctx) => {
+            let response = undefined;
             let index = 0;
-            const next = async () => {
-                if (index < middlewares.length) {
-                    return await middlewares[index++](ctx, next);
+            let next = async () => {
+                const currentMiddleware = middlewares[index++];
+                let result = await currentMiddleware?.(ctx, next);
+                if (result instanceof Response) {
+                    ctx.res = result;
+                    response = ctx.res;
+                    return result;
                 }
-                else {
-                    return await finalCallback(ctx);
+                if (result) {
+                    response = result;
+                    return response;
                 }
             };
-            const response = await next();
+            await next();
             if (response instanceof Response) {
                 return response;
             }
@@ -95,10 +101,10 @@ class TezX extends router_js_1.Router {
                 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}`);
+                throw new Error(`Handler failed: Middleware chain incomplete or response missing. Did you forget ${colors_js_1.COLORS.bgRed} 'await next()' ${colors_js_1.COLORS.reset} or to return a response? ${colors_js_1.COLORS.bgCyan} Path: ${ctx.pathname}, Method: ${ctx.method} ${colors_js_1.COLORS.reset}`);
             }
             const resBody = response || ctx.body;
-            return ctx.send(resBody, ctx.headers.toObject());
+            return ctx.send(resBody, ctx.headers.toJSON());
         };
     }
     #findMiddleware(pathname) {
@@ -141,21 +147,18 @@ class TezX extends router_js_1.Router {
         let middlewares = this.#findMiddleware(resolvePath);
         ctx.env = this.env;
         try {
-            let callback = async (ctx) => {
-                const find = this.findRoute(ctx.req.method, resolvePath);
-                if (find?.callback) {
-                    ctx.params = find.params;
-                    const callback = find.callback;
-                    let middlewares = find.middlewares;
-                    return (await this.#createHandler(middlewares, callback)(ctx));
-                }
-                else {
-                    let res = (await config_js_1.GlobalConfig.notFound(ctx));
-                    ctx.setStatus = res.status;
-                    return res;
-                }
-            };
-            let response = await this.#createHandler([...this.triMiddlewares.middlewares, ...middlewares], callback)(ctx);
+            let combine = [...this.triMiddlewares.middlewares, ...middlewares];
+            const find = this.findRoute(ctx.req.method, resolvePath);
+            if (find?.callback) {
+                ctx.params = find.params;
+                const callback = find.callback;
+                let routeMiddlewares = find.middlewares || [];
+                combine.push(...routeMiddlewares, callback);
+            }
+            else {
+                combine.push(config_js_1.GlobalConfig.notFound);
+            }
+            let response = await this.#createHandler(combine)(ctx);
             if (ctx.wsProtocol) {
                 if (typeof response == "function") {
                     return {

package/cjs/index.js

@@ -7,4 +7,4 @@ var server_js_1 = require("./core/server.js");
 Object.defineProperty(exports, "TezX", { enumerable: true, get: function () { return server_js_1.TezX; } });
 var params_js_1 = require("./utils/params.js");
 Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return params_js_1.useParams; } });
-exports.version = "1.0.60";
+exports.version = "1.0.62";

package/cjs/middleware/index.js

@@ -15,10 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectBot = exports.cors = void 0;
+__exportStar(require("./basicAuth.js"), exports);
 var cors_js_1 = require("./cors.js");
 Object.defineProperty(exports, "cors", { enumerable: true, get: function () { return cors_js_1.cors; } });
 var detectBot_js_1 = require("./detectBot.js");
 Object.defineProperty(exports, "detectBot", { enumerable: true, get: function () { return detectBot_js_1.detectBot; } });
+__exportStar(require("./detectLocale.js"), exports);
 __exportStar(require("./i18nMiddleware.js"), exports);
 __exportStar(require("./lazyLoadModules.js"), exports);
 __exportStar(require("./logger.js"), exports);
@@ -26,8 +28,7 @@ __exportStar(require("./pagination.js"), exports);
 __exportStar(require("./powered-by.js"), exports);
 __exportStar(require("./rateLimiter.js"), exports);
 __exportStar(require("./request-id.js"), exports);
+__exportStar(require("./requestTimeout.js"), exports);
 __exportStar(require("./sanitizeHeader.js"), exports);
 __exportStar(require("./secureHeaders.js"), exports);
 __exportStar(require("./xssProtection.js"), exports);
-__exportStar(require("./basicAuth.js"), exports);
-__exportStar(require("./detectLocale.js"), exports);

package/cjs/middleware/requestTimeout.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestTimeout = void 0;
+const config_1 = require("../core/config");
+const requestTimeout = (options) => {
+    const { getTimeout, onTimeout = (ctx) => {
+        ctx.setStatus = 504;
+        ctx.body = { error: "Request timed out." };
+    }, logTimeoutEvent = (ctx, error) => {
+        config_1.GlobalConfig.debugging.warn(`[TIMEOUT] ${error.message}: ${ctx.method} ${ctx.path}`);
+    }, cleanup = () => {
+    }, } = options;
+    return async (ctx, next) => {
+        let timeoutId = null;
+        try {
+            const timeout = getTimeout(ctx);
+            const timeoutPromise = new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    const timeoutError = new Error("Request timed out.");
+                    logTimeoutEvent(ctx, timeoutError);
+                    reject(timeoutError);
+                }, timeout);
+            });
+            return await Promise.race([next(), timeoutPromise]);
+        }
+        catch (error) {
+            if (error.message === "Request timed out.") {
+                onTimeout(ctx, error);
+            }
+            else {
+                throw error;
+            }
+        }
+        finally {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+            cleanup(ctx);
+        }
+    };
+};
+exports.requestTimeout = requestTimeout;

package/cjs/ws/deno.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DenoTransport = void 0;
 class DenoTransport {
     async upgrade(ctx, event, options) {
-        const { socket, response } = (Deno).upgradeWebSocket(ctx.req.rawRequest, {
+        const { socket, response } = Deno.upgradeWebSocket(ctx.req.rawRequest, {
             protocol: options.protocol,
             idleTimeout: options.idleTimeout,
         });

package/core/header.d.ts

@@ -68,4 +68,10 @@ export declare class HeadersParser {
      * @returns A record of headers where single-value headers are returned as a string.
      */
     toObject(): Record<string, string | string[]>;
+    /**
+     * Converts headers to a JSON-safe plain object (only single string values).
+     * Multi-value headers are joined by commas.
+     * @returns A record of headers with string values.
+     */
+    toJSON(): Record<string, string>;
 }

package/core/header.js

@@ -77,5 +77,12 @@ export class HeadersParser {
         }
         return obj;
     }
+    toJSON() {
+        const obj = {};
+        for (const [key, value] of this.headers.entries()) {
+            obj[key] = Array.isArray(value) ? value.join(", ") : value;
+        }
+        return obj;
+    }
 }
 Object.defineProperty(HeadersParser, "name", { value: "Headers" });

package/core/request.d.ts

@@ -129,6 +129,12 @@ export declare class Request {
          * });
          */
         forEach: (callback: (value: string[], key: string) => void) => void;
+        /**
+         * Converts headers to a JSON-safe plain object (only single string values).
+         * Multi-value headers are joined by commas.
+         * @returns A record of headers with string values.
+         */
+        toJSON(): Record<string, string>;
         /**
          * Converts all headers into a plain JavaScript object.
          * Single-value headers are represented as a string, and multi-value headers as an array.

package/core/request.js

@@ -51,6 +51,9 @@ export class Request {
             forEach: function forEach(callback) {
                 return requestHeaders.forEach(callback);
             },
+            toJSON() {
+                return requestHeaders.toJSON();
+            },
             toObject: function toObject() {
                 return requestHeaders.toObject();
             },

package/core/router.d.ts

@@ -5,7 +5,7 @@ export type ctx<T extends Record<string, any> = {}> = Context<T> & T;
 export type NextCallback = () => Promise<any>;
 export type CallbackReturn = Promise<Response> | Response;
 export type Callback<T extends Record<string, any> = {}> = (ctx: ctx<T>) => CallbackReturn;
-export type Middleware<T extends Record<string, any> = {}> = (ctx: ctx<T>, next: NextCallback) => Promise<Response> | Response | NextCallback;
+export type Middleware<T extends Record<string, any> = {}> = (ctx: ctx<T>, next: NextCallback) => Promise<Response | void> | Response | NextCallback;
 export type RouterConfig = {
     /**
      * `env` allows you to define environment variables for the router.

package/core/router.js

@@ -1,5 +1,5 @@
 import { getFiles } from "../utils/staticFile.js";
-import { sanitizePathSplit, wildcardOrOptionalParamRegex } from "../utils/url.js";
+import { sanitizePathSplit, wildcardOrOptionalParamRegex, } from "../utils/url.js";
 import { GlobalConfig } from "./config.js";
 import MiddlewareConfigure, { TriMiddleware, } from "./MiddlewareConfigure.js";
 class TrieRouter {

package/core/server.js

@@ -73,18 +73,24 @@ export class TezX extends Router {
         }
         return null;
     }
-    #createHandler(middlewares, finalCallback) {
+    #createHandler(middlewares) {
         return async (ctx) => {
+            let response = undefined;
             let index = 0;
-            const next = async () => {
-                if (index < middlewares.length) {
-                    return await middlewares[index++](ctx, next);
+            let next = async () => {
+                const currentMiddleware = middlewares[index++];
+                let result = await currentMiddleware?.(ctx, next);
+                if (result instanceof Response) {
+                    ctx.res = result;
+                    response = ctx.res;
+                    return result;
                 }
-                else {
-                    return await finalCallback(ctx);
+                if (result) {
+                    response = result;
+                    return response;
                 }
             };
-            const response = await next();
+            await next();
             if (response instanceof Response) {
                 return response;
             }
@@ -92,10 +98,10 @@ export class TezX extends Router {
                 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}`);
+                throw new Error(`Handler failed: Middleware chain incomplete or response missing. Did you forget ${COLORS.bgRed} 'await next()' ${COLORS.reset} or to return a response? ${COLORS.bgCyan} Path: ${ctx.pathname}, Method: ${ctx.method} ${COLORS.reset}`);
             }
             const resBody = response || ctx.body;
-            return ctx.send(resBody, ctx.headers.toObject());
+            return ctx.send(resBody, ctx.headers.toJSON());
         };
     }
     #findMiddleware(pathname) {
@@ -138,21 +144,18 @@ export class TezX extends Router {
         let middlewares = this.#findMiddleware(resolvePath);
         ctx.env = this.env;
         try {
-            let callback = async (ctx) => {
-                const find = this.findRoute(ctx.req.method, resolvePath);
-                if (find?.callback) {
-                    ctx.params = find.params;
-                    const callback = find.callback;
-                    let middlewares = find.middlewares;
-                    return (await this.#createHandler(middlewares, callback)(ctx));
-                }
-                else {
-                    let res = (await GlobalConfig.notFound(ctx));
-                    ctx.setStatus = res.status;
-                    return res;
-                }
-            };
-            let response = await this.#createHandler([...this.triMiddlewares.middlewares, ...middlewares], callback)(ctx);
+            let combine = [...this.triMiddlewares.middlewares, ...middlewares];
+            const find = this.findRoute(ctx.req.method, resolvePath);
+            if (find?.callback) {
+                ctx.params = find.params;
+                const callback = find.callback;
+                let routeMiddlewares = find.middlewares || [];
+                combine.push(...routeMiddlewares, callback);
+            }
+            else {
+                combine.push(GlobalConfig.notFound);
+            }
+            let response = await this.#createHandler(combine)(ctx);
             if (ctx.wsProtocol) {
                 if (typeof response == "function") {
                     return {

package/index.js

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

package/middleware/index.d.ts

@@ -1,7 +1,9 @@
+export * from "./basicAuth.js";
 export { cors } from "./cors.js";
 export type { CorsOptions } from "./cors.js";
 export { detectBot } from "./detectBot.js";
 export type { DetectBotReason } from "./detectBot.js";
+export * from "./detectLocale.js";
 export * from "./i18nMiddleware.js";
 export * from "./lazyLoadModules.js";
 export * from "./logger.js";
@@ -9,8 +11,7 @@ export * from "./pagination.js";
 export * from "./powered-by.js";
 export * from "./rateLimiter.js";
 export * from "./request-id.js";
+export * from "./requestTimeout.js";
 export * from "./sanitizeHeader.js";
 export * from "./secureHeaders.js";
 export * from "./xssProtection.js";
-export * from "./basicAuth.js";
-export * from "./detectLocale.js";

package/middleware/index.js

@@ -1,5 +1,7 @@
+export * from "./basicAuth.js";
 export { cors } from "./cors.js";
 export { detectBot } from "./detectBot.js";
+export * from "./detectLocale.js";
 export * from "./i18nMiddleware.js";
 export * from "./lazyLoadModules.js";
 export * from "./logger.js";
@@ -7,8 +9,7 @@ export * from "./pagination.js";
 export * from "./powered-by.js";
 export * from "./rateLimiter.js";
 export * from "./request-id.js";
+export * from "./requestTimeout.js";
 export * from "./sanitizeHeader.js";
 export * from "./secureHeaders.js";
 export * from "./xssProtection.js";
-export * from "./basicAuth.js";
-export * from "./detectLocale.js";

package/middleware/requestTimeout.d.ts

@@ -0,0 +1,26 @@
+import { Context } from "../core/context";
+import { CallbackReturn, Middleware } from "../core/router";
+type TimeoutOptions = {
+    /**
+     * ⏳ Function to dynamically determine the timeout duration (in milliseconds).
+     */
+    getTimeout: (ctx: Context) => number;
+    /**
+     * 🚫 Custom function to handle timeout errors.
+     */
+    onTimeout?: (ctx: Context, error: Error) => CallbackReturn;
+    /**
+     * 📝 Logging function for timeout events.
+     */
+    logTimeoutEvent?: (ctx: Context, error: Error) => void;
+    /**
+     * 🛠️ Custom function to clean up resources after a timeout.
+     */
+    cleanup?: (ctx: Context) => void;
+};
+/**
+ * Middleware to enforce fully dynamic request timeouts.
+ * @param options - Custom options for dynamic timeout handling.
+ */
+export declare const requestTimeout: (options: TimeoutOptions) => Middleware;
+export {};

package/middleware/requestTimeout.js

@@ -0,0 +1,38 @@
+import { GlobalConfig } from "../core/config";
+export const requestTimeout = (options) => {
+    const { getTimeout, onTimeout = (ctx) => {
+        ctx.setStatus = 504;
+        ctx.body = { error: "Request timed out." };
+    }, logTimeoutEvent = (ctx, error) => {
+        GlobalConfig.debugging.warn(`[TIMEOUT] ${error.message}: ${ctx.method} ${ctx.path}`);
+    }, cleanup = () => {
+    }, } = options;
+    return async (ctx, next) => {
+        let timeoutId = null;
+        try {
+            const timeout = getTimeout(ctx);
+            const timeoutPromise = new Promise((_, reject) => {
+                timeoutId = setTimeout(() => {
+                    const timeoutError = new Error("Request timed out.");
+                    logTimeoutEvent(ctx, timeoutError);
+                    reject(timeoutError);
+                }, timeout);
+            });
+            return await Promise.race([next(), timeoutPromise]);
+        }
+        catch (error) {
+            if (error.message === "Request timed out.") {
+                onTimeout(ctx, error);
+            }
+            else {
+                throw error;
+            }
+        }
+        finally {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+            cleanup(ctx);
+        }
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tezx",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "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",
@@ -19,6 +19,7 @@
   "bugs": {
     "url": "https://github.com/tezxjs/TezX/issues"
   },
+  "homepage": "https://github.com/tezxjs/TezX/issues#readme",
   "exports": {
     ".": {
       "import": "./index.js",
@@ -51,7 +52,6 @@
       "default": "./ws/index.js"
     }
   },
-  "homepage": "https://github.com/tezxjs/TezX",
   "files": [
     "adapter/",
     "cjs/",

package/ws/deno.js

@@ -1,6 +1,6 @@
 export class DenoTransport {
     async upgrade(ctx, event, options) {
-        const { socket, response } = (Deno).upgradeWebSocket(ctx.req.rawRequest, {
+        const { socket, response } = Deno.upgradeWebSocket(ctx.req.rawRequest, {
             protocol: options.protocol,
             idleTimeout: options.idleTimeout,
         });