@nxtedition/nxt-undici 2.0.31 → 2.0.33

package/lib/index.js

@@ -185,12 +185,10 @@ export async function request(url, opts) {
           if (statusCode !== 101) {
             this.abort(createError(statusCode, { headers }))
           } else {
-            this.resolve?.({ headers, socket })
+            this.resolve({ headers, socket })
             this.resolve = null
           }
         },
-        onBodySent(chunk) {},
-        onRequestSent() {},
         onHeaders(
           statusCode,
           rawHeaders,
@@ -214,7 +212,7 @@ export async function request(url, opts) {
             size: Number.isFinite(contentLength) ? contentLength : null,
           })
 
-          this.resolve?.(this.body)
+          this.resolve(this.body)
           this.resolve = null
           this.reject = null
 

package/lib/interceptor/cache.js

@@ -18,14 +18,6 @@ class CacheHandler {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
     // NOTE: Only cache 307 respones for now...
     if (statusCode !== 307) {

package/lib/interceptor/log.js

@@ -13,8 +13,6 @@ class Handler {
       start: -1,
       end: -1,
       headers: -1,
-      firstBodySent: -1,
-      lastBodySent: -1,
       firstBodyReceived: -1,
       lastBodyReceived: -1,
     }
@@ -40,20 +38,6 @@ class Handler {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onBodySent(chunk) {
-    if (this.stats.firstBodySent === -1) {
-      this.stats.firstBodySent = performance.now() - this.stats.start
-    }
-
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    this.stats.lastBodySent = performance.now() - this.stats.start
-
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     this.stats.headers = performance.now() - this.stats.start
 

package/lib/interceptor/proxy.js

@@ -31,14 +31,6 @@ class Handler {
     )
   }
 
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     return this.handler.onHeaders(
       statusCode,

package/lib/interceptor/redirect.js

@@ -13,6 +13,8 @@ class Handler {
     this.reason = null
     this.maxCount = Number.isFinite(opts.follow) ? opts.follow : opts.follow?.count ?? 0
 
+    this.headersSent = false
+
     this.count = 0
     this.location = null
 
@@ -38,16 +40,10 @@ class Handler {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusText, headers) {
     if (redirectableStatusCodes.indexOf(statusCode) === -1) {
+      assert(!this.headersSent)
+      this.headersSent = true
       return this.handler.onHeaders(statusCode, rawHeaders, resume, statusText, headers)
     }
 
@@ -65,6 +61,8 @@ class Handler {
 
     if (typeof this.opts.follow === 'function') {
       if (!this.opts.follow(this.location, this.count)) {
+        assert(!this.headersSent)
+        this.headersSent = true
         return this.handler.onHeaders(statusCode, rawHeaders, resume, statusText, headers)
       }
     } else {

package/lib/interceptor/request-content.js

@@ -1,71 +1,53 @@
 import crypto from 'node:crypto'
-import { findHeader } from '../utils.js'
-
-class Handler {
-  constructor(opts, { handler, md5, length }) {
-    this.handler = handler
-    this.md5 = opts.md5 ? md5 : null
-    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)
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket, headers) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
-  }
-
-  onBodySent(chunk) {
-    this.pos += chunk.length
-    this.hasher?.update(chunk)
-
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    const hash = this.hasher?.digest('base64') ?? null
-
-    if (this.length != null && this.pos !== Number(this.length)) {
-      this.abort(
-        Object.assign(new Error('Request Content-Length mismatch'), {
-          expected: Number(this.length),
-          actual: this.pos,
-        }),
-      )
-    }
-
-    if (this.md5 != null && hash !== this.md5) {
-      this.abort(
-        Object.assign(new Error('Request Content-MD5 mismatch'), {
-          expected: this.md5,
-          actual: hash,
-        }),
-      )
-    }
-
-    return this.handler.onRequestSent()
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
-  }
-
-  onData(chunk) {
-    return this.handler.onData(chunk)
-  }
-
-  onComplete(rawTrailers) {
-    return this.handler.onComplete(rawTrailers)
-  }
-
-  onError(err) {
-    return this.handler.onError(err)
+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
   }
 }
 
@@ -74,11 +56,10 @@ export default (dispatch) => (opts, handler) => {
     return dispatch(opts, handler)
   }
 
-  // TODO (fix): case-insensitive check?
-  const md5 = findHeader(opts.headers, 'content-md5')
+  const md5 = opts.md5 ? findHeader(opts.headers, 'content-md5') : null
   const length = findHeader(opts.headers, 'content-length')
 
-  return md5 != null || length != null
-    ? dispatch(opts, new Handler(opts, { handler, md5, length }))
+  return md5 || length
+    ? dispatch({ ...opts, body: getBody(opts.body, { md5, length }) }, handler)
     : dispatch(opts, handler)
 }

package/lib/interceptor/response-content.js

@@ -19,14 +19,6 @@ class Handler {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
     this.md5 = this.opts.md5 ? findHeader(rawHeaders, 'content-md5') : null
     this.length = findHeader(rawHeaders, 'content-length')

package/lib/interceptor/response-error.js

@@ -19,14 +19,6 @@ class Handler {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     if (statusCode >= 400) {
       this.statusCode = statusCode

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

@@ -13,6 +13,8 @@ class Handler {
     this.error = null
     this.etag = null
 
+    this.headersSent = false
+
     this.reason = null
     this.aborted = false
 
@@ -38,14 +40,6 @@ class Handler {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
     const etag = findHeader(rawHeaders, 'etag')
 
@@ -80,6 +74,8 @@ class Handler {
       if (statusCode === 206) {
         const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
         if (!contentRange) {
+          assert(!this.headersSent)
+          this.headersSent = true
           return this.handler.onHeaders(
             statusCode,
             rawHeaders,
@@ -107,6 +103,8 @@ class Handler {
     this.etag = etag
     this.resume = resume
 
+    assert(!this.headersSent)
+    this.headersSent = true
     return this.handler.onHeaders(
       statusCode,
       rawHeaders,

package/lib/interceptor/response-retry.js

@@ -1,3 +1,4 @@
+import assert from 'node:assert'
 import { isDisturbed, retry as retryFn } from '../utils.js'
 
 class Handler {
@@ -6,12 +7,18 @@ class Handler {
     this.handler = handler
     this.opts = opts
 
-    this.hasBody = false
+    this.headersSent = false
     this.count = 0
 
     this.reason = null
     this.aborted = false
 
+    this.statusCode = null
+    this.rawHeaders = null
+    this.resume = null
+    this.statusMessage = null
+    this.headers = null
+
     this.handler.onConnect((reason) => {
       this.aborted = true
       if (this.abort) {
@@ -34,29 +41,34 @@ class Handler {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onRequestSent() {
-    return this.handler.onRequestSent()
-  }
-
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers) {
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
+    this.statusCode = statusCode
+    this.rawHeaders = rawHeaders
+    this.resume = resume
+    this.statusMessage = statusMessage
+    this.headers = headers
+
+    return true
   }
 
   onData(chunk) {
-    this.hasBody = true
+    if (!this.headersSent) {
+      this.sendHeaders()
+    }
+
     return this.handler.onData(chunk)
   }
 
   onComplete(rawTrailers) {
+    if (!this.headersSent) {
+      this.sendHeaders()
+    }
+
     return this.handler.onComplete(rawTrailers)
   }
 
   onError(err) {
-    if (this.aborted || this.hasBody || isDisturbed(this.opts.body)) {
+    if (this.aborted || this.headersSent || isDisturbed(this.opts.body)) {
       return this.handler.onError(err)
     }
 
@@ -79,6 +91,25 @@ class Handler {
         }
       })
   }
+
+  sendHeaders() {
+    assert(!this.headersSent)
+
+    this.headersSent = true
+    this.handler.onHeaders(
+      this.statusCode,
+      this.rawHeaders,
+      this.resume,
+      this.statusMessage,
+      this.headers,
+    )
+
+    this.statusCode = null
+    this.rawHeaders = null
+    this.resume = null
+    this.statusMessage = null
+    this.headers = null
+  }
 }
 
 export default (dispatch) => (opts, handler) => {

package/package.json

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