h3 2.0.1-rc.21 → 2.0.1-rc.23

package/dist/{h3-CRCltuUf.mjs → h3.mjs}

@@ -1,4 +1,3 @@
-import "./h3-DagAgogP.mjs";
 import { NullProtoObj as EmptyObject, addRoute, createRouter, findRoute, removeRoute, routeToRegExp } from "rou3";
 import { FastResponse, FastURL } from "srvx";
 function freezeApp(app) {
@@ -7,10 +6,6 @@ function freezeApp(app) {
 		throw new Error("Cannot add routes after the server init.");
 	};
 }
-function withLeadingSlash(path) {
-	if (!path || path === "/") return "/";
-	return path[0] === "/" ? path : `/${path}`;
-}
 function withoutTrailingSlash(path) {
 	if (!path || path === "/") return "/";
 	return path[path.length - 1] === "/" ? path.slice(0, -1) : path;
@@ -24,22 +19,11 @@ function withoutBase(input = "", base = "") {
 function decodePathname(pathname) {
 	return decodeURI(pathname.includes("%25") ? pathname.replace(/%25/g, "%2525") : pathname);
 }
-function resolveDotSegments(path) {
-	if (!path.includes(".") && !path.includes("%2")) return path;
-	const segments = path.replaceAll("\\", "/").split("/");
-	const resolved = [];
-	for (const segment of segments) {
-		const normalized = segment.replace(/%2e/gi, ".");
-		if (normalized === "..") {
-			if (resolved.length > 1) resolved.pop();
-		} else if (normalized !== ".") resolved.push(segment);
-	}
-	return resolved.join("/") || "/";
-}
 const kEventNS = "h3.internal.event.";
 const kEventRes = /* @__PURE__ */ Symbol.for(`${kEventNS}res`);
 const kEventResHeaders = /* @__PURE__ */ Symbol.for(`${kEventNS}res.headers`);
 const kEventResErrHeaders = /* @__PURE__ */ Symbol.for(`${kEventNS}res.err.headers`);
+const kMalformedURL = /* @__PURE__ */ Symbol.for(`${kEventNS}malformed`);
 var H3Event = class {
 	app;
 	req;
@@ -51,8 +35,13 @@ var H3Event = class {
 		this.req = req;
 		this.app = app;
 		const _url = req._url;
-		const url = _url && _url instanceof URL ? _url : new FastURL(req.url);
-		if (url.pathname.includes("%")) url.pathname = decodePathname(url.pathname);
+		let url = _url && _url instanceof URL ? _url : new FastURL(req.url);
+		if (url.pathname.includes("%")) try {
+			const pathname = decodePathname(url.pathname);
+			if (pathname !== url.pathname) url = new FastURL(`${url.protocol}//${url.host}${pathname}${url.search}`);
+		} catch {
+			this[kMalformedURL] = true;
+		}
 		this.url = url;
 	}
 	get res() {
@@ -100,7 +89,7 @@ function sanitizeStatusMessage(statusMessage = "") {
 function sanitizeStatusCode(statusCode, defaultStatusCode = 200) {
 	if (!statusCode) return defaultStatusCode;
 	if (typeof statusCode === "string") statusCode = +statusCode;
-	if (statusCode < 100 || statusCode > 599) return defaultStatusCode;
+	if (Number.isNaN(statusCode) || statusCode < 100 || statusCode > 599) return defaultStatusCode;
 	return statusCode;
 }
 var HTTPError = class HTTPError extends Error {
@@ -472,7 +461,7 @@ async function validateData(data, fn, options) {
 		throw createValidationError(error);
 	}
 }
-const reqBodyKeys = new Set([
+const reqBodyKeys = /* @__PURE__ */ new Set([
 	"body",
 	"text",
 	"formData",
@@ -485,21 +474,19 @@ function validatedRequest(req, validate) {
 	}
 	if (!validate.body) return req;
 	return new Proxy(req, { get(_target, prop) {
-		if (validate.body) {
-			if (prop === "json") return function _validatedJson() {
-				return req.json().then((data) => validate.body["~standard"].validate(data)).then((result) => {
-					if (result.issues) throw createValidationError(validate.onError?.({
-						_source: "body",
-						...result
-					}) || {
-						message: VALIDATION_FAILED,
-						issues: result.issues
-					});
-					return result.value;
+		if (prop === "json") return function _validatedJson() {
+			return req.json().then((data) => validate.body["~standard"].validate(data)).then((result) => {
+				if (result.issues) throw createValidationError(validate.onError?.({
+					_source: "body",
+					...result
+				}) || {
+					message: VALIDATION_FAILED,
+					issues: result.issues
 				});
-			};
-			else if (reqBodyKeys.has(prop)) throw new TypeError(`Cannot access .${prop} on request with JSON validation enabled. Use .json() instead.`);
-		}
+				return result.value;
+			});
+		};
+		else if (reqBodyKeys.has(prop)) throw new TypeError(`Cannot access .${prop} on request with JSON validation enabled. Use .json() instead.`);
 		return Reflect.get(req, prop);
 	} });
 }
@@ -556,7 +543,10 @@ function mockEvent(_request, options) {
 	return new H3Event(request);
 }
 function requestWithURL(req, url) {
-	const cache = { url };
+	const cache = {
+		url,
+		_url: void 0
+	};
 	return new Proxy(req, { get(target, prop) {
 		if (prop in cache) return cache[prop];
 		const value = Reflect.get(target, prop);
@@ -566,7 +556,13 @@ function requestWithURL(req, url) {
 }
 function requestWithBaseURL(req, base) {
 	const url = new URL(req.url);
-	url.pathname = decodePathname(url.pathname).slice(base.length) || "/";
+	let pathname;
+	try {
+		pathname = decodePathname(url.pathname);
+	} catch {
+		pathname = url.pathname;
+	}
+	url.pathname = pathname.slice(base.length) || "/";
 	return requestWithURL(req, url.href);
 }
 function toRequest(input, options) {
@@ -575,7 +571,7 @@ function toRequest(input, options) {
 		if (url[0] === "/") {
 			const headers = options?.headers ? new Headers(options.headers) : void 0;
 			const host = headers?.get("host") || "localhost";
-			url = `${headers?.get("x-forwarded-proto") === "https" ? "https" : "http"}://${host}${url}`;
+			url = `${(headers?.get("x-forwarded-proto") || "").split(",")[0].trim() === "https" ? "https" : "http"}://${host}${url}`;
 		}
 		return new Request(url, options);
 	} else if (options || input instanceof URL) return new Request(input, options);
@@ -627,7 +623,7 @@ function getRequestHost(event, opts = {}) {
 }
 function getRequestProtocol(event, opts = {}) {
 	if (opts.xForwardedProto !== false) {
-		const forwardedProto = event.req.headers.get("x-forwarded-proto");
+		const forwardedProto = (event.req.headers.get("x-forwarded-proto") || "").split(",")[0].trim();
 		if (forwardedProto === "https") return "https";
 		if (forwardedProto === "http") return "http";
 	}
@@ -709,13 +705,14 @@ function defineLazyEventHandler(loader) {
 }
 function toEventHandler(handler) {
 	if (typeof handler === "function") return handler;
-	if (typeof handler?.handler === "function") return handler.handler;
+	if (typeof handler?.handler === "function" && handler.constructor?.["~h3"]) return handler.handler;
 	if (typeof handler?.fetch === "function") return function _fetchHandler(event) {
 		return handler.fetch(event.req);
 	};
 }
 const NoHandler = () => kNotFound;
 var H3Core = class {
+	static "~h3" = true;
 	config;
 	"~middleware";
 	"~routes" = [];
@@ -742,6 +739,10 @@ var H3Core = class {
 		const event = new H3Event(request, context, this);
 		let handlerRes;
 		try {
+			if (event[kMalformedURL] && !this.config.allowMalformedURL) throw new HTTPError({
+				status: 400,
+				message: "Bad Request"
+			});
 			if (this.config.onRequest) {
 				const hookRes = this.config.onRequest(event);
 				handlerRes = typeof hookRes?.then === "function" ? hookRes.then(() => this.handler(event)) : this.handler(event);
@@ -783,10 +784,21 @@ const H3 = /* @__PURE__ */ (() => {
 					const originalPathname = event.url.pathname;
 					if (!originalPathname.startsWith(base) || originalPathname.length > base.length && originalPathname[base.length] !== "/") return next();
 					event.url.pathname = event.url.pathname.slice(base.length) || "/";
-					return callMiddleware(event, input["~middleware"], () => {
+					const restore = () => {
 						event.url.pathname = originalPathname;
-						return next();
-					});
+					};
+					try {
+						const result = callMiddleware(event, input["~middleware"], () => {
+							restore();
+							return next();
+						});
+						if (typeof result?.then === "function") return Promise.resolve(result).finally(restore);
+						restore();
+						return result;
+					} catch (err) {
+						restore();
+						throw err;
+					}
 				});
 				for (const r of input["~routes"]) this["~addRoute"]({
 					...r,
@@ -860,6 +872,9 @@ const H3 = /* @__PURE__ */ (() => {
 	};
 	return H3;
 })();
+function definePlugin(def) {
+	return ((opts) => (h3) => def(h3, opts));
+}
 function toWebHandler(app) {
 	return (request, context) => {
 		return Promise.resolve(app.request(request, void 0, context || request.context));
@@ -873,8 +888,15 @@ function fromWebHandler(handler) {
 function fromNodeHandler(handler) {
 	if (typeof handler !== "function") throw new TypeError(`Invalid handler. It should be a function: ${handler}`);
 	return function _nodeHandler(event) {
-		if (!event.runtime?.node?.res) throw new Error("[h3] Executing Node.js middleware is not supported in this server!");
-		return callNodeHandler(handler, event.runtime?.node.req, event.runtime?.node.res);
+		const node = event.runtime?.node;
+		if (!node?.res) throw new Error("[h3] Executing Node.js middleware is not supported in this server!");
+		const url = event.url.pathname + event.url.search;
+		if (node.req.url === url) return callNodeHandler(handler, node.req, node.res);
+		const originalUrl = node.req.url;
+		node.req.url = url;
+		return callNodeHandler(handler, node.req, node.res).finally(() => {
+			node.req.url = originalUrl;
+		});
 	};
 }
 function defineNodeHandler(handler) {
@@ -1036,7 +1058,7 @@ function serializeIterableValue(value) {
 			if (value instanceof Uint8Array) return value;
 			return textEncoder.encode(JSON.stringify(value));
 	}
-	return new Uint8Array();
+	return /* @__PURE__ */ new Uint8Array();
 }
 function coerceIterable(iterable) {
 	if (typeof iterable === "function") iterable = iterable();
@@ -1079,14 +1101,19 @@ function redirectBack(event, opts = {}) {
 	return redirect(location, opts.status);
 }
 function writeEarlyHints(event, hints) {
-	if (event.runtime?.node?.res?.writeEarlyHints) return new Promise((resolve) => {
-		event.runtime?.node?.res?.writeEarlyHints(hints, () => resolve());
-	});
-	for (const [name, value] of Object.entries(hints)) {
-		if (name.toLowerCase() !== "link") continue;
-		if (Array.isArray(value)) for (const v of value) event.res.headers.append("link", v);
-		else event.res.headers.append("link", value);
+	const linkValues = [];
+	for (const [name, value] of Object.entries(hints)) if (name.toLowerCase() === "link") {
+		for (const v of Array.isArray(value) ? value : [value]) if (v) linkValues.push(v);
+	}
+	if (event.runtime?.node?.res?.writeEarlyHints) {
+		if (linkValues.length === 0) return Promise.resolve();
+		const normalizedHints = { link: linkValues };
+		for (const [name, value] of Object.entries(hints)) if (name.toLowerCase() !== "link") normalizedHints[name] = value;
+		return new Promise((resolve) => {
+			event.runtime?.node?.res?.writeEarlyHints(normalizedHints, () => resolve());
+		});
 	}
+	for (const v of linkValues) event.res.headers.append("link", v);
 }
 function iterable(iterable, options) {
 	const serializer = options?.serializer ?? serializeIterableValue;
@@ -1109,18 +1136,39 @@ function html(first, ...values) {
 	return new HTTPResponse(typeof first === "string" ? first : first.reduce((out, str, i) => out + str + (values[i] ?? ""), ""), { headers: { "content-type": "text/html; charset=utf-8" } });
 }
 function parseURLEncodedBody(body) {
-	const form = new URLSearchParams(body);
-	const parsedForm = new EmptyObject();
-	for (const [key, value] of form.entries()) if (hasProp(parsedForm, key)) {
-		if (!Array.isArray(parsedForm[key])) parsedForm[key] = [parsedForm[key]];
-		parsedForm[key].push(value);
-	} else parsedForm[key] = value;
-	return parsedForm;
-}
-async function readBody(event) {
+	return collectEntries(new URLSearchParams(body).entries());
+}
+function parseFormData(form) {
+	return collectEntries(form.entries());
+}
+function collectEntries(entries) {
+	const parsed = new EmptyObject();
+	for (const [key, value] of entries) if (hasProp(parsed, key)) {
+		if (!Array.isArray(parsed[key])) parsed[key] = [parsed[key]];
+		parsed[key].push(value);
+	} else parsed[key] = value;
+	return parsed;
+}
+async function readBody(event, options) {
+	const contentType = event.req.headers.get("content-type") || "";
+	const type = options?.type;
+	if (type === "formData") {
+		let form;
+		try {
+			form = await event.req.formData();
+		} catch {
+			throw new HTTPError({
+				status: 400,
+				statusText: "Bad Request",
+				message: "Invalid form data body"
+			});
+		}
+		return parseFormData(form);
+	}
 	const text = await event.req.text();
+	if (type === "text") return text;
 	if (!text) return;
-	if ((event.req.headers.get("content-type") || "").startsWith("application/x-www-form-urlencoded")) return parseURLEncodedBody(text);
+	if (type === "urlencoded" || !type && contentType.startsWith("application/x-www-form-urlencoded")) return parseURLEncodedBody(text);
 	try {
 		return JSON.parse(text);
 	} catch {
@@ -1196,14 +1244,15 @@ function bodyLimit(limit) {
 		return next();
 	};
 }
-const PayloadMethods = new Set([
+const PayloadMethods = /* @__PURE__ */ new Set([
 	"PATCH",
 	"POST",
 	"PUT",
 	"DELETE"
 ]);
-const ignoredHeaders = new Set([
+const ignoredHeaders = /* @__PURE__ */ new Set([
 	"transfer-encoding",
+	"accept-encoding",
 	"connection",
 	"keep-alive",
 	"upgrade",
@@ -1251,14 +1300,23 @@ async function proxyRequest(event, target, opts = {}) {
 	});
 }
 async function proxy(event, target, opts = {}) {
+	const callerSignal = opts.fetchOptions?.signal;
 	const fetchOptions = {
 		headers: opts.headers,
-		...opts.fetchOptions
+		...opts.fetchOptions,
+		signal: callerSignal ? AbortSignal.any([event.req.signal, callerSignal]) : event.req.signal
 	};
 	let response;
 	try {
 		response = target[0] === "/" ? await event.app.fetch(createSubRequest(event, target, fetchOptions)) : await fetch(target, fetchOptions);
 	} catch (error) {
+		if (error?.name === "AbortError") {
+			if (opts.propagateAbortError) throw error;
+			if (event.req.signal.aborted) return new HTTPResponse(null, {
+				status: 499,
+				statusText: "Client Closed Request"
+			});
+		}
 		throw new HTTPError({
 			status: 502,
 			cause: error
@@ -1683,6 +1741,9 @@ var EventStream = class {
 	_unsentData;
 	_disposed = false;
 	_handled = false;
+	get _isClosed() {
+		return this._writerIsClosed || this._disposed;
+	}
 	constructor(event, opts = {}) {
 		this._event = event;
 		this._writer = this._transformStream.writable.getWriter();
@@ -1710,7 +1771,7 @@ var EventStream = class {
 		await this._sendEvent(message);
 	}
 	async pushComment(comment) {
-		if (this._writerIsClosed) return;
+		if (this._isClosed) return;
 		if (this._paused && !this._unsentData) {
 			this._unsentData = formatEventStreamComment(comment);
 			return;
@@ -1724,7 +1785,7 @@ var EventStream = class {
 		});
 	}
 	async _sendEvent(message) {
-		if (this._writerIsClosed) return;
+		if (this._isClosed) return;
 		if (this._paused && !this._unsentData) {
 			this._unsentData = formatEventStreamMessage(message);
 			return;
@@ -1738,7 +1799,7 @@ var EventStream = class {
 		});
 	}
 	async _sendEvents(messages) {
-		if (this._writerIsClosed) return;
+		if (this._isClosed) return;
 		const payload = formatEventStreamMessages(messages);
 		if (this._paused && !this._unsentData) {
 			this._unsentData = payload;
@@ -1763,7 +1824,7 @@ var EventStream = class {
 		await this.flush();
 	}
 	async flush() {
-		if (this._writerIsClosed) return;
+		if (this._isClosed) return;
 		if (this._unsentData?.length) {
 			await this._writer.write(this._encoder.encode(this._unsentData)).catch(() => {
 				this._writerIsClosed = true;
@@ -1773,7 +1834,7 @@ var EventStream = class {
 	}
 	async close() {
 		if (this._disposed) return;
-		if (!this._writerIsClosed) try {
+		if (!this._isClosed) try {
 			await this._writer.close();
 		} catch {}
 		this._disposed = true;
@@ -1858,7 +1919,8 @@ function handleCacheHeaders(event, opts) {
 	}
 	if (opts.etag) {
 		event.res.headers.set("etag", opts.etag);
-		if (event.req.headers.get("if-none-match") === opts.etag) cacheMatched = true;
+		const ifNonMatch = event.req.headers.get("if-none-match");
+		if (ifNonMatch && ifNonMatch.split(",").some((token) => token.trim() === opts.etag)) cacheMatched = true;
 	}
 	event.res.headers.set("cache-control", cacheControls.join(", "));
 	if (cacheMatched) {
@@ -1867,6 +1929,28 @@ function handleCacheHeaders(event, opts) {
 	}
 	return false;
 }
+const DOT_SEGMENT_RE = /(?:^|\/)(?:\.|%(?:25)*2e){1,2}(?:\/|$)/i;
+const ENCODED_SEP_RE = /%(?:25)*(?:2f|5c)/i;
+const ENCODED_SEP_RE_G = new RegExp(ENCODED_SEP_RE.source, "gi");
+const ENCODED_DOT_RE_G = /%(?:25)*2e/gi;
+function resolveDotSegments(path, opts) {
+	if (path[0] !== "/" || path[1] === "/" || path[1] === "\\") path = "/" + path.replace(/^[/\\]+/, "");
+	const decodeSlashes = opts?.decodeSlashes;
+	const hasBackslash = path.includes("\\");
+	const hasEncodedSep = decodeSlashes && ENCODED_SEP_RE.test(path);
+	if (!hasBackslash && !hasEncodedSep && !DOT_SEGMENT_RE.test(path)) return path;
+	let normalized = hasBackslash ? path.replaceAll("\\", "/") : path;
+	if (hasEncodedSep) normalized = normalized.replace(ENCODED_SEP_RE_G, "/");
+	const segments = normalized.split("/");
+	const resolved = [];
+	for (const segment of segments) {
+		const normalizedSegment = segment.includes("%") ? segment.replace(ENCODED_DOT_RE_G, ".") : segment;
+		if (normalizedSegment === "..") {
+			if (resolved.length > 1) resolved.pop();
+		} else if (normalizedSegment !== ".") resolved.push(segment);
+	}
+	return (resolved.join("/") || "/").replace(/^\/+/, "/");
+}
 const COMMON_MIME_TYPES = {
 	".html": "text/html",
 	".htm": "text/html",
@@ -1908,7 +1992,13 @@ async function serveStatic(event, options) {
 		event.res.headers.set("allow", "GET, HEAD");
 		throw new HTTPError({ status: 405 });
 	}
-	const originalId = resolveDotSegments(decodeURI(withLeadingSlash(withoutTrailingSlash(event.url.pathname))));
+	const resolvedId = resolveDotSegments(withoutTrailingSlash(event.url.pathname));
+	let originalId = resolvedId;
+	if (resolvedId.includes("%")) try {
+		originalId = decodeURI(resolvedId);
+	} catch {
+		originalId = resolvedId;
+	}
 	const acceptEncodings = parseAcceptEncoding(event.req.headers.get("accept-encoding") || "", options.encodings);
 	if (acceptEncodings.length > 1) event.res.headers.set("vary", "accept-encoding");
 	let id = originalId;
@@ -1928,6 +2018,7 @@ async function serveStatic(event, options) {
 	}
 	if (meta.mtime) {
 		const mtimeDate = new Date(meta.mtime);
+		mtimeDate.setMilliseconds(0);
 		const ifModifiedSinceH = event.req.headers.get("if-modified-since");
 		if (ifModifiedSinceH && new Date(ifModifiedSinceH) >= mtimeDate) return new HTTPResponse(null, {
 			status: 304,
@@ -1947,7 +2038,7 @@ async function serveStatic(event, options) {
 		if (type) event.res.headers.set("content-type", type);
 	}
 	if (meta.encoding && !event.res.headers.get("content-encoding")) event.res.headers.set("content-encoding", meta.encoding);
-	if (meta.size !== void 0 && meta.size > 0 && !event.req.headers.get("content-length")) event.res.headers.set("content-length", meta.size + "");
+	if (meta.size !== void 0 && meta.size > 0 && !event.res.headers.get("content-length")) event.res.headers.set("content-length", meta.size + "");
 	if (event.req.method === "HEAD") return new HTTPResponse(null, { status: 200 });
 	return new HTTPResponse(await options.getContents(id) || null, { status: 200 });
 }
@@ -2365,13 +2456,17 @@ function isPreflightRequest(event) {
 	return event.req.method === "OPTIONS" && !!origin && !!accessControlRequestMethod;
 }
 function appendCorsPreflightHeaders(event, options) {
+	const originHeaders = createOriginHeaders(event, options);
+	const allowHeaderHeaders = createAllowHeaderHeaders(event, options);
 	const headers = {
-		...createOriginHeaders(event, options),
+		...originHeaders,
 		...createCredentialsHeaders(options),
 		...createMethodsHeaders(options),
-		...createAllowHeaderHeaders(event, options),
+		...allowHeaderHeaders,
 		...createMaxAgeHeader(options)
 	};
+	const varyValues = [originHeaders.vary, allowHeaderHeaders.vary].filter(Boolean);
+	if (varyValues.length > 0) headers.vary = varyValues.join(", ");
 	for (const [key, value] of Object.entries(headers)) {
 		event.res.headers.append(key, value);
 		event.res.errHeaders.append(key, value);
@@ -2409,7 +2504,7 @@ function timingSafeEqual(a, b) {
 	return result === 0;
 }
 function randomJitter() {
-	const randomBuffer = new Uint32Array(1);
+	const randomBuffer = /* @__PURE__ */ new Uint32Array(1);
 	crypto.getRandomValues(randomBuffer);
 	const jitter = randomBuffer[0] % 100;
 	return new Promise((resolve) => setTimeout(resolve, jitter));
@@ -2430,6 +2525,7 @@ async function requireBasicAuth(event, opts) {
 		throw authFailed(event, opts?.realm);
 	}
 	const colonIndex = authDecoded.indexOf(":");
+	if (colonIndex === -1) throw authFailed(event, opts?.realm);
 	const username = authDecoded.slice(0, colonIndex);
 	const password = authDecoded.slice(colonIndex + 1);
 	if (!username || !password) throw authFailed(event, opts?.realm);
@@ -2473,12 +2569,20 @@ async function getRequestFingerprint(event, opts = {}) {
 function defineWebSocket(hooks) {
 	return hooks;
 }
-function defineWebSocketHandler(hooks) {
+function defineWebSocketHandler(hooks, http) {
 	return defineHandler(function _webSocketHandler(event) {
+		if (http && !isWebSocketUpgrade(event)) return http(event);
 		const crossws = typeof hooks === "function" ? hooks(event) : hooks;
-		return Object.assign(new Response("WebSocket upgrade is required.", { status: 426 }), { crossws });
+		if (crossws instanceof Promise) return crossws.then(toUpgradeResponse);
+		return toUpgradeResponse(crossws);
 	});
 }
+function isWebSocketUpgrade(event) {
+	return event.req.headers.get("upgrade")?.toLowerCase() === "websocket";
+}
+function toUpgradeResponse(crossws) {
+	return Object.assign(new Response("WebSocket upgrade is required.", { status: 426 }), { crossws });
+}
 const PARSE_ERROR = -32700;
 const INVALID_REQUEST = -32600;
 const METHOD_NOT_FOUND = -32601;
@@ -2534,7 +2638,10 @@ async function processJsonRpcBody(body, methodMap, context) {
 async function processJsonRpcMethod(raw, methodMap, context) {
 	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return createJsonRpcError(null, INVALID_REQUEST, "Invalid Request");
 	const req = raw;
-	if (req.jsonrpc !== "2.0" || typeof req.method !== "string" || "id" in req && !isValidId(req.id)) return createJsonRpcError("id" in req && isValidId(req.id) ? req.id : null, INVALID_REQUEST, "Invalid Request");
+	if (req.jsonrpc !== "2.0" || typeof req.method !== "string" || "id" in req && !isValidId(req.id)) {
+		const id = "id" in req && isValidId(req.id) ? req.id : null;
+		return createJsonRpcError(id, INVALID_REQUEST, "Invalid Request");
+	}
 	if ("params" in req && req.params !== void 0 && (typeof req.params !== "object" || req.params === null)) return isNotification(req) ? void 0 : createJsonRpcError(req.id, INVALID_PARAMS, "Invalid params");
 	if (req.method.startsWith("rpc.")) return isNotification(req) ? void 0 : createJsonRpcError(req.id, METHOD_NOT_FOUND, "Method not found");
 	const method = req.method;
@@ -2565,7 +2672,8 @@ async function processJsonRpcMethod(raw, methodMap, context) {
 		};
 		const statusCode = h3Error.status;
 		const statusMessage = h3Error.message;
-		return createJsonRpcError(id, mapHttpStatusToJsonRpcError(statusCode), statusMessage, h3Error.data);
+		const errorCode = mapHttpStatusToJsonRpcError(statusCode);
+		return createJsonRpcError(id, errorCode, statusMessage, h3Error.data);
 	}
 }
 function mapHttpStatusToJsonRpcError(status) {
@@ -2721,4 +2829,4 @@ const toNodeListener = toNodeHandler;
 const createApp = (config) => new H3(config);
 const createRouter$1 = (config) => new H3(config);
 const useBase = withBase;
-export { basicAuth as $, defineLazyEventHandler as $t, readFormDataBody as A, freezeApp as An, bodyLimit as At, setHeader as B, redirect as Bt, getResponseHeader as C, toMiddleware as Cn, parseCookies as Ct, isError as D, sanitizeStatusCode as Dn, getProxyRequestHeaders as Dt, getResponseStatusText as E, HTTPError as En, fetchWithEvent as Et, sendNoContent as F, readBody as Ft, toNodeHandler as G, defineNodeHandler as Gt, setResponseHeader as H, writeEarlyHints as Ht, sendProxy as I, readValidatedBody as It, defineJsonRpcHandler as J, fromWebHandler as Jt, toNodeListener as K, defineNodeMiddleware as Kt, sendRedirect as L, html as Lt, readRawBody as M, onRequest as Mt, removeResponseHeader as N, onResponse as Nt, lazyEventHandler as O, sanitizeStatusMessage as On, proxy as Ot, sendIterable as P, assertBodySize as Pt, getRequestFingerprint as Q, defineHandler as Qt, sendStream as R, iterable as Rt, getRequestWebStream as S, defineMiddleware as Sn, getValidatedCookies as St, getResponseStatus as T, toResponse as Tn, setCookie as Tt, setResponseHeaders as U, defineRoute as Ut, setHeaders as V, redirectBack as Vt, setResponseStatus as W, removeRoute$1 as Wt, defineWebSocket as X, H3 as Xt, defineJsonRpcWebSocketHandler as Y, toWebHandler as Yt, defineWebSocketHandler as Z, H3Core as Zt, getHeaders as _, getEventContext as _n, createEventStream as _t, appendResponseHeaders as a, getRequestHost as an, isCorsOriginAllowed as at, getRequestHeaders as b, mockEvent as bn, getChunkedCookie as bt, createError as c, getRequestURL as cn, sealSession as ct, defineEventHandler as d, getValidatedQuery as dn, useSession as dt, defineValidatedHandler as en, requireBasicAuth as et, defineNodeListener as f, getValidatedRouterParams as fn, withBase as ft, getHeader as g, toRequest as gn, withServerTiming as gt, getBodyStream as h, requestWithURL as hn, setServerTiming as ht, appendResponseHeader as i, getQuery as in, isPreflightRequest as it, readMultipartFormData as j, onError as jt, readFormData as k, H3Event as kn, proxyRequest as kt, createRouter$1 as l, getRouterParam as ln, unsealSession as lt, fromNodeMiddleware as m, requestWithBaseURL as mn, handleCacheHeaders as mt, appendHeader as n, toEventHandler as nn, appendCorsPreflightHeaders as nt, clearResponseHeaders as o, getRequestIP as on, clearSession as ot, eventHandler as p, isMethod as pn, serveStatic as pt, useBase as q, fromNodeHandler as qt, appendHeaders as r, assertMethod as rn, handleCors as rt, createApp as s, getRequestProtocol as sn, getSession as st, H3Error as t, dynamicEventHandler as tn, appendCorsHeaders as tt, defaultContentType as u, getRouterParams as un, updateSession as ut, getMethod as v, isEvent as vn, deleteChunkedCookie as vt, getResponseHeaders as w, HTTPResponse as wn, setChunkedCookie as wt, getRequestPath as x, callMiddleware as xn, getCookie as xt, getRequestHeader as y, isHTTPEvent as yn, deleteCookie as yt, sendWebResponse as z, noContent as zt };
+export { H3, H3Core, H3Error, H3Event, HTTPError, HTTPResponse, appendCorsHeaders, appendCorsPreflightHeaders, appendHeader, appendHeaders, appendResponseHeader, appendResponseHeaders, assertBodySize, assertMethod, basicAuth, bodyLimit, callMiddleware, clearResponseHeaders, clearSession, createApp, createError, createEventStream, createRouter$1 as createRouter, defaultContentType, defineEventHandler, defineHandler, defineJsonRpcHandler, defineJsonRpcWebSocketHandler, defineLazyEventHandler, defineMiddleware, defineNodeHandler, defineNodeListener, defineNodeMiddleware, definePlugin, defineRoute, defineValidatedHandler, defineWebSocket, defineWebSocketHandler, deleteChunkedCookie, deleteCookie, dynamicEventHandler, eventHandler, fetchWithEvent, freezeApp, fromNodeHandler, fromNodeMiddleware, fromWebHandler, getBodyStream, getChunkedCookie, getCookie, getEventContext, getHeader, getHeaders, getMethod, getProxyRequestHeaders, getQuery, getRequestFingerprint, getRequestHeader, getRequestHeaders, getRequestHost, getRequestIP, getRequestPath, getRequestProtocol, getRequestURL, getRequestWebStream, getResponseHeader, getResponseHeaders, getResponseStatus, getResponseStatusText, getRouterParam, getRouterParams, getSession, getValidatedCookies, getValidatedQuery, getValidatedRouterParams, handleCacheHeaders, handleCors, html, isCorsOriginAllowed, isError, isEvent, isHTTPEvent, isMethod, isPreflightRequest, iterable, lazyEventHandler, mockEvent, noContent, onError, onRequest, onResponse, parseCookies, proxy, proxyRequest, readBody, readFormData, readFormDataBody, readMultipartFormData, readRawBody, readValidatedBody, redirect, redirectBack, removeResponseHeader, removeRoute$1 as removeRoute, requestWithBaseURL, requestWithURL, requireBasicAuth, resolveDotSegments, sanitizeStatusCode, sanitizeStatusMessage, sealSession, sendIterable, sendNoContent, sendProxy, sendRedirect, sendStream, sendWebResponse, serveStatic, setChunkedCookie, setCookie, setHeader, setHeaders, setResponseHeader, setResponseHeaders, setResponseStatus, setServerTiming, toEventHandler, toMiddleware, toNodeHandler, toNodeListener, toRequest, toResponse, toWebHandler, unsealSession, updateSession, useBase, useSession, withBase, withServerTiming, writeEarlyHints };