@void/isr 0.20.2 → 0.21.0

package/dist/core.d.mts

@@ -53,6 +53,8 @@ export declare function isrCacheResponse(entry: IsrCacheEntry, stale: boolean, n
 export declare function resolveRevalidateTtl(response: Response, defaultTtl: number): number;
 /** Return whether credentials or EventSource semantics require an ISR bypass. */
 export declare function shouldBypassIsr(request: Request): boolean;
+/** Only document navigations may read a framework's shared HTML cache. */
+export declare function isFrameworkDocumentRequest(request: Request): boolean;
 /** Return whether a response explicitly forbids storage in a shared cache. */
 export declare function hasSharedCacheOptOut(response: Response): boolean;
 /** Return whether a complete render may be persisted in the shared ISR cache. */

package/dist/core.mjs

@@ -139,6 +139,18 @@ function acceptsEventStream(request) {
 function shouldBypassIsr(request) {
 	return request.headers.has("Cookie") || request.headers.has("Authorization") || acceptsEventStream(request);
 }
+/** Only document navigations may read a framework's shared HTML cache. */
+function isFrameworkDocumentRequest(request) {
+	if (request.method !== "GET" || request.headers.has("X-VoidPages")) return false;
+	if (new URL(request.url).pathname.startsWith("/__void/")) return false;
+	if (!request.headers.get("accept")?.split(",").some((value) => value.trim().toLowerCase().split(";", 1)[0] === "text/html")) return false;
+	const mode = request.headers.get("sec-fetch-mode")?.toLowerCase();
+	if (mode && mode !== "navigate") return false;
+	const destination = request.headers.get("sec-fetch-dest")?.toLowerCase();
+	if (destination && destination !== "document") return false;
+	if (request.headers.has("rsc") || request.headers.has("x-nextjs-data")) return false;
+	return true;
+}
 /** Return whether a response explicitly forbids storage in a shared cache. */
 function hasSharedCacheOptOut(response) {
 	if (response.headers.has("Set-Cookie")) return true;
@@ -197,4 +209,4 @@ function extractPageDataFromHtml(html) {
 	return match ? normalizePageDataForJsonCache(match[2]) : null;
 }
 //#endregion
-export { SHARED_CACHE_POLICY_HEADER, SHARED_CACHE_POLICY_VERSION, buildVariantOriginalUrl, decodeIsrCacheEntry, exactQueryAllowlist, extractPageDataFromHtml, hasCurrentSharedCachePolicy, hasSharedCacheOptOut, isSharedCacheableResponse, isStale, isrCacheResponse, markSharedCachePolicy, normalizePageDataForJsonCache, packIsrValue, resolvePageTtl, resolvePathTtl, resolveRevalidateTtl, serializeHeaders, shouldBypassIsr, unpackIsrValue };
+export { SHARED_CACHE_POLICY_HEADER, SHARED_CACHE_POLICY_VERSION, buildVariantOriginalUrl, decodeIsrCacheEntry, exactQueryAllowlist, extractPageDataFromHtml, hasCurrentSharedCachePolicy, hasSharedCacheOptOut, isFrameworkDocumentRequest, isSharedCacheableResponse, isStale, isrCacheResponse, markSharedCachePolicy, normalizePageDataForJsonCache, packIsrValue, resolvePageTtl, resolvePathTtl, resolveRevalidateTtl, serializeHeaders, shouldBypassIsr, unpackIsrValue };

package/dist/runtime.d.mts

@@ -5,7 +5,7 @@ import { matchSegmentPattern } from "@void/edge";
 //#region src/runtime.d.ts
 /**
  * Single-tenant ISR (incremental static regeneration) cache ladder for the
- * self-hosted Void worker (`vite build && wrangler deploy`).
+ * direct Cloudflare Worker (Void apps and framework deploy wrappers).
  *
  * On managed Void, ISR lives in the dispatch worker that sits IN FRONT of the
  * user worker. Self-host has no dispatch worker, so this module ports that
@@ -121,6 +121,8 @@ export declare function populateJsonEdgeCache(cache: Cache | undefined, cacheKey
  * only runs for GET, so there is no body to preserve.
  */
 export declare function cloneWithoutVoidPages(request: Request): Request;
+/** Cache only framework document HTML; leave client data requests and other response types live. */
+export declare function handleFrameworkIsr(request: Request, env: IsrCacheEnv, ctx: ExecutionContext, options: HandleIsrOptions, render: RenderFn): Promise<Response | null>;
 /**
  * Run the ISR caching ladder for a request.
  *

package/dist/runtime.mjs

@@ -1,5 +1,5 @@
 import { canonicalIsrPathname, denormalizeIsrPath, isrCacheKey, isrCachePrefix, isrCacheVariantPrefix, isrEdgeCacheUrl, normalizeIsrPath } from "./index.mjs";
-import { SHARED_CACHE_POLICY_HEADER, SHARED_CACHE_POLICY_VERSION, buildVariantOriginalUrl, decodeIsrCacheEntry, extractPageDataFromHtml, hasCurrentSharedCachePolicy, hasSharedCacheOptOut, isSharedCacheableResponse, isStale, isrCacheResponse, markSharedCachePolicy, normalizePageDataForJsonCache, packIsrValue, resolvePageTtl, resolvePathTtl, resolveRevalidateTtl, serializeHeaders, shouldBypassIsr, unpackIsrValue } from "./core.mjs";
+import { SHARED_CACHE_POLICY_HEADER, SHARED_CACHE_POLICY_VERSION, buildVariantOriginalUrl, decodeIsrCacheEntry, extractPageDataFromHtml, hasCurrentSharedCachePolicy, hasSharedCacheOptOut, isFrameworkDocumentRequest, isSharedCacheableResponse, isStale, isrCacheResponse, markSharedCachePolicy, normalizePageDataForJsonCache, packIsrValue, resolvePageTtl, resolvePathTtl, resolveRevalidateTtl, serializeHeaders, shouldBypassIsr, unpackIsrValue } from "./core.mjs";
 import { matchSegmentPattern } from "@void/edge";
 //#region src/runtime.ts
 const MAX_ISR_VARIANTS_PER_PATH = 200;
@@ -242,7 +242,7 @@ function cloneWithoutVoidPages(request) {
 * stale, don't retry. An explicit cache opt-out (including `ttl === 0`)
 * deletes the KV entry and both edge variants.
 */
-async function revalidateInBackground(env, request, host, pathname, defaultTtl, keys, render, variantUrl) {
+async function revalidateInBackground(env, request, host, pathname, defaultTtl, keys, render, variantUrl, htmlOnly) {
 	try {
 		const response = await render(cloneWithoutVoidPages(request));
 		const ttl = resolveRevalidateTtl(response, defaultTtl);
@@ -251,7 +251,7 @@ async function revalidateInBackground(env, request, host, pathname, defaultTtl,
 			if (ttl === 0 || hasSharedCacheOptOut(response)) await deleteSharedIsrVariants(env, cache, host, pathname, keys, variantUrl);
 			return;
 		}
-		if (ttl > 0 && isSharedCacheableResponse(response)) {
+		if (ttl > 0 && isSharedCacheableResponse(response) && (!htmlOnly || isHtmlResponse(response))) {
 			await writeIsrCache(env, host, pathname, response, ttl, variantUrl);
 			const headers = new Headers(response.headers);
 			headers.set("x-isr-cache", "HIT");
@@ -264,11 +264,19 @@ async function revalidateInBackground(env, request, host, pathname, defaultTtl,
 				headers
 			}));
 			await populateJsonEdgeCache(cache, keys.jsonKey, response, ttl, "HIT");
-		} else if (ttl === 0 || hasSharedCacheOptOut(response)) await deleteSharedIsrVariants(env, cache, host, pathname, keys, variantUrl);
+		} else if (ttl === 0 || hasSharedCacheOptOut(response) || htmlOnly && !isHtmlResponse(response)) await deleteSharedIsrVariants(env, cache, host, pathname, keys, variantUrl);
 	} catch (err) {
 		console.error("ISR revalidation failed:", err);
 	}
 }
+function isHtmlResponse(response) {
+	return response.headers.get("content-type")?.toLowerCase().split(";", 1)[0]?.trim() === "text/html";
+}
+/** Cache only framework document HTML; leave client data requests and other response types live. */
+async function handleFrameworkIsr(request, env, ctx, options, render) {
+	if (!isFrameworkDocumentRequest(request)) return null;
+	return handleIsrInternal(request, env, ctx, options, render, true);
+}
 /**
 * Run the ISR caching ladder for a request.
 *
@@ -289,6 +297,9 @@ async function revalidateInBackground(env, request, host, pathname, defaultTtl,
 *     when cacheable, writes KV + JSON edge + HTML edge in the background.
 */
 async function handleIsr(request, env, ctx, options, render) {
+	return handleIsrInternal(request, env, ctx, options, render, false);
+}
+async function handleIsrInternal(request, env, ctx, options, render, htmlOnly) {
 	const { revalidate, pages, pathRevalidate, deploymentId, queryAllowlist } = options;
 	if (request.method !== "GET") return null;
 	if (request.headers.has("range")) return null;
@@ -336,7 +347,7 @@ async function handleIsr(request, env, ctx, options, render) {
 		if (stale) ctx.waitUntil(revalidateInBackground(env, request, host, pathname, isrTtl, {
 			htmlKey,
 			jsonKey
-		}, render, variantUrl));
+		}, render, variantUrl, htmlOnly));
 		const cacheResponse = isrCacheResponse(cached, stale);
 		if (!stale) ctx.waitUntil(safeCachePut(cache, htmlKey, cacheResponse.clone()));
 		return clientRevalidateResponse(cacheResponse);
@@ -346,18 +357,20 @@ async function handleIsr(request, env, ctx, options, render) {
 	const response = await render(request);
 	if (isEventStreamResponse(response)) return response;
 	const ttl = resolveRevalidateTtl(response, isrTtl);
-	if (ttl > 0 && isSharedCacheableResponse(response)) {
+	if (ttl > 0 && isSharedCacheableResponse(response) && (!htmlOnly || isHtmlResponse(response))) {
 		ctx.waitUntil(writeIsrCache(env, host, pathname, response, ttl, variantUrl));
-		ctx.waitUntil(populateJsonEdgeCache(cache, jsonKey, response, ttl, "MISS"));
+		ctx.waitUntil(populateJsonEdgeCache(cache, jsonKey, response, ttl, "HIT"));
 		const cacheHeaders = new Headers(response.headers);
 		cacheHeaders.set("Cache-Control", `public, s-maxage=${ttl}, max-age=0, must-revalidate`);
 		cacheHeaders.set("x-isr-cache", "MISS");
 		markSharedCachePolicy(cacheHeaders);
 		cacheHeaders.delete("x-void-page-data");
 		cacheHeaders.delete("set-cookie");
+		const edgeHeaders = new Headers(cacheHeaders);
+		edgeHeaders.set("x-isr-cache", "HIT");
 		const cacheResponse = new Response(response.clone().body, {
 			status: response.status,
-			headers: cacheHeaders
+			headers: edgeHeaders
 		});
 		ctx.waitUntil(safeCachePut(cache, htmlKey, cacheResponse));
 		const clientHeaders = new Headers(cacheHeaders);
@@ -368,11 +381,11 @@ async function handleIsr(request, env, ctx, options, render) {
 			headers: clientHeaders
 		});
 	}
-	if (response.status === 200 && (ttl === 0 || hasSharedCacheOptOut(response))) ctx.waitUntil(deleteSharedIsrVariants(env, cache, host, pathname, {
+	if (response.status === 200 && (ttl === 0 || hasSharedCacheOptOut(response) || htmlOnly && !isHtmlResponse(response))) ctx.waitUntil(deleteSharedIsrVariants(env, cache, host, pathname, {
 		htmlKey,
 		jsonKey
 	}, variantUrl));
 	return response;
 }
 //#endregion
-export { MAX_ISR_VARIANTS_PER_PATH, SHARED_CACHE_POLICY_HEADER, SHARED_CACHE_POLICY_VERSION, canonicalIsrPathname, clientRevalidateResponse, cloneWithoutVoidPages, deleteIsrCache, denormalizeIsrPath, extractPageDataFromHtml, handleIsr, hasCurrentSharedCachePolicy, hasSharedCacheOptOut, hostRegistryKey, htmlEdgeKey, isEventStreamResponse, isSharedCacheableResponse, isStale, isrCacheResponse, isrKey, isrPrefix, isrVariantPrefix, jsonEdgeKey, listIsrHosts, markSharedCachePolicy, matchSegmentPattern as matchLiteralPattern, normalizeIsrPath, normalizePageDataForJsonCache, packIsrValue, populateJsonEdgeCache, readIsrCache, resolvePathTtl, resolveRevalidateTtl, serializeHeaders, shouldBypassIsr, unpackIsrValue, writeIsrCache };
+export { MAX_ISR_VARIANTS_PER_PATH, SHARED_CACHE_POLICY_HEADER, SHARED_CACHE_POLICY_VERSION, canonicalIsrPathname, clientRevalidateResponse, cloneWithoutVoidPages, deleteIsrCache, denormalizeIsrPath, extractPageDataFromHtml, handleFrameworkIsr, handleIsr, hasCurrentSharedCachePolicy, hasSharedCacheOptOut, hostRegistryKey, htmlEdgeKey, isEventStreamResponse, isSharedCacheableResponse, isStale, isrCacheResponse, isrKey, isrPrefix, isrVariantPrefix, jsonEdgeKey, listIsrHosts, markSharedCachePolicy, matchSegmentPattern as matchLiteralPattern, normalizeIsrPath, normalizePageDataForJsonCache, packIsrValue, populateJsonEdgeCache, readIsrCache, resolvePathTtl, resolveRevalidateTtl, serializeHeaders, shouldBypassIsr, unpackIsrValue, writeIsrCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/isr",
-  "version": "0.20.2",
+  "version": "0.21.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@cloudflare/workers-types": "^4.20260702.1",
-    "@void/edge": "0.20.2"
+    "@void/edge": "0.21.0"
   },
   "devDependencies": {
     "typescript": "7.0.2",