@nxtedition/nxt-undici 7.3.20 → 7.3.22

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/redirect.js

@@ -52,7 +52,7 @@ class Handler extends DecoratorHandler {
       return super.onHeaders(statusCode, headers, resume)
     }
 
-    if (isDisturbed(this.#opts.body)) {
+    if (statusCode !== 303 && isDisturbed(this.#opts.body)) {
       throw new Error(`Disturbed request cannot be redirected.`)
     }
 
@@ -102,8 +102,12 @@ class Handler extends DecoratorHandler {
 
     // https://tools.ietf.org/html/rfc7231#section-6.4.4
     // In case of HTTP 303, always replace method to be either HEAD or GET
-    if (statusCode === 303 && this.#opts.method !== 'HEAD') {
-      this.#opts = { ...this.#opts, method: 'GET', body: null }
+    if (statusCode === 303) {
+      this.#opts = {
+        ...this.#opts,
+        method: this.#opts.method !== 'HEAD' ? 'GET' : 'HEAD',
+        body: null,
+      }
     }
   }
 

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.20",
+  "version": "7.3.22",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",