layercache 1.3.4 → 1.4.0

package/dist/index.js

@@ -3,6 +3,7 @@ import {
   validateAdaptiveTtlOptions,
   validateCacheKey,
   validateCircuitBreakerOptions,
+  validateContextEntryOptions,
   validateLayerNumberOption,
   validateNonNegativeNumber,
   validatePattern,
@@ -11,22 +12,23 @@ import {
   validateTag,
   validateTags,
   validateTtlPolicy
-} from "./chunk-BORDQ3LA.js";
+} from "./chunk-7KMKQ6QZ.js";
 import {
   MemoryLayer,
   TagIndex,
   createHonoCacheMiddleware
-} from "./chunk-5RCAX2BQ.js";
+} from "./chunk-FFZCC7EQ.js";
 import {
   PatternMatcher,
   createStoredValueEnvelope,
+  expireStoredEnvelope,
   isStoredValueEnvelope,
   refreshStoredEnvelope,
-  remainingFreshTtlSeconds,
-  remainingStoredTtlSeconds,
+  remainingFreshTtlMs,
+  remainingStoredTtlMs,
   resolveStoredValue,
   unwrapStoredValue
-} from "./chunk-4PPBOOXT.js";
+} from "./chunk-KJDFYE5T.js";
 
 // src/CacheStack.ts
 import { EventEmitter } from "events";
@@ -219,6 +221,9 @@ var CacheNamespace = class _CacheNamespace {
   async invalidateByTag(tag) {
     await this.trackMetrics(() => this.cache.invalidateByTag(this.qualifyTag(tag)));
   }
+  async expireByTag(tag) {
+    await this.trackMetrics(() => this.cache.expireByTag(this.qualifyTag(tag)));
+  }
   async invalidateByTags(tags, mode = "any") {
     await this.trackMetrics(
       () => this.cache.invalidateByTags(
@@ -227,12 +232,26 @@ var CacheNamespace = class _CacheNamespace {
       )
     );
   }
+  async expireByTags(tags, mode = "any") {
+    await this.trackMetrics(
+      () => this.cache.expireByTags(
+        tags.map((tag) => this.qualifyTag(tag)),
+        mode
+      )
+    );
+  }
   async invalidateByPattern(pattern) {
     await this.trackMetrics(() => this.cache.invalidateByPattern(this.qualify(pattern)));
   }
+  async expireByPattern(pattern) {
+    await this.trackMetrics(() => this.cache.expireByPattern(this.qualify(pattern)));
+  }
   async invalidateByPrefix(prefix) {
     await this.trackMetrics(() => this.cache.invalidateByPrefix(this.qualify(prefix)));
   }
+  async expireByPrefix(prefix) {
+    await this.trackMetrics(() => this.cache.expireByPrefix(this.qualify(prefix)));
+  }
   /**
    * Returns detailed metadata about a single cache key within this namespace.
    */
@@ -580,6 +599,35 @@ var CacheStackInvalidationSupport = class {
       })
     );
   }
+  async expireKeysInLayers(layers, keys) {
+    const foundKeys = /* @__PURE__ */ new Set();
+    await Promise.all(
+      layers.map(async (layer) => {
+        if (this.options.shouldSkipLayer(layer)) {
+          return;
+        }
+        await Promise.all(
+          keys.map(async (key) => {
+            try {
+              const stored = layer.getEntry ? await layer.getEntry(key) : await layer.get(key);
+              if (stored === null) {
+                return;
+              }
+              foundKeys.add(key);
+              const expired = expireStoredEnvelope(stored);
+              if (expired === stored) {
+                return;
+              }
+              await layer.set(key, expired, remainingStoredTtlMs(expired));
+            } catch (error) {
+              await this.options.handleLayerFailure(layer, "expire", error);
+            }
+          })
+        );
+      })
+    );
+    return foundKeys;
+  }
   assertWithinInvalidationKeyLimit(size, maxKeys) {
     if (maxKeys !== false && size > maxKeys) {
       throw new Error(`Invalidation matched too many keys (${size} > ${maxKeys}).`);
@@ -698,12 +746,12 @@ var CacheStackLayerWriter = class {
   }
   buildLayerSetEntry(layer, key, kind, value, writeOptions, now) {
     const freshTtl = this.options.resolveFreshTtl(key, layer.name, kind, writeOptions, layer.defaultTtl, value);
-    const staleWhileRevalidate = this.options.resolveLayerSeconds(
+    const staleWhileRevalidate = this.options.resolveLayerMs(
       layer.name,
       writeOptions?.staleWhileRevalidate,
       this.options.globalStaleWhileRevalidate
     );
-    const staleIfError = this.options.resolveLayerSeconds(
+    const staleIfError = this.options.resolveLayerMs(
       layer.name,
       writeOptions?.staleIfError,
       this.options.globalStaleIfError
@@ -711,12 +759,12 @@ var CacheStackLayerWriter = class {
     const payload = createStoredValueEnvelope({
       kind,
       value,
-      freshTtlSeconds: freshTtl,
-      staleWhileRevalidateSeconds: staleWhileRevalidate,
-      staleIfErrorSeconds: staleIfError,
+      freshTtlMs: freshTtl,
+      staleWhileRevalidateMs: staleWhileRevalidate,
+      staleIfErrorMs: staleIfError,
       now
     });
-    const ttl = remainingStoredTtlSeconds(payload, now) ?? freshTtl;
+    const ttl = remainingStoredTtlMs(payload, now) ?? freshTtl;
     return {
       key,
       value: payload,
@@ -859,15 +907,15 @@ function planFreshReadPolicies({
   stored,
   hasFetcher,
   slidingTtl,
-  refreshAheadSeconds
+  refreshAheadMs
 }) {
   const refreshedStored = slidingTtl && isStoredValueEnvelope(stored) ? refreshStoredEnvelope(stored) : void 0;
-  const refreshedStoredTtl = refreshedStored ? remainingStoredTtlSeconds(refreshedStored) ?? void 0 : void 0;
-  const remainingFreshTtl = remainingFreshTtlSeconds(stored) ?? 0;
+  const refreshedStoredTtl = refreshedStored ? remainingStoredTtlMs(refreshedStored) ?? void 0 : void 0;
+  const remainingFreshTtl = remainingFreshTtlMs(stored) ?? 0;
   return {
     refreshedStored,
     refreshedStoredTtl,
-    shouldScheduleBackgroundRefresh: hasFetcher && refreshAheadSeconds > 0 && remainingFreshTtl > 0 && remainingFreshTtl <= refreshAheadSeconds
+    shouldScheduleBackgroundRefresh: hasFetcher && refreshAheadMs > 0 && remainingFreshTtl > 0 && remainingFreshTtl <= refreshAheadMs
   };
 }
 
@@ -903,7 +951,7 @@ var CacheStackReader = class {
         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);
+          this.scheduleBackgroundRefresh(normalizedKey, fetcher, options, this.createFetcherContext(normalizedKey, hit));
         }
         return hit.value;
       }
@@ -914,7 +962,15 @@ var CacheStackReader = class {
         return hit.value;
       }
       try {
-        return await this.fetchWithGuards(normalizedKey, fetcher, options);
+        return await this.fetchWithGuards(
+          normalizedKey,
+          fetcher,
+          options,
+          void 0,
+          void 0,
+          false,
+          this.createFetcherContext(normalizedKey, hit)
+        );
       } catch (error) {
         this.options.metricsCollector.increment("staleHits");
         this.options.metricsCollector.increment("refreshErrors");
@@ -929,7 +985,11 @@ var CacheStackReader = class {
     if (!fetcher) {
       return null;
     }
-    return this.fetchWithGuards(normalizedKey, fetcher, options, void 0, void 0, true);
+    return this.fetchWithGuards(normalizedKey, fetcher, options, void 0, void 0, true, {
+      key: normalizedKey,
+      currentValue: void 0,
+      state: "miss"
+    });
   }
   async readLayerEntry(layer, key) {
     if (this.options.shouldSkipLayer(layer)) {
@@ -957,7 +1017,7 @@ var CacheStackReader = class {
       if (!layer || this.options.shouldSkipLayer(layer)) {
         continue;
       }
-      const ttl = remainingStoredTtlSeconds(stored) ?? this.options.resolveLayerSeconds(layer.name, options?.ttl, void 0, layer.defaultTtl);
+      const ttl = remainingStoredTtlMs(stored) ?? this.options.resolveLayerMs(layer.name, options?.ttl, void 0, layer.defaultTtl);
       try {
         await layer.set(key, stored, ttl);
       } catch (error) {
@@ -1024,7 +1084,11 @@ var CacheStackReader = class {
     this.options.emit("miss", { key, mode });
     return { found: false, value: null, stored: null, state: "miss" };
   }
-  async fetchWithGuards(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, initialMissConfirmed = false) {
+  async fetchWithGuards(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, initialMissConfirmed = false, fetcherContext = {
+    key,
+    currentValue: void 0,
+    state: "miss"
+  }) {
     const fetchTask = async () => {
       const shouldRecheckFreshLayers = !(initialMissConfirmed && this.options.singleFlightCoordinator);
       if (shouldRecheckFreshLayers) {
@@ -1034,7 +1098,7 @@ var CacheStackReader = class {
           return secondHit.value;
         }
       }
-      return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch);
+      return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, fetcherContext);
     };
     const singleFlightTask = async () => {
       if (!this.options.singleFlightCoordinator) {
@@ -1045,7 +1109,7 @@ var CacheStackReader = class {
           key,
           this.resolveSingleFlightOptions(),
           fetchTask,
-          () => this.waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch)
+          () => this.waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, fetcherContext)
         );
       } catch (error) {
         if (!this.options.isGracefulDegradationEnabled()) {
@@ -1069,7 +1133,11 @@ var CacheStackReader = class {
     }
     return this.options.stampedeGuard.execute(key, singleFlightTask);
   }
-  async waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
+  async waitForFreshValue(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, fetcherContext = {
+    key,
+    currentValue: void 0,
+    state: "miss"
+  }) {
     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;
@@ -1083,9 +1151,13 @@ var CacheStackReader = class {
       }
       await this.options.sleep(pollIntervalMs);
     }
-    return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch);
+    return this.fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, fetcherContext);
   }
-  async fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
+  async fetchAndPopulate(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, fetcherContext = {
+    key,
+    currentValue: void 0,
+    state: "miss"
+  }) {
     this.options.circuitBreakerManager.assertClosed(key, options?.circuitBreaker ?? this.options.circuitBreaker);
     this.options.metricsCollector.increment("fetches");
     const fetchStart = Date.now();
@@ -1094,7 +1166,7 @@ var CacheStackReader = class {
       fetched = await this.options.fetchRateLimiter.schedule(
         options?.fetcherRateLimit ?? this.options.fetcherRateLimit,
         { key, fetcher },
-        fetcher
+        () => fetcher(fetcherContext)
       );
       this.options.circuitBreakerManager.recordSuccess(key);
       this.options.logger.debug?.("fetch", { key, durationMs: Date.now() - fetchStart });
@@ -1144,10 +1216,14 @@ var CacheStackReader = class {
     await this.options.storeEntry(key, "value", fetched, options);
     return fetched;
   }
-  runScheduleBackgroundRefresh(key, fetcher, options) {
-    this.scheduleBackgroundRefresh(key, fetcher, options);
+  runScheduleBackgroundRefresh(key, fetcher, options, fetcherContext) {
+    this.scheduleBackgroundRefresh(key, fetcher, options, fetcherContext);
   }
-  scheduleBackgroundRefresh(key, fetcher, options) {
+  scheduleBackgroundRefresh(key, fetcher, options, fetcherContext = {
+    key,
+    currentValue: void 0,
+    state: "miss"
+  }) {
     if (!shouldStartBackgroundRefresh({
       isDisconnecting: this.options.isDisconnecting(),
       hasRefreshInFlight: this.backgroundRefreshes.has(key)
@@ -1161,7 +1237,7 @@ var CacheStackReader = class {
       this.options.metricsCollector.increment("refreshes");
       try {
         if (this.backgroundRefreshAbort.get(key)) return;
-        await this.runBackgroundRefresh(key, fetcher, options, clearEpoch, keyEpoch);
+        await this.runBackgroundRefresh(key, fetcher, options, clearEpoch, keyEpoch, fetcherContext);
       } catch (error) {
         if (this.backgroundRefreshAbort.get(key)) return;
         this.options.metricsCollector.increment("refreshErrors");
@@ -1176,16 +1252,22 @@ var CacheStackReader = class {
     })();
     this.backgroundRefreshes.set(key, refresh);
   }
-  async runBackgroundRefresh(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch) {
+  async runBackgroundRefresh(key, fetcher, options, expectedClearEpoch, expectedKeyEpoch, fetcherContext = {
+    key,
+    currentValue: void 0,
+    state: "miss"
+  }) {
     const timeoutMs = this.options.backgroundRefreshTimeoutMs ?? DEFAULT_BACKGROUND_REFRESH_TIMEOUT_MS;
     await this.fetchWithGuards(
       key,
-      () => this.options.withTimeout(fetcher(), timeoutMs, () => {
+      (context) => this.options.withTimeout(fetcher(context), timeoutMs, () => {
         return new Error(`Background refresh timed out after ${timeoutMs}ms for key "${key}".`);
       }),
       options,
       expectedClearEpoch,
-      expectedKeyEpoch
+      expectedKeyEpoch,
+      false,
+      fetcherContext
     );
   }
   async runApplyFreshReadPolicies(key, hit, options, fetcher) {
@@ -1196,7 +1278,7 @@ var CacheStackReader = class {
       stored: hit.stored,
       hasFetcher: Boolean(fetcher),
       slidingTtl: options?.slidingTtl ?? false,
-      refreshAheadSeconds: this.options.resolveLayerSeconds(hit.layerName, options?.refreshAhead, this.options.refreshAhead, 0) ?? 0
+      refreshAheadMs: this.options.resolveLayerMs(hit.layerName, options?.refreshAhead, this.options.refreshAhead, 0) ?? 0
     });
     if (plan.refreshedStored) {
       for (let index = 0; index <= hit.layerIndex; index += 1) {
@@ -1212,9 +1294,17 @@ var CacheStackReader = class {
       }
     }
     if (fetcher && plan.shouldScheduleBackgroundRefresh) {
-      this.options.scheduleBackgroundRefreshDispatch(key, fetcher, options);
+      this.options.scheduleBackgroundRefreshDispatch(key, fetcher, options, this.createFetcherContext(key, hit));
     }
   }
+  createFetcherContext(key, hit) {
+    return {
+      key,
+      currentValue: hit.value === null ? void 0 : hit.value,
+      state: hit.state,
+      layer: hit.layerName
+    };
+  }
   resolveSingleFlightOptions() {
     return {
       leaseMs: this.options.singleFlightLeaseMs ?? DEFAULT_SINGLE_FLIGHT_LEASE_MS,
@@ -1496,7 +1586,7 @@ var CacheStackSnapshotManager = class {
         await visitor({
           key: exportedKey,
           value: stored,
-          ttl: remainingStoredTtlSeconds(stored)
+          ttl: remainingStoredTtlMs(stored)
         });
       };
       if (layer.forEachKey) {
@@ -1960,7 +2050,7 @@ var MetricsCollector = class {
 
 // src/internal/TtlResolver.ts
 import { randomBytes as randomBytes2 } from "crypto";
-var DEFAULT_NEGATIVE_TTL_SECONDS = 60;
+var DEFAULT_NEGATIVE_TTL_MS = 6e4;
 var secureRandom = {
   value() {
     return randomBytes2(4).readUInt32BE(0) / 4294967296;
@@ -1987,17 +2077,17 @@ var TtlResolver = class {
   }
   resolveFreshTtl(key, layerName, kind, options, fallbackTtl, globalNegativeTtl, globalTtl, value) {
     const policyTtl = kind === "value" ? this.resolvePolicyTtl(key, value, options?.ttlPolicy) : void 0;
-    const baseTtl = kind === "empty" ? this.resolveLayerSeconds(
+    const baseTtl = kind === "empty" ? this.resolveLayerMs(
       layerName,
       options?.negativeTtl,
       globalNegativeTtl,
-      this.resolveLayerSeconds(layerName, options?.ttl, globalTtl, policyTtl ?? fallbackTtl) ?? DEFAULT_NEGATIVE_TTL_SECONDS
-    ) : this.resolveLayerSeconds(layerName, options?.ttl, globalTtl, policyTtl ?? fallbackTtl);
+      this.resolveLayerMs(layerName, options?.ttl, globalTtl, policyTtl ?? fallbackTtl) ?? DEFAULT_NEGATIVE_TTL_MS
+    ) : this.resolveLayerMs(layerName, options?.ttl, globalTtl, policyTtl ?? fallbackTtl);
     const adaptiveTtl = this.applyAdaptiveTtl(key, layerName, baseTtl, options?.adaptiveTtl);
-    const jitter = this.resolveLayerSeconds(layerName, options?.ttlJitter, void 0);
+    const jitter = this.resolveLayerMs(layerName, options?.ttlJitter, void 0);
     return this.applyJitter(adaptiveTtl, jitter);
   }
-  resolveLayerSeconds(layerName, override, globalDefault, fallback) {
+  resolveLayerMs(layerName, override, globalDefault, fallback) {
     if (override !== void 0) {
       return this.readLayerNumber(layerName, override) ?? fallback;
     }
@@ -2019,8 +2109,8 @@ var TtlResolver = class {
     if (profile.hits < hotAfter) {
       return ttl;
     }
-    const step = this.resolveLayerSeconds(layerName, config.step, void 0, Math.max(1, Math.round(ttl / 2))) ?? 0;
-    const maxTtl = this.resolveLayerSeconds(layerName, config.maxTtl, void 0, ttl + step * 4) ?? ttl;
+    const step = this.resolveLayerMs(layerName, config.step, void 0, Math.max(1, Math.round(ttl / 2))) ?? 0;
+    const maxTtl = this.resolveLayerMs(layerName, config.maxTtl, void 0, ttl + step * 4) ?? ttl;
     const multiplier = Math.floor(profile.hits / hotAfter);
     return Math.min(maxTtl, ttl + step * multiplier);
   }
@@ -2042,17 +2132,17 @@ var TtlResolver = class {
     if (policy === "until-midnight") {
       const nextMidnight = new Date(now);
       nextMidnight.setHours(24, 0, 0, 0);
-      return Math.max(1, Math.ceil((nextMidnight.getTime() - now.getTime()) / 1e3));
+      return Math.max(1, Math.ceil(nextMidnight.getTime() - now.getTime()));
     }
     if (policy === "next-hour") {
       const nextHour = new Date(now);
       nextHour.setMinutes(60, 0, 0);
-      return Math.max(1, Math.ceil((nextHour.getTime() - now.getTime()) / 1e3));
+      return Math.max(1, Math.ceil(nextHour.getTime() - now.getTime()));
     }
-    const alignToSeconds = policy.alignTo;
-    const currentSeconds = Math.floor(Date.now() / 1e3);
-    const nextBoundary = Math.ceil((currentSeconds + 1) / alignToSeconds) * alignToSeconds;
-    return Math.max(1, nextBoundary - currentSeconds);
+    const alignToMs = policy.alignTo;
+    const currentMs = Date.now();
+    const nextBoundary = Math.ceil((currentMs + 1) / alignToMs) * alignToMs;
+    return Math.max(1, nextBoundary - currentMs);
   }
   readLayerNumber(layerName, value) {
     if (typeof value === "number") {
@@ -2254,7 +2344,7 @@ var CacheStack = class extends EventEmitter {
       },
       enqueueWriteBehind: this.enqueueWriteBehind.bind(this),
       resolveFreshTtl: this.resolveFreshTtl.bind(this),
-      resolveLayerSeconds: this.resolveLayerSeconds.bind(this),
+      resolveLayerMs: this.resolveLayerMs.bind(this),
       globalStaleWhileRevalidate: this.options.staleWhileRevalidate,
       globalStaleIfError: this.options.staleIfError,
       writePolicy: this.options.writePolicy,
@@ -2310,12 +2400,12 @@ var CacheStack = class extends EventEmitter {
       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),
+      resolveLayerMs: (layerName, override, globalDefault, fallback) => this.resolveLayerMs(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),
+      scheduleBackgroundRefreshDispatch: (key, fetcher, options2, fetcherContext) => this.scheduleBackgroundRefresh(key, fetcher, options2, fetcherContext),
       stampedePrevention: options.stampedePrevention,
       singleFlightCoordinator: options.singleFlightCoordinator,
       singleFlightLeaseMs: options.singleFlightLeaseMs,
@@ -2421,7 +2511,7 @@ var CacheStack = class extends EventEmitter {
     return false;
   }
   /**
-   * Returns the remaining TTL in seconds for the key in the fastest layer
+   * Returns the remaining TTL in milliseconds for the key in the fastest layer
    * that has it, or null if the key is not found / has no TTL.
    */
   async ttl(key) {
@@ -2657,6 +2747,15 @@ var CacheStack = class extends EventEmitter {
       await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "invalidate" });
     });
   }
+  async expireByTag(tag) {
+    await this.observeOperation("layercache.expire_by_tag", void 0, async () => {
+      validateTag(tag);
+      await this.awaitStartup("expireByTag");
+      const keys = await this.invalidation.collectKeysForTag(tag, this.invalidationMaxKeys());
+      await this.expireKeys(keys);
+      await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "expire" });
+    });
+  }
   async invalidateByTags(tags, mode = "any") {
     await this.observeOperation("layercache.invalidate_by_tags", void 0, async () => {
       if (tags.length === 0) {
@@ -2673,6 +2772,22 @@ var CacheStack = class extends EventEmitter {
       await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "invalidate" });
     });
   }
+  async expireByTags(tags, mode = "any") {
+    await this.observeOperation("layercache.expire_by_tags", void 0, async () => {
+      if (tags.length === 0) {
+        return;
+      }
+      validateTags(tags);
+      await this.awaitStartup("expireByTags");
+      const keysByTag = await Promise.all(
+        tags.map((tag) => this.invalidation.collectKeysForTag(tag, this.invalidationMaxKeys()))
+      );
+      const keys = mode === "all" ? this.invalidation.intersectKeys(keysByTag) : [...new Set(keysByTag.flat())];
+      this.invalidation.assertWithinInvalidationKeyLimit(keys.length, this.invalidationMaxKeys());
+      await this.expireKeys(keys);
+      await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "expire" });
+    });
+  }
   async invalidateByPattern(pattern) {
     await this.observeOperation("layercache.invalidate_by_pattern", void 0, async () => {
       validatePattern(pattern);
@@ -2685,6 +2800,18 @@ var CacheStack = class extends EventEmitter {
       await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "invalidate" });
     });
   }
+  async expireByPattern(pattern) {
+    await this.observeOperation("layercache.expire_by_pattern", void 0, async () => {
+      validatePattern(pattern);
+      await this.awaitStartup("expireByPattern");
+      const keys = await this.keyDiscovery.collectKeysMatchingPattern(
+        this.qualifyPattern(pattern),
+        this.invalidationMaxKeys()
+      );
+      await this.expireKeys(keys);
+      await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "expire" });
+    });
+  }
   async invalidateByPrefix(prefix) {
     await this.observeOperation("layercache.invalidate_by_prefix", void 0, async () => {
       await this.awaitStartup("invalidateByPrefix");
@@ -2694,6 +2821,15 @@ var CacheStack = class extends EventEmitter {
       await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "invalidate" });
     });
   }
+  async expireByPrefix(prefix) {
+    await this.observeOperation("layercache.expire_by_prefix", void 0, async () => {
+      await this.awaitStartup("expireByPrefix");
+      const qualifiedPrefix = this.qualifyKey(validateCacheKey(prefix));
+      const keys = await this.keyDiscovery.collectKeysWithPrefix(qualifiedPrefix, this.invalidationMaxKeys());
+      await this.expireKeys(keys);
+      await this.publishInvalidation({ scope: "keys", keys, sourceId: this.instanceId, operation: "expire" });
+    });
+  }
   getMetrics() {
     return this.metricsCollector.snapshot;
   }
@@ -2770,9 +2906,9 @@ var CacheStack = class extends EventEmitter {
     const normalizedKey = this.qualifyKey(userKey);
     await this.awaitStartup("inspect");
     const foundInLayers = [];
-    let freshTtlSeconds = null;
-    let staleTtlSeconds = null;
-    let errorTtlSeconds = null;
+    let freshTtlMs = null;
+    let staleTtlMs = null;
+    let errorTtlMs = null;
     let isStale = false;
     for (const layer of this.layers) {
       if (this.shouldSkipLayer(layer)) {
@@ -2789,9 +2925,9 @@ var CacheStack = class extends EventEmitter {
       foundInLayers.push(layer.name);
       if (foundInLayers.length === 1 && resolved.envelope) {
         const now = Date.now();
-        freshTtlSeconds = resolved.envelope.freshUntil !== null ? Math.max(0, Math.ceil((resolved.envelope.freshUntil - now) / 1e3)) : null;
-        staleTtlSeconds = resolved.envelope.staleUntil !== null ? Math.max(0, Math.ceil((resolved.envelope.staleUntil - now) / 1e3)) : null;
-        errorTtlSeconds = resolved.envelope.errorUntil !== null ? Math.max(0, Math.ceil((resolved.envelope.errorUntil - now) / 1e3)) : null;
+        freshTtlMs = resolved.envelope.freshUntil !== null ? Math.max(0, Math.ceil(resolved.envelope.freshUntil - now)) : null;
+        staleTtlMs = resolved.envelope.staleUntil !== null ? Math.max(0, Math.ceil(resolved.envelope.staleUntil - now)) : null;
+        errorTtlMs = resolved.envelope.errorUntil !== null ? Math.max(0, Math.ceil(resolved.envelope.errorUntil - now)) : null;
         isStale = resolved.state === "stale-while-revalidate" || resolved.state === "stale-if-error";
       }
     }
@@ -2799,7 +2935,7 @@ var CacheStack = class extends EventEmitter {
       return null;
     }
     const tags = await this.getTagsForKey(normalizedKey);
-    return { key: userKey, foundInLayers, freshTtlSeconds, staleTtlSeconds, errorTtlSeconds, isStale, tags };
+    return { key: userKey, foundInLayers, freshTtlMs, staleTtlMs, errorTtlMs, isStale, tags };
   }
   async exportState() {
     await this.awaitStartup("exportState");
@@ -2856,30 +2992,35 @@ var CacheStack = class extends EventEmitter {
     });
   }
   async storeEntry(key, kind, value, options) {
+    const resolvedOptions = this.resolveContextOptions(key, kind, value, options);
     const clearEpoch = this.maintenance.currentClearEpoch();
     const keyEpoch = this.maintenance.currentKeyEpoch(key);
-    await this.layerWriter.writeAcrossLayers(key, kind, value, options);
+    await this.layerWriter.writeAcrossLayers(key, kind, value, resolvedOptions);
     if (this.maintenance.isWriteOutdated(key, clearEpoch, keyEpoch)) {
       return;
     }
-    if (options?.tags) {
-      await this.tagIndex.track(key, options.tags);
+    if (resolvedOptions?.tags) {
+      await this.tagIndex.track(key, resolvedOptions.tags);
     } else {
       await this.tagIndex.touch(key);
     }
     this.metricsCollector.increment("sets");
-    this.logger.debug?.("set", { key, kind, tags: options?.tags });
-    this.emit("set", { key, kind, tags: options?.tags });
+    this.logger.debug?.("set", { key, kind, tags: resolvedOptions?.tags });
+    this.emit("set", { key, kind, tags: resolvedOptions?.tags });
     if (this.shouldBroadcastL1Invalidation()) {
       await this.publishInvalidation({ scope: "key", keys: [key], sourceId: this.instanceId, operation: "write" });
     }
   }
   async writeBatch(entries) {
-    const { clearEpoch, entryEpochs } = await this.layerWriter.writeBatch(entries);
+    const resolvedEntries = entries.map((entry) => ({
+      ...entry,
+      options: this.resolveContextOptions(entry.key, "value", entry.value, entry.options)
+    }));
+    const { clearEpoch, entryEpochs } = await this.layerWriter.writeBatch(resolvedEntries);
     if (clearEpoch !== this.maintenance.currentClearEpoch()) {
       return;
     }
-    for (const entry of entries) {
+    for (const entry of resolvedEntries) {
       if (this.maintenance.isWriteOutdated(entry.key, clearEpoch, entryEpochs.get(entry.key))) {
         continue;
       }
@@ -2913,8 +3054,46 @@ var CacheStack = class extends EventEmitter {
       value
     );
   }
-  resolveLayerSeconds(layerName, override, globalDefault, fallback) {
-    return this.ttlResolver.resolveLayerSeconds(layerName, override, globalDefault, fallback);
+  resolveLayerMs(layerName, override, globalDefault, fallback) {
+    return this.ttlResolver.resolveLayerMs(layerName, override, globalDefault, fallback);
+  }
+  resolveContextOptions(key, kind, value, options) {
+    if (!options?.contextOptions) {
+      return options;
+    }
+    const { contextOptions, ...baseOptions } = options;
+    let overrides;
+    try {
+      overrides = contextOptions({ key, value, kind });
+    } catch (error) {
+      throw new Error(`options.contextOptions() failed for key "${key}": ${this.formatError(error)}`);
+    }
+    if (!overrides) {
+      return baseOptions;
+    }
+    if (!this.isPlainObject(overrides)) {
+      throw new Error(
+        `options.contextOptions() must return a plain object or undefined for key "${key}". Async resolvers are not supported.`
+      );
+    }
+    try {
+      validateContextEntryOptions("options.contextOptions()", overrides);
+    } catch (error) {
+      throw new Error(
+        `options.contextOptions() returned invalid entry options for key "${key}": ${this.formatError(error)}`
+      );
+    }
+    return {
+      ...baseOptions,
+      ...overrides
+    };
+  }
+  isPlainObject(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      return false;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
   }
   async deleteKeys(keys) {
     if (keys.length === 0) {
@@ -2932,6 +3111,30 @@ var CacheStack = class extends EventEmitter {
     this.logger.debug?.("delete", { keys });
     this.emit("delete", { keys });
   }
+  async expireKeys(keys) {
+    if (keys.length === 0) {
+      return;
+    }
+    this.maintenance.bumpKeyEpochs(keys);
+    const foundKeys = await this.expireKeysInLayers(keys, this.layers);
+    for (const key of keys) {
+      if (foundKeys.has(key)) {
+        continue;
+      }
+      await this.tagIndex.remove(key);
+      this.ttlResolver.deleteProfile(key);
+      this.circuitBreakerManager.delete(key);
+    }
+    this.metricsCollector.increment("invalidations");
+    this.logger.debug?.("expire", { keys });
+    this.emit("expire", { keys });
+  }
+  async expireKeysInLayers(keys, layers) {
+    if (keys.length === 0) {
+      return /* @__PURE__ */ new Set();
+    }
+    return this.invalidation.expireKeysInLayers(layers, keys);
+  }
   async publishInvalidation(message) {
     if (!this.options.invalidationBus) {
       return;
@@ -2953,6 +3156,10 @@ var CacheStack = class extends EventEmitter {
     }
     const keys = message.keys ?? [];
     this.maintenance.bumpKeyEpochs(keys);
+    if (message.operation === "expire") {
+      await this.expireKeysInLayers(keys, localLayers);
+      return;
+    }
     await this.invalidation.deleteKeysFromLayers(localLayers, keys);
     if (message.operation !== "write") {
       for (const key of keys) {
@@ -3150,6 +3357,9 @@ var CacheStack = class extends EventEmitter {
     validateCircuitBreakerOptions(options.circuitBreaker);
     validateRateLimitOptions("options.fetcherRateLimit", options.fetcherRateLimit);
     validateTags(options.tags);
+    if (options.contextOptions && typeof options.contextOptions !== "function") {
+      throw new Error("options.contextOptions must be a function.");
+    }
   }
   assertActive(operation) {
     if (this.isDisconnecting) {
@@ -3164,8 +3374,8 @@ var CacheStack = class extends EventEmitter {
   async readLayerEntry(layer, key) {
     return this.reader.readLayerEntry(layer, key);
   }
-  scheduleBackgroundRefresh(key, fetcher, options) {
-    this.reader.runScheduleBackgroundRefresh(key, fetcher, options);
+  scheduleBackgroundRefresh(key, fetcher, options, fetcherContext) {
+    this.reader.runScheduleBackgroundRefresh(key, fetcher, options, fetcherContext);
   }
   async applyFreshReadPolicies(key, hit, options, fetcher) {
     return this.reader.runApplyFreshReadPolicies(key, hit, options, fetcher);
@@ -3309,7 +3519,7 @@ var RedisInvalidationBus = class {
     }
     const candidate = value;
     const validScope = candidate.scope === "key" || candidate.scope === "keys" || candidate.scope === "clear";
-    const validOperation = candidate.operation === void 0 || candidate.operation === "write" || candidate.operation === "delete" || candidate.operation === "invalidate" || candidate.operation === "clear";
+    const validOperation = candidate.operation === void 0 || candidate.operation === "write" || candidate.operation === "delete" || candidate.operation === "invalidate" || candidate.operation === "expire" || candidate.operation === "clear";
     const validKeys = candidate.keys === void 0 || Array.isArray(candidate.keys) && candidate.keys.every((key) => typeof key === "string");
     return validScope && typeof candidate.sourceId === "string" && candidate.sourceId.length > 0 && validOperation && validKeys;
   }
@@ -3640,7 +3850,7 @@ var RedisLayer = class {
       const payload = await this.encodePayload(serialized);
       const normalizedKey = this.withPrefix(entry.key);
       if (entry.ttl && entry.ttl > 0) {
-        pipeline.set(normalizedKey, payload, "EX", entry.ttl);
+        pipeline.set(normalizedKey, payload, "PX", entry.ttl);
       } else {
         pipeline.set(normalizedKey, payload);
       }
@@ -3655,7 +3865,7 @@ var RedisLayer = class {
     if (ttl && ttl > 0) {
       await this.runCommand(
         `set(${this.displayKey(key)})`,
-        () => this.client.set(normalizedKey, payload, "EX", ttl)
+        () => this.client.set(normalizedKey, payload, "PX", ttl)
       );
       return;
     }
@@ -3684,7 +3894,10 @@ var RedisLayer = class {
   }
   async ttl(key) {
     this.validateKey(key);
-    const remaining = await this.runCommand(`ttl(${this.displayKey(key)})`, () => this.client.ttl(this.withPrefix(key)));
+    const remaining = await this.runCommand(
+      `ttl(${this.displayKey(key)})`,
+      () => this.client.pttl(this.withPrefix(key))
+    );
     if (remaining < 0) {
       return null;
     }
@@ -3835,12 +4048,12 @@ var RedisLayer = class {
     const payload = await this.encodePayload(serialized);
     const ttl = await this.runCommand(
       `rewrite-ttl(${this.displayKey(key)})`,
-      () => this.client.ttl(this.withPrefix(key))
+      () => this.client.pttl(this.withPrefix(key))
     );
     if (ttl > 0) {
       await this.runCommand(
         `rewrite-set(${this.displayKey(key)})`,
-        () => this.client.set(this.withPrefix(key), payload, "EX", ttl)
+        () => this.client.set(this.withPrefix(key), payload, "PX", ttl)
       );
       return;
     }
@@ -4151,7 +4364,7 @@ var DiskLayer = class {
       const entry = {
         key,
         value,
-        expiresAt: ttl && ttl > 0 ? Date.now() + ttl * 1e3 : null
+        expiresAt: ttl && ttl > 0 ? Date.now() + ttl : null
       };
       const payload = this.serializer.serialize(entry);
       const raw = Buffer.isBuffer(payload) ? payload : Buffer.from(payload, "utf8");
@@ -4196,7 +4409,7 @@ var DiskLayer = class {
     if (entry.expiresAt === null) {
       return null;
     }
-    const remaining = Math.ceil((entry.expiresAt - Date.now()) / 1e3);
+    const remaining = Math.ceil(entry.expiresAt - Date.now());
     if (remaining <= 0) {
       return null;
     }
@@ -4486,7 +4699,7 @@ var MemcachedLayer = class {
     this.validateKey(key);
     const payload = this.serializer.serialize(value);
     await this.client.set(this.withPrefix(key), payload, {
-      expires: ttl && ttl > 0 ? ttl : void 0
+      expires: ttl && ttl > 0 ? Math.ceil(ttl / 1e3) : void 0
     });
   }
   async has(key) {