@nxtedition/nxt-undici 3.3.1 → 3.3.2

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/utils.js

@@ -250,6 +250,7 @@ export function bodyLength(body) {
 
 export class DecoratorHandler {
   #handler
+  #onConnectCalled = false
 
   constructor(handler) {
     if (typeof handler !== 'object' || handler === null) {
@@ -259,10 +260,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?.(...args)
+    }
     return this.#handler.onError?.(...args)
   }
 

package/package.json

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