@nxtedition/nxt-undici 1.4.1 → 1.4.3

package/lib/index.js

@@ -127,6 +127,7 @@ class Readable extends stream.Readable {
 
 const dispatchers = {
   requestBody: require('./interceptor/request-body.js'),
+  requestBodyFactory: require('./interceptor/request-body-factory.js'),
   abort: require('./interceptor/abort.js'),
   catch: require('./interceptor/catch.js'),
   responseContent: require('./interceptor/response-content.js'),
@@ -216,7 +217,7 @@ async function request(url, opts) {
   if (dispatch == null) {
     dispatch = (opts, handler) => dispatcher.dispatch(opts, handler)
     dispatch = dispatchers.catch(dispatch)
-    dispatch = dispatchers.requestBody(dispatch)
+    dispatch = dispatchers.requestBodyFactory(dispatch)
     dispatch = dispatchers.abort(dispatch)
     dispatch = dispatchers.requestId(dispatch)
     dispatch = dispatchers.log(dispatch)
@@ -229,6 +230,7 @@ async function request(url, opts) {
     dispatch = dispatchers.signal(dispatch)
     dispatch = dispatchers.cache(dispatch)
     dispatch = dispatchers.proxy(dispatch)
+    dispatch = dispatchers.requestBody(dispatch)
     dispatcherCache.set(dispatcher, dispatch)
   }
 

package/lib/interceptor/request-body-factory.js

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

package/lib/interceptor/request-body.js

@@ -23,7 +23,7 @@ class Handler {
       abort(this.error)
     } else {
       this.abort = abort
-      return this.onConnect(abort)
+      return this.handler.onConnect(abort)
     }
   }
 
@@ -58,22 +58,15 @@ class Handler {
   }
 }
 
-function dispatchImpl(dispatch, opts, handler) {
-  if (typeof opts.body === 'function') {
-    Promise.resolve(opts.body({ signal: opts.signal })).then(
-      (body) => dispatchImpl({ ...opts, body }, handler),
-      (err) => handler.onError(err),
-    )
-  } else if (isStream(opts.body)) {
+module.exports = (dispatch) => (opts, handler) => {
+  if (isStream(opts.body)) {
     if (opts.method === 'GET' || opts.method === 'HEAD') {
       opts.body.resume() // dump
-      dispatch({ ...opts, body: undefined }, new Handler(opts, { handler }))
+      return dispatch({ ...opts, body: undefined }, new Handler(opts, { handler }))
     } else {
-      dispatch(opts, new Handler(opts, { handler }))
+      return dispatch(opts, new Handler(opts, { handler }))
     }
   } else {
-    dispatch(opts, handler)
+    return dispatch(opts, handler)
   }
 }
-
-module.exports = (dispatch) => (opts, handler) => dispatchImpl(dispatch, opts, handler)

package/package.json

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