@nxtedition/nxt-undici 6.0.21 → 6.0.23

package/lib/interceptor/cache.js

@@ -2,15 +2,17 @@ import undici from '@nxtedition/undici'
 import { DecoratorHandler, parseCacheControl } from '../utils.js'
 
 const DEFAULT_STORE = new undici.cacheStores.SqliteCacheStore({ location: ':memory:' })
-const MAX_ENTRY_SIZE = 128 * 1024
+const DEFAULT_MAX_ENTRY_SIZE = 128 * 1024
 const EMPTY_BUFFER = Buffer.alloc(0)
+const NOOP = () => {}
 
 class CacheHandler extends DecoratorHandler {
   #key
   #value
   #store
+  #maxEntrySize
 
-  constructor(key, { store, handler }) {
+  constructor(key, { store, handler, maxEntrySize }) {
     undici.util.cache.assertCacheKey(key)
 
     super(handler)
@@ -18,6 +20,7 @@ class CacheHandler extends DecoratorHandler {
     this.#key = key
     this.#value = null
     this.#store = store
+    this.#maxEntrySize = maxEntrySize ?? store.maxEntrySize ?? DEFAULT_MAX_ENTRY_SIZE
   }
 
   onConnect(abort) {
@@ -37,7 +40,7 @@ class CacheHandler extends DecoratorHandler {
     }
 
     const contentLength = headers['content-length'] ? Number(headers['content-length']) : Infinity
-    if (Number.isFinite(contentLength) && contentLength > MAX_ENTRY_SIZE) {
+    if (Number.isFinite(contentLength) && contentLength > DEFAULT_MAX_ENTRY_SIZE) {
       // We don't support caching responses with body...
       return super.onHeaders(statusCode, headers, resume)
     }
@@ -110,7 +113,7 @@ class CacheHandler extends DecoratorHandler {
       this.#value.size += chunk.length
       this.#value.body.push(chunk)
 
-      if (this.#value.size > MAX_ENTRY_SIZE) {
+      if (this.#value.size > this.#maxEntrySize) {
         this.#value = null
         this.#value.size = 0
       }
@@ -161,7 +164,11 @@ export default () => (dispatch) => (opts, handler) => {
       opts,
       cacheControlDirectives['no-store']
         ? handler
-        : new CacheHandler(undici.util.cache.makeCacheKey(opts), { store, handler }),
+        : new CacheHandler(undici.util.cache.makeCacheKey(opts), {
+            maxEntrySize: opts.cache.maxEntrySize,
+            store,
+            handler,
+          }),
     )
   }
 
@@ -175,27 +182,20 @@ export default () => (dispatch) => (opts, handler) => {
     }
   }
 
-  let state = 0
-
-  const resume = () => {
-    try {
-      let paused = false
-      while (!paused && !aborted) {
-        state += 1
-        if (state === 1) {
-          handler.onConnect(abort)
-        } else if (state === 2) {
-          paused = handler.onHeaders(statusCode, headers, resume) === false
-        } else if (state === 3) {
-          paused = handler.onData(body ?? EMPTY_BUFFER) === false
-        } else if (state === 4) {
-          handler.onComplete({})
-        }
-      }
-    } catch (err) {
-      abort(err)
-    }
+  handler.onConnect(abort)
+  if (aborted) {
+    return
+  }
+
+  handler.onHeaders(statusCode, headers, NOOP)
+  if (aborted) {
+    return
+  }
+
+  handler.onData(body ?? EMPTY_BUFFER)
+  if (aborted) {
+    return
   }
 
-  resume()
+  handler.onComplete({})
 }

package/lib/utils.js

@@ -276,15 +276,15 @@ export class DecoratorHandler {
     })
   }
 
-  onUpgrade(...args) {
+  onUpgrade(statusCode, headers, socket) {
     if (!this.#aborted && !this.#errored) {
-      return this.#handler.onUpgrade?.(...args)
+      return this.#handler.onUpgrade?.(statusCode, headers, socket)
     }
   }
 
-  onHeaders(...args) {
+  onHeaders(statusCode, headers, resume) {
     if (!this.#aborted && !this.#errored) {
-      return this.#handler.onHeaders?.(...args)
+      return this.#handler.onHeaders?.(statusCode, headers, resume)
     }
   }
 

package/package.json

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