@graffy/cache 0.15.8-alpha.5 → 0.15.10-alpha.2

package/index.cjs

@@ -1 +1,96 @@
-"use strict";var e=require("@graffy/common"),t=require("@graffy/stream");module.exports=function({maxAge:n=6e4}={}){return r=>{const o=[];let a=[];const c=new Set,i=e.makeWatcher();function s(t=[]){const r=Date.now();let a;!o.length||r-o[0][0]>n/3?(a=[],o.unshift([r,a]),o.splice(3)):a=o[0][1],e.merge(a,t)}r.on("read",[],(async(t,r,c)=>{if(r.skipCache)return c(t);const i=Date.now()-n,f=[];let m=!1;if(a.length){const{known:n,unknown:r}=e.slice(a,t);if(n&&e.merge(f,n),!r)return f;t=r}for(let n=0;n<o.length;n++){const[r,a]=o[n];if(r<i)break;const{known:c,unknown:s}=e.slice(a,t);if(c&&e.merge(f,c),!(t=s))break;m=!0}if(t){m=!0;const n=await c(t);e.merge(f,n)}return m&&s(f),f})),r.on("watch",[],((n,r,o)=>{const a=o(n);if(r.skipCache)return a;const c=i.watch([]),f=t.mapStream(a,(e=>(s(e),e)));return e.mergeStreams(c,f)})),r.on("write",[],(async(t,n,o)=>{if(!n.optimism)return o(t);c.add(t),e.merge(a,t),i.write(t);try{const n=await o(t);return s(n),i.write(n),n}catch(f){const n=e.getKnown(t),o=await r.read(n);throw i.write(o),f}finally{c.delete(t),a=[];for(const t of c)e.merge(a,t)}}))}};
+"use strict";
+var common = require("@graffy/common");
+var stream = require("@graffy/stream");
+const DEFAULT_MAX_AGE = 6e4;
+const NUM_LAYERS = 3;
+function index({ maxAge = DEFAULT_MAX_AGE } = {}) {
+  return (store) => {
+    const layers = [];
+    let optimisticState = [];
+    const optimisticChanges = new Set();
+    const watcher = common.makeWatcher();
+    function addToCache(result = []) {
+      const now = Date.now();
+      let state;
+      if (!layers.length || now - layers[0][0] > maxAge / NUM_LAYERS) {
+        state = [];
+        layers.unshift([now, state]);
+        layers.splice(NUM_LAYERS);
+      } else {
+        state = layers[0][1];
+      }
+      common.merge(state, result);
+    }
+    store.on("read", [], async (query, options, next) => {
+      if (options.skipCache)
+        return next(query);
+      const earliest = Date.now() - maxAge;
+      const result = [];
+      let miss = false;
+      if (optimisticState.length) {
+        const { known, unknown } = common.slice(optimisticState, query);
+        if (known)
+          common.merge(result, known);
+        if (!unknown)
+          return result;
+        query = unknown;
+      }
+      for (let i = 0; i < layers.length; i++) {
+        const [fetchTime, state] = layers[i];
+        if (fetchTime < earliest)
+          break;
+        const { known, unknown } = common.slice(state, query);
+        if (known)
+          common.merge(result, known);
+        query = unknown;
+        if (!query)
+          break;
+        miss = true;
+      }
+      if (query) {
+        miss = true;
+        const nextValue = await next(query);
+        common.merge(result, nextValue);
+      }
+      if (miss)
+        addToCache(result);
+      return result;
+    });
+    store.on("watch", [], (query, options, next) => {
+      const nextStream = next(query);
+      if (options.skipCache)
+        return nextStream;
+      const optiStream = watcher.watch([]);
+      const nextStreamCopy = stream.mapStream(nextStream, (change) => {
+        addToCache(change);
+        return change;
+      });
+      return common.mergeStreams(optiStream, nextStreamCopy);
+    });
+    store.on("write", [], async (change, options, next) => {
+      if (!options.optimism)
+        return next(change);
+      optimisticChanges.add(change);
+      common.merge(optimisticState, change);
+      watcher.write(change);
+      try {
+        const appliedChange = await next(change);
+        addToCache(appliedChange);
+        watcher.write(appliedChange);
+        return appliedChange;
+      } catch (e) {
+        const query = common.getKnown(change);
+        const undo = await store.read(query);
+        watcher.write(undo);
+        throw e;
+      } finally {
+        optimisticChanges.delete(change);
+        optimisticState = [];
+        for (const oChange of optimisticChanges) {
+          common.merge(optimisticState, oChange);
+        }
+      }
+    });
+  };
+}
+module.exports = index;

package/index.mjs

@@ -1 +1,95 @@
-import{makeWatcher as t,slice as n,merge as e,mergeStreams as o,getKnown as r}from"@graffy/common";import{mapStream as a}from"@graffy/stream";function i({maxAge:i=6e4}={}){return c=>{const f=[];let s=[];const w=new Set,u=t();function l(t=[]){const n=Date.now();let o;!f.length||n-f[0][0]>i/3?(o=[],f.unshift([n,o]),f.splice(3)):o=f[0][1],e(o,t)}c.on("read",[],(async(t,o,r)=>{if(o.skipCache)return r(t);const a=Date.now()-i,c=[];let w=!1;if(s.length){const{known:o,unknown:r}=n(s,t);if(o&&e(c,o),!r)return c;t=r}for(let i=0;i<f.length;i++){const[o,r]=f[i];if(o<a)break;const{known:s,unknown:u}=n(r,t);if(s&&e(c,s),!(t=u))break;w=!0}if(t){w=!0;const n=await r(t);e(c,n)}return w&&l(c),c})),c.on("watch",[],((t,n,e)=>{const r=e(t);if(n.skipCache)return r;const i=u.watch([]),c=a(r,(t=>(l(t),t)));return o(i,c)})),c.on("write",[],(async(t,n,o)=>{if(!n.optimism)return o(t);w.add(t),e(s,t),u.write(t);try{const n=await o(t);return l(n),u.write(n),n}catch(a){const n=r(t),e=await c.read(n);throw u.write(e),a}finally{w.delete(t),s=[];for(const t of w)e(s,t)}}))}}export{i as default};
+import { makeWatcher, slice, merge, mergeStreams, getKnown } from "@graffy/common";
+import { mapStream } from "@graffy/stream";
+const DEFAULT_MAX_AGE = 6e4;
+const NUM_LAYERS = 3;
+function index({ maxAge = DEFAULT_MAX_AGE } = {}) {
+  return (store) => {
+    const layers = [];
+    let optimisticState = [];
+    const optimisticChanges = new Set();
+    const watcher = makeWatcher();
+    function addToCache(result = []) {
+      const now = Date.now();
+      let state;
+      if (!layers.length || now - layers[0][0] > maxAge / NUM_LAYERS) {
+        state = [];
+        layers.unshift([now, state]);
+        layers.splice(NUM_LAYERS);
+      } else {
+        state = layers[0][1];
+      }
+      merge(state, result);
+    }
+    store.on("read", [], async (query, options, next) => {
+      if (options.skipCache)
+        return next(query);
+      const earliest = Date.now() - maxAge;
+      const result = [];
+      let miss = false;
+      if (optimisticState.length) {
+        const { known, unknown } = slice(optimisticState, query);
+        if (known)
+          merge(result, known);
+        if (!unknown)
+          return result;
+        query = unknown;
+      }
+      for (let i = 0; i < layers.length; i++) {
+        const [fetchTime, state] = layers[i];
+        if (fetchTime < earliest)
+          break;
+        const { known, unknown } = slice(state, query);
+        if (known)
+          merge(result, known);
+        query = unknown;
+        if (!query)
+          break;
+        miss = true;
+      }
+      if (query) {
+        miss = true;
+        const nextValue = await next(query);
+        merge(result, nextValue);
+      }
+      if (miss)
+        addToCache(result);
+      return result;
+    });
+    store.on("watch", [], (query, options, next) => {
+      const nextStream = next(query);
+      if (options.skipCache)
+        return nextStream;
+      const optiStream = watcher.watch([]);
+      const nextStreamCopy = mapStream(nextStream, (change) => {
+        addToCache(change);
+        return change;
+      });
+      return mergeStreams(optiStream, nextStreamCopy);
+    });
+    store.on("write", [], async (change, options, next) => {
+      if (!options.optimism)
+        return next(change);
+      optimisticChanges.add(change);
+      merge(optimisticState, change);
+      watcher.write(change);
+      try {
+        const appliedChange = await next(change);
+        addToCache(appliedChange);
+        watcher.write(appliedChange);
+        return appliedChange;
+      } catch (e) {
+        const query = getKnown(change);
+        const undo = await store.read(query);
+        watcher.write(undo);
+        throw e;
+      } finally {
+        optimisticChanges.delete(change);
+        optimisticState = [];
+        for (const oChange of optimisticChanges) {
+          merge(optimisticState, oChange);
+        }
+      }
+    });
+  };
+}
+export { index as default };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/cache",
   "description": "Graffy module providing in-memory caching.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.8-alpha.5",
+  "version": "0.15.10-alpha.2",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.8-alpha.5",
-    "@graffy/stream": "0.15.8-alpha.5"
+    "@graffy/common": "0.15.10-alpha.2",
+    "@graffy/stream": "0.15.10-alpha.2"
   }
 }