@nxtedition/nxt-undici 4.2.20 → 4.2.22

package/lib/index.js

@@ -58,7 +58,7 @@ function wrapDispatcher(dispatcher) {
             headers,
             signal: opts.signal,
             reset: opts.reset ?? false,
-            blocking: opts.blocking ?? null,
+            blocking: opts.blocking ?? opts.method !== 'HEAD',
             headersTimeout: opts.headersTimeout,
             bodyTimeout: opts.bodyTimeout,
             idempotent: opts.idempotent,

package/lib/interceptor/log.js

@@ -9,13 +9,12 @@ class Handler extends DecoratorHandler {
   #aborted = false
   #pos = 0
   #created = 0
-  #now = 0
   #timing = {
     created: -1,
     connect: -1,
     headers: -1,
     data: -1,
-    complete: -1,
+    end: -1,
   }
 
   constructor(opts, { handler }) {
@@ -26,19 +25,16 @@ class Handler extends DecoratorHandler {
     this.#logger = opts.logger
 
     this.#created = performance.now()
-    this.#now += this.#created
   }
 
   onConnect(abort) {
     this.#pos = 0
     this.#abort = abort
 
-    this.#timing.connect = performance.now() - this.#now
-    this.#now += this.#timing.connect
-
+    this.#timing.connect = performance.now() - this.#created
     this.#timing.headers = -1
     this.#timing.data = -1
-    this.#timing.complete = -1
+    this.#timing.end = -1
 
     this.#logger.debug({ ureq: this.#opts }, 'upstream request started')
 
@@ -58,8 +54,7 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#timing.headers = performance.now() - this.#now
-    this.#now += this.#timing.headers
+    this.#timing.headers = performance.now() - this.#created
 
     this.#logger.debug(
       {
@@ -75,8 +70,7 @@ class Handler extends DecoratorHandler {
 
   onData(chunk) {
     if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#now
-      this.#now += this.#timing.data
+      this.#timing.data = performance.now() - this.#created
     }
 
     this.#pos += chunk.length
@@ -85,17 +79,17 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#timing.complete = performance.now() - this.#created
+    this.#timing.end = performance.now() - this.#created
 
     this.#logger.debug(
       {
         ureq: { id: this.#opts.id, url: this.#opts.url },
         ures: {
           bytesRead: this.#pos,
-          bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
+          bytesReadPerSecond: (this.#pos * 1e3) / (this.#timing.end - this.#timing.data),
           timing: this.#timing,
         },
-        elapsedTime: this.#timing.complete,
+        elapsedTime: this.#timing.end,
       },
       'upstream request completed',
     )
@@ -104,16 +98,16 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.complete = performance.now() - this.#created
+    this.#timing.end = performance.now() - this.#created
 
     const data = {
       ureq: this.#opts,
       ures: {
         bytesRead: this.#pos,
-        bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
+        bytesReadPerSecond: (this.#pos * 1e3) / (this.#timing.end - this.#timing.data),
         timing: this.#timing,
       },
-      elapsedTime: this.#timing.complete,
+      elapsedTime: this.#timing.end,
       err,
     }
 

package/package.json

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