@nxtedition/nxt-undici 1.0.5 → 1.0.7

package/lib/index.js

@@ -6,6 +6,19 @@ const { parseHeaders } = require('./utils')
 
 const dispatcherCache = new WeakMap()
 
+// https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
+// 2,147,483,647 (2^31 − 1) stands for max SMI value (an internal optimization of V8).
+// With this upper bound, if you'll be generating 1k ids/sec, you're going to hit it in ~25 days.
+// This is very likely to happen in real-world applications, hence the limit is enforced.
+// Growing beyond this value will make the id generation slower and cause a deopt.
+// In the worst cases, it will become a float, losing accuracy.
+const maxInt = 2147483647
+let nextReqId = Math.floor(Math.random() * maxInt)
+function genReqId() {
+  nextReqId = (nextReqId + 1) & maxInt
+  return `req-${nextReqId.toString(36)}`
+}
+
 class Readable extends stream.Readable {
   constructor({ statusCode, statusMessage, headers, size, ...opts }) {
     super(opts)
@@ -157,7 +170,7 @@ async function request(url, opts) {
   return new Promise((resolve, reject) =>
     dispatch(
       {
-        id: opts.id,
+        id: opts.id ?? headers?.['request-id'] ?? headers?.['Request-Id'] ?? genReqId(),
         url,
         method,
         body: opts.body,
@@ -174,7 +187,7 @@ async function request(url, opts) {
         proxy: opts.proxy,
         cache: opts.cache,
         upgrade: opts.upgrade,
-        follow: opts.follow ?? 3,
+        follow: opts.follow ?? 8,
         logger: opts.logger,
       },
       {

package/lib/interceptor/redirect.js

@@ -11,6 +11,7 @@ class Handler {
     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
@@ -67,9 +68,8 @@ class Handler {
         return this.handler.onHeaders(statusCode, headers, resume, statusText)
       }
     } else {
-      const maxCount = this.opts.follow.count ?? 0
-      if (this.count >= maxCount) {
-        throw new Error(`Max redirections reached: ${maxCount}.`)
+      if (this.count >= this.maxCount) {
+        throw new Error(`Max redirections reached: ${this.maxCount}.`)
       }
     }
 
@@ -158,17 +158,12 @@ function shouldRemoveHeader(header, removeContent, unknownOrigin) {
 
 // https://tools.ietf.org/html/rfc7231#section-6.4
 function cleanRequestHeaders(headers, removeContent, unknownOrigin) {
-  const ret = []
-  if (Array.isArray(headers)) {
-    for (let i = 0; i < headers.length; i += 2) {
-      if (!shouldRemoveHeader(headers[i], removeContent, unknownOrigin)) {
-        ret.push(headers[i], headers[i + 1])
-      }
-    }
-  } else if (headers && typeof headers === 'object') {
+  let ret
+  if (headers && typeof headers === 'object') {
     for (const key of Object.keys(headers)) {
       if (!shouldRemoveHeader(key, removeContent, unknownOrigin)) {
-        ret.push(key, headers[key])
+        ret ??= {}
+        ret[key] = headers[key]
       }
     }
   } else {
@@ -178,4 +173,6 @@ function cleanRequestHeaders(headers, removeContent, unknownOrigin) {
 }
 
 module.exports = (dispatch) => (opts, handler) =>
-  opts.follow ? dispatch(opts, new Handler(opts, { handler, dispatch })) : dispatch(opts, handler)
+  opts.follow != null
+    ? dispatch(opts, new Handler(opts, { handler, dispatch }))
+    : dispatch(opts, handler)

package/lib/interceptor/request-id.js

@@ -12,10 +12,6 @@ function genReqId() {
 }
 
 module.exports = (dispatch) => (opts, handler) => {
-  if (opts.id === null) {
-    return dispatch(opts, handler)
-  }
-
   let id = opts.id ?? opts.headers?.['request-id'] ?? opts.headers?.['Request-Id']
   id = id ? `${id},${genReqId()}` : genReqId()
 

package/package.json

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