routup 5.0.0-beta.2 → 5.0.0-beta.3

package/dist/{src-CNoRH9eg.mjs → src-Tr9cHQaV.mjs}

@@ -1,12 +1,12 @@
+import { FastURL } from "srvx";
 import { HTTPError, isHTTPError } from "@ebec/http";
 import { Buffer } from "node:buffer";
 import { subtle } from "uncrypto";
-import { distinctArray, hasOwnProperty, merge } from "smob";
+import { distinctArray, merge } from "smob";
 import { compile } from "proxy-addr";
 import { get, getType } from "mime-explorer";
-import { FastURL } from "srvx";
-import { pathToRegexp } from "path-to-regexp";
 import Negotiator from "negotiator";
+import { pathToRegexp } from "path-to-regexp";
 //#region src/constants.ts
 let MethodName = /* @__PURE__ */ function(MethodName) {
 	MethodName["GET"] = "GET";
@@ -53,6 +53,89 @@ let HeaderName = /* @__PURE__ */ function(HeaderName) {
 	return HeaderName;
 }({});
 //#endregion
+//#region src/response/helpers/cache.ts
+function setResponseCacheHeaders(event, options) {
+	options = options || {};
+	const cacheControls = ["public"].concat(options.cacheControls || []);
+	if (options.maxAge !== void 0) cacheControls.push(`max-age=${+options.maxAge}`, `s-maxage=${+options.maxAge}`);
+	if (options.modifiedTime) {
+		const modifiedTime = typeof options.modifiedTime === "string" ? new Date(options.modifiedTime) : options.modifiedTime;
+		event.response.headers.set("last-modified", modifiedTime.toUTCString());
+	}
+	event.response.headers.set("cache-control", cacheControls.join(", "));
+}
+//#endregion
+//#region src/error/module.ts
+var RoutupError = class extends HTTPError {
+	constructor(input = {}) {
+		super(input);
+		this.name = "RoutupError";
+	}
+};
+//#endregion
+//#region src/response/helpers/event-stream/utils.ts
+function stripNewlines(value) {
+	return value.replace(/[\r\n]/g, "");
+}
+function serializeEventStreamMessage(message) {
+	let result = "";
+	if (message.id) result += `id: ${stripNewlines(message.id)}\n`;
+	if (message.event) result += `event: ${stripNewlines(message.event)}\n`;
+	if (typeof message.retry === "number" && Number.isInteger(message.retry)) result += `retry: ${message.retry}\n`;
+	const lines = message.data.replace(/\r/g, "").split("\n");
+	for (const line of lines) result += `data: ${line}\n`;
+	result += "\n";
+	return result;
+}
+//#endregion
+//#region src/response/helpers/event-stream/module.ts
+function createEventStream(event, options) {
+	if (options?.maxMessageSize !== void 0) {
+		if (!Number.isInteger(options.maxMessageSize) || options.maxMessageSize < 0) throw new RoutupError("maxMessageSize must be a non-negative integer.");
+	}
+	let controller;
+	let closed = false;
+	const encoder = new TextEncoder();
+	const stream = new ReadableStream({
+		start(ctrl) {
+			controller = ctrl;
+		},
+		cancel() {
+			closed = true;
+		}
+	});
+	const headers = new Headers(event.response.headers);
+	headers.set(HeaderName.CONTENT_TYPE, "text/event-stream");
+	headers.set(HeaderName.CACHE_CONTROL, "private, no-cache, no-store, no-transform, must-revalidate, max-age=0");
+	headers.set(HeaderName.X_ACCEL_BUFFERING, "no");
+	headers.set(HeaderName.CONNECTION, "keep-alive");
+	const handle = {
+		write(message) {
+			if (closed) return;
+			if (typeof message === "string") {
+				handle.write({ data: message });
+				return;
+			}
+			const serialized = serializeEventStreamMessage(message);
+			if (options?.maxMessageSize !== void 0) {
+				if (encoder.encode(serialized).byteLength > options.maxMessageSize) return;
+			}
+			controller.enqueue(encoder.encode(serialized));
+		},
+		end() {
+			if (closed) return;
+			closed = true;
+			controller.close();
+		},
+		response: new Response(stream, {
+			status: event.response.status,
+			statusText: event.response.statusText,
+			headers
+		})
+	};
+	return handle;
+}
+//#endregion
 //#region src/utils/header.ts
 function sanitizeHeaderValue(value) {
 	return value.replace(/[\r\n]/g, "");
@@ -193,432 +276,77 @@ function cleanDoubleSlashes(input = "") {
 	return input.replace(/\/+/g, "/");
 }
 //#endregion
-//#region src/error/is.ts
-function isError(input) {
-	if (!isHTTPError(input)) return false;
-	return input.name === "RoutupError";
+//#region src/response/helpers/header.ts
+function appendResponseHeader(event, name, value) {
+	const { headers } = event.response;
+	if (Array.isArray(value)) for (const v of value) headers.append(name, sanitizeHeaderValue(v));
+	else headers.append(name, sanitizeHeaderValue(value));
+}
+function appendResponseHeaderDirective(event, name, value) {
+	const { headers } = event.response;
+	const existing = headers.get(name);
+	if (!existing) {
+		if (Array.isArray(value)) headers.set(name, sanitizeHeaderValue(value.join("; ")));
+		else headers.set(name, sanitizeHeaderValue(value));
+		return;
+	}
+	const directives = existing.split("; ");
+	if (Array.isArray(value)) directives.push(...value);
+	else directives.push(value);
+	const unique = [...new Set(directives)];
+	headers.set(name, sanitizeHeaderValue(unique.join("; ")));
 }
 //#endregion
-//#region src/error/module.ts
-var RoutupError = class extends HTTPError {
-	constructor(input = {}) {
-		super(input);
-		this.name = "RoutupError";
+//#region src/response/helpers/utils.ts
+function setResponseContentTypeByFileName(event, fileName) {
+	const ext = extname(fileName);
+	if (ext) {
+		let type = getMimeType(ext.substring(1));
+		if (type) {
+			const charset = getCharsetForMimeType(type);
+			if (charset) type += `; charset=${charset}`;
+			event.response.headers.set(HeaderName.CONTENT_TYPE, type);
+		}
 	}
-};
+}
 //#endregion
-//#region src/error/create.ts
-function isNativeError(input) {
-	return isObject(input) && typeof input.message === "string" && typeof input.name === "string";
+//#region src/response/helpers/header-attachment.ts
+function sanitizeFilename(filename) {
+	return filename.replace(/[\r\n]/g, "");
 }
-/**
-* Create an internal error object by
-* - an existing RoutupError (returned as-is)
-* - an HTTPError (wrapped into a RoutupError preserving status)
-* - an Error (wrapped preserving message and cause)
-* - an options object (statusCode, statusMessage, etc.)
-* - a message string
-*
-* @param input
-*/
-function createError(input) {
-	if (isError(input)) return input;
-	if (typeof input === "string") return new RoutupError(input);
-	if (isHTTPError(input)) return new RoutupError({
-		message: input.message,
-		code: input.code,
-		statusCode: input.statusCode,
-		statusMessage: input.statusMessage,
-		redirectURL: input.redirectURL,
-		cause: input
-	});
-	if (isNativeError(input)) return new RoutupError({
-		message: input.message,
-		cause: input
-	});
-	if (!isObject(input)) return new RoutupError();
-	const options = { ...input };
-	if (options.cause === void 0) options.cause = input;
-	return new RoutupError(options);
+function toAsciiFilename(filename) {
+	return filename.replace(/[^\x20-\x7E]/g, "").replace(/"/g, "\\\"");
 }
-//#endregion
-//#region src/event/module.ts
-var RoutupEvent = class {
-	request;
-	params;
-	path;
-	method;
-	mountPath;
-	error;
-	routerPath;
-	/**
-	* Collected allowed methods (for OPTIONS).
-	*/
-	methodsAllowed;
-	store;
-	_dispatched;
-	_response;
-	/**
-	* Cached parsed URL (avoids double-parsing).
-	*/
-	_url;
-	_searchParams;
-	/**
-	* Continuation function for middleware onion model.
-	*/
-	_next;
-	/**
-	* Whether _next has already been called (guard against double-invocation).
-	*/
-	_nextCalled;
-	/**
-	* The cached result of the next handler.
-	*/
-	_nextResult;
-	constructor(request) {
-		this.request = request;
-		this._url = new FastURL(request.url);
-		this.method = request.method;
-		this.path = this._url.pathname;
-		this.mountPath = "/";
-		this.params = {};
-		this.routerPath = [];
-		this.methodsAllowed = [];
-		this.store = Object.create(null);
-		this._dispatched = false;
-		this._nextCalled = false;
-	}
-	get headers() {
-		return this.request.headers;
-	}
-	get searchParams() {
-		if (!this._searchParams) this._searchParams = new URLSearchParams(this._url.search);
-		return this._searchParams;
-	}
-	get response() {
-		if (!this._response) this._response = {
-			status: 200,
-			headers: new Headers()
-		};
-		return this._response;
-	}
-	get dispatched() {
-		return this._dispatched;
-	}
-	set dispatched(value) {
-		this._dispatched = value;
-	}
-	async next() {
-		if (this._nextCalled) return this._nextResult;
-		this._nextCalled = true;
-		if (this._next) this._nextResult = this._next();
-		return this._nextResult;
+function encodeRfc5987(filename) {
+	return encodeURIComponent(filename).replace(/['()]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`).replace(/\*/g, "%2A");
+}
+function setResponseHeaderAttachment(event, filename) {
+	if (typeof filename === "string") setResponseContentTypeByFileName(event, filename);
+	let disposition = "attachment";
+	if (filename) {
+		const sanitized = sanitizeFilename(filename);
+		const ascii = toAsciiFilename(sanitized);
+		disposition += `; filename="${ascii}"`;
+		disposition += `; filename*=UTF-8''${encodeRfc5987(sanitized)}`;
 	}
-};
+	event.response.headers.set(HeaderName.CONTENT_DISPOSITION, disposition);
+}
 //#endregion
-//#region src/handler/constants.ts
-let HandlerType = /* @__PURE__ */ function(HandlerType) {
-	HandlerType["CORE"] = "core";
-	HandlerType["ERROR"] = "error";
-	return HandlerType;
-}({});
-const HandlerSymbol = /* @__PURE__ */ Symbol.for("Handler");
-//#endregion
-//#region src/hook/constants.ts
-let HookName = /* @__PURE__ */ function(HookName) {
-	HookName["REQUEST"] = "request";
-	HookName["RESPONSE"] = "response";
-	HookName["ERROR"] = "error";
-	HookName["CHILD_MATCH"] = "childMatch";
-	HookName["CHILD_DISPATCH_BEFORE"] = "childDispatchBefore";
-	HookName["CHILD_DISPATCH_AFTER"] = "childDispatchAfter";
-	return HookName;
-}({});
-//#endregion
-//#region src/hook/module.ts
-var HookManager = class {
-	items;
-	constructor() {
-		this.items = {};
-	}
-	addListener(name, fn) {
-		this.items[name] = this.items[name] || [];
-		this.items[name].push(fn);
-		return () => {
-			this.removeListener(name, fn);
-		};
-	}
-	removeListener(name, fn) {
-		if (!this.items[name]) return;
-		if (typeof fn === "undefined") {
-			delete this.items[name];
-			return;
-		}
-		if (typeof fn === "function") {
-			const index = this.items[name].indexOf(fn);
-			if (index !== -1) this.items[name].splice(index, 1);
-		}
-		if (this.items[name].length === 0) delete this.items[name];
-	}
-	async trigger(name, event) {
-		if (!this.items[name] || this.items[name].length === 0) return;
-		try {
-			for (let i = 0; i < this.items[name].length; i++) {
-				const listener = this.items[name][i];
-				await this.triggerListener(name, event, listener);
-				if (event.dispatched) {
-					if (event.error) event.error = void 0;
-					return;
-				}
-			}
-		} catch (e) {
-			event.error = e;
-			if (!this.isErrorListenerHook(name)) {
-				await this.trigger(HookName.ERROR, event);
-				if (event.dispatched) {
-					if (event.error) event.error = void 0;
-				}
-			}
-		}
-	}
-	triggerListener(name, event, listener) {
-		if (this.isErrorListenerHook(name)) {
-			if (event.error) return listener(event);
-			return;
-		}
-		return listener(event);
-	}
-	isErrorListenerHook(input) {
-		return input === HookName.ERROR;
-	}
-};
-//#endregion
-//#region src/path/matcher.ts
-function decodeParam(val) {
-	/* istanbul ignore next */
-	if (typeof val !== "string" || val.length === 0) return val;
-	try {
-		return decodeURIComponent(val);
-	} catch {
-		return val;
-	}
-}
-var PathMatcher = class {
-	path;
-	regexp;
-	regexpKeys = [];
-	regexpOptions;
-	constructor(path, options) {
-		this.path = path;
-		this.regexpOptions = options || {};
-		const regexp = pathToRegexp(path, options);
-		this.regexp = regexp.regexp;
-		this.regexpKeys = regexp.keys;
-	}
-	test(path) {
-		return this.regexp.test(path);
-	}
-	exec(path) {
-		if (this.path === "/" && this.regexpOptions.end === false) return {
-			path: "/",
-			params: Object.create(null)
-		};
-		const match = this.regexp.exec(path);
-		if (!match) return;
-		const params = Object.create(null);
-		for (let i = 1; i < match.length; i++) {
-			const key = this.regexpKeys[i - 1];
-			if (!key) continue;
-			const prop = key.name;
-			const val = decodeParam(match[i]);
-			if (typeof val !== "undefined") params[prop] = val;
-		}
-		return {
-			path: match[0],
-			params
-		};
-	}
-};
-//#endregion
-//#region src/path/utils.ts
-function isPath(input) {
-	return typeof input === "string";
-}
-//#endregion
-//#region src/response/helpers/cache.ts
-function setResponseCacheHeaders(event, options) {
-	options = options || {};
-	const cacheControls = ["public"].concat(options.cacheControls || []);
-	if (options.maxAge !== void 0) cacheControls.push(`max-age=${+options.maxAge}`, `s-maxage=${+options.maxAge}`);
-	if (options.modifiedTime) {
-		const modifiedTime = typeof options.modifiedTime === "string" ? new Date(options.modifiedTime) : options.modifiedTime;
-		event.response.headers.set("last-modified", modifiedTime.toUTCString());
-	}
-	event.response.headers.set("cache-control", cacheControls.join(", "));
-}
-//#endregion
-//#region src/response/helpers/event-stream/utils.ts
-function stripNewlines(value) {
-	return value.replace(/[\r\n]/g, "");
-}
-function serializeEventStreamMessage(message) {
-	let result = "";
-	if (message.id) result += `id: ${stripNewlines(message.id)}\n`;
-	if (message.event) result += `event: ${stripNewlines(message.event)}\n`;
-	if (typeof message.retry === "number" && Number.isInteger(message.retry)) result += `retry: ${message.retry}\n`;
-	const lines = message.data.replace(/\r/g, "").split("\n");
-	for (const line of lines) result += `data: ${line}\n`;
-	result += "\n";
-	return result;
-}
-//#endregion
-//#region src/response/helpers/event-stream/module.ts
-function createEventStream(event, options) {
-	if (options?.maxMessageSize !== void 0) {
-		if (!Number.isInteger(options.maxMessageSize) || options.maxMessageSize < 0) throw new RoutupError("maxMessageSize must be a non-negative integer.");
-	}
-	let controller;
-	let closed = false;
-	const encoder = new TextEncoder();
-	const stream = new ReadableStream({
-		start(ctrl) {
-			controller = ctrl;
-		},
-		cancel() {
-			closed = true;
-		}
-	});
-	const headers = new Headers(event.response.headers);
-	headers.set(HeaderName.CONTENT_TYPE, "text/event-stream");
-	headers.set(HeaderName.CACHE_CONTROL, "private, no-cache, no-store, no-transform, must-revalidate, max-age=0");
-	headers.set(HeaderName.X_ACCEL_BUFFERING, "no");
-	headers.set(HeaderName.CONNECTION, "keep-alive");
-	const handle = {
-		write(message) {
-			if (closed) return;
-			if (typeof message === "string") {
-				handle.write({ data: message });
-				return;
-			}
-			const serialized = serializeEventStreamMessage(message);
-			if (options?.maxMessageSize !== void 0) {
-				if (encoder.encode(serialized).byteLength > options.maxMessageSize) return;
-			}
-			controller.enqueue(encoder.encode(serialized));
-		},
-		end() {
-			if (closed) return;
-			closed = true;
-			controller.close();
-		},
-		response: new Response(stream, {
-			status: event.response.status,
-			statusText: event.response.statusText,
-			headers
-		})
-	};
-	return handle;
-}
-//#endregion
-//#region src/response/helpers/gone.ts
-function isResponseGone(event) {
-	return event.dispatched;
-}
-function setResponseGone(event) {
-	event.dispatched = true;
-}
-//#endregion
-//#region src/response/helpers/header.ts
-function appendResponseHeader(event, name, value) {
-	const { headers } = event.response;
-	if (Array.isArray(value)) for (const v of value) headers.append(name, sanitizeHeaderValue(v));
-	else headers.append(name, sanitizeHeaderValue(value));
-}
-function appendResponseHeaderDirective(event, name, value) {
-	const { headers } = event.response;
-	const existing = headers.get(name);
-	if (!existing) {
-		if (Array.isArray(value)) headers.set(name, sanitizeHeaderValue(value.join("; ")));
-		else headers.set(name, sanitizeHeaderValue(value));
-		return;
-	}
-	const directives = existing.split("; ");
-	if (Array.isArray(value)) directives.push(...value);
-	else directives.push(value);
-	const unique = [...new Set(directives)];
-	headers.set(name, sanitizeHeaderValue(unique.join("; ")));
-}
-//#endregion
-//#region src/response/helpers/utils.ts
-function setResponseContentTypeByFileName(event, fileName) {
-	const ext = extname(fileName);
-	if (ext) {
-		let type = getMimeType(ext.substring(1));
-		if (type) {
-			const charset = getCharsetForMimeType(type);
-			if (charset) type += `; charset=${charset}`;
-			event.response.headers.set(HeaderName.CONTENT_TYPE, type);
-		}
-	}
-}
-//#endregion
-//#region src/response/helpers/header-attachment.ts
-function sanitizeFilename(filename) {
-	return filename.replace(/[\r\n]/g, "");
-}
-function toAsciiFilename(filename) {
-	return filename.replace(/[^\x20-\x7E]/g, "").replace(/"/g, "\\\"");
-}
-function encodeRfc5987(filename) {
-	return encodeURIComponent(filename).replace(/['()]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`).replace(/\*/g, "%2A");
-}
-function setResponseHeaderAttachment(event, filename) {
-	if (typeof filename === "string") setResponseContentTypeByFileName(event, filename);
-	let disposition = "attachment";
-	if (filename) {
-		const sanitized = sanitizeFilename(filename);
-		const ascii = toAsciiFilename(sanitized);
-		disposition += `; filename="${ascii}"`;
-		disposition += `; filename*=UTF-8''${encodeRfc5987(sanitized)}`;
-	}
-	event.response.headers.set(HeaderName.CONTENT_DISPOSITION, disposition);
-}
-//#endregion
-//#region src/response/helpers/header-content-type.ts
-function setResponseHeaderContentType(event, input, ifNotExists) {
-	if (ifNotExists) {
-		if (event.response.headers.get(HeaderName.CONTENT_TYPE)) return;
-	}
-	const contentType = getMimeType(input);
-	if (contentType) event.response.headers.set(HeaderName.CONTENT_TYPE, contentType);
-}
-//#endregion
-//#region src/router-options/module.ts
-const defaults = {
-	trustProxy: () => false,
-	subdomainOffset: 2,
-	etag: buildEtagFn(),
-	proxyIpMax: 0
-};
-const instances = {};
-function setRouterOptions(id, input) {
-	instances[id] = input;
-}
-function findRouterOption(key, path) {
-	if (!path || path.length === 0) return defaults[key];
-	if (path.length > 0) for (let i = path.length; i >= 0; i--) {
-		const segment = path[i];
-		if (segment !== void 0 && hasOwnProperty(instances, segment) && typeof instances[segment][key] !== "undefined") return instances[segment][key];
-	}
-	return defaults[key];
-}
+//#region src/response/helpers/header-content-type.ts
+function setResponseHeaderContentType(event, input, ifNotExists) {
+	if (ifNotExists) {
+		if (event.response.headers.get(HeaderName.CONTENT_TYPE)) return;
+	}
+	const contentType = getMimeType(input);
+	if (contentType) event.response.headers.set(HeaderName.CONTENT_TYPE, contentType);
+}
 //#endregion
 //#region src/response/to-response.ts
 function stripWeakPrefix(etag) {
 	return etag.startsWith("W/") ? etag.slice(2) : etag;
 }
 async function applyEtag(body, event, headers) {
-	const etagFn = findRouterOption("etag", event.routerPath);
+	const etagFn = event.routerOptions.etag;
 	if (!etagFn) return void 0;
 	const etag = await etagFn(body);
 	if (!etag) return void 0;
@@ -684,7 +412,6 @@ async function toResponse(value, event) {
 async function sendAccepted(event, data) {
 	event.response.status = 202;
 	event.response.statusText = "Accepted";
-	event.dispatched = true;
 	return await toResponse(data ?? "", event);
 }
 //#endregion
@@ -692,7 +419,6 @@ async function sendAccepted(event, data) {
 async function sendCreated(event, data) {
 	event.response.status = 201;
 	event.response.statusText = "Created";
-	event.dispatched = true;
 	return await toResponse(data ?? "", event);
 }
 //#endregion
@@ -718,7 +444,6 @@ async function sendFile(event, options) {
 			contentOptions.start = Number.isFinite(parsedStart) && parsedStart >= 0 ? parsedStart : 0;
 			contentOptions.end = Number.isFinite(parsedEnd) && parsedEnd >= 0 ? Math.min(parsedEnd, stats.size - 1) : stats.size - 1;
 			if (contentOptions.start >= stats.size || contentOptions.start > contentOptions.end) {
-				event.dispatched = true;
 				const rangeHeaders = new Headers(headers);
 				rangeHeaders.set(HeaderName.CONTENT_RANGE, `bytes */${stats.size}`);
 				return new Response(null, {
@@ -738,113 +463,422 @@ async function sendFile(event, options) {
 			headers.set(HeaderName.ETag, `W/"${stats.size}-${mtime.getTime()}"`);
 		}
 	}
-	const content = await options.content(contentOptions);
-	event.dispatched = true;
-	return new Response(content, {
-		status: statusCode,
-		statusText: event.response.statusText,
-		headers
-	});
-}
+	const content = await options.content(contentOptions);
+	return new Response(content, {
+		status: statusCode,
+		statusText: event.response.statusText,
+		headers
+	});
+}
+//#endregion
+//#region src/request/helpers/header.ts
+function getRequestHeader(event, name) {
+	return event.headers.get(name);
+}
+//#endregion
+//#region src/request/helpers/negotiator.ts
+const NEGOTIATOR_KEY = /* @__PURE__ */ Symbol.for("routup:negotiator");
+function headersToPlainObject(headers) {
+	const result = {};
+	headers.forEach((value, key) => {
+		result[key] = value;
+	});
+	return result;
+}
+function useRequestNegotiator(event) {
+	let value = event.store[NEGOTIATOR_KEY];
+	if (value) return value;
+	value = new Negotiator({ headers: headersToPlainObject(event.headers) });
+	event.store[NEGOTIATOR_KEY] = value;
+	return value;
+}
+//#endregion
+//#region src/request/helpers/header-accept.ts
+function getRequestAcceptableContentTypes(event) {
+	return useRequestNegotiator(event).mediaTypes();
+}
+function getRequestAcceptableContentType(event, input) {
+	input = input || [];
+	const items = Array.isArray(input) ? input : [input];
+	if (items.length === 0) return getRequestAcceptableContentTypes(event).shift();
+	if (!getRequestHeader(event, HeaderName.ACCEPT)) return items[0];
+	let polluted = false;
+	const mimeTypes = [];
+	for (const item of items) {
+		const mimeType = getMimeType(item);
+		if (mimeType) mimeTypes.push(mimeType);
+		else polluted = true;
+	}
+	const matches = useRequestNegotiator(event).mediaTypes(mimeTypes);
+	if (matches.length > 0) {
+		if (polluted) return items[0];
+		return items[mimeTypes.indexOf(matches[0])];
+	}
+}
+//#endregion
+//#region src/response/helpers/send-format.ts
+function sendFormat(event, input) {
+	const { default: formatDefault, ...formats } = input;
+	const contentTypes = Object.keys(formats);
+	if (contentTypes.length === 0) return formatDefault();
+	const contentType = getRequestAcceptableContentType(event, contentTypes);
+	if (contentType && formats[contentType]) return formats[contentType]();
+	return formatDefault();
+}
+//#endregion
+//#region src/response/helpers/send-redirect.ts
+function escapeHtml(str) {
+	return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function isAllowedRedirectUrl(location) {
+	if (location.startsWith("//")) return false;
+	if (location.startsWith("/") || location.startsWith(".")) return true;
+	try {
+		const url = new URL(location);
+		return url.protocol === "http:" || url.protocol === "https:";
+	} catch {
+		return true;
+	}
+}
+function sendRedirect(event, location, statusCode = 302) {
+	if (!isAllowedRedirectUrl(location)) throw new RoutupError({
+		statusCode: 400,
+		statusMessage: "Invalid redirect URL scheme."
+	});
+	const sanitizedLocation = sanitizeHeaderValue(location);
+	const html = `<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0; url=${escapeHtml(location)}"></head></html>`;
+	const headers = new Headers(event.response.headers);
+	headers.set("location", sanitizedLocation);
+	headers.set("content-type", "text/html; charset=utf-8");
+	headers.delete("content-length");
+	return new Response(html, {
+		status: statusCode,
+		statusText: event.response.statusText,
+		headers
+	});
+}
+//#endregion
+//#region src/response/helpers/send-stream.ts
+function sendStream(event, stream) {
+	const { status, statusText, headers } = event.response;
+	return new Response(stream, {
+		status,
+		statusText,
+		headers
+	});
+}
+//#endregion
+//#region src/event/module.ts
+var RoutupEvent = class {
+	request;
+	params;
+	path;
+	method;
+	mountPath;
+	headers;
+	searchParams;
+	response;
+	store;
+	_context;
+	_routerOptions;
+	constructor(context) {
+		this._context = context;
+		this.request = context.request;
+		this.params = context.params;
+		this.path = context.path;
+		this.method = context.method;
+		this.mountPath = context.mountPath;
+		this.headers = context.headers;
+		this.searchParams = context.searchParams;
+		this.response = context.response;
+		this.store = context.store;
+	}
+	get routerOptions() {
+		if (!this._routerOptions) this._routerOptions = this._context.routerOptions();
+		return this._routerOptions;
+	}
+	async next(error) {
+		return this._context.next(this, error);
+	}
+};
+//#endregion
+//#region src/dispatcher/module.ts
+var DispatcherEvent = class {
+	request;
+	params;
+	path;
+	method;
+	/**
+	* Collected allowed methods (for OPTIONS).
+	*/
+	methodsAllowed;
+	mountPath;
+	error;
+	routerPath;
+	_dispatched;
+	_response;
+	_store;
+	/**
+	* Cached parsed URL (avoids double-parsing).
+	*/
+	_url;
+	/**
+	* Continuation function for middleware onion model.
+	*/
+	_next;
+	/**
+	* Whether _next has already been called (guard against double-invocation).
+	*/
+	_nextCalled;
+	/**
+	* The cached result of the next handler.
+	*/
+	_nextResult;
+	constructor(request) {
+		this.request = request;
+		this._url = new FastURL(request.url);
+		this.method = request.method;
+		this.path = this._url.pathname;
+		this.mountPath = "/";
+		this.params = {};
+		this.routerPath = [];
+		this.methodsAllowed = [];
+		this._dispatched = false;
+		this._nextCalled = false;
+	}
+	get response() {
+		if (!this._response) this._response = {
+			status: 200,
+			headers: new Headers()
+		};
+		return this._response;
+	}
+	get dispatched() {
+		return this._dispatched;
+	}
+	set dispatched(value) {
+		this._dispatched = value;
+	}
+	async next(event, error) {
+		if (this._nextCalled) return this._nextResult;
+		this._nextCalled = true;
+		if (this._next) this._nextResult = this._next(event, error);
+		return this._nextResult;
+	}
+	setNext(fn) {
+		if (fn) this._next = async (event, error) => {
+			return toResponse(await fn(error), event);
+		};
+		else this._next = void 0;
+		this._nextCalled = false;
+		this._nextResult = void 0;
+	}
+	build() {
+		return new RoutupEvent({
+			request: this.request,
+			params: this.params,
+			path: this.path,
+			method: this.method,
+			mountPath: this.mountPath,
+			headers: this.request.headers,
+			searchParams: new URLSearchParams(this._url.search),
+			response: this.response,
+			store: this.store,
+			routerOptions: () => this.resolveOptions(),
+			next: (event, error) => this.next(event, error)
+		});
+	}
+	get store() {
+		if (!this._store) this._store = Object.create(null);
+		return this._store;
+	}
+	resolveOptions() {
+		const resolved = {
+			trustProxy: () => false,
+			subdomainOffset: 2,
+			etag: buildEtagFn(),
+			proxyIpMax: 0
+		};
+		for (let i = 0; i < this.routerPath.length; i++) {
+			const node = this.routerPath[i];
+			const entries = Object.entries(node.options);
+			for (const entry of entries) {
+				const [key, value] = entry;
+				if (typeof value !== "undefined") resolved[key] = value;
+			}
+		}
+		return resolved;
+	}
+};
 //#endregion
-//#region src/request/helpers/header.ts
-function getRequestHeader(event, name) {
-	return event.headers.get(name);
+//#region src/error/is.ts
+function isError(input) {
+	if (!isHTTPError(input)) return false;
+	return input.name === "RoutupError";
 }
 //#endregion
-//#region src/request/helpers/negotiator.ts
-const NEGOTIATOR_KEY = /* @__PURE__ */ Symbol.for("routup:negotiator");
-function headersToPlainObject(headers) {
-	const result = {};
-	headers.forEach((value, key) => {
-		result[key] = value;
-	});
-	return result;
+//#region src/error/create.ts
+function isNativeError(input) {
+	return isObject(input) && typeof input.message === "string" && typeof input.name === "string";
 }
-function useRequestNegotiator(event) {
-	let value = event.store[NEGOTIATOR_KEY];
-	if (value) return value;
-	value = new Negotiator({ headers: headersToPlainObject(event.headers) });
-	event.store[NEGOTIATOR_KEY] = value;
-	return value;
+/**
+* Create an internal error object by
+* - an existing RoutupError (returned as-is)
+* - an HTTPError (wrapped into a RoutupError preserving status)
+* - an Error (wrapped preserving message and cause)
+* - an options object (statusCode, statusMessage, etc.)
+* - a message string
+*
+* @param input
+*/
+function createError(input) {
+	if (isError(input)) return input;
+	if (typeof input === "string") return new RoutupError(input);
+	if (isHTTPError(input)) return new RoutupError({
+		message: input.message,
+		code: input.code,
+		statusCode: input.statusCode,
+		statusMessage: input.statusMessage,
+		redirectURL: input.redirectURL,
+		cause: input
+	});
+	if (isNativeError(input)) return new RoutupError({
+		message: input.message,
+		cause: input
+	});
+	if (!isObject(input)) return new RoutupError();
+	const options = { ...input };
+	if (options.cause === void 0) options.cause = input;
+	return new RoutupError(options);
 }
 //#endregion
-//#region src/request/helpers/header-accept.ts
-function getRequestAcceptableContentTypes(event) {
-	return useRequestNegotiator(event).mediaTypes();
-}
-function getRequestAcceptableContentType(event, input) {
-	input = input || [];
-	const items = Array.isArray(input) ? input : [input];
-	if (items.length === 0) return getRequestAcceptableContentTypes(event).shift();
-	if (!getRequestHeader(event, HeaderName.ACCEPT)) return items[0];
-	let polluted = false;
-	const mimeTypes = [];
-	for (const item of items) {
-		const mimeType = getMimeType(item);
-		if (mimeType) mimeTypes.push(mimeType);
-		else polluted = true;
+//#region src/handler/constants.ts
+let HandlerType = /* @__PURE__ */ function(HandlerType) {
+	HandlerType["CORE"] = "core";
+	HandlerType["ERROR"] = "error";
+	return HandlerType;
+}({});
+const HandlerSymbol = /* @__PURE__ */ Symbol.for("Handler");
+//#endregion
+//#region src/hook/constants.ts
+let HookName = /* @__PURE__ */ function(HookName) {
+	HookName["REQUEST"] = "request";
+	HookName["RESPONSE"] = "response";
+	HookName["ERROR"] = "error";
+	HookName["CHILD_MATCH"] = "childMatch";
+	HookName["CHILD_DISPATCH_BEFORE"] = "childDispatchBefore";
+	HookName["CHILD_DISPATCH_AFTER"] = "childDispatchAfter";
+	return HookName;
+}({});
+//#endregion
+//#region src/hook/module.ts
+var HookManager = class {
+	items;
+	constructor() {
+		this.items = {};
 	}
-	const matches = useRequestNegotiator(event).mediaTypes(mimeTypes);
-	if (matches.length > 0) {
-		if (polluted) return items[0];
-		return items[mimeTypes.indexOf(matches[0])];
+	addListener(name, fn) {
+		this.items[name] = this.items[name] || [];
+		this.items[name].push(fn);
+		return () => {
+			this.removeListener(name, fn);
+		};
 	}
-}
-//#endregion
-//#region src/response/helpers/send-format.ts
-function sendFormat(event, input) {
-	const { default: formatDefault, ...formats } = input;
-	const contentTypes = Object.keys(formats);
-	if (contentTypes.length === 0) return formatDefault();
-	const contentType = getRequestAcceptableContentType(event, contentTypes);
-	if (contentType && formats[contentType]) return formats[contentType]();
-	return formatDefault();
-}
+	removeListener(name, fn) {
+		if (!this.items[name]) return;
+		if (typeof fn === "undefined") {
+			delete this.items[name];
+			return;
+		}
+		if (typeof fn === "function") {
+			const index = this.items[name].indexOf(fn);
+			if (index !== -1) this.items[name].splice(index, 1);
+		}
+		if (this.items[name].length === 0) delete this.items[name];
+	}
+	async trigger(name, event) {
+		if (!this.items[name] || this.items[name].length === 0) return;
+		try {
+			for (let i = 0; i < this.items[name].length; i++) {
+				const listener = this.items[name][i];
+				await this.triggerListener(name, event, listener);
+				if (event.dispatched) {
+					if (event.error) event.error = void 0;
+					return;
+				}
+			}
+		} catch (e) {
+			event.error = e;
+			if (!this.isErrorListenerHook(name)) {
+				await this.trigger(HookName.ERROR, event);
+				if (event.dispatched) {
+					if (event.error) event.error = void 0;
+				}
+			}
+		}
+	}
+	triggerListener(name, event, listener) {
+		if (this.isErrorListenerHook(name)) {
+			if (event.error) return listener(event);
+			return;
+		}
+		return listener(event);
+	}
+	isErrorListenerHook(input) {
+		return input === HookName.ERROR;
+	}
+};
 //#endregion
-//#region src/response/helpers/send-redirect.ts
-function escapeHtml(str) {
-	return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-function isAllowedRedirectUrl(location) {
-	if (location.startsWith("//")) return false;
-	if (location.startsWith("/") || location.startsWith(".")) return true;
+//#region src/path/matcher.ts
+function decodeParam(val) {
+	/* istanbul ignore next */
+	if (typeof val !== "string" || val.length === 0) return val;
 	try {
-		const url = new URL(location);
-		return url.protocol === "http:" || url.protocol === "https:";
+		return decodeURIComponent(val);
 	} catch {
-		return true;
+		return val;
 	}
 }
-function sendRedirect(event, location, statusCode = 302) {
-	if (!isAllowedRedirectUrl(location)) throw new RoutupError({
-		statusCode: 400,
-		statusMessage: "Invalid redirect URL scheme."
-	});
-	const sanitizedLocation = sanitizeHeaderValue(location);
-	const html = `<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0; url=${escapeHtml(location)}"></head></html>`;
-	const headers = new Headers(event.response.headers);
-	headers.set("location", sanitizedLocation);
-	headers.set("content-type", "text/html; charset=utf-8");
-	headers.delete("content-length");
-	const response = new Response(html, {
-		status: statusCode,
-		statusText: event.response.statusText,
-		headers
-	});
-	event.dispatched = true;
-	return response;
-}
+var PathMatcher = class {
+	path;
+	regexp;
+	regexpKeys = [];
+	regexpOptions;
+	constructor(path, options) {
+		this.path = path;
+		this.regexpOptions = options || {};
+		const regexp = pathToRegexp(path, options);
+		this.regexp = regexp.regexp;
+		this.regexpKeys = regexp.keys;
+	}
+	test(path) {
+		return this.regexp.test(path);
+	}
+	exec(path) {
+		if (this.path === "/" && this.regexpOptions.end === false) return {
+			path: "/",
+			params: Object.create(null)
+		};
+		const match = this.regexp.exec(path);
+		if (!match) return;
+		const params = Object.create(null);
+		for (let i = 1; i < match.length; i++) {
+			const key = this.regexpKeys[i - 1];
+			if (!key) continue;
+			const prop = key.name;
+			const val = decodeParam(match[i]);
+			if (typeof val !== "undefined") params[prop] = val;
+		}
+		return {
+			path: match[0],
+			params
+		};
+	}
+};
 //#endregion
-//#region src/response/helpers/send-stream.ts
-function sendStream(event, stream) {
-	event.dispatched = true;
-	const { status, statusText, headers } = event.response;
-	return new Response(stream, {
-		status,
-		statusText,
-		headers
-	});
+//#region src/path/utils.ts
+function isPath(input) {
+	return typeof input === "string";
 }
 //#endregion
 //#region src/handler/module.ts
@@ -884,10 +918,11 @@ var Handler = class {
 		let response;
 		try {
 			let result;
+			const handlerEvent = event.build();
 			if (this.config.type === HandlerType.ERROR) {
-				if (event.error) result = await this.config.fn(event.error, event);
-			} else result = await this.config.fn(event);
-			response = await toResponse(result, event);
+				if (event.error) result = await this.config.fn(event.error, handlerEvent);
+			} else result = await this.config.fn(handlerEvent);
+			response = await toResponse(result, handlerEvent);
 			if (response) event.dispatched = true;
 		} catch (e) {
 			event.error = isError(e) ? e : createError(e);
@@ -1028,7 +1063,7 @@ function createNodeBridge(handler, isMiddleware) {
 		if (!node?.req || !node?.res) throw new RoutupError("fromNodeHandler/fromNodeMiddleware requires a Node.js runtime.");
 		const req = node.req;
 		const res = node.res;
-		if ((isMiddleware ? await callMiddleware(handler, req, res) : await callHandler(handler, req, res)) === kHandled) event.dispatched = true;
+		if ((isMiddleware ? await callMiddleware(handler, req, res) : await callHandler(handler, req, res)) === kHandled) return null;
 	}) });
 }
 /**
@@ -1179,7 +1214,7 @@ function matchRequestContentType(event, contentType) {
 function getRequestHostName(event, options = {}) {
 	let trustProxy;
 	if (typeof options.trustProxy !== "undefined") trustProxy = buildTrustProxyFn(options.trustProxy);
-	else trustProxy = findRouterOption("trustProxy", event.routerPath);
+	else trustProxy = event.routerOptions.trustProxy;
 	let hostname = event.headers.get(HeaderName.X_FORWARDED_HOST);
 	if (!hostname || !event.request.ip || !trustProxy(event.request.ip, 0)) hostname = event.headers.get(HeaderName.HOST);
 	else if (hostname && hostname.includes(",")) hostname = hostname.substring(0, hostname.indexOf(",")).trimEnd();
@@ -1202,7 +1237,7 @@ function getRequestHostName(event, options = {}) {
 function getRequestIP(event, options = {}) {
 	let trustProxy;
 	if (typeof options.trustProxy !== "undefined") trustProxy = buildTrustProxyFn(options.trustProxy);
-	else trustProxy = findRouterOption("trustProxy", event.routerPath);
+	else trustProxy = event.routerOptions.trustProxy;
 	const socketAddr = event.request.ip;
 	if (!socketAddr) return;
 	const forwarded = event.headers.get(HeaderName.X_FORWARDED_FOR);
@@ -1222,7 +1257,7 @@ function getRequestIP(event, options = {}) {
 function getRequestProtocol(event, options = {}) {
 	let trustProxy;
 	if (typeof options.trustProxy !== "undefined") trustProxy = buildTrustProxyFn(options.trustProxy);
-	else trustProxy = findRouterOption("trustProxy", event.routerPath);
+	else trustProxy = event.routerOptions.trustProxy;
 	let protocol;
 	try {
 		if (new URL(event.request.url).protocol === "https:") protocol = "https";
@@ -1246,7 +1281,7 @@ function isPlugin(input) {
 	return typeof input.install === "function" && input.install.length === 1;
 }
 //#endregion
-//#region src/router-options/normalize.ts
+//#region src/router/options.ts
 function normalizeRouterOptions(input) {
 	if (typeof input.etag !== "undefined") input.etag = buildEtagFn(input.etag);
 	if (typeof input.trustProxy !== "undefined") input.trustProxy = buildTrustProxyFn(input.trustProxy);
@@ -1266,10 +1301,6 @@ let RouterPipelineStep = /* @__PURE__ */ function(RouterPipelineStep) {
 }({});
 //#endregion
 //#region src/router/utils.ts
-let nextId = 0;
-function generateRouterID() {
-	return ++nextId;
-}
 function isRouterInstance(input) {
 	return isInstance(input, RouterSymbol);
 }
@@ -1288,10 +1319,6 @@ function acceptsJson(request) {
 var Router = class Router {
 	"@instanceof" = RouterSymbol;
 	/**
-	* An identifier for the router instance.
-	*/
-	id;
-	/**
 	* A label for the router instance.
 	*/
 	name;
@@ -1313,12 +1340,15 @@ var Router = class Router {
 	* @protected
 	*/
 	hookManager;
-	constructor(options = {}) {
-		this.id = generateRouterID();
-		this.name = options.name;
+	/**
+	* Normalized options for this router instance.
+	*/
+	_options;
+	constructor(input = {}) {
+		this.name = input.name;
 		this.hookManager = new HookManager();
-		this.setPath(options.path);
-		setRouterOptions(this.id, normalizeRouterOptions(options));
+		this._options = normalizeRouterOptions(input);
+		this.setPath(input.path);
 	}
 	matchPath(path) {
 		if (this.pathMatcher) return this.pathMatcher.test(path);
@@ -1332,11 +1362,11 @@ var Router = class Router {
 		this.pathMatcher = new PathMatcher(withLeadingSlash(withoutTrailingSlash(`${value}`)), { end: false });
 	}
 	/**
-	* Public entry point — creates a RoutupEvent from the request,
+	* Public entry point — creates a DispatcherEvent from the request,
 	* runs the pipeline, and returns a Response (with 404/500 fallbacks).
 	*/
 	async fetch(request) {
-		const event = new RoutupEvent(request);
+		const event = new DispatcherEvent(request);
 		let response;
 		try {
 			response = await this.dispatch(event);
@@ -1438,25 +1468,18 @@ var Router = class Router {
 		}
 		const item = this.stack[context.stackIndex];
 		const { event } = context;
-		const savedNext = event._next;
-		const savedNextCalled = event._nextCalled;
 		try {
-			event._nextCalled = false;
-			event._next = async () => {
+			event.setNext(async (error) => {
+				if (error) event.error = createError(error);
 				const nextContext = {
 					step: RouterPipelineStep.LOOKUP,
 					event,
 					stackIndex: context.stackIndex + 1,
 					response: void 0
 				};
-				event.routerPath.push(this.id);
-				try {
-					await this.executePipelineStep(nextContext);
-				} finally {
-					event.routerPath.pop();
-				}
+				await this.executePipelineStep(nextContext);
 				return nextContext.response;
-			};
+			});
 			const response = await item.dispatch(event);
 			if (response) {
 				context.response = response;
@@ -1465,9 +1488,6 @@ var Router = class Router {
 		} catch (e) {
 			event.error = createError(e);
 			await this.hookManager.trigger(HookName.ERROR, event);
-		} finally {
-			event._next = savedNext;
-			event._nextCalled = savedNextCalled;
 		}
 		context.stackIndex++;
 		context.step = RouterPipelineStep.CHILD_AFTER;
@@ -1508,7 +1528,10 @@ var Router = class Router {
 			event,
 			stackIndex: 0
 		};
-		event.routerPath.push(this.id);
+		event.routerPath.push({
+			name: this.name,
+			options: this._options
+		});
 		try {
 			await this.executePipelineStep(context);
 		} finally {
@@ -1611,6 +1634,6 @@ var Router = class Router {
 	}
 };
 //#endregion
-export { isError as $, useRequestNegotiator as A, appendResponseHeaderDirective as B, defineCoreHandler as C, sendFormat as D, sendRedirect as E, toResponse as F, setResponseCacheHeaders as G, setResponseGone as H, setResponseHeaderContentType as I, HandlerSymbol as J, isPath as K, setResponseHeaderAttachment as L, sendFile as M, sendCreated as N, getRequestAcceptableContentType as O, sendAccepted as P, RoutupError as Q, setResponseContentTypeByFileName as R, defineErrorHandler as S, sendStream as T, createEventStream as U, isResponseGone as V, serializeEventStreamMessage as W, RoutupEvent as X, HandlerType as Y, createError as Z, fromWebHandler as _, getRequestHostName as a, fromNodeHandler as b, getRequestAcceptableLanguages as c, getRequestAcceptableCharset as d, HeaderName as et, getRequestAcceptableCharsets as f, isHandlerOptions as g, isHandler as h, getRequestIP as i, getRequestHeader as j, getRequestAcceptableContentTypes as k, getRequestAcceptableEncoding as l, readBody as m, isPlugin as n, matchRequestContentType as o, isRequestCacheable as p, PathMatcher as q, getRequestProtocol as r, getRequestAcceptableLanguage as s, Router as t, MethodName as tt, getRequestAcceptableEncodings as u, isWebHandler as v, Handler as w, fromNodeMiddleware as x, isWebHandlerProvider as y, appendResponseHeader as z };
+export { setResponseCacheHeaders as $, createError as A, getRequestHeader as B, defineErrorHandler as C, PathMatcher as D, isPath as E, sendRedirect as F, setResponseHeaderContentType as G, sendCreated as H, sendFormat as I, appendResponseHeader as J, setResponseHeaderAttachment as K, getRequestAcceptableContentType as L, DispatcherEvent as M, RoutupEvent as N, HandlerSymbol as O, sendStream as P, RoutupError as Q, getRequestAcceptableContentTypes as R, fromNodeMiddleware as S, Handler as T, sendAccepted as U, sendFile as V, toResponse as W, createEventStream as X, appendResponseHeaderDirective as Y, serializeEventStreamMessage as Z, isHandlerOptions as _, getRequestIP as a, isWebHandlerProvider as b, getRequestAcceptableLanguage as c, getRequestAcceptableEncodings as d, HeaderName as et, getRequestAcceptableCharset as f, isHandler as g, readBody as h, getRequestProtocol as i, isError as j, HandlerType as k, getRequestAcceptableLanguages as l, isRequestCacheable as m, normalizeRouterOptions as n, getRequestHostName as o, getRequestAcceptableCharsets as p, setResponseContentTypeByFileName as q, isPlugin as r, matchRequestContentType as s, Router as t, MethodName as tt, getRequestAcceptableEncoding as u, fromWebHandler as v, defineCoreHandler as w, fromNodeHandler as x, isWebHandler as y, useRequestNegotiator as z };
 
-//# sourceMappingURL=src-CNoRH9eg.mjs.map
+//# sourceMappingURL=src-Tr9cHQaV.mjs.map