@nxtedition/nxt-undici 2.0.34 → 2.0.36

package/lib/index.js

@@ -24,7 +24,6 @@ const dispatchers = {
   responseError: (await import('./interceptor/response-error.js')).default,
   requestBodyFactory: (await import('./interceptor/request-body-factory.js')).default,
   responseContent: (await import('./interceptor/response-content.js')).default,
-  requestContent: (await import('./interceptor/request-content.js')).default,
   log: (await import('./interceptor/log.js')).default,
   redirect: (await import('./interceptor/redirect.js')).default,
   responseRetry: (await import('./interceptor/response-retry.js')).default,
@@ -126,7 +125,6 @@ export async function request(url, opts) {
     dispatch = dispatchers.responseRetry(dispatch)
     dispatch = dispatchers.responseRetryBody(dispatch)
     dispatch = dispatchers.responseContent(dispatch)
-    dispatch = dispatchers.requestContent(dispatch)
     dispatch = dispatchers.cache(dispatch)
     dispatch = dispatchers.redirect(dispatch)
     dispatch = dispatchers.proxy(dispatch)

package/lib/interceptor/log.js

@@ -79,12 +79,24 @@ class Handler {
 
     if (this.aborted) {
       this.logger.debug(
-        { bytesRead: this.pos, elapsedTime: this.stats.end, stats: this.stats, err },
+        {
+          ureq: this.opts,
+          bytesRead: this.pos,
+          elapsedTime: this.stats.end,
+          stats: this.stats,
+          err,
+        },
         'upstream request aborted',
       )
     } else {
       this.logger.error(
-        { ureq: this.opts, bytesRead: this.pos, elapsedTime: this.stats.end, err },
+        {
+          ureq: this.opts,
+          bytesRead: this.pos,
+          elapsedTime: this.stats.end,
+          stats: this.stats,
+          err,
+        },
         'upstream request failed',
       )
     }

package/lib/interceptor/redirect.js

@@ -51,7 +51,7 @@ class Handler {
       throw new Error(`Disturbed request cannot be redirected.`)
     }
 
-    this.location = findHeader(rawHeaders, 'location')
+    this.location = headers ? headers.location : findHeader(rawHeaders, 'location')
 
     if (!this.location) {
       throw new Error(`Missing redirection location .`)

package/lib/interceptor/response-content.js

@@ -20,8 +20,8 @@ class Handler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
-    this.md5 = this.opts.md5 ? findHeader(rawHeaders, 'content-md5') : null
-    this.length = findHeader(rawHeaders, 'content-length')
+    this.md5 = headers ? headers['content-md5'] : findHeader(rawHeaders, 'content-md5')
+    this.length = headers ? headers['content-length'] : findHeader(rawHeaders, 'content-length')
     this.hasher = this.md5 != null ? crypto.createHash('md5') : null
 
     return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)

package/lib/interceptor/response-error.js

@@ -23,7 +23,7 @@ class Handler {
     if (statusCode >= 400) {
       this.statusCode = statusCode
       this.headers = headers
-      this.contentType = findHeader(rawHeaders, 'content-type')
+      this.contentType = headers ? headers['content-type'] : findHeader(rawHeaders, 'content-type')
       if (this.contentType === 'application/json' || this.contentType === 'text/plain') {
         this.decoder = new TextDecoder('utf-8')
         this.body = ''

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

@@ -41,7 +41,7 @@ class Handler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
-    const etag = findHeader(rawHeaders, 'etag')
+    const etag = headers ? headers.etag : findHeader(rawHeaders, 'etag')
 
     if (this.resume) {
       this.resume = null
@@ -56,7 +56,9 @@ class Handler {
         throw this.error
       }
 
-      const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
+      const contentRange = parseContentRange(
+        headers ? headers['content-range'] : findHeader(rawHeaders, 'content-range'),
+      )
       if (!contentRange) {
         throw this.error
       }
@@ -72,7 +74,9 @@ class Handler {
 
     if (this.end == null) {
       if (statusCode === 206) {
-        const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
+        const contentRange = parseContentRange(
+          headers ? headers['content-range'] : findHeader(rawHeaders, 'content-range'),
+        )
         if (!contentRange) {
           assert(!this.headersSent)
           this.headersSent = true
@@ -90,7 +94,9 @@ class Handler {
         this.end = end
         this.pos = Number(start)
       } else {
-        const contentLength = findHeader(rawHeaders, 'content-length')
+        const contentLength = headers
+          ? headers['content-length']
+          : findHeader(rawHeaders, 'content-length')
         if (contentLength) {
           this.end = Number(contentLength)
         }

package/package.json

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

package/lib/interceptor/request-content.js

@@ -1,65 +0,0 @@
-import crypto from 'node:crypto'
-import { Transform, pipeline, Readable } from 'node:stream'
-import { findHeader, isBuffer, isStream } from '../utils.js'
-
-function getBody(body, opts) {
-  if (body == null) {
-    return getBody(Readable.from([]), opts)
-  } else if (typeof body === 'string') {
-    return getBody(Readable.from([Buffer.from(body)]), opts)
-  } else if (isBuffer(body)) {
-    return getBody(Readable.from([body]), opts)
-  } else if (typeof body === 'function') {
-    return async (...args) => getBody(await body(...args), opts)
-  } else if (isStream(body)) {
-    const hasher = opts.md5 ? crypto.createHash('md5') : null
-    let pos = 0
-    body = pipeline(
-      body,
-      new Transform({
-        transform(chunk, encoding, callback) {
-          pos += chunk.length
-          this.push(chunk)
-          hasher?.update(chunk, encoding)
-          callback()
-        },
-        flush(callback) {
-          const hash = hasher?.digest('base64') ?? null
-
-          if (opts.length != null && pos !== Number(opts.length)) {
-            callback(
-              Object.assign(new Error('Request Content-Length mismatch'), {
-                expected: Number(opts.length),
-                actual: pos,
-              }),
-            )
-          } else if (opts.md5 != null && hash !== opts.md5) {
-            callback(
-              Object.assign(new Error('Request Content-MD5 mismatch'), {
-                expected: opts.md5,
-                actual: hash,
-              }),
-            )
-          } else {
-            callback(null)
-          }
-        },
-      }),
-    )
-  } else {
-    return body
-  }
-}
-
-export default (dispatch) => (opts, handler) => {
-  if (opts.upgrade) {
-    return dispatch(opts, handler)
-  }
-
-  const md5 = opts.md5 ? findHeader(opts.headers, 'content-md5') : null
-  const length = findHeader(opts.headers, 'content-length')
-
-  return md5 || length
-    ? dispatch({ ...opts, body: getBody(opts.body, { md5, length }) }, handler)
-    : dispatch(opts, handler)
-}