@nxtedition/lib 23.4.4 → 23.5.1

package/app.js

@@ -453,6 +453,10 @@ export function makeApp(appConfig, onTerminate) {
 
     globalThis.ds = ds
 
+    ds.rpc.provide('cache/drop', () => {
+      ds.event.emit('cache/drop')
+    })
+
     appDestroyers.unshift(() => ds.close())
   }
 

package/cache.js

@@ -2,7 +2,6 @@ import { LRUCache } from 'lru-cache'
 
 export class AsyncCache {
   #lru
-  #prefix
   #valueSelector
   #keySelector
   #dedupe = new Map()
@@ -13,12 +12,12 @@ export class AsyncCache {
     this.#lru = new LRUCache({ max: 1024 })
 
     if (typeof location === 'string') {
-      this.#prefix = location + ':'
+      // Do nothing...
     } else {
       throw new TypeError('location must be undefined or a string')
     }
 
-    if (typeof valueSelector === 'function') {
+    if (typeof valueSelector === 'function' || valueSelector === undefined) {
       this.#valueSelector = valueSelector
     } else {
       throw new TypeError('valueSelector must be a function')
@@ -41,7 +40,7 @@ export class AsyncCache {
 
     if (typeof opts?.stale === 'number' || opts?.stale === undefined) {
       const stale = opts?.stale ?? Number.MAX_SAFE_INTEGER
-      this.#stale = () => stale
+      this.#stale = (val, key) => stale
     } else if (typeof opts?.stale === 'function') {
       this.#stale = opts.stale
     } else {
@@ -58,10 +57,10 @@ export class AsyncCache {
 
     let cached = this.#lru.get(key)
 
-    if (!cached) {
-      const raw = globalThis.localStorage.getItem(this.#prefix + key)
-      cached = raw ? JSON.parse(raw) : null
-    }
+    // if (!cached) {
+    //   const raw = globalThis.localStorage.getItem(this.#prefix + key)
+    //   cached = raw ? JSON.parse(raw) : null
+    // }
 
     if (cached) {
       if (Date.now() < cached.expire) {
@@ -74,31 +73,46 @@ export class AsyncCache {
       }
     }
 
-    let promise = this.#dedupe.get(key)
-    if (!promise) {
-      promise = this.#valueSelector(...args).then(
-        (value) => {
-          this.#dedupe.delete(key)
-
-          cached = {
-            expire: Date.now() + this.#ttl(value, key),
-            value,
-          }
-
-          globalThis.localStorage.setItem(this.#prefix + key, JSON.stringify(cached))
-          this.#lru.set(key, cached)
-
-          return value
-        },
-        (err) => {
-          this.#dedupe.delete(key)
-
-          throw err
-        },
-      )
-      this.#dedupe.set(key, promise)
+    let promise
+
+    if (this.#valueSelector) {
+      promise = this.#dedupe.get(key)
+      if (!promise) {
+        promise = this.#valueSelector(...args).then(
+          (value) => {
+            this.#dedupe.delete(key)
+            this.set(key, value)
+            return value
+          },
+          (err) => {
+            this.#dedupe.delete(key)
+
+            throw err
+          },
+        )
+        this.#dedupe.set(key, promise)
+      }
     }
 
     return cached ? cached.value : promise
   }
+
+  set(key, value) {
+    if (typeof key !== 'string' || key.length === 0) {
+      throw new TypeError('key must be a non-empty string')
+    }
+
+    const cached = {
+      expire: Date.now() + this.#ttl(value, key),
+      value,
+    }
+
+    // globalThis.localStorage.setItem(this.#prefix + key, JSON.stringify(cached))
+
+    this.#lru.set(key, cached)
+  }
+
+  clear() {
+    // TODO (fix): Implement...
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.4.4",
+  "version": "23.5.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",