srvx 0.5.0 → 0.5.2

package/dist/adapters/bun.d.mts

@@ -1,5 +1,6 @@
 import { ServerOptions, Server, BunFetchHandler } from '../types.mjs';
 import * as Bun from 'bun';
+export { F as URL } from '../shared/srvx.DEE2RO4O.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:net';

package/dist/adapters/bun.mjs

@@ -1,4 +1,5 @@
-import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.FQfHxe2J.mjs';
+import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.Ctaz0clH.mjs';
+export { F as URL } from '../shared/srvx.Ctaz0clH.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 import 'node:fs';
 

package/dist/adapters/cloudflare.d.mts

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

package/dist/adapters/cloudflare.mjs

@@ -1,6 +1,7 @@
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
 
+const URL = globalThis.URL;
 const Response = globalThis.Response;
 function serve(options) {
   return new CloudflareServer(options);
@@ -49,4 +50,4 @@ class CloudflareServer {
   }
 }
 
-export { Response, serve };
+export { Response, URL, serve };

package/dist/adapters/deno.d.mts

@@ -1,4 +1,5 @@
 import { ServerOptions, Server, DenoFetchHandler } from '../types.mjs';
+export { F as URL } from '../shared/srvx.DEE2RO4O.mjs';
 import 'node:http';
 import 'node:https';
 import 'node:net';

package/dist/adapters/deno.mjs

@@ -1,4 +1,5 @@
-import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.FQfHxe2J.mjs';
+import { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.Ctaz0clH.mjs';
+export { F as URL } from '../shared/srvx.Ctaz0clH.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 import 'node:fs';
 

package/dist/adapters/generic.d.mts

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

package/dist/adapters/generic.mjs

@@ -1,6 +1,7 @@
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
 
+const URL = globalThis.URL;
 const Response = globalThis.Response;
 function serve(options) {
   return new GenericServer(options);
@@ -27,4 +28,4 @@ class GenericServer {
   }
 }
 
-export { Response, serve };
+export { Response, URL, serve };

package/dist/adapters/node.d.mts

@@ -1,4 +1,5 @@
 import { ServerRequest, ServerOptions, Server, FetchHandler, NodeHttpHandler } from '../types.mjs';
+export { F as URL } from '../shared/srvx.DEE2RO4O.mjs';
 import NodeHttp__default from 'node:http';
 import { Readable } from 'node:stream';
 import 'node:https';

package/dist/adapters/node.mjs

@@ -1,7 +1,8 @@
 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 { r as resolveTLSOptions, a as resolvePortAndHost, p as printListening, f as fmtURL } from '../shared/srvx.Ctaz0clH.mjs';
+export { F as URL } from '../shared/srvx.Ctaz0clH.mjs';
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
 import 'node:fs';

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

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

package/dist/adapters/service-worker.mjs

@@ -1,8 +1,10 @@
 import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
 
+const URL = globalThis.URL;
 const Response = globalThis.Response;
-const isMainThread = () => typeof navigator !== "undefined" && "serviceWorker" in navigator;
+const isBrowserWindow = typeof window !== "undefined" && typeof navigator !== "undefined";
+const isServiceWorker = typeof self !== "undefined" && "skipWaiting" in self;
 function serve(options) {
   return new ServiceWorkerServer(options);
 }
@@ -30,7 +32,12 @@ class ServiceWorkerServer {
   #fetchListener;
   #listeningPromise;
   serve() {
-    if (isMainThread()) {
+    if (isBrowserWindow) {
+      if (!navigator.serviceWorker) {
+        throw new Error(
+          "Service worker is not supported in the current window."
+        );
+      }
       const swURL = this.options.serviceWorker?.url;
       if (!swURL) {
         throw new Error(
@@ -41,28 +48,32 @@ class ServiceWorkerServer {
         type: "module",
         scope: this.options.serviceWorker?.scope
       }).then((registration) => {
-        registration.addEventListener("updatefound", () => {
+        if (registration.active) {
           location.replace(location.href);
-        });
+        } else {
+          registration.addEventListener("updatefound", () => {
+            location.replace(location.href);
+          });
+        }
+      });
+    } else if (isServiceWorker) {
+      this.#fetchListener = async (event) => {
+        if (/\/[^/]*\.[a-zA-Z0-9]+$/.test(new URL(event.request.url).pathname)) {
+          return;
+        }
+        const response = await this.fetch(event.request, event);
+        if (response.status !== 404) {
+          event.respondWith(response);
+        }
+      };
+      addEventListener("fetch", this.#fetchListener);
+      self.addEventListener("install", () => {
+        self.skipWaiting();
+      });
+      self.addEventListener("activate", () => {
+        self.clients?.claim?.();
       });
-      return;
     }
-    this.#fetchListener = async (event) => {
-      if (/\/[^/]*\.[a-zA-Z0-9]+$/.test(new URL(event.request.url).pathname)) {
-        return;
-      }
-      const response = await this.fetch(event.request, event);
-      if (response.status !== 404) {
-        event.respondWith(response);
-      }
-    };
-    addEventListener("fetch", this.#fetchListener);
-    globalThis.addEventListener("install", () => {
-      globalThis.skipWaiting();
-    });
-    globalThis.addEventListener("activate", (event) => {
-      event.waitUntil(globalThis.clients?.claim?.());
-    });
   }
   ready() {
     return Promise.resolve(this.#listeningPromise).then(() => this);
@@ -71,17 +82,17 @@ class ServiceWorkerServer {
     if (this.#fetchListener) {
       removeEventListener("fetch", this.#fetchListener);
     }
-    if (isMainThread()) {
+    if (isBrowserWindow) {
       const registrations = await navigator.serviceWorker.getRegistrations();
       for (const registration of registrations) {
         if (registration.active) {
           await registration.unregister();
         }
       }
-    } else {
-      await globalThis.registration.unregister();
+    } else if (isServiceWorker) {
+      await self.registration.unregister();
     }
   }
 }
 
-export { Response, serve };
+export { Response, URL, serve };

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/types.d.mts

@@ -6,6 +6,7 @@ import * as CF from '@cloudflare/workers-types';
 
 type MaybePromise<T> = T | Promise<T>;
 declare const Response: typeof globalThis.Response;
+declare const URL: typeof globalThis.URL;
 /**
  * Create a new server instance.
  */
@@ -231,5 +232,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 { Response, URL, serve };
 export type { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FetchHandler, NodeHttpHandler, Server, ServerHandler, ServerOptions, ServerPlugin, ServerPluginInstance, ServerRequest, ServerRuntimeContext };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "srvx",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "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,10 +59,12 @@
   "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",
     "@types/node": "^22.14.1",
+    "@types/serviceworker": "^0.0.132",
     "@vitest/coverage-v8": "^3.1.2",
     "automd": "^0.4.0",
     "changelogen": "^0.6.1",
@@ -66,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.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 };