@nxtedition/nxt-undici 1.1.0 → 1.2.1

package/lib/index.js

@@ -126,7 +126,8 @@ class Readable extends stream.Readable {
 }
 
 const dispatchers = {
-  abort: require('./interceptor/abort.js'),
+  requestBody: require('./interceptor/request-body.js'),
+  dump: require('./interceptor/dump.js'),
   catch: require('./interceptor/catch.js'),
   responseContent: require('./interceptor/response-content.js'),
   requestContent: require('./interceptor/request-content.js'),
@@ -142,6 +143,8 @@ const dispatchers = {
 }
 
 async function request(url, opts) {
+  // TODO (fix): More argument validation...
+
   if (typeof url === 'string') {
     url = new URL(url)
   } else if (url instanceof URL) {
@@ -162,7 +165,8 @@ async function request(url, opts) {
   let headers
   if (Array.isArray(opts.headers)) {
     headers = parseHeaders(opts.headers)
-  } else {
+  } else if (opts.headers != null) {
+    // TODO (fix): Object.values(opts.headers)?
     headers = opts.headers
   }
 
@@ -202,7 +206,8 @@ async function request(url, opts) {
   if (dispatch == null) {
     dispatch = (opts, handler) => dispatcher.dispatch(opts, handler)
     dispatch = dispatchers.catch(dispatch)
-    dispatch = dispatchers.abort(dispatch)
+    dispatch = dispatchers.requestBody(dispatch)
+    dispatch = dispatchers.dump(dispatch)
     dispatch = dispatchers.requestId(dispatch)
     dispatch = dispatchers.log(dispatch)
     dispatch = dispatchers.responseRetry(dispatch)
@@ -217,12 +222,6 @@ async function request(url, opts) {
     dispatcherCache.set(dispatcher, dispatch)
   }
 
-  // TODO (fix): retry support
-  let body = opts.body
-  if (typeof body === 'function') {
-    body = await opts.body({ signal: opts.signal })
-  }
-
   return new Promise((resolve, reject) =>
     dispatch(
       {
@@ -239,6 +238,7 @@ 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/{abort.js → dump.js}

@@ -1,16 +1,25 @@
 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)
     })
   }
 
@@ -56,17 +65,22 @@ class Handler {
   }
 
   onComplete(rawTrailers) {
-    return this.reason == null
-      ? this.handler.onComplete(rawTrailers)
-      : this.handler.onError(this.reason)
+    return this.onFinally(this.reason, rawTrailers)
   }
 
   onError(err) {
-    return this.handler.onError(err)
+    return this.onFinally(err)
+  }
+
+  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.method === 'GET' || opts.method === 'HEAD'
-    ? dispatch(opts, new Handler(opts, { handler }))
-    : dispatch(opts, handler)
+  opts.dump ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)

package/lib/interceptor/log.js

@@ -42,7 +42,7 @@ class Handler {
     this.logger.debug(
       {
         ures: { statusCode, headers: parseHeaders(rawHeaders) },
-        elapsedTime: this.startTime - performance.now(),
+        elapsedTime: performance.now() - this.startTime,
       },
       'upstream request response',
     )
@@ -56,7 +56,7 @@ class Handler {
 
   onComplete(rawTrailers) {
     this.logger.debug(
-      { bytesRead: this.pos, elapsedTime: this.startTime - performance.now() },
+      { bytesRead: this.pos, elapsedTime: performance.now() - this.startTime },
       'upstream request completed',
     )
     return this.handler.onComplete(rawTrailers)
@@ -65,12 +65,12 @@ class Handler {
   onError(err) {
     if (this.aborted) {
       this.logger.debug(
-        { bytesRead: this.pos, elapsedTime: this.startTime - performance.now(), err },
+        { bytesRead: this.pos, elapsedTime: performance.now() - this.startTime, err },
         'upstream request aborted',
       )
     } else {
       this.logger.error(
-        { bytesRead: this.pos, elapsedTime: this.startTime - performance.now(), err },
+        { bytesRead: this.pos, elapsedTime: performance.now() - this.startTime, err },
         'upstream request failed',
       )
     }

package/lib/interceptor/request-body.js

@@ -0,0 +1,7 @@
+module.exports = (dispatch) => (opts, handler) =>
+  typeof opts.body !== 'function'
+    ? dispatch(opts, handler)
+    : Promise.resolve(opts.body({ signal: opts.signal })).then(
+        (body) => dispatch({ ...opts, body }, handler),
+        (err) => handler.onError(err),
+      )

package/lib/utils.js

@@ -1,7 +1,12 @@
 const tp = require('node:timers/promises')
 
 function isDisturbed(body) {
-  if (body == null || typeof body === 'string' || Buffer.isBuffer(body)) {
+  if (
+    body == null ||
+    typeof body === 'string' ||
+    Buffer.isBuffer(body) ||
+    typeof body === 'function'
+  ) {
     return false
   }
 

package/package.json

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