@nxtedition/nxt-undici 1.0.7 → 1.0.9

package/lib/index.js

@@ -2,7 +2,7 @@ const assert = require('assert')
 const createError = require('http-errors')
 const undici = require('undici')
 const stream = require('stream')
-const { parseHeaders } = require('./utils')
+const { parseHeaders, AbortError } = require('./utils')
 
 const dispatcherCache = new WeakMap()
 
@@ -19,14 +19,53 @@ function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
+const kAbort = Symbol('abort')
+const kStatusCode = Symbol('statusCode')
+const kStatusMessage = Symbol('statusMessage')
+const kHeaders = Symbol('headers')
+const kSize = Symbol('size')
+
 class Readable extends stream.Readable {
-  constructor({ statusCode, statusMessage, headers, size, ...opts }) {
-    super(opts)
-    this.statusCode = statusCode
-    this.statusMessage = statusMessage
-    this.headers = headers
-    this.body = this
-    this.size = size
+  constructor({ statusCode, statusMessage, headers, size, abort, highWaterMark, resume }) {
+    super(highWaterMark ? { highWaterMark } : undefined)
+
+    this[kStatusCode] = statusCode
+    this[kStatusMessage] = statusMessage
+    this[kHeaders] = headers
+    this[kSize] = size
+    this[kAbort] = abort
+
+    this._read = resume
+  }
+
+  get statusCode() {
+    return this[kStatusCode]
+  }
+
+  get statusMessage() {
+    return this[kStatusMessage]
+  }
+
+  get headers() {
+    return this[kHeaders]
+  }
+
+  get size() {
+    return this[kSize]
+  }
+
+  get body() {
+    return this
+  }
+
+  _destroy(err, callback) {
+    if (err == null && !this.readableEnded) {
+      err = new AbortError()
+    }
+
+    this[kAbort](err)
+
+    callback(err)
   }
 
   async text() {
@@ -50,6 +89,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,22 +100,17 @@ class Readable extends stream.Readable {
     return Buffer.concat(buffers)
   }
 
-  async buffer() {
-    return Buffer.from(await this.arrayBuffer())
-  }
-
   async dump() {
     let n = 0
     try {
       for await (const chunk of this) {
-        // do nothing
         n += chunk.length
         if (n > 128 * 1024) {
           break
         }
       }
     } catch {
-      this.destroy()
+      // Do nothing...
     }
   }
 }
@@ -80,7 +118,8 @@ class Readable extends stream.Readable {
 const dispatchers = {
   abort: require('./interceptor/abort.js'),
   catch: require('./interceptor/catch.js'),
-  content: require('./interceptor/content.js'),
+  responseContent: require('./interceptor/response-content.js'),
+  requestContent: require('./interceptor/request-content.js'),
   log: require('./interceptor/log.js'),
   redirect: require('./interceptor/redirect.js'),
   responseBodyRetry: require('./interceptor/response-body-retry.js'),
@@ -154,12 +193,13 @@ 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)
-    dispatch = dispatchers.content(dispatch)
+    dispatch = dispatchers.responseContent(dispatch)
+    dispatch = dispatchers.requestContent(dispatch)
     dispatch = dispatchers.redirect(dispatch)
     dispatch = dispatchers.signal(dispatch)
     dispatch = dispatchers.cache(dispatch)
@@ -210,8 +250,6 @@ async function request(url, opts) {
         },
         onBodySent(chunk) {},
         onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-          assert(this.abort)
-
           const headers = parseHeaders(rawHeaders)
 
           if (statusCode >= 400) {
@@ -222,30 +260,26 @@ async function request(url, opts) {
             const contentLength = Number(headers['content-length'] ?? headers['Content-Length'])
 
             this.body = new Readable({
-              read: resume,
+              resume,
+              abort: this.abort,
               highWaterMark: 128 * 1024,
               statusCode,
               statusMessage,
               headers,
               size: Number.isFinite(contentLength) ? contentLength : null,
-            }).on('error', (err) => {
-              if (this.logger && this.body?.listenerCount('error') === 1) {
-                this.logger.error({ err }, 'unhandled response body error')
-              }
             })
 
             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 +287,7 @@ async function request(url, opts) {
             this.body.destroy(err)
           } else {
             this.reject(err)
+            this.resolve = null
             this.reject = null
           }
         },

package/lib/interceptor/abort.js

@@ -18,6 +18,10 @@ class Handler {
     return this.handler.onBodySent(chunk)
   }
 
+  onRequestSent() {
+    return this.handler.onRequestSent()
+  }
+
   onUpgrade(statusCode, rawHeaders, socket) {
     return this.handler.onUpgrade(statusCode, rawHeaders, socket)
   }

package/lib/interceptor/cache.js

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

package/lib/interceptor/catch.js

@@ -28,6 +28,14 @@ class Handler {
     }
   }
 
+  onRequestSent() {
+    try {
+      return this.handler.onRequestSent()
+    } catch (err) {
+      this.abort(err)
+    }
+  }
+
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     try {
       return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)

package/lib/interceptor/log.js

@@ -34,6 +34,10 @@ class Handler {
     return this.handler.onBodySent(chunk)
   }
 
+  onRequestSent() {
+    return this.handler.onRequestSent()
+  }
+
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     this.logger.debug(
       {

package/lib/interceptor/proxy.js

@@ -35,6 +35,10 @@ class Handler {
     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

@@ -42,6 +42,10 @@ class Handler {
     return this.handler.onBodySent(chunk)
   }
 
+  onRequestSent() {
+    return this.handler.onRequestSent()
+  }
+
   onError(error) {
     return this.handler.onError(error)
   }

package/lib/interceptor/request-content.js

@@ -0,0 +1,76 @@
+const crypto = require('node:crypto')
+
+class Handler {
+  constructor(opts, { handler, md5, length }) {
+    this.handler = handler
+    this.md5 = md5
+    this.length = length
+    this.hasher = this.md5 ? crypto.createHash('md5') : null
+    this.pos = 0
+  }
+
+  onConnect(abort) {
+    return this.handler.onConnect(abort)
+  }
+
+  onUpgrade(statusCode, rawHeaders, socket) {
+    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
+  }
+
+  onBodySent(chunk) {
+    this.pos += chunk.length
+    this.hasher?.update(chunk)
+    return this.handler.onBodySent(chunk)
+  }
+
+  onRequestSent() {
+    const hash = this.hasher?.digest('base64')
+    if (this.md5 != null && hash !== this.md5) {
+      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'), {
+          expected: Number(this.length),
+          actual: this.pos,
+        }),
+      )
+    }
+    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) {
+    this.handler.onError(err)
+  }
+}
+
+module.exports = (dispatch) => (opts, handler) => {
+  if (opts.upgrade) {
+    return dispatch(opts, handler)
+  }
+
+  // TODO (fix): case-insensitive check?
+  const md5 = opts.headers?.['content-md5'] ?? opts.headers?.['Content-MD5']
+  const length = opts.headers?.['content-lenght'] ?? opts.headers?.['Content-Length']
+
+  return md5 != null || length != null
+    ? dispatch(opts, new Handler(opts, { handler, md5, length }))
+    : dispatch(opts, handler)
+}

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

@@ -44,6 +44,10 @@ class Handler {
     return this.handler.onBodySent(chunk)
   }
 
+  onRequestSent() {
+    return this.handler.onRequestSent()
+  }
+
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     const etag = findHeader(rawHeaders, 'etag')
 
@@ -116,7 +120,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-content.js

@@ -0,0 +1,69 @@
+const crypto = require('node:crypto')
+const { findHeader } = require('../utils')
+
+class Handler {
+  constructor(opts, { handler }) {
+    this.handler = handler
+    this.md5 = null
+    this.length = null
+    this.hasher = null
+    this.pos = 0
+  }
+
+  onConnect(abort) {
+    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) {
+    this.md5 = findHeader(rawHeaders, 'content-md5')
+    this.length = findHeader(rawHeaders, 'content-length')
+    this.hasher = this.md5 != null ? crypto.createHash('md5') : null
+    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+  }
+
+  onData(chunk) {
+    this.pos += chunk.length
+    this.hasher?.update(chunk)
+    return this.handler.onData(chunk)
+  }
+
+  onComplete(rawTrailers) {
+    const hash = this.hasher?.digest('base64')
+    if (this.md5 != null && hash !== this.md5) {
+      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'), {
+          expected: Number(this.length),
+          actual: this.pos,
+        }),
+      )
+    }
+    return this.handler.onComplete(rawTrailers)
+  }
+
+  onError(err) {
+    this.handler.onError(err)
+  }
+}
+
+module.exports = (dispatch) => (opts, handler) =>
+  !opts.upgrade ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)

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
@@ -38,8 +39,12 @@ class Handler {
     return this.handler.onBodySent(chunk)
   }
 
+  onRequestSent() {
+    return this.handler.onRequestSent()
+  }
+
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    this.aborted = true
+    this.statusCode = statusCode
     return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
   }
 
@@ -52,11 +57,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

@@ -39,6 +39,10 @@ class Handler {
     return this.handler.onBodySent(chunk)
   }
 
+  onRequestSent() {
+    return this.handler.onRequestSent()
+  }
+
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     if (statusCode < 400) {
       return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
@@ -46,7 +50,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.7",
+  "version": "1.0.9",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",

package/lib/interceptor/content.js

@@ -1,141 +0,0 @@
-const crypto = require('node:crypto')
-const stream = require('node:stream')
-const { findHeader, isStream } = require('../utils')
-
-class Handler {
-  constructor(opts, { handler }) {
-    this.handler = handler
-    this.md5 = null
-    this.length = null
-    this.hasher = null
-    this.pos = 0
-  }
-
-  onConnect(abort) {
-    return this.handler.onConnect(abort)
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    return this.handler.onUpgrade(statusCode, rawHeaders, socket)
-  }
-
-  onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
-  }
-
-  onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    this.md5 = findHeader(rawHeaders, 'content-md5')
-    this.length = findHeader(rawHeaders, 'content-length')
-    this.hasher = this.md5 != null ? crypto.createHash('md5') : null
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
-  }
-
-  onData(chunk) {
-    this.pos += chunk.length
-    this.hasher?.update(chunk)
-    return this.handler.onData(chunk)
-  }
-
-  onComplete(rawTrailers) {
-    const hash = this.hasher?.digest('base64')
-    if (this.md5 != null && hash !== this.md5) {
-      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'), {
-          expected: Number(this.length),
-          actual: this.pos,
-        }),
-      )
-    }
-    return this.handler.onComplete(rawTrailers)
-  }
-
-  onError(err) {
-    this.handler.onError(err)
-  }
-}
-
-module.exports = (dispatch) => (opts, handler) => {
-  if (opts.upgrade) {
-    return dispatch(opts, handler)
-  }
-
-  // TODO (fix): case-insensitive check?
-  const md5 = opts.headers?.['content-md5'] ?? opts.headers?.['Content-MD5']
-  const length = opts.headers?.['content-lenght'] ?? opts.headers?.['Content-Length']
-
-  if (md5 == null && length == null) {
-    return dispatch(opts, new Handler(opts, { handler }))
-  }
-
-  if (isStream(opts.body)) {
-    const hasher = md5 ? crypto.createHash('md5') : null
-    let pos = 0
-
-    opts = {
-      ...opts,
-      body: stream.pipeline(
-        opts.body,
-        new stream.Transform({
-          transform(chunk, encoding, callback) {
-            pos += chunk.length
-            hasher?.update(chunk)
-            callback(null, chunk)
-          },
-          final(callback) {
-            const hash = hasher?.digest('base64')
-            if (md5 != null && hash !== md5) {
-              callback(
-                Object.assign(new Error('Request Content-MD5 mismatch'), {
-                  expected: md5,
-                  actual: hash,
-                }),
-              )
-            } else if (length != null && pos !== Number(length)) {
-              callback(
-                Object.assign(new Error('Request Content-Length mismatch'), {
-                  expected: Number(length),
-                  actual: pos,
-                }),
-              )
-            } else {
-              callback(null)
-            }
-          },
-        }),
-        () => {},
-      ),
-    }
-  } else if (opts.body instanceof Buffer || typeof opts.body === 'string') {
-    const buf = Buffer.from(opts.body)
-    const hasher = md5 ? crypto.createHash('md5') : null
-
-    const hash = hasher?.update(buf).digest('base64')
-    const pos = buf.length
-
-    if (md5 != null && hash !== md5) {
-      throw Object.assign(new Error('Request Content-MD5 mismatch'), {
-        expected: md5,
-        actual: hash,
-      })
-    }
-
-    if (length != null && pos !== Number(length)) {
-      throw Object.assign(new Error('Request Content-Length mismatch'), {
-        expected: Number(length),
-        actual: pos,
-      })
-    }
-  } else {
-    throw new Error('not implemented')
-  }
-
-  return dispatch(opts, new Handler(opts, { handler }))
-}