@nxtedition/nxt-undici 2.0.14 → 2.0.15

package/lib/interceptor/redirect.js

@@ -4,16 +4,34 @@ import { findHeader, isDisturbed, parseURL } from '../utils.js'
 const redirectableStatusCodes = [300, 301, 302, 303, 307, 308]
 
 class Handler {
-  constructor(opts, { dispatch, handler, count = 0 }) {
+  constructor(opts, { dispatch, handler }) {
     this.dispatch = dispatch
     this.handler = handler
     this.opts = opts
-    this.redirectOpts = null
-    this.count = count
+    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
+      }
+    })
   }
 
   onConnect(abort) {
-    return this.handler.onConnect(abort)
+    if (this.aborted) {
+      abort(this.reason)
+    } else {
+      this.abort = abort
+    }
   }
 
   onUpgrade(statusCode, headers, socket) {
@@ -33,42 +51,37 @@ class Handler {
       return this.handler.onHeaders(statusCode, headers, resume, statusText)
     }
 
-    const location = findHeader(headers, 'location')
+    if (isDisturbed(this.opts.body)) {
+      throw new Error(`Disturbed request cannot be redirected.`)
+    }
+
+    this.location = findHeader(headers, 'location')
 
-    if (!location) {
-      // TODO (perf): Consume body?
+    if (!this.location) {
       throw new Error(`Missing redirection location .`)
     }
 
     this.count += 1
 
-    // TODO (feat): follow as function...
-
-    const maxCount = Number.isFinite(this.opts.follow)
-      ? this.opts.follow
-      : Number.isFinite(this.opts.follow?.count)
-        ? this.opts.follow?.count
-        : 0
-
-    if (this.count >= maxCount) {
-      // TODO (perf): Consume body?
-      throw new Error(`Max redirections reached: ${maxCount}.`)
-    }
-
-    if (isDisturbed(this.opts.body)) {
-      // TODO (perf): Consume body?
-      throw new Error(`Disturbed request cannot be redirected.`)
+    if (typeof this.opts.follow === 'function') {
+      if (!this.opts.follow(this.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 { origin, pathname, search } = parseURL(
-      new URL(location, this.opts.origin && new URL(this.opts.path, this.opts.origin)),
+      new URL(this.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.redirectOpts = {
+    this.opts = {
       ...this.opts,
       headers: cleanRequestHeaders(
         this.opts.headers,
@@ -77,17 +90,18 @@ 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.redirectOpts.method !== 'HEAD') {
-      this.redirectOpts = { ...this.redirectOpts, method: 'GET', body: null }
+    if (statusCode === 303 && this.opts.method !== 'HEAD') {
+      this.opts = { ...this.opts, method: 'GET', body: null }
     }
   }
 
   onData(chunk) {
-    if (this.redirectOpts) {
+    if (this.location) {
       /*
         https://tools.ietf.org/html/rfc7231#section-6.4
 
@@ -111,7 +125,7 @@ class Handler {
   }
 
   onComplete(trailers) {
-    if (this.redirectOpts) {
+    if (this.location) {
       /*
         https://tools.ietf.org/html/rfc7231#section-6.4
 
@@ -120,15 +134,10 @@ class Handler {
 
         See comment on onData method above for more detailed informations.
       */
-      this.dispatch(
-        this.redirectOpts,
-        new Handler(this.redirectOpts, {
-          handler: this.handler,
-          dispatch: this.dispatch,
-          count: this.count,
-        }),
-      )
-      this.handler = null
+
+      this.location = null
+
+      this.dispatch(this.opts, this)
     } else {
       return this.handler.onComplete(trailers)
     }
@@ -169,5 +178,5 @@ function cleanRequestHeaders(headers, removeContent, unknownOrigin) {
 
 export default (dispatch) => (opts, handler) =>
   opts.follow != null
-    ? dispatch(opts, new Handler(opts, { handler, dispatch, count: 0 }))
+    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)

package/package.json

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