tezx 2.0.11 → 3.0.0

package/cjs/core/request.js

@@ -1,152 +1,100 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Request = void 0;
-const formData_js_1 = require("../utils/formData.js");
+exports.TezXRequest = void 0;
 const url_js_1 = require("../utils/url.js");
-class Request {
+const error_js_1 = require("./error.js");
+class TezXRequest {
     url;
     method;
     pathname;
-    urlRef = {
-        protocol: undefined,
-        origin: undefined,
-        hostname: undefined,
-        port: undefined,
-        href: undefined,
-        query: {},
-        pathname: "/",
-    };
-    query;
-    rawRequest;
+    #rawRequest;
     params = {};
     remoteAddress = {};
-    constructor({ params, method, req, options, }) {
-        let parse = (0, url_js_1.urlParse)(req.url);
-        let url = parse?.href;
-        this.remoteAddress = options?.connInfo?.remoteAddr;
-        this.url = url || "";
-        this.urlRef = parse;
+    #bodyConsumed = false;
+    #rawBodyArrayBuffer;
+    #cachedText;
+    #cachedJSON;
+    #cachedFormObject;
+    #headersCache;
+    #queryCache;
+    constructor(req, method, pathname, params) {
+        this.url = req.url;
+        this.params = params ?? {};
         this.method = method;
-        this.params = params;
-        this.rawRequest = req;
-        this.pathname = parse.pathname;
-        this.query = parse.query;
+        this.#rawRequest = req;
+        this.pathname = pathname ?? "/";
     }
-    get headers() {
-        let requestHeaders = this.rawRequest.headers;
-        return {
-            get: function get(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(callbackfn) {
-                return requestHeaders.forEach(callbackfn);
-            },
-            toJSON() {
-                const obj = {};
-                for (const [key, value] of requestHeaders.entries()) {
-                    obj[key] = value;
-                }
-                return obj;
-            },
-        };
+    header(header) {
+        if (header) {
+            return this.#rawRequest.headers.get(header.toLowerCase());
+        }
+        if (this.#headersCache)
+            return this.#headersCache;
+        const obj = {};
+        this.#rawRequest.headers.forEach((value, key) => {
+            obj[key.toLowerCase()] = value;
+        });
+        this.#headersCache = obj;
+        return this.#headersCache;
+    }
+    get query() {
+        return (this.#queryCache ??= (0, url_js_1.url2query)(this.url));
+    }
+    async #ensureRawBuffer() {
+        if (this.#bodyConsumed)
+            return;
+        this.#rawBodyArrayBuffer = await this.#rawRequest.arrayBuffer();
+        this.#bodyConsumed = true;
     }
     async text() {
-        return await this.rawRequest.text();
+        if (this.#cachedText !== undefined)
+            return this.#cachedText;
+        await this.#ensureRawBuffer();
+        this.#cachedText = new TextDecoder().decode(this.#rawBodyArrayBuffer);
+        return this.#cachedText;
+    }
+    get #contentType() {
+        const ct = this.#rawRequest.headers.get("content-type");
+        if (!ct)
+            return "";
+        return ct.split(";")[0].trim().toLowerCase();
     }
     async json() {
-        const contentType = this.rawRequest.headers.get("content-type") || "";
-        if (contentType.includes("application/json")) {
-            return await this.rawRequest.json();
-        }
-        else {
+        if (this.#cachedJSON !== undefined)
+            return this.#cachedJSON;
+        if (this.#contentType !== "application/json")
             return {};
-        }
-    }
-    async formData(options) {
-        const contentType = this.rawRequest.headers.get("content-type") || "";
-        if (!contentType) {
-            throw Error("Invalid Content-Type");
-        }
-        if (contentType.includes("application/json")) {
-            return await this.rawRequest.json();
-        }
-        else if (contentType.includes("application/x-www-form-urlencoded")) {
-            const formData = await this.rawRequest.formData();
-            const result = {};
-            for (const [key, value] of formData.entries()) {
-                result[key] = value;
-            }
-            return result;
-        }
-        else if (contentType.includes("multipart/form-data")) {
-            const boundaryMatch = contentType.match(/boundary=([^;]+)/);
-            if (!boundaryMatch) {
-                throw new Error("Boundary not found in multipart/form-data");
+        try {
+            if (!this.#bodyConsumed) {
+                this.#cachedJSON = await this.#rawRequest.json();
+                this.#bodyConsumed = true;
             }
-            const formData = await this.rawRequest.formData();
-            const result = {};
-            for (const [key, value] of formData.entries()) {
-                let val = value;
-                if (val instanceof File && typeof options == "object") {
-                    let filename = val.name;
-                    if (options?.sanitized) {
-                        filename = `${Date.now()}-${(0, formData_js_1.sanitized)(filename)}`;
-                    }
-                    if (Array.isArray(options?.allowedTypes) &&
-                        !options.allowedTypes?.includes(val.type)) {
-                        throw new Error(`Invalid file type: "${val.type}". Allowed types: ${options.allowedTypes.join(", ")}`);
-                    }
-                    if (typeof options?.maxSize !== "undefined" &&
-                        val.size > options.maxSize) {
-                        throw new Error(`File size exceeds the limit: ${val.size} bytes (Max: ${options.maxSize} bytes)`);
-                    }
-                    if (typeof options?.maxFiles != "undefined" &&
-                        options.maxFiles == 0) {
-                        throw new Error(`Field "${key}" exceeds the maximum allowed file count of ${options.maxFiles}.`);
-                    }
-                    val = new File([await val.arrayBuffer()], filename, {
-                        type: val.type,
-                    });
-                }
-                if (result[key]) {
-                    if (Array.isArray(result[key])) {
-                        if (val instanceof File &&
-                            typeof options?.maxFiles != "undefined" &&
-                            result[key]?.length >= options.maxFiles) {
-                            throw new Error(`Field "${key}" exceeds the maximum allowed file count of ${options.maxFiles}.`);
-                        }
-                        result[key].push(val);
-                    }
-                    else {
-                        if (val instanceof File &&
-                            typeof options?.maxFiles != "undefined" &&
-                            options.maxFiles == 1) {
-                            throw new Error(`Field "${key}" exceeds the maximum allowed file count of ${options.maxFiles}.`);
-                        }
-                        result[key] = [result[key], val];
-                    }
-                }
-                else {
-                    result[key] = val;
-                }
+            else {
+                const txt = await this.text();
+                this.#cachedJSON = txt ? JSON.parse(txt) : {};
             }
-            return result;
         }
-        else {
-            return {};
+        catch {
+            this.#cachedJSON = {};
+        }
+        return this.#cachedJSON;
+    }
+    async formData() {
+        if (this.#cachedFormObject)
+            return this.#cachedFormObject;
+        const ct = this.#contentType;
+        if (!ct)
+            throw new error_js_1.TezXError("Missing Content-Type");
+        if (ct === "application/x-www-form-urlencoded" ||
+            ct === "multipart/form-data") {
+            if (this.#bodyConsumed) {
+                throw new error_js_1.TezXError("Multipart body already consumed elsewhere");
+            }
+            this.#cachedFormObject = (await this.#rawRequest.formData());
+            this.#bodyConsumed = true;
+            return this.#cachedFormObject;
         }
+        return this.#cachedFormObject;
     }
 }
-exports.Request = Request;
+exports.TezXRequest = TezXRequest;