layercache 1.3.3 → 1.3.4

package/dist/index.cjs

@@ -1106,6 +1106,366 @@ function planFreshReadPolicies({
   };
 }
 
+// src/internal/CacheStackReader.ts
+var DEFAULT_SINGLE_FLIGHT_LEASE_MS = 3e4;
+var DEFAULT_SINGLE_FLIGHT_TIMEOUT_MS = 5e3;
+var DEFAULT_SINGLE_FLIGHT_POLL_MS = 50;
+var DEFAULT_BACKGROUND_REFRESH_TIMEOUT_MS = 3e4;
+var CacheStackReader = class {
+  constructor(options) {
+    this.options = options;
+  }
+  options;
+  backgroundRefreshes = /* @__PURE__ */ new Map();
+  backgroundRefreshAbort = /* @__PURE__ */ new Map();
+  get activeRefreshCount() {
+    return this.backgroundRefreshes.size;
+  }
+  async getPrepared(normalizedKey, fetcher, options) {
+    const hit = await this.readFromLayers(normalizedKey, options, "allow-stale");
+    if (hit.found) {
+      this.options.ttlResolver.recordAccess(normalizedKey);
+      if (this.isNegativeStoredValue(hit.stored)) {
+        this.options.metricsCollector.increment("negativeCacheHits");
+      }
+      if (hit.state === "fresh") {
+        this.options.metricsCollector.increment("hits");
+        await this.applyFreshReadPolicies(normalizedKey, hit, options, fetcher);
+        return hit.value;
+      }
+      if (hit.state === "stale-while-revalidate") {
+        this.options.metricsCollector.increment("hits");
+        this.options.metricsCollector.increment("staleHits");
+        this.options.emit("stale-serve", { key: normalizedKey, state: hit.state, layer: hit.layerName });
+        if (fetcher) {
+          this.scheduleBackgroundRefresh(normalizedKey, fetcher, options);
+        }
+        return hit.value;
+      }
+      if (!fetcher) {
+        this.options.metricsCollector.increment("hits");
+        this.options.metricsCollector.increment("staleHits");
+        this.options.emit("stale-serve", { key: normalizedKey, state: hit.state, layer: hit.layerName });
+        return hit.value;
+      }
+      try {
+        return await this.fetchWithGuards(normalizedKey, fetcher, options);
+      } catch (error) {
+        this.options.metricsCollector.increment("staleHits");
+        this.options.metricsCollector.increment("refreshErrors");
+        this.options.logger.debug?.("stale-if-error", {
+          key: normalizedKey,
+          error: this.options.formatError(error)
+        });
+        return hit.value;
+      }
+    }
+    this.options.metricsCollector.increment("misses");
+    if (!fetcher) {
+      return null;
+    }
+    return this.fetchWithGuards(normalizedKey, fetcher, options, void 0, void 0, true);
+  }
+  async readLayerEntry(layer, key) {
+    if (this.options.shouldSkipLayer(layer)) {
+      return null;
+    }
+    if (layer.getEntry) {
+      try {
+        return await layer.getEntry(key);
+      } catch (error) {
+        return this.options.handleLayerFailure(layer, "read", error);
+      }
+    }
+    try {
+      return await layer.get(key);
+    } catch (error) {
+      return this.options.handleLayerFailure(layer, "read", error);
+    }
+  }
+  async backfill(key, stored, upToIndex, options) {
+    if (upToIndex < 0) {
+      return;
+    }
+    for (let index = 0; index <= upToIndex; index += 1) {
+      const layer = this.options.layers[index];
+      if (!layer || this.options.shouldSkipLayer(layer)) {
+        continue;
+      }
+      const ttl = remainingStoredTtlSeconds(stored) ?? this.options.resolveLayerSeconds(layer.name, options?.ttl, void 0, layer.defaultTtl);
+      try {
+        await layer.set(key, stored, ttl);
+      } catch (error) {
+        await this.options.handleLayerFailure(layer, "backfill", error);
+        continue;
+      }
+      this.options.metricsCollector.increment("backfills");
+      this.options.logger.debug?.("backfill", { key, layer: layer.name });
+      this.options.emit("backfill", { key, layer: layer.name });
+    }
+  }
+  abortAllRefreshes() {
+    for (const key of this.backgroundRefreshAbort.keys()) {
+      this.backgroundRefreshAbort.set(key, true);
+    }
+  }
+  getAllRefreshPromises() {
+    return [...this.backgroundRefreshes.values()];
+  }
+  async readFromLayers(key, options, mode) {
+    let sawRetainableValue = false;
+    for (let index = 0; index < this.options.layers.length; index += 1) {
+      const layer = this.options.layers[index];
+      if (!layer) continue;
+      const readStart = performance.now();
+      const stored = await this.readLayerEntry(layer, key);
+      const readDuration = performance.now() - readStart;
+      this.options.metricsCollector.recordLatency(layer.name, readDuration);
+      if (stored === null) {
+        this.options.metricsCollector.incrementLayer("missesByLayer", layer.name);
+        continue;
+      }
+      const resolved = resolveStoredValue(stored);
+      if (resolved.state === "expired") {
+        await layer.delete(key);
+        continue;
+      }
+      sawRetainableValue = true;
+      if (mode === "fresh-only" && resolved.state !== "fresh") {
+        continue;
+      }
+      await this.options.tagIndex.touch(key);
+      await this.backfill(key, stored, index - 1, options);
+      this.options.metricsCollector.incrementLayer("hitsByLayer", layer.name);
+      this.options.logger.debug?.("hit", { key, layer: layer.name, state: resolved.state });
+      this.options.emit("hit", {
+        key,
+        layer: layer.name,
+        state: resolved.state
+      });
+      return {
+        found: true,
+        value: resolved.value,
+        stored,
+        state: resolved.state,
+        layerIndex: index,
+        layerName: layer.name
+      };
+    }
+    if (!sawRetainableValue) {
+      await this.options.tagIndex.remove(key);
+    }
+    this.options.logger.debug?.("miss", { key, mode });
+    this.options.emit("miss", { key, mode });
+    return { found: false, value: null, stored: null, state: "miss" };
+  }
+  async fetchWithGuards(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, initialMissConfirmed = false) {
+    const fetchTask = async () => {
+      const shouldRecheckFreshLayers = !(initialMissConfirmed && this.options.singleFlightCoordinator);
+      if (shouldRecheckFreshLayers) {
+        const secondHit = await this.readFromLayers(key, options, "fresh-only");
+        if (secondHit.found) {
+          this.options.metricsCollector.increment("hits");
+          return secondHit.value;
+        }
+      }
+      return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch);
+    };
+    const singleFlightTask = async () => {
+      if (!this.options.singleFlightCoordinator) {
+        return fetchTask();
+      }
+      try {
+        return await this.options.singleFlightCoordinator.execute(
+          key,
+          this.resolveSingleFlightOptions(),
+          fetchTask,
+          () => this.waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch)
+        );
+      } catch (error) {
+        if (!this.options.isGracefulDegradationEnabled()) {
+          throw error;
+        }
+        this.options.metricsCollector.increment("degradedOperations");
+        this.options.logger.warn?.("single-flight-coordinator-degraded", {
+          key,
+          error: this.options.formatError(error)
+        });
+        this.options.emitError("single-flight", {
+          key,
+          degraded: true,
+          error: this.options.formatError(error)
+        });
+        return fetchTask();
+      }
+    };
+    if (this.options.stampedePrevention === false) {
+      return singleFlightTask();
+    }
+    return this.options.stampedeGuard.execute(key, singleFlightTask);
+  }
+  async waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
+    const timeoutMs = this.options.singleFlightTimeoutMs ?? DEFAULT_SINGLE_FLIGHT_TIMEOUT_MS;
+    const pollIntervalMs = this.options.singleFlightPollMs ?? DEFAULT_SINGLE_FLIGHT_POLL_MS;
+    const deadline = Date.now() + timeoutMs;
+    this.options.metricsCollector.increment("singleFlightWaits");
+    this.options.emit("stampede-dedupe", { key });
+    while (Date.now() < deadline) {
+      const hit = await this.readFromLayers(key, options, "fresh-only");
+      if (hit.found) {
+        this.options.metricsCollector.increment("hits");
+        return hit.value;
+      }
+      await this.options.sleep(pollIntervalMs);
+    }
+    return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch);
+  }
+  async fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
+    this.options.circuitBreakerManager.assertClosed(key, options?.circuitBreaker ?? this.options.circuitBreaker);
+    this.options.metricsCollector.increment("fetches");
+    const fetchStart = Date.now();
+    let fetched;
+    try {
+      fetched = await this.options.fetchRateLimiter.schedule(
+        options?.fetcherRateLimit ?? this.options.fetcherRateLimit,
+        { key, fetcher },
+        fetcher
+      );
+      this.options.circuitBreakerManager.recordSuccess(key);
+      this.options.logger.debug?.("fetch", { key, durationMs: Date.now() - fetchStart });
+    } catch (error) {
+      this.options.recordCircuitFailure(key, options?.circuitBreaker ?? this.options.circuitBreaker, error);
+      throw error;
+    }
+    if (fetched === null || fetched === void 0) {
+      if (!this.shouldNegativeCache(options)) {
+        return null;
+      }
+      if (this.options.maintenance.isWriteOutdated(key, expectedClearEpoch, expectedKeyEpoch)) {
+        this.options.logger.debug?.("skip-negative-store-after-invalidation", {
+          key,
+          expectedClearEpoch,
+          clearEpoch: this.options.maintenance.currentClearEpoch(),
+          expectedKeyEpoch,
+          keyEpoch: this.options.maintenance.currentKeyEpoch(key)
+        });
+        return null;
+      }
+      await this.options.storeEntry(key, "empty", null, options);
+      return null;
+    }
+    if (options?.shouldCache) {
+      try {
+        if (!options.shouldCache(fetched)) {
+          return fetched;
+        }
+      } catch (error) {
+        this.options.logger.warn?.("shouldCache-error", {
+          key,
+          error: this.options.formatError(error)
+        });
+      }
+    }
+    if (this.options.maintenance.isWriteOutdated(key, expectedClearEpoch, expectedKeyEpoch)) {
+      this.options.logger.debug?.("skip-store-after-invalidation", {
+        key,
+        expectedClearEpoch,
+        clearEpoch: this.options.maintenance.currentClearEpoch(),
+        expectedKeyEpoch,
+        keyEpoch: this.options.maintenance.currentKeyEpoch(key)
+      });
+      return fetched;
+    }
+    await this.options.storeEntry(key, "value", fetched, options);
+    return fetched;
+  }
+  runScheduleBackgroundRefresh(key, fetcher, options) {
+    this.scheduleBackgroundRefresh(key, fetcher, options);
+  }
+  scheduleBackgroundRefresh(key, fetcher, options) {
+    if (!shouldStartBackgroundRefresh({
+      isDisconnecting: this.options.isDisconnecting(),
+      hasRefreshInFlight: this.backgroundRefreshes.has(key)
+    })) {
+      return;
+    }
+    const clearEpoch = this.options.maintenance.currentClearEpoch();
+    const keyEpoch = this.options.maintenance.currentKeyEpoch(key);
+    this.backgroundRefreshAbort.set(key, false);
+    const refresh = (async () => {
+      this.options.metricsCollector.increment("refreshes");
+      try {
+        if (this.backgroundRefreshAbort.get(key)) return;
+        await this.runBackgroundRefresh(key, fetcher, options, clearEpoch, keyEpoch);
+      } catch (error) {
+        if (this.backgroundRefreshAbort.get(key)) return;
+        this.options.metricsCollector.increment("refreshErrors");
+        this.options.logger.warn?.("background-refresh-error", {
+          key,
+          error: this.options.formatError(error)
+        });
+      } finally {
+        this.backgroundRefreshes.delete(key);
+        this.backgroundRefreshAbort.delete(key);
+      }
+    })();
+    this.backgroundRefreshes.set(key, refresh);
+  }
+  async runBackgroundRefresh(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
+    const timeoutMs = this.options.backgroundRefreshTimeoutMs ?? DEFAULT_BACKGROUND_REFRESH_TIMEOUT_MS;
+    await this.fetchWithGuards(
+      key,
+      () => this.options.withTimeout(fetcher(), timeoutMs, () => {
+        return new Error(`Background refresh timed out after ${timeoutMs}ms for key "${key}".`);
+      }),
+      options,
+      expectedClearEpoch,
+      expectedKeyEpoch
+    );
+  }
+  async runApplyFreshReadPolicies(key, hit, options, fetcher) {
+    return this.applyFreshReadPolicies(key, hit, options, fetcher);
+  }
+  async applyFreshReadPolicies(key, hit, options, fetcher) {
+    const plan = planFreshReadPolicies({
+      stored: hit.stored,
+      hasFetcher: Boolean(fetcher),
+      slidingTtl: options?.slidingTtl ?? false,
+      refreshAheadSeconds: this.options.resolveLayerSeconds(hit.layerName, options?.refreshAhead, this.options.refreshAhead, 0) ?? 0
+    });
+    if (plan.refreshedStored) {
+      for (let index = 0; index <= hit.layerIndex; index += 1) {
+        const layer = this.options.layers[index];
+        if (!layer || this.options.shouldSkipLayer(layer)) {
+          continue;
+        }
+        try {
+          await layer.set(key, plan.refreshedStored, plan.refreshedStoredTtl);
+        } catch (error) {
+          await this.options.handleLayerFailure(layer, "sliding-ttl", error);
+        }
+      }
+    }
+    if (fetcher && plan.shouldScheduleBackgroundRefresh) {
+      this.options.scheduleBackgroundRefreshDispatch(key, fetcher, options);
+    }
+  }
+  resolveSingleFlightOptions() {
+    return {
+      leaseMs: this.options.singleFlightLeaseMs ?? DEFAULT_SINGLE_FLIGHT_LEASE_MS,
+      waitTimeoutMs: this.options.singleFlightTimeoutMs ?? DEFAULT_SINGLE_FLIGHT_TIMEOUT_MS,
+      pollIntervalMs: this.options.singleFlightPollMs ?? DEFAULT_SINGLE_FLIGHT_POLL_MS,
+      renewIntervalMs: this.options.singleFlightRenewIntervalMs
+    };
+  }
+  shouldNegativeCache(options) {
+    return options?.negativeCache ?? this.options.negativeCaching ?? false;
+  }
+  isNegativeStoredValue(stored) {
+    return isStoredValueEnvelope(stored) && stored.kind === "empty";
+  }
+};
+
 // src/internal/CacheStackSnapshotManager.ts
 var import_node_fs = require("fs");
 
@@ -2423,10 +2783,6 @@ var CacheMissError = class extends Error {
 };
 
 // src/CacheStack.ts
-var DEFAULT_SINGLE_FLIGHT_LEASE_MS = 3e4;
-var DEFAULT_SINGLE_FLIGHT_TIMEOUT_MS = 5e3;
-var DEFAULT_SINGLE_FLIGHT_POLL_MS = 50;
-var DEFAULT_BACKGROUND_REFRESH_TIMEOUT_MS = 3e4;
 var DEFAULT_SNAPSHOT_MAX_BYTES = 16 * 1024 * 1024;
 var DEFAULT_SNAPSHOT_MAX_ENTRIES = 1e4;
 var DEFAULT_INVALIDATION_MAX_KEYS = 1e4;
@@ -2537,7 +2893,7 @@ var CacheStack = class extends import_node_events.EventEmitter {
       layers: this.layers,
       tagIndex: this.tagIndex,
       snapshotSerializer: this.snapshotSerializer,
-      readLayerEntry: this.readLayerEntry.bind(this),
+      readLayerEntry: (layer, key) => this.reader.readLayerEntry(layer, key),
       shouldSkipLayer: (layer) => this.shouldSkipLayer(layer),
       handleLayerFailure: async (layer, operation, error) => this.handleLayerFailure(layer, operation, error),
       qualifyKey: this.qualifyKey.bind(this),
@@ -2545,6 +2901,41 @@ var CacheStack = class extends import_node_events.EventEmitter {
       validateCacheKey,
       formatError: this.formatError.bind(this)
     });
+    this.reader = new CacheStackReader({
+      layers: this.layers,
+      metricsCollector: this.metricsCollector,
+      maintenance: this.maintenance,
+      tagIndex: this.tagIndex,
+      circuitBreakerManager: this.circuitBreakerManager,
+      fetchRateLimiter: this.fetchRateLimiter,
+      stampedeGuard: this.stampedeGuard,
+      ttlResolver: this.ttlResolver,
+      logger: this.logger,
+      shouldSkipLayer: (layer) => this.shouldSkipLayer(layer),
+      handleLayerFailure: async (layer, operation, error) => this.handleLayerFailure(layer, operation, error),
+      emit: (event, data) => this.emit(event, data),
+      emitError: (operation, context) => this.emitError(operation, context),
+      formatError: (error) => this.formatError(error),
+      storeEntry: (key, kind, value, options2) => this.storeEntry(key, kind, value, options2),
+      recordCircuitFailure: (key, options2, error) => this.recordCircuitFailure(key, options2, error),
+      resolveLayerSeconds: (layerName, override, globalDefault, fallback) => this.resolveLayerSeconds(layerName, override, globalDefault, fallback),
+      sleep: (ms) => this.sleep(ms),
+      withTimeout: (promise, ms, createError) => this.withTimeout(promise, ms, createError),
+      isDisconnecting: () => this.isDisconnecting,
+      isGracefulDegradationEnabled: () => this.isGracefulDegradationEnabled(),
+      scheduleBackgroundRefreshDispatch: (key, fetcher, options2) => this.scheduleBackgroundRefresh(key, fetcher, options2),
+      stampedePrevention: options.stampedePrevention,
+      singleFlightCoordinator: options.singleFlightCoordinator,
+      singleFlightLeaseMs: options.singleFlightLeaseMs,
+      singleFlightTimeoutMs: options.singleFlightTimeoutMs,
+      singleFlightPollMs: options.singleFlightPollMs,
+      singleFlightRenewIntervalMs: options.singleFlightRenewIntervalMs,
+      backgroundRefreshTimeoutMs: options.backgroundRefreshTimeoutMs,
+      negativeCaching: options.negativeCaching,
+      refreshAhead: options.refreshAhead,
+      circuitBreaker: options.circuitBreaker,
+      fetcherRateLimit: options.fetcherRateLimit
+    });
     this.initializeWriteBehind(options.writeBehind);
     this.startup = this.initialize();
   }
@@ -2563,8 +2954,6 @@ var CacheStack = class extends import_node_events.EventEmitter {
   invalidation;
   layerWriter;
   snapshots;
-  backgroundRefreshes = /* @__PURE__ */ new Map();
-  backgroundRefreshAbort = /* @__PURE__ */ new Map();
   layerDegradedUntil = /* @__PURE__ */ new Map();
   maintenance = new CacheStackMaintenance();
   ttlResolver;
@@ -2572,6 +2961,7 @@ var CacheStack = class extends import_node_events.EventEmitter {
   nextOperationId = 0;
   currentGeneration;
   isDisconnecting = false;
+  reader;
   disconnectPromise;
   /**
    * Read-through cache get.
@@ -2584,51 +2974,9 @@ var CacheStack = class extends import_node_events.EventEmitter {
       const normalizedKey = this.qualifyKey(validateCacheKey(key));
       this.validateWriteOptions(options);
       await this.awaitStartup("get");
-      return this.getPrepared(normalizedKey, fetcher, options);
+      return this.reader.getPrepared(normalizedKey, fetcher, options);
     });
   }
-  async getPrepared(normalizedKey, fetcher, options) {
-    const hit = await this.readFromLayers(normalizedKey, options, "allow-stale");
-    if (hit.found) {
-      this.ttlResolver.recordAccess(normalizedKey);
-      if (this.isNegativeStoredValue(hit.stored)) {
-        this.metricsCollector.increment("negativeCacheHits");
-      }
-      if (hit.state === "fresh") {
-        this.metricsCollector.increment("hits");
-        await this.applyFreshReadPolicies(normalizedKey, hit, options, fetcher);
-        return hit.value;
-      }
-      if (hit.state === "stale-while-revalidate") {
-        this.metricsCollector.increment("hits");
-        this.metricsCollector.increment("staleHits");
-        this.emit("stale-serve", { key: normalizedKey, state: hit.state, layer: hit.layerName });
-        if (fetcher) {
-          this.scheduleBackgroundRefresh(normalizedKey, fetcher, options);
-        }
-        return hit.value;
-      }
-      if (!fetcher) {
-        this.metricsCollector.increment("hits");
-        this.metricsCollector.increment("staleHits");
-        this.emit("stale-serve", { key: normalizedKey, state: hit.state, layer: hit.layerName });
-        return hit.value;
-      }
-      try {
-        return await this.fetchWithGuards(normalizedKey, fetcher, options);
-      } catch (error) {
-        this.metricsCollector.increment("staleHits");
-        this.metricsCollector.increment("refreshErrors");
-        this.logger.debug?.("stale-if-error", { key: normalizedKey, error: this.formatError(error) });
-        return hit.value;
-      }
-    }
-    this.metricsCollector.increment("misses");
-    if (!fetcher) {
-      return null;
-    }
-    return this.fetchWithGuards(normalizedKey, fetcher, options, void 0, void 0, true);
-  }
   /**
    * Alias for `get(key, fetcher, options)` — explicit get-or-set pattern.
    * Fetches and caches the value if not already present.
@@ -2779,7 +3127,7 @@ var CacheStack = class extends import_node_events.EventEmitter {
             const optionsSignature = serializeOptions(entry.options);
             const existing = pendingReads.get(entry.key);
             if (!existing) {
-              const promise = this.getPrepared(entry.key, entry.fetch, entry.options);
+              const promise = this.reader.getPrepared(entry.key, entry.fetch, entry.options);
               pendingReads.set(entry.key, {
                 promise,
                 fetch: entry.fetch,
@@ -2815,7 +3163,7 @@ var CacheStack = class extends import_node_events.EventEmitter {
         if (keys.length === 0) {
           break;
         }
-        const values = layer.getMany ? await layer.getMany(keys) : await Promise.all(keys.map((key) => this.readLayerEntry(layer, key)));
+        const values = layer.getMany ? await layer.getMany(keys) : await Promise.all(keys.map((key) => this.reader.readLayerEntry(layer, key)));
         for (let offset = 0; offset < values.length; offset += 1) {
           const key = keys[offset];
           const stored = values[offset];
@@ -2831,7 +3179,7 @@ var CacheStack = class extends import_node_events.EventEmitter {
             this.metricsCollector.increment("staleHits", indexesByKey.get(key)?.length ?? 1);
           }
           await this.tagIndex.touch(key);
-          await this.backfill(key, stored, layerIndex - 1);
+          await this.reader.backfill(key, stored, layerIndex - 1);
           resultsByKey.set(key, resolved.value);
           pending.delete(key);
           this.metricsCollector.increment("hits", indexesByKey.get(key)?.length ?? 1);
@@ -2965,7 +3313,7 @@ var CacheStack = class extends import_node_events.EventEmitter {
         isLocal: Boolean(layer.isLocal),
         degradedUntil: this.layerDegradedUntil.get(layer.name) ?? null
       })),
-      backgroundRefreshes: this.backgroundRefreshes.size
+      backgroundRefreshes: this.reader.activeRefreshCount
     };
   }
   resetMetrics() {
@@ -3085,11 +3433,9 @@ var CacheStack = class extends import_node_events.EventEmitter {
         await this.unsubscribeInvalidation?.();
         await this.flushWriteBehindQueue();
         await this.maintenance.waitForGenerationCleanup();
-        for (const key of this.backgroundRefreshAbort.keys()) {
-          this.backgroundRefreshAbort.set(key, true);
-        }
+        this.reader.abortAllRefreshes();
         await Promise.allSettled(
-          [...this.backgroundRefreshes.values()].map((promise) => {
+          this.reader.getAllRefreshPromises().map((promise) => {
             let timer;
             return Promise.race([
               promise,
@@ -3102,8 +3448,6 @@ var CacheStack = class extends import_node_events.EventEmitter {
             });
           })
         );
-        this.backgroundRefreshes.clear();
-        this.backgroundRefreshAbort.clear();
         this.maintenance.disposeWriteBehindTimer();
         this.fetchRateLimiter.dispose();
         await Promise.allSettled(this.layers.map((layer) => layer.dispose?.() ?? Promise.resolve()));
@@ -3119,116 +3463,6 @@ var CacheStack = class extends import_node_events.EventEmitter {
       await this.handleInvalidationMessage(message);
     });
   }
-  async fetchWithGuards(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, initialMissConfirmed = false) {
-    const fetchTask = async () => {
-      const shouldRecheckFreshLayers = !(initialMissConfirmed && this.options.singleFlightCoordinator);
-      if (shouldRecheckFreshLayers) {
-        const secondHit = await this.readFromLayers(key, options, "fresh-only");
-        if (secondHit.found) {
-          this.metricsCollector.increment("hits");
-          return secondHit.value;
-        }
-      }
-      return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch);
-    };
-    const singleFlightTask = async () => {
-      if (!this.options.singleFlightCoordinator) {
-        return fetchTask();
-      }
-      try {
-        return await this.options.singleFlightCoordinator.execute(
-          key,
-          this.resolveSingleFlightOptions(),
-          fetchTask,
-          () => this.waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch)
-        );
-      } catch (error) {
-        if (!this.isGracefulDegradationEnabled()) {
-          throw error;
-        }
-        this.metricsCollector.increment("degradedOperations");
-        this.logger.warn?.("single-flight-coordinator-degraded", { key, error: this.formatError(error) });
-        this.emitError("single-flight", { key, degraded: true, error: this.formatError(error) });
-        return fetchTask();
-      }
-    };
-    if (this.options.stampedePrevention === false) {
-      return singleFlightTask();
-    }
-    return this.stampedeGuard.execute(key, singleFlightTask);
-  }
-  async waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
-    const timeoutMs = this.options.singleFlightTimeoutMs ?? DEFAULT_SINGLE_FLIGHT_TIMEOUT_MS;
-    const pollIntervalMs = this.options.singleFlightPollMs ?? DEFAULT_SINGLE_FLIGHT_POLL_MS;
-    const deadline = Date.now() + timeoutMs;
-    this.metricsCollector.increment("singleFlightWaits");
-    this.emit("stampede-dedupe", { key });
-    while (Date.now() < deadline) {
-      const hit = await this.readFromLayers(key, options, "fresh-only");
-      if (hit.found) {
-        this.metricsCollector.increment("hits");
-        return hit.value;
-      }
-      await this.sleep(pollIntervalMs);
-    }
-    return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch);
-  }
-  async fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
-    this.circuitBreakerManager.assertClosed(key, options?.circuitBreaker ?? this.options.circuitBreaker);
-    this.metricsCollector.increment("fetches");
-    const fetchStart = Date.now();
-    let fetched;
-    try {
-      fetched = await this.fetchRateLimiter.schedule(
-        options?.fetcherRateLimit ?? this.options.fetcherRateLimit,
-        { key, fetcher },
-        fetcher
-      );
-      this.circuitBreakerManager.recordSuccess(key);
-      this.logger.debug?.("fetch", { key, durationMs: Date.now() - fetchStart });
-    } catch (error) {
-      this.recordCircuitFailure(key, options?.circuitBreaker ?? this.options.circuitBreaker, error);
-      throw error;
-    }
-    if (fetched === null || fetched === void 0) {
-      if (!this.shouldNegativeCache(options)) {
-        return null;
-      }
-      if (this.maintenance.isWriteOutdated(key, expectedClearEpoch, expectedKeyEpoch)) {
-        this.logger.debug?.("skip-negative-store-after-invalidation", {
-          key,
-          expectedClearEpoch,
-          clearEpoch: this.maintenance.currentClearEpoch(),
-          expectedKeyEpoch,
-          keyEpoch: this.maintenance.currentKeyEpoch(key)
-        });
-        return null;
-      }
-      await this.storeEntry(key, "empty", null, options);
-      return null;
-    }
-    if (options?.shouldCache) {
-      try {
-        if (!options.shouldCache(fetched)) {
-          return fetched;
-        }
-      } catch (error) {
-        this.logger.warn?.("shouldCache-error", { key, error: this.formatError(error) });
-      }
-    }
-    if (this.maintenance.isWriteOutdated(key, expectedClearEpoch, expectedKeyEpoch)) {
-      this.logger.debug?.("skip-store-after-invalidation", {
-        key,
-        expectedClearEpoch,
-        clearEpoch: this.maintenance.currentClearEpoch(),
-        expectedKeyEpoch,
-        keyEpoch: this.maintenance.currentKeyEpoch(key)
-      });
-      return fetched;
-    }
-    await this.storeEntry(key, "value", fetched, options);
-    return fetched;
-  }
   async storeEntry(key, kind, value, options) {
     const clearEpoch = this.maintenance.currentClearEpoch();
     const keyEpoch = this.maintenance.currentKeyEpoch(key);
@@ -3275,87 +3509,6 @@ var CacheStack = class extends import_node_events.EventEmitter {
       });
     }
   }
-  async readFromLayers(key, options, mode) {
-    let sawRetainableValue = false;
-    for (let index = 0; index < this.layers.length; index += 1) {
-      const layer = this.layers[index];
-      if (!layer) continue;
-      const readStart = performance.now();
-      const stored = await this.readLayerEntry(layer, key);
-      const readDuration = performance.now() - readStart;
-      this.metricsCollector.recordLatency(layer.name, readDuration);
-      if (stored === null) {
-        this.metricsCollector.incrementLayer("missesByLayer", layer.name);
-        continue;
-      }
-      const resolved = resolveStoredValue(stored);
-      if (resolved.state === "expired") {
-        await layer.delete(key);
-        continue;
-      }
-      sawRetainableValue = true;
-      if (mode === "fresh-only" && resolved.state !== "fresh") {
-        continue;
-      }
-      await this.tagIndex.touch(key);
-      await this.backfill(key, stored, index - 1, options);
-      this.metricsCollector.incrementLayer("hitsByLayer", layer.name);
-      this.logger.debug?.("hit", { key, layer: layer.name, state: resolved.state });
-      this.emit("hit", { key, layer: layer.name, state: resolved.state });
-      return {
-        found: true,
-        value: resolved.value,
-        stored,
-        state: resolved.state,
-        layerIndex: index,
-        layerName: layer.name
-      };
-    }
-    if (!sawRetainableValue) {
-      await this.tagIndex.remove(key);
-    }
-    this.logger.debug?.("miss", { key, mode });
-    this.emit("miss", { key, mode });
-    return { found: false, value: null, stored: null, state: "miss" };
-  }
-  async readLayerEntry(layer, key) {
-    if (this.shouldSkipLayer(layer)) {
-      return null;
-    }
-    if (layer.getEntry) {
-      try {
-        return await layer.getEntry(key);
-      } catch (error) {
-        return this.handleLayerFailure(layer, "read", error);
-      }
-    }
-    try {
-      return await layer.get(key);
-    } catch (error) {
-      return this.handleLayerFailure(layer, "read", error);
-    }
-  }
-  async backfill(key, stored, upToIndex, options) {
-    if (upToIndex < 0) {
-      return;
-    }
-    for (let index = 0; index <= upToIndex; index += 1) {
-      const layer = this.layers[index];
-      if (!layer || this.shouldSkipLayer(layer)) {
-        continue;
-      }
-      const ttl = remainingStoredTtlSeconds(stored) ?? this.resolveLayerSeconds(layer.name, options?.ttl, void 0, layer.defaultTtl);
-      try {
-        await layer.set(key, stored, ttl);
-      } catch (error) {
-        await this.handleLayerFailure(layer, "backfill", error);
-        continue;
-      }
-      this.metricsCollector.increment("backfills");
-      this.logger.debug?.("backfill", { key, layer: layer.name });
-      this.emit("backfill", { key, layer: layer.name });
-    }
-  }
   resolveFreshTtl(key, layerName, kind, options, fallbackTtl, value) {
     return this.ttlResolver.resolveFreshTtl(
       key,
@@ -3371,55 +3524,6 @@ var CacheStack = class extends import_node_events.EventEmitter {
   resolveLayerSeconds(layerName, override, globalDefault, fallback) {
     return this.ttlResolver.resolveLayerSeconds(layerName, override, globalDefault, fallback);
   }
-  shouldNegativeCache(options) {
-    return options?.negativeCache ?? this.options.negativeCaching ?? false;
-  }
-  scheduleBackgroundRefresh(key, fetcher, options) {
-    if (!shouldStartBackgroundRefresh({
-      isDisconnecting: this.isDisconnecting,
-      hasRefreshInFlight: this.backgroundRefreshes.has(key)
-    })) {
-      return;
-    }
-    const clearEpoch = this.maintenance.currentClearEpoch();
-    const keyEpoch = this.maintenance.currentKeyEpoch(key);
-    this.backgroundRefreshAbort.set(key, false);
-    const refresh = (async () => {
-      this.metricsCollector.increment("refreshes");
-      try {
-        if (this.backgroundRefreshAbort.get(key)) return;
-        await this.runBackgroundRefresh(key, fetcher, options, clearEpoch, keyEpoch);
-      } catch (error) {
-        if (this.backgroundRefreshAbort.get(key)) return;
-        this.metricsCollector.increment("refreshErrors");
-        this.logger.warn?.("background-refresh-error", { key, error: this.formatError(error) });
-      } finally {
-        this.backgroundRefreshes.delete(key);
-        this.backgroundRefreshAbort.delete(key);
-      }
-    })();
-    this.backgroundRefreshes.set(key, refresh);
-  }
-  async runBackgroundRefresh(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
-    const timeoutMs = this.options.backgroundRefreshTimeoutMs ?? DEFAULT_BACKGROUND_REFRESH_TIMEOUT_MS;
-    await this.fetchWithGuards(
-      key,
-      () => this.withTimeout(fetcher(), timeoutMs, () => {
-        return new Error(`Background refresh timed out after ${timeoutMs}ms for key "${key}".`);
-      }),
-      options,
-      expectedClearEpoch,
-      expectedKeyEpoch
-    );
-  }
-  resolveSingleFlightOptions() {
-    return {
-      leaseMs: this.options.singleFlightLeaseMs ?? DEFAULT_SINGLE_FLIGHT_LEASE_MS,
-      waitTimeoutMs: this.options.singleFlightTimeoutMs ?? DEFAULT_SINGLE_FLIGHT_TIMEOUT_MS,
-      pollIntervalMs: this.options.singleFlightPollMs ?? DEFAULT_SINGLE_FLIGHT_POLL_MS,
-      renewIntervalMs: this.options.singleFlightRenewIntervalMs
-    };
-  }
   async deleteKeys(keys) {
     if (keys.length === 0) {
       return;
@@ -3665,29 +3769,14 @@ var CacheStack = class extends import_node_events.EventEmitter {
     await this.startup;
     this.assertActive(operation);
   }
+  async readLayerEntry(layer, key) {
+    return this.reader.readLayerEntry(layer, key);
+  }
+  scheduleBackgroundRefresh(key, fetcher, options) {
+    this.reader.runScheduleBackgroundRefresh(key, fetcher, options);
+  }
   async applyFreshReadPolicies(key, hit, options, fetcher) {
-    const plan = planFreshReadPolicies({
-      stored: hit.stored,
-      hasFetcher: Boolean(fetcher),
-      slidingTtl: options?.slidingTtl ?? false,
-      refreshAheadSeconds: this.resolveLayerSeconds(hit.layerName, options?.refreshAhead, this.options.refreshAhead, 0) ?? 0
-    });
-    if (plan.refreshedStored) {
-      for (let index = 0; index <= hit.layerIndex; index += 1) {
-        const layer = this.layers[index];
-        if (!layer || this.shouldSkipLayer(layer)) {
-          continue;
-        }
-        try {
-          await layer.set(key, plan.refreshedStored, plan.refreshedStoredTtl);
-        } catch (error) {
-          await this.handleLayerFailure(layer, "sliding-ttl", error);
-        }
-      }
-    }
-    if (fetcher && plan.shouldScheduleBackgroundRefresh) {
-      this.scheduleBackgroundRefresh(key, fetcher, options);
-    }
+    return this.reader.runApplyFreshReadPolicies(key, hit, options, fetcher);
   }
   shouldSkipLayer(layer) {
     const degradedUntil = this.layerDegradedUntil.get(layer.name);
@@ -3729,9 +3818,6 @@ var CacheStack = class extends import_node_events.EventEmitter {
     }
     this.emitError("fetch", { key, error: this.formatError(error) });
   }
-  isNegativeStoredValue(stored) {
-    return isStoredValueEnvelope(stored) && stored.kind === "empty";
-  }
   emitError(operation, context) {
     this.logger.error?.(operation, context);
     if (this.listenerCount("error") > 0) {