@nxtedition/nxt-undici 1.0.2 → 1.0.4

package/lib/index.js

@@ -115,7 +115,7 @@ async function request(url, opts) {
   }
 
   headers = {
-    'request-id': `req-${genReqId()}`,
+    'request-id': genReqId(),
     'user-agent': opts.userAgent ?? globalThis.userAgent,
     ...headers,
   }

package/lib/interceptor/log.js

@@ -1,11 +1,23 @@
 const { parseHeaders } = require('../utils')
-const xuid = require('xuid')
 const { performance } = require('perf_hooks')
 
+// 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 Handler {
   constructor(opts, { handler }) {
     this.handler = handler
-    this.opts = opts.id ? opts : { ...opts, id: xuid() }
+    this.opts = opts.id ? opts : { ...opts, id: genReqId() }
     this.abort = null
     this.aborted = false
     this.logger = opts.logger.child({ ureq: { id: opts.id } })

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

@@ -10,7 +10,9 @@ class Handler {
     this.aborted = false
     this.reason = null
 
-    this.count = 0
+    this.retryCount = 0
+    this.retryPromise = null
+
     this.pos = 0
     this.end = null
     this.error = null
@@ -110,31 +112,30 @@ class Handler {
   }
 
   onError(err) {
-    if (this.timeout) {
-      clearTimeout(this.timeout)
-      this.timeout = null
-    }
-
     if (!this.resume || this.aborted || !this.etag || isDisturbed(this.opts.body)) {
       return this.handler.onError(err)
     }
 
-    const retryPromise = retryFn(err, this.count++, this.opts)
+    // TODO (fix): abort signal?
+    const retryPromise = retryFn(err, this.retryCount++, this.opts)
     if (retryPromise == null) {
       return this.handler.onError(err)
     }
 
     retryPromise
       .then(() => {
-        this.timeout = null
-        try {
-          this.dispatch(this.opts, this)
-        } catch (err2) {
-          this.handler.onError(err)
+        if (!this.aborted) {
+          try {
+            this.dispatch(this.opts, this)
+          } catch (err2) {
+            this.handler.onError(new AggregateError([err, err2]))
+          }
         }
       })
       .catch((err) => {
-        this.handler.onError(err)
+        if (!this.aborted) {
+          this.handler.onError(err)
+        }
       })
 
     this.error = err

package/lib/interceptor/response-retry.js

@@ -8,9 +8,9 @@ class Handler {
     this.abort = null
     this.aborted = false
     this.reason = null
-    this.timeout = null
-    this.count = 0
-    this.retryAfter = null
+
+    this.retryCount = 0
+    this.retryPromise = null
 
     this.handler.onConnect((reason) => {
       this.aborted = true
@@ -52,31 +52,30 @@ class Handler {
   }
 
   onError(err) {
-    if (this.timeout) {
-      clearTimeout(this.timeout)
-      this.timeout = null
-    }
-
     if (this.aborted || isDisturbed(this.opts.body)) {
       return this.handler.onError(err)
     }
 
-    const retryPromise = retryFn(err, this.count++, this.opts)
+    // TODO (fix): abort signal?
+    const retryPromise = retryFn(err, this.retryCount++, this.opts)
     if (retryPromise == null) {
       return this.handler.onError(err)
     }
 
     retryPromise
       .then(() => {
-        this.timeout = null
-        try {
-          this.dispatch(this.opts, this)
-        } catch (err2) {
-          this.handler.onError(err)
+        if (!this.aborted) {
+          try {
+            this.dispatch(this.opts, this)
+          } catch (err2) {
+            this.handler.onError(new AggregateError([err, err2]))
+          }
         }
       })
       .catch((err) => {
-        this.handler.onError(err)
+        if (!this.aborted) {
+          this.handler.onError(err)
+        }
       })
 
     this.opts.logger?.debug('retrying response')

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

@@ -10,8 +10,7 @@ class Handler {
     this.aborted = false
     this.reason = null
 
-    this.timeout = null
-    this.count = 0
+    this.retryCount = 0
     this.retryPromise = null
 
     this.handler.onConnect((reason) => {
@@ -47,7 +46,8 @@ class Handler {
 
     const err = createError(statusCode, { headers: parseHeaders(rawHeaders) })
 
-    const retryPromise = retryFn(err, this.count++, this.opts)
+    // TODO (fix): abort signal?
+    const retryPromise = retryFn(err, this.retryCount++, this.opts)
     if (retryPromise == null) {
       return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
     }
@@ -70,26 +70,24 @@ class Handler {
   }
 
   onError(err) {
-    if (this.timeout) {
-      clearTimeout(this.timeout)
-      this.timeout = null
-    }
-
     if (this.retryPromise == null || this.aborted || isDisturbed(this.opts.body)) {
       return this.handler.onError(err)
     }
 
     this.retryPromise
       .then(() => {
-        this.timeout = null
-        try {
-          this.dispatch(this.opts, this)
-        } catch (err) {
-          this.handler.onError(err)
+        if (!this.aborted) {
+          try {
+            this.dispatch(this.opts, this)
+          } catch (err2) {
+            this.handler.onError(new AggregateError([err, err2]))
+          }
         }
       })
       .catch((err) => {
-        this.handler.onError(err)
+        if (!this.aborted) {
+          this.handler.onError(err)
+        }
       })
     this.retryPromise = null
 

package/package.json

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