@nxtedition/cache 1.0.0 → 1.0.2

package/lib/index.d.ts

@@ -12,7 +12,7 @@ export interface AsyncCacheOptions<V> {
     ttl?: number | ((value: V, key: string) => number);
     stale?: number | ((value: V, key: string) => number);
     lru?: LRUCache.Options<string, CacheEntry<V>, unknown> | false | null;
-    db?: AsyncCacheDbOptions;
+    db?: AsyncCacheDbOptions | false | null;
 }
 export type CacheResult<V> = {
     value: V;
@@ -21,13 +21,13 @@ export type CacheResult<V> = {
     value: Promise<V> | null | undefined;
     async: true;
 };
-export declare class AsyncCache<V = unknown> {
+export declare class AsyncCache<V = unknown, A extends unknown[] = unknown[]> {
     #private;
-    constructor(location: string, valueSelector?: (...args: unknown[]) => V | Promise<V>, keySelector?: (...args: unknown[]) => string, opts?: AsyncCacheOptions<V>);
+    constructor(location: string, valueSelector?: (...args: A) => V | Promise<V>, keySelector?: (...args: A) => string, opts?: AsyncCacheOptions<V>);
     close(): void;
-    get(...args: unknown[]): CacheResult<V>;
-    peek(...args: unknown[]): CacheResult<V>;
-    refresh(...args: unknown[]): Promise<V> | undefined;
+    get(...args: A): CacheResult<V>;
+    peek(...args: A): CacheResult<V>;
+    refresh(...args: A): Promise<V> | undefined;
     delete(key: string): void;
     set(key: string, value: V): void;
     purgeStale(): void;

package/lib/index.js

@@ -1,6 +1,5 @@
 import { DatabaseSync,                    } from 'node:sqlite'
 import { LRUCache } from 'lru-cache'
-import { doYield } from '@nxtedition/yield'
 
 let fastNowTime = 0
 
@@ -44,13 +43,6 @@ const dbs = new Set                            ()
                
  
 
-                            
-             
-          
-             
-               
- 
-
                                       
                   
                   
@@ -60,7 +52,7 @@ const dbs = new Set                            ()
                                                     
                                                       
                                                                        
-                          
+                                         
  
 
                             
@@ -70,10 +62,10 @@ const dbs = new Set                            ()
 const VERSION = 2
 const MAX_DURATION = 365000000e3
 
-export class AsyncCache              {
+export class AsyncCache                                               {
   #lru                                        
-  #valueSelector                                                      
-  #keySelector                                
+  #valueSelector                                              
+  #keySelector                        
   #dedupe = new Map                    ()
 
   #ttl                                 
@@ -86,12 +78,10 @@ export class AsyncCache              {
   #purgeStaleQuery                       = null
   #evictQuery                       = null
 
-  #setQueue                     = []
-
   constructor(
     location        ,
-    valueSelector                                         ,
-    keySelector                                 ,
+    valueSelector                                 ,
+    keySelector                         ,
     opts                       ,
   ) {
     if (typeof location === 'string') {
@@ -107,7 +97,7 @@ export class AsyncCache              {
     }
 
     if (typeof keySelector === 'function' || keySelector === undefined) {
-      this.#keySelector = keySelector ?? ((...args           ) => JSON.stringify(args))
+      this.#keySelector = keySelector ?? ((...args   ) => JSON.stringify(args))
     } else {
       throw new TypeError('keySelector must be a function')
     }
@@ -131,13 +121,12 @@ export class AsyncCache              {
     }
 
     this.#lru =
-      opts?.lru === false || opts?.lru === undefined
-        ? null
-        : new LRUCache({ max: 4096, ...opts?.lru })
+      opts?.lru === false || opts?.lru === null ? null : new LRUCache({ max: 4096, ...opts?.lru })
 
-    for (let n = 0; true; n++) {
+    for (let n = 0; opts?.db !== null && opts?.db !== false; n++) {
       try {
-        this.#db ??= new DatabaseSync(location, { timeout: 20, ...opts?.db })
+        const { maxSize = 256 * 1024 * 1024, timeout = 20 } = opts?.db ?? {}
+        this.#db ??= new DatabaseSync(location, { timeout })
 
         this.#db.exec(`
           PRAGMA journal_mode = WAL;
@@ -154,7 +143,6 @@ export class AsyncCache              {
         `)
 
         {
-          const maxSize = opts?.db?.maxSize ?? 256 * 1024 * 1024
           const { page_size } = this.#db.prepare('PRAGMA page_size').get()                         
           this.#db.exec(`PRAGMA max_page_count = ${Math.ceil(maxSize / page_size)}`)
         }
@@ -191,7 +179,6 @@ export class AsyncCache              {
 
   close()       {
     dbs.delete(this)
-    this.#setQueue.length = 0
     this.#getQuery = null
     this.#setQuery = null
     this.#delQuery = null
@@ -201,15 +188,15 @@ export class AsyncCache              {
     this.#db = null
   }
 
-  get(...args           )                 {
+  get(...args   )                 {
     return this.#load(args, true)
   }
 
-  peek(...args           )                 {
+  peek(...args   )                 {
     return this.#load(args, false)
   }
 
-  refresh(...args           )                         {
+  refresh(...args   )                         {
     return this.#refresh(args)
   }
 
@@ -228,7 +215,7 @@ export class AsyncCache              {
     } catch {}
   }
 
-  #load(args           , refresh         )                 {
+  #load(args   , refresh         )                 {
     const key = this.#keySelector(...args)
 
     if (typeof key !== 'string' || key.length === 0) {
@@ -246,16 +233,13 @@ export class AsyncCache              {
           cached = {
             ttl: row.ttl,
             stale: row.stale,
-            value: ArrayBuffer.isView(row.val) ? (row.val                ) : JSON.parse(row.val),
-          }
-        } else {
-          const entry = this.#setQueue.findLast((x) => x.key === key)
-          if (entry !== undefined) {
-            cached = {
-              ttl: entry.ttl,
-              stale: entry.stale,
-              value: entry.value,
-            }
+            value: ArrayBuffer.isView(row.val)
+              ? (Buffer.from(
+                  row.val.buffer,
+                  row.val.byteOffset,
+                  row.val.byteLength,
+                )                )
+              : JSON.parse(row.val),
           }
         }
 
@@ -292,12 +276,12 @@ export class AsyncCache              {
       : { value: promise, async: true }
   }
 
-  // eslint-disable-next-line: no-unsafe-argument
-  #refresh(args           , key = this.#keySelector(...args))                         {
+  #refresh(args   , key = this.#keySelector(...args))                         {
     if (typeof key !== 'string' || key.length === 0) {
       throw new TypeError('keySelector must return a non-empty string')
     }
 
+    // TODO (fix): cross process/thread dedupe...
     let promise = this.#dedupe.get(key)
     if (promise === undefined && this.#valueSelector) {
       // eslint-disable-next-line: no-unsafe-argument
@@ -343,38 +327,30 @@ export class AsyncCache              {
       return
     }
 
-    this.#lru?.set(key, { ttl, stale, value })
+    const storedValue = ArrayBuffer.isView(value)
+      ? (Buffer.from(value.buffer, value.byteOffset, value.byteLength)                )
+      : value
 
-    this.#setQueue.push({ key, value, ttl, stale })
-    if (this.#setQueue.length === 1) {
-      doYield(this.#flushSetQueue)
-    }
-  }
+    this.#lru?.set(key, { ttl, stale, value: storedValue })
 
-  #flushSetQueue = ()       => {
-    for (const { key, value, ttl, stale } of this.#setQueue.splice(0, 64)) {
-      const data                           = ArrayBuffer.isView(value)
-        ? value
-        : JSON.stringify(value           )
-      try {
-        this.#setQuery?.run(key, data          , ttl, stale)
-      } catch (err) {
-        if ((err                                   )?.errcode === 13 /* SQLITE_FULL */) {
-          try {
-            this.#evictQuery?.run(256)
-            this.#setQuery?.run(key, data          , ttl, stale)
-          } catch {
-            process.emitWarning(err         )
-          }
-        } else {
+    const data                           = ArrayBuffer.isView(value)
+      ? value
+      : JSON.stringify(value           )
+
+    try {
+      this.#setQuery?.run(key, data          , ttl, stale)
+    } catch (err) {
+      if ((err                                   )?.errcode === 13 /* SQLITE_FULL */) {
+        try {
+          this.#evictQuery?.run(256)
+          this.#setQuery?.run(key, data          , ttl, stale)
+        } catch {
           process.emitWarning(err         )
         }
+      } else {
+        process.emitWarning(err         )
       }
     }
-
-    if (this.#setQueue.length > 0) {
-      doYield(this.#flushSetQueue)
-    }
   }
 
   #delete(key        )       {
@@ -383,11 +359,6 @@ export class AsyncCache              {
     }
 
     this.#lru?.delete(key)
-
-    if (this.#setQueue.some((x) => x.key === key)) {
-      this.#setQueue = this.#setQueue.filter((x) => x.key !== key)
-    }
-
     try {
       this.#delQuery?.run(key)
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/cache",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,8 +23,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@nxtedition/yield": "^1.0.7",
     "lru-cache": "^11.2.6"
   },
-  "gitHead": "e85766435987febc99140e523cd2d4f5af458892"
+  "gitHead": "1bcd9e44bf750ac6fb478967c46e784e14ea63c5"
 }