@nxtedition/nxt-undici 2.0.12 → 2.0.14

package/lib/index.js

@@ -278,6 +278,7 @@ export async function request(url, opts) {
             this.abort(createError(statusCode, { headers }))
           } else {
             this.resolve({ headers, socket })
+            this.resolve = null
           }
         },
         onBodySent(chunk) {},

package/lib/interceptor/redirect.js

@@ -128,6 +128,7 @@ class Handler {
           count: this.count,
         }),
       )
+      this.handler = null
     } else {
       return this.handler.onComplete(trailers)
     }

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

@@ -1,61 +1,19 @@
-class Handler {
-  constructor(opts, { handler, dispatch }) {
-    this.handler = handler
-    this.dispatch = dispatch
-    this.ac = new AbortController()
-
-    const signal = opts.signal ? AbortSignal.any([this.ac.signal, opts.signal]) : this.ac.signal
-
-    const body = opts.body({ signal })
-
-    if (typeof body.then === 'function') {
-      body.then(
-        (body) => this.dispatch({ ...opts, body }, handler),
-        (err) => this.handler.onError(err),
-      )
-    } else {
-      this.dispatch({ ...opts, body }, handler)
-    }
-  }
-
-  onConnect(abort) {
-    this.abort = (err) => {
-      this.ac.abort(err)
-      abort(err)
-    }
-    return this.handler.onConnect(abort)
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+export default (dispatch) => (opts, handler) => {
+  if (typeof opts.body !== 'function') {
+    return dispatch(opts, handler)
   }
 
-  onData(chunk) {
-    return this.handler.onData(chunk)
-  }
+  // TODO (fix): Can we do signal in a better way using
+  // a handler?
 
-  onComplete(rawTrailers) {
-    return this.handler.onComplete(rawTrailers)
-  }
+  const body = opts.body({ signal: opts.signal })
 
-  onError(err) {
-    return this.handler.onError(err)
+  if (typeof body.then === 'function') {
+    body.then(
+      (body) => dispatch({ ...opts, body }, handler),
+      (err) => handler.onError(err),
+    )
+  } else {
+    dispatch({ ...opts, body }, handler)
   }
 }
-
-export default (dispatch) => (opts, handler) =>
-  typeof opts.body === 'function'
-    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
-    : dispatch(opts, handler)

package/package.json

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