@nxtedition/nxt-undici 4.2.9 → 4.2.12

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Matteo Collina and Undici contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/interceptor/dns.js

@@ -29,6 +29,7 @@ class Handler extends DecoratorHandler {
         'ENETUNREACH',
         'EHOSTDOWN',
         'EHOSTUNREACH',
+        'EHOSTNOTFOUND',
         'ENODATA',
         'EPIPE',
       ].includes(err.code)
@@ -70,7 +71,7 @@ export default (interceptorOpts) => (dispatch) => (opts, handler) => {
       const url = new URL(opts.origin)
       url.hostname = Array.isArray(val)
         ? val[Math.floor(val.length * Math.random())].address
-        : val?.address ?? val
+        : (val?.address ?? val)
       dispatch(
         {
           ...opts,

package/lib/interceptor/log.js

@@ -8,13 +8,14 @@ class Handler extends DecoratorHandler {
   #abort = null
   #aborted = false
   #pos = 0
+  #created = 0
+  #now = 0
   #timing = {
-    created: performance.now(),
+    created: -1,
     connect: -1,
     headers: -1,
     data: -1,
     complete: -1,
-    error: -1,
   }
 
   constructor(opts, { handler }) {
@@ -23,12 +24,21 @@ class Handler extends DecoratorHandler {
     this.#handler = handler
     this.#opts = opts
     this.#logger = opts.logger.child({ ureq: { id: opts.id } })
+
+    this.#created = performance.now()
+    this.#now += this.#created
   }
 
   onConnect(abort) {
     this.#pos = 0
     this.#abort = abort
-    this.#timing.connect = performance.now() - this.#timing.created
+
+    this.#timing.connect = performance.now() - this.#now
+    this.#now += this.#timing.connect
+
+    this.#timing.headers = -1
+    this.#timing.data = -1
+    this.#timing.complete = -1
 
     this.#logger.debug({ ureq: this.#opts }, 'upstream request started')
 
@@ -48,7 +58,8 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#timing.headers = performance.now() - this.#timing.connect - this.#timing.created
+    this.#timing.headers = performance.now() - this.#now
+    this.#now += this.#timing.headers
 
     this.#logger = this.#logger.child({ ures: { statusCode, headers } })
     this.#logger.debug({ elapsedTime: this.#timing.headers }, 'upstream request response')
@@ -58,7 +69,8 @@ class Handler extends DecoratorHandler {
 
   onData(chunk) {
     if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#timing.headers - this.#timing.created
+      this.#timing.data = performance.now() - this.#now
+      this.#now += this.#timing.data
     }
 
     this.#pos += chunk.length
@@ -67,14 +79,16 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#timing.complete = performance.now() - this.#timing.data - this.#timing.created
+    this.#timing.complete = performance.now() - this.#created
 
     this.#logger.debug(
       {
+        ures: {
+          bytesRead: this.#pos,
+          bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
+          timing: this.#timing,
+        },
         elapsedTime: this.#timing.complete,
-        bytesRead: this.#pos,
-        bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
-        timing: this.#timing,
       },
       'upstream request completed',
     )
@@ -83,30 +97,23 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.error = performance.now() - this.#timing.data - this.#timing.created
+    this.#timing.complete = performance.now() - this.#created
+
+    const logger = this.#logger.child({
+      ureq: this.#opts,
+      ures: {
+        bytesRead: this.#pos,
+        bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
+        timing: this.#timing,
+      },
+      elapsedTime: this.#timing.complete,
+      err,
+    })
 
     if (this.#aborted) {
-      this.#logger.debug(
-        {
-          ureq: this.#opts,
-          bytesRead: this.#pos,
-          timing: this.#timing,
-          elapsedTime: this.#timing.error,
-          err,
-        },
-        'upstream request aborted',
-      )
+      logger.debug('upstream request aborted')
     } else {
-      this.#logger.error(
-        {
-          ureq: this.#opts,
-          bytesRead: this.#pos,
-          timing: this.#timing,
-          elapsedTime: this.#timing.error,
-          err,
-        },
-        'upstream request failed',
-      )
+      logger.error('upstream request failed')
     }
 
     return this.#handler.onError(err)

package/package.json

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