@vinext/cloudflare 1.3.0 → 1.3.1

package/dist/cache/app-page-parts.d.ts

@@ -4,10 +4,4 @@
  * payload, the two parts Next.js keeps in one entry, rather than a variant.
  */
 export declare function isCanonicalAppPage(responseStageProps: unknown, isRscRequest: boolean): boolean;
-/**
- * Whether a canonical RSC request has a document part. A `.rsc` path reaches
- * its page's HTML path only through the app's trailingSlash policy, and
- * vinext's client never sends one, so it stores its payload alone.
- */
-export declare function hasDocumentPart(rscRequestUrl: string): boolean;
 //#endregion

package/dist/cache/app-page-parts.js

@@ -6,13 +6,5 @@
 function isCanonicalAppPage(responseStageProps, isRscRequest) {
 	return responseStageProps !== null && typeof responseStageProps === "object" && Reflect.get(responseStageProps, "kind") === "app-page" && Reflect.get(responseStageProps, "isRscRequest") === isRscRequest && (Reflect.get(responseStageProps, "matchKind") === "request" || Reflect.get(responseStageProps, "matchKind") === "resolved") && (!isRscRequest || Reflect.get(responseStageProps, "renderMode") === "navigation") && Reflect.get(responseStageProps, "interceptionContext") === null && Reflect.get(responseStageProps, "interceptionId") === null && Reflect.get(responseStageProps, "mountedSlotsHeader") === null;
 }
-/**
-* Whether a canonical RSC request has a document part. A `.rsc` path reaches
-* its page's HTML path only through the app's trailingSlash policy, and
-* vinext's client never sends one, so it stores its payload alone.
-*/
-function hasDocumentPart(rscRequestUrl) {
-	return !new URL(rscRequestUrl).pathname.endsWith(".rsc");
-}
 //#endregion
-export { hasDocumentPart, isCanonicalAppPage };
+export { isCanonicalAppPage };

package/dist/cache/cdn-adapter.worker.js

@@ -1,5 +1,5 @@
 import { VINEXT_CDN_BUILD_ID_HEADER, getVinextCdnBuildIdentity } from "./cdn-build-id.js";
-import { hasDocumentPart, isCanonicalAppPage } from "./app-page-parts.js";
+import { isCanonicalAppPage } from "./app-page-parts.js";
 import { SHARED_RESPONSE_STAGE_HEADER, finalizeGatewayResponse } from "./browser-cache-policy.js";
 import { hasCacheMethod, invalidateOrPurge } from "./workers-cache-invalidation.js";
 import { VINEXT_PRERENDER_READINESS_PATH, VINEXT_RSC_VARY_HEADER } from "vinext/internal/server/headers";
@@ -383,7 +383,6 @@ function getResponseStageInvocation(value, expectedCache) {
 function otherPagePartDispatch(request, props) {
 	const isRscRequest = isCanonicalAppPage(props, true);
 	if (!isRscRequest && !isCanonicalAppPage(props, false)) return null;
-	if (isRscRequest && !hasDocumentPart(request.url)) return null;
 	const headers = new Headers(request.headers);
 	for (const name of FRAMEWORK_RESPONSE_VARY_FIELDS) headers.delete(name);
 	for (const name of [

package/dist/cache/kv-data-adapter.runtime.js

@@ -25,6 +25,14 @@ import { getRequestExecutionContext } from "vinext/shims/request-context";
 */
 /** Default KV namespace binding name read from the Worker `env`. */
 const DEFAULT_BINDING = "VINEXT_KV_CACHE";
+function toStoredLifetime(seconds) {
+	if (seconds === Infinity) return "Infinity";
+	if (seconds === -Infinity) return "-Infinity";
+	return seconds;
+}
+function isStoredLifetime(value) {
+	return typeof value === "number" || value === "Infinity" || value === "-Infinity";
+}
 function parseTagMarker(raw) {
 	if (raw === null || raw === void 0) return {};
 	if (!raw.startsWith("{")) return { expired: /^\d+$/.test(raw) ? Number(raw) : NaN };
@@ -313,8 +321,8 @@ var KVCacheHandler = class {
 		const expireAt = typeof effectiveExpire === "number" && effectiveExpire > 0 ? now + effectiveExpire * 1e3 : null;
 		const cacheControl = typeof effectiveRevalidate === "number" ? {
 			revalidate: Number.isFinite(effectiveRevalidate) ? effectiveRevalidate : false,
-			...effectiveExpire === void 0 ? {} : { expire: effectiveExpire },
-			...effectiveStale === void 0 ? {} : { stale: effectiveStale }
+			...effectiveExpire === void 0 ? {} : { expire: toStoredLifetime(effectiveExpire) },
+			...effectiveStale === void 0 ? {} : { stale: toStoredLifetime(effectiveStale) }
 		} : void 0;
 		const entry = {
 			value: data ? serializeForJSON(data) : null,
@@ -469,18 +477,24 @@ function validateCacheEntry(raw) {
 	if (obj.cacheControl !== void 0) {
 		if (!isUnknownRecord(obj.cacheControl)) return null;
 		if (typeof obj.cacheControl.revalidate !== "number" && obj.cacheControl.revalidate !== false) return null;
-		if (obj.cacheControl.expire !== void 0 && typeof obj.cacheControl.expire !== "number") return null;
-		if (obj.cacheControl.stale !== void 0 && typeof obj.cacheControl.stale !== "number") return null;
+		for (const field of ["expire", "stale"]) {
+			const seconds = obj.cacheControl[field];
+			if (seconds !== void 0 && !isStoredLifetime(seconds)) return null;
+		}
 	}
 	if (obj.value !== null) {
 		if (!obj.value || typeof obj.value !== "object") return null;
 		const value = obj.value;
 		if (typeof value.kind !== "string" || !VALID_KINDS.has(value.kind)) return null;
 	}
-	if (obj.cacheControl?.revalidate === false) obj.cacheControl = {
-		...obj.cacheControl,
-		revalidate: Infinity
-	};
+	if (obj.cacheControl !== void 0) {
+		const { revalidate, expire, stale } = obj.cacheControl;
+		obj.cacheControl = {
+			revalidate: revalidate === false ? Infinity : revalidate,
+			...expire === void 0 ? {} : { expire: Number(expire) },
+			...stale === void 0 ? {} : { stale: Number(stale) }
+		};
+	}
 	return raw;
 }
 /**

package/dist/cache/response-store-adapter.worker.js

@@ -1,6 +1,6 @@
-import { hasDocumentPart, isCanonicalAppPage } from "./app-page-parts.js";
+import { isCanonicalAppPage } from "./app-page-parts.js";
 import { SHARED_RESPONSE_STAGE_HEADER, finalizeGatewayResponse } from "./browser-cache-policy.js";
-import { captureResponseStoreDataRegeneration, runWithResponseStoreInvocation, setResponseStore } from "./response-store-data.runtime.js";
+import { captureResponseStoreDataRegeneration, runWithResponseStoreInvocation, setResponseStore, trackResponseStoreRegenerationWork } from "./response-store-data.runtime.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER, VINEXT_STALE_TIME_PENDING_HEADER } from "vinext/internal/server/headers";
 import { VINEXT_RSC_BUILD_ID_HEADER, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER as VINEXT_RSC_VARY_HEADER$1, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, createCanonicalRscRequestHeaders, createCanonicalRscRequestUrl, stripRscCacheBustingSearchParam } from "vinext/internal/server/app-rsc-cache-busting";
 import { hasSharedCacheCredentials, isNonCacheableCacheControl } from "vinext/shims/cdn-cache";
@@ -25,7 +25,10 @@ function stageContext(ctx, env) {
 		hostRuntime: "worker",
 		passThroughOnException: () => ctx.passThroughOnException(),
 		...ctx.props === void 0 ? {} : { props: ctx.props },
-		waitUntil: (promise) => ctx.waitUntil(promise)
+		waitUntil: (promise) => {
+			trackResponseStoreRegenerationWork(promise);
+			ctx.waitUntil(promise);
+		}
 	});
 }
 function safeProps(props) {
@@ -263,7 +266,7 @@ function otherPagePart(identityRequest, identityProps) {
 		invocation: rscPartInvocation(identityRequest, identityProps),
 		kind: "rsc"
 	};
-	if (isCanonicalAppPage(identityProps, true) && hasDocumentPart(identityRequest.url)) return {
+	if (isCanonicalAppPage(identityProps, true)) return {
 		invocation: documentPartInvocation(identityRequest, identityProps),
 		kind: "document"
 	};

package/dist/cache/response-store-data.runtime.d.ts

@@ -31,6 +31,8 @@ export declare function captureResponseStoreAppPageDocument(): ((document: CdnAp
 export declare function deferResponseStoreNotModified(): boolean;
 /** Stream the foreground body while retaining an independent admission branch. */
 export declare function deferResponseStoreAdmission(response: Response, complete: (response: Response) => Promise<Response>): Response | null;
+/** Keeps work a regeneration hands to waitUntil inside the regeneration. */
+export declare function trackResponseStoreRegenerationWork(work: Promise<unknown>): void;
 /** Re-render an invocation and return the exact rewritten data-cache entry. */
 export declare function captureResponseStoreDataRegeneration(key: string, callback: () => Promise<void>): Promise<Response>;
 export declare class WorkersResponseStoreCacheHandler implements CacheHandler {

package/dist/cache/response-store-data.runtime.js

@@ -157,6 +157,10 @@ function deferResponseStoreAdmission(response, complete) {
 	writer.closed.catch((error) => finishAdmission({ reason: error }));
 	return new Response(foreground, response);
 }
+/** Keeps work a regeneration hands to waitUntil inside the regeneration. */
+function trackResponseStoreRegenerationWork(work) {
+	regenerationStorage.getStore()?.sideWrites.push(work.then(() => void 0, () => void 0));
+}
 /** Re-render an invocation and return the exact rewritten data-cache entry. */
 async function captureResponseStoreDataRegeneration(key, callback) {
 	const scope = {
@@ -295,8 +299,7 @@ var WorkersResponseStoreCacheHandler = class {
 	}
 	set(key, value, context) {
 		const write = this.write(key, value, context);
-		const regeneration = regenerationStorage.getStore();
-		if (regeneration && regeneration.targetKey !== key) regeneration.sideWrites.push(write);
+		regenerationStorage.getStore()?.sideWrites.push(write);
 		return write;
 	}
 	async write(key, value, context) {
@@ -374,4 +377,4 @@ function createResponseStoreDataCacheAdapter() {
 	return new WorkersResponseStoreCacheHandler();
 }
 //#endregion
-export { CACHE_FUNCTION_REVALIDATOR_ID, DATA_REVALIDATOR_ID, WorkersResponseStoreCacheHandler, captureResponseStoreAppPageDocument, captureResponseStoreDataRegeneration, captureResponseStoreRscData, createResponseStoreDataCacheAdapter as default, deferResponseStoreAdmission, deferResponseStoreNotModified, runWithResponseStoreInvocation, setResponseStore };
+export { CACHE_FUNCTION_REVALIDATOR_ID, DATA_REVALIDATOR_ID, WorkersResponseStoreCacheHandler, captureResponseStoreAppPageDocument, captureResponseStoreDataRegeneration, captureResponseStoreRscData, createResponseStoreDataCacheAdapter as default, deferResponseStoreAdmission, deferResponseStoreNotModified, runWithResponseStoreInvocation, setResponseStore, trackResponseStoreRegenerationWork };

package/dist/tpr.js

@@ -102,7 +102,6 @@ function filterTrafficPaths(entries) {
 		if (/\.(js|css|png|jpg|jpeg|gif|svg|ico|woff2?|ttf|eot|map|webp|avif)$/i.test(e.path)) return false;
 		if (e.path.startsWith("/api/")) return false;
 		if (e.path.startsWith("/_next/") || e.path.startsWith("/__vinext/")) return false;
-		if (e.path.endsWith(".rsc")) return false;
 		return true;
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Cloudflare cache and image adapters for vinext.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",
@@ -56,12 +56,12 @@
     "miniflare": "5.20260730.0-alpha",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "vinext": "1.4.0"
+    "vinext": "1.4.1"
   },
   "peerDependencies": {
     "@cloudflare/vite-plugin": "*",
     "cf": "*",
-    "vinext": "^1.4.0"
+    "vinext": "^1.4.1"
   },
   "peerDependenciesMeta": {
     "@cloudflare/vite-plugin": {