@hyperttp/core 1.3.1 → 1.3.3

package/transports/node.js

@@ -1,173 +1,77 @@
-import http from "node:http";
-import https from "node:https";
-import { Readable } from "node:stream";
-import { ReadableStream } from "node:stream/web";
 /**
- * @ru Реализация HTTP-транспорта на основе встроенных модулей Node.js (http/https). Поддерживает keep-alive, пулы соединений, автоматический Content-Length, обработку abort-сигналов.
- * @en HTTP transport implementation based on Node.js built-in modules (http/https). Supports keep-alive, connection pools, automatic Content-Length, and abort signal handling.
+ * @ru Транспорт на основе глобального fetch (Node.js 18+). Обрабатывает нормализацию URL, сериализацию тела и очистку потока.
+ * @en Transport based on the global fetch API (Node.js 18+). Handles URL normalisation, body serialisation, and stream cleanup.
+ */
+/**
+ * @ru Реализация транспорта для Node.js с использованием fetch.
+ * @en Node.js transport implementation using fetch.
  */
 export class NodeTransport {
-    /** @ru Конфигурация транспорта. @en Transport configuration. */
+    /**
+     * @ru Конфигурация клиента.
+     * @en Client configuration.
+     */
     config;
-    httpAgent;
-    httpsAgent;
+    isProduction;
+    cleanBaseUrl;
     /**
      * @ru Создаёт экземпляр NodeTransport.
      * @en Creates a NodeTransport instance.
-     * @param config - Transport configuration.
+     * @param config - Transport configuration (may include baseUrl).
      */
     constructor(config) {
         this.config = config;
-        const agentOptions = {
-            keepAlive: true,
-            keepAliveMsecs: config.network?.keepAliveTimeout ?? 30000,
-            maxSockets: config.network?.maxConcurrent ?? 500,
-            maxFreeSockets: Math.min(256, Math.floor((config.network?.maxConcurrent ?? 500) / 2)),
-            scheduling: "lifo",
-        };
-        this.httpAgent = new http.Agent(agentOptions);
-        this.httpsAgent = new https.Agent(agentOptions);
-    }
-    get baseUrl() {
-        return this.config.baseUrl ?? "http://localhost:3000";
+        this.isProduction = process.env.NODE_ENV === "production";
+        const base = config.baseUrl ?? "http://localhost:3000";
+        this.cleanBaseUrl = base.endsWith("/") ? base.slice(0, -1) : base;
     }
     /**
-     * @ru Выполняет HTTP-запрос.
-     * @en Executes an HTTP request.
-     * @param req - Request parameters (url, method, headers, body, signal).
-     * @returns Promise with the transport response.
-     * @throws If the request is aborted (AbortError).
-     * @throws If localhost URL is used in production environment.
-     * @throws On network or protocol errors.
+     * @ru Выполняет HTTP-запрос через fetch.
+     * @en Executes an HTTP request via fetch.
+     * @param req - Transport request object (method, url, headers, body, signal).
+     * @returns Promise resolving to a TransportResponse.
+     * @throws If a localhost URL is requested in production environment.
      */
     async execute(req) {
-        const fullUrl = new URL(req.url, this.baseUrl);
-        if (process.env.NODE_ENV === "production" &&
-            fullUrl.hostname === "localhost") {
+        const urlStr = req.url;
+        const fullUrl = urlStr.startsWith("http")
+            ? urlStr
+            : urlStr.charCodeAt(0) === 47
+                ? this.cleanBaseUrl + urlStr
+                : this.cleanBaseUrl + "/" + urlStr;
+        if (this.isProduction && fullUrl.includes("//localhost")) {
             throw new Error("Localhost URL detected in production environment");
         }
-        if (req.signal?.aborted) {
-            const abortError = req.signal.reason || new Error("The operation was aborted.");
-            if (abortError instanceof Error && !abortError.name)
-                abortError.name = "AbortError";
-            throw abortError;
-        }
-        const headers = { ...req.headers };
-        const hasHeader = (name) => Object.keys(headers).some((k) => k.toLowerCase() === name.toLowerCase());
         let finalBody = req.body;
-        if (finalBody !== undefined && finalBody !== null) {
-            if (Buffer.isBuffer(finalBody)) {
-                if (!hasHeader("content-length")) {
-                    headers["Content-Length"] = String(finalBody.byteLength);
-                }
-            }
-            else if (typeof finalBody === "string") {
-                if (!hasHeader("content-length")) {
-                    headers["Content-Length"] = String(Buffer.byteLength(finalBody, "utf-8"));
-                }
-            }
-            else if (!(finalBody instanceof ReadableStream)) {
-                finalBody = JSON.stringify(finalBody);
-                if (!hasHeader("content-length")) {
-                    headers["Content-Length"] = String(Buffer.byteLength(finalBody, "utf-8"));
-                }
-            }
+        if (finalBody !== undefined &&
+            finalBody !== null &&
+            typeof finalBody === "object" &&
+            !Buffer.isBuffer(finalBody) &&
+            !(finalBody instanceof ReadableStream)) {
+            finalBody = JSON.stringify(finalBody);
         }
-        return new Promise((resolve, reject) => {
-            const isHttps = fullUrl.protocol === "https:";
-            const requestFn = isHttps ? https.request : http.request;
-            const agent = isHttps ? this.httpsAgent : this.httpAgent;
-            let isDone = false;
-            let nodeResInstance = null;
-            const reqOptions = {
-                method: req.method,
-                headers: headers,
-                agent,
-            };
-            const nodeReq = requestFn(fullUrl, reqOptions, (nodeRes) => {
-                nodeResInstance = nodeRes;
-                nodeRes.on("end", () => {
-                    isDone = true;
-                    cleanupSignal();
-                });
-                nodeRes.on("close", () => {
-                    isDone = true;
-                    cleanupSignal();
-                });
-                const webStream = Readable.toWeb(nodeRes);
-                const dump = async () => {
-                    isDone = true;
-                    cleanupSignal();
-                    nodeRes.destroy();
-                };
-                const bodyPayload = Object.assign(webStream, {
-                    dump,
-                });
-                resolve({
-                    status: nodeRes.statusCode ?? 200,
-                    headers: nodeRes.headers,
-                    url: fullUrl.toString(),
-                    body: bodyPayload,
-                });
-            });
-            let onAbort;
-            if (req.signal) {
-                onAbort = () => {
-                    if (isDone)
-                        return;
-                    isDone = true;
-                    nodeReq.destroy();
-                    if (nodeResInstance) {
-                        nodeResInstance.destroy();
-                    }
-                    const err = req.signal?.reason || new Error("The operation was aborted.");
-                    if (err instanceof Error && !err.name)
-                        err.name = "AbortError";
-                    reject(err);
-                };
-                req.signal.addEventListener("abort", onAbort, { once: true });
-            }
-            function cleanupSignal() {
-                if (req.signal && onAbort) {
-                    req.signal.removeEventListener("abort", onAbort);
-                }
-            }
-            nodeReq.on("error", (err) => {
-                if (isDone)
-                    return;
-                isDone = true;
-                cleanupSignal();
-                reject(err);
-            });
-            if (finalBody !== undefined && finalBody !== null) {
-                if (Buffer.isBuffer(finalBody) || typeof finalBody === "string") {
-                    nodeReq.end(finalBody);
-                }
-                else if (finalBody instanceof ReadableStream) {
-                    Readable.fromWeb(finalBody).pipe(nodeReq);
-                }
-            }
-            else {
-                nodeReq.end();
-            }
+        const res = await globalThis.fetch(fullUrl, {
+            method: req.method,
+            headers: req.headers,
+            body: finalBody,
+            signal: req.signal,
         });
-    }
-    /**
-     * @ru Закрывает все активные соединения (graceful shutdown). Уничтожает HTTP/HTTPS агенты.
-     * @en Closes all active connections (graceful shutdown). Destroys HTTP/HTTPS agents.
-     * @returns Promise that resolves after closing.
-     */
-    async close() {
-        this.httpAgent.destroy();
-        this.httpsAgent.destroy();
-    }
-    /**
-     * @ru Принудительно уничтожает транспорт (аналог close).
-     * @en Forcefully destroys the transport (alias for close).
-     * @returns Promise that resolves after destruction.
-     */
-    async destroy() {
-        await this.close();
+        const webStream = res.body || new ReadableStream();
+        webStream.dump = async function () {
+            if (res.body && !res.body.locked) {
+                await res.body.cancel();
+            }
+        };
+        const resHeaders = {};
+        for (const [key, value] of res.headers) {
+            resHeaders[key] = value;
+        }
+        return {
+            status: res.status,
+            headers: resHeaders,
+            url: res.url,
+            body: webStream,
+        };
     }
 }
 //# sourceMappingURL=node.js.map

package/transports/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/transports/node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/transports/node.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH;;;GAGG;AACH,MAAM,OAAO,aAAa;IACxB;;;OAGG;IACI,MAAM,CAAsB;IAElB,YAAY,CAAU;IACtB,YAAY,CAAS;IAEtC;;;;OAIG;IACH,YAAY,MAA2B;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;QAE1D,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,uBAAuB,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAAC,GAAqB;QACxC,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC;QAEvB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;YACvC,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE;gBAC3B,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,MAAM;gBAC5B,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,GAAG,GAAG,MAAM,CAAC;QAEvC,IAAI,IAAI,CAAC,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,SAAS,GAAQ,GAAG,CAAC,IAAI,CAAC;QAC9B,IACE,SAAS,KAAK,SAAS;YACvB,SAAS,KAAK,IAAI;YAClB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC3B,CAAC,CAAC,SAAS,YAAY,cAAc,CAAC,EACtC,CAAC;YACD,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE;YAC1C,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,OAAO,EAAE,GAAG,CAAC,OAAiC;YAC9C,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,IAAI,IAAI,cAAc,EAAE,CAAC;QAElD,SAAiB,CAAC,IAAI,GAAG,KAAK;YAC7B,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,UAAU,GAA2B,EAAE,CAAC;QAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACvC,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC1B,CAAC;QAED,OAAO;YACL,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,IAAI,EAAE,SAAgD;SACvD,CAAC;IACJ,CAAC;CACF"}

package/utils/decompress.d.ts

@@ -1,28 +1,26 @@
 import type { TransportStreamExtensions } from "@hyperttp/types";
-/**
- * @ru Тип потока с расширениями транспорта (метод dump).
- * @en Stream type with transport extensions (dump method).
- */
 type StreamPayload = ReadableStream<Uint8Array> & TransportStreamExtensions;
-/**
- * @ru Тип буфера с расширениями транспорта (метод dump).
- * @en Buffer type with transport extensions (dump method).
- */
 type BufferPayload = Uint8Array & TransportStreamExtensions;
 /**
- * @ru Декомпрессирует буфер, последовательно применяя все кодировки из Content-Encoding.
- * @en Decompresses a buffer by sequentially applying all encodings from Content-Encoding.
- * @param body - Compressed buffer (Uint8Array).
- * @param encoding - Content-Encoding header value (e.g., 'gzip, deflate').
- * @returns Decompressed buffer with a no-op dump method.
+ * @ru Полностью декомпрессирует буфер, последовательно применяя цепочку алгоритмов из Content-Encoding.
+ * @en Fully decompresses a buffer by sequentially applying the Content-Encoding chain.
+ * @param body - Compressed Uint8Array body.
+ * @param encoding - Raw Content-Encoding header (may contain multiple comma-separated values).
+ * @returns Decompressed buffer with a noop dump method.
  */
 export declare function decompressBuffer(body: Uint8Array, encoding: string): BufferPayload;
 /**
- * @ru Создаёт декомпрессирующий поток для тела ответа, поддерживая цепочку кодировок. Использует DecompressionStream (если доступен) или Node.js zlib.
- * @en Creates a decompressing stream for the response body, supporting chained encodings. Uses DecompressionStream (if available) or Node.js zlib.
- * @param body - Source compressed stream.
- * @param encoding - Content-Encoding header value.
- * @returns Transformed stream with a dump method that cancels the stream.
+ * @ru Создаёт декомпрессирующий поток, минимизируя конвертацию между Web и Node.js стримами.
+ * @en Creates a decompressing stream while minimising conversion between Web and Node.js streams.
+ *
+ * @ru Алгоритм: для gzip/deflate при наличии глобального DecompressionStream использует Web Streams API,
+ * иначе переключается на Node.js zlib. Brotli всегда идёт через Node.js (до появления стандартного Web-потока).
+ * @en Algorithm: for gzip/deflate, if global DecompressionStream is available, uses Web Streams API;
+ * otherwise falls back to Node.js zlib. Brotli always goes through Node.js (until standard Web stream is available).
+ *
+ * @param body - Original compressed ReadableStream.
+ * @param encoding - Raw Content-Encoding header (may be a chain).
+ * @returns Decompressed ReadableStream with a dump method that cancels the stream.
  */
 export declare function createDecompressStream(body: ReadableStream<Uint8Array>, encoding: string): StreamPayload;
 export {};

package/utils/decompress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decompress.d.ts","sourceRoot":"","sources":["../../src/utils/decompress.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEjE;;;GAGG;AACH,KAAK,aAAa,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC;AAE5E;;;GAGG;AACH,KAAK,aAAa,GAAG,UAAU,GAAG,yBAAyB,CAAC;AAuE5D;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,GACf,aAAa,CAQf;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,EAChC,QAAQ,EAAE,MAAM,GACf,aAAa,CA0Df"}
+{"version":3,"file":"decompress.d.ts","sourceRoot":"","sources":["../../src/utils/decompress.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,KAAK,aAAa,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC;AAC5E,KAAK,aAAa,GAAG,UAAU,GAAG,yBAAyB,CAAC;AAqE5D;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,GACf,aAAa,CASf;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,EAChC,QAAQ,EAAE,MAAM,GACf,aAAa,CA+Cf"}

package/utils/decompress.js

@@ -1,9 +1,9 @@
 import { brotliDecompressSync, createBrotliDecompress, createGunzip, createInflate, gunzipSync, inflateSync, } from "node:zlib";
 import { Readable } from "node:stream";
 /**
- * @ru Разбирает строку Content-Encoding на массив кодировок (без identity).
- * @en Parses a Content-Encoding string into an array of encodings (excluding identity).
- * @param encoding - The Content-Encoding header value.
+ * @ru Разбирает заголовок Content-Encoding в массив алгоритмов, исключая "identity".
+ * @en Parses Content-Encoding header into an array of algorithms, excluding "identity".
+ * @param encoding - Raw Content-Encoding header value (e.g., "gzip, deflate").
  * @returns Array of normalized encoding names.
  */
 function parseEncodings(encoding) {
@@ -13,10 +13,10 @@ function parseEncodings(encoding) {
         .filter((part) => part.length > 0 && part !== "identity");
 }
 /**
- * @ru Прикрепляет пустой метод dump к буферу для соответствия интерфейсу TransportStreamExtensions.
- * @en Attaches a no-op dump method to a buffer to conform to TransportStreamExtensions.
- * @param buffer - The buffer to decorate.
- * @returns The same buffer with a dump method.
+ * @ru Добавляет noop-метод dump к буферу, сохраняя совместимость с TransportStreamExtensions.
+ * @en Attaches a noop dump method to a buffer, maintaining TransportStreamExtensions compatibility.
+ * @param buffer - The Uint8Array buffer.
+ * @returns Buffer with dump method attached.
  */
 function attachNoopDump(buffer) {
     const payload = buffer;
@@ -24,10 +24,10 @@ function attachNoopDump(buffer) {
     return payload;
 }
 /**
- * @ru Прикрепляет метод dump, который отменяет поток, к ReadableStream.
- * @en Attaches a dump method that cancels the stream to a ReadableStream.
- * @param stream - The stream to decorate.
- * @returns The same stream with a dump method.
+ * @ru Добавляет метод dump к стриму, который отменяет (cancel) поток.
+ * @en Attaches a dump method to a stream that cancels the stream.
+ * @param stream - ReadableStream to enhance.
+ * @returns Stream with dump method attached.
  */
 function attachStreamDump(stream) {
     const payload = stream;
@@ -42,14 +42,15 @@ function attachStreamDump(stream) {
     return payload;
 }
 /**
- * @ru Применяет декомпрессию один раз для заданной кодировки. Поддерживает gzip, deflate, br.
- * @en Applies decompression once for a given encoding. Supports gzip, deflate, br.
- * @param input - The compressed input buffer.
- * @param encoding - Single encoding name (e.g., 'gzip', 'deflate', 'br').
- * @returns Decompressed buffer, or original if encoding is not recognized.
+ * @ru Применяет один этап декомпрессии к буферу синхронно (для одиночных чанков).
+ * @en Applies a single decompression step to a buffer synchronously (for single chunks).
+ * @param input - Compressed buffer.
+ * @param encoding - Single encoding name ("gzip", "deflate", "br").
+ * @returns Decompressed buffer, or original if encoding is unknown.
+ * @throws If decompression fails due to corrupt data.
  */
 function decompressOnce(input, encoding) {
-    const buffer = Buffer.from(input);
+    const buffer = Buffer.from(input.buffer, input.byteOffset, input.byteLength);
     switch (encoding) {
         case "gzip":
         case "x-gzip":
@@ -63,55 +64,65 @@ function decompressOnce(input, encoding) {
     }
 }
 /**
- * @ru Декомпрессирует буфер, последовательно применяя все кодировки из Content-Encoding.
- * @en Decompresses a buffer by sequentially applying all encodings from Content-Encoding.
- * @param body - Compressed buffer (Uint8Array).
- * @param encoding - Content-Encoding header value (e.g., 'gzip, deflate').
- * @returns Decompressed buffer with a no-op dump method.
+ * @ru Полностью декомпрессирует буфер, последовательно применяя цепочку алгоритмов из Content-Encoding.
+ * @en Fully decompresses a buffer by sequentially applying the Content-Encoding chain.
+ * @param body - Compressed Uint8Array body.
+ * @param encoding - Raw Content-Encoding header (may contain multiple comma-separated values).
+ * @returns Decompressed buffer with a noop dump method.
  */
 export function decompressBuffer(body, encoding) {
     let current = body;
-    for (const enc of parseEncodings(encoding)) {
-        current = decompressOnce(current, enc);
+    const encodings = parseEncodings(encoding);
+    for (let i = 0; i < encodings.length; i++) {
+        current = decompressOnce(current, encodings[i]);
     }
     return attachNoopDump(current);
 }
 /**
- * @ru Создаёт декомпрессирующий поток для тела ответа, поддерживая цепочку кодировок. Использует DecompressionStream (если доступен) или Node.js zlib.
- * @en Creates a decompressing stream for the response body, supporting chained encodings. Uses DecompressionStream (if available) or Node.js zlib.
- * @param body - Source compressed stream.
- * @param encoding - Content-Encoding header value.
- * @returns Transformed stream with a dump method that cancels the stream.
+ * @ru Создаёт декомпрессирующий поток, минимизируя конвертацию между Web и Node.js стримами.
+ * @en Creates a decompressing stream while minimising conversion between Web and Node.js streams.
+ *
+ * @ru Алгоритм: для gzip/deflate при наличии глобального DecompressionStream использует Web Streams API,
+ * иначе переключается на Node.js zlib. Brotli всегда идёт через Node.js (до появления стандартного Web-потока).
+ * @en Algorithm: for gzip/deflate, if global DecompressionStream is available, uses Web Streams API;
+ * otherwise falls back to Node.js zlib. Brotli always goes through Node.js (until standard Web stream is available).
+ *
+ * @param body - Original compressed ReadableStream.
+ * @param encoding - Raw Content-Encoding header (may be a chain).
+ * @returns Decompressed ReadableStream with a dump method that cancels the stream.
  */
 export function createDecompressStream(body, encoding) {
+    const encodings = parseEncodings(encoding);
+    if (encodings.length === 0)
+        return attachStreamDump(body);
     let current = body;
-    for (const enc of parseEncodings(encoding)) {
-        if (enc === "gzip" || enc === "x-gzip") {
-            if (typeof DecompressionStream !== "undefined") {
-                current = current.pipeThrough(new DecompressionStream("gzip"));
-                continue;
+    let nodeReadableStream = null;
+    for (let i = 0; i < encodings.length; i++) {
+        const enc = encodings[i];
+        const isGzip = enc === "gzip" || enc === "x-gzip";
+        const isDeflate = enc === "deflate";
+        if ((isGzip || isDeflate) && typeof DecompressionStream !== "undefined") {
+            if (nodeReadableStream) {
+                current = Readable.toWeb(nodeReadableStream);
+                nodeReadableStream = null;
             }
-            const nodeReadable = Readable.fromWeb(current);
-            const decompressed = nodeReadable.pipe(createGunzip());
-            current = Readable.toWeb(decompressed);
-            continue;
+            current = current.pipeThrough(new DecompressionStream(isGzip ? "gzip" : "deflate"));
         }
-        if (enc === "deflate") {
-            if (typeof DecompressionStream !== "undefined") {
-                current = current.pipeThrough(new DecompressionStream("deflate"));
-                continue;
+        else {
+            if (!nodeReadableStream) {
+                nodeReadableStream = Readable.fromWeb(current);
             }
-            const nodeReadable = Readable.fromWeb(current);
-            const decompressed = nodeReadable.pipe(createInflate());
-            current = Readable.toWeb(decompressed);
-            continue;
-        }
-        if (enc === "br") {
-            const nodeReadable = Readable.fromWeb(current);
-            const decompressed = nodeReadable.pipe(createBrotliDecompress());
-            current = Readable.toWeb(decompressed);
+            if (isGzip)
+                nodeReadableStream = nodeReadableStream.pipe(createGunzip());
+            else if (isDeflate)
+                nodeReadableStream = nodeReadableStream.pipe(createInflate());
+            else if (enc === "br")
+                nodeReadableStream = nodeReadableStream.pipe(createBrotliDecompress());
         }
     }
+    if (nodeReadableStream) {
+        current = Readable.toWeb(nodeReadableStream);
+    }
     return attachStreamDump(current);
 }
 //# sourceMappingURL=decompress.js.map

package/utils/decompress.js.map

@@ -1 +1 @@
-{"version":3,"file":"decompress.js","sourceRoot":"","sources":["../../src/utils/decompress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decompress.js","sourceRoot":"","sources":["../../src/utils/decompress.ts"],"names":[],"mappings":"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"}

package/utils/merge.js

@@ -7,23 +7,17 @@
  */
 export function deepMerge(target, source) {
     const output = { ...target };
-    if (isObject(target) && isObject(source)) {
-        for (const key in source) {
-            if (Object.prototype.hasOwnProperty.call(source, key)) {
-                const sourceValue = source[key];
-                const targetValue = output[key];
-                if (isObject(sourceValue)) {
-                    if (key in output && isObject(targetValue)) {
-                        output[key] = deepMerge(targetValue, sourceValue);
-                    }
-                    else {
-                        output[key] = deepMerge({}, sourceValue);
-                    }
-                }
-                else if (sourceValue !== undefined) {
-                    output[key] = sourceValue;
-                }
-            }
+    for (const key of Object.keys(source)) {
+        const sourceValue = source[key];
+        const targetValue = output[key];
+        if (isObject(sourceValue) && isObject(targetValue)) {
+            output[key] = deepMerge(targetValue, sourceValue);
+            continue;
+        }
+        if (sourceValue !== undefined) {
+            output[key] = isObject(sourceValue)
+                ? deepMerge({}, sourceValue)
+                : sourceValue;
         }
     }
     return output;
@@ -34,6 +28,6 @@ export function deepMerge(target, source) {
  * @param item - Evaluated runtime variable value context.
  */
 function isObject(item) {
-    return typeof item === "object" && item !== null && !Array.isArray(item);
+    return Object.prototype.toString.call(item) === "[object Object]";
 }
 //# sourceMappingURL=merge.js.map

package/utils/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utils/merge.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAGvB,MAAS,EAAE,MAAS;IACpB,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAA6B,CAAC;IAExD,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;gBACtD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAEhC,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC1B,IAAI,GAAG,IAAI,MAAM,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC3C,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;oBACpD,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;oBAC3C,CAAC;gBACH,CAAC;qBAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBACrC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,IAAa;IAC7B,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC3E,CAAC"}
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utils/merge.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAGvB,MAAS,EAAE,MAAS;IACpB,MAAM,MAAM,GAA4B,EAAE,GAAG,MAAM,EAAE,CAAC;IAEtD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAEhC,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CACrB,WAAsC,EACtC,WAAsC,CACvC,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC;gBACjC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,WAAsC,CAAC;gBACvD,CAAC,CAAC,WAAW,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,MAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,IAAa;IAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,iBAAiB,CAAC;AACpE,CAAC"}

package/utils/normalize.d.ts

@@ -1,33 +1,32 @@
 import type { Method, RequestBodyData } from "@hyperttp/types";
-export type NormalizedBody = string | Uint8Array | ArrayBuffer | FormData | URLSearchParams | ReadableStream | Blob | null | undefined;
 /**
- * @ru Нормализует метод HTTP: приводит к верхнему регистру, использует кэш для часто встречающихся методов.
- * @en Normalizes an HTTP method: converts to uppercase, uses cache for common methods.
- * @param method - Raw method string (e.g., 'get', 'POST').
- * @returns Normalized uppercase method.
+ * @ru Нормализует строку HTTP-метода в стандартную заглавную форму (например, "get" → "GET").
+ * @en Normalizes an HTTP method string to its standard uppercase form (e.g., "get" → "GET").
+ * @param method - Raw method string.
+ * @returns Normalized method (e.g., "GET", "POST", etc.).
  */
 export declare function normalizeMethod(method: string): Method;
 /**
- * @ru Извлекает URL из объекта запроса или строки. Поддерживает поля url, _url, или комбинацию scheme/host/path.
- * @en Extracts a URL from a request object or string. Supports url, _url fields, or scheme/host/path combination.
- * @param req - Request object or URL string.
+ * @ru Извлекает и нормализует URL из строки или объекта запроса (поддерживает поля url, _url, или комбинацию scheme/host/path).
+ * @en Extracts and normalizes a URL from a string or request object (supports url, _url fields, or scheme/host/path combination).
+ * @param req - Request object or plain URL string.
  * @returns Normalized URL string.
- * @throws If URL cannot be resolved.
+ * @throws If URL cannot be determined.
  */
 export declare function normalizeUrl(req: any): string;
 /**
- * @ru Нормализует заголовки из различных форматов (массив, объект) в единый объект с правильной обработкой множественных значений (cookie, set-cookie).
- * @en Normalizes headers from various formats (array, object) into a single object with proper handling of multi-value headers (cookie, set-cookie).
- * @param headers - Raw headers in array or object format.
- * @returns Normalized headers object where values are strings or arrays of strings (for set-cookie).
+ * @ru Нормализует входные заголовки (объект, массив пар) в стандартный объект с ключами в нижнем регистре и правильным объединением значений.
+ * @en Normalizes input headers (object, array of pairs) into a standard object with lower‑case keys and proper value merging.
+ * @param headers - Raw headers (plain object, array of [key, value] pairs, or null/undefined).
+ * @returns Normalized headers object (keys are lower‑case, values are strings or arrays for set-cookie).
  */
 export declare function normalizeHeaders(headers: unknown): Record<string, string | string[]>;
 /**
- * @ru Нормализует тело запроса: для методов GET и HEAD тело всегда undefined, для остальных возвращает переданное тело.
- * @en Normalizes request body: for GET and HEAD methods body is always undefined, for others returns the provided body.
+ * @ru Возвращает тело запроса только для методов, поддерживающих тело (не GET/HEAD), иначе undefined.
+ * @en Returns the request body only for methods that support a body (not GET/HEAD), otherwise undefined.
  * @param method - HTTP method.
- * @param body - Raw request body.
- * @returns Normalized body or undefined.
+ * @param body - Original request body (if any).
+ * @returns The body for allowed methods, or undefined for GET/HEAD.
  */
 export declare function normalizeBody(method: Method, body: RequestBodyData | undefined): RequestBodyData | undefined;
 //# sourceMappingURL=normalize.d.ts.map

package/utils/normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/utils/normalize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE/D,MAAM,MAAM,cAAc,GACtB,MAAM,GACN,UAAU,GACV,WAAW,GACX,QAAQ,GACR,eAAe,GACf,cAAc,GACd,IAAI,GACJ,IAAI,GACJ,SAAS,CAAC;AA+Cd;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAItD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAY7C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CA+HnC;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,eAAe,GAAG,SAAS,GAChC,eAAe,GAAG,SAAS,CAK7B"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/utils/normalize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAuC/D;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGtD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAU7C;AA0CD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CA+CnC;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,eAAe,GAAG,SAAS,GAChC,eAAe,GAAG,SAAS,CAE7B"}