srvx 0.6.0 → 0.7.0

package/dist/{adapters/service-worker.d.mts → service-worker.d.mts}

@@ -1,14 +1,10 @@
-import { ServerRequest, ServerOptions, Server } from '../types.mjs';
-import 'node:http';
-import 'node:https';
-import 'node:net';
-import 'bun';
-import '@cloudflare/workers-types';
+import { Server, ServerOptions, ServerRequest } from "./types.mjs";
 
+//#region src/adapters/service-worker.d.ts
 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 { FastResponse, FastURL, serve };
-export type { ServiceWorkerHandler };
+//#endregion
+export { FastResponse, FastURL, ServiceWorkerHandler, serve };

package/dist/service-worker.mjs

@@ -0,0 +1,80 @@
+import { wrapFetch } from "./_middleware.mjs";
+import { errorPlugin } from "./_plugins.mjs";
+
+//#region src/adapters/service-worker.ts
+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) {
+	return new ServiceWorkerServer(options);
+}
+var ServiceWorkerServer = class {
+	runtime = "service-worker";
+	options;
+	fetch;
+	#fetchListener;
+	#listeningPromise;
+	constructor(options) {
+		this.options = {
+			...options,
+			middleware: [...options.middleware || []]
+		};
+		for (const plugin of options.plugins || []) plugin(this);
+		errorPlugin(this);
+		const fetchHandler = wrapFetch(this);
+		this.fetch = (request, event) => {
+			Object.defineProperties(request, { runtime: {
+				enumerable: true,
+				value: {
+					runtime: "service-worker",
+					serviceWorker: { event }
+				}
+			} });
+			return Promise.resolve(fetchHandler(request));
+		};
+		if (!options.manual) this.serve();
+	}
+	serve() {
+		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("Service worker URL is not provided. Please set the `serviceWorker.url` serve option or manually register.");
+			this.#listeningPromise = navigator.serviceWorker.register(swURL, {
+				type: "module",
+				scope: this.options.serviceWorker?.scope
+			}).then((registration) => {
+				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?.();
+			});
+		}
+	}
+	ready() {
+		return Promise.resolve(this.#listeningPromise).then(() => this);
+	}
+	async close() {
+		if (this.#fetchListener) removeEventListener("fetch", this.#fetchListener);
+		if (isBrowserWindow) {
+			const registrations = await navigator.serviceWorker.getRegistrations();
+			for (const registration of registrations) if (registration.active) await registration.unregister();
+		} else if (isServiceWorker) await self.registration.unregister();
+	}
+};
+
+//#endregion
+export { FastResponse, FastURL, serve };

package/dist/types.d.mts

@@ -1,235 +1,228 @@
-import * as NodeHttp from 'node:http';
-import * as NodeHttps from 'node:https';
-import * as NodeNet from 'node:net';
-import * as Bun from 'bun';
-import * as CF from '@cloudflare/workers-types';
+import * as NodeHttp$1 from "node:http";
+import * as NodeHttps from "node:https";
+import * as NodeHttp2 from "node:http2";
+import * as NodeNet from "node:net";
+import * as Bun from "bun";
+import * as CF from "@cloudflare/workers-types";
 
+//#region src/types.d.ts
 type MaybePromise<T> = T | Promise<T>;
 /**
- * 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.
- */
-declare function serve(options: ServerOptions): Server;
+* Faster URL constructor with lazy access to pathname and search params (For Node, Deno, and Bun).
+*/
+
 /**
- * Web fetch compatible request handler
- */
+* Web fetch compatible request handler
+*/
 type ServerHandler = (request: ServerRequest) => MaybePromise<Response>;
+type ServerMiddleware = (request: ServerRequest, next: () => Response | Promise<Response>) => Response | Promise<Response>;
+type ServerPlugin = (server: Server) => void;
 /**
- * Server options
- */
+* Server options
+*/
 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.
-     */
-    plugins?: (ServerPlugin | ServerPluginInstance)[];
-    /**
-     * If set to `true`, server will not start listening automatically.
-     */
-    manual?: boolean;
-    /**
-     * The port server should be listening to.
-     *
-     * Default is read from `PORT` environment variable or will be `3000`.
-     *
-     * **Tip:** You can set the port to `0` to use a random port.
-     */
-    port?: string | number;
-    /**
-     * The hostname (IP or resolvable host) server listener should bound to.
-     *
-     * When not provided, server with listen to all network interfaces by default.
-     *
-     * **Important:** If you are running a server that is not expected to be exposed to the network, use `hostname: "localhost"`.
-     */
-    hostname?: string;
-    /**
-     * Enabling this option allows multiple processes to bind to the same port, which is useful for load balancing.
-     *
-     * **Note:** Despite Node.js built-in behavior that has `exclusive` flag (opposite of `reusePort`) enabled by default, srvx uses non-exclusive mode for consistency.
-     */
-    reusePort?: boolean;
-    /**
-     * The protocol to use for the server.
-     *
-     * Possible values are `http` and `https`.
-     *
-     * If `protocol` is not set, Server will use `http` as the default protocol or `https` if both `tls.cert` and `tls.key` options are provided.
-     */
-    protocol?: "http" | "https";
-    /**
-     * If set to `true`, server will not print the listening address.
-     */
-    silent?: boolean;
-    /**
-     * TLS server options.
-     */
-    tls?: {
-        /**
-         * File path or inlined TLS certificate in PEM format (required).
-         */
-        cert?: string;
-        /**
-         * File path or inlined TLS private key in PEM format (required).
-         */
-        key?: string;
-        /**
-         * Passphrase for the private key (optional).
-         */
-        passphrase?: string;
-    };
-    /**
-     * Node.js server options.
-     */
-    node?: (NodeHttp.ServerOptions | NodeHttps.ServerOptions) & NodeNet.ListenOptions;
-    /**
-     * Bun server options
-     *
-     * @docs https://bun.sh/docs/api/http
-     */
-    bun?: Omit<Bun.ServeOptions | Bun.TLSServeOptions, "fetch">;
-    /**
-     * Deno server options
-     *
-     * @docs https://docs.deno.com/api/deno/~/Deno.serve
-     */
-    deno?: Deno.ServeOptions;
-    /**
-     * Service worker options
-     */
-    serviceWorker?: {
-        /**
-         * The path to the service worker file to be registered.
-         */
-        url?: string;
-        /**
-         * The scope of the service worker.
-         *
-         */
-        scope?: string;
-    };
+  /**
+  * The fetch handler handles incoming requests.
+  */
+  fetch: ServerHandler;
+  /**
+  * Handle lifecycle errors.
+  *
+  * @note This handler will set built-in Bun and Deno error handler.
+  */
+  error?: ErrorHandler;
+  /**
+  * Server middleware handlers to run before the main fetch handler.
+  */
+  middleware?: ServerMiddleware[];
+  /**
+  * Server plugins.
+  */
+  plugins?: ServerPlugin[];
+  /**
+  * If set to `true`, server will not start listening automatically.
+  */
+  manual?: boolean;
+  /**
+  * The port server should be listening to.
+  *
+  * Default is read from `PORT` environment variable or will be `3000`.
+  *
+  * **Tip:** You can set the port to `0` to use a random port.
+  */
+  port?: string | number;
+  /**
+  * The hostname (IP or resolvable host) server listener should bound to.
+  *
+  * When not provided, server with listen to all network interfaces by default.
+  *
+  * **Important:** If you are running a server that is not expected to be exposed to the network, use `hostname: "localhost"`.
+  */
+  hostname?: string;
+  /**
+  * Enabling this option allows multiple processes to bind to the same port, which is useful for load balancing.
+  *
+  * **Note:** Despite Node.js built-in behavior that has `exclusive` flag (opposite of `reusePort`) enabled by default, srvx uses non-exclusive mode for consistency.
+  */
+  reusePort?: boolean;
+  /**
+  * The protocol to use for the server.
+  *
+  * Possible values are `http` and `https`.
+  *
+  * If `protocol` is not set, Server will use `http` as the default protocol or `https` if both `tls.cert` and `tls.key` options are provided.
+  */
+  protocol?: "http" | "https";
+  /**
+  * If set to `true`, server will not print the listening address.
+  */
+  silent?: boolean;
+  /**
+  * TLS server options.
+  */
+  tls?: {
+    /**
+    * File path or inlined TLS certificate in PEM format (required).
+    */
+    cert?: string;
+    /**
+    * File path or inlined TLS private key in PEM format (required).
+    */
+    key?: string;
+    /**
+    * Passphrase for the private key (optional).
+    */
+    passphrase?: string;
+  };
+  /**
+  * Node.js server options.
+  */
+  node?: (NodeHttp$1.ServerOptions | NodeHttps.ServerOptions | NodeHttp2.ServerOptions) & NodeNet.ListenOptions & {
+    http2?: boolean;
+  };
+  /**
+  * Bun server options
+  *
+  * @docs https://bun.sh/docs/api/http
+  */
+  bun?: Omit<Bun.ServeOptions | Bun.TLSServeOptions, "fetch">;
+  /**
+  * Deno server options
+  *
+  * @docs https://docs.deno.com/api/deno/~/Deno.serve
+  */
+  deno?: Deno.ServeOptions;
+  /**
+  * Service worker options
+  */
+  serviceWorker?: {
+    /**
+    * The path to the service worker file to be registered.
+    */
+    url?: string;
+    /**
+    * The scope of the service worker.
+    *
+    */
+    scope?: string;
+  };
 }
 interface Server<Handler = ServerHandler> {
-    /**
-     * Current runtime name
-     */
-    readonly runtime: "node" | "deno" | "bun" | "cloudflare" | "service-worker" | "generic";
-    /**
-     * Server options
-     */
-    readonly options: ServerOptions;
-    /**
-     * Server URL address.
-     */
-    readonly url?: string;
-    /**
-     * Node.js context.
-     */
-    readonly node?: {
-        server?: NodeHttp.Server;
-        handler: (nodeReq: NodeHttp.IncomingMessage, nodeRes: NodeHttp.ServerResponse) => void | Promise<void>;
-    };
-    /**
-     * Bun context.
-     */
-    readonly bun?: {
-        server?: Bun.Server;
-    };
-    /**
-     * Deno context.
-     */
-    readonly deno?: {
-        server?: Deno.HttpServer;
-    };
-    /**
-     * Server fetch handler
-     */
-    readonly fetch: Handler;
-    /**
-     * Returns a promise that resolves when the server is ready.
-     */
-    ready(): Promise<Server<Handler>>;
-    /**
-     * Stop listening to prevent new connections from being accepted.
-     *
-     * By default, it does not cancel in-flight requests or websockets. That means it may take some time before all network activity stops.
-     *
-     * @param closeActiveConnections Immediately terminate in-flight requests, websockets, and stop accepting new connections.
-     * @default false
-     */
-    close(closeActiveConnections?: boolean): Promise<void>;
-}
-type ServerPlugin = (server: Server) => ServerPluginInstance;
-type ServerMiddleware = (request: ServerRequest, next: () => Response | Promise<Response>) => Response | Promise<Response>;
-interface ServerPluginInstance {
-    name?: string;
-    fetch?: ServerMiddleware;
+  /**
+  * Current runtime name
+  */
+  readonly runtime: "node" | "deno" | "bun" | "cloudflare" | "service-worker" | "generic";
+  /**
+  * Server options
+  */
+  readonly options: ServerOptions & {
+    middleware: ServerMiddleware[];
+  };
+  /**
+  * Server URL address.
+  */
+  readonly url?: string;
+  /**
+  * Node.js context.
+  */
+  readonly node?: {
+    server?: NodeHttp$1.Server | NodeHttp2.Http2Server;
+    handler: (req: NodeServerRequest, res: NodeServerResponse) => void | Promise<void>;
+  };
+  /**
+  * Bun context.
+  */
+  readonly bun?: {
+    server?: Bun.Server;
+  };
+  /**
+  * Deno context.
+  */
+  readonly deno?: {
+    server?: Deno.HttpServer;
+  };
+  /**
+  * Server fetch handler
+  */
+  readonly fetch: Handler;
+  /**
+  * Returns a promise that resolves when the server is ready.
+  */
+  ready(): Promise<Server<Handler>>;
+  /**
+  * Stop listening to prevent new connections from being accepted.
+  *
+  * By default, it does not cancel in-flight requests or websockets. That means it may take some time before all network activity stops.
+  *
+  * @param closeActiveConnections Immediately terminate in-flight requests, websockets, and stop accepting new connections.
+  * @default false
+  */
+  close(closeActiveConnections?: boolean): Promise<void>;
 }
 interface ServerRuntimeContext {
-    name: "node" | "deno" | "bun" | "cloudflare" | (string & {});
-    /**
-     * Underlying Node.js server request info.
-     */
-    node?: {
-        req: NodeHttp.IncomingMessage;
-        res?: NodeHttp.ServerResponse;
-    };
-    /**
-     * Underlying Deno server request info.
-     */
-    deno?: {
-        info: Deno.ServeHandlerInfo<Deno.NetAddr>;
-    };
-    /**
-     * Underlying Bun server request context.
-     */
-    bun?: {
-        server: Bun.Server;
-    };
-    /**
-     * Underlying Cloudflare request context.
-     */
-    cloudflare?: {
-        env: unknown;
-        context: CF.ExecutionContext;
-    };
+  name: "node" | "deno" | "bun" | "cloudflare" | (string & {});
+  /**
+  * Underlying Node.js server request info.
+  */
+  node?: {
+    req: NodeServerRequest;
+    res?: NodeServerResponse;
+  };
+  /**
+  * Underlying Deno server request info.
+  */
+  deno?: {
+    info: Deno.ServeHandlerInfo<Deno.NetAddr>;
+  };
+  /**
+  * Underlying Bun server request context.
+  */
+  bun?: {
+    server: Bun.Server;
+  };
+  /**
+  * Underlying Cloudflare request context.
+  */
+  cloudflare?: {
+    env: unknown;
+    context: CF.ExecutionContext;
+  };
 }
 interface ServerRequest extends Request {
-    /**
-     * Runtime specific request context.
-     */
-    runtime?: ServerRuntimeContext;
-    /**
-     * IP address of the client.
-     */
-    ip?: string | undefined;
+  /**
+  * Runtime specific request context.
+  */
+  runtime?: ServerRuntimeContext;
+  /**
+  * IP address of the client.
+  */
+  ip?: string | undefined;
 }
 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 DenoFetchHandler = (request: Request, info?: Deno.ServeHandlerInfo<Deno.NetAddr>) => Response | Promise<Response>;
-type NodeHttpHandler = (nodeReq: NodeHttp.IncomingMessage, nodeRes: NodeHttp.ServerResponse) => void | Promise<void>;
-type CloudflareFetchHandler = CF.ExportedHandlerFetchHandler;
-
-export { FastResponse, FastURL, serve };
-export type { BunFetchHandler, CloudflareFetchHandler, DenoFetchHandler, ErrorHandler, FetchHandler, NodeHttpHandler, Server, ServerHandler, ServerMiddleware, ServerOptions, ServerPlugin, ServerPluginInstance, ServerRequest, ServerRuntimeContext };
+type NodeServerRequest = NodeHttp$1.IncomingMessage | NodeHttp2.Http2ServerRequest;
+type NodeServerResponse = NodeHttp$1.ServerResponse | NodeHttp2.Http2ServerResponse;
+type NodeHttpHandler = (req: NodeServerRequest, res: NodeServerResponse) => void | Promise<void>; //#endregion
+export { BunFetchHandler, DenoFetchHandler, FetchHandler, NodeHttpHandler, NodeServerRequest, NodeServerResponse, Server, ServerOptions, ServerRequest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "homepage": "https://srvx.h3.dev",
   "repository": "h3js/srvx",
@@ -9,20 +9,20 @@
   "type": "module",
   "exports": {
     "./types": "./dist/types.d.mts",
-    "./deno": "./dist/adapters/deno.mjs",
-    "./bun": "./dist/adapters/bun.mjs",
-    "./node": "./dist/adapters/node.mjs",
-    "./cloudflare": "./dist/adapters/cloudflare.mjs",
-    "./generic": "./dist/adapters/generic.mjs",
-    "./service-worker": "./dist/adapters/service-worker.mjs",
+    "./deno": "./dist/deno.mjs",
+    "./bun": "./dist/bun.mjs",
+    "./node": "./dist/node.mjs",
+    "./cloudflare": "./dist/cloudflare.mjs",
+    "./generic": "./dist/generic.mjs",
+    "./service-worker": "./dist/service-worker.mjs",
     ".": {
       "types": "./dist/types.d.mts",
-      "deno": "./dist/adapters/deno.mjs",
-      "bun": "./dist/adapters/bun.mjs",
-      "workerd": "./dist/adapters/cloudflare.mjs",
-      "browser": "./dist/adapters/service-worker.mjs",
-      "node": "./dist/adapters/node.mjs",
-      "default": "./dist/adapters/generic.mjs"
+      "deno": "./dist/deno.mjs",
+      "bun": "./dist/bun.mjs",
+      "workerd": "./dist/cloudflare.mjs",
+      "browser": "./dist/service-worker.mjs",
+      "node": "./dist/node.mjs",
+      "default": "./dist/generic.mjs"
     }
   },
   "types": "./dist/types.d.mts",
@@ -34,7 +34,7 @@
     "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",
+    "build": "obuild",
     "dev": "vitest dev",
     "lint": "eslint . && prettier -c .",
     "lint:fix": "automd && eslint . --fix && prettier -w .",
@@ -57,29 +57,32 @@
     "cookie-es": "^2.0.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250423.0",
+    "@cloudflare/workers-types": "^4.20250513.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",
+    "@types/bun": "^1.2.13",
+    "@types/deno": "^2.3.0",
+    "@types/node": "^22.15.17",
+    "@types/node-forge": "^1.3.11",
+    "@types/serviceworker": "^0.0.134",
+    "@vitest/coverage-v8": "^3.1.3",
     "automd": "^0.4.0",
     "changelogen": "^0.6.1",
-    "eslint": "^9.25.1",
+    "eslint": "^9.26.0",
     "eslint-config-unjs": "^0.4.2",
-    "execa": "^9.5.2",
+    "execa": "^9.5.3",
     "get-port-please": "^3.1.2",
     "mitata": "^1.0.34",
+    "node-forge": "^1.3.1",
+    "obuild": "^0.0.6",
     "prettier": "^3.5.3",
     "typescript": "^5.8.3",
-    "unbuild": "^3.5.0",
-    "vitest": "^3.1.2"
+    "undici": "^7.9.0",
+    "vitest": "^3.1.3"
   },
-  "packageManager": "pnpm@10.9.0",
+  "packageManager": "pnpm@10.11.0",
   "engines": {
-    "node": ">=20.11.1"
+    "node": ">=20.16.0"
   }
 }