@nxtedition/nxt-undici 1.2.1 → 1.3.0

package/lib/index.js

@@ -127,7 +127,7 @@ class Readable extends stream.Readable {
 
 const dispatchers = {
   requestBody: require('./interceptor/request-body.js'),
-  dump: require('./interceptor/dump.js'),
+  abort: require('./interceptor/abort.js'),
   catch: require('./interceptor/catch.js'),
   responseContent: require('./interceptor/response-content.js'),
   requestContent: require('./interceptor/request-content.js'),
@@ -151,14 +151,24 @@ async function request(url, opts) {
     // Do nothing...
   } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
     // Do nothing...
-  } else {
-    throw new Error('missing url')
   }
 
   if (opts == null && typeof url === 'object' && url != null) {
     opts = url
   }
 
+  if (url) {
+    // Do nothing...
+  } else if (typeof opts.url === 'string') {
+    url = new URL(opts.url)
+  } else if (url.url instanceof URL) {
+    url = opts.url
+  } else if (typeof opts.origin === 'string' && typeof (opts.path ?? opts.pathname) === 'string') {
+    url = opts
+  } else {
+    throw new Error('missing url')
+  }
+
   const method = opts.method ?? (opts.body ? 'POST' : 'GET')
   const idempotent = opts.idempotent ?? (method === 'GET' || method === 'HEAD')
 
@@ -207,7 +217,7 @@ async function request(url, opts) {
     dispatch = (opts, handler) => dispatcher.dispatch(opts, handler)
     dispatch = dispatchers.catch(dispatch)
     dispatch = dispatchers.requestBody(dispatch)
-    dispatch = dispatchers.dump(dispatch)
+    dispatch = dispatchers.abort(dispatch)
     dispatch = dispatchers.requestId(dispatch)
     dispatch = dispatchers.log(dispatch)
     dispatch = dispatchers.responseRetry(dispatch)
@@ -238,7 +248,6 @@ async function request(url, opts) {
         headersTimeout: opts.headersTimeout,
         bodyTimeout: opts.bodyTimeout,
         idempotent,
-        dump: opts.dump ?? {},
         signal: opts.signal,
         retry: opts.retry ?? 8,
         proxy: opts.proxy,

package/lib/interceptor/{dump.js → abort.js}

@@ -1,25 +1,17 @@
 const { AbortError } = require('../utils')
 
-// TODO (fix): Configrable max body size
-// TODO (fix): Dump true?
-
 class Handler {
   constructor(opts, { handler }) {
     this.opts = opts
     this.handler = handler
     this.pos = 0
     this.reason = null
-    this.timeout = null
   }
 
   onConnect(abort) {
     this.abort = abort
     this.handler.onConnect((reason) => {
       this.reason = reason ?? new AbortError()
-      this.timeout = setTimeout(() => {
-        this.timeout = null
-        this.abort(this.reason)
-      }, this.opts.dump?.timeout ?? 10e3)
     })
   }
 
@@ -73,14 +65,8 @@ class Handler {
   }
 
   onFinally(err, rawTrailers) {
-    if (this.timeout) {
-      clearTimeout(this.timeout)
-      this.timeout = null
-    }
-
     return err == null ? this.handler.onComplete(rawTrailers) : this.handler.onError(err)
   }
 }
 
-module.exports = (dispatch) => (opts, handler) =>
-  opts.dump ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)
+module.exports = (dispatch) => (opts, handler) => dispatch(opts, new Handler(opts, { handler }))

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.1",
+  "version": "1.3.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",