@nxtedition/nxt-undici 2.0.7 → 2.0.9

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,
-  catch: (await import('./interceptor/catch.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,
@@ -223,7 +222,6 @@ export async function request(url, opts) {
   let dispatch = dispatcherCache.get(dispatcher)
   if (dispatch == null) {
     dispatch = (opts, handler) => dispatcher.dispatch(opts, handler)
-    dispatch = dispatchers.catch(dispatch)
     dispatch = dispatchers.requestBodyFactory(dispatch)
     dispatch = dispatchers.log(dispatch)
     dispatch = dispatchers.requestId(dispatch)
@@ -250,7 +248,6 @@ export async function request(url, opts) {
         headers,
         origin: url.origin,
         path: url.path ?? (url.search ? `${url.pathname}${url.search ?? ''}` : url.pathname),
-        query: opts.query,
         reset: opts.reset ?? false,
         blocking: opts.blocking ?? false,
         headersTimeout: opts.headersTimeout,

package/lib/interceptor/log.js

@@ -24,7 +24,8 @@ class Handler {
     this.abort = abort
     this.stats.start = performance.now()
     this.logger.debug({ ureq: this.opts }, 'upstream request started')
-    this.handler.onConnect((reason) => {
+
+    return this.handler.onConnect((reason) => {
       this.aborted = true
       this.abort(reason)
     })
@@ -35,6 +36,7 @@ class Handler {
     socket.on('close', () => {
       this.logger.debug('upstream request socket closed')
     })
+
     return this.handler.onUpgrade(statusCode, rawHeaders, socket)
   }
 
@@ -62,6 +64,7 @@ class Handler {
       },
       'upstream request response',
     )
+
     return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
   }
 
@@ -71,6 +74,7 @@ class Handler {
     }
 
     this.pos += chunk.length
+
     return this.handler.onData(chunk)
   }
 
@@ -82,6 +86,7 @@ class Handler {
       { bytesRead: this.pos, elapsedTime: this.stats.end, stats: this.stats },
       'upstream request completed',
     )
+
     return this.handler.onComplete(rawTrailers)
   }
 

package/lib/interceptor/redirect.js

@@ -4,34 +4,16 @@ import { findHeader, isDisturbed, parseURL } from '../utils.js'
 const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 
 class Handler {
-  constructor(opts, { dispatch, handler }) {
+  constructor(opts, { dispatch, handler, count = 0 }) {
     this.dispatch = dispatch
     this.handler = handler
     this.opts = opts
-    this.abort = null
-    this.aborted = false
-    this.reason = null
-    this.maxCount = Number.isFinite(opts.follow) ? opts.follow : opts.follow?.count ?? 0
-
-    this.count = 0
-    this.location = null
-
-    this.handler.onConnect((reason) => {
-      this.aborted = true
-      if (this.abort) {
-        this.abort(reason)
-      } else {
-        this.reason = reason
-      }
-    })
+    this.redirectOpts = null
+    this.count = count
   }
 
   onConnect(abort) {
-    if (this.aborted) {
-      abort(this.reason)
-    } else {
-      this.abort = abort
-    }
+    return this.handler.onConnect(abort)
   }
 
   onUpgrade(statusCode, headers, socket) {
@@ -46,10 +28,6 @@ class Handler {
     return this.handler.onRequestSent()
   }
 
-  onError(error) {
-    return this.handler.onError(error)
-  }
-
   onHeaders(statusCode, headers, resume, statusText) {
     if (redirectableStatusCodes.indexOf(statusCode) === -1) {
       return this.handler.onHeaders(statusCode, headers, resume, statusText)
@@ -59,33 +37,36 @@ class Handler {
       throw new Error(`Disturbed request cannot be redirected.`)
     }
 
-    this.location = findHeader(headers, 'location')
+    const location = findHeader(headers, 'location')
 
-    if (!this.location) {
+    if (!location) {
       throw new Error(`Missing redirection location .`)
     }
 
     this.count += 1
 
     if (typeof this.opts.follow === 'function') {
-      if (!this.opts.follow(this.location, this.count)) {
+      if (!this.opts.follow(location, this.count)) {
         return this.handler.onHeaders(statusCode, headers, resume, statusText)
       }
     } else {
-      if (this.count >= this.maxCount) {
-        throw new Error(`Max redirections reached: ${this.maxCount}.`)
+      const maxCount = Number.isFinite(this.opts.follow)
+        ? this.opts.follow
+        : this.opts.follow?.count ?? 0
+      if (this.count >= maxCount) {
+        throw new Error(`Max redirections reached: ${maxCount}.`)
       }
     }
 
     const { origin, pathname, search } = parseURL(
-      new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)),
+      new URL(location, this.opts.origin && new URL(this.opts.path, this.opts.origin)),
     )
     const path = search ? `${pathname}${search}` : pathname
 
     // Remove headers referring to the original URL.
     // By default it is Host only, unless it's a 303 (see below), which removes also all Content-* headers.
     // https://tools.ietf.org/html/rfc7231#section-6.4
-    this.opts = {
+    this.redirectOpts = {
       ...this.opts,
       headers: cleanRequestHeaders(
         this.opts.headers,
@@ -94,18 +75,17 @@ class Handler {
       ),
       path,
       origin,
-      query: null,
     }
 
     // https://tools.ietf.org/html/rfc7231#section-6.4.4
     // In case of HTTP 303, always replace method to be either HEAD or GET
-    if (statusCode === 303 && this.opts.method !== 'HEAD') {
-      this.opts = { ...this.opts, method: 'GET', body: null }
+    if (statusCode === 303 && this.redirectOpts.method !== 'HEAD') {
+      this.redirectOpts = { ...this.redirectOpts, method: 'GET', body: null }
     }
   }
 
   onData(chunk) {
-    if (this.location) {
+    if (this.redirectOpts) {
       /*
         https://tools.ietf.org/html/rfc7231#section-6.4
 
@@ -129,7 +109,7 @@ class Handler {
   }
 
   onComplete(trailers) {
-    if (this.location) {
+    if (this.redirectOpts) {
       /*
         https://tools.ietf.org/html/rfc7231#section-6.4
 
@@ -138,14 +118,22 @@ class Handler {
 
         See comment on onData method above for more detailed informations.
       */
-
-      this.location = null
-
-      this.dispatch(this.opts, this)
+      this.dispatch(
+        this.redirectOpts,
+        new Handler(this.redirectOpts, {
+          handler: this.handler,
+          dispatch: this.dispatch,
+          count: this.count,
+        }),
+      )
     } else {
       return this.handler.onComplete(trailers)
     }
   }
+
+  onError(error) {
+    return this.handler.onError(error)
+  }
 }
 
 // https://tools.ietf.org/html/rfc7231#section-6.4.4
@@ -178,5 +166,5 @@ function cleanRequestHeaders(headers, removeContent, unknownOrigin) {
 
 export default (dispatch) => (opts, handler) =>
   opts.follow != null
-    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
+    ? dispatch(opts, new Handler(opts, { handler, dispatch, count: 0 }))
     : dispatch(opts, handler)

package/lib/interceptor/request-content.js

@@ -12,6 +12,7 @@ class Handler {
 
   onConnect(abort) {
     this.abort = abort
+
     return this.handler.onConnect(abort)
   }
 
@@ -22,6 +23,7 @@ class Handler {
   onBodySent(chunk) {
     this.pos += chunk.length
     this.hasher?.update(chunk)
+
     return this.handler.onBodySent(chunk)
   }
 
@@ -62,7 +64,7 @@ class Handler {
   }
 
   onError(err) {
-    this.handler.onError(err)
+    return this.handler.onError(err)
   }
 }
 

package/lib/interceptor/response-content.js

@@ -30,12 +30,14 @@ class Handler {
     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)
   }
 

package/lib/interceptor/signal.js

@@ -6,13 +6,12 @@ class Handler {
   }
 
   onConnect(abort) {
-    this.abort = () => abort(this.signal.reason)
-
-    this.signal.addEventListener('abort', this.abort)
-
     if (this.signal.aborted) {
       abort(this.signal.reason)
     } else {
+      this.abort = () => abort(this.signal.reason)
+      this.signal.addEventListener('abort', this.abort)
+
       this.handler.onConnect(abort)
     }
   }
@@ -41,6 +40,7 @@ class Handler {
     if (this.abort) {
       this.signal.removeEventListener('abort', this.abort)
     }
+
     return this.handler.onComplete(rawTrailers)
   }
 
@@ -48,6 +48,7 @@ class Handler {
     if (this.abort) {
       this.signal.removeEventListener('abort', this.abort)
     }
+
     return this.handler.onError(err)
   }
 }

package/package.json

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

package/lib/interceptor/catch.js

@@ -1,71 +0,0 @@
-class Handler {
-  constructor(opts, { handler }) {
-    this.handler = handler
-  }
-
-  onConnect(abort) {
-    this.abort = abort
-    try {
-      return this.handler.onConnect(abort)
-    } catch (err) {
-      this.abort(err)
-    }
-  }
-
-  onUpgrade(statusCode, rawHeaders, socket) {
-    try {
-      return this.handler.onUpgrade(statusCode, rawHeaders, socket)
-    } catch (err) {
-      this.abort(err)
-    }
-  }
-
-  onBodySent(chunk) {
-    try {
-      return this.handler.onBodySent(chunk)
-    } catch (err) {
-      this.abort(err)
-    }
-  }
-
-  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)
-    } catch (err) {
-      this.abort(err)
-      return false
-    }
-  }
-
-  onData(chunk) {
-    try {
-      return this.handler.onData(chunk)
-    } catch (err) {
-      this.abort(err)
-      return false
-    }
-  }
-
-  onComplete(rawTrailers) {
-    try {
-      return this.handler.onComplete(rawTrailers)
-    } catch (err) {
-      this.abort(err)
-      return false
-    }
-  }
-
-  onError(err) {
-    return this.handler.onError(err)
-  }
-}
-
-export default (dispatch) => (opts, handler) => dispatch(opts, new Handler(opts, { handler }))