@nxtedition/nxt-undici 6.2.23 → 6.2.25

package/lib/sqlite-cache-store.js

@@ -1,6 +1,6 @@
 import { DatabaseSync } from 'node:sqlite'
 import assert from 'node:assert'
-import { parseRangeHeader } from './utils.js'
+import { parseRangeHeader, getFastNow } from './utils.js'
 
 const VERSION = 6
 
@@ -46,14 +46,14 @@ export class SqliteCacheStore {
   #deleteExpiredValuesQuery
 
   /**
-   * @type {import('node:sqlite').StatementSync}
+   * @type {number}
    */
-  #deleteByUrlQuery
+  #deleteExpiredValuesTime = getFastNow()
 
   /**
-   * @type {NodeJS.Timeout}
+   * @type {import('node:sqlite').StatementSync}
    */
-  #pruneInterval
+  #deleteByUrlQuery
 
   /**
    * @param {import('undici-types/cache-interceptor.d.ts').default.SqliteCacheStoreOpts & { maxEntryCount?: number} | undefined} opts
@@ -134,14 +134,9 @@ export class SqliteCacheStore {
     this.#deleteExpiredValuesQuery = this.#db.prepare(
       `DELETE FROM cacheInterceptorV${VERSION} WHERE deleteAt <= ?`,
     )
-
-    this.#pruneInterval = setInterval(() => {
-      this.#deleteExpiredValuesQuery.run(Date.now())
-    }, 60e3).unref()
   }
 
   close() {
-    clearInterval(this.#pruneInterval)
     this.#db.close()
   }
 
@@ -170,6 +165,11 @@ 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.#insertValueQuery.run(
       makeValueUrl(key),
       key.method,
@@ -222,7 +222,7 @@ export class SqliteCacheStore {
       return undefined
     }
 
-    const now = Date.now()
+    const now = getFastNow()
     for (const value of values) {
       if (now >= value.deleteAt && !canBeExpired) {
         return undefined

package/package.json

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