srvx 0.8.16 → 0.9.0

package/README.md

@@ -13,7 +13,7 @@ Universal Server based on web standards. Works with [Deno](https://deno.com/), [
 - ✅ Zero dependency
 - ✅ Full featured CLI with watcher, error handler, serve static and logger
 - ✅ Seamless runtime integration with same API ([handler](https://srvx.h3.dev/guide/handler) and [instance](https://srvx.h3.dev/guide/server)).
-- ✅ [Node.js compatibility](https://srvx.h3.dev/guide/node) with up to [~96.98%](https://github.com/h3js/srvx/tree/main/test/bench-node) native performance.
+- ✅ [Node.js compatibility](https://srvx.h3.dev/guide/node) with a [**close to native performance**](https://github.com/h3js/srvx/tree/main/test/bench-node).
 - ✅ Zero overhead [Deno](https://deno.com/) and [Bun](https://bun.sh/) support.
 
 ## Quick start

package/dist/_chunks/{_inherit-aIijG5gM.mjs → _inherit-BoJ2sCH1.mjs}

@@ -17,7 +17,7 @@ function lazyInherit(target, source, sourceKey) {
 				this[sourceKey][key] = value;
 			};
 		}
-		if (typeof desc.value === "function") {
+		if (!targetDesc?.value && typeof desc.value === "function") {
 			modified = true;
 			desc.value = function(...args) {
 				return this[sourceKey][key](...args);

package/dist/_chunks/{_url-6S_VTq5O.mjs → _url-DjsXG6si.mjs}

@@ -1,4 +1,4 @@
-import { lazyInherit } from "./_inherit-aIijG5gM.mjs";
+import { lazyInherit } from "./_inherit-BoJ2sCH1.mjs";
 
 //#region src/_url.ts
 /**
@@ -35,6 +35,9 @@ const FastURL = /* @__PURE__ */ (() => {
 				this.#search = url.search;
 			}
 		}
+		static [Symbol.hasInstance](val) {
+			return val instanceof NativeURL;
+		}
 		get _url() {
 			if (this.#url) return this.#url;
 			this.#url = new NativeURL(this.href);

package/dist/_chunks/call-Ca6cbyoe.mjs

@@ -0,0 +1,157 @@
+import { lazyInherit } from "./_inherit-BoJ2sCH1.mjs";
+
+//#region src/adapters/_node/response.ts
+/**
+* Fast Response for Node.js runtime
+*
+* It is faster because in most cases it doesn't create a full Response instance.
+*/
+const NodeResponse = /* @__PURE__ */ (() => {
+	const NativeResponse = globalThis.Response;
+	const STATUS_CODES = globalThis.process?.getBuiltinModule?.("node:http")?.STATUS_CODES || {};
+	class NodeResponse$1 {
+		#body;
+		#init;
+		#headers;
+		#response;
+		constructor(body, init) {
+			this.#body = body;
+			this.#init = init;
+		}
+		static [Symbol.hasInstance](val) {
+			return val instanceof NativeResponse;
+		}
+		get status() {
+			return this.#response?.status || this.#init?.status || 200;
+		}
+		get statusText() {
+			return this.#response?.statusText || this.#init?.statusText || STATUS_CODES[this.status] || "";
+		}
+		get headers() {
+			if (this.#response) return this.#response.headers;
+			if (this.#headers) return this.#headers;
+			const initHeaders = this.#init?.headers;
+			return this.#headers = initHeaders instanceof Headers ? initHeaders : new Headers(initHeaders);
+		}
+		get ok() {
+			if (this.#response) return this.#response.ok;
+			const status = this.status;
+			return status >= 200 && status < 300;
+		}
+		get _response() {
+			if (this.#response) return this.#response;
+			this.#response = new NativeResponse(this.#body, this.#headers ? {
+				...this.#init,
+				headers: this.#headers
+			} : this.#init);
+			this.#init = void 0;
+			this.#headers = void 0;
+			this.#body = void 0;
+			return this.#response;
+		}
+		_toNodeResponse() {
+			const status = this.status;
+			const statusText = this.statusText;
+			let body;
+			let contentType;
+			let contentLength;
+			if (this.#response) body = this.#response.body;
+			else if (this.#body) if (this.#body instanceof ReadableStream) body = this.#body;
+			else if (typeof this.#body === "string") {
+				body = this.#body;
+				contentType = "text/plain; charset=UTF-8";
+				contentLength = Buffer.byteLength(this.#body);
+			} else if (this.#body instanceof ArrayBuffer) {
+				body = Buffer.from(this.#body);
+				contentLength = this.#body.byteLength;
+			} else if (this.#body instanceof Uint8Array) {
+				body = this.#body;
+				contentLength = this.#body.byteLength;
+			} else if (this.#body instanceof DataView) {
+				body = Buffer.from(this.#body.buffer);
+				contentLength = this.#body.byteLength;
+			} else if (this.#body instanceof Blob) {
+				body = this.#body.stream();
+				contentType = this.#body.type;
+				contentLength = this.#body.size;
+			} else if (typeof this.#body.pipe === "function") body = this.#body;
+			else body = this._response.body;
+			const headers = [];
+			const initHeaders = this.#init?.headers;
+			const headerEntries = this.#response?.headers || this.#headers || (initHeaders ? Array.isArray(initHeaders) ? initHeaders : initHeaders?.entries ? initHeaders.entries() : Object.entries(initHeaders).map(([k, v]) => [k.toLowerCase(), v]) : void 0);
+			let hasContentTypeHeader;
+			let hasContentLength;
+			if (headerEntries) for (const [key, value] of headerEntries) {
+				if (Array.isArray(value)) for (const v of value) headers.push([key, v]);
+				else headers.push([key, value]);
+				if (key === "content-type") hasContentTypeHeader = true;
+				else if (key === "content-length") hasContentLength = true;
+			}
+			if (contentType && !hasContentTypeHeader) headers.push(["content-type", contentType]);
+			if (contentLength && !hasContentLength) headers.push(["content-length", String(contentLength)]);
+			this.#init = void 0;
+			this.#headers = void 0;
+			this.#response = void 0;
+			this.#body = void 0;
+			return {
+				status,
+				statusText,
+				headers,
+				body
+			};
+		}
+	}
+	lazyInherit(NodeResponse$1.prototype, NativeResponse.prototype, "_response");
+	Object.setPrototypeOf(NodeResponse$1, NativeResponse);
+	Object.setPrototypeOf(NodeResponse$1.prototype, NativeResponse.prototype);
+	return NodeResponse$1;
+})();
+
+//#endregion
+//#region src/adapters/_node/call.ts
+function callNodeHandler(handler, req) {
+	const isMiddleware = handler.length > 2;
+	const nodeCtx = req.runtime?.node;
+	if (!nodeCtx || !nodeCtx.req || !nodeCtx.res) throw new Error("Node.js runtime context is not available.");
+	const { req: nodeReq, res: nodeRes } = nodeCtx;
+	let _headers;
+	const webRes = new NodeResponse(void 0, {
+		get status() {
+			return nodeRes.statusCode;
+		},
+		get statusText() {
+			return nodeRes.statusMessage;
+		},
+		get headers() {
+			if (!_headers) {
+				const headerEntries = [];
+				const rawHeaders = nodeRes.getHeaders();
+				for (const [name, value] of Object.entries(rawHeaders)) if (Array.isArray(value)) for (const v of value) headerEntries.push([name, v]);
+				else if (value) headerEntries.push([name, String(value)]);
+				_headers = new Headers(headerEntries);
+			}
+			return _headers;
+		}
+	});
+	return new Promise((resolve, reject) => {
+		nodeRes.once("close", () => resolve(webRes));
+		nodeRes.once("finish", () => resolve(webRes));
+		nodeRes.once("error", (error) => reject(error));
+		let streamPromise;
+		nodeRes.once("pipe", (stream) => {
+			streamPromise = new Promise((resolve$1) => {
+				stream.once("end", () => resolve$1(webRes));
+				stream.once("error", (error) => reject(error));
+			});
+		});
+		try {
+			if (isMiddleware) Promise.resolve(handler(nodeReq, nodeRes, (error) => error ? reject(error) : streamPromise || resolve(webRes))).catch((error) => reject(error));
+			else Promise.resolve(handler(nodeReq, nodeRes)).then(() => streamPromise || webRes);
+		} catch (error) {
+			reject(error);
+		}
+	});
+}
+
+//#endregion
+export { NodeResponse, callNodeHandler };

package/dist/_chunks/call-Ccm3CgTV.mjs

@@ -0,0 +1,4 @@
+import "./_inherit-BoJ2sCH1.mjs";
+import { callNodeHandler } from "./call-Ca6cbyoe.mjs";
+
+export { callNodeHandler };

package/dist/_chunks/{types-vBo0F7mW.d.mts → types-4jUOEbJe.d.mts}

@@ -1,7 +1,7 @@
-import * as cloudflare_workers0 from "cloudflare:workers";
-import * as NodeHttp$1 from "node:http";
+import * as NodeHttp from "node:http";
 import * as NodeHttps from "node:https";
 import * as NodeHttp2 from "node:http2";
+import * as cloudflare_workers0 from "cloudflare:workers";
 import * as NodeNet from "node:net";
 import * as Bun from "bun";
 import * as CF from "@cloudflare/workers-types";
@@ -112,7 +112,7 @@ interface ServerOptions {
   /**
   * Node.js server options.
   */
-  node?: (NodeHttp$1.ServerOptions | NodeHttps.ServerOptions | NodeHttp2.ServerOptions) & NodeNet.ListenOptions & {
+  node?: (NodeHttp.ServerOptions | NodeHttps.ServerOptions | NodeHttp2.ServerOptions) & NodeNet.ListenOptions & {
     http2?: boolean;
   };
   /**
@@ -120,7 +120,7 @@ interface ServerOptions {
   *
   * @docs https://bun.sh/docs/api/http
   */
-  bun?: Omit<Bun.ServeOptions | Bun.TLSServeOptions, "fetch">;
+  bun?: Omit<Bun.Serve.Options<any>, "fetch">;
   /**
   * Deno server options
   *
@@ -161,14 +161,14 @@ interface Server<Handler = ServerHandler> {
   * Node.js context.
   */
   readonly node?: {
-    server?: NodeHttp$1.Server | NodeHttp2.Http2Server;
+    server?: NodeHttp.Server | NodeHttp2.Http2Server;
     handler: (req: NodeServerRequest, res: NodeServerResponse) => void | Promise<void>;
   };
   /**
   * Bun context.
   */
   readonly bun?: {
-    server?: Bun.Server;
+    server?: Bun.Server<any>;
   };
   /**
   * Deno context.
@@ -221,7 +221,7 @@ interface ServerRuntimeContext {
   * Underlying Bun server request context.
   */
   bun?: {
-    server: Bun.Server;
+    server: Bun.Server<any>;
   };
   /**
   * Underlying Cloudflare request context.
@@ -235,6 +235,10 @@ interface ServerRequestContext {
   [key: string]: unknown;
 }
 interface ServerRequest extends Request {
+  /**
+  * Access to the parsed URL
+  */
+  _url?: URL;
   /**
   * Runtime specific request context.
   */
@@ -257,10 +261,10 @@ interface ServerRequest extends Request {
 // ----------------------------------------------------------------------------
 type FetchHandler = (request: Request) => Response | Promise<Response>;
 type ErrorHandler = (error: unknown) => Response | Promise<Response>;
-type BunFetchHandler = (request: Request, server?: Bun.Server) => Response | Promise<Response>;
+type BunFetchHandler = (request: Request, server?: Bun.Server<any>) => Response | Promise<Response>;
 type DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.NetAddr>) => Response | Promise<Response>;
-type NodeServerRequest = NodeHttp$1.IncomingMessage | NodeHttp2.Http2ServerRequest;
-type NodeServerResponse = NodeHttp$1.ServerResponse | NodeHttp2.Http2ServerResponse;
+type NodeServerRequest = NodeHttp.IncomingMessage | NodeHttp2.Http2ServerRequest;
+type NodeServerResponse = NodeHttp.ServerResponse | NodeHttp2.Http2ServerResponse;
 type NodeHttpHandler = (req: NodeServerRequest, res: NodeServerResponse) => void | Promise<void>;
 type NodeHTTPMiddleware = (req: NodeServerRequest, res: NodeServerResponse, next: (error?: Error) => void) => unknown | Promise<unknown>;
 type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler;

package/dist/adapters/bun.d.mts

@@ -1,5 +1,5 @@
-import { BunFetchHandler, Server, ServerOptions } from "../_chunks/types-vBo0F7mW.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-AwIHDSW0.mjs";
+import { BunFetchHandler, Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-D-jAQyRZ.mjs";
 import * as bun from "bun";
 
 //#region src/adapters/bun.d.ts
@@ -11,7 +11,7 @@ declare class BunServer implements Server<BunFetchHandler> {
   readonly runtime = "bun";
   readonly options: Server["options"];
   readonly bun: Server["bun"];
-  readonly serveOptions: bun.ServeOptions | bun.TLSServeOptions;
+  readonly serveOptions: bun.Serve.Options<any>;
   readonly fetch: BunFetchHandler;
   constructor(options: ServerOptions);
   serve(): Promise<this>;

package/dist/adapters/bun.mjs

@@ -1,7 +1,7 @@
-import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-DEm1vdc3.mjs";
-import { wrapFetch } from "../_chunks/_middleware-z4fpJ-o6.mjs";
-import "../_chunks/_inherit-aIijG5gM.mjs";
-import { FastURL$1 as FastURL } from "../_chunks/_url-6S_VTq5O.mjs";
+import "../_chunks/_inherit-BoJ2sCH1.mjs";
+import { FastURL$1 as FastURL } from "../_chunks/_url-DjsXG6si.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-dqVgpDNy.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Z-W2xNSK.mjs";
 
 //#region src/adapters/bun.ts
 const FastResponse = Response;

package/dist/adapters/cloudflare.d.mts

@@ -1,4 +1,4 @@
-import { Server, ServerOptions } from "../_chunks/types-vBo0F7mW.mjs";
+import { Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
 import * as CF from "@cloudflare/workers-types";
 
 //#region src/adapters/cloudflare.d.ts

package/dist/adapters/cloudflare.mjs

@@ -1,5 +1,5 @@
-import { wrapFetch } from "../_chunks/_middleware-z4fpJ-o6.mjs";
-import { errorPlugin } from "../_chunks/_plugins-BuL6RXOq.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Z-W2xNSK.mjs";
+import { errorPlugin } from "../_chunks/_plugins-DOhVIkXu.mjs";
 
 //#region src/adapters/cloudflare.ts
 const FastURL = URL;

package/dist/adapters/deno.d.mts

@@ -1,5 +1,5 @@
-import { DenoFetchHandler, Server, ServerOptions } from "../_chunks/types-vBo0F7mW.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-AwIHDSW0.mjs";
+import { DenoFetchHandler, Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-D-jAQyRZ.mjs";
 
 //#region src/adapters/deno.d.ts
 declare const FastResponse: typeof globalThis.Response;

package/dist/adapters/deno.mjs

@@ -1,7 +1,7 @@
-import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-DEm1vdc3.mjs";
-import { wrapFetch } from "../_chunks/_middleware-z4fpJ-o6.mjs";
-import "../_chunks/_inherit-aIijG5gM.mjs";
-import { FastURL$1 as FastURL } from "../_chunks/_url-6S_VTq5O.mjs";
+import "../_chunks/_inherit-BoJ2sCH1.mjs";
+import { FastURL$1 as FastURL } from "../_chunks/_url-DjsXG6si.mjs";
+import { createWaitUntil, fmtURL, printListening, resolvePortAndHost, resolveTLSOptions } from "../_chunks/_utils-dqVgpDNy.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Z-W2xNSK.mjs";
 
 //#region src/adapters/deno.ts
 const FastResponse = Response;

package/dist/adapters/generic.d.mts

@@ -1,4 +1,4 @@
-import { Server, ServerOptions } from "../_chunks/types-vBo0F7mW.mjs";
+import { Server, ServerOptions } from "../_chunks/types-4jUOEbJe.mjs";
 
 //#region src/adapters/generic.d.ts
 declare const FastURL: typeof globalThis.URL;

package/dist/adapters/generic.mjs

@@ -1,6 +1,6 @@
-import { createWaitUntil } from "../_chunks/_utils-DEm1vdc3.mjs";
-import { wrapFetch } from "../_chunks/_middleware-z4fpJ-o6.mjs";
-import { errorPlugin } from "../_chunks/_plugins-BuL6RXOq.mjs";
+import { createWaitUntil } from "../_chunks/_utils-dqVgpDNy.mjs";
+import { wrapFetch } from "../_chunks/_middleware-Z-W2xNSK.mjs";
+import { errorPlugin } from "../_chunks/_plugins-DOhVIkXu.mjs";
 
 //#region src/adapters/generic.ts
 const FastURL = URL;

package/dist/adapters/node.d.mts

@@ -1,6 +1,5 @@
-import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "../_chunks/types-vBo0F7mW.mjs";
-import { FastURL$2 as FastURL } from "../_chunks/_url-AwIHDSW0.mjs";
-import NodeHttp from "node:http";
+import { FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest } from "../_chunks/types-4jUOEbJe.mjs";
+import { FastURL$2 as FastURL } from "../_chunks/_url-D-jAQyRZ.mjs";
 import { Readable } from "node:stream";
 
 //#region src/adapters/_node/request.d.ts
@@ -12,28 +11,13 @@ declare const NodeRequest: {
   new (nodeCtx: NodeRequestContext): ServerRequest;
 };
 //#endregion
-//#region src/adapters/_node/headers.d.ts
-type NodeRequestHeaders = InstanceType<typeof NodeRequestHeaders>;
-declare const NodeRequestHeaders: {
-  new (nodeCtx: {
-    req: NodeServerRequest;
-    res?: NodeServerResponse;
-  }): globalThis.Headers;
-};
-declare const NodeResponseHeaders: {
-  new (nodeCtx: {
-    req?: NodeServerRequest;
-    res: NodeServerResponse;
-  }): globalThis.Headers;
-};
-//#endregion
 //#region src/adapters/_node/response.d.ts
 // prettier-ignore
 type PreparedNodeResponseBody = string | Buffer | Uint8Array | DataView | ReadableStream | Readable | undefined | null;
 interface PreparedNodeResponse {
   status: number;
   statusText: string;
-  headers: NodeHttp.OutgoingHttpHeader[];
+  headers: [string, string][];
   body: PreparedNodeResponseBody;
 }
 /**
@@ -43,7 +27,7 @@ interface PreparedNodeResponse {
 */
 declare const NodeResponse: {
   new (body?: BodyInit | null, init?: ResponseInit): globalThis.Response & {
-    readonly nodeResponse: () => PreparedNodeResponse;
+    _toNodeResponse: () => PreparedNodeResponse;
   };
 };
 type NodeResponse = InstanceType<typeof NodeResponse>;
@@ -51,8 +35,40 @@ type NodeResponse = InstanceType<typeof NodeResponse>;
 //#region src/adapters/_node/send.d.ts
 declare function sendNodeResponse(nodeRes: NodeServerResponse, webRes: Response | NodeResponse): Promise<void>;
 //#endregion
+//#region src/adapters/_node/web/fetch.d.ts
+// https://github.com/nodejs/node/blob/main/lib/_http_incoming.js
+// https://github.com/nodejs/node/blob/main/lib/_http_outgoing.js
+// https://github.com/nodejs/node/blob/main/lib/_http_server.js
+/**
+* Calls a Node.js HTTP Request handler with a Fetch API Request object and returns a Response object.
+*
+* If the web Request contains an existing Node.js req/res pair (indicating it originated from a Node.js server from srvx/node), it will be called directly.
+*
+* Otherwise, new Node.js IncomingMessage and ServerResponse objects are created and linked to a custom Duplex stream that bridges the Fetch API streams with Node.js streams.
+*
+* The handler is invoked with these objects, and the response is constructed from the ServerResponse once it is finished.
+*
+* @experimental Behavior might be unstable.
+*/
+declare function fetchNodeHandler(handler: NodeHttpHandler, req: ServerRequest): Promise<Response>;
+//#endregion
+//#region src/adapters/_node/adapter.d.ts
+type AdapterMeta = {
+  __nodeHandler?: NodeHttpHandler;
+  __fetchHandler?: FetchHandler;
+};
+/**
+* Converts a Fetch API handler to a Node.js HTTP handler.
+*/
+declare function toNodeHandler(handler: FetchHandler & AdapterMeta): NodeHttpHandler & AdapterMeta;
+/**
+* Converts a Node.js HTTP handler into a Fetch API handler.
+*
+* @experimental Behavior might be unstable and won't work in Bun and Deno currently (tracker: https://github.com/h3js/srvx/issues/132)
+*/
+declare function toFetchHandler(handler: NodeHttpHandler & AdapterMeta): FetchHandler & AdapterMeta;
+//#endregion
 //#region src/adapters/node.d.ts
 declare function serve(options: ServerOptions): Server;
-declare function toNodeHandler(fetchHandler: FetchHandler): NodeHttpHandler;
 //#endregion
-export { NodeResponse as FastResponse, FastURL, NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, sendNodeResponse, serve, toNodeHandler };
+export { NodeResponse as FastResponse, FastURL, NodeRequest, NodeResponse, fetchNodeHandler, sendNodeResponse, serve, toFetchHandler, toNodeHandler };