@floegence/floe-webapp-core 0.68.0 → 0.69.0

package/dist/resource-cache.d.ts

@@ -38,6 +38,8 @@ export interface CachedResourceDefinition<T> {
 }
 export interface ResourceCache {
     resource<T>(definition: CachedResourceDefinition<T>): CachedResource<T>;
+    /** Abort pending refreshes without retiring snapshots, storage, hydration or subscribers. */
+    cancelRefreshes(scope: string): void;
     clearScope(scope: string): Promise<void>;
     flush(): Promise<void>;
     dispose(): void;

package/dist/resource-cache.js

@@ -1,177 +1,186 @@
-async function N(h, i) {
-  const g = [...await h.list()].sort((e, t) => e.lastAccessedAt - t.lastAccessedAt);
-  let l = g.reduce((e, t) => e + t.bytes, 0);
-  const n = [];
-  for (const e of g) {
-    if (l <= Math.max(0, i)) break;
-    await h.remove(e.key), n.push(e.key), l -= e.bytes;
+async function J(y, l) {
+  const m = [...await y.list()].sort((r, s) => r.lastAccessedAt - s.lastAccessedAt);
+  let i = m.reduce((r, s) => r + s.bytes, 0);
+  const a = [];
+  for (const r of m) {
+    if (i <= Math.max(0, l)) break;
+    await y.remove(r.key), a.push(r.key), i -= r.bytes;
   }
-  return n;
+  return a;
 }
-function I(h) {
-  const i = h.storage, g = Math.max(0, h.maxBytes ?? 32 * 1024 * 1024), l = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
-  let e, t = Promise.resolve(), o = !1;
-  const d = (s) => (t = t.then(s).catch(() => {
-  }), t), v = async () => {
-    const s = await N({
-      list: async () => (await i.list()).map((r) => ({ ...r, lastAccessedAt: Math.max(r.lastAccessedAt, l.get(r.key)?.accessedAt ?? 0) })),
-      remove: (r) => i.remove(r)
-    }, g);
-    for (const r of s) l.get(r)?.evicted();
-  }, y = async () => {
-    clearTimeout(e), e = void 0;
-    const s = [...n];
-    n.clear(), s.length && d(async () => {
-      for (const [r, f] of s)
-        if (f.valid())
+function z(y) {
+  const l = y.storage, m = Math.max(0, y.maxBytes ?? 32 * 1024 * 1024), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map();
+  let r, s = Promise.resolve(), n = !1;
+  const d = (t) => (s = s.then(t).catch(() => {
+  }), s), f = async () => {
+    const t = await J({
+      list: async () => (await l.list()).map((e) => ({ ...e, lastAccessedAt: Math.max(e.lastAccessedAt, i.get(e.key)?.accessedAt ?? 0) })),
+      remove: (e) => l.remove(e)
+    }, m);
+    for (const e of t) i.get(e)?.evicted();
+  }, p = async () => {
+    clearTimeout(r), r = void 0;
+    const t = [...a];
+    a.clear(), t.length && d(async () => {
+      for (const [e, v] of t)
+        if (v.valid())
           try {
-            await i.set(r, f.value), f.stored();
+            await l.set(e, v.value), v.stored();
           } catch {
           }
-      await v();
-    }), await t;
-  }, k = (s, r, f, a) => {
-    n.set(s, { value: r, valid: f, stored: a }), e === void 0 && (e = setTimeout(() => {
-      y();
-    }, h.writeDelayMs ?? 100));
+      await f();
+    }), await s;
+  }, x = (t, e, v, o) => {
+    a.set(t, { value: e, valid: v, stored: o }), r === void 0 && (r = setTimeout(() => {
+      p();
+    }, y.writeDelayMs ?? 100));
   };
   return {
-    resource: (s) => {
-      if (o) throw new Error("Resource cache is disposed");
-      if (!s.scope || !s.key || !Number.isSafeInteger(s.version)) throw new Error("Invalid resource identity");
-      const r = JSON.stringify([s.scope, s.key, s.version]), f = l.get(r);
-      if (f)
-        return f.accessedAt = Date.now(), f.handle;
-      let a = { data: void 0, restoring: !0, refreshing: !1, stale: !0, error: void 0 };
-      const D = /* @__PURE__ */ new Set();
-      let R = 0, p = 0, q, x, b, w;
-      const m = () => {
-        for (const c of D) c();
-      }, E = (c) => {
-        ++R, a = { data: c, restoring: !1, refreshing: a.refreshing, stale: !1, error: void 0 };
+    resource: (t) => {
+      if (n) throw new Error("Resource cache is disposed");
+      if (!t.scope || !t.key || !Number.isSafeInteger(t.version)) throw new Error("Invalid resource identity");
+      const e = JSON.stringify([t.scope, t.key, t.version]), v = i.get(e);
+      if (v)
+        return v.accessedAt = Date.now(), v.handle;
+      let o = { data: void 0, restoring: !0, refreshing: !1, stale: !0, error: void 0 };
+      const S = /* @__PURE__ */ new Set();
+      let D = 0, w = 0, E, R, g, h, M;
+      const b = () => {
+        for (const c of S) c();
+      }, P = (c) => {
+        ++D, o = { data: c, restoring: !1, refreshing: o.refreshing, stale: !1, error: void 0 };
         try {
-          const u = JSON.stringify({ version: s.version, data: s.persist ? s.persist(c) : c });
-          q = u, u !== x ? k(r, u, () => q === u, () => {
-            x = u;
-          }) : n.delete(r);
+          const u = JSON.stringify({ version: t.version, data: t.persist ? t.persist(c) : c });
+          E = u, u !== R ? x(e, u, () => E === u, () => {
+            R = u;
+          }) : a.delete(e);
         } catch {
         }
-        m();
-      }, B = R, C = i.get(r).then((c) => {
-        if (!(o || R !== B || c === null))
+        b();
+      }, C = D, O = l.get(e).then((c) => {
+        if (!(n || D !== C || c === null))
           try {
             const u = JSON.parse(c);
-            if (u.version !== s.version) throw new Error("Unsupported snapshot");
-            const A = s.decode(u.data);
-            a = { ...a, data: A, stale: !0 }, q = c, x = c;
+            if (u.version !== t.version) throw new Error("Unsupported snapshot");
+            const A = t.decode(u.data);
+            o = { ...o, data: A, stale: !0 }, E = c, R = c;
           } catch {
-            d(() => i.remove(r));
+            d(() => l.remove(e));
           }
       }).catch(() => {
       }).finally(() => {
-        o || !a.restoring || (a = { ...a, restoring: !1 }, m());
-      }), M = {
-        snapshot: () => a,
-        subscribe: (c) => (D.add(c), () => {
-          D.delete(c);
+        n || !o.restoring || (o = { ...o, restoring: !1 }, b());
+      }), q = {
+        snapshot: () => o,
+        subscribe: (c) => (S.add(c), () => {
+          S.delete(c);
         }),
-        hydrate: () => C,
+        hydrate: () => O,
         refresh: (c) => {
-          if (w) return w;
-          const u = ++p, A = new AbortController();
-          return b = A, a = { ...a, refreshing: !0, error: void 0 }, m(), w = Promise.resolve().then(() => c(A.signal)).then((S) => (!o && u === p && !A.signal.aborted && E(S), S), (S) => {
-            throw !o && u === p && !A.signal.aborted && (a = { ...a, stale: !0, error: S }, m()), S;
-          }).finally(() => {
-            u === p && (w = void 0, b = void 0, a = { ...a, refreshing: !1 }, m());
-          }), w;
+          if (h) return h;
+          const u = ++w, A = new AbortController();
+          g = A, o = { ...o, refreshing: !0, error: void 0 }, b();
+          const B = new Promise((k, I) => {
+            M = () => I(new DOMException("Resource refresh cancelled", "AbortError"));
+          }), N = Promise.resolve().then(() => c(A.signal)).then((k) => (!n && u === w && !A.signal.aborted && P(k), k), (k) => {
+            throw !n && u === w && !A.signal.aborted && (o = { ...o, stale: !0, error: k }, b()), k;
+          });
+          return h = Promise.race([N, B]).finally(() => {
+            u === w && (h = void 0, g = void 0, M = void 0, o = { ...o, refreshing: !1 }, b());
+          }), h;
         },
         set: (c) => {
-          ++p, b?.abort(), w = void 0, a = { ...a, refreshing: !1 }, E(c);
+          ++w, g?.abort(), h = void 0, o = { ...o, refreshing: !1 }, P(c);
         },
         invalidate: (c = !1) => {
-          ++R, ++p, b?.abort(), b = void 0, w = void 0, q = void 0, x = void 0, n.delete(r), a = { data: c ? void 0 : a.data, restoring: !1, refreshing: !1, stale: !0, error: void 0 }, m(), d(() => i.remove(r));
+          ++D, ++w, g?.abort(), g = void 0, h = void 0, E = void 0, R = void 0, a.delete(e), o = { data: c ? void 0 : o.data, restoring: !1, refreshing: !1, stale: !0, error: void 0 }, b(), d(() => l.remove(e));
         }
       };
-      return l.set(r, { scope: s.scope, accessedAt: Date.now(), evicted: () => {
-        x = void 0;
-      }, handle: M, stop: () => {
-        ++p, b?.abort(), D.clear();
-      } }), M;
+      return i.set(e, { scope: t.scope, accessedAt: Date.now(), evicted: () => {
+        R = void 0;
+      }, handle: q, cancelRefresh: () => {
+        h && (++w, M?.(), M = void 0, g?.abort(), g = void 0, h = void 0, o = { ...o, refreshing: !1, stale: !0 }, b());
+      }, stop: () => {
+        ++w, g?.abort(), S.clear();
+      } }), q;
     },
-    flush: y,
-    clearScope: async (s) => {
-      for (const r of l.values()) r.scope === s && r.handle.invalidate(!0);
+    flush: p,
+    cancelRefreshes: (t) => {
+      for (const e of i.values()) e.scope === t && e.cancelRefresh();
+    },
+    clearScope: async (t) => {
+      for (const e of i.values()) e.scope === t && e.handle.invalidate(!0);
       await d(async () => {
-        for (const r of await i.list())
+        for (const e of await l.list())
           try {
-            JSON.parse(r.key)[0] === s && await i.remove(r.key);
+            JSON.parse(e.key)[0] === t && await l.remove(e.key);
           } catch {
           }
       });
     },
     dispose: () => {
-      if (!o) {
-        o = !0;
-        for (const s of l.values()) s.stop();
-        y(), l.clear();
+      if (!n) {
+        n = !0;
+        for (const t of i.values()) t.stop();
+        p(), i.clear();
       }
     }
   };
 }
-function J(h = "floe-resource-cache") {
-  let i;
-  const g = () => i ??= new Promise((n, e) => {
-    const t = indexedDB.open(h, 1);
-    t.onupgradeneeded = () => t.result.createObjectStore("snapshots", { keyPath: "key" }), t.onsuccess = () => {
-      const o = t.result;
-      o.onversionchange = () => {
-        o.close(), i = void 0;
-      }, n(o);
-    }, t.onerror = () => {
-      i = void 0, e(t.error);
-    }, t.onblocked = () => {
-      i = void 0, e(new Error("Resource cache database is blocked"));
+function L(y = "floe-resource-cache") {
+  let l;
+  const m = () => l ??= new Promise((a, r) => {
+    const s = indexedDB.open(y, 1);
+    s.onupgradeneeded = () => s.result.createObjectStore("snapshots", { keyPath: "key" }), s.onsuccess = () => {
+      const n = s.result;
+      n.onversionchange = () => {
+        n.close(), l = void 0;
+      }, a(n);
+    }, s.onerror = () => {
+      l = void 0, r(s.error);
+    }, s.onblocked = () => {
+      l = void 0, r(new Error("Resource cache database is blocked"));
     };
-  }), l = async (n, e) => {
-    const t = await g();
-    return new Promise((o, d) => {
-      const v = t.transaction("snapshots", n);
-      let y;
-      v.oncomplete = () => o(y), v.onerror = () => d(v.error), v.onabort = () => d(v.error ?? new Error("Resource cache transaction aborted")), e(v.objectStore("snapshots"), (k) => {
-        y = k;
+  }), i = async (a, r) => {
+    const s = await m();
+    return new Promise((n, d) => {
+      const f = s.transaction("snapshots", a);
+      let p;
+      f.oncomplete = () => n(p), f.onerror = () => d(f.error), f.onabort = () => d(f.error ?? new Error("Resource cache transaction aborted")), r(f.objectStore("snapshots"), (x) => {
+        p = x;
       });
     });
   };
   return {
-    get: (n) => l("readwrite", (e, t) => {
-      const o = e.get(n);
-      o.onsuccess = () => {
-        const d = o.result;
-        d && e.put({ ...d, lastAccessedAt: Date.now() }), t(d?.value ?? null);
+    get: (a) => i("readwrite", (r, s) => {
+      const n = r.get(a);
+      n.onsuccess = () => {
+        const d = n.result;
+        d && r.put({ ...d, lastAccessedAt: Date.now() }), s(d?.value ?? null);
       };
     }),
-    set: (n, e) => l("readwrite", (t, o) => {
-      t.put({ key: n, value: e, bytes: new TextEncoder().encode(e).byteLength, lastAccessedAt: Date.now() }), o(void 0);
+    set: (a, r) => i("readwrite", (s, n) => {
+      s.put({ key: a, value: r, bytes: new TextEncoder().encode(r).byteLength, lastAccessedAt: Date.now() }), n(void 0);
     }),
-    remove: (n) => l("readwrite", (e, t) => {
-      e.delete(n), t(void 0);
+    remove: (a) => i("readwrite", (r, s) => {
+      r.delete(a), s(void 0);
     }),
-    list: () => l("readonly", (n, e) => {
-      const t = [], o = n.openCursor();
-      o.onsuccess = () => {
-        const d = o.result;
+    list: () => i("readonly", (a, r) => {
+      const s = [], n = a.openCursor();
+      n.onsuccess = () => {
+        const d = n.result;
         if (!d) {
-          e(t);
+          r(s);
           return;
         }
-        const { key: v, bytes: y, lastAccessedAt: k } = d.value;
-        t.push({ key: v, bytes: y, lastAccessedAt: k }), d.continue();
+        const { key: f, bytes: p, lastAccessedAt: x } = d.value;
+        s.push({ key: f, bytes: p, lastAccessedAt: x }), d.continue();
       };
     })
   };
 }
 export {
-  J as createIndexedDBResourceCacheStorage,
-  I as createResourceCache,
-  N as enforceResourceCacheBudget
+  L as createIndexedDBResourceCacheStorage,
+  z as createResourceCache,
+  J as enforceResourceCacheBudget
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/floe-webapp-core",
-  "version": "0.68.0",
+  "version": "0.69.0",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",