@nxtedition/nxt-undici 5.0.1 → 5.0.3

package/lib/interceptor/cache.js

@@ -129,7 +129,7 @@ function makeKey(opts) {
 
 const DEFAULT_CACHE_STORE = new MemoryCacheStore({ maxSize: 128 * 1024, maxEntrySize: 1024 })
 
-export default (opts) => (dispatch) => (opts, handler) => {
+export default () => (dispatch) => (opts, handler) => {
   if (!opts.cache || opts.upgrade) {
     return dispatch(opts, handler)
   }

package/lib/interceptor/log.js

@@ -120,5 +120,5 @@ class Handler extends DecoratorHandler {
   }
 }
 
-export default (opts) => (dispatch) => (opts, handler) =>
+export default () => (dispatch) => (opts, handler) =>
   opts.logger ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)

package/lib/interceptor/lookup.js

@@ -1,4 +1,4 @@
-export default (opts) => (dispatch) => (opts, handler) => {
+export default () => (dispatch) => (opts, handler) => {
   const lookup = opts.lookup
 
   if (!lookup) {

package/lib/interceptor/proxy.js

@@ -149,7 +149,7 @@ function printIp(address, port) {
   return str
 }
 
-export default (opts) => (dispatch) => (opts, handler) => {
+export default () => (dispatch) => (opts, handler) => {
   if (!opts.proxy) {
     return dispatch(opts, handler)
   }

package/lib/interceptor/redirect.js

@@ -184,5 +184,5 @@ function cleanRequestHeaders(headers, removeContent, unknownOrigin) {
   return ret
 }
 
-export default (opts) => (dispatch) => (opts, handler) =>
+export default () => (dispatch) => (opts, handler) =>
   opts.follow ? dispatch(opts, new Handler(opts, { handler, dispatch })) : dispatch(opts, handler)

package/lib/interceptor/request-body-factory.js

@@ -1,4 +1,4 @@
-export default (opts) => (dispatch) => (opts, handler) => {
+export default () => (dispatch) => (opts, handler) => {
   if (typeof opts.body !== 'function') {
     return dispatch(opts, handler)
   }

package/lib/interceptor/request-id.js

@@ -11,7 +11,7 @@ function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
-export default (opts) => (dispatch) => (opts, handler) => {
+export default () => (dispatch) => (opts, handler) => {
   const id = opts.id ? `${opts.id},${genReqId()}` : genReqId()
   return dispatch(
     {

package/lib/interceptor/response-error.js

@@ -129,7 +129,7 @@ class Handler extends DecoratorHandler {
   }
 }
 
-export default (opts) => (dispatch) => (opts, handler) =>
+export default () => (dispatch) => (opts, handler) =>
   opts.error !== false && opts.throwOnError !== false
     ? dispatch(opts, new Handler(opts, { handler }))
     : dispatch(opts, handler)

package/lib/interceptor/response-retry.js

@@ -31,7 +31,16 @@ class Handler extends DecoratorHandler {
 
     this.#handler = handler
     this.#dispatch = dispatch
-    this.#opts = opts
+
+    if (typeof opts === 'number') {
+      this.#opts = { count: opts }
+    } else if (typeof opts === 'boolean') {
+      this.#opts = null
+    } else if (typeof opts === 'object') {
+      this.#opts = opts
+    } else {
+      throw new Error('invalid argument: opts')
+    }
   }
 
   onConnect(abort) {
@@ -149,7 +158,7 @@ class Handler extends DecoratorHandler {
       return
     }
 
-    const retryPromise = retryFn(err, this.#retryCount++, { ...this.#opts.retry })
+    const retryPromise = retryFn(err, this.#retryCount, { ...this.#opts.retry })
     if (retryPromise == null) {
       this.#onError(err)
       return
@@ -164,6 +173,7 @@ class Handler extends DecoratorHandler {
         } else if (isDisturbed(this.#opts.body)) {
           this.#onError(this.#error)
         } else if (!this.#headersSent) {
+          this.#retryCount++
           this.#opts.logger?.debug({ retryCount: this.#retryCount }, 'retry response headers')
           this.#dispatch(this.#opts, this)
         } else {
@@ -181,6 +191,7 @@ class Handler extends DecoratorHandler {
             },
           }
 
+          this.#retryCount++
           this.#opts.logger?.debug({ retryCount: this.#retryCount }, 'retry response body')
           this.#dispatch(this.#opts, this)
         }
@@ -205,7 +216,7 @@ class Handler extends DecoratorHandler {
   }
 }
 
-export default (opts) => (dispatch) => (opts, handler) =>
+export default () => (dispatch) => (opts, handler) =>
   // TODO (fix): HEAD, PUT, PATCH, DELETE, OPTIONS?
   opts.retry !== false && opts.method === 'GET' && !opts.upgrade
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))

package/lib/interceptor/response-verify.js

@@ -81,7 +81,7 @@ class Handler extends DecoratorHandler {
   }
 }
 
-export default (opts) => (dispatch) => (opts, handler) =>
+export default () => (dispatch) => (opts, handler) =>
   !opts.upgrade && opts.verify !== false
     ? dispatch(opts, new Handler(opts, { handler }))
     : dispatch(opts, handler)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -12,20 +12,17 @@
     "cache-control-parser": "^2.0.6",
     "http-errors": "^2.0.0",
     "lru-cache": "^11.0.2",
-    "undici": "^6.20.1"
+    "undici": "^7.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.9.0",
-    "eslint": "^8.0.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-n": "^17.13.1",
-    "eslint-plugin-promise": "^7.1.0",
-    "husky": "^9.1.6",
+    "@types/node": "^22.10.1",
+    "eslint": "^9.16.0",
+    "eslint-plugin-n": "^17.14.0",
+    "husky": "^9.1.7",
     "lint-staged": "^15.2.10",
     "pinst": "^3.0.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.1",
+    "send": "^1.1.0",
     "tap": "^21.0.1"
   },
   "scripts": {
@@ -44,27 +41,5 @@
     "printWidth": 100,
     "semi": false,
     "singleQuote": true
-  },
-  "eslintConfig": {
-    "parserOptions": {
-      "ecmaFeatures": {
-        "ecmaVersion": 2020
-      }
-    },
-    "extends": [
-      "standard",
-      "prettier",
-      "prettier/prettier"
-    ],
-    "rules": {
-      "quotes": [
-        "error",
-        "single",
-        {
-          "avoidEscape": true,
-          "allowTemplateLiterals": true
-        }
-      ]
-    }
   }
 }