@nxtedition/nxt-undici 1.2.2 → 1.4.0

package/lib/index.js

@@ -255,6 +255,7 @@ async function request(url, opts) {
         upgrade: opts.upgrade,
         follow: opts.follow ?? 8,
         logger: opts.logger,
+        highWaterMark: opts.highWaterMark ?? 128 * 1024,
       },
       {
         resolve,
@@ -289,7 +290,7 @@ async function request(url, opts) {
             this.body = new Readable({
               resume,
               abort: this.abort,
-              highWaterMark: 128 * 1024,
+              highWaterMark: this.highWaterMark,
               statusCode,
               statusMessage,
               headers,

package/lib/interceptor/log.js

@@ -9,12 +9,20 @@ class Handler {
     this.aborted = false
     this.logger = opts.logger.child({ ureq: opts })
     this.pos = 0
-    this.startTime = 0
+    this.stats = {
+      start: -1,
+      end: -1,
+      headers: -1,
+      firstBodySent: -1,
+      lastBodySent: -1,
+      firstBodyReceived: -1,
+      lastBodyReceived: -1,
+    }
   }
 
   onConnect(abort) {
     this.abort = abort
-    this.startTime = performance.now()
+    this.stats.start = performance.now()
     this.logger.debug('upstream request started')
     this.handler.onConnect((reason) => {
       this.aborted = true
@@ -31,18 +39,26 @@ class Handler {
   }
 
   onBodySent(chunk) {
+    if (this.stats.firstBodySent === -1) {
+      this.stats.firstBodySent = this.stats.start - performance.now()
+    }
+
     return this.handler.onBodySent(chunk)
   }
 
   onRequestSent() {
+    this.stats.lastBodySent = this.stats.start - performance.now()
+
     return this.handler.onRequestSent()
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
+    this.stats.headers = this.stats.start - performance.now()
+
     this.logger.debug(
       {
         ures: { statusCode, headers: parseHeaders(rawHeaders) },
-        elapsedTime: performance.now() - this.startTime,
+        elapsedTime: performance.now() - this.stats.start,
       },
       'upstream request response',
     )
@@ -50,29 +66,29 @@ class Handler {
   }
 
   onData(chunk) {
+    if (this.stats.firstBodyReceived === -1) {
+      this.stats.firstBodyReceived = this.stats.start - performance.now()
+    }
+
     this.pos += chunk.length
     return this.handler.onData(chunk)
   }
 
   onComplete(rawTrailers) {
-    this.logger.debug(
-      { bytesRead: this.pos, elapsedTime: performance.now() - this.startTime },
-      'upstream request completed',
-    )
+    this.stats.lastBodyReceived = this.stats.start - performance.now()
+    this.stats.end = this.stats.lastBodyReceived
+
+    this.logger.debug({ bytesRead: this.pos, stats: this.stats }, 'upstream request completed')
     return this.handler.onComplete(rawTrailers)
   }
 
   onError(err) {
+    this.stats.end = this.stats.start - performance.now()
+
     if (this.aborted) {
-      this.logger.debug(
-        { bytesRead: this.pos, elapsedTime: performance.now() - this.startTime, err },
-        'upstream request aborted',
-      )
+      this.logger.debug({ bytesRead: this.pos, stats: this.stats, err }, 'upstream request aborted')
     } else {
-      this.logger.error(
-        { bytesRead: this.pos, elapsedTime: performance.now() - this.startTime, err },
-        'upstream request failed',
-      )
+      this.logger.error({ bytesRead: this.pos, err }, 'upstream request failed')
     }
     return this.handler.onError(err)
   }

package/package.json

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