@nxtedition/nxt-undici 7.0.0 → 7.1.1

package/lib/index.js

@@ -7,6 +7,7 @@ const dispatcherCache = new WeakMap()
 
 export const interceptors = {
   query: (await import('./interceptor/query.js')).default,
+  requestBodyFactory: (await import('./interceptor/request-body-factory.js')).default,
   responseError: (await import('./interceptor/response-error.js')).default,
   responseRetry: (await import('./interceptor/response-retry.js')).default,
   responseVerify: (await import('./interceptor/response-verify.js')).default,
@@ -84,6 +85,7 @@ function wrapDispatch(dispatcher) {
       dispatcher,
       interceptors.dns(),
       interceptors.lookup(),
+      interceptors.requestBodyFactory(),
       interceptors.responseRetry(),
       interceptors.responseVerify(),
       interceptors.proxy(),

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

@@ -0,0 +1,64 @@
+import { Readable } from 'node:stream'
+import { isStream } from '../utils.js'
+
+class FactoryStream extends Readable {
+  #factory
+  #ac
+  #body
+
+  constructor(factory) {
+    super()
+    this.#factory = factory
+  }
+
+  _construct(callback) {
+    this.#ac = new AbortController()
+    Promise.resolve(this.#factory({ signal: this.#ac.signal })).then(
+      (body) => {
+        try {
+          if (typeof body === 'string' || body instanceof Buffer) {
+            this.push(body)
+            this.push(null)
+          } else if (isStream(body)) {
+            this.#body = body
+          } else {
+            this.#body = Readable.from(body)
+          }
+
+          if (this.#body != null) {
+            this.#body
+              .on('readable', () => this._read())
+              .on('end', () => this.push(null))
+              .on('error', (err) => this.destroy(err))
+          }
+
+          callback(null)
+        } catch (err) {
+          callback(err)
+        }
+      },
+      (err) => callback(err),
+    )
+  }
+
+  _read() {
+    const chunk = this.#body?.read()
+    if (chunk !== null) {
+      this.push(chunk)
+    }
+  }
+
+  _destroy(err, callback) {
+    if (this.#ac != null) {
+      this.#ac.abort()
+      this.#ac = null
+    }
+
+    callback(err)
+  }
+}
+
+export default () => (dispatch) => (opts, handler) =>
+  typeof opts.body !== 'function'
+    ? dispatch(opts, handler)
+    : dispatch({ ...opts, body: new FactoryStream(opts.body) }, handler)

package/lib/request.js

@@ -16,10 +16,6 @@ export class RequestHandler {
         throw new InvalidArgumentError('invalid resolve')
       }
 
-      if (typeof body === 'function') {
-        throw new InvalidArgumentError('body cannot be a function')
-      }
-
       if (highWaterMark && (typeof highWaterMark !== 'number' || highWaterMark < 0)) {
         throw new InvalidArgumentError('invalid highWaterMark')
       }

package/package.json

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