@nxtedition/nxt-undici 6.0.4 → 6.0.6

package/lib/index.js

@@ -1,7 +1,6 @@
 import undici from '@nxtedition/undici'
 import { parseHeaders } from './utils.js'
 import { request as _request } from './request.js'
-import { cacheStores } from 'undici'
 
 const dispatcherCache = new WeakMap()
 
@@ -20,7 +19,7 @@ export const interceptors = {
 }
 
 export const cache = {
-  SqliteCacheStore: cacheStores.SqliteCacheStore,
+  SqliteCacheStore: undici.cacheStores.SqliteCacheStore,
 }
 
 export { parseHeaders } from './utils.js'

package/lib/interceptor/cache.js

@@ -1,18 +1,21 @@
-import { cacheStores } from 'undici'
+import undici from '@nxtedition/undici'
 import { DecoratorHandler, parseCacheControl } from '../utils.js'
 
-const DEFAULT_STORE = new cacheStores.SqliteCacheStore({ location: ':memory:' })
+const DEFAULT_STORE = new undici.cacheStores.SqliteCacheStore({ location: ':memory:' })
 const MAX_ENTRY_SIZE = 128 * 1024
 
 class CacheHandler extends DecoratorHandler {
+  #key
   #value
-  #opts
   #store
 
-  constructor(opts, { store, handler }) {
+  constructor(key, { store, handler }) {
+    undici.util.cache.assertCacheKey(key)
+
     super(handler)
 
-    this.#opts = opts
+    this.#key = key
+    this.#value = null
     this.#store = store
   }
 
@@ -61,7 +64,7 @@ class CacheHandler extends DecoratorHandler {
       for (const key of [headers.vary]
         .flat()
         .flatMap((vary) => vary.split(',').map((key) => key.trim().toLowerCase()))) {
-        const val = this.#opts.headers?.[key]
+        const val = this.#key.headers[key]
         if (!val) {
           // Expect vary headers to be present...
           return super.onHeaders(statusCode, headers, resume)
@@ -115,7 +118,7 @@ class CacheHandler extends DecoratorHandler {
 
   onComplete(trailers) {
     if (this.#value && (!trailers || Object.keys(trailers).length === 0)) {
-      this.#store.set(this.#opts, this.#value)
+      this.#store.set(this.#key, this.#value)
     }
 
     super.onComplete(trailers)
@@ -150,7 +153,10 @@ export default () => (dispatch) => (opts, handler) => {
   const store = opts.cache.store ?? DEFAULT_STORE
   const entry = store.get(opts)
   if (!entry) {
-    return dispatch(opts, new CacheHandler(opts.headers, { store, handler }))
+    return dispatch(
+      opts,
+      new CacheHandler(undici.util.cache.makeCacheKey(opts), { store, handler }),
+    )
   }
 
   let aborted = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "6.0.4",
+  "version": "6.0.6",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -9,10 +9,9 @@
     "lib/*"
   ],
   "dependencies": {
-    "@nxtedition/undici": "^10.0.2",
+    "@nxtedition/undici": "^10.1.2",
     "cache-control-parser": "^2.0.6",
-    "http-errors": "^2.0.0",
-    "undici": "^7.3.0"
+    "http-errors": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.7",