@decocms/apps-vtex 7.31.7 → 7.32.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/apps-vtex",
-  "version": "7.31.7",
+  "version": "7.32.1",
   "type": "module",
   "description": "Deco commerce app: VTEX integration",
   "repository": {
@@ -51,10 +51,10 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.31.7",
-    "@decocms/apps-commerce": "7.31.7",
-    "@decocms/apps-website": "7.31.7",
-    "@decocms/tanstack": "7.31.7"
+    "@decocms/blocks": "7.32.1",
+    "@decocms/apps-commerce": "7.32.1",
+    "@decocms/apps-website": "7.32.1",
+    "@decocms/tanstack": "7.32.1"
   },
   "peerDependencies": {
     "@tanstack/react-query": ">=5.0.0",

package/src/utils/fetchCache.ts

@@ -1,12 +1,20 @@
 /**
- * SWR in-memory fetch cache for VTEX API responses.
+ * VTEX SWR fetch cache — a thin binding over the shared, instrumented
+ * `createFetchCache` in `@decocms/blocks/sdk/fetchCache`.
  *
- * Inspired by deco-cx/deco runtime/fetch/fetchCache.ts.
- * Provides in-flight deduplication + stale-while-revalidate for GET requests.
- *
- * Only caches on the server side. Keyed by full URL string.
+ * The implementation (in-flight dedup, stale-while-revalidate, stale-if-error,
+ * inflight backstop) now lives ONCE in the framework so every commerce app
+ * shares it and emits `deco.cache.requests{layer="swr"}` automatically. This
+ * module just wires VTEX's tuning constants (`./constants`) and the
+ * `provider: "vtex"` label into a single module-level instance, preserving the
+ * public surface (`fetchWithCache` / `clearFetchCache` / `getFetchCacheStats` /
+ * `FetchCacheOptions`) that `client.ts` and existing tests depend on.
  */
 
+import {
+  createFetchCache,
+  type FetchCacheOptions as SharedFetchCacheOptions,
+} from "@decocms/blocks/sdk/fetchCache";
 import {
   FETCH_CACHE_FRESH_TTL_MS,
   FETCH_CACHE_INFLIGHT_BACKSTOP_MS,
@@ -14,186 +22,34 @@ import {
   FETCH_CACHE_STALE_IF_ERROR_MS,
 } from "./constants";
 
-interface CacheEntry {
-  body: unknown;
-  status: number;
-  createdAt: number;
-  refreshing: boolean;
-}
-
-function freshTtlForStatus(status: number): number {
-  if (status >= 200 && status < 300) return FETCH_CACHE_FRESH_TTL_MS.success;
-  if (status === 404) return FETCH_CACHE_FRESH_TTL_MS.notFound;
-  if (status >= 500) return FETCH_CACHE_FRESH_TTL_MS.serverError;
-  return 0;
-}
-
-const store = new Map<string, CacheEntry>();
-const inflight = new Map<string, Promise<CacheEntry>>();
-
-function evictIfNeeded() {
-  if (store.size <= FETCH_CACHE_MAX_ENTRIES) return;
-  const sorted = [...store.entries()].sort((a, b) => a[1].createdAt - b[1].createdAt);
-  const toRemove = sorted.slice(0, store.size - FETCH_CACHE_MAX_ENTRIES);
-  for (const [key] of toRemove) store.delete(key);
-}
-
-/**
- * Race a Promise against a timeout so callers' `.finally()` always runs.
- * Critical for evicting the inflight Map entry when a `fetch()` hangs —
- * without this, a never-settling Promise leaks the Map slot forever and
- * every subsequent request for the same key joins the zombie Promise.
- */
-function withTimeout<T>(work: Promise<T>, ms: number, label: string): Promise<T> {
-  let timer: ReturnType<typeof setTimeout> | undefined;
-  const timeout = new Promise<never>((_, reject) => {
-    timer = setTimeout(() => {
-      reject(new Error(`${label} timed out after ${ms}ms`));
-    }, ms);
-  });
-  return Promise.race([work, timeout]).finally(() => {
-    clearTimeout(timer);
-  });
-}
-
-async function executeFetch(url: string, doFetch: () => Promise<Response>): Promise<CacheEntry> {
-  // Single attempt on purpose. The resilience layer (`createResilientFetch`,
-  // wired as the VTEX fetch's baseFetch) owns retries, backoff+jitter, the
-  // per-host retry budget, and the circuit breaker. Retrying here would:
-  //   - double-retry network errors (resilience 3× × fetchCache 3× = up to 9
-  //     upstream calls per logical request — the retry storm the budget
-  //     prevents), and
-  //   - re-enter the breaker on every 5xx retry, opening it ~3× too fast.
-  const response = await doFetch();
+export type FetchCacheOptions = SharedFetchCacheOptions;
 
-  if (response.status >= 500) {
-    throw new Error(`fetchWithCache: ${response.status} ${response.statusText} — ${url}`);
-  }
-
-  const body = response.ok ? await response.json() : null;
-  return {
-    body,
-    status: response.status,
-    createdAt: Date.now(),
-    refreshing: false,
-  };
-}
-
-export interface FetchCacheOptions {
-  /**
-   * Custom TTL in ms. If provided, overrides status-based TTL.
-   */
-  ttl?: number;
-  /**
-   * Stale-if-error window in ms. How long past the freshness TTL a last-good
-   * entry may still be served while the origin is failing. Defaults to
-   * {@link FETCH_CACHE_STALE_IF_ERROR_MS} (24h). Set to 0 to disable stale
-   * serving.
-   */
-  sieMs?: number;
-}
+const cache = createFetchCache({
+  provider: "vtex",
+  maxEntries: FETCH_CACHE_MAX_ENTRIES,
+  freshTtlMs: FETCH_CACHE_FRESH_TTL_MS,
+  staleIfErrorMs: FETCH_CACHE_STALE_IF_ERROR_MS,
+  inflightBackstopMs: FETCH_CACHE_INFLIGHT_BACKSTOP_MS,
+});
 
 /**
  * Wrap a GET fetch call with SWR caching and in-flight dedup.
  *
  * Returns `null` for non-2xx responses that are cached (e.g. 404).
  * 5xx responses throw so the caller can handle them explicitly.
- *
- * @param cacheKey - Unique key (typically the full URL)
- * @param doFetch - The actual fetch call to execute
- * @param opts - Optional overrides
- * @returns Parsed JSON body, or null for cacheable error responses (e.g. 404)
  */
 export function fetchWithCache<T>(
   cacheKey: string,
   doFetch: () => Promise<Response>,
   opts?: FetchCacheOptions,
 ): Promise<T | null> {
-  const now = Date.now();
-  const entry = store.get(cacheKey);
-
-  if (entry) {
-    const maxAge = opts?.ttl ?? freshTtlForStatus(entry.status);
-    const age = now - entry.createdAt;
-    const isStale = age > maxAge;
-
-    if (!isStale) return Promise.resolve(entry.body as T | null);
-
-    // Beyond the stale-if-error window the last-good entry is too old to keep
-    // serving during an outage: drop it and fall through to a foreground
-    // refetch (cold path). On a healthy origin this is never reached because
-    // the background refresh below keeps resetting `createdAt`.
-    const sieMs = opts?.sieMs ?? FETCH_CACHE_STALE_IF_ERROR_MS;
-    const tooStale = age > maxAge + sieMs;
-
-    if (!tooStale) {
-      if (!entry.refreshing) {
-        entry.refreshing = true;
-        // Background refresh: no retry — stale data is already being served.
-        // Timeout guards against a hung VTEX response leaving `refreshing`
-        // stuck true forever (which would silently disable revalidation).
-        withTimeout(
-          executeFetch(cacheKey, doFetch),
-          FETCH_CACHE_INFLIGHT_BACKSTOP_MS,
-          `fetchCache stale-refresh ${cacheKey}`,
-        )
-          .then((fresh) => {
-            const ttl = opts?.ttl ?? freshTtlForStatus(fresh.status);
-            const existingWasSuccess = entry.status >= 200 && entry.status < 300;
-            const freshIsError = fresh.status >= 400;
-            const wouldDowngrade = existingWasSuccess && freshIsError;
-            if (ttl > 0 && !wouldDowngrade) {
-              store.set(cacheKey, fresh);
-            } else {
-              entry.refreshing = false;
-            }
-          })
-          .catch(() => {
-            entry.refreshing = false;
-          });
-      }
-      // Serve last-good while it is within the SIE window (stale-if-error).
-      return Promise.resolve(entry.body as T | null);
-    }
-
-    store.delete(cacheKey);
-    // fall through to the cold path below with the dead entry removed
-  }
-
-  const existing = inflight.get(cacheKey);
-  if (existing) return existing.then((e) => e.body as T | null);
-
-  // Wrap with a timeout so the `.finally()` below always runs and evicts
-  // the inflight slot — even if `executeFetch` never settles. See the
-  // FETCH_CACHE_INFLIGHT_BACKSTOP_MS doc comment (constants.ts) for the leak
-  // this guards against.
-  const promise = withTimeout(
-    executeFetch(cacheKey, doFetch),
-    FETCH_CACHE_INFLIGHT_BACKSTOP_MS,
-    `fetchCache ${cacheKey}`,
-  )
-    .then((fresh) => {
-      const ttl = opts?.ttl ?? freshTtlForStatus(fresh.status);
-      if (ttl > 0) {
-        store.set(cacheKey, fresh);
-        evictIfNeeded();
-      }
-      return fresh;
-    })
-    .finally(() => inflight.delete(cacheKey));
-
-  inflight.set(cacheKey, promise);
-  return promise.then((e) => e.body as T | null);
+  return cache.fetchWithCache<T>(cacheKey, doFetch, opts);
 }
 
 export function clearFetchCache() {
-  store.clear();
-  inflight.clear();
+  cache.clear();
 }
 
 export function getFetchCacheStats() {
-  return {
-    entries: store.size,
-    inflight: inflight.size,
-  };
+  return cache.getStats();
 }

package/src/utils/operationRouter.ts

@@ -118,16 +118,10 @@ const MATCHERS: ReadonlyArray<Matcher> = [
  * });
  * ```
  */
+import { extractPathname } from "@decocms/blocks/sdk/urlUtils";
+
 export function vtexOperationRouter(url: string, method: string): string | undefined {
-	let pathname: string;
-	try {
-		pathname = new URL(url).pathname;
-	} catch {
-		const qs = url.indexOf("?");
-		const hash = url.indexOf("#");
-		const end = [qs, hash].filter((i) => i >= 0).sort((a, b) => a - b)[0];
-		pathname = end === undefined ? url : url.slice(0, end);
-	}
+	const pathname = extractPathname(url);
 
 	const upperMethod = method.toUpperCase();
 	for (const { pattern, operation } of MATCHERS) {