@nxtedition/nxt-undici 4.2.8 → 4.2.10

package/lib/interceptor/log.js

@@ -8,8 +8,9 @@ class Handler extends DecoratorHandler {
   #abort = null
   #aborted = false
   #pos = 0
+  #now = 0
   #timing = {
-    created: performance.now(),
+    created: -1,
     connect: -1,
     headers: -1,
     data: -1,
@@ -23,12 +24,17 @@ class Handler extends DecoratorHandler {
     this.#handler = handler
     this.#opts = opts
     this.#logger = opts.logger.child({ ureq: { id: opts.id } })
+
+    this.#timing.created = performance.now()
+    this.#now += this.#timing.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.#logger.debug({ ureq: this.#opts }, 'upstream request started')
 
@@ -48,22 +54,19 @@ 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.debug(
-      {
-        ures: { statusCode, headers },
-        elapsedTime: this.#timing.headers,
-      },
-      'upstream request response',
-    )
+    this.#logger = this.#logger.child({ ures: { statusCode, headers } })
+    this.#logger.debug({ elapsedTime: this.#timing.headers }, 'upstream request response')
 
     return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
   }
 
   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
@@ -72,10 +75,16 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#timing.complete = performance.now() - this.#timing.data - this.#timing.created
+    this.#timing.complete = performance.now() - this.#now
+    this.#now += this.#timing.complete
 
     this.#logger.debug(
-      { elapsedTime: this.#timing.complete, bytesRead: this.#pos, timing: this.#timing },
+      {
+        elapsedTime: this.#timing.complete,
+        bytesRead: this.#pos,
+        bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
+        timing: this.#timing,
+      },
       'upstream request completed',
     )
 
@@ -83,7 +92,8 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.error = performance.now() - this.#timing.data - this.#timing.created
+    this.#timing.error = performance.now() - this.#now
+    this.#now += this.#timing.error
 
     if (this.#aborted) {
       this.#logger.debug(

package/package.json

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