@nxtedition/nxt-undici 2.0.1 → 2.0.3

package/lib/index.js

@@ -242,7 +242,7 @@ export async function request(url, opts) {
     dispatcherCache.set(dispatcher, dispatch)
   }
 
-  return new Promise((resolve, reject) =>
+  const res = await new Promise((resolve, reject) =>
     dispatch(
       {
         id: opts.id ?? headers?.['request-id'] ?? headers?.['Request-Id'] ?? genReqId(),
@@ -290,27 +290,23 @@ export async function request(url, opts) {
         onHeaders(statusCode, rawHeaders, resume, statusMessage) {
           const headers = parseHeaders(rawHeaders)
 
-          if (statusCode >= 400) {
-            this.abort(createError(statusCode, { headers }))
-          } else {
-            assert(statusCode >= 200)
+          assert(statusCode >= 200)
 
-            const contentLength = Number(headers['content-length'] ?? headers['Content-Length'])
+          const contentLength = Number(headers['content-length'] ?? headers['Content-Length'])
 
-            this.body = new Readable({
-              resume,
-              abort: this.abort,
-              highWaterMark: this.highWaterMark,
-              statusCode,
-              statusMessage,
-              headers,
-              size: Number.isFinite(contentLength) ? contentLength : null,
-            })
+          this.body = new Readable({
+            resume,
+            abort: this.abort,
+            highWaterMark: this.highWaterMark,
+            statusCode,
+            statusMessage,
+            headers,
+            size: Number.isFinite(contentLength) ? contentLength : null,
+          })
 
-            this.resolve(this.body)
-            this.resolve = null
-            this.reject = null
-          }
+          this.resolve(this.body)
+          this.resolve = null
+          this.reject = null
 
           return false
         },
@@ -332,4 +328,15 @@ export async function request(url, opts) {
       },
     ),
   )
+
+  if (res.statusCode >= 400) {
+    // TODO (fix): Limit the size of the body?
+    const data =
+      res.headers['content-type']?.toLowerCase() === 'application/json'
+        ? await res.json()
+        : await res.text()
+    throw createError(res.statusCode, { headers, data })
+  }
+
+  return res
 }

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

@@ -1,7 +1,61 @@
+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)
+  }
+
+  onData(chunk) {
+    return this.handler.onData(chunk)
+  }
+
+  onComplete(rawTrailers) {
+    return this.handler.onComplete(rawTrailers)
+  }
+
+  onError(err) {
+    return this.handler.onError(err)
+  }
+}
+
 export default (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, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -16,8 +16,8 @@
     "undici": "^5.27.0"
   },
   "devDependencies": {
-    "@types/node": "^20.8.9",
-    "eslint": "^8.52.0",
+    "@types/node": "^20.9.1",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.0",
@@ -27,7 +27,7 @@
     "lint-staged": "^15.0.2",
     "pinst": "^3.0.0",
     "prettier": "^3.0.3",
-    "tap": "^18.4.2"
+    "tap": "^18.6.1"
   },
   "scripts": {
     "prepare": "husky install",