@nxtedition/nxt-undici 6.0.18 → 6.0.20

package/lib/interceptor/response-retry.js

@@ -13,6 +13,7 @@ class Handler extends DecoratorHandler {
   #abort
   #aborted = false
   #reason
+  #resume
 
   #pos
   #end
@@ -41,6 +42,7 @@ class Handler extends DecoratorHandler {
       this.#end = null
       this.#etag = null
       this.#error = null
+      this.#resume = null
 
       super.onConnect((reason) => {
         if (!this.#aborted) {
@@ -62,6 +64,8 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, headers, resume) {
+    this.#resume = resume
+
     if (this.#error == null) {
       assert(this.#etag == null)
       assert(this.#pos == null)
@@ -69,18 +73,18 @@ class Handler extends DecoratorHandler {
       assert(this.#headersSent === false)
 
       if (headers.trailer) {
-        return this.#onHeaders(statusCode, headers, resume)
+        return this.#onHeaders(statusCode, headers)
       }
 
       const contentLength = headers['content-length'] ? Number(headers['content-length']) : null
       if (contentLength != null && !Number.isFinite(contentLength)) {
-        return this.#onHeaders(statusCode, headers, resume)
+        return this.#onHeaders(statusCode, headers)
       }
 
       if (statusCode === 206) {
         const range = parseRangeHeader(headers['content-range'])
         if (!range) {
-          return this.#onHeaders(statusCode, headers, resume)
+          return this.#onHeaders(statusCode, headers)
         }
 
         const { start, size, end = size } = range
@@ -100,7 +104,7 @@ class Handler extends DecoratorHandler {
         this.#end = contentLength
         this.#etag = headers.etag
       } else {
-        return this.#onHeaders(statusCode, headers, resume)
+        return this.#onHeaders(statusCode, headers)
       }
 
       // Weak etags are not useful for comparison nor cache
@@ -113,7 +117,7 @@ class Handler extends DecoratorHandler {
       assert(Number.isFinite(this.#pos))
       assert(this.#end == null || Number.isFinite(this.#end))
 
-      return this.#onHeaders(statusCode, headers, resume)
+      return this.#onHeaders(statusCode, headers)
     } else if (statusCode === 206 || (this.#pos === 0 && statusCode === 200)) {
       assert(this.#etag != null || !this.#pos)
 
@@ -207,10 +211,10 @@ class Handler extends DecoratorHandler {
     super.onError(err)
   }
 
-  #onHeaders(statusCode, headers, resume) {
+  #onHeaders(statusCode, headers) {
     assert(!this.#headersSent)
     this.#headersSent = true
-    return super.onHeaders(statusCode, headers, resume)
+    return super.onHeaders(statusCode, headers, () => this.#resume?.())
   }
 }
 

package/lib/request.js

@@ -143,7 +143,16 @@ export class RequestHandler {
 }
 
 export function request(dispatch, url, opts) {
-  if (!url || (typeof url !== 'string' && typeof url !== 'object' && !(url instanceof URL))) {
+  if (typeof url === 'object' && url != null && opts == null) {
+    opts = url
+    url = opts.url ?? opts
+  }
+
+  if (typeof url === 'string') {
+    url = new URL(url)
+  }
+
+  if (url == null || typeof url !== 'object') {
     throw new InvalidArgumentError('invalid url')
   }
 
@@ -151,12 +160,6 @@ export function request(dispatch, url, opts) {
     throw new InvalidArgumentError('invalid opts')
   }
 
-  if (typeof url === 'string') {
-    url = new URL(url)
-  } else if (typeof url === 'object' && url != null && opts == null) {
-    opts = url
-  }
-
   let origin = url.origin
   if (!origin) {
     const protocol = url.protocol ?? 'http:'

package/package.json

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