@nxtedition/nxt-undici 6.2.24 → 6.2.26

package/lib/sqlite-cache-store.js

@@ -1,8 +1,8 @@
 import { DatabaseSync } from 'node:sqlite'
 import assert from 'node:assert'
-import { parseRangeHeader } from './utils.js'
+import { parseRangeHeader, getFastNow } from './utils.js'
 
-const VERSION = 6
+const VERSION = 7
 
 /**
  * @typedef {import('undici-types/cache-interceptor.d.ts').default.CacheStore} CacheStore
@@ -46,9 +46,9 @@ export class SqliteCacheStore {
   #deleteExpiredValuesQuery
 
   /**
-   * @type {import('node:sqlite').StatementSync}
+   * @type {number}
    */
-  #deleteByUrlQuery
+  #deleteExpiredValuesTime = getFastNow()
 
   /**
    * @param {import('undici-types/cache-interceptor.d.ts').default.SqliteCacheStoreOpts & { maxEntryCount?: number} | undefined} opts
@@ -75,10 +75,8 @@ export class SqliteCacheStore {
         staleAt INTEGER NOT NULL
       );
 
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_url ON cacheInterceptorV${VERSION}(url);
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_method ON cacheInterceptorV${VERSION}(method);
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_deleteAt ON cacheInterceptorV${VERSION}(deleteAt);
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_start ON cacheInterceptorV${VERSION}(start);
+      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_getValuesQuery ON cacheInterceptorV${VERSION}(url, method, start, deleteAt);
+      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_deleteExpiredValuesQuery ON cacheInterceptorV${VERSION}(deleteAt);
     `)
 
     this.#getValuesQuery = this.#db.prepare(`
@@ -122,10 +120,6 @@ export class SqliteCacheStore {
       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `)
 
-    this.#deleteByUrlQuery = this.#db.prepare(
-      `DELETE FROM cacheInterceptorV${VERSION} WHERE url = ?`,
-    )
-
     this.#deleteExpiredValuesQuery = this.#db.prepare(
       `DELETE FROM cacheInterceptorV${VERSION} WHERE deleteAt <= ?`,
     )
@@ -160,7 +154,10 @@ export class SqliteCacheStore {
     assert(Number.isFinite(value.end))
     assert(!body || body?.byteLength === value.end - value.start)
 
-    this.#deleteExpiredValuesQuery.run(Date.now())
+    const now = getFastNow()
+    if (now > this.#deleteExpiredValuesTime + 60e3) {
+      this.#deleteExpiredValuesQuery.run(now)
+    }
 
     this.#insertValueQuery.run(
       makeValueUrl(key),
@@ -180,17 +177,6 @@ export class SqliteCacheStore {
     )
   }
 
-  /**
-   * @param {import('undici-types/cache-interceptor.d.ts').default.CacheKey} key
-   */
-  delete(key) {
-    if (typeof key !== 'object') {
-      throw new TypeError(`expected key to be object, got ${typeof key}`)
-    }
-
-    this.#deleteByUrlQuery.run(makeValueUrl(key))
-  }
-
   /**
    * @param {import('undici-types/cache-interceptor.d.ts').default.CacheKey} key
    * @param {boolean} [canBeExpired=false]
@@ -214,7 +200,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.24",
+  "version": "6.2.26",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",