@nxtedition/nxt-undici 1.0.6 → 1.0.8

package/lib/index.js

@@ -50,6 +50,10 @@ class Readable extends stream.Readable {
   }
 
   async arrayBuffer() {
+    return (await this.buffer()).buffer
+  }
+
+  async buffer() {
     const buffers = []
     for await (const chunk of this) {
       buffers.push(chunk)
@@ -57,10 +61,6 @@ class Readable extends stream.Readable {
     return Buffer.concat(buffers)
   }
 
-  async buffer() {
-    return Buffer.from(await this.arrayBuffer())
-  }
-
   async dump() {
     let n = 0
     try {
@@ -154,8 +154,8 @@ async function request(url, opts) {
     dispatch = (opts, handler) => dispatcher.dispatch(opts, handler)
     dispatch = dispatchers.catch(dispatch)
     dispatch = dispatchers.abort(dispatch)
-    dispatch = dispatchers.log(dispatch)
     dispatch = dispatchers.requestId(dispatch)
+    dispatch = dispatchers.log(dispatch)
     dispatch = dispatchers.responseRetry(dispatch)
     dispatch = dispatchers.responseStatusRetry(dispatch)
     dispatch = dispatchers.responseBodyRetry(dispatch)
@@ -170,7 +170,7 @@ async function request(url, opts) {
   return new Promise((resolve, reject) =>
     dispatch(
       {
-        id: opts.id ?? genReqId(),
+        id: opts.id ?? headers?.['request-id'] ?? headers?.['Request-Id'] ?? genReqId(),
         url,
         method,
         body: opts.body,
@@ -210,8 +210,6 @@ async function request(url, opts) {
         },
         onBodySent(chunk) {},
         onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-          assert(this.abort)
-
           const headers = parseHeaders(rawHeaders)
 
           if (statusCode >= 400) {
@@ -236,16 +234,15 @@ async function request(url, opts) {
 
             this.resolve(this.body)
             this.resolve = null
+            this.reject = null
           }
 
           return false
         },
         onData(chunk) {
-          assert(this.body)
           return this.body.push(chunk)
         },
         onComplete() {
-          assert(this.body)
           this.body.push(null)
         },
         onError(err) {
@@ -253,6 +250,7 @@ async function request(url, opts) {
             this.body.destroy(err)
           } else {
             this.reject(err)
+            this.resolve = null
             this.reject = null
           }
         },

package/lib/interceptor/response-body-retry.js

@@ -116,7 +116,6 @@ class Handler {
       return this.handler.onError(err)
     }
 
-    // TODO (fix): abort signal?
     const retryPromise = retryFn(err, this.retryCount++, this.opts)
     if (retryPromise == null) {
       return this.handler.onError(err)

package/lib/interceptor/response-retry.js

@@ -8,6 +8,7 @@ class Handler {
     this.abort = null
     this.aborted = false
     this.reason = null
+    this.statusCode = 0
 
     this.retryCount = 0
     this.retryPromise = null
@@ -39,7 +40,7 @@ class Handler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    this.aborted = true
+    this.statusCode = statusCode
     return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
   }
 
@@ -52,11 +53,10 @@ class Handler {
   }
 
   onError(err) {
-    if (this.aborted || isDisturbed(this.opts.body)) {
+    if (this.aborted || this.statusCode || isDisturbed(this.opts.body)) {
       return this.handler.onError(err)
     }
 
-    // TODO (fix): abort signal?
     const retryPromise = retryFn(err, this.retryCount++, this.opts)
     if (retryPromise == null) {
       return this.handler.onError(err)

package/lib/interceptor/response-status-retry.js

@@ -46,7 +46,6 @@ class Handler {
 
     const err = createError(statusCode, { headers: parseHeaders(rawHeaders) })
 
-    // TODO (fix): abort signal?
     const retryPromise = retryFn(err, this.retryCount++, this.opts)
     if (retryPromise == null) {
       return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)

package/package.json

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