nitro 3.0.1-alpha.2 → 3.0.260415-beta

package/dist/presets/azure/runtime/_utils.mjs

@@ -14,12 +14,12 @@ export function getAzureParsedCookiesFromHeaders(headers) {
 		const setCookieOptions = Object.fromEntries(_setCookieOptions.map(([k, v]) => [k.toLowerCase(), v]));
 		const cookieObject = {
 			name: key,
-			value,
+			value: value || "",
 			domain: setCookieOptions.domain,
 			path: setCookieOptions.path,
-			expires: parseNumberOrDate(setCookieOptions.expires),
+			expires: parseNumberOrDate(setCookieOptions.expires || ""),
 			sameSite: setCookieOptions.samesite,
-			maxAge: parseNumber(setCookieOptions["max-age"]),
+			maxAge: parseNumber(setCookieOptions["max-age"] || ""),
 			secure: setCookieStr.includes("Secure") ? true : undefined,
 			httpOnly: setCookieStr.includes("HttpOnly") ? true : undefined
 		};
@@ -32,7 +32,7 @@ function parseNumberOrDate(expires) {
 	if (expiresAsNumber !== undefined) {
 		return expiresAsNumber;
 	}
-	// Convert to Date if possible
+	
 	const expiresAsDate = new Date(expires);
 	if (!Number.isNaN(expiresAsDate.getTime())) {
 		return expiresAsDate;
@@ -42,7 +42,7 @@ function parseNumber(maxAge) {
 	if (!maxAge) {
 		return undefined;
 	}
-	// Convert to number if possible
+	
 	const maxAgeAsNumber = Number(maxAge);
 	if (!Number.isNaN(maxAgeAsNumber)) {
 		return maxAgeAsNumber;

package/dist/presets/azure/runtime/azure-swa.mjs

@@ -6,12 +6,12 @@ const nitroApp = useNitroApp();
 export async function handle(context, req) {
 	let url;
 	if (req.headers["x-ms-original-url"]) {
-		// This URL has been proxied as there was no static file matching it.
+		
 		const parsedURL = parseURL(req.headers["x-ms-original-url"]);
 		url = parsedURL.pathname + parsedURL.search;
 	} else {
-		// Because Azure SWA handles /api/* calls differently they
-		// never hit the proxy and we have to reconstitute the URL.
+		
+		
 		url = "/api/" + (req.params.url || "");
 	}
 	const request = new Request(url, {
@@ -19,8 +19,8 @@ export async function handle(context, req) {
 		body: req.bufferBody ?? req.rawBody
 	});
 	const response = await nitroApp.fetch(request);
-	// (v3 - current) https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-node?tabs=typescript%2Cwindows%2Cazure-cli&pivots=nodejs-model-v3#http-response
-	// (v4) https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-node?tabs=typescript%2Cwindows%2Cazure-cli&pivots=nodejs-model-v4#http-response
+	
+	
 	context.res = {
 		status: response.status,
 		body: response.body,

package/dist/presets/bun/runtime/bun.mjs

@@ -5,11 +5,13 @@ import { useNitroApp } from "nitro/app";
 import { startScheduleRunner } from "#nitro/runtime/task";
 import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
 import { resolveWebsocketHooks } from "#nitro/runtime/app";
-const port = Number.parseInt(process.env.NITRO_PORT || process.env.PORT || "") || 3e3;
+import { tracingSrvxPlugins } from "#nitro/virtual/tracing";
+const _parsedPort = Number.parseInt(process.env.NITRO_PORT ?? process.env.PORT ?? "");
+const port = Number.isNaN(_parsedPort) ? 3e3 : _parsedPort;
 const host = process.env.NITRO_HOST || process.env.HOST;
 const cert = process.env.NITRO_SSL_CERT;
 const key = process.env.NITRO_SSL_KEY;
-// const socketPath = process.env.NITRO_UNIX_SOCKET; // TODO
+
 const nitroApp = useNitroApp();
 let _fetch = nitroApp.fetch;
 const ws = import.meta._websocket ? wsAdapter({ resolve: resolveWebsocketHooks }) : undefined;
@@ -21,7 +23,7 @@ if (import.meta._websocket) {
 		return nitroApp.fetch(req);
 	};
 }
-serve({
+const server = serve({
 	port,
 	hostname: host,
 	tls: cert && key ? {
@@ -29,11 +31,12 @@ serve({
 		key
 	} : undefined,
 	fetch: _fetch,
-	bun: { websocket: import.meta._websocket ? ws?.websocket : undefined }
+	bun: { websocket: import.meta._websocket ? ws?.websocket : undefined },
+	plugins: [...tracingSrvxPlugins]
 });
 trapUnhandledErrors();
-// Scheduled tasks
+
 if (import.meta._tasks) {
-	startScheduleRunner();
+	startScheduleRunner({ waitUntil: server.waitUntil });
 }
 export default {};

package/dist/presets/cloudflare/runtime/_module-handler.mjs

@@ -13,7 +13,7 @@ export function createHandler(hooks) {
 			});
 			const ctxExt = {};
 			const url = new URL(request.url);
-			// Preset-specific logic
+			
 			if (hooks.fetch) {
 				const res = await hooks.fetch(request, env, context, url, ctxExt);
 				if (res) {

package/dist/presets/cloudflare/runtime/cloudflare-durable.mjs

@@ -23,14 +23,14 @@ const ws = import.meta._websocket ? wsAdapter({
 	bindingName: DURABLE_BINDING
 }) : undefined;
 export default createHandler({ fetch(request, env, context, url, ctxExt) {
-	// Static assets fallback (optional binding)
+	
 	if (env.ASSETS && isPublicAssetURL(url.pathname)) {
 		return env.ASSETS.fetch(request);
 	}
-	// Expose stub fetch to the context
+	
 	ctxExt.durableFetch = (req = request) => getDurableStub(env).fetch(req);
-	// Websocket upgrade
-	// https://crossws.unjs.io/adapters/cloudflare#durable-objects
+	
+	
 	if (import.meta._websocket && request.headers.get("upgrade") === "websocket") {
 		return ws.handleUpgrade(request, env, context);
 	}

package/dist/presets/cloudflare/runtime/cloudflare-module.mjs

@@ -5,12 +5,12 @@ import { createHandler } from "./_module-handler.mjs";
 import { resolveWebsocketHooks } from "#nitro/runtime/app";
 const ws = import.meta._websocket ? wsAdapter({ resolve: resolveWebsocketHooks }) : undefined;
 export default createHandler({ fetch(cfRequest, env, context, url) {
-	// Static assets fallback (optional binding)
+	
 	if (env.ASSETS && isPublicAssetURL(url.pathname)) {
 		return env.ASSETS.fetch(cfRequest);
 	}
-	// Websocket upgrade
-	// https://crossws.unjs.io/adapters/cloudflare
+	
+	
 	if (import.meta._websocket && cfRequest.headers.get("upgrade") === "websocket") {
 		return ws.handleUpgrade(cfRequest, env, context);
 	}

package/dist/presets/cloudflare/runtime/cloudflare-pages.mjs

@@ -13,8 +13,8 @@ export default {
 			env,
 			context
 		});
-		// Websocket upgrade
-		// https://crossws.unjs.io/adapters/cloudflare
+		
+		
 		if (import.meta._websocket && cfReq.headers.get("upgrade") === "websocket") {
 			return ws.handleUpgrade(cfReq, env, context);
 		}

package/dist/presets/cloudflare/runtime/plugin.dev.mjs

@@ -7,32 +7,21 @@ globalThis.__env__ = proxy.env;
 globalThis.__wait_until__ = proxy.ctx.waitUntil.bind(proxy.ctx);
 const cloudflareDevPlugin = function(nitroApp) {
 	nitroApp.hooks.hook("request", async (event) => {
-		event.req.context ??= {};
-		// Inject the various cf values from the proxy in event and event.context
-		event.req.context.cf = proxy.cf;
-		event.req.context.waitUntil = proxy.ctx.waitUntil.bind(proxy.ctx);
 		const request = event.req;
-		request.cf = proxy.cf;
-		event.req.context.cloudflare = {
-			...event.req.context.cloudflare,
-			request,
+		request.runtime ??= { name: "cloudflare" };
+		request.runtime.cloudflare = {
+			...request.runtime.cloudflare,
 			env: proxy.env,
 			context: proxy.ctx
 		};
-		// Replicate Nitro production behavior
-		// https://github.com/unjs/nitro/blob/main/src/runtime/entries/cloudflare-pages.ts#L55
-		// https://github.com/unjs/nitro/blob/main/src/runtime/app.ts#L120
-		// TODO: Update for v3
-		// (event.node.req as any).__unenv__ = {
-		//   ...(event.node.req as any).__unenv__,
-		//   waitUntil: event.context.waitUntil,
-		// };
+		request.waitUntil = proxy.ctx.waitUntil.bind(proxy.ctx);
+		request.cf = proxy.cf;
 	});
-	// https://github.com/pi0/nitro-cloudflare-dev/issues/5
-	// https://github.com/unjs/hookable/issues/98
+	
+	
 	// @ts-expect-error
 	nitroApp.hooks._hooks.request.unshift(nitroApp.hooks._hooks.request.pop());
-	// Dispose proxy when Nitro is closed
+	
 	nitroApp.hooks.hook("close", () => {
 		return proxy?.dispose();
 	});
@@ -51,8 +40,8 @@ async function _getPlatformProxy() {
 		configPath: runtimeConfig.wrangler.configPath,
 		persist: { path: runtimeConfig.wrangler.persistDir }
 	};
-	// TODO: investigate why
-	// https://github.com/pi0/nitro-cloudflare-dev/issues/51
+	
+	
 	if (runtimeConfig.wrangler.environment) {
 		proxyOptions.environment = runtimeConfig.wrangler.environment;
 	}

package/dist/presets/deno/runtime/deno-deploy.mjs

@@ -4,14 +4,14 @@ import { useNitroApp } from "nitro/app";
 import { resolveWebsocketHooks } from "#nitro/runtime/app";
 const nitroApp = useNitroApp();
 const ws = import.meta._websocket ? wsAdapter({ resolve: resolveWebsocketHooks }) : undefined;
-// TODO: Migrate to srvx to provide request IP
+
 Deno.serve((denoReq, info) => {
-	// srvx compatibility
+	
 	const req = denoReq;
 	req.runtime ??= { name: "deno" };
 	req.runtime.deno ??= { info };
-	// TODO: Support remoteAddr
-	// https://crossws.unjs.io/adapters/deno
+	req.ip = info.remoteAddr.hostname;
+	
 	if (import.meta._websocket && req.headers.get("upgrade") === "websocket") {
 		return ws.handleUpgrade(req, info);
 	}

package/dist/presets/deno/runtime/deno-server.mjs

@@ -5,11 +5,13 @@ import { useNitroApp } from "nitro/app";
 import { startScheduleRunner } from "#nitro/runtime/task";
 import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
 import { resolveWebsocketHooks } from "#nitro/runtime/app";
-const port = Number.parseInt(process.env.NITRO_PORT || process.env.PORT || "") || 3e3;
+import { tracingSrvxPlugins } from "#nitro/virtual/tracing";
+const _parsedPort = Number.parseInt(process.env.NITRO_PORT ?? process.env.PORT ?? "");
+const port = Number.isNaN(_parsedPort) ? 3e3 : _parsedPort;
 const host = process.env.NITRO_HOST || process.env.HOST;
 const cert = process.env.NITRO_SSL_CERT;
 const key = process.env.NITRO_SSL_KEY;
-// const socketPath = process.env.NITRO_UNIX_SOCKET; // TODO
+
 const nitroApp = useNitroApp();
 let _fetch = nitroApp.fetch;
 if (import.meta._websocket) {
@@ -21,18 +23,19 @@ if (import.meta._websocket) {
 		return nitroApp.fetch(req);
 	};
 }
-serve({
+const server = serve({
 	port,
 	hostname: host,
 	tls: cert && key ? {
 		cert,
 		key
 	} : undefined,
-	fetch: _fetch
+	fetch: _fetch,
+	plugins: [...tracingSrvxPlugins]
 });
 trapUnhandledErrors();
-// Scheduled tasks
+
 if (import.meta._tasks) {
-	startScheduleRunner();
+	startScheduleRunner({ waitUntil: server.waitUntil });
 }
 export default {};

package/dist/presets/edgeone/runtime/edgeone.mjs

@@ -0,0 +1,10 @@
+import "#nitro/virtual/polyfills";
+import { NodeRequest } from "srvx/node";
+import { useNitroApp } from "nitro/app";
+const nitroApp = useNitroApp();
+
+export default async function handle(req) {
+	
+	const request = new NodeRequest({ req });
+	return nitroApp.fetch(request);
+}

package/dist/presets/netlify/runtime/netlify-edge.mjs

@@ -2,13 +2,12 @@ import "#nitro/virtual/polyfills";
 import { useNitroApp } from "nitro/app";
 import { isPublicAssetURL } from "#nitro/virtual/public-assets";
 const nitroApp = useNitroApp();
-// https://docs.netlify.com/edge-functions/api/
+
 export default async function netlifyEdge(netlifyReq, context) {
-	// srvx compatibility
+	
 	const req = netlifyReq;
 	req.ip = context.ip;
 	req.runtime ??= { name: "netlify-edge" };
-	// @ts-expect-error (add to srvx types)
 	req.runtime.netlify ??= { context };
 	const url = new URL(req.url);
 	if (isPublicAssetURL(url.pathname)) {

package/dist/presets/netlify/runtime/netlify.mjs

@@ -4,7 +4,7 @@ const nitroApp = useNitroApp();
 const ONE_YEAR_IN_SECONDS = 365 * 24 * 60 * 60;
 const handler = async (req) => {
 	req.runtime ??= { name: "netlify" };
-	req.ip = req.headers.get("x-nf-client-connection-ip") || undefined;
+	req.ip ??= req.headers.get("x-nf-client-connection-ip") || undefined;
 	const response = await nitroApp.fetch(req);
 	const isr = (req.context?.routeRules || {})?.isr?.options;
 	if (isr) {

package/dist/presets/node/runtime/node-cluster.mjs

@@ -6,11 +6,12 @@ import { useNitroApp } from "nitro/app";
 import { startScheduleRunner } from "#nitro/runtime/task";
 import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
 import { resolveWebsocketHooks } from "#nitro/runtime/app";
-const port = Number.parseInt(process.env.NITRO_PORT || process.env.PORT || "") || 3e3;
+const _parsedPort = Number.parseInt(process.env.NITRO_PORT ?? process.env.PORT ?? "");
+const port = Number.isNaN(_parsedPort) ? 3e3 : _parsedPort;
 const host = process.env.NITRO_HOST || process.env.HOST;
 const cert = process.env.NITRO_SSL_CERT;
 const key = process.env.NITRO_SSL_KEY;
-// const socketPath = process.env.NITRO_UNIX_SOCKET; // TODO
+
 const clusterId = cluster.isWorker && process.env.WORKER_ID;
 if (clusterId) {
 	console.log(`Worker #${clusterId} started`);
@@ -46,8 +47,8 @@ if (import.meta._websocket) {
 	});
 }
 trapUnhandledErrors();
-// Scheduled tasks
+
 if (import.meta._tasks) {
-	startScheduleRunner();
+	startScheduleRunner({ waitUntil: server.waitUntil });
 }
 export default {};

package/dist/presets/node/runtime/node-middleware.mjs

@@ -8,7 +8,7 @@ const nitroApp = useNitroApp();
 export const middleware = toNodeHandler(nitroApp.fetch);
 const ws = import.meta._websocket ? wsAdapter({ resolve: resolveWebsocketHooks }) : undefined;
 export const handleUpgrade = ws?.handleUpgrade;
-// Scheduled tasks
+
 if (import.meta._tasks) {
 	startScheduleRunner();
 }

package/dist/presets/node/runtime/node-server.mjs

@@ -5,11 +5,13 @@ import { useNitroApp } from "nitro/app";
 import { startScheduleRunner } from "#nitro/runtime/task";
 import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
 import { resolveWebsocketHooks } from "#nitro/runtime/app";
-const port = Number.parseInt(process.env.NITRO_PORT || process.env.PORT || "") || 3e3;
+import { tracingSrvxPlugins } from "#nitro/virtual/tracing";
+const _parsedPort = Number.parseInt(process.env.NITRO_PORT ?? process.env.PORT ?? "");
+const port = Number.isNaN(_parsedPort) ? 3e3 : _parsedPort;
 const host = process.env.NITRO_HOST || process.env.HOST;
 const cert = process.env.NITRO_SSL_CERT;
 const key = process.env.NITRO_SSL_KEY;
-// const socketPath = process.env.NITRO_UNIX_SOCKET; // TODO
+
 const nitroApp = useNitroApp();
 const server = serve({
 	port,
@@ -18,7 +20,8 @@ const server = serve({
 		cert,
 		key
 	} : undefined,
-	fetch: nitroApp.fetch
+	fetch: nitroApp.fetch,
+	plugins: [...tracingSrvxPlugins]
 });
 if (import.meta._websocket) {
 	const { handleUpgrade } = wsAdapter({ resolve: resolveWebsocketHooks });
@@ -39,8 +42,8 @@ if (import.meta._websocket) {
 	});
 }
 trapUnhandledErrors();
-// Scheduled tasks
+
 if (import.meta._tasks) {
-	startScheduleRunner();
+	startScheduleRunner({ waitUntil: server.waitUntil });
 }
 export default {};

package/dist/presets/stormkit/runtime/stormkit.mjs

@@ -8,9 +8,8 @@ export const handler = async function(event, context) {
 		headers: event.headers,
 		body: event.body
 	});
-	// srvx compatibility
+	
 	req.runtime ??= { name: "stormkit" };
-	// @ts-expect-error (add to srvx types)
 	req.runtime.stormkit ??= {
 		event,
 		context

package/dist/presets/vercel/runtime/cron-handler.mjs

@@ -0,0 +1,25 @@
+import { timingSafeEqual } from "node:crypto";
+import { defineHandler, HTTPError } from "nitro/h3";
+import { runCronTasks } from "#nitro/runtime/task";
+export default defineHandler(async (event) => {
+	
+	const cronSecret = process.env.CRON_SECRET;
+	if (cronSecret) {
+		const authHeader = event.req.headers.get("authorization") || "";
+		const expected = `Bearer ${cronSecret}`;
+		const a = Buffer.from(authHeader);
+		const b = Buffer.from(expected);
+		if (a.length !== b.length || !timingSafeEqual(a, b)) {
+			throw new HTTPError("Unauthorized", { status: 401 });
+		}
+	}
+	const cron = event.req.headers.get("x-vercel-cron-schedule");
+	if (!cron) {
+		throw new HTTPError("Missing x-vercel-cron-schedule header", { status: 400 });
+	}
+	await runCronTasks(cron, {
+		context: { waitUntil: event.req.waitUntil },
+		payload: { scheduledTime: Date.now() }
+	});
+	return { success: true };
+});

package/dist/presets/vercel/runtime/queue-handler.mjs

@@ -0,0 +1,21 @@
+import { handleCallback, send } from "@vercel/queue";
+import { defineHandler } from "nitro";
+import { useNitroApp, useNitroHooks } from "nitro/app";
+export default defineHandler((event) => {
+	return handleCallback(async (message, metadata) => {
+		try {
+			await useNitroHooks().callHook("vercel:queue", {
+				message,
+				metadata,
+				send
+			});
+		} catch (error) {
+			console.error("[vercel:queue]", error);
+			useNitroApp().captureError?.(error, {
+				event,
+				tags: ["vercel:queue"]
+			});
+			throw error;
+		}
+	})(event.req);
+});

package/dist/presets/vercel/runtime/vercel.node.mjs

@@ -5,14 +5,14 @@ import { isrRouteRewrite } from "./isr.mjs";
 const nitroApp = useNitroApp();
 const handler = toNodeHandler(nitroApp.fetch);
 export default function nodeHandler(req, res) {
-	// https://vercel.com/docs/headers/request-headers#x-forwarded-for
-	// srvx node adapter uses req.socket.remoteAddress for req.ip
+	
+	
 	let ip;
 	Object.defineProperty(req.socket, "remoteAddress", { get() {
 		const h = req.headers["x-forwarded-for"];
 		return ip ??= h?.split?.(",").shift()?.trim();
 	} });
-	// ISR route rewrite
+	
 	const isrURL = isrRouteRewrite(req.url, req.headers["x-now-route-matches"]);
 	if (isrURL) {
 		const { routeRules } = getRouteRules("", isrURL[0]);

package/dist/presets/vercel/runtime/vercel.web.mjs

@@ -3,7 +3,7 @@ import { useNitroApp, getRouteRules } from "nitro/app";
 import { isrRouteRewrite } from "./isr.mjs";
 const nitroApp = useNitroApp();
 export default { fetch(req, context) {
-	// ISR route rewrite
+	
 	const isrURL = isrRouteRewrite(req.url, req.headers.get("x-now-route-matches"));
 	if (isrURL) {
 		const { routeRules } = getRouteRules("", isrURL[0]);
@@ -11,10 +11,8 @@ export default { fetch(req, context) {
 			req = new Request(new URL(isrURL[0] + (isrURL[1] ? `?${isrURL[1]}` : ""), req.url).href, req);
 		}
 	}
-	req.runtime = {
-		name: "vercel",
-		vercel: { context }
-	};
+	req.runtime ??= { name: "vercel" };
+	req.runtime.vercel = { context };
 	let ip;
 	Object.defineProperty(req, "ip", { get() {
 		const h = req.headers.get("x-forwarded-for");

package/dist/presets/winterjs/runtime/winterjs.mjs

@@ -3,8 +3,8 @@ import "#nitro/virtual/polyfills";
 import { useNitroApp } from "nitro/app";
 import { hasProtocol, joinURL } from "ufo";
 const nitroApp = useNitroApp();
-// Use plain handler as winterjs Web API is incomplete
-// TODO: Migrate to toWebHandler
+
+
 const _handler = toPlainHandler(nitroApp.h3App);
 async function _handleEvent(event) {
 	try {
@@ -33,9 +33,9 @@ async function _handleEvent(event) {
 addEventListener("fetch", async (event) => {
 	event.respondWith(await _handleEvent(event));
 });
-// ------------------------------
-// Polyfills for missing APIs
-// ------------------------------
+
+
+
 function toBuffer(data) {
 	return new Promise((resolve, reject) => {
 		const chunks = [];
@@ -52,20 +52,20 @@ function toBuffer(data) {
 		})).catch(reject);
 	});
 }
-// Headers.entries
+
 if (!Headers.prototype.entries) {
 	// @ts-ignore
 	Headers.prototype.entries = function() {
 		return [...this];
 	};
 }
-// URL.pathname
+
 if (!URL.prototype.pathname) {
 	Object.defineProperty(URL.prototype, "pathname", { get() {
 		return this.path || "/";
 	} });
 }
-// URL constructor (relative support)
+
 const _URL = globalThis.URL;
 globalThis.URL = class URL extends _URL {
 	constructor(url, base) {
@@ -76,7 +76,7 @@ globalThis.URL = class URL extends _URL {
 		super(joinURL(base, url));
 	}
 };
-// Response (avoid Promise body)
+
 const _Response = globalThis.Response;
 globalThis.Response = class Response extends _Response {
 	_body;
@@ -85,7 +85,7 @@ globalThis.Response = class Response extends _Response {
 		this._body = body;
 	}
 	get body() {
-		// TODO: Return ReadableStream (should be iterable)
+		
 		return this._body;
 	}
 };

package/dist/presets/zephyr/runtime/server.mjs

@@ -0,0 +1,3 @@
+import "#nitro/virtual/polyfills";
+import { createHandler } from "../../cloudflare/runtime/_module-handler.mjs";
+export default createHandler({ fetch() {} });

package/dist/runtime/internal/app.mjs

@@ -1,7 +1,7 @@
 import { H3Core, toRequest } from "h3";
 import { HookableCore } from "hookable";
 import { nitroAsyncContext } from "./context.mjs";
-// IMPORTANT: virtual imports and user code should be imported last to avoid initialization order issues
+
 import errorHandler from "#nitro/virtual/error-handler";
 import { plugins } from "#nitro/virtual/plugins";
 import { findRoute, findRouteRules, globalMiddleware, findRoutedMiddleware } from "#nitro/virtual/routing";
@@ -42,7 +42,7 @@ export function serverFetch(resource, init, context) {
 	}
 }
 export async function resolveWebsocketHooks(req) {
-	// https://github.com/h3js/h3/blob/c11ca743d476e583b3b47de1717e6aae92114357/src/utils/ws.ts#L37
+	
 	const hooks = (await serverFetch(req)).crossws;
 	return hooks || {};
 }
@@ -51,7 +51,7 @@ export function fetch(resource, init, context) {
 		return serverFetch(resource, init, context);
 	}
 	resource = resource._request || resource;
-	return fetch(resource, init);
+	return globalThis.fetch(resource, init);
 }
 function createNitroApp() {
 	const hooks = hasHooks ? new HookableCore() : undefined;
@@ -99,7 +99,7 @@ function createNitroApp() {
 		req.context.nitro = req.context.nitro || { errors: [] };
 		return h3App.fetch(req);
 	};
-	// Experimental async context support
+	
 	if (import.meta._asyncContext) {
 		const originalHandler = appHandler;
 		appHandler = (req) => {
@@ -127,9 +127,9 @@ function initNitroPlugins(app) {
 	return app;
 }
 function createH3App(config) {
-	// Create H3 app
+	
 	const h3App = new H3Core(config);
-	// Compiled route matching
+	
 	hasRoutes && (h3App["~findRoute"] = (event) => findRoute(event.req.method, event.url.pathname));
 	hasGlobalMiddleware && h3App["~middleware"].push(...globalMiddleware);
 	if (hasRouteRules || hasRoutedMiddleware) {
@@ -166,21 +166,21 @@ export function getRouteRules(method, pathname) {
 			const currentRule = routeRules[rule.name];
 			if (currentRule) {
 				if (rule.options === false) {
-					// Remove/Reset existing rule with `false` value
+					
 					delete routeRules[rule.name];
 					continue;
 				}
 				if (typeof currentRule.options === "object" && typeof rule.options === "object") {
-					// Merge nested rule objects
+					
 					currentRule.options = {
 						...currentRule.options,
 						...rule.options
 					};
 				} else {
-					// Override rule if non object
+					
 					currentRule.options = rule.options;
 				}
-				// Routing (route and params)
+				
 				currentRule.route = rule.route;
 				currentRule.params = {
 					...currentRule.params,
@@ -195,7 +195,8 @@ export function getRouteRules(method, pathname) {
 		}
 	}
 	const middleware = [];
-	for (const rule of Object.values(routeRules)) {
+	const orderedRules = Object.values(routeRules).sort((a, b) => (a.handler?.order || 0) - (b.handler?.order || 0));
+	for (const rule of orderedRules) {
 		if (rule.options === false || !rule.handler) {
 			continue;
 		}

package/dist/runtime/internal/cache.d.mts

@@ -4,8 +4,4 @@ export declare function defineCachedFunction<
 	T,
 	ArgsT extends unknown[] = any[]
 >(fn: (...args: ArgsT) => T | Promise<T>, opts?: CacheOptions<T, ArgsT>): (...args: ArgsT) => Promise<T>;
-export declare function cachedFunction<
-	T,
-	ArgsT extends unknown[] = any[]
->(fn: (...args: ArgsT) => T | Promise<T>, opts?: CacheOptions<T>): (...args: ArgsT) => Promise<T | undefined>;
 export declare function defineCachedHandler(handler: EventHandler, opts?: CachedEventHandlerOptions): EventHandler;