srvx 0.5.1 → 0.6.0

package/dist/adapters/bun.d.mts

@@ -1,11 +1,12 @@
 import { ServerOptions, Server, BunFetchHandler } from '../types.mjs';
 import * as Bun from 'bun';
+export { F as FastURL } from '../shared/srvx.DEE2RO4O.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:net';
 import '@cloudflare/workers-types';
 
-declare const Response: typeof globalThis.Response;
+declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): BunServer;
 declare class BunServer implements Server<BunFetchHandler> {
     readonly runtime = "bun";
@@ -20,4 +21,4 @@ declare class BunServer implements Server<BunFetchHandler> {
     close(closeAll?: boolean): Promise<void>;
 }
 
-export { Response, serve };
+export { FastResponse, serve };

package/dist/adapters/bun.mjs

@@ -1,8 +1,10 @@
-import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.FQfHxe2J.mjs';
-import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
+import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.Ctaz0clH.mjs';
+export { F as FastURL } from '../shared/srvx.Ctaz0clH.mjs';
+import { w as wrapFetch } from '../shared/srvx.zEohKxBQ.mjs';
+import { w as wsUpgradePlugin } from '../shared/srvx.BMykKwGg.mjs';
 import 'node:fs';
 
-const Response = globalThis.Response;
+const FastResponse = Response;
 function serve(options) {
   return new BunServer(options);
 }
@@ -11,7 +13,7 @@ class BunServer {
     this.runtime = "bun";
     this.bun = {};
     this.options = options;
-    const fetchHandler = wrapFetch(this, this.options.fetch);
+    const fetchHandler = wrapFetch(this, [wsUpgradePlugin]);
     this.fetch = (request, server) => {
       Object.defineProperties(request, {
         runtime: {
@@ -31,7 +33,7 @@ class BunServer {
     this.serveOptions = {
       ...resolvePortAndHost(this.options),
       reusePort: this.options.reusePort,
-      error: this.options.onError,
+      error: this.options.error,
       ...this.options.bun,
       tls: {
         cert: tls?.cert,
@@ -75,4 +77,4 @@ class BunServer {
   }
 }
 
-export { Response, serve };
+export { FastResponse, serve };

package/dist/adapters/cloudflare.d.mts

@@ -5,7 +5,8 @@ import 'node:https';
 import 'node:net';
 import 'bun';
 
-declare const Response: typeof globalThis.Response;
+declare const FastURL: typeof globalThis.URL;
+declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): Server<CF.ExportedHandlerFetchHandler>;
 
-export { Response, serve };
+export { FastResponse, FastURL, serve };

package/dist/adapters/cloudflare.mjs

@@ -1,7 +1,9 @@
-import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
-import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
+import { w as wrapFetch } from '../shared/srvx.zEohKxBQ.mjs';
+import { e as errorPlugin } from '../shared/srvx.CEIXM-sv.mjs';
+import { w as wsUpgradePlugin } from '../shared/srvx.BMykKwGg.mjs';
 
-const Response = globalThis.Response;
+const FastURL = URL;
+const FastResponse = Response;
 function serve(options) {
   return new CloudflareServer(options);
 }
@@ -9,10 +11,10 @@ class CloudflareServer {
   constructor(options) {
     this.runtime = "cloudflare";
     this.options = options;
-    const fetchHandler = wrapFetch(
-      this,
-      wrapFetchOnError(this.options.fetch, this.options.onError)
-    );
+    const fetchHandler = wrapFetch(this, [
+      errorPlugin,
+      wsUpgradePlugin
+    ]);
     this.fetch = (request, env, context) => {
       Object.defineProperties(request, {
         runtime: {
@@ -49,4 +51,4 @@ class CloudflareServer {
   }
 }
 
-export { Response, serve };
+export { FastResponse, FastURL, serve };

package/dist/adapters/deno.d.mts

@@ -1,11 +1,12 @@
 import { ServerOptions, Server, DenoFetchHandler } from '../types.mjs';
+export { F as FastURL } from '../shared/srvx.DEE2RO4O.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
 
-declare const Response: typeof globalThis.Response;
+declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): DenoServer;
 declare class DenoServer implements Server<DenoFetchHandler> {
     #private;
@@ -21,4 +22,4 @@ declare class DenoServer implements Server<DenoFetchHandler> {
     close(): Promise<void | undefined>;
 }
 
-export { Response, serve };
+export { FastResponse, serve };

package/dist/adapters/deno.mjs

@@ -1,8 +1,10 @@
-import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.FQfHxe2J.mjs';
-import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
+import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.Ctaz0clH.mjs';
+export { F as FastURL } from '../shared/srvx.Ctaz0clH.mjs';
+import { w as wrapFetch } from '../shared/srvx.zEohKxBQ.mjs';
+import { w as wsUpgradePlugin } from '../shared/srvx.BMykKwGg.mjs';
 import 'node:fs';
 
-const Response = globalThis.Response;
+const FastResponse = Response;
 function serve(options) {
   return new DenoServer(options);
 }
@@ -11,7 +13,7 @@ class DenoServer {
     this.runtime = "deno";
     this.deno = {};
     this.options = options;
-    const fetchHandler = wrapFetch(this, this.options.fetch);
+    const fetchHandler = wrapFetch(this, [wsUpgradePlugin]);
     this.fetch = (request, info) => {
       Object.defineProperties(request, {
         runtime: {
@@ -31,7 +33,7 @@ class DenoServer {
     this.serveOptions = {
       ...resolvePortAndHost(this.options),
       reusePort: this.options.reusePort,
-      onError: this.options.onError,
+      onError: this.options.error,
       ...tls ? { key: tls.key, cert: tls.cert, passphrase: tls.passphrase } : {},
       ...this.options.deno
     };
@@ -78,4 +80,4 @@ class DenoServer {
   }
 }
 
-export { Response, serve };
+export { FastResponse, serve };

package/dist/adapters/generic.d.mts

@@ -5,7 +5,8 @@ import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
 
-declare const Response: typeof globalThis.Response;
+declare const FastURL: typeof globalThis.URL;
+declare const FastResponse: typeof globalThis.Response;
 declare function serve(options: ServerOptions): Server;
 
-export { Response, serve };
+export { FastResponse, FastURL, serve };

package/dist/adapters/generic.mjs

@@ -1,7 +1,8 @@
-import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
-import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
+import { w as wrapFetch } from '../shared/srvx.zEohKxBQ.mjs';
+import { e as errorPlugin } from '../shared/srvx.CEIXM-sv.mjs';
 
-const Response = globalThis.Response;
+const FastURL = URL;
+const FastResponse = Response;
 function serve(options) {
   return new GenericServer(options);
 }
@@ -9,10 +10,7 @@ class GenericServer {
   constructor(options) {
     this.runtime = "generic";
     this.options = options;
-    const fetchHandler = wrapFetch(
-      this,
-      wrapFetchOnError(this.options.fetch, this.options.onError)
-    );
+    const fetchHandler = wrapFetch(this, [errorPlugin]);
     this.fetch = (request) => {
       return Promise.resolve(fetchHandler(request));
     };
@@ -27,4 +25,4 @@ class GenericServer {
   }
 }
 
-export { Response, serve };
+export { FastResponse, FastURL, serve };

package/dist/adapters/node.d.mts

@@ -1,6 +1,7 @@
 import { ServerRequest, ServerOptions, Server, FetchHandler, NodeHttpHandler } from '../types.mjs';
+export { F as FastURL } from '../shared/srvx.DEE2RO4O.mjs';
 import NodeHttp__default from 'node:http';
-import { Readable } from 'node:stream';
+import NodeStream, { Readable } from 'node:stream';
 import 'node:https';
 import 'node:net';
 import 'bun';
@@ -23,11 +24,16 @@ declare const NodeResponse: {
     };
 };
 
+type NodeRequestContext = {
+    req: NodeHttp__default.IncomingMessage;
+    res?: NodeHttp__default.ServerResponse;
+    upgrade?: {
+        socket: NodeStream.Duplex;
+        header: Buffer;
+    };
+};
 declare const NodeRequest: {
-    new (nodeCtx: {
-        req: NodeHttp__default.IncomingMessage;
-        res: NodeHttp__default.ServerResponse;
-    }): ServerRequest;
+    new (nodeCtx: NodeRequestContext): ServerRequest;
 };
 
 declare const NodeRequestHeaders: {
@@ -46,4 +52,4 @@ declare const NodeResponseHeaders: {
 declare function serve(options: ServerOptions): Server;
 declare function toNodeHandler(fetchHandler: FetchHandler): NodeHttpHandler;
 
-export { NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, NodeRequest as Request, NodeResponse as Response, serve, toNodeHandler };
+export { NodeResponse as FastResponse, NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, serve, toNodeHandler };

package/dist/adapters/node.mjs

@@ -1,9 +1,10 @@
 import NodeHttp from 'node:http';
 import NodeHttps from 'node:https';
 import { splitSetCookieString } from 'cookie-es';
-import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.FQfHxe2J.mjs';
-import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
-import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
+import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.Ctaz0clH.mjs';
+export { F as FastURL } from '../shared/srvx.Ctaz0clH.mjs';
+import { w as wrapFetch } from '../shared/srvx.zEohKxBQ.mjs';
+import { e as errorPlugin } from '../shared/srvx.CEIXM-sv.mjs';
 import 'node:fs';
 
 async function sendNodeResponse(nodeRes, webRes) {
@@ -46,6 +47,23 @@ async function sendNodeResponse(nodeRes, webRes) {
   }
   return webRes.body ? streamBody(webRes.body, nodeRes) : endNodeResponse(nodeRes);
 }
+async function sendNodeUpgradeResponse(socket, res) {
+  const head = [
+    `HTTP/1.1 ${res.status || 200} ${res.statusText || ""}`,
+    ...[...res.headers.entries()].map(
+      ([key, value]) => `${encodeURIComponent(key)}: ${encodeURIComponent(value)}`
+    )
+  ];
+  socket.write(head.join("\r\n") + "\r\n\r\n");
+  if (res.body) {
+    for await (const chunk of res.body) {
+      socket.write(chunk);
+    }
+  }
+  return new Promise((resolve) => {
+    socket.end(resolve);
+  });
+}
 function endNodeResponse(nodeRes) {
   return new Promise((resolve) => nodeRes.end(resolve));
 }
@@ -688,7 +706,7 @@ const NodeResponse = /* @__PURE__ */ (() => {
       const headers = [];
       const headersInit = this.#init?.headers;
       if (headersInit) {
-        const headerEntries = headersInit.entries ? headersInit.entries() : Object.entries(headersInit);
+        const headerEntries = Array.isArray(headersInit) ? headersInit : headersInit.entries ? headersInit.entries() : Object.entries(headersInit);
         for (const [key, value] of headerEntries) {
           if (key === "set-cookie") {
             for (const setCookie of splitSetCookieString(value)) {
@@ -699,6 +717,17 @@ const NodeResponse = /* @__PURE__ */ (() => {
           }
         }
       }
+      if (this.#headersObj) {
+        for (const [key, value] of this.#headersObj) {
+          if (key === "set-cookie") {
+            for (const setCookie of splitSetCookieString(value)) {
+              headers.push(["set-cookie", setCookie]);
+            }
+          } else {
+            headers.push([key, value]);
+          }
+        }
+      }
       const bodyInit = this.#body;
       let body;
       if (bodyInit) {
@@ -907,11 +936,7 @@ class NodeServer {
   constructor(options) {
     this.runtime = "node";
     this.options = options;
-    const fetchHandler = wrapFetch(
-      this,
-      wrapFetchOnError(this.options.fetch, this.options.onError)
-    );
-    this.fetch = fetchHandler;
+    const fetchHandler = this.fetch = wrapFetch(this, [errorPlugin]);
     const handler = (nodeReq, nodeRes) => {
       const request = new NodeRequest({ req: nodeReq, res: nodeRes });
       const res = fetchHandler(request);
@@ -930,6 +955,19 @@ class NodeServer {
       this.serveOptions,
       handler
     ) : NodeHttp.createServer(this.serveOptions, handler);
+    const upgradeHandler = this.options.upgrade;
+    if (upgradeHandler) {
+      server.on("upgrade", (nodeReq, socket, header) => {
+        const request = new NodeRequest({
+          req: nodeReq,
+          upgrade: { socket, header }
+        });
+        const res = upgradeHandler(request);
+        return res instanceof Promise ? res.then(
+          (resolvedRes) => sendNodeUpgradeResponse(socket, resolvedRes)
+        ) : sendNodeUpgradeResponse(socket, res);
+      });
+    }
     this.node = { server, handler };
     if (!options.manual) {
       this.serve();
@@ -973,4 +1011,4 @@ class NodeServer {
   }
 }
 
-export { NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, NodeRequest as Request, NodeResponse as Response, serve, toNodeHandler };
+export { NodeResponse as FastResponse, NodeRequest, NodeRequestHeaders, NodeResponse, NodeResponseHeaders, serve, toNodeHandler };

package/dist/adapters/service-worker.d.mts

@@ -5,9 +5,10 @@ import 'node:net';
 import 'bun';
 import '@cloudflare/workers-types';
 
-declare const Response: typeof globalThis.Response;
+declare const FastURL: typeof globalThis.URL;
+declare const FastResponse: typeof globalThis.Response;
 type ServiceWorkerHandler = (request: ServerRequest, event: FetchEvent) => Response | Promise<Response>;
 declare function serve(options: ServerOptions): Server<ServiceWorkerHandler>;
 
-export { Response, serve };
+export { FastResponse, FastURL, serve };
 export type { ServiceWorkerHandler };

package/dist/adapters/service-worker.mjs

@@ -1,7 +1,8 @@
-import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
-import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
+import { w as wrapFetch } from '../shared/srvx.zEohKxBQ.mjs';
+import { e as errorPlugin } from '../shared/srvx.CEIXM-sv.mjs';
 
-const Response = globalThis.Response;
+const FastURL = URL;
+const FastResponse = Response;
 const isBrowserWindow = typeof window !== "undefined" && typeof navigator !== "undefined";
 const isServiceWorker = typeof self !== "undefined" && "skipWaiting" in self;
 function serve(options) {
@@ -11,10 +12,7 @@ class ServiceWorkerServer {
   constructor(options) {
     this.runtime = "service-worker";
     this.options = options;
-    const fetchHandler = wrapFetch(
-      this,
-      wrapFetchOnError(this.options.fetch, this.options.onError)
-    );
+    const fetchHandler = wrapFetch(this, [errorPlugin]);
     this.fetch = (request, event) => {
       Object.defineProperties(request, {
         runtime: {
@@ -94,4 +92,4 @@ class ServiceWorkerServer {
   }
 }
 
-export { Response, serve };
+export { FastResponse, FastURL, serve };

package/dist/shared/srvx.BMykKwGg.mjs

@@ -0,0 +1,16 @@
+const wsUpgradePlugin = (server) => {
+  const upgradeHandler = server.options.upgrade;
+  if (!upgradeHandler) {
+    return {};
+  }
+  return {
+    fetch(request, next) {
+      if (request.headers.get("upgrade") === "websocket") {
+        return upgradeHandler(request);
+      }
+      return next();
+    }
+  };
+};
+
+export { wsUpgradePlugin as w };

package/dist/shared/srvx.CEIXM-sv.mjs

@@ -0,0 +1,18 @@
+const errorPlugin = (server) => {
+  const errorHandler = server.options.error;
+  if (!errorHandler) {
+    return {};
+  }
+  return {
+    fetch(_request, next) {
+      try {
+        const res = next();
+        return res instanceof Promise ? res.catch((error) => errorHandler(error)) : res;
+      } catch (error) {
+        return errorHandler(error);
+      }
+    }
+  };
+};
+
+export { errorPlugin as e };

package/dist/shared/srvx.Ctaz0clH.mjs

@@ -0,0 +1,172 @@
+import { readFileSync } from 'node:fs';
+
+function resolvePortAndHost(opts) {
+  const _port = opts.port ?? globalThis.process?.env.PORT ?? 3e3;
+  const port = typeof _port === "number" ? _port : Number.parseInt(_port, 10);
+  const hostname = opts.hostname ?? globalThis.process?.env.HOST;
+  return { port, hostname };
+}
+function fmtURL(host, port, secure) {
+  if (!host || !port) {
+    return void 0;
+  }
+  if (host.includes(":")) {
+    host = `[${host}]`;
+  }
+  return `http${secure ? "s" : ""}://${host}:${port}/`;
+}
+function printListening(opts, url) {
+  if (!url || (opts.silent ?? globalThis.process?.env?.TEST)) {
+    return;
+  }
+  const _url = new URL(url);
+  const allInterfaces = _url.hostname === "[::]" || _url.hostname === "0.0.0.0";
+  if (allInterfaces) {
+    _url.hostname = "localhost";
+    url = _url.href;
+  }
+  let listeningOn = `\u279C Listening on:`;
+  let additionalInfo = allInterfaces ? " (all interfaces)" : "";
+  if (globalThis.process.stdout?.isTTY) {
+    listeningOn = `\x1B[32m${listeningOn}\x1B[0m`;
+    url = `\x1B[36m${url}\x1B[0m`;
+    additionalInfo = `\x1B[2m${additionalInfo}\x1B[0m`;
+  }
+  console.log(`  ${listeningOn} ${url}${additionalInfo}`);
+}
+function resolveTLSOptions(opts) {
+  if (!opts.tls || opts.protocol === "http") {
+    return;
+  }
+  const cert = resolveCertOrKey(opts.tls.cert);
+  const key = resolveCertOrKey(opts.tls.key);
+  if (!cert && !key) {
+    if (opts.protocol === "https") {
+      throw new TypeError(
+        "TLS `cert` and `key` must be provided for `https` protocol."
+      );
+    }
+    return;
+  }
+  if (!cert || !key) {
+    throw new TypeError("TLS `cert` and `key` must be provided together.");
+  }
+  return {
+    cert,
+    key,
+    passphrase: opts.tls.passphrase
+  };
+}
+function resolveCertOrKey(value) {
+  if (!value) {
+    return;
+  }
+  if (typeof value !== "string") {
+    throw new TypeError(
+      "TLS certificate and key must be strings in PEM format or file paths."
+    );
+  }
+  if (value.startsWith("-----BEGIN ")) {
+    return value;
+  }
+  return readFileSync(value, "utf8");
+}
+
+const FastURL = /* @__PURE__ */ (() => {
+  const FastURL2 = class URL {
+    #originalURL;
+    #parsedURL;
+    constructor(url) {
+      this.#originalURL = url;
+    }
+    get _url() {
+      if (!this.#parsedURL) {
+        this.#parsedURL = new globalThis.URL(this.#originalURL);
+      }
+      return this.#parsedURL;
+    }
+    toString() {
+      return this._url.toString();
+    }
+    toJSON() {
+      return this.toString();
+    }
+    get pathname() {
+      if (this.#parsedURL) {
+        return this.#parsedURL.pathname;
+      }
+      if (!this._pathname) {
+        const url = this.#originalURL;
+        const protoIndex = url.indexOf("://");
+        if (protoIndex === -1) {
+          return this._url.pathname;
+        }
+        const pIndex = url.indexOf(
+          "/",
+          protoIndex + 4
+          /* :// */
+        );
+        if (pIndex === -1) {
+          return this._url.pathname;
+        }
+        const qIndex = this._urlqindex = url.indexOf("?", pIndex);
+        this._pathname = url.slice(pIndex, qIndex === -1 ? void 0 : qIndex);
+      }
+      return this._pathname;
+    }
+    set pathname(value) {
+      this._url.pathname = value;
+    }
+    get searchParams() {
+      if (this.#parsedURL) {
+        return this.#parsedURL.searchParams;
+      }
+      if (!this._query) {
+        this._query = new URLSearchParams(this.search);
+      }
+      return this._query;
+    }
+    get search() {
+      if (this.#parsedURL) {
+        return this.#parsedURL.search;
+      }
+      if (!this._search) {
+        const qIndex = this._urlqindex;
+        if (qIndex === -1) {
+          this._search = "";
+        } else {
+          this._search = qIndex === void 0 ? this._url.search : this.#originalURL.slice(this._urlqindex);
+        }
+      }
+      return this._search;
+    }
+    set search(value) {
+      this._url.search = value;
+    }
+  };
+  const slowProps = [
+    "hash",
+    "host",
+    "hostname",
+    "href",
+    "origin",
+    "password",
+    "port",
+    "protocol",
+    "username"
+  ];
+  for (const prop of slowProps) {
+    Object.defineProperty(FastURL2.prototype, prop, {
+      get() {
+        return this._url[prop];
+      },
+      set(value) {
+        this._url[prop] = value;
+      }
+    });
+  }
+  Object.setPrototypeOf(FastURL2, globalThis.URL);
+  return FastURL2;
+})();
+
+export { FastURL as F, resolvePortAndHost as a, fmtURL as f, printListening as p, resolveTLSOptions as r };

package/dist/shared/srvx.DEE2RO4O.d.mts

@@ -0,0 +1,5 @@
+declare const FastURL: {
+    new (url: string): URL;
+};
+
+export { FastURL as F };

package/dist/shared/srvx.zEohKxBQ.mjs

@@ -0,0 +1,20 @@
+function wrapFetch(server, basePlugins) {
+  const plugins = [
+    ...basePlugins || [],
+    ...server.options.plugins || []
+  ].map((plugin) => typeof plugin === "function" ? plugin(server) : plugin);
+  const middleware = plugins.filter((plugin) => plugin.fetch).map((plugin) => plugin.fetch);
+  const fetchHandler = server.options.fetch;
+  return middleware.length === 0 ? fetchHandler : (request) => callMiddleware(request, fetchHandler, middleware, 0);
+}
+function callMiddleware(request, fetchHandler, middleware, index) {
+  if (index === middleware.length) {
+    return fetchHandler(request);
+  }
+  return middleware[index](
+    request,
+    () => callMiddleware(request, fetchHandler, middleware, index + 1)
+  );
+}
+
+export { wrapFetch as w };

package/dist/types.d.mts

@@ -5,7 +5,14 @@ import * as Bun from 'bun';
 import * as CF from '@cloudflare/workers-types';
 
 type MaybePromise<T> = T | Promise<T>;
-declare const Response: typeof globalThis.Response;
+/**
+ * Faster URL constructor with lazy access to pathname and search params (For Node, Deno, and Bun).
+ */
+declare const FastURL: typeof globalThis.URL;
+/**
+ * Faster Response constructor optimized for Node.js (same as Response for other runtimes).
+ */
+declare const FastResponse: typeof globalThis.Response;
 /**
  * Create a new server instance.
  */
@@ -22,6 +29,16 @@ interface ServerOptions {
      * The fetch handler handles incoming requests.
      */
     fetch: ServerHandler;
+    /**
+     * Handle websocket upgrades.
+     */
+    upgrade?: ServerHandler;
+    /**
+     * Handle lifecycle errors.
+     *
+     * @note This handler will set built-in Bun and Deno error handler.
+     */
+    error?: ErrorHandler;
     /**
      * Server plugins.
      */
@@ -81,12 +98,6 @@ interface ServerOptions {
          */
         passphrase?: string;
     };
-    /**
-     * Runtime agnostic error handler (optional).
-     *
-     * @note This handler will take precedence over runtime specific error handlers.
-     */
-    onError?: ErrorHandler;
     /**
      * Node.js server options.
      */
@@ -169,21 +180,10 @@ interface Server<Handler = ServerHandler> {
     close(closeActiveConnections?: boolean): Promise<void>;
 }
 type ServerPlugin = (server: Server) => ServerPluginInstance;
+type ServerMiddleware = (request: ServerRequest, next: () => Response | Promise<Response>) => Response | Promise<Response>;
 interface ServerPluginInstance {
-    /**
-     * Plugin display name
-     */
     name?: string;
-    /**
-     * Hook to allow running logic before user fetch handler
-     * If an response value is returned, user fetch handler and the next plugins will be skipped.
-     */
-    request?: (request: ServerRequest) => MaybePromise<Response | void>;
-    /**
-     * Hook to allow running logic after user fetch handler
-     * If a response value is returned, user response and the next plugins will be skipped.
-     */
-    response?: (request: ServerRequest, response: Response) => MaybePromise<void | Response>;
+    fetch?: ServerMiddleware;
 }
 interface ServerRuntimeContext {
     name: "node" | "deno" | "bun" | "cloudflare" | (string & {});
@@ -231,5 +231,5 @@ type DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.Net
 type NodeHttpHandler = (nodeReq: NodeHttp.IncomingMessage, nodeRes: NodeHttp.ServerResponse) => void | Promise<void>;
 type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler;
 
-export { Response, serve };
-export type { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FetchHandler, NodeHttpHandler, Server, ServerHandler, ServerOptions, ServerPlugin, ServerPluginInstance, ServerRequest, ServerRuntimeContext };
+export { FastResponse, FastURL, serve };
+export type { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FetchHandler, NodeHttpHandler, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerPluginInstance, ServerRequest, ServerRuntimeContext };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "srvx",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
-  "repository": "h3js/srvx",
   "homepage": "https://srvx.h3.dev",
+  "repository": "h3js/srvx",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",
@@ -31,10 +31,14 @@
   ],
   "scripts": {
     "bench:node": "node test/bench-node/_run.mjs",
+    "bench:url:bun": "bun run ./test/url.bench.ts",
+    "bench:url:deno": "deno run -A ./test/url.bench.ts",
+    "bench:url:node": "pnpm node-ts --expose-gc --allow-natives-syntax ./test/url.bench.ts",
     "build": "unbuild",
     "dev": "vitest dev",
     "lint": "eslint . && prettier -c .",
     "lint:fix": "automd && eslint . --fix && prettier -w .",
+    "node-ts": "node --disable-warning=ExperimentalWarning --experimental-strip-types",
     "prepack": "pnpm build",
     "play:bun": "bun playground/app.mjs",
     "play:cf": "pnpx wrangler dev playground/app.mjs",
@@ -55,6 +59,7 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250423.0",
     "@hono/node-server": "^1.14.1",
+    "@mitata/counters": "^0.0.8",
     "@mjackson/node-fetch-server": "^0.6.1",
     "@types/bun": "^1.2.10",
     "@types/deno": "^2.2.0",
@@ -67,7 +72,7 @@
     "eslint-config-unjs": "^0.4.2",
     "execa": "^9.5.2",
     "get-port-please": "^3.1.2",
-    "jiti": "^2.4.2",
+    "mitata": "^1.0.34",
     "prettier": "^3.5.3",
     "typescript": "^5.8.3",
     "unbuild": "^3.5.0",

package/dist/shared/srvx.BD9sRkkl.mjs

@@ -1,16 +0,0 @@
-function wrapFetchOnError(fetchHandler, onError) {
-  if (!onError) return fetchHandler;
-  return (...params) => {
-    try {
-      const result = fetchHandler(...params);
-      if (result instanceof Promise) {
-        return result.catch(onError);
-      }
-      return result;
-    } catch (error) {
-      return onError(error);
-    }
-  };
-}
-
-export { wrapFetchOnError as w };

package/dist/shared/srvx.DhN4g5wJ.mjs

@@ -1,76 +0,0 @@
-function wrapFetch(server, fetchHandler) {
-  const plugins = server.options.plugins;
-  if (!plugins?.length) {
-    return fetchHandler;
-  }
-  const requestHooks = [];
-  const responseHooks = [];
-  for (const ctor of plugins) {
-    const plugin = typeof ctor === "function" ? ctor(server) : ctor;
-    if (plugin.request) {
-      requestHooks.push(plugin.request);
-    }
-    if (plugin.response) {
-      responseHooks.push(plugin.response);
-    }
-  }
-  const hasRequestHooks = requestHooks.length > 0;
-  const hasResponseHooks = responseHooks.length > 0;
-  if (!hasRequestHooks && !hasResponseHooks) {
-    return fetchHandler;
-  }
-  return (request) => {
-    let resValue;
-    let resPromise;
-    if (hasRequestHooks) {
-      for (const reqHook of requestHooks) {
-        if (resPromise) {
-          resPromise = resPromise.then((res) => res || reqHook(request));
-        } else {
-          const res = reqHook(request);
-          if (res) {
-            if (res instanceof Promise) {
-              resPromise = res;
-            } else {
-              return res;
-            }
-          }
-        }
-      }
-    }
-    if (resPromise) {
-      resPromise = resPromise.then((res) => res || fetchHandler(request));
-    } else {
-      const res = fetchHandler(request);
-      if (res instanceof Promise) {
-        resPromise = res;
-      } else {
-        resValue = res;
-      }
-    }
-    if (hasResponseHooks) {
-      for (const resHook of responseHooks) {
-        if (resPromise) {
-          resPromise = resPromise.then((res) => {
-            if (res) {
-              resValue = res;
-            }
-            return resHook(request, resValue);
-          });
-        } else {
-          const res = resHook(request, resValue);
-          if (res) {
-            if (res instanceof Promise) {
-              resPromise = res;
-            } else {
-              resValue = res;
-            }
-          }
-        }
-      }
-    }
-    return resPromise ? resPromise.then((res) => res || resValue) : resValue;
-  };
-}
-
-export { wrapFetch as w };

package/dist/shared/srvx.FQfHxe2J.mjs

@@ -1,75 +0,0 @@
-import { readFileSync } from 'node:fs';
-
-function resolvePortAndHost(opts) {
-  const _port = opts.port ?? globalThis.process?.env.PORT ?? 3e3;
-  const port = typeof _port === "number" ? _port : Number.parseInt(_port, 10);
-  const hostname = opts.hostname ?? globalThis.process?.env.HOST;
-  return { port, hostname };
-}
-function fmtURL(host, port, secure) {
-  if (!host || !port) {
-    return void 0;
-  }
-  if (host.includes(":")) {
-    host = `[${host}]`;
-  }
-  return `http${secure ? "s" : ""}://${host}:${port}/`;
-}
-function printListening(opts, url) {
-  if (!url || (opts.silent ?? globalThis.process?.env?.TEST)) {
-    return;
-  }
-  const _url = new URL(url);
-  const allInterfaces = _url.hostname === "[::]" || _url.hostname === "0.0.0.0";
-  if (allInterfaces) {
-    _url.hostname = "localhost";
-    url = _url.href;
-  }
-  let listeningOn = `\u279C Listening on:`;
-  let additionalInfo = allInterfaces ? " (all interfaces)" : "";
-  if (globalThis.process.stdout?.isTTY) {
-    listeningOn = `\x1B[32m${listeningOn}\x1B[0m`;
-    url = `\x1B[36m${url}\x1B[0m`;
-    additionalInfo = `\x1B[2m${additionalInfo}\x1B[0m`;
-  }
-  console.log(`  ${listeningOn} ${url}${additionalInfo}`);
-}
-function resolveTLSOptions(opts) {
-  if (!opts.tls || opts.protocol === "http") {
-    return;
-  }
-  const cert = resolveCertOrKey(opts.tls.cert);
-  const key = resolveCertOrKey(opts.tls.key);
-  if (!cert && !key) {
-    if (opts.protocol === "https") {
-      throw new TypeError(
-        "TLS `cert` and `key` must be provided for `https` protocol."
-      );
-    }
-    return;
-  }
-  if (!cert || !key) {
-    throw new TypeError("TLS `cert` and `key` must be provided together.");
-  }
-  return {
-    cert,
-    key,
-    passphrase: opts.tls.passphrase
-  };
-}
-function resolveCertOrKey(value) {
-  if (!value) {
-    return;
-  }
-  if (typeof value !== "string") {
-    throw new TypeError(
-      "TLS certificate and key must be strings in PEM format or file paths."
-    );
-  }
-  if (value.startsWith("-----BEGIN ")) {
-    return value;
-  }
-  return readFileSync(value, "utf8");
-}
-
-export { resolvePortAndHost as a, fmtURL as f, printListening as p, resolveTLSOptions as r };