apps 0.0.1-beta.7 → 0.0.1-beta.70

package/js/{chunk-57RKNWL2.js → chunk-PD6I2SDG.js}

@@ -4,7 +4,7 @@ import {
   fromWeb,
   layerMergedContext,
   make2 as make
-} from "./chunk-UK573G7W.js";
+} from "./chunk-EOPQ727L.js";
 import {
   Reference,
   Service,
@@ -13,16 +13,16 @@ import {
   getOrUndefined2 as getOrUndefined,
   map3 as map,
   merge3 as merge,
-  remove3 as remove,
+  remove2 as remove,
   succeed4 as succeed,
   toReadableStreamEffect,
   tryPromise
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-IFJU5SYQ.js";
 import {
   __export
 } from "./chunk-CZ7CSFO4.js";
 
-// ../../node_modules/.bun/effect@https+++pkg.pr.new+Effect-TS+effect+effect@c7d1ffff31a3e2ae0b0b+a654a55b752bdb24/node_modules/effect/dist/unstable/http/FetchHttpClient.js
+// ../../node_modules/.bun/effect@4.0.1/node_modules/effect/dist/http/FetchHttpClient.js
 var FetchHttpClient_exports = {};
 __export(FetchHttpClient_exports, {
   Fetch: () => Fetch,

package/js/{chunk-NKLWZJLE.js → chunk-RUP4JMKO.js}

@@ -3,14 +3,14 @@ import {
   CacheEntry,
   CacheError,
   cacheLimits
-} from "./chunk-R3EV5FTO.js";
+} from "./chunk-7LMU3ER3.js";
 import {
   Clock_exports,
   Duration_exports,
   Effect_exports,
   Exit_exports,
   Schema_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-IFJU5SYQ.js";
 
 // ../app-cache/src/index.ts
 var canonical = (value) => {
@@ -25,7 +25,7 @@ var cacheKey = (key) => Effect_exports.gen(function* () {
   );
   const bytes = new TextEncoder().encode(canonical(parsed));
   if (bytes.byteLength > cacheLimits.keyBytes)
-    return yield* new CacheError({ reason: "capacity" });
+    return yield* new CacheError({ reason: "capacity", limit: "keyBytes" });
   const hash = yield* Effect_exports.tryPromise({
     try: () => crypto.subtle.digest("SHA-256", bytes),
     catch: () => new CacheError({ reason: "invalid" })
@@ -44,15 +44,22 @@ var makeCache = (host, background, scope = "shared", deadline) => {
     Effect_exports.mapError(() => new CacheError({ reason: "storage" }))
   );
   const durations = (freshFor, staleFor = 0) => Effect_exports.try({
-    try: () => {
-      const fresh = Duration_exports.toMillis(Duration_exports.fromInputUnsafe(freshFor));
-      const stale = Duration_exports.toMillis(Duration_exports.fromInputUnsafe(staleFor));
-      if (![fresh, stale].every((value) => Number.isFinite(value) && value >= 0) || fresh + stale > cacheLimits.retentionMs)
-        throw new CacheError({ reason: "invalid" });
-      return { fresh, stale };
-    },
+    try: () => ({
+      fresh: Duration_exports.toMillis(Duration_exports.fromInputUnsafe(freshFor)),
+      stale: Duration_exports.toMillis(Duration_exports.fromInputUnsafe(staleFor))
+    }),
     catch: () => new CacheError({ reason: "invalid" })
-  });
+  }).pipe(
+    Effect_exports.flatMap(
+      ({ fresh, stale }) => ![fresh, stale].every((value) => Number.isFinite(value) && value >= 0) ? Effect_exports.fail(new CacheError({ reason: "invalid" })) : (
+        // The cache keeps nothing past its retention: a longer lifetime loses staleness first.
+        Effect_exports.succeed({
+          fresh: Math.min(fresh, cacheLimits.retentionMs),
+          stale: Math.max(0, Math.min(stale, cacheLimits.retentionMs - fresh))
+        })
+      )
+    )
+  );
   const get = (options, refresh) => Effect_exports.gen(function* () {
     const key = yield* keyOf(options.key);
     const { fresh, stale } = yield* durations(options.freshFor, options.staleFor);
@@ -111,13 +118,14 @@ var makeCache = (host, background, scope = "shared", deadline) => {
         yield* Effect_exports.annotateCurrentSpan("cache.result", "fresh");
         return yield* decode(entry.value);
       }
-      if (!refresh && entry !== null && now < entry.staleUntil) {
+      const kept = !refresh && entry !== null && now < entry.staleUntil;
+      if (kept && options.stale !== "revalidate") {
         yield* Effect_exports.annotateCurrentSpan("cache.result", "stale");
         if (lease !== null) yield* background(load(lease).pipe(Effect_exports.asVoid));
         return yield* decode(entry.value);
       }
       if (lease !== null) {
-        yield* Effect_exports.annotateCurrentSpan("cache.result", "miss");
+        yield* Effect_exports.annotateCurrentSpan("cache.result", kept ? "revalidated" : "miss");
         return yield* load(lease);
       }
       if (now >= waitUntil) {
@@ -159,7 +167,10 @@ var makeCache = (host, background, scope = "shared", deadline) => {
       Effect_exports.flatMap((key2) => transport({ operation: "invalidate", key: key2 })),
       Effect_exports.asVoid
     ),
-    /** Read fresh data, refresh stale data in the background, or wait for the lease owner. */
+    /**
+     * Read fresh data, refresh stale data in the background (or first, with `stale: "revalidate"`),
+     * or wait for the lease owner.
+     */
     get: (options) => get(options, false),
     /** Force one awaited refresh without removing the retained value. Concurrent refreshes share a load. */
     revalidate: (options) => get(options, true)