@nxtedition/nxt-undici 4.1.0 → 4.1.2

package/lib/index.js

@@ -103,7 +103,7 @@ export async function request(url, opts) {
   } else if (url instanceof URL) {
     opts = { url, ...opts }
   } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
-    opts = { url, ...opts }
+    opts = opts ? { ...url, ...opts } : url
   }
 
   if (opts == null && typeof url === 'object' && url != null) {

package/lib/interceptor/cache.js

@@ -6,7 +6,7 @@ class CacheHandler extends DecoratorHandler {
   #handler
   #store
   #key
-  #value
+  #value = null
 
   constructor({ key, handler, store }) {
     super(handler)

package/lib/interceptor/dns.js

@@ -65,7 +65,6 @@ export default (interceptorOpts) => (dispatch) => (opts, handler) => {
 
   const callback = (err, val) => {
     if (err) {
-      handler.onConnect(() => {})
       handler.onError(err)
     } else {
       const url = new URL(opts.origin)
@@ -88,7 +87,6 @@ export default (interceptorOpts) => (dispatch) => (opts, handler) => {
       )
     }
   } catch (err) {
-    handler.onConnect(() => {})
     handler.onError(err)
   }
 

package/lib/interceptor/log.js

@@ -3,10 +3,11 @@ import { DecoratorHandler, parseHeaders } from '../utils.js'
 class Handler extends DecoratorHandler {
   #handler
   #opts
-  #abort
-  #aborted = false
   #logger
-  #pos
+
+  #abort = null
+  #aborted = false
+  #pos = 0
   #timing = {
     created: performance.now(),
     connect: -1,

package/lib/interceptor/lookup.js

@@ -7,7 +7,6 @@ export default (opts) => (dispatch) => (opts, handler) => {
 
   const callback = (err, origin) => {
     if (err) {
-      handler.onConnect(() => {})
       handler.onError(err)
     } else {
       dispatch({ ...opts, origin }, handler)

package/lib/interceptor/redirect.js

@@ -6,15 +6,15 @@ const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 class Handler extends DecoratorHandler {
   #dispatch
   #handler
-
   #opts
-  #abort
-  #aborted = false
-  #reason
   #maxCount
+
+  #abort = null
+  #aborted = false
+  #reason = null
   #headersSent = false
   #count = 0
-  #location
+  #location = null
   #history = []
 
   constructor(opts, { dispatch, handler }) {

package/lib/interceptor/request-body-factory.js

@@ -12,7 +12,6 @@ export default (opts) => (dispatch) => (opts, handler) => {
           dispatch({ ...opts, body }, handler)
         })
         .catch((err) => {
-          handler.onConnect(() => {})
           handler.onError(err)
         })
       return true
@@ -20,7 +19,6 @@ export default (opts) => (dispatch) => (opts, handler) => {
       return dispatch({ ...opts, body }, handler)
     }
   } catch (err) {
-    handler.onConnect(() => {})
     handler.onError(err)
     return true
   }

package/lib/interceptor/response-error.js

@@ -4,12 +4,12 @@ import { DecoratorHandler, parseHeaders } from '../utils.js'
 class Handler extends DecoratorHandler {
   #handler
 
-  #statusCode
-  #contentType
-  #decoder
-  #headers
-  #body
-  #errored
+  #statusCode = 0
+  #contentType = null
+  #decoder = null
+  #headers = null
+  #body = ''
+  #errored = false
 
   constructor(opts, { handler }) {
     super(handler)

package/lib/interceptor/response-retry.js

@@ -17,14 +17,14 @@ class Handler extends DecoratorHandler {
   #headersSent = false
   #errorSent = false
 
-  #abort
+  #abort = null
   #aborted = false
   #reason = null
 
-  #pos
-  #end
-  #etag
-  #error
+  #pos = null
+  #end = null
+  #etag = null
+  #error = null
 
   constructor(opts, { handler, dispatch }) {
     super(handler)

package/lib/interceptor/response-verify.js

@@ -8,11 +8,11 @@ class Handler extends DecoratorHandler {
   #handler
 
   #verifyOpts
-  #contentMD5
-  #contentLength
-  #hasher
-  #pos
-  #errored
+  #contentMD5 = null
+  #contentLength = null
+  #hasher = null
+  #pos = 0
+  #errored = false
 
   constructor(opts, { handler }) {
     super(handler)
@@ -74,9 +74,7 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    if (this.#errored) {
-      // Do nothing...
-    } else {
+    if (!this.#errored) {
       this.#handler.onError(err)
     }
   }

package/package.json

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