tezx 4.0.2 → 4.0.4

package/cjs/core/context.js

@@ -31,7 +31,7 @@ class Context {
             return this;
         const _key = key.toLowerCase();
         const append = options?.append || _key === "set-cookie";
-        const target = this.res?.headers ?? (this.#headers ??= new Headers());
+        const target = this.headers;
         if (append) {
             target.append(_key, value);
         }
@@ -47,10 +47,11 @@ class Context {
         this.#status = status;
         return this;
     }
-    #newResponse(body, type, init = {}) {
-        let headers = (0, response_js_1.mergeHeaders)(this.#headers, init.headers);
-        if (!headers.has("Content-Type"))
+    createResponse(body, type, init = {}) {
+        const headers = (0, response_js_1.mergeHeaders)(this.#headers, init.headers);
+        if (type) {
             headers.set("Content-Type", type);
+        }
         return new Response(body, {
             status: init.status ?? this.#status,
             statusText: init.statusText,
@@ -58,50 +59,16 @@ class Context {
         });
     }
     newResponse(body, init = {}) {
-        let headers = (0, response_js_1.mergeHeaders)(this.#headers, init.headers);
-        return new Response(body, {
-            status: init.status ?? this.#status,
-            statusText: init.statusText,
-            headers,
-        });
+        return this.createResponse(body, null, init);
     }
     text(content, init) {
-        return this.#newResponse(content, "text/plain; charset=utf-8", init);
+        return this.createResponse(content, "text/plain; charset=utf-8", init);
     }
     html(strings, init) {
-        return this.#newResponse(strings, "text/html; charset=utf-8", init);
+        return this.createResponse(strings, "text/html; charset=utf-8", init);
     }
     json(json, init) {
-        return this.#newResponse(JSON.stringify(json), "application/json; charset=utf-8", init);
-    }
-    send(body, init) {
-        let _body;
-        let type;
-        if (body === null || body === undefined) {
-            _body = "";
-            type = "text/plain";
-        }
-        else if (typeof body === "string" || typeof body === "number") {
-            _body = body;
-            type = "text/plain";
-        }
-        else if (body instanceof Uint8Array || body instanceof ArrayBuffer || (typeof ReadableStream !== "undefined" && body instanceof ReadableStream)) {
-            _body = body;
-            type = "application/octet-stream";
-        }
-        else if (body instanceof Blob || (typeof File !== "undefined" && body instanceof File)) {
-            _body = body;
-            type = body.type || "application/octet-stream";
-        }
-        else if (typeof body === "object") {
-            _body = JSON.stringify(body);
-            type = "application/json";
-        }
-        else {
-            _body = String(body);
-            type = "text/plain";
-        }
-        return this.#newResponse(_body, type, init);
+        return this.createResponse(JSON.stringify(json), "application/json; charset=utf-8", init);
     }
     redirect(url, status = 302) {
         const headers = new Headers(this.#headers);
@@ -122,18 +89,15 @@ class Context {
         if (init?.filename) {
             headers["Content-Disposition"] = `attachment; filename="${init?.filename}"`;
         }
+        let contentType = null;
         if (init?.download || init?.filename) {
-            headers["Content-Type"] = "application/octet-stream";
-            return this.newResponse(stream, {
-                status: init?.status ?? this.#status,
-                statusText: init?.statusText,
-                headers,
-            });
+            contentType = "application/octet-stream";
+        }
+        else {
+            const ext = (0, utils_js_1.extensionExtract)(filePath);
+            contentType = mimeTypes_js_1.mimeTypes[ext] ?? mimeTypes_js_1.defaultMimeType;
         }
-        const ext = (0, utils_js_1.extensionExtract)(filePath);
-        const mimeType = mimeTypes_js_1.mimeTypes[ext] ?? mimeTypes_js_1.defaultMimeType;
-        headers["Content-Type"] = mimeType;
-        return this.newResponse(stream, {
+        return this.createResponse(stream, contentType, {
             status: init?.status ?? this.#status,
             statusText: init?.statusText,
             headers,

package/cjs/core/request.js

@@ -8,7 +8,6 @@ class TezXRequest {
     pathname;
     #rawRequest;
     params = {};
-    remoteAddress = {};
     #bodyConsumed = false;
     #rawBodyArrayBuffer;
     #cachedText;

package/cjs/core/server.js

@@ -7,10 +7,9 @@ const url_js_1 = require("../utils/url.js");
 const context_js_1 = require("./context.js");
 const router_js_1 = require("./router.js");
 class TezX extends router_js_1.Router {
-    #pathResolver;
     #notFound = response_js_1.notFoundResponse;
     #errorHandler = response_js_1.handleErrorResponse;
-    constructor({ basePath = "/", routeRegistry = new RadixRouter_js_1.RadixRouter(), } = {}) {
+    constructor({ basePath = "/", routeRegistry = new RadixRouter_js_1.RadixRouter() } = {}) {
         super({ basePath });
         if (!routeRegistry) {
             throw new Error("routeRegistry is required for TezX initialization");
@@ -30,24 +29,27 @@ class TezX extends router_js_1.Router {
         let index = -1;
         const dispatch = (i) => {
             if (i <= index)
-                throw new Error("next() called multiple times");
+                return Promise.reject(new Error("next() called multiple times"));
             index = i;
             const fn = stack[i];
             if (!fn)
                 return ctx.res;
-            const result = fn(ctx, () => dispatch(i + 1));
-            if (!(result instanceof Promise)) {
-                if (result instanceof Response)
-                    ctx.res = result;
-                return ctx.res;
+            try {
+                const result = fn(ctx, () => dispatch(i + 1));
+                if (!(result instanceof Promise)) {
+                    if (result instanceof Response)
+                        ctx.res = result;
+                    return result ?? ctx.res;
+                }
+                return result.then((res) => {
+                    if (res instanceof Response)
+                        ctx.res = res;
+                    return res ?? ctx.res;
+                }, (err) => Promise.reject(err));
+            }
+            catch (err) {
+                return Promise.reject(err);
             }
-            return result.then((res) => {
-                if (res instanceof Response)
-                    ctx.res = res;
-                return ctx.res;
-            }, (err) => {
-                throw err;
-            });
         };
         return dispatch(0);
     }
@@ -66,9 +68,13 @@ class TezX extends router_js_1.Router {
             if (mLen === 0)
                 return this.#notFound(ctx);
             ctx.params = params;
-            if (mLen === 1)
-                return await middlewares[0](ctx) ?? this.#notFound(ctx);
-            return await this.#composeChain(ctx, middlewares) ?? this.#notFound(ctx);
+            if (mLen === 1) {
+                ctx.res = await middlewares[0](ctx);
+            }
+            else {
+                ctx.res = await this.#composeChain(ctx, middlewares);
+            }
+            return ctx.res ?? this.#notFound(ctx);
         }
         catch (err) {
             let error = err instanceof Error ? err : new Error(String(err));
@@ -76,10 +82,9 @@ class TezX extends router_js_1.Router {
         }
     }
     async serve(req, server) {
-        const method = req.method || "GET";
+        const method = req.method;
         if (method === "HEAD") {
-            const headReq = new Request(req, { method: "GET" });
-            const res = await this.#handleRequest(headReq, "GET", server);
+            const res = await this.#handleRequest(req, "GET", server);
             return new Response(null, {
                 status: res.status,
                 statusText: res.statusText,

package/cjs/helper/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateUUID = exports.generateRandomBase64 = exports.generateID = exports.useFormData = void 0;
+exports.getConnInfo = getConnInfo;
 const formData_js_1 = require("./formData.js");
 Object.defineProperty(exports, "useFormData", { enumerable: true, get: function () { return formData_js_1.useFormData; } });
 const generateID_js_1 = require("./generateID.js");
@@ -11,3 +12,6 @@ exports.default = {
     useFormData: formData_js_1.useFormData,
     generateID: generateID_js_1.generateID, generateRandomBase64: generateID_js_1.generateRandomBase64, generateUUID: generateID_js_1.generateUUID
 };
+function getConnInfo(ctx) {
+    return ctx?.server?.requestIP?.(ctx.rawRequest);
+}

package/cjs/index.js

@@ -5,7 +5,7 @@ const router_js_1 = require("./core/router.js");
 Object.defineProperty(exports, "Router", { enumerable: true, get: function () { return router_js_1.Router; } });
 const server_js_1 = require("./core/server.js");
 Object.defineProperty(exports, "TezX", { enumerable: true, get: function () { return server_js_1.TezX; } });
-exports.version = "4.0.2";
+exports.version = "4.0.4";
 exports.default = {
     Router: router_js_1.Router,
     TezX: server_js_1.TezX,

package/cjs/middleware/detect-bot.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectBot = void 0;
+const index_js_1 = require("../helper/index.js");
 const rateLimit_js_1 = require("../utils/rateLimit.js");
 const detectBot = (opts = {}) => {
     const botUAs = opts.botUserAgents || ["bot", "spider", "crawl", "slurp"];
@@ -8,7 +9,7 @@ const detectBot = (opts = {}) => {
     const botRegex = new RegExp(botUAs.join("|"), "i");
     checkBot = (ua) => botRegex.test(ua);
     const keyGenerator = opts.keyGenerator ?? ((ctx) => {
-        const addr = ctx.req.remoteAddress;
+        const addr = (0, index_js_1.getConnInfo)(ctx);
         return addr ? `${addr.address}:${addr.port}` : "unknown";
     });
     const maxReq = opts.maxRequests || 30;

package/cjs/middleware/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./cache-control.js"), exports);
 __exportStar(require("./cors.js"), exports);
 __exportStar(require("./detect-bot.js"), exports);
 __exportStar(require("./etag.js"), exports);
-__exportStar(require("./getConnInfo.js"), exports);
 __exportStar(require("./i18n.js"), exports);
 __exportStar(require("./logger.js"), exports);
 __exportStar(require("./pagination.js"), exports);

package/cjs/middleware/pagination.js

@@ -42,8 +42,9 @@ const paginationHandler = (options = {}) => {
                 pagination,
             };
             ctx.body = body;
-            if (next) {
-                return await next();
+            let res = await next();
+            if (res) {
+                return res;
             }
             return ctx.json(body);
         }

package/cjs/middleware/rate-limiter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = exports.rateLimiter = void 0;
+exports.rateLimiter = exports.default = void 0;
+const index_js_1 = require("../helper/index.js");
 const rateLimit_js_1 = require("../utils/rateLimit.js");
 const rateLimiter = (options) => {
     const { maxRequests, windowMs, keyGenerator = (ctx) => {
@@ -12,9 +13,8 @@ const rateLimiter = (options) => {
         const clientIp = ctx.req.header("client-ip");
         if (clientIp)
             return clientIp;
-        const addr = ctx.req.remoteAddress?.address || "unknown";
-        const port = ctx.req.remoteAddress?.port || "0";
-        return `${addr}:${port}`;
+        const { port, address } = (0, index_js_1.getConnInfo)(ctx) ?? {};
+        return `${address}:${port}`;
     }, storage = (0, rateLimit_js_1.createRateLimitDefaultStorage)(), onError = (ctx, retryAfter, error) => {
         ctx.status(429);
         throw new Error(`Rate limit exceeded. Try again in ${retryAfter} seconds.`);
@@ -33,5 +33,5 @@ const rateLimiter = (options) => {
         return await next();
     };
 };
-exports.rateLimiter = rateLimiter;
 exports.default = rateLimiter;
+exports.rateLimiter = rateLimiter;

package/cjs/utils/mimeTypes.js

@@ -15,6 +15,10 @@ exports.mimeTypes = {
     tsv: "text/tab-separated-values",
     rtf: "application/rtf",
     markdown: "text/markdown",
+    jsx: "text/javascript",
+    ts: "text/typescript",
+    tsx: "text/typescript",
+    jsonld: "application/ld+json",
     png: "image/png",
     jpg: "image/jpeg",
     jpeg: "image/jpeg",
@@ -25,6 +29,13 @@ exports.mimeTypes = {
     bmp: "image/bmp",
     tiff: "image/tiff",
     psd: "image/vnd.adobe.photoshop",
+    tif: "image/tiff",
+    avif: "image/avif",
+    woff: "font/woff",
+    woff2: "font/woff2",
+    ttf: "font/ttf",
+    otf: "font/otf",
+    eot: "application/vnd.ms-fontobject",
     mp4: "video/mp4",
     webm: "video/webm",
     ogg: "video/ogg",
@@ -33,6 +44,9 @@ exports.mimeTypes = {
     wmv: "video/x-ms-wmv",
     flv: "video/x-flv",
     "3gp": "video/3gpp",
+    mkv: "video/x-matroska",
+    mpeg: "video/mpeg",
+    mpg: "video/mpeg",
     mp3: "audio/mpeg",
     wav: "audio/wav",
     aac: "audio/aac",
@@ -40,11 +54,7 @@ exports.mimeTypes = {
     m4a: "audio/mp4",
     mid: "audio/midi",
     midi: "audio/midi",
-    woff: "font/woff",
-    woff2: "font/woff2",
-    ttf: "font/ttf",
-    otf: "font/otf",
-    eot: "application/vnd.ms-fontobject",
+    weba: "audio/webm",
     pdf: "application/pdf",
     odp: "application/vnd.oasis.opendocument.presentation",
     zip: "application/zip",
@@ -83,6 +93,8 @@ exports.mimeTypes = {
     deb: "application/x-debian-package",
     rpm: "application/x-redhat-package-manager",
     apk: "application/vnd.android.package-archive",
+    bin: "application/octet-stream",
+    iso: "application/octet-stream",
     webmanifest: "application/manifest+json",
     ics: "text/calendar",
     vcf: "text/vcard",

package/cookie/index.d.ts

@@ -1,4 +1,4 @@
-import { Context } from "../core/context.js";
+import { Context } from "../index.js";
 import { CookieOptions } from "../types/index.js";
 /**
  * Get the value of a specific cookie by name from the request context.

package/core/context.d.ts

@@ -1,4 +1,5 @@
 import { ExtractParamsFromPath, HttpBaseResponse, ResHeaderKey, ResponseInit, WebSocketEvent } from "../types/index.js";
+import { ContentType } from "../utils/mimeTypes.js";
 import { TezXRequest } from "./request.js";
 export declare class Context<TPath extends string = any> {
     #private;
@@ -112,6 +113,35 @@ export declare class Context<TPath extends string = any> {
      * ctx.status(404).text("Not found");
      */
     status(status: number): this;
+    /**
+     * Creates a native Response object with optional body, Content-Type, and headers.
+     *
+     * This function always overwrites the `Content-Type` header if `type` is provided.
+     * It merges any existing headers from the context (`this.#headers`) with headers
+     * provided in `init.headers`.
+     *
+     * @param {BodyInit | null} body - The response body. Can be string, Blob, ArrayBuffer, Uint8Array, or null.
+     * @param {string | null} type - The MIME type to set in the `Content-Type` header. If null, no Content-Type is set.
+     * @param {ResponseInit} [init={}] - Optional response initialization object (status, statusText, headers).
+     * @param {number} [init.status] - HTTP status code (default is `this.#status`).
+     * @param {string} [init.statusText] - Optional status text for the response.
+     * @param {HeadersInit} [init.headers] - Additional headers to merge with context headers.
+     *
+     * @returns {Response} A native Fetch API Response object.
+     *
+     * @example
+     * // Simple text response
+     * const res = createResponse("Hello World", "text/plain");
+     *
+     * @example
+     * // JSON response
+     * const res = createResponse(JSON.stringify({ ok: true }), "application/json", { status: 200 });
+     *
+     * @example
+     * // Custom headers
+     * const res = createResponse("Hello", "text/plain", { headers: { "X-Custom": "test" } });
+     */
+    createResponse(body: BodyInit | null, type: ContentType | null, init?: ResponseInit): Response;
     /**
      * Protected helper method to create a Response or PlainResponse
      * based on runtime environment (Node.js or Web).
@@ -157,38 +187,6 @@ export declare class Context<TPath extends string = any> {
      * ctx.json({ success: true });
      */
     json(json: object, init?: ResponseInit): HttpBaseResponse;
-    /**
-    * Send a response with automatic content type detection.
-    *
-    * This method determines the proper `Content-Type` header based on the type of `body`.
-    * If a `Content-Type` is provided in `init.headers`, it will be used instead.
-    *
-    * Supported types:
-    * - `string` / `number` → "text/plain"
-    * - `object` → JSON serialized, "application/json"
-    * - `Uint8Array` / `ArrayBuffer` / `ReadableStream` → "application/octet-stream"
-    * - `Blob` / `File` → uses `body.type` or falls back to "application/octet-stream"
-    * - `null` / `undefined` → empty string, "text/plain"
-    * - any other → `String(body)`, "text/plain"
-    *
-    * @param {any} body - Response body of any type.
-    * @param {ResponseInit} [init] - Optional response init object, headers, status, etc.
-    * @returns {HttpBaseResponse} - A Bun-compatible response object.
-    *
-    * @example
-    * // Send a string
-    * ctx.send("Hello World");
-    *
-    * // Send JSON
-    * ctx.send({ user: "Alice", id: 123 });
-    *
-    * // Send binary
-    * ctx.send(new Uint8Array([1,2,3]));
-    *
-    * // Custom content-type
-    * ctx.send("Hello", { headers: { "Content-Type": "text/html" } });
-    */
-    send(body: any, init?: ResponseInit): HttpBaseResponse;
     /**
      * Sends an HTTP redirect response to the specified URL.
      *

package/core/context.js

@@ -28,7 +28,7 @@ export class Context {
             return this;
         const _key = key.toLowerCase();
         const append = options?.append || _key === "set-cookie";
-        const target = this.res?.headers ?? (this.#headers ??= new Headers());
+        const target = this.headers;
         if (append) {
             target.append(_key, value);
         }
@@ -44,10 +44,11 @@ export class Context {
         this.#status = status;
         return this;
     }
-    #newResponse(body, type, init = {}) {
-        let headers = mergeHeaders(this.#headers, init.headers);
-        if (!headers.has("Content-Type"))
+    createResponse(body, type, init = {}) {
+        const headers = mergeHeaders(this.#headers, init.headers);
+        if (type) {
             headers.set("Content-Type", type);
+        }
         return new Response(body, {
             status: init.status ?? this.#status,
             statusText: init.statusText,
@@ -55,50 +56,16 @@ export class Context {
         });
     }
     newResponse(body, init = {}) {
-        let headers = mergeHeaders(this.#headers, init.headers);
-        return new Response(body, {
-            status: init.status ?? this.#status,
-            statusText: init.statusText,
-            headers,
-        });
+        return this.createResponse(body, null, init);
     }
     text(content, init) {
-        return this.#newResponse(content, "text/plain; charset=utf-8", init);
+        return this.createResponse(content, "text/plain; charset=utf-8", init);
     }
     html(strings, init) {
-        return this.#newResponse(strings, "text/html; charset=utf-8", init);
+        return this.createResponse(strings, "text/html; charset=utf-8", init);
     }
     json(json, init) {
-        return this.#newResponse(JSON.stringify(json), "application/json; charset=utf-8", init);
-    }
-    send(body, init) {
-        let _body;
-        let type;
-        if (body === null || body === undefined) {
-            _body = "";
-            type = "text/plain";
-        }
-        else if (typeof body === "string" || typeof body === "number") {
-            _body = body;
-            type = "text/plain";
-        }
-        else if (body instanceof Uint8Array || body instanceof ArrayBuffer || (typeof ReadableStream !== "undefined" && body instanceof ReadableStream)) {
-            _body = body;
-            type = "application/octet-stream";
-        }
-        else if (body instanceof Blob || (typeof File !== "undefined" && body instanceof File)) {
-            _body = body;
-            type = body.type || "application/octet-stream";
-        }
-        else if (typeof body === "object") {
-            _body = JSON.stringify(body);
-            type = "application/json";
-        }
-        else {
-            _body = String(body);
-            type = "text/plain";
-        }
-        return this.#newResponse(_body, type, init);
+        return this.createResponse(JSON.stringify(json), "application/json; charset=utf-8", init);
     }
     redirect(url, status = 302) {
         const headers = new Headers(this.#headers);
@@ -119,18 +86,15 @@ export class Context {
         if (init?.filename) {
             headers["Content-Disposition"] = `attachment; filename="${init?.filename}"`;
         }
+        let contentType = null;
         if (init?.download || init?.filename) {
-            headers["Content-Type"] = "application/octet-stream";
-            return this.newResponse(stream, {
-                status: init?.status ?? this.#status,
-                statusText: init?.statusText,
-                headers,
-            });
+            contentType = "application/octet-stream";
+        }
+        else {
+            const ext = extensionExtract(filePath);
+            contentType = mimeTypes[ext] ?? defaultMimeType;
         }
-        const ext = extensionExtract(filePath);
-        const mimeType = mimeTypes[ext] ?? defaultMimeType;
-        headers["Content-Type"] = mimeType;
-        return this.newResponse(stream, {
+        return this.createResponse(stream, contentType, {
             status: init?.status ?? this.#status,
             statusText: init?.statusText,
             headers,

package/core/request.d.ts

@@ -1,4 +1,4 @@
-import { ExtractParamsFromPath, HTTPMethod, NetAddr, ReqHeaderKey, RequestHeaders } from "../types/index.js";
+import { ExtractParamsFromPath, HTTPMethod, ReqHeaderKey, RequestHeaders } from "../types/index.js";
 /**
  * A wrapper around the raw HTTP request that provides convenient access to URL, headers, body parsing, and route parameters.
  *
@@ -26,18 +26,6 @@ export declare class TezXRequest<Path extends string = any> {
      * @type {ExtractParamsFromPath<Path>}
      */
     readonly params: ExtractParamsFromPath<Path>;
-    /**
-     * Remote address details of the connected client.
-     * @requires injectRemoteAddress middleware.
-     * @typedef {Object} NetAddr
-     * @property {string} [transport] - Transport protocol (e.g., "tcp", "udp").
-     * @property {"IPv4" | "IPv6" | "Unix"} [family] - Address family.
-     * @property {string} [hostname] - Hostname or IP address.
-     * @property {number} [port] - Port number.
-     * @type {NetAddr}
-     * @default {}
-     */
-    remoteAddress: NetAddr;
     /**
      * Creates an instance of TezXRequest.
      *

package/core/request.js

@@ -5,7 +5,6 @@ export class TezXRequest {
     pathname;
     #rawRequest;
     params = {};
-    remoteAddress = {};
     #bodyConsumed = false;
     #rawBodyArrayBuffer;
     #cachedText;

package/core/server.d.ts

@@ -25,7 +25,7 @@ export declare class TezX<T extends Record<string, any> = {}> extends Router<T>
     #private;
     /** Internal route registry to hold all routes */
     protected router?: RouteRegistry;
-    constructor({ basePath, routeRegistry, }?: TezXConfig);
+    constructor({ basePath, routeRegistry }?: TezXConfig);
     /**
      * Register a custom 404 (not found) handler.
      *

package/core/server.js

@@ -4,10 +4,9 @@ import { getPathname } from "../utils/url.js";
 import { Context } from "./context.js";
 import { Router } from "./router.js";
 export class TezX extends Router {
-    #pathResolver;
     #notFound = notFoundResponse;
     #errorHandler = handleErrorResponse;
-    constructor({ basePath = "/", routeRegistry = new RadixRouter(), } = {}) {
+    constructor({ basePath = "/", routeRegistry = new RadixRouter() } = {}) {
         super({ basePath });
         if (!routeRegistry) {
             throw new Error("routeRegistry is required for TezX initialization");
@@ -27,24 +26,27 @@ export class TezX extends Router {
         let index = -1;
         const dispatch = (i) => {
             if (i <= index)
-                throw new Error("next() called multiple times");
+                return Promise.reject(new Error("next() called multiple times"));
             index = i;
             const fn = stack[i];
             if (!fn)
                 return ctx.res;
-            const result = fn(ctx, () => dispatch(i + 1));
-            if (!(result instanceof Promise)) {
-                if (result instanceof Response)
-                    ctx.res = result;
-                return ctx.res;
+            try {
+                const result = fn(ctx, () => dispatch(i + 1));
+                if (!(result instanceof Promise)) {
+                    if (result instanceof Response)
+                        ctx.res = result;
+                    return result ?? ctx.res;
+                }
+                return result.then((res) => {
+                    if (res instanceof Response)
+                        ctx.res = res;
+                    return res ?? ctx.res;
+                }, (err) => Promise.reject(err));
+            }
+            catch (err) {
+                return Promise.reject(err);
             }
-            return result.then((res) => {
-                if (res instanceof Response)
-                    ctx.res = res;
-                return ctx.res;
-            }, (err) => {
-                throw err;
-            });
         };
         return dispatch(0);
     }
@@ -63,9 +65,13 @@ export class TezX extends Router {
             if (mLen === 0)
                 return this.#notFound(ctx);
             ctx.params = params;
-            if (mLen === 1)
-                return await middlewares[0](ctx) ?? this.#notFound(ctx);
-            return await this.#composeChain(ctx, middlewares) ?? this.#notFound(ctx);
+            if (mLen === 1) {
+                ctx.res = await middlewares[0](ctx);
+            }
+            else {
+                ctx.res = await this.#composeChain(ctx, middlewares);
+            }
+            return ctx.res ?? this.#notFound(ctx);
         }
         catch (err) {
             let error = err instanceof Error ? err : new Error(String(err));
@@ -73,10 +79,9 @@ export class TezX extends Router {
         }
     }
     async serve(req, server) {
-        const method = req.method || "GET";
+        const method = req.method;
         if (method === "HEAD") {
-            const headReq = new Request(req, { method: "GET" });
-            const res = await this.#handleRequest(headReq, "GET", server);
+            const res = await this.#handleRequest(req, "GET", server);
             return new Response(null, {
                 status: res.status,
                 statusText: res.statusText,