@vinext/cloudflare 1.2.0 → 1.2.1

package/dist/cache/cdn-adapter-config.d.ts

@@ -28,4 +28,5 @@ export declare function finalizeCdnAdapterBuildOutput({ root, outDir, isPrimaryS
   binding: string;
   bindingIsExplicit: boolean;
 }): Promise<void>;
-//#endregion
+//#endregion
+export {};

package/dist/cache/config.d.ts

@@ -134,4 +134,5 @@ export declare function createWorkersCacheConfig({ versionMetadataBinding }?: {
     VinextUncachedResponse: import("cf/config").WorkerEntrypointExport;
   };
 }>;
-//#endregion
+//#endregion
+export {};

package/dist/cache/kv-data-adapter.runtime.d.ts

@@ -60,7 +60,7 @@ export declare class KVCacheHandler implements CacheHandler {
   private keySpace;
   private ctx;
   private ttlSeconds;
-  /** Local in-memory cache for tag invalidation timestamps. Avoids redundant KV reads. */
+  /** Local in-memory cache for tag invalidation markers. Avoids redundant KV reads. */
   private _tagCache;
   /** Monotonic ordering for concurrent tag-cache fills and local invalidations. */
   private _tagCacheOrder;
@@ -95,14 +95,18 @@ export declare class KVCacheHandler implements CacheHandler {
    */
   private _readTagMarkers;
   /**
-   * Report whether any tag has an invalidation marker at or after `lastModified`.
+   * Report whether any tag expired an entry last modified at `lastModified`:
+   * its marker's expire time is at or after `lastModified` and, for a cacheLife
+   * profile's marker, has passed.
    * Call `_primeTagCache` for the same tags first — a tag with no cache entry
    * counts as never invalidated. Pass `requireFresh` to call it before a prime,
    * so an entry past `tagCacheTtlMs` does not answer for a tag it never re-read.
    */
   private _hasRevalidatedTag;
+  /** Report whether any primed tag was marked stale after `lastModified`. */
+  private _hasStaleTag;
   set(key: string, data: IncrementalCacheValue | null, ctx?: Record<string, unknown>): Promise<void>;
-  revalidateTag(tags: string | string[], _durations?: {
+  revalidateTag(tags: string | string[], durations?: {
     expire?: number;
   }): Promise<void>;
   /**

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

@@ -1,3 +1,4 @@
+import { isStaleTagInvalidation } from "./workers-cache-invalidation.js";
 import { isUnknownRecord, readCacheControlNumberField } from "../utils/cache-control-metadata.js";
 import { ENTRY_PREFIX, createKvKeySpace, resolveKvExpirationTtlSeconds } from "./kv-key.js";
 import { Buffer } from "node:buffer";
@@ -24,6 +25,23 @@ import { getRequestExecutionContext } from "vinext/shims/request-context";
 */
 /** Default KV namespace binding name read from the Worker `env`. */
 const DEFAULT_BINDING = "VINEXT_KV_CACHE";
+function parseTagMarker(raw) {
+	if (raw === null || raw === void 0) return {};
+	if (!raw.startsWith("{")) return { expired: /^\d+$/.test(raw) ? Number(raw) : NaN };
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch {
+		return { expired: NaN };
+	}
+	if (!isUnknownRecord(parsed)) return { expired: NaN };
+	const { stale, expired } = parsed;
+	if (stale === void 0 && expired === void 0 || stale !== void 0 && typeof stale !== "number" || expired !== void 0 && typeof expired !== "number") return { expired: NaN };
+	return {
+		...stale === void 0 ? {} : { stale },
+		...expired === void 0 ? {} : { expired }
+	};
+}
 /** Prefix used by revalidatePath for path-based tags. */
 const PATH_TAG_PREFIX = "_N_T_";
 /** The runtime rejects a lower `cacheTtl` with "Cache TTL must be at least 30". */
@@ -98,7 +116,7 @@ var KVCacheHandler = class {
 	keySpace;
 	ctx;
 	ttlSeconds;
-	/** Local in-memory cache for tag invalidation timestamps. Avoids redundant KV reads. */
+	/** Local in-memory cache for tag invalidation markers. Avoids redundant KV reads. */
 	_tagCache = /* @__PURE__ */ new Map();
 	/** Monotonic ordering for concurrent tag-cache fills and local invalidations. */
 	_tagCacheOrder = 0;
@@ -179,6 +197,7 @@ var KVCacheHandler = class {
 			return null;
 		}
 		if (this._hasRevalidatedTag(softTags, entry.lastModified)) return null;
+		const hasStaleTag = this._hasStaleTag([...entryTags, ...softTags], entry.lastModified);
 		if (entry.expireAt !== void 0 && entry.expireAt !== null && Date.now() > entry.expireAt) {
 			this._deleteEntryReadInBackground(kvKey);
 			return null;
@@ -186,7 +205,7 @@ var KVCacheHandler = class {
 		const now = Date.now();
 		const requestedRevalidate = readPositiveNumberField(_ctx, "revalidate");
 		const requestedRevalidateAt = requestedRevalidate === void 0 ? null : entry.lastModified + requestedRevalidate * 1e3;
-		if (entry.revalidateAt !== null && now > entry.revalidateAt || requestedRevalidateAt !== null && now > requestedRevalidateAt) return {
+		if (hasStaleTag || entry.revalidateAt !== null && now > entry.revalidateAt || requestedRevalidateAt !== null && now > requestedRevalidateAt) return {
 			lastModified: entry.lastModified,
 			value: restoredValue,
 			cacheState: "stale",
@@ -221,7 +240,7 @@ var KVCacheHandler = class {
 			if (current && current.order >= order) continue;
 			const marker = markers.get(this._tagKey(tag));
 			tagCache.set(tag, {
-				timestamp: marker ? Number(marker) : 0,
+				marker: parseTagMarker(marker),
 				fetchedAt: now,
 				order
 			});
@@ -244,18 +263,30 @@ var KVCacheHandler = class {
 		return markers;
 	}
 	/**
-	* Report whether any tag has an invalidation marker at or after `lastModified`.
+	* Report whether any tag expired an entry last modified at `lastModified`:
+	* its marker's expire time is at or after `lastModified` and, for a cacheLife
+	* profile's marker, has passed.
 	* Call `_primeTagCache` for the same tags first — a tag with no cache entry
 	* counts as never invalidated. Pass `requireFresh` to call it before a prime,
 	* so an entry past `tagCacheTtlMs` does not answer for a tag it never re-read.
 	*/
 	_hasRevalidatedTag(tags, lastModified, requireFresh = false) {
-		const now = requireFresh ? Date.now() : 0;
+		const now = Date.now();
 		for (const tag of tags) {
 			const cached = this._tagCache.get(tag);
-			if (!cached || cached.timestamp === 0) continue;
+			if (cached?.marker.expired === void 0) continue;
 			if (requireFresh && now - cached.fetchedAt >= this._tagCacheTtl) continue;
-			if (Number.isNaN(cached.timestamp) || cached.timestamp >= lastModified) return true;
+			const { stale, expired } = cached.marker;
+			const pending = stale !== void 0 && expired > now;
+			if (Number.isNaN(expired) || expired >= lastModified && !pending) return true;
+		}
+		return false;
+	}
+	/** Report whether any primed tag was marked stale after `lastModified`. */
+	_hasStaleTag(tags, lastModified) {
+		for (const tag of tags) {
+			const stale = this._tagCache.get(tag)?.marker.stale;
+			if (stale !== void 0 && stale > lastModified) return true;
 		}
 		return false;
 	}
@@ -300,16 +331,32 @@ var KVCacheHandler = class {
 			metadata
 		});
 	}
-	async revalidateTag(tags, _durations) {
+	async revalidateTag(tags, durations) {
 		const tagList = Array.isArray(tags) ? tags : [tags];
 		const now = Date.now();
 		const validTags = tagList.filter((t) => validateTag(t) !== null);
-		await Promise.all(validTags.map((tag) => this.kv.put(this._tagKey(tag), String(now))));
+		const markers = await Promise.all(validTags.map(async (tag) => {
+			const tagKey = this._tagKey(tag);
+			if (!isStaleTagInvalidation(durations)) {
+				await this.kv.put(tagKey, String(now));
+				return { expired: now };
+			}
+			const expire = durations?.expire;
+			const expired = expire === void 0 ? parseTagMarker(await this.kv.get(tagKey)).expired : now + expire * 1e3;
+			const marker = {
+				stale: now,
+				...expired !== void 0 && Number.isFinite(expired) ? { expired } : {}
+			};
+			await this.kv.put(tagKey, JSON.stringify(marker));
+			return marker;
+		}));
 		const order = ++this._tagCacheOrder;
-		for (const tag of validTags) this._tagCache.set(tag, {
-			timestamp: now,
-			fetchedAt: now,
-			order
+		validTags.forEach((tag, index) => {
+			this._tagCache.set(tag, {
+				marker: markers[index],
+				fetchedAt: now,
+				order
+			});
 		});
 	}
 	/**

package/dist/cache/response-store-adapter.worker.d.ts

@@ -11,4 +11,5 @@ export declare function createVinextResponseStoreOptions<Env extends VinextRespo
 export declare function createVinextResponseStoreHandler(store: WorkersResponseStore): {
   fetch(request: Request, env: VinextResponseStoreEnv, ctx: WorkerExecutionContext): Promise<Response>;
 };
-//#endregion
+//#endregion
+export {};

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

@@ -6,10 +6,11 @@ import { cacheForRequest } from "vinext/cache";
 //#region src/cache/response-store-data.runtime.ts
 const ARRAY_BUFFER_MARKER = "$vinextArrayBuffer";
 const CACHE_MAX_AGE_SECONDS = 31536e4;
-const CACHE_MAX_AGE = `public, max-age=${CACHE_MAX_AGE_SECONDS}`;
 const DATA_ENTRY_PATH = "__vinext_data";
 const REPLAYABLE_HEADER = "X-Vinext-Response-Store-Replayable";
 const MAX_CACHE_TAG_HEADER_BYTES = 16384;
+/** How long past its revalidate a current Store's hit can still be marked fresh: write latency. */
+const STALE_FRESH_HIT_GRACE_MS = 5e3;
 const DATA_REVALIDATOR_ID = "vinext:data";
 const CACHE_FUNCTION_REVALIDATOR_ID = "vinext:cache-function";
 const invocationStorage = new AsyncLocalStorage();
@@ -194,9 +195,9 @@ function deserialize(value) {
 	return entry;
 }
 function cachePolicy(revalidate, expire) {
-	if (revalidate === false || revalidate === void 0) return `public, max-age=${CACHE_MAX_AGE_SECONDS}`;
-	const staleSeconds = expire === void 0 ? CACHE_MAX_AGE_SECONDS : Math.max(0, expire - revalidate);
-	return `public, max-age=${Math.max(0, revalidate)}, stale-while-revalidate=${staleSeconds}`;
+	if (revalidate === false || revalidate === void 0) return `public, max-age=${expire === void 0 ? CACHE_MAX_AGE_SECONDS : Math.max(1, Math.ceil(expire))}`;
+	const maxAge = revalidate > 0 ? Math.max(1, Math.floor(revalidate)) : 0;
+	return `public, max-age=${maxAge}, stale-while-revalidate=${expire === void 0 ? CACHE_MAX_AGE_SECONDS : Math.max(0, Math.ceil(expire) - maxAge)}`;
 }
 var WorkersResponseStoreCacheHandler = class {
 	store;
@@ -244,12 +245,13 @@ var WorkersResponseStoreCacheHandler = class {
 			}
 			const age = Date.now() - entry.lastModified;
 			const requestedRevalidate = readCacheControlField(context, "revalidate");
+			const storedRevalidate = entry.cacheControl?.revalidate;
 			const requestedStale = typeof requestedRevalidate === "number" && requestedRevalidate > 0 && age > requestedRevalidate * 1e3;
 			let cacheState;
 			if (response.headers.get(REPLAYABLE_HEADER) === "1") {
 				if (requestedStale && storeStatus !== "BLOB-STALE") cacheState = "stale";
 			} else if (typeof entry.cacheControl?.expire === "number" && age > entry.cacheControl.expire * 1e3) cacheState = "expired";
-			else if (requestedStale || storeStatus === "BLOB-STALE" || typeof entry.cacheControl?.revalidate === "number" && entry.cacheControl.revalidate > 0 && age > entry.cacheControl.revalidate * 1e3) cacheState = "stale";
+			else if (storeStatus === "BLOB-STALE" || requestedStale && typeof requestedRevalidate === "number" && (typeof storedRevalidate !== "number" || requestedRevalidate < storedRevalidate) || typeof storedRevalidate === "number" && storedRevalidate > 0 && age > storedRevalidate * 1e3 + STALE_FRESH_HIT_GRACE_MS) cacheState = "stale";
 			return {
 				lastModified: entry.lastModified,
 				value: entry.value,
@@ -274,9 +276,11 @@ var WorkersResponseStoreCacheHandler = class {
 		let revalidate = readCacheControlField(context, "revalidate");
 		if (value && "revalidate" in value) revalidate = value.revalidate;
 		if (revalidate === 0) return;
+		if (typeof revalidate === "number" && !Number.isFinite(revalidate)) revalidate = false;
 		const rawExpire = readCacheControlField(context, "expire");
-		const expire = typeof rawExpire === "number" ? rawExpire : void 0;
-		const stale = readCacheControlField(context, "stale");
+		const expire = typeof rawExpire === "number" && Number.isFinite(rawExpire) ? rawExpire : void 0;
+		const rawStale = readCacheControlField(context, "stale");
+		const stale = typeof rawStale === "number" && Number.isFinite(rawStale) ? rawStale : void 0;
 		const cacheControl = typeof revalidate === "number" || revalidate === false ? {
 			revalidate,
 			...typeof expire === "number" ? { expire } : {},
@@ -303,7 +307,7 @@ var WorkersResponseStoreCacheHandler = class {
 			lastModified: Date.now(),
 			value
 		}), { headers: {
-			"Cache-Control": revalidator ? cachePolicy(revalidate, expire) : CACHE_MAX_AGE,
+			"Cache-Control": cachePolicy(revalidate, expire),
 			...tagHeader ? { "Cache-Tag": tagHeader } : {},
 			"Content-Type": "application/json",
 			...revalidator ? { [REPLAYABLE_HEADER]: "1" } : {}

package/dist/cache/static-assets-adapter.runtime.d.ts

@@ -26,4 +26,5 @@ export default function createStaticAssetsCacheAdapter({ env, options }?: {
   env?: Record<string, unknown>;
   options?: StaticAssetsAdapterOptions;
 }): CdnCacheAdapter;
-//#endregion
+//#endregion
+export {};

package/dist/cache/workers-cache-invalidation.d.ts

@@ -27,4 +27,5 @@ export declare function hasCacheMethod<Name extends CacheMethodName>(value: unkn
  * `undefined` when the cache supports neither.
  */
 export declare function invalidateOrPurge(cache: unknown, options: CacheInvalidationOptions): unknown;
-//#endregion
+//#endregion
+export {};

package/dist/cdn-warm.d.ts

@@ -130,4 +130,5 @@ export declare function waitForCdnWarmTargetReadiness(options: Pick<CdnWarmOptio
 }): Promise<CdnWarmReadinessResult>;
 export declare function warmCdnCache(options: CdnWarmOptions): Promise<CdnWarmResult>;
 export declare function warmCdnCacheFromPrerender(options: PrerenderCdnWarmOptions): Promise<CdnWarmResult>;
-//#endregion
+//#endregion
+export {};

package/dist/deploy.d.ts

@@ -192,4 +192,5 @@ export declare function resolveDeploymentControlPlaneOptions(options: Deployment
 export declare function resolveWorkerNameForVersionOverride(config: ParsedWranglerConfig | null, options: Pick<DeployOptions, "preview" | "env" | "name">): string | undefined;
 export declare function buildVersionOverrideHeaders(workerName: string | undefined, versionId: string): HeadersInit | undefined;
 export declare function deploy(options: DeployOptions): Promise<void>;
-//#endregion
+//#endregion
+export {};

package/dist/deploy.js

@@ -1191,6 +1191,7 @@ async function deploy(options) {
 	if (deploymentTool === "cf" && options.name) throw new Error("--name is not supported for cloudflare.config.ts projects. Set `name` in cloudflare.config.ts instead.");
 	const viteMode = resolveViteBuildMode(deploymentTool, deployEnv);
 	const wranglerFallbackEnv = deploymentTool === "cf" ? void 0 : deployEnv;
+	if (!process.env.NODE_ENV) Reflect.set(process.env, "NODE_ENV", "production");
 	loadDotenv({
 		root,
 		mode: viteMode

package/dist/version-headers.js

@@ -1,2 +1 @@
-import { VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "vinext/internal/server/headers";
-export { VINEXT_EXPECTED_WORKER_VERSION_HEADER };
+export { VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "vinext/internal/server/headers";

package/dist/wrangler-config.d.ts

@@ -16,4 +16,5 @@ type WranglerEnvironmentConfig = {
  * Parse the Wrangler fields used by TPR and staged CDN warming.
  */
 export declare function parseWranglerConfig(root: string, configPath?: string): WranglerConfig | null;
-//#endregion
+//#endregion
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinext/cloudflare",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Cloudflare cache and image adapters for vinext.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",
@@ -48,21 +48,20 @@
     }
   },
   "dependencies": {
-    "@cloudflare/workers-response-store": "1.1.2"
+    "@cloudflare/workers-response-store": "1.1.3"
   },
   "devDependencies": {
     "@types/node": "^25.9.2",
     "cf": "1.0.0-beta.1",
     "miniflare": "5.20260730.0-alpha",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
-    "vite-plus": "1.1.0",
-    "vitest": "5.0.3",
-    "vinext": "1.3.0"
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
+    "vite-plus": "1.3.0",
+    "vinext": "1.3.1"
   },
   "peerDependencies": {
     "@cloudflare/vite-plugin": "*",
     "cf": "*",
-    "vinext": "^1.3.0"
+    "vinext": "^1.3.1"
   },
   "peerDependenciesMeta": {
     "@cloudflare/vite-plugin": {
@@ -78,6 +77,6 @@
   "scripts": {
     "build": "vp pack",
     "dev": "vp pack --watch",
-    "test": "vp run vinext#build && vp run @cloudflare/workers-response-store#build && vp run @vinext/cloudflare#build && VINEXT_RESPONSE_STORE_MODE=self-contained VINEXT_RESPONSE_STORE_LOCATION_HINT=weur pnpm --filter response-store-demo run build && VINEXT_RESPONSE_STORE_LOCATION_HINT=wnam pnpm --filter response-store-demo run build && vitest run"
+    "test": "vp run vinext#build && vp run @cloudflare/workers-response-store#build && vp run @vinext/cloudflare#build && VINEXT_RESPONSE_STORE_MODE=self-contained VINEXT_RESPONSE_STORE_LOCATION_HINT=weur pnpm --filter response-store-demo run build && VINEXT_RESPONSE_STORE_LOCATION_HINT=wnam pnpm --filter response-store-demo run build && vp test run"
   }
 }