vinext 0.0.43 → 0.0.45

package/dist/server/app-browser-entry.js

@@ -1,3 +1,4 @@
+import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
 import { stripBasePath } from "../utils/base-path.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import { createAppPayloadCacheKey, getMountedSlotIdsHeader, normalizeAppElements, readAppElementsMetadata, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
@@ -8,8 +9,8 @@ import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlo
 import { createHistoryStateWithPreviousNextUrl, createPendingNavigationCommit, readHistoryStatePreviousNextUrl, resolveAndClassifyNavigationCommit, resolveInterceptionContextFromPreviousNextUrl, resolvePendingNavigationCommitDisposition, resolveServerActionRequestState, routerReducer } from "./app-browser-state.js";
 import { devOnCaughtError } from "./app-browser-error.js";
 import { createElement, startTransition, use, useLayoutEffect, useRef, useState } from "react";
-import { hydrateRoot } from "react-dom/client";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "@vitejs/plugin-rsc/browser";
+import { hydrateRoot } from "react-dom/client";
 //#region src/server/app-browser-entry.ts
 function toActionType(kind) {
 	return kind === "traverse" ? "traverse" : "navigate";
@@ -109,13 +110,13 @@ function drainPrePaintEffects(upToRenderId) {
 	for (const [id, effect] of pendingNavigationPrePaintEffects) if (id <= upToRenderId) {
 		pendingNavigationPrePaintEffects.delete(id);
 		if (id === upToRenderId) effect();
-		else commitClientNavigationState(void 0);
+		else commitClientNavigationState(void 0, { releaseSnapshot: true });
 	}
 }
 function createNavigationCommitEffect(href, historyUpdateMode, navId, params, previousNextUrl) {
 	return () => {
 		if (navId !== activeNavigationId) {
-			commitClientNavigationState(void 0);
+			commitClientNavigationState(void 0, { releaseSnapshot: true });
 			return;
 		}
 		const targetHref = new URL(href, window.location.origin).href;
@@ -371,17 +372,78 @@ function restoreHydrationNavigationContext(pathname, searchParams, params) {
 		params
 	});
 }
+function decodeHashFragment(fragment) {
+	try {
+		return decodeURIComponent(fragment);
+	} catch {
+		return fragment;
+	}
+}
+function scrollToHashTarget(hash) {
+	const fragment = decodeHashFragment(hash.startsWith("#") ? hash.slice(1) : hash);
+	requestAnimationFrame(() => {
+		if (fragment === "" || fragment === "top") {
+			window.scrollTo(0, 0);
+			return;
+		}
+		const idElement = document.getElementById(fragment);
+		if (idElement) {
+			idElement.scrollIntoView({ behavior: "auto" });
+			return;
+		}
+		document.getElementsByName(fragment)[0]?.scrollIntoView({ behavior: "auto" });
+	});
+}
 function restorePopstateScrollPosition(state) {
-	if (!(state && typeof state === "object" && "__vinext_scrollY" in state)) return;
+	if (!(state && typeof state === "object" && "__vinext_scrollY" in state)) {
+		if (window.location.hash) scrollToHashTarget(window.location.hash);
+		return;
+	}
 	const y = Number(state.__vinext_scrollY);
 	const x = "__vinext_scrollX" in state ? Number(state.__vinext_scrollX) : 0;
 	requestAnimationFrame(() => {
 		window.scrollTo(x, y);
 	});
 }
+let isPageUnloading = false;
+const RSC_RELOAD_KEY = "__vinext_rsc_initial_reload__";
+function readReloadFlag() {
+	try {
+		return sessionStorage.getItem(RSC_RELOAD_KEY);
+	} catch {
+		return null;
+	}
+}
+function writeReloadFlag(path) {
+	try {
+		sessionStorage.setItem(RSC_RELOAD_KEY, path);
+	} catch {}
+}
+function clearReloadFlag() {
+	try {
+		sessionStorage.removeItem(RSC_RELOAD_KEY);
+	} catch {}
+}
+function recoverFromBadInitialRscResponse(reason) {
+	const currentPath = window.location.pathname + window.location.search;
+	if (readReloadFlag() === currentPath) {
+		clearReloadFlag();
+		console.error(`[vinext] Initial RSC fetch ${reason} after reload; aborting hydration. Server-rendered HTML remains visible; client components will not hydrate.`);
+		return null;
+	}
+	writeReloadFlag(currentPath);
+	if (readReloadFlag() !== currentPath) {
+		console.error(`[vinext] Initial RSC fetch ${reason}; sessionStorage unavailable so the reload-loop guard cannot persist — aborting hydration. Server-rendered HTML remains visible; client components will not hydrate.`);
+		return null;
+	}
+	console.warn(`[vinext] Initial RSC fetch ${reason}; reloading once to let the server render the HTML error page`);
+	window.location.reload();
+	return null;
+}
 async function readInitialRscStream() {
 	const vinext = getVinextBrowserGlobal();
 	if (vinext.__VINEXT_RSC__ || vinext.__VINEXT_RSC_CHUNKS__ || vinext.__VINEXT_RSC_DONE__) {
+		clearReloadFlag();
 		if (vinext.__VINEXT_RSC__) {
 			const embedData = vinext.__VINEXT_RSC__;
 			delete vinext.__VINEXT_RSC__;
@@ -396,6 +458,11 @@ async function readInitialRscStream() {
 		return createProgressiveRscStream();
 	}
 	const rscResponse = await fetch(toRscUrl(window.location.pathname + window.location.search));
+	if (!rscResponse.ok) return recoverFromBadInitialRscResponse(`returned ${rscResponse.status}`);
+	const contentType = rscResponse.headers.get("content-type") ?? "";
+	if (!contentType.startsWith("text/x-component")) return recoverFromBadInitialRscResponse(`returned non-RSC content-type "${contentType || "(missing)"}"`);
+	if (!rscResponse.body) return recoverFromBadInitialRscResponse("returned empty body");
+	clearReloadFlag();
 	let params = {};
 	const paramsHeader = rscResponse.headers.get("X-Vinext-Params");
 	if (paramsHeader) try {
@@ -403,7 +470,6 @@ async function readInitialRscStream() {
 		applyClientParams(params);
 	} catch {}
 	restoreHydrationNavigationContext(window.location.pathname, window.location.search, params);
-	if (!rscResponse.body) throw new Error("[vinext] Initial RSC response had no body");
 	return rscResponse.body;
 }
 function registerServerActionCallback() {
@@ -424,6 +490,10 @@ function registerServerActionCallback() {
 		});
 		const actionRedirect = fetchResponse.headers.get("x-action-redirect");
 		if (actionRedirect) {
+			if (isDangerousScheme(actionRedirect)) {
+				console.error(DANGEROUS_URL_BLOCK_MESSAGE);
+				return;
+			}
 			try {
 				if (new URL(actionRedirect, window.location.origin).origin !== window.location.origin) {
 					window.location.href = actionRedirect;
@@ -442,7 +512,12 @@ function registerServerActionCallback() {
 }
 async function main() {
 	registerServerActionCallback();
-	const root = normalizeAppElementsPromise(createFromReadableStream(await readInitialRscStream()));
+	const rscStream = await readInitialRscStream();
+	if (rscStream === null) return;
+	bootstrapHydration(rscStream);
+}
+function bootstrapHydration(rscStream) {
+	const root = normalizeAppElementsPromise(createFromReadableStream(rscStream));
 	const initialNavigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
 	replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(window.history.state, null), "", window.location.href);
 	window.__VINEXT_RSC_ROOT__ = hydrateRoot(document, createElement(BrowserRoot, {
@@ -451,121 +526,122 @@ async function main() {
 	}), import.meta.env.DEV ? { onCaughtError: devOnCaughtError } : void 0);
 	window.__VINEXT_HYDRATED_AT = performance.now();
 	window.__VINEXT_RSC_NAVIGATE__ = async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false) {
-		if (redirectDepth > 10) {
-			console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
-			window.location.href = href;
-			return;
-		}
 		let _snapshotPending = false;
 		let pendingRouterState = null;
 		const navId = ++activeNavigationId;
+		let currentHref = href;
+		let currentHistoryMode = historyUpdateMode;
+		let currentPrevNextUrl = previousNextUrlOverride;
+		let redirectCount = redirectDepth;
 		try {
 			if (programmaticTransition) pendingRouterState = beginPendingBrowserRouterState();
-			const url = new URL(href, window.location.origin);
-			const rscUrl = toRscUrl(url.pathname + url.search);
-			const requestState = getRequestState(navigationKind, previousNextUrlOverride);
-			const requestInterceptionContext = requestState.interceptionContext;
-			const requestPreviousNextUrl = requestState.previousNextUrl;
-			const navState = getClientNavigationState();
-			const currentPath = navState?.pendingPathname ?? navState?.cachedPathname ?? stripBasePath(window.location.pathname, __basePath);
-			const isSameRoute = stripBasePath(url.pathname, __basePath) === currentPath;
-			setPendingPathname(url.pathname, navId);
-			const elementsAtNavStart = getBrowserRouterState().elements;
-			const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
-			const cachedRoute = getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
-			if (cachedRoute) {
-				if (navId !== activeNavigationId) {
-					settlePendingBrowserRouterState(pendingRouterState);
+			while (true) {
+				if (redirectCount > 10) {
+					console.error("[vinext] Too many RSC redirects — aborting navigation to prevent infinite loop.");
+					window.location.href = currentHref;
+					return;
+				}
+				const url = new URL(currentHref, window.location.origin);
+				const rscUrl = toRscUrl(url.pathname + url.search);
+				const requestState = getRequestState(navigationKind, currentPrevNextUrl);
+				const requestInterceptionContext = requestState.interceptionContext;
+				const requestPreviousNextUrl = requestState.previousNextUrl;
+				const navState = getClientNavigationState();
+				const currentPath = navState?.pendingPathname ?? navState?.cachedPathname ?? stripBasePath(window.location.pathname, __basePath);
+				const isSameRoute = stripBasePath(url.pathname, __basePath) === currentPath;
+				setPendingPathname(url.pathname, navId);
+				const elementsAtNavStart = getBrowserRouterState().elements;
+				const mountedSlotsHeader = getMountedSlotIdsHeader(elementsAtNavStart);
+				const cachedRoute = getVisitedResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader, navigationKind);
+				if (cachedRoute) {
+					if (navId !== activeNavigationId) return;
+					const cachedParams = cachedRoute.params;
+					const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(currentHref, cachedParams);
+					const cachedPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
+					if (navId !== activeNavigationId) return;
+					_snapshotPending = true;
+					try {
+						await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, currentHref, navId, currentHistoryMode, cachedParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
+					} finally {
+						_snapshotPending = false;
+					}
 					return;
 				}
-				const cachedParams = cachedRoute.params;
-				const cachedNavigationSnapshot = createClientNavigationRenderSnapshot(href, cachedParams);
-				const cachedPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(cachedRoute.response))));
-				if (navId !== activeNavigationId) {
-					settlePendingBrowserRouterState(pendingRouterState);
+				let navResponse;
+				let navResponseUrl = null;
+				if (navigationKind !== "refresh") {
+					const prefetchedResponse = consumePrefetchResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader);
+					if (prefetchedResponse) {
+						navResponse = restoreRscResponse(prefetchedResponse, false);
+						navResponseUrl = prefetchedResponse.url;
+					}
+				}
+				if (!navResponse) {
+					const requestHeaders = createRscRequestHeaders(requestInterceptionContext);
+					if (mountedSlotsHeader) requestHeaders.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
+					navResponse = await fetch(rscUrl, {
+						headers: requestHeaders,
+						credentials: "include"
+					});
+				}
+				if (navId !== activeNavigationId) return;
+				const isRscResponse = (navResponse.headers.get("content-type") ?? "").startsWith("text/x-component");
+				if (!navResponse.ok || !isRscResponse || !navResponse.body) {
+					const responseUrl = navResponseUrl ?? navResponse.url;
+					let hardNavTarget = currentHref;
+					if (responseUrl) {
+						const parsed = new URL(responseUrl, window.location.origin);
+						const origUrl = new URL(currentHref, window.location.origin);
+						let pathname = parsed.pathname.replace(/\.rsc$/, "");
+						if (origUrl.pathname.length > 1 && origUrl.pathname.endsWith("/") && !pathname.endsWith("/")) pathname += "/";
+						hardNavTarget = pathname + parsed.search;
+						if (origUrl.hash) hardNavTarget += origUrl.hash;
+					}
+					window.location.href = hardNavTarget;
 					return;
 				}
+				const finalUrl = new URL(navResponseUrl ?? navResponse.url, window.location.origin);
+				const requestedUrl = new URL(rscUrl, window.location.origin);
+				if (finalUrl.pathname !== requestedUrl.pathname) {
+					const destinationPath = finalUrl.pathname.replace(/\.rsc$/, "") + finalUrl.search;
+					replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(null, requestPreviousNextUrl), "", destinationPath);
+					currentHref = destinationPath;
+					currentHistoryMode = void 0;
+					currentPrevNextUrl = requestPreviousNextUrl;
+					redirectCount += 1;
+					continue;
+				}
+				let navParams = {};
+				const paramsHeader = navResponse.headers.get("X-Vinext-Params");
+				if (paramsHeader) try {
+					navParams = JSON.parse(decodeURIComponent(paramsHeader));
+				} catch {}
+				const navigationSnapshot = createClientNavigationRenderSnapshot(currentHref, navParams);
+				const responseSnapshot = await snapshotRscResponse(navResponse);
+				if (navId !== activeNavigationId) return;
+				const rscPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(responseSnapshot))));
+				if (navId !== activeNavigationId) return;
 				_snapshotPending = true;
 				try {
-					await renderNavigationPayload(cachedPayload, cachedNavigationSnapshot, href, navId, historyUpdateMode, cachedParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
+					await renderNavigationPayload(rscPayload, navigationSnapshot, currentHref, navId, currentHistoryMode, navParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
 				} finally {
 					_snapshotPending = false;
 				}
+				if (navId !== activeNavigationId) return;
+				storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, readAppElementsMetadata(await rscPayload).interceptionContext), responseSnapshot, navParams);
 				return;
 			}
-			let navResponse;
-			let navResponseUrl = null;
-			if (navigationKind !== "refresh") {
-				const prefetchedResponse = consumePrefetchResponse(rscUrl, requestInterceptionContext, mountedSlotsHeader);
-				if (prefetchedResponse) {
-					navResponse = restoreRscResponse(prefetchedResponse, false);
-					navResponseUrl = prefetchedResponse.url;
-				}
-			}
-			if (!navResponse) {
-				const requestHeaders = createRscRequestHeaders(requestInterceptionContext);
-				if (mountedSlotsHeader) requestHeaders.set("X-Vinext-Mounted-Slots", mountedSlotsHeader);
-				navResponse = await fetch(rscUrl, {
-					headers: requestHeaders,
-					credentials: "include"
-				});
-			}
-			if (navId !== activeNavigationId) {
-				settlePendingBrowserRouterState(pendingRouterState);
-				return;
-			}
-			const finalUrl = new URL(navResponseUrl ?? navResponse.url, window.location.origin);
-			const requestedUrl = new URL(rscUrl, window.location.origin);
-			if (finalUrl.pathname !== requestedUrl.pathname) {
-				const destinationPath = finalUrl.pathname.replace(/\.rsc$/, "") + finalUrl.search;
-				replaceHistoryStateWithoutNotify(createHistoryStateWithPreviousNextUrl(null, requestPreviousNextUrl), "", destinationPath);
-				const navigate = window.__VINEXT_RSC_NAVIGATE__;
-				if (!navigate) {
-					settlePendingBrowserRouterState(pendingRouterState);
-					window.location.href = destinationPath;
-					return;
-				}
-				settlePendingBrowserRouterState(pendingRouterState);
-				return navigate(destinationPath, redirectDepth + 1, navigationKind, void 0, requestPreviousNextUrl, false);
-			}
-			let navParams = {};
-			const paramsHeader = navResponse.headers.get("X-Vinext-Params");
-			if (paramsHeader) try {
-				navParams = JSON.parse(decodeURIComponent(paramsHeader));
-			} catch {}
-			const navigationSnapshot = createClientNavigationRenderSnapshot(href, navParams);
-			const responseSnapshot = await snapshotRscResponse(navResponse);
-			if (navId !== activeNavigationId) {
-				settlePendingBrowserRouterState(pendingRouterState);
-				return;
-			}
-			const rscPayload = normalizeAppElementsPromise(createFromFetch(Promise.resolve(restoreRscResponse(responseSnapshot))));
-			if (navId !== activeNavigationId) {
-				settlePendingBrowserRouterState(pendingRouterState);
-				return;
-			}
-			_snapshotPending = true;
-			try {
-				await renderNavigationPayload(rscPayload, navigationSnapshot, href, navId, historyUpdateMode, navParams, requestPreviousNextUrl, pendingRouterState, isSameRoute, toActionType(navigationKind));
-			} finally {
-				_snapshotPending = false;
-			}
-			if (navId !== activeNavigationId) {
-				settlePendingBrowserRouterState(pendingRouterState);
-				return;
-			}
-			storeVisitedResponseSnapshot(rscUrl, resolveVisitedResponseInterceptionContext(requestInterceptionContext, readAppElementsMetadata(await rscPayload).interceptionContext), responseSnapshot, navParams);
-			return;
 		} catch (error) {
 			if (_snapshotPending) {
 				_snapshotPending = false;
 				commitClientNavigationState(navId);
 			}
+			if (navId !== activeNavigationId) return;
+			if (!isPageUnloading) console.error("[vinext] RSC navigation error:", error);
+			window.location.href = currentHref;
+		} finally {
 			settlePendingBrowserRouterState(pendingRouterState);
 			if (navId === activeNavigationId) clearPendingPathname(navId);
-			if (navId !== activeNavigationId) return;
-			console.error("[vinext] RSC navigation error:", error);
-			window.location.href = href;
 		}
 	};
 	if ("scrollRestoration" in history) history.scrollRestoration = "manual";
@@ -595,7 +671,15 @@ async function main() {
 		}
 	});
 }
-if (typeof document !== "undefined") main();
+if (typeof document !== "undefined") {
+	window.addEventListener("pagehide", () => {
+		isPageUnloading = true;
+	});
+	window.addEventListener("pageshow", () => {
+		isPageUnloading = false;
+	});
+	main();
+}
 //#endregion
 export {};