@nxtedition/nxt-undici 6.1.5 → 6.1.7

package/lib/interceptor/cache.js

@@ -190,22 +190,26 @@ export default () => (dispatch) => (opts, handler) => {
     }
   }
 
-  handler.onConnect(abort)
-  if (aborted) {
-    return
-  }
-
-  handler.onHeaders(statusCode, headers, NOOP)
-  if (aborted) {
-    return
-  }
+  try {
+    handler.onConnect(abort)
+    if (aborted) {
+      return
+    }
 
-  if (body?.byteLength) {
-    handler.onData(body)
+    handler.onHeaders(statusCode, headers, NOOP)
     if (aborted) {
       return
     }
-  }
 
-  handler.onComplete({})
+    if (body?.byteLength) {
+      handler.onData(body)
+      if (aborted) {
+        return
+      }
+    }
+
+    handler.onComplete({})
+  } catch (err) {
+    abort(err)
+  }
 }

package/lib/utils.js

@@ -202,6 +202,7 @@ export class DecoratorHandler {
   #aborted = false
   #errored = false
   #completed = false
+  #abort
 
   constructor(handler) {
     if (typeof handler !== 'object' || handler === null) {
@@ -214,23 +215,26 @@ export class DecoratorHandler {
     this.#aborted = false
     this.#errored = false
     this.#completed = false
+    this.#abort = abort
 
     return this.#handler.onConnect?.((reason) => {
       if (!this.#aborted && !this.#completed && !this.#errored) {
         this.#aborted = true
-        abort(reason)
+        this.#abort(reason)
       }
     })
   }
 
   onUpgrade(statusCode, headers, socket) {
     if (!this.#aborted && !this.#errored) {
+      assert(!this.#completed)
       return this.#handler.onUpgrade?.(statusCode, headers, socket)
     }
   }
 
   onHeaders(statusCode, headers, resume) {
     if (!this.#aborted && !this.#errored) {
+      assert(!this.#completed)
       return this.#handler.onHeaders?.(statusCode, headers, resume)
     }
   }
@@ -243,9 +247,8 @@ export class DecoratorHandler {
   }
 
   onComplete(trailers) {
-    if (!this.#aborted && !this.#completed) {
+    if (!this.#aborted && !this.#completed && !this.#errored) {
       this.#completed = true
-      assert(!this.#errored)
       return this.#handler.onComplete?.(trailers)
     }
   }

package/package.json

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