@nxtedition/nxt-undici 3.3.1 → 3.3.3

package/lib/interceptor/cache.js

@@ -193,7 +193,9 @@ export default (opts) => (dispatch) => (opts, handler) => {
     } catch (err) {
       handler.onError(err)
     }
+
+    return true
   } else {
-    dispatch(opts, new CacheHandler({ handler, store, key: makeKey(opts) }))
+    return dispatch(opts, new CacheHandler({ handler, store, key: makeKey(opts) }))
   }
 }

package/lib/interceptor/dns.js

@@ -60,35 +60,37 @@ export default (interceptorOpts) => (dispatch) => (opts, handler) => {
   const { hostname } = new URL(opts.origin)
 
   if (net.isIP(hostname)) {
-    dispatch(opts, handler)
-  } else {
-    const callback = (err, val) => {
-      if (err) {
-        handler.onConnect(() => {})
-        handler.onError(err)
-      } else {
-        const url = new URL(opts.origin)
-        url.hostname = Array.isArray(val)
-          ? val[Math.floor(val.length * Math.random())].address
-          : val?.address ?? val
-        dispatch(
-          { ...opts, origin: url.origin },
-          resolver.clear ? new Handler({ resolver, key: hostname }, { handler }) : handler,
-        )
-      }
-    }
+    return dispatch(opts, handler)
+  }
 
-    try {
-      const thenable = resolver.lookup(hostname, { family, hints, order, all }, callback)
-      if (typeof thenable?.then === 'function') {
-        thenable.then(
-          (val) => callback(null, val),
-          (err) => callback(err),
-        )
-      }
-    } catch (err) {
+  const callback = (err, val) => {
+    if (err) {
       handler.onConnect(() => {})
       handler.onError(err)
+    } else {
+      const url = new URL(opts.origin)
+      url.hostname = Array.isArray(val)
+        ? val[Math.floor(val.length * Math.random())].address
+        : val?.address ?? val
+      dispatch(
+        { ...opts, origin: url.origin },
+        resolver.clear ? new Handler({ resolver, key: hostname }, { handler }) : handler,
+      )
     }
   }
+
+  try {
+    const thenable = resolver.lookup(hostname, { family, hints, order, all }, callback)
+    if (typeof thenable?.then === 'function') {
+      thenable.then(
+        (val) => callback(null, val),
+        (err) => callback(err),
+      )
+    }
+  } catch (err) {
+    handler.onConnect(() => {})
+    handler.onError(err)
+  }
+
+  return true
 }

package/lib/interceptor/log.js

@@ -7,8 +7,14 @@ class Handler extends DecoratorHandler {
   #aborted = false
   #logger
   #pos
-  #timing
-  #startTime = performance.now()
+  #timing = {
+    created: performance.now(),
+    connect: -1,
+    headers: -1,
+    data: -1,
+    complete: -1,
+    error: -1,
+  }
 
   constructor(opts, { handler }) {
     super(handler)
@@ -21,13 +27,7 @@ class Handler extends DecoratorHandler {
   onConnect(abort) {
     this.#pos = 0
     this.#abort = abort
-    this.#timing = {
-      connect: performance.now() - this.#startTime,
-      headers: -1,
-      data: -1,
-      complete: -1,
-      error: -1,
-    }
+    this.#timing.connect = performance.now() - this.#timing.created
 
     this.#logger.debug({ ureq: this.#opts }, 'upstream request started')
 
@@ -47,7 +47,7 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#timing.headers = performance.now() - this.#timing.connect - this.#startTime
+    this.#timing.headers = performance.now() - this.#timing.connect - this.#timing.created
 
     this.#logger.debug(
       {
@@ -62,7 +62,7 @@ class Handler extends DecoratorHandler {
 
   onData(chunk) {
     if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#timing.headers - this.#startTime
+      this.#timing.data = performance.now() - this.#timing.headers - this.#timing.created
     }
 
     this.#pos += chunk.length
@@ -71,7 +71,7 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#timing.complete = performance.now() - this.#timing.data - this.#startTime
+    this.#timing.complete = performance.now() - this.#timing.data - this.#timing.created
 
     this.#logger.debug(
       { elapsedTime: this.#timing.complete, bytesRead: this.#pos, timing: this.#timing },
@@ -82,7 +82,7 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.error = performance.now() - this.#timing.data - this.#startTime
+    this.#timing.error = performance.now() - this.#timing.data - this.#timing.created
 
     if (this.#aborted) {
       this.#logger.debug(

package/lib/interceptor/lookup.js

@@ -25,4 +25,6 @@ export default (opts) => (dispatch) => (opts, handler) => {
   } catch (err) {
     callback(err)
   }
+
+  return true
 }

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

@@ -16,11 +16,13 @@ export default (opts) => (dispatch) => (opts, handler) => {
           handler.onError(err)
         },
       )
+      return true
     } else {
-      dispatch({ ...opts, body }, handler)
+      return dispatch({ ...opts, body }, handler)
     }
   } catch (err) {
     handler.onConnect(() => {})
     handler.onError(err)
+    return true
   }
 }

package/lib/utils.js

@@ -3,6 +3,8 @@ import cacheControlParser from 'cache-control-parser'
 import stream from 'node:stream'
 import { util } from '@nxtedition/undici'
 
+const noop = () => {}
+
 export function parseCacheControl(str) {
   return str ? cacheControlParser.parse(str) : null
 }
@@ -250,6 +252,7 @@ export function bodyLength(body) {
 
 export class DecoratorHandler {
   #handler
+  #onConnectCalled = false
 
   constructor(handler) {
     if (typeof handler !== 'object' || handler === null) {
@@ -259,10 +262,15 @@ export class DecoratorHandler {
   }
 
   onConnect(...args) {
+    this.#onConnectCalled = true
     return this.#handler.onConnect?.(...args)
   }
 
   onError(...args) {
+    if (!this.#onConnectCalled) {
+      this.#onConnectCalled = true
+      this.#handler.onConnect?.(noop)
+    }
     return this.#handler.onError?.(...args)
   }
 

package/package.json

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