@nxtedition/nxt-undici 7.3.19 → 7.3.21

package/lib/index.d.ts

@@ -176,7 +176,8 @@ export interface CacheStore {
     key: CacheKey,
     value: CacheValue & { body: null | Buffer | Buffer[]; start: number; end: number },
   ): void
-  purgeStale(): void
+  gc(): void
+  clear(): void
   close(): void
 }
 
@@ -242,7 +243,8 @@ export class SqliteCacheStore implements CacheStore {
     key: CacheKey,
     value: CacheValue & { body: null | Buffer | Buffer[]; start: number; end: number },
   ): void
-  purgeStale(): void
+  gc(): void
+  clear(): void
   close(): void
 }
 

package/lib/interceptor/dns.js

@@ -52,7 +52,6 @@ export default () => (dispatch) => {
                 pending: 0,
                 errored: 0,
                 counter: 0,
-                timeout: 0,
               }
             })
 
@@ -68,35 +67,31 @@ export default () => (dispatch) => {
   }
 
   return async (opts, handler) => {
-    if (!opts.dns || !opts.origin) {
-      return dispatch(opts, handler)
-    }
+    try {
+      if (!opts.dns || !opts.origin) {
+        return dispatch(opts, handler)
+      }
 
-    const ttl = opts.dns.ttl ?? 2e3
-    const url = new URL(opts.path ?? '', opts.origin)
-    const balance = opts.dns.balance
+      const ttl = opts.dns.ttl ?? 2e3
+      const url = new URL(opts.path ?? '', opts.origin)
+      const balance = opts.dns.balance
 
-    const { host, hostname, pathname } = url
+      const { host, hostname, pathname } = url
 
-    if (net.isIP(hostname)) {
-      return dispatch(opts, handler)
-    }
+      if (net.isIP(hostname)) {
+        return dispatch(opts, handler)
+      }
 
-    try {
       const now = getFastNow()
 
       let records = cache.get(hostname)
 
       if (records == null || records.every((x) => x.expires < now)) {
         const [err, val] = await resolve(hostname, { ttl })
-
         if (err) {
           throw err
         }
-
         records = val
-      } else if (records.some((x) => x.expires < now + 1e3)) {
-        resolve(hostname, { ttl })
       }
 
       let record
@@ -108,7 +103,7 @@ export default () => (dispatch) => {
 
         for (let i = 0; i < records.length; i++) {
           const idx = (hash + i) % records.length
-          if (records[idx].expires >= now && records[idx].timeout < now) {
+          if (records[idx].expires >= now) {
             record = records[idx]
             break
           }
@@ -116,13 +111,14 @@ export default () => (dispatch) => {
       }
 
       if (record == null) {
-        records.sort(
+        // toSorted — balance:'hash' relies on the cached array's index order.
+        const sorted = records.toSorted(
           (a, b) => a.errored - b.errored || a.pending - b.pending || a.counter - b.counter,
         )
 
-        for (let i = 0; i < records.length; i++) {
-          if (records[i].expires >= now && records[i].timeout < now) {
-            record = records[i]
+        for (let i = 0; i < sorted.length; i++) {
+          if (sorted[i].expires >= now) {
+            record = sorted[i]
             break
           }
         }
@@ -135,7 +131,15 @@ export default () => (dispatch) => {
         })
       }
 
-      url.hostname = record.address
+      // Pre-emptive refresh when any record is past half its TTL — the
+      // in-flight request still uses the already-selected `record`; the
+      // refreshed records land in cache for the next request, smoothing
+      // out DNS lookup latency. `resolve()` dedupes via `promises`.
+      if (records.some((x) => x.expires < now + ttl / 2)) {
+        resolve(hostname, { ttl })
+      }
+
+      url.hostname = net.isIPv6(record.address) ? `[${record.address}]` : record.address
 
       record.counter++
       record.pending++
@@ -150,10 +154,6 @@ export default () => (dispatch) => {
           } else if (statusCode != null && statusCode >= 500) {
             record.errored++
           }
-
-          if (err != null || statusCode >= 500) {
-            record.timeout = getFastNow() + 10e3
-          }
         }),
       )
     } catch (err) {

package/lib/sqlite-cache-store.js

@@ -4,7 +4,7 @@ import { parseRangeHeader, getFastNow } from './utils.js'
 // Bump version when the URL key format or schema changes to invalidate old caches.
 const VERSION = 10
 
-/** @typedef {{ purgeStale: () => void } } */
+/** @typedef {{ gc: () => void, clear: () => void } } */
 const stores = new Set()
 
 {
@@ -12,7 +12,17 @@ const stores = new Set()
   offPeakBC.unref()
   offPeakBC.onmessage = () => {
     for (const store of stores) {
-      store.purgeStale()
+      store.gc()
+    }
+  }
+}
+
+{
+  const clearCacheBC = new BroadcastChannel('nxt:clearCache')
+  clearCacheBC.unref()
+  clearCacheBC.onmessage = () => {
+    for (const store of stores) {
+      store.clear()
     }
   }
 }
@@ -42,6 +52,11 @@ export class SqliteCacheStore {
    */
   #db
 
+  /**
+   * @type {number}
+   */
+  #dbTimeout = 20
+
   /**
    * @type {import('node:sqlite').StatementSync}
    */
@@ -69,7 +84,11 @@ export class SqliteCacheStore {
    * @param {import('undici-types/cache-interceptor.d.ts').default.SqliteCacheStoreOpts & { maxSize?: number } | undefined} opts
    */
   constructor(opts) {
-    this.#db = new DatabaseSync(opts?.location ?? ':memory:', { timeout: 20, ...opts?.db })
+    this.#dbTimeout = opts?.db?.timeout ?? this.#dbTimeout
+    this.#db = new DatabaseSync(opts?.location ?? ':memory:', {
+      ...opts?.db,
+      timeout: this.#dbTimeout,
+    })
 
     const maxSize = opts?.maxSize ?? 256 * 1024 * 1024
     this.#db.exec(`
@@ -157,13 +176,43 @@ export class SqliteCacheStore {
     stores.add(this)
   }
 
-  purgeStale() {
+  gc() {
     try {
+      this.#db.exec('PRAGMA busy_timeout = 1000')
       this.#deleteExpiredValuesQuery.run(getFastNow())
       this.#db.exec('PRAGMA wal_checkpoint(TRUNCATE)')
       this.#db.exec('PRAGMA optimize')
     } catch (err) {
       process.emitWarning(err)
+    } finally {
+      try {
+        this.#db.exec(`PRAGMA busy_timeout = ${this.#dbTimeout}`)
+      } catch (err) {
+        process.emitWarning(err)
+      }
+    }
+  }
+
+  clear() {
+    this.#insertBatch.length = 0
+
+    if (this.#closed) {
+      return
+    }
+
+    try {
+      this.#db.exec('PRAGMA busy_timeout = 1000')
+      this.#db.exec(`DELETE FROM cacheInterceptorV${VERSION}`)
+      this.#db.exec('PRAGMA wal_checkpoint(TRUNCATE)')
+      this.#db.exec('PRAGMA optimize')
+    } catch (err) {
+      process.emitWarning(err)
+    } finally {
+      try {
+        this.#db.exec(`PRAGMA busy_timeout = ${this.#dbTimeout}`)
+      } catch (err) {
+        process.emitWarning(err)
+      }
     }
   }
 

package/package.json

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