vinext 1.0.0-beta.9 → 1.0.1

package/dist/server/prod-server.js

@@ -1,30 +1,32 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { isUnknownRecord } from "../utils/record.js";
+import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
+import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
+import { StaticFileCache, contentTypeForPath, etagFromFilenameHash } from "./static-file-cache.js";
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
-import { VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import { VINEXT_PRERENDER_RENDER_ERROR_HEADER } from "./headers.js";
 import { normalizePath } from "./normalize-path.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { readStaticFileSignal } from "./static-file-signal.js";
 import { canonicalizeRequestPathname, filterInternalHeaders } from "./request-pipeline.js";
-import { isUnknownRecord } from "../utils/record.js";
 import { parseHttpDate } from "./http-date.js";
 import { evaluateStaticPreconditions } from "./http-conditional.js";
 import { buildNextDataNotFoundResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./pages-data-route.js";
-import { ASSET_PREFIX_URL_DIR, assetPrefixPathname, isAbsoluteAssetPrefix } from "../utils/asset-prefix.js";
 import { setPagesClientAssets } from "./pages-client-assets.js";
 import { resolveRequestHost, resolveRequestProtocol, trustProxy, trustedHosts } from "./proxy-trust.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, isSafeImageContentType, parseImageParams } from "./image-optimization.js";
 import { installSocketErrorBackstop } from "./socket-error-backstop.js";
-import { StaticFileCache, contentTypeForPath, etagFromFilenameHash } from "./static-file-cache.js";
 import { collectInlineCssManifest } from "../build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./revalidation-host.js";
-import { finalizeMissingStaticAssetResponse, mergeHeaders } from "./worker-utils.js";
+import { traceFrameworkRequest } from "./request-tracing.js";
+import { mergeHeaders } from "./worker-utils.js";
 import { runPagesRequest, wrapMiddlewareWithBasePath } from "./pages-request-pipeline.js";
 import { computeClientRuntimeMetadata } from "../utils/client-runtime-metadata.js";
-import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { readPrerenderSecret } from "../build/server-manifest.js";
+import { readTrustedPrerenderRouteParamsFromHeaders, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { registerPrerenderCloudflareLoader } from "../build/prerender-cloudflare-loader.js";
 import { seedMemoryCacheFromPrerender } from "./seed-cache.js";
 import { negotiateEncoding, parseAcceptedEncodings, selectContentEncoding } from "./accept-encoding.js";
 import { ifRangeAllowsRange, parseByteRange } from "./http-range.js";
@@ -40,7 +42,7 @@ import { createServer } from "node:http";
 /**
 * Production server for vinext.
 *
-* Serves the built output from `vinext build`. Handles:
+* Serves the built output from `vite build`. Handles:
 * - Static asset serving from client build output
 * - Pages Router: SSR rendering + API route handling
 * - App Router: RSC/SSR rendering, route handlers, server actions
@@ -314,7 +316,7 @@ const OMIT_METHOD_NOT_ALLOWED_HEADERS = /* @__PURE__ */ new Set([
 	"content-type",
 	"transfer-encoding"
 ]);
-function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix) {
+function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix, crossOrigin) {
 	const metadata = computeClientRuntimeMetadata({
 		clientDir,
 		assetBase,
@@ -323,7 +325,8 @@ function installClientBuildManifestGlobals(clientDir, assetBase, assetPrefix) {
 	setPagesClientAssets({
 		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
 		lazyChunks: metadata.lazyChunks,
-		dynamicPreloads: metadata.dynamicPreloads
+		dynamicPreloads: metadata.dynamicPreloads,
+		crossOrigin
 	});
 }
 function isNoBodyResponseStatus(status) {
@@ -795,8 +798,32 @@ async function sendWebResponse(webResponse, req, res, compress) {
 		return;
 	}
 	const nodeStream = Readable.fromWeb(webResponse.body);
-	if (shouldCompress) pipeline(nodeStream, createCompressor(encoding, "streaming"), res, () => {});
-	else pipeline(nodeStream, res, () => {});
+	if (shouldCompress) {
+		const compressor = createCompressor(encoding, "streaming");
+		await new Promise((resolve) => {
+			pipeline(nodeStream, compressor, res, () => {
+				resolve();
+			});
+		});
+	} else await new Promise((resolve) => {
+		pipeline(nodeStream, res, () => {
+			resolve();
+		});
+	});
+}
+function waitForNodeResponseCompletion(res) {
+	if (res.writableFinished || res.destroyed) return Promise.resolve();
+	return new Promise((resolve) => {
+		const done = () => {
+			res.off("finish", done);
+			res.off("close", done);
+			res.off("error", done);
+			resolve();
+		};
+		res.once("finish", done);
+		res.once("close", done);
+		res.once("error", done);
+	});
 }
 /**
 * Start the production server.
@@ -806,22 +833,25 @@ async function sendWebResponse(webResponse, req, res, compress) {
 */
 async function startProdServer(options = {}) {
 	installSocketErrorBackstop();
-	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), rscEntryPath: explicitRscEntryPath, serverEntryPath: explicitServerEntryPath, noCompression = false, purpose, silent = false } = options;
+	const { port = process.env.PORT ? parseInt(process.env.PORT) : 3e3, host = "0.0.0.0", outDir = path.resolve("dist"), rscEntryPath: explicitRscEntryPath, serverDir: explicitServerDir, serverEntryPath: explicitServerEntryPath, noCompression = false, purpose, silent = false } = options;
+	if (purpose === "prerender") registerPrerenderCloudflareLoader();
 	const compress = !noCompression;
 	const resolvedOutDir = path.resolve(outDir);
 	const clientDir = path.join(resolvedOutDir, "client");
-	const rscEntryPath = explicitRscEntryPath ? path.resolve(explicitRscEntryPath) : path.join(resolvedOutDir, "server", "index.js");
-	const serverEntryPath = explicitServerEntryPath ? path.resolve(explicitServerEntryPath) : path.join(resolvedOutDir, "server", "entry.js");
+	const serverDir = explicitServerDir ? path.resolve(explicitServerDir) : path.join(resolvedOutDir, "server");
+	const rscEntryPath = explicitRscEntryPath ? path.resolve(explicitRscEntryPath) : path.join(serverDir, "index.js");
+	const serverEntryPath = explicitServerEntryPath ? path.resolve(explicitServerEntryPath) : path.join(serverDir, "entry.js");
 	const isAppRouter = fs.existsSync(rscEntryPath);
 	if (!isAppRouter && !fs.existsSync(serverEntryPath)) {
 		console.error(`[vinext] No build output found in ${outDir}`);
-		console.error("Run `vinext build` first.");
+		console.error("Run `vite build` first.");
 		process.exit(1);
 	}
 	if (isAppRouter) return startAppRouterServer({
 		port,
 		host,
 		clientDir,
+		serverDir,
 		rscEntryPath,
 		compress,
 		purpose,
@@ -953,8 +983,10 @@ function installPagesClientAssets(options) {
 		clientEntry: metadata.clientEntryFile,
 		appBootstrapPreinitModules: metadata.appBootstrapPreinitModules,
 		ssrManifest: Object.keys(ssrManifest).length > 0 ? ssrManifest : void 0,
+		cssGraph: metadata.cssGraph,
 		lazyChunks: metadata.lazyChunks,
-		dynamicPreloads: metadata.dynamicPreloads
+		dynamicPreloads: metadata.dynamicPreloads,
+		crossOrigin: options.crossOrigin
 	});
 	return ssrManifest;
 }
@@ -976,12 +1008,15 @@ function installPagesClientAssets(options) {
 * 4. Stream the Web Response back (with optional compression)
 */
 async function startAppRouterServer(options) {
-	const { port, host, clientDir, rscEntryPath, compress, purpose, silent } = options;
-	const prerenderSecret = readPrerenderSecret(path.dirname(rscEntryPath));
+	const { port, host, clientDir, serverDir, rscEntryPath, compress, purpose, silent } = options;
+	const prerenderSecret = readPrerenderSecret(serverDir);
 	const rscModule = await importServerEntryModule(rscEntryPath);
 	const rscEntryRequire = createServerEntryRequire(rscEntryPath);
 	const rscHandler = resolveAppRouterHandler(rscModule.default);
+	const workerEntry = rscModule.default && typeof rscModule.default === "object" ? rscModule.default : void 0;
+	const ensureInstrumentation = typeof workerEntry?.__ensureInstrumentation === "function" ? () => workerEntry.__ensureInstrumentation() : typeof rscModule.__ensureInstrumentation === "function" ? () => rscModule.__ensureInstrumentation() : () => void 0;
 	const appRouterAssetPrefix = typeof rscModule.__assetPrefix === "string" ? rscModule.__assetPrefix : "";
+	const appRouterCrossOrigin = rscModule.__crossOrigin === "anonymous" || rscModule.__crossOrigin === "use-credentials" ? rscModule.__crossOrigin : "";
 	const appRouterBasePath = typeof rscModule.__basePath === "string" ? rscModule.__basePath : "";
 	const appRouterInlineCss = rscModule.__inlineCss === true;
 	const appRouterHasPagesDir = rscModule.__hasPagesDir === true;
@@ -990,7 +1025,7 @@ async function startAppRouterServer(options) {
 	const appImageAllowedWidths = Array.isArray(rscModule.__imageAllowedWidths) ? rscModule.__imageAllowedWidths : [...DEFAULT_DEVICE_SIZES, ...DEFAULT_IMAGE_SIZES];
 	let imageConfig = typeof rscModule.__imageConfig === "object" && rscModule.__imageConfig !== null ? rscModule.__imageConfig : void 0;
 	if (imageConfig === void 0) {
-		const imageConfigPath = path.join(path.dirname(rscEntryPath), "image-config.json");
+		const imageConfigPath = path.join(serverDir, "image-config.json");
 		if (fs.existsSync(imageConfigPath)) try {
 			imageConfig = JSON.parse(fs.readFileSync(imageConfigPath, "utf-8"));
 		} catch {}
@@ -1002,14 +1037,15 @@ async function startAppRouterServer(options) {
 		clientDir,
 		assetPrefix: appRouterAssetPrefix,
 		assetBase: appAssetBase,
-		clientEntryLookup: "pages-client-entry"
+		clientEntryLookup: "pages-client-entry",
+		crossOrigin: appRouterCrossOrigin
 	});
-	else installClientBuildManifestGlobals(clientDir, appAssetBase, appRouterAssetPrefix);
+	else installClientBuildManifestGlobals(clientDir, appAssetBase, appRouterAssetPrefix, appRouterCrossOrigin);
 	const seedPrerenderedRoutes = resolveAppRouterPrerenderSeeder(rscModule);
-	const seededRoutes = await runWithServerEntryRequire(rscEntryRequire, () => seedPrerenderedRoutes(path.dirname(rscEntryPath)));
+	const seededRoutes = await runWithServerEntryRequire(rscEntryRequire, () => seedPrerenderedRoutes(serverDir));
 	if (seededRoutes > 0) console.log(`[vinext] Seeded ${seededRoutes} pre-rendered route${seededRoutes !== 1 ? "s" : ""} into memory cache`);
 	const staticCache = await StaticFileCache.create(clientDir);
-	const handleRequest = async (req, res) => {
+	const handleRequestImpl = async (req, res) => {
 		const rawUrl = req.url ?? "/";
 		const rawPathname = rawUrl.split("?")[0];
 		if (isOpenRedirectShaped(rawPathname)) {
@@ -1034,22 +1070,22 @@ async function startAppRouterServer(options) {
 				return;
 			}
 		}
-		let missingBuildAsset = false;
 		{
 			const assetLookupPath = resolveAppRouterAssetPath(pathname, appAssetPathPrefix, appRouterAssetPrefix);
 			if (assetLookupPath) {
 				if (await tryServeStatic(req, res, clientDir, assetLookupPath, compress, staticCache)) return;
-				missingBuildAsset = true;
 			}
 		}
 		if (isImageOptimizationPath(pathname)) {
-			const params = parseImageParams(new URL(rawUrl, "http://localhost"), appImageAllowedWidths, imageConfig?.qualities);
+			const parsedUrl = new URL(rawUrl, "http://localhost");
+			const params = parseImageParams(parsedUrl, appImageAllowedWidths, imageConfig?.qualities);
 			if (!params) {
 				res.writeHead(400);
 				res.end("Bad Request");
 				return;
 			}
-			if (!isSafeImageContentType(contentTypeForPath(params.imageUrl), imageConfig?.dangerouslyAllowSVG)) {
+			const ct = contentTypeForPath(params.imageUrl);
+			if (!isSafeImageContentType(ct, imageConfig?.dangerouslyAllowSVG)) {
 				res.writeHead(400);
 				res.end("The requested resource is not an allowed image type");
 				return;
@@ -1067,10 +1103,6 @@ async function startAppRouterServer(options) {
 		try {
 			const request = nodeToWebRequest(req, rawUrl, prerenderSecret, appRouterI18nConfig, appRouterAuthorizeOnDemandRevalidate);
 			const response = await rscHandler(request, createNodeExecutionContext(resolveTrustedNodeRevalidateOrigin(req, host, port)));
-			if (missingBuildAsset && response.status === 404) {
-				await sendWebResponse(finalizeMissingStaticAssetResponse(response, true), req, res, compress);
-				return;
-			}
 			const staticFileSignal = readStaticFileSignal(response);
 			if (staticFileSignal) {
 				let staticFilePath = "/";
@@ -1096,6 +1128,32 @@ async function startAppRouterServer(options) {
 			}
 		}
 	};
+	const handleRequest = async (req, res) => {
+		try {
+			await ensureInstrumentation();
+		} catch (error) {
+			console.error("[vinext] Instrumentation error:", error);
+			if (!res.headersSent) {
+				if (purpose === "prerender") res.setHeader(VINEXT_PRERENDER_RENDER_ERROR_HEADER, "1");
+				res.writeHead(500);
+				res.end("Internal Server Error");
+			}
+			return;
+		}
+		const target = req.url ?? "/";
+		const headers = nodeHeadersToWebHeaders(req.headers);
+		return traceFrameworkRequest({
+			callback: async () => {
+				await handleRequestImpl(req, res);
+				await waitForNodeResponseCompletion(res);
+			},
+			getStatus: () => res.statusCode,
+			headers,
+			isRsc: new URL(target, "http://localhost").pathname.endsWith(".rsc") || headers.get("RSC") === "1",
+			method: req.method ?? "GET",
+			target
+		});
+	};
 	const server = createServer((req, res) => {
 		runWithServerEntryRequire(rscEntryRequire, () => handleRequest(req, res));
 	});
@@ -1118,7 +1176,8 @@ function isPagesServerEntryPageRoute(value) {
 	if (typeof value.pattern !== "string") return false;
 	if (!("module" in value) || value.module === void 0) return true;
 	const pageModule = value.module;
-	if (!pageModule || typeof pageModule !== "object") return false;
+	if (pageModule === null) return true;
+	if (typeof pageModule !== "object") return false;
 	return !("getStaticPaths" in pageModule) || typeof pageModule.getStaticPaths === "function";
 }
 function readPagesServerEntryPageRoutes(value) {
@@ -1142,6 +1201,7 @@ async function startPagesRouterServer(options) {
 	const { renderPage, handleApiRoute: handleApi, authorizeOnDemandRevalidate, runMiddleware, vinextConfig, buildId: pagesBuildId } = serverEntry;
 	const matchPageRoute = typeof serverEntry.matchPageRoute === "function" ? serverEntry.matchPageRoute : void 0;
 	const matchApiRoute = typeof serverEntry.matchApiRoute === "function" ? serverEntry.matchApiRoute : void 0;
+	const ensureInstrumentation = typeof serverEntry.__ensureInstrumentation === "function" ? () => serverEntry.__ensureInstrumentation() : () => void 0;
 	const hasMiddleware = serverEntry.hasMiddleware === true;
 	const pageRoutes = readPagesServerEntryPageRoutes(serverEntry.pageRoutes);
 	const prerenderSecret = readPrerenderSecret(path.dirname(serverEntryPath));
@@ -1171,10 +1231,34 @@ async function startPagesRouterServer(options) {
 		clientDir,
 		assetPrefix,
 		assetBase,
-		clientEntryLookup: "any-client-entry"
+		clientEntryLookup: "any-client-entry",
+		crossOrigin: vinextConfig?.crossOrigin ?? ""
 	});
 	const staticCache = await StaticFileCache.create(clientDir);
 	const handleRequest = async (req, res) => {
+		try {
+			await ensureInstrumentation();
+		} catch (error) {
+			console.error("[vinext] Instrumentation error:", error);
+			if (!res.headersSent) {
+				if (purpose === "prerender") res.setHeader(VINEXT_PRERENDER_RENDER_ERROR_HEADER, "1");
+				res.writeHead(500);
+				res.end("Internal Server Error");
+			}
+			return;
+		}
+		return traceFrameworkRequest({
+			callback: async () => {
+				await handleRequestImpl(req, res);
+				await waitForNodeResponseCompletion(res);
+			},
+			getStatus: () => res.statusCode,
+			headers: nodeHeadersToWebHeaders(req.headers),
+			method: req.method ?? "GET",
+			target: req.url ?? "/"
+		});
+	};
+	const handleRequestImpl = async (req, res) => {
 		const rawUrl = req.url ?? "/";
 		const rawPagesPathnameBeforeNormalize = rawUrl.split("?")[0];
 		if (isOpenRedirectShaped(rawPagesPathnameBeforeNormalize)) {
@@ -1226,7 +1310,6 @@ async function startPagesRouterServer(options) {
 			return;
 		}
 		const pagesAssetLookup = resolveAppRouterAssetPath(pathname, pagesAssetPathPrefix, assetPrefix);
-		const missingBuildAsset = pagesAssetLookup !== null;
 		if (pagesAssetLookup) {
 			if (await tryServeStatic(req, res, clientDir, pagesAssetLookup, compress, staticCache)) return;
 		}
@@ -1291,7 +1374,8 @@ async function startPagesRouterServer(options) {
 				duplex: hasBody ? "half" : void 0
 			});
 			const middlewareRequest = isDataReq && skipProxyUrlNormalize ? new Request(new URL(originalRenderUrl, webRequest.url), webRequest) : void 0;
-			const result = await runPagesRequest(webRequest, {
+			const deps = {
+				assetPrefix,
 				basePath,
 				trailingSlash,
 				i18nConfig,
@@ -1314,18 +1398,20 @@ async function startPagesRouterServer(options) {
 				renderPage: typeof renderPage === "function" ? (request, resolvedUrl, options, stagedHeaders) => renderPage(request, resolvedUrl, ssrManifest, void 0, stagedHeaders, {
 					...options,
 					originalUrl: originalRenderUrl
-				}) : null,
+				}, stagedHeaders?.has("Cache-Control") ? new Headers({ "Cache-Control": stagedHeaders.get("Cache-Control") }) : void 0) : null,
 				handleApi: typeof handleApi === "function" ? (request, apiUrl) => handleApi(request, apiUrl, createNodeExecutionContext(), resolveTrustedNodeRevalidateOrigin(req, host, port), "node") : null,
 				serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl) => {
 					if (isImageOptimizationPath(requestPathname)) {
 						for (const [name, value] of Object.entries(stagedHeaders)) res.setHeader(name, value);
-						const params = parseImageParams(new URL(resolvedUrl, "http://localhost"), allowedImageWidths, pagesImageConfig?.qualities);
+						const parsedUrl = new URL(resolvedUrl, "http://localhost");
+						const params = parseImageParams(parsedUrl, allowedImageWidths, pagesImageConfig?.qualities);
 						if (!params) {
 							res.writeHead(400);
 							res.end("Bad Request");
 							return true;
 						}
-						if (!isSafeImageContentType(contentTypeForPath(params.imageUrl), pagesImageConfig?.dangerouslyAllowSVG)) {
+						const ct = contentTypeForPath(params.imageUrl);
+						if (!isSafeImageContentType(ct, pagesImageConfig?.dangerouslyAllowSVG)) {
 							res.writeHead(400);
 							res.end("The requested resource is not an allowed image type");
 							return true;
@@ -1343,14 +1429,11 @@ async function startPagesRouterServer(options) {
 					if (requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/") || phase === "direct" && requestPathname.startsWith(`/_next/static/`)) return false;
 					return tryServeStatic(req, res, clientDir, requestPathname, compress, staticCache, stagedHeaders);
 				}
-			});
+			};
+			const result = await runPagesRequest(webRequest, deps);
 			if (result.type === "handled") return;
 			if (result.type === "response") {
 				const { response } = result;
-				if (missingBuildAsset && response.status === 404) {
-					await sendWebResponse(finalizeMissingStaticAssetResponse(response, true), req, res, compress);
-					return;
-				}
 				const streamedApi = isVinextStreamedApiResponse(response);
 				if (isVinextStreamedHtmlResponse(response) || streamedApi || !response.body || result.defaultContentType === void 0) {
 					if (streamedApi && result.defaultContentType !== void 0 && !response.headers.has("content-type")) response.headers.set("content-type", result.defaultContentType);
@@ -1399,4 +1482,4 @@ async function startPagesRouterServer(options) {
 	};
 }
 //#endregion
-export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, rememberCurrentServerEntryImportMtime, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic };
+export { COMPRESSIBLE_TYPES, COMPRESS_THRESHOLD, importServerEntryModule, mergeResponseHeaders, mergeWebResponse, negotiateEncoding, nodeToWebRequest, readNodeStream, rememberCurrentServerEntryImportMtime, resolveAppRouterAssetPath, resolveAppRouterPrerenderSeeder, resolveRequestHost as resolveHost, resolveServerEntryImportUrl, sendCompressed, sendWebResponse, startProdServer, trustProxy, trustedHosts, tryServeStatic, waitForNodeResponseCompletion };

package/dist/server/proxy-trust.d.ts

@@ -7,7 +7,7 @@ import { IncomingMessage } from "node:http";
  * without reloading the module, and so existing call sites that imported
  * `trustedHosts` from `prod-server.ts` keep the same semantics.
  */
-declare const trustedHosts: Set<string>;
+export declare const trustedHosts: Set<string>;
 /**
  * Whether to trust `X-Forwarded-Proto` from upstream proxies.
  *
@@ -15,7 +15,7 @@ declare const trustedHosts: Set<string>;
  * non-empty (having trusted hosts implies a trusted proxy). Computed at
  * module load time, matching the existing prod-server behavior.
  */
-declare const trustProxy: boolean;
+export declare const trustProxy: boolean;
 /**
  * Resolve the request protocol, honoring `X-Forwarded-Proto` only when
  * the trust-proxy gate is enabled. Defaults to `"http"`.
@@ -23,7 +23,7 @@ declare const trustProxy: boolean;
  * Accepts either a Node `IncomingMessage` or a Fetch `Headers` instance
  * so the same trust logic can be applied in both server flavors.
  */
-declare function resolveRequestProtocol(source: IncomingMessage | Headers): "http" | "https";
+export declare function resolveRequestProtocol(source: IncomingMessage | Headers): "http" | "https";
 /**
  * Resolve the request host. `X-Forwarded-Host` is honored only when its
  * value matches the `trustedHosts` allow-list. Falls back to the raw
@@ -34,6 +34,5 @@ declare function resolveRequestProtocol(source: IncomingMessage | Headers): "htt
  * `X-Forwarded-Host: evil.com` to a server that resolves redirect URLs
  * against `request.url`.
  */
-declare function resolveRequestHost(source: IncomingMessage | Headers, fallback: string): string;
-//#endregion
-export { resolveRequestHost, resolveRequestProtocol, trustProxy, trustedHosts };
+export declare function resolveRequestHost(source: IncomingMessage | Headers, fallback: string): string;
+//#endregion

package/dist/server/request-log.d.ts

@@ -26,10 +26,9 @@ type RequestLogOptions = {
 /**
  * Print a single request log line to stdout.
  */
-declare function logRequest({ method, url, status, totalMs, compileMs, renderMs }: RequestLogOptions): void;
+export declare function logRequest({ method, url, status, totalMs, compileMs, renderMs }: RequestLogOptions): void;
 /**
  * Returns `performance.now()` - a high-resolution monotonic timestamp.
  */
-declare function now(): number;
-//#endregion
-export { logRequest, now };
+export declare function now(): number;
+//#endregion

package/dist/server/request-pipeline.d.ts

@@ -13,9 +13,9 @@ import { isOpenRedirectShaped } from "./open-redirect.js";
  * must do this before comparing raw route/config/basePath identity so those
  * comparisons agree with the `Request` that userland eventually receives.
  */
-declare function canonicalizeRequestPathname(pathname: string): string;
+export declare function canonicalizeRequestPathname(pathname: string): string;
 /** Canonicalize only the pathname portion while preserving the raw query. */
-declare function canonicalizeRequestUrlPathname(url: string): string;
+export declare function canonicalizeRequestUrlPathname(url: string): string;
 /**
  * Shared request pipeline utilities.
  *
@@ -53,8 +53,8 @@ declare function canonicalizeRequestUrlPathname(url: string): string;
  * @param rawPathname - The raw pathname from the URL, before any normalization
  * @returns A 404 Response if the path is protocol-relative, or null to continue
  */
-declare function guardProtocolRelativeUrl(rawPathname: string): Response | null;
-type HeaderRecord = Record<string, string | string[]>;
+export declare function guardProtocolRelativeUrl(rawPathname: string): Response | null;
+export type HeaderRecord = Record<string, string | string[]>;
 type ResolvePublicFileRouteOptions = {
   cleanPathname: string;
   middlewareContext: StaticFileSignalContext;
@@ -70,8 +70,8 @@ type ResolvePublicFileRouteOptions = {
  * helper owns the RSC exclusion, existence-first method enforcement, and
  * static-file signaling. Missing mutation targets continue through routing.
  */
-declare function resolvePublicFileRoute(options: ResolvePublicFileRouteOptions): Response | null;
-declare function normalizeTrailingSlashPathname(pathname: string, trailingSlash: boolean): string | null;
+export declare function resolvePublicFileRoute(options: ResolvePublicFileRouteOptions): Response | null;
+export declare function normalizeTrailingSlashPathname(pathname: string, trailingSlash: boolean): string | null;
 /**
  * Check if the pathname needs a trailing slash redirect, and return the
  * redirect Response if so.
@@ -90,7 +90,7 @@ declare function normalizeTrailingSlashPathname(pathname: string, trailingSlash:
  * @param search - The query string (including `?`) to preserve in the redirect
  * @returns A 308 redirect Response, or null if no redirect is needed
  */
-declare function normalizeTrailingSlash(pathname: string, basePath: string, trailingSlash: boolean, search: string): Response | null;
+export declare function normalizeTrailingSlash(pathname: string, basePath: string, trailingSlash: boolean, search: string): Response | null;
 /**
  * Validate CSRF origin for server action requests.
  *
@@ -102,7 +102,7 @@ declare function normalizeTrailingSlash(pathname: string, basePath: string, trai
  * @param allowedOrigins - Origins from experimental.serverActions.allowedOrigins
  * @returns A 403 Response if origin validation fails, or null to continue
  */
-declare function validateCsrfOrigin(request: Request, allowedOrigins?: string[]): Response | null;
+export declare function validateCsrfOrigin(request: Request, allowedOrigins?: string[]): Response | null;
 /**
  * Reject malformed Flight container reference graphs in server action payloads.
  *
@@ -115,8 +115,8 @@ declare function validateCsrfOrigin(request: Request, allowedOrigins?: string[])
  * numeric backing-field graphs that contain missing backing fields or cycles.
  * Regular user form fields are ignored entirely.
  */
-declare function validateServerActionPayload(body: string | FormData): Promise<Response | null>;
-declare function isOriginAllowed(origin: string, allowed: string[]): boolean;
+export declare function validateServerActionPayload(body: string | FormData): Promise<Response | null>;
+export declare function isOriginAllowed(origin: string, allowed: string[]): boolean;
 /**
  * Strip internal `x-middleware-*` headers from a Headers object.
  *
@@ -128,7 +128,7 @@ declare function isOriginAllowed(origin: string, allowed: string[]): boolean;
  *
  * @param headers - The Headers object to modify in place
  */
-declare function processMiddlewareHeaders(headers: Headers): void;
+export declare function processMiddlewareHeaders(headers: Headers): void;
 /**
  * Strip internal headers from an inbound request so they cannot be forged by
  * an external attacker to influence routing or impersonate internal state.
@@ -144,14 +144,14 @@ declare function processMiddlewareHeaders(headers: Headers): void;
  * @param headers - The source Headers (never modified)
  * @returns A new Headers with internal framework headers removed
  */
-declare function filterInternalHeaders(headers: Headers): Headers;
+export declare function filterInternalHeaders(headers: Headers): Headers;
 /**
  * Re-attach the Workers-specific `cf` metadata from `source` onto a rebuilt
  * Request. `new Request()` never copies it, and middleware/authorization code
  * can key off `request.cf` (geo checks, bot scores), so every reconstruction
  * must restore it explicitly.
  */
-declare function attachRequestCfMetadata(target: Request, source: Request): Request;
+export declare function attachRequestCfMetadata(target: Request, source: Request): Request;
 /**
  * Clone a Request while overriding headers, preserving metadata when possible.
  *
@@ -160,7 +160,7 @@ declare function attachRequestCfMetadata(target: Request, source: Request): Requ
  * when cloning a foreign Request instance. In that case, fall back to building
  * a RequestInit with best-effort metadata.
  */
-declare function cloneRequestWithHeaders(request: Request, headers: Headers): Request;
+export declare function cloneRequestWithHeaders(request: Request, headers: Headers): Request;
 /**
  * Clone a Request while overriding the URL, preserving headers and metadata
  * when possible.
@@ -173,6 +173,6 @@ declare function cloneRequestWithHeaders(request: Request, headers: Headers): Re
  * both are handled explicitly — the same reasons `cloneRequestWithHeaders`
  * exists.
  */
-declare function cloneRequestWithUrl(request: Request, url: string): Request;
+export declare function cloneRequestWithUrl(request: Request, url: string): Request;
 //#endregion
-export { HeaderRecord, INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, attachRequestCfMetadata, canonicalizeRequestPathname, canonicalizeRequestUrlPathname, cloneRequestWithHeaders, cloneRequestWithUrl, createStaticFileSignal, filterInternalHeaders, guardProtocolRelativeUrl, hasBasePath, isOpenRedirectShaped, isOriginAllowed, normalizeTrailingSlash, normalizeTrailingSlashPathname, processMiddlewareHeaders, resolvePublicFileRoute, stripBasePath, validateCsrfOrigin, validateServerActionPayload };
+export { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, createStaticFileSignal, hasBasePath, isOpenRedirectShaped, stripBasePath };

package/dist/server/request-pipeline.js

@@ -1,7 +1,7 @@
-import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
 import "../utils/protocol-headers.js";
-import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS } from "./headers.js";
 import { getUnconsumedMiddlewareRequestHeaders } from "../utils/middleware-request-headers.js";
+import { hasBasePath, removeTrailingSlash, stripBasePath } from "../utils/base-path.js";
+import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS } from "./headers.js";
 import { forbiddenResponse, methodNotAllowedResponse, notFoundResponse } from "./http-error-responses.js";
 import { isOpenRedirectShaped } from "./open-redirect.js";
 import { createStaticFileSignal } from "./static-file-signal.js";
@@ -336,6 +336,11 @@ function getRequestCf(request) {
 * must restore it explicitly.
 */
 function attachRequestCfMetadata(target, source) {
+	const ownDescriptor = Object.getOwnPropertyDescriptor(source, "cf");
+	if (ownDescriptor) {
+		Object.defineProperty(target, "cf", ownDescriptor);
+		return target;
+	}
 	const cf = getRequestCf(source);
 	if (cf !== void 0) Object.defineProperty(target, "cf", {
 		value: cf,

package/dist/server/request-stage.d.ts

@@ -0,0 +1,5 @@
+import { VinextRequestStageModule } from "./multi-stage.js";
+//#region src/server/request-stage.d.ts
+/** Lazily load the router-specific request stage selected by vinext. */
+export declare function loadVinextRequestStage<Env = unknown, Context = unknown>(): Promise<VinextRequestStageModule<Env, Context>>;
+//#endregion

package/dist/server/request-stage.js

@@ -0,0 +1,7 @@
+//#region src/server/request-stage.ts
+/** Lazily load the router-specific request stage selected by vinext. */
+function loadVinextRequestStage() {
+	return import("virtual:vinext-request-stage");
+}
+//#endregion
+export { loadVinextRequestStage };

package/dist/server/request-tracing.d.ts

@@ -0,0 +1,22 @@
+//#region src/server/request-tracing.d.ts
+type RequestTraceInput<T> = {
+  callback: () => Promise<T>;
+  /** Trace an intentional in-process request as a separate propagated request segment. */
+  detached?: boolean;
+  getStatus(result: T | undefined): number | undefined;
+  headers: Headers;
+  isRsc?: boolean;
+  method: string;
+  target: string;
+};
+export declare function setFrameworkRequestRoute(route: string | undefined, isRsc?: boolean): void;
+export declare function captureFrameworkRequestRoute<T>(callback: () => Promise<T>, onRoute?: (route: string) => void): Promise<{
+  result: T;
+  route: string | undefined;
+}>;
+export declare function attachFrameworkRequestRoute(response: Response, route: string | undefined): Response;
+export declare function clearFrameworkRequestError(response: Response): Response;
+export declare function attachFrameworkRequestError(response: Response, error: unknown): Response;
+export declare function consumeFrameworkRequestRoute(response: Response): Response;
+export declare function traceFrameworkRequest<T>(input: RequestTraceInput<T>): Promise<T>;
+//#endregion