@nxtedition/nxt-undici 6.0.21 → 6.0.22

package/lib/interceptor/cache.js

@@ -4,6 +4,7 @@ import { DecoratorHandler, parseCacheControl } from '../utils.js'
 const DEFAULT_STORE = new undici.cacheStores.SqliteCacheStore({ location: ':memory:' })
 const MAX_ENTRY_SIZE = 128 * 1024
 const EMPTY_BUFFER = Buffer.alloc(0)
+const NOOP = () => {}
 
 class CacheHandler extends DecoratorHandler {
   #key
@@ -175,27 +176,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.22",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",