@nxtedition/nxt-undici 6.2.15 → 6.2.17

package/lib/interceptor/response-retry.js

@@ -4,7 +4,6 @@ import { DecoratorHandler, isDisturbed, decorateError, parseRangeHeader } from '
 
 function noop() {}
 
-// TODO (fix): What about onUpgrade?
 class Handler extends DecoratorHandler {
   #dispatch
   #opts
@@ -77,6 +76,11 @@ class Handler extends DecoratorHandler {
     }
   }
 
+  onUpgrade() {
+    // TODO (fix): Should we support this?
+    throw new Error('not supported')
+  }
+
   onHeaders(statusCode, headers, resume) {
     this.#statusCode = statusCode
     this.#headers = headers
@@ -149,13 +153,13 @@ class Handler extends DecoratorHandler {
 
       if (this.#pos > 0 && this.#etag !== headers.etag) {
         this.#maybeError(null)
-        return null
+        return false
       }
 
       const contentRange = parseRangeHeader(headers['content-range'])
       if (!contentRange) {
         this.#maybeError(null)
-        return null
+        return false
       }
 
       const { start, size, end = size } = contentRange
@@ -168,6 +172,7 @@ class Handler extends DecoratorHandler {
       return true
     } else {
       this.#maybeError(this.#retryError)
+      return false
     }
   }
 
@@ -247,29 +252,26 @@ class Handler extends DecoratorHandler {
     let retryPromise
     try {
       if (typeof this.#opts.retry === 'function') {
-        retryPromise = this.#opts.retry(
-          decorateError(err, this.#opts, {
-            statusCode: this.#statusCode,
-            headers: this.#headers,
-            trailers: this.#trailers,
-            body: this.#body,
-          }),
-          this.#retryCount,
-          this.#opts,
-          () => this.#retryFn(err, this.#retryCount, this.#opts),
+        retryPromise = Promise.resolve(
+          this.#opts.retry(
+            decorateError(err, this.#opts, {
+              statusCode: this.#statusCode,
+              headers: this.#headers,
+              trailers: this.#trailers,
+              body: this.#body,
+            }),
+            this.#retryCount,
+            this.#opts,
+            () => this.#retryFn(err, this.#retryCount, this.#opts),
+          ),
         )
       } else {
-        retryPromise = this.#retryFn(err, this.#retryCount, this.#opts)
+        retryPromise = Promise.resolve(this.#retryFn(err, this.#retryCount, this.#opts))
       }
     } catch (err) {
       retryPromise = Promise.reject(err)
     }
 
-    if (retryPromise == null) {
-      this.#maybeError(err)
-      return
-    }
-
     retryPromise
       .then((shouldRetry) => {
         if (this.#aborted) {
@@ -361,6 +363,7 @@ class Handler extends DecoratorHandler {
 export default () => (dispatch) => (opts, handler) =>
   opts.retry !== false &&
   !opts.upgrade &&
-  (/^(HEAD|GET|PUT|PATCH)$/.test(opts.method) || opts.idempotent)
+  (/^(HEAD|GET|PUT|PATCH|QUERY)$/.test(opts.method) || opts.idempotent) &&
+  opts.idempotent !== false
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)

package/package.json

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