@nxtedition/cache 2.1.4 → 2.1.6

package/lib/index.js

@@ -96,6 +96,7 @@ export class Cache                                              extends EventEmi
   #lockMean         = 5
   #lockTimeout         = 10
   #lockMinTimeout         = 1
+  #lockMaxTimeout         = 1_000
 
   #location        
   #database                      = null
@@ -196,7 +197,7 @@ export class Cache                                              extends EventEmi
 
     for (let n = 0; opts?.database !== null && opts?.database !== false; n++) {
       try {
-        const maxSize = opts?.database?.maxSize ?? 256 * 1024 * 1024
+        const maxSize = opts?.database?.maxSize ?? 128 * 1024 * 1024
         const timeout = opts?.database?.timeout ?? 20
 
         this.#database ??= new DatabaseSync(location, { timeout })
@@ -709,13 +710,22 @@ export class Cache                                              extends EventEmi
     // EMA of mean and variance (Welford-style), clamped to [10ms, 1s].
     // Timeout = mean * 1.2 + 3 * stddev: 20% base margin plus 3 standard
     // deviations to accommodate timing variability.
+    // Winsorize input at mean + 5σ so a single extreme outlier can't blow up the stats.
     const alpha = 0.2
-    const diff = duration - this.#lockMean
+    const clamped = Math.min(
+      duration,
+      this.#lockMean + 5 * Math.sqrt(this.#lockVar),
+      this.#lockMaxTimeout,
+    )
+    const diff = clamped - this.#lockMean
     this.#lockMean += alpha * diff
     this.#lockVar = (1 - alpha) * (this.#lockVar + alpha * diff * diff)
     this.#lockTimeout = Math.max(
       this.#lockMinTimeout,
-      Math.min(1_000, Math.ceil(this.#lockMean * 1.2 + Math.sqrt(this.#lockVar) * 3)),
+      Math.min(
+        this.#lockMaxTimeout,
+        Math.ceil(this.#lockMean * 1.2 + Math.sqrt(this.#lockVar) * 3),
+      ),
     )
   }
 

package/lib/memory.js

@@ -13,7 +13,10 @@
                  
  
 
-const maxInt = 2147483647
+let fastNow = Date.now()
+setInterval(() => {
+  fastNow = Date.now()
+}, 1e3).unref()
 
 export class MemoryCache    {
   #map                                   = new Map()
@@ -25,7 +28,6 @@ export class MemoryCache    {
   #size = 0
   #count = 0
 
-  #counter = 0
   #cork = 0
 
   constructor(opts                ) {
@@ -42,8 +44,6 @@ export class MemoryCache    {
   }
 
   set(key        , entry                     ) {
-    this.#counter = (this.#counter + 1) & maxInt
-
     const existing = this.#map.get(key)
     if (existing != null) {
       this.#delete(existing)
@@ -52,7 +52,7 @@ export class MemoryCache    {
     this.#map.set(key, entry)
     entry.key = key
     entry.index = this.#arr.push(entry) - 1
-    entry.counter = this.#counter
+    entry.counter = fastNow
 
     this.#size += entry.size ?? 0
     this.#count += 1
@@ -76,8 +76,7 @@ export class MemoryCache    {
   get(key        ) {
     const entry = this.#map.get(key)
     if (entry != null) {
-      this.#counter = (this.#counter + 1) & maxInt
-      entry.counter = this.#counter
+      entry.counter = fastNow
     }
     return entry
   }
@@ -121,6 +120,10 @@ export class MemoryCache    {
   }
 
   #prune() {
+    if (this.#cork > 0) {
+      return
+    }
+
     while (this.#arr.length > 0 && (this.#size > this.#maxSize || this.#count > this.#maxCount)) {
       const e1 = this.#arr[(Math.random() * this.#arr.length) | 0]
       const e2 = this.#arr[(Math.random() * this.#arr.length) | 0]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/cache",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -30,5 +30,5 @@
     "tsd": "^0.33.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "f7c04358e008a7b0f28e2ca76a81ebdc07fbd734"
+  "gitHead": "a7202d8b4d3decaff213576df560e8cd5775db37"
 }