@nxtedition/nxt-undici 6.2.28 → 6.2.30

package/lib/interceptor/cache.js

@@ -164,7 +164,12 @@ class CacheHandler extends DecoratorHandler {
       try {
         this.#store.set(this.#key, this.#value)
       } catch (err) {
-        this.#logger?.error({ err }, 'failed to set cache entry')
+        if (err.message === 'database is locked') {
+          // Database is busy. We don't bother trying again...
+          this.#logger?.debug({ err }, 'failed to set cache entry')
+        } else {
+          this.#logger?.error({ err }, 'failed to set cache entry')
+        }
       }
       this.#value = null
     }
@@ -207,7 +212,12 @@ export default () => (dispatch) => (opts, handler) => {
   try {
     entry = store.get(opts)
   } catch (err) {
-    opts.logger?.error({ err }, 'failed to get cache entry')
+    if (err.message === 'database is locked') {
+      // Database is busy. We don't bother trying again...
+      opts.logger?.debug({ err }, 'failed to set cache entry')
+    } else {
+      opts.logger?.error({ err }, 'failed to set cache entry')
+    }
   }
 
   if (!entry && !cacheControlDirectives['only-if-cached']) {

package/lib/sqlite-cache-store.js

@@ -136,6 +136,8 @@ export class SqliteCacheStore {
   get(key) {
     assertCacheKey(key)
 
+    this.#prune()
+
     const value = this.#findValue(key)
     return value ? makeResult(value) : undefined
   }
@@ -154,11 +156,7 @@ export class SqliteCacheStore {
     assert(Number.isFinite(value.end))
     assert(!body || body?.byteLength === value.end - value.start)
 
-    const now = getFastNow()
-    if (now > this.#deleteExpiredValuesTime + 60e3) {
-      this.#deleteExpiredValuesQuery.run(now)
-      this.#deleteExpiredValuesTime = now
-    }
+    this.#prune()
 
     this.#insertValueQuery.run(
       makeValueUrl(key),
@@ -178,6 +176,14 @@ export class SqliteCacheStore {
     )
   }
 
+  #prune() {
+    const now = getFastNow()
+    if (now > this.#deleteExpiredValuesTime) {
+      this.#deleteExpiredValuesQuery.run(this.#deleteExpiredValuesTime)
+      this.#deleteExpiredValuesTime += 60e3
+    }
+  }
+
   /**
    * @param {import('undici-types/cache-interceptor.d.ts').default.CacheKey} key
    * @param {boolean} [canBeExpired=false]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "6.2.28",
+  "version": "6.2.30",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",