@nxtedition/nxt-undici 6.2.3 → 6.2.5

package/lib/interceptor/response-retry.js

@@ -1,6 +1,9 @@
 import assert from 'node:assert'
 import tp from 'node:timers/promises'
 import { DecoratorHandler, isDisturbed, parseRangeHeader } from '../utils.js'
+import createHttpError from 'http-errors'
+
+function noop() {}
 
 // TODO (fix): What about onUpgrade?
 class Handler extends DecoratorHandler {
@@ -12,6 +15,8 @@ class Handler extends DecoratorHandler {
   #errorSent = false
 
   #statusCode = 0
+  #headers = null
+  #trailers = null
 
   #abort
   #aborted = false
@@ -41,6 +46,8 @@ class Handler extends DecoratorHandler {
 
   onConnect(abort) {
     this.#statusCode = 0
+    this.#headers = null
+    this.#trailers = null
 
     if (!this.#headersSent) {
       this.#pos = null
@@ -69,6 +76,9 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, headers, resume) {
+    this.#statusCode = statusCode
+    this.#headers = headers
+
     if (this.#error == null) {
       assert(this.#etag == null)
       assert(this.#pos == null)
@@ -107,7 +117,6 @@ class Handler extends DecoratorHandler {
         this.#end = contentLength
         this.#etag = headers.etag
       } else if (statusCode >= 400) {
-        this.#statusCode = statusCode
         return true
       } else {
         return this.#onHeaders(statusCode, headers, resume)
@@ -168,19 +177,41 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(trailers) {
+    this.#trailers = trailers
+
     if (this.#statusCode >= 400) {
-      this.#maybeRetry({ statusCode: this.#statusCode })
+      this.#maybeRetry(null, this.#statusCode)
     } else {
       super.onComplete(trailers)
     }
   }
 
-  #maybeRetry(err) {
-    if (this.#aborted || isDisturbed(this.#opts.body) || (this.#pos && !this.#etag)) {
+  #maybeError(err) {
+    if (err) {
       this.#onError(err)
+    } else {
+      this.#onHeaders(this.#statusCode, this.#headers, noop)
+      super.onComplete(this.#trailers)
+    }
+  }
+
+  #maybeRetry(err, statusCode) {
+    if (this.#aborted || isDisturbed(this.#opts.body) || (this.#pos && !this.#etag)) {
+      this.#maybeError(err)
       return
     }
 
+    if (!err) {
+      // TOOD (fix): Avoid creating an Error and do onHeaders + onComplete.
+      const stackTraceLimit = Error.stackTraceLimit
+      Error.stackTraceLimit = 0
+      try {
+        err = createHttpError(statusCode ?? 500)
+      } finally {
+        Error.stackTraceLimit = stackTraceLimit
+      }
+    }
+
     let retryPromise
     try {
       retryPromise = retryFn(err, this.#retryCount, this.#opts)
@@ -189,7 +220,7 @@ class Handler extends DecoratorHandler {
     }
 
     if (retryPromise == null) {
-      this.#onError(err)
+      this.#maybeError(err)
       return
     }
 

package/lib/utils.js

@@ -248,10 +248,6 @@ export class DecoratorHandler {
 
   onComplete(trailers) {
     if (!this.#aborted && !this.#completed && !this.#errored) {
-<<<<<<< HEAD
-      this.#abort = null
-=======
->>>>>>> 23823e3 (fix: decoerator)
       this.#completed = true
       return this.#handler.onComplete?.(trailers)
     }

package/package.json

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