@nxtedition/nxt-undici 2.0.3 → 2.0.5

package/lib/index.js

@@ -129,7 +129,6 @@ class Readable extends stream.Readable {
 const dispatchers = {
   requestBody: (await import('./interceptor/request-body.js')).default,
   requestBodyFactory: (await import('./interceptor/request-body-factory.js')).default,
-  abort: (await import('./interceptor/abort.js')).default,
   catch: (await import('./interceptor/catch.js')).default,
   responseContent: (await import('./interceptor/response-content.js')).default,
   requestContent: (await import('./interceptor/request-content.js')).default,
@@ -227,8 +226,8 @@ export async function request(url, opts) {
     dispatch = dispatchers.catch(dispatch)
     dispatch = dispatchers.requestBodyFactory(dispatch)
     dispatch = dispatchers.abort(dispatch)
-    dispatch = dispatchers.requestId(dispatch)
     dispatch = dispatchers.log(dispatch)
+    dispatch = dispatchers.requestId(dispatch)
     dispatch = dispatchers.responseRetry(dispatch)
     dispatch = dispatchers.responseStatusRetry(dispatch)
     dispatch = dispatchers.responseBodyRetry(dispatch)
@@ -329,7 +328,9 @@ export async function request(url, opts) {
     ),
   )
 
-  if (res.statusCode >= 400) {
+  if (method === 'HEAD') {
+    await res.dump()
+  } else if (res.statusCode >= 400) {
     // TODO (fix): Limit the size of the body?
     const data =
       res.headers['content-type']?.toLowerCase() === 'application/json'

package/lib/interceptor/log.js

@@ -7,7 +7,7 @@ class Handler {
     this.opts = opts
     this.abort = null
     this.aborted = false
-    this.logger = opts.logger.child({ ureq: opts })
+    this.logger = opts.logger.child({ ureq: { id: opts.id } })
     this.pos = 0
     this.stats = {
       start: -1,
@@ -23,7 +23,7 @@ class Handler {
   onConnect(abort) {
     this.abort = abort
     this.stats.start = performance.now()
-    this.logger.debug('upstream request started')
+    this.logger.debug({ ureq: this.opts }, 'upstream request started')
     this.handler.onConnect((reason) => {
       this.aborted = true
       this.abort(reason)
@@ -99,6 +99,7 @@ class Handler {
         'upstream request failed',
       )
     }
+
     return this.handler.onError(err)
   }
 }

package/lib/interceptor/request-content.js

@@ -7,9 +7,11 @@ class Handler {
     this.length = length
     this.hasher = this.md5 ? crypto.createHash('md5') : null
     this.pos = 0
+    this.abort = null
   }
 
   onConnect(abort) {
+    this.abort = abort
     return this.handler.onConnect(abort)
   }
 
@@ -25,22 +27,25 @@ class Handler {
 
   onRequestSent() {
     const hash = this.hasher?.digest('base64')
+
     if (this.md5 != null && hash !== this.md5) {
-      this.handler.onError(
+      this.abort(
         Object.assign(new Error('Request Content-Length mismatch'), {
           expected: this.md5,
           actual: hash,
         }),
       )
     }
+
     if (this.length != null && this.pos !== Number(this.length)) {
-      return this.handler.onError(
+      this.abort(
         Object.assign(new Error('Request Content-Length mismatch'), {
           expected: Number(this.length),
           actual: this.pos,
         }),
       )
     }
+
     return this.handler.onRequestSent()
   }
 

package/lib/interceptor/response-content.js

@@ -41,14 +41,16 @@ class Handler {
 
   onComplete(rawTrailers) {
     const hash = this.hasher?.digest('base64')
+
     if (this.md5 != null && hash !== this.md5) {
-      this.handler.onError(
+      return this.handler.onError(
         Object.assign(new Error('Request Content-Length mismatch'), {
           expected: this.md5,
           actual: hash,
         }),
       )
     }
+
     if (this.length != null && this.pos !== Number(this.length)) {
       return this.handler.onError(
         Object.assign(new Error('Request Content-Length mismatch'), {
@@ -57,6 +59,7 @@ class Handler {
         }),
       )
     }
+
     return this.handler.onComplete(rawTrailers)
   }
 

package/package.json

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

package/lib/interceptor/abort.js

@@ -1,72 +0,0 @@
-import { AbortError } from '../utils.js'
-
-class Handler {
-  constructor(opts, { handler }) {
-    this.opts = opts
-    this.handler = handler
-    this.pos = 0
-    this.reason = null
-  }
-
-  onConnect(abort) {
-    this.abort = abort
-    this.handler.onConnect((reason) => {
-      this.reason = reason ?? new AbortError()
-    })
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    if (this.reason == null) {
-      const ret = this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
-      if (this.reason == null) {
-        return ret
-      }
-    }
-
-    return true
-  }
-
-  onData(chunk) {
-    if (this.reason == null) {
-      const ret = this.handler.onData(chunk)
-      if (this.reason == null) {
-        return ret
-      }
-    }
-
-    this.pos += chunk.length
-    if (this.pos < 128 * 1024) {
-      return true
-    }
-
-    this.abort(this.reason)
-
-    return false
-  }
-
-  onComplete(rawTrailers) {
-    return this.onFinally(this.reason, rawTrailers)
-  }
-
-  onError(err) {
-    return this.onFinally(err)
-  }
-
-  onFinally(err, rawTrailers) {
-    return err == null ? this.handler.onComplete(rawTrailers) : this.handler.onError(err)
-  }
-}
-
-export default (dispatch) => (opts, handler) => dispatch(opts, new Handler(opts, { handler }))