@nxtedition/nxt-undici 4.2.24 → 4.2.26

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

@@ -3,23 +3,19 @@ export default (opts) => (dispatch) => (opts, handler) => {
     return dispatch(opts, handler)
   }
 
-  try {
-    const body = opts.body({ signal: opts.signal })
+  const body = opts.body({ signal: opts.signal })
 
-    if (typeof body?.then === 'function') {
-      body
-        .then((body) => {
-          dispatch({ ...opts, body }, handler)
-        })
-        .catch((err) => {
-          handler.onError(err)
-        })
-      return true
-    } else {
-      return dispatch({ ...opts, body }, handler)
-    }
-  } catch (err) {
-    handler.onError(err)
+  if (typeof body?.then === 'function') {
+    body.then(
+      (body) => {
+        dispatch({ ...opts, body }, handler)
+      },
+      (err) => {
+        handler.onError(err)
+      },
+    )
     return true
+  } else {
+    return dispatch({ ...opts, body }, handler)
   }
 }

package/lib/interceptor/response-error.js

@@ -118,7 +118,7 @@ class Handler extends DecoratorHandler {
           err.code ??= this.#body.code
         }
         if (this.#body.error != null) {
-          err.error ??= this.#body.errorq
+          err.error ??= this.#body.error
         }
       }
 

package/lib/interceptor/response-retry.js

@@ -17,14 +17,14 @@ class Handler extends DecoratorHandler {
   #headersSent = false
   #errorSent = false
 
-  #abort = null
+  #abort
   #aborted = false
-  #reason = null
+  #reason
 
-  #pos = null
-  #end = null
-  #etag = null
-  #error = null
+  #pos
+  #end
+  #etag
+  #error
 
   constructor(opts, { handler, dispatch }) {
     super(handler)
@@ -87,7 +87,7 @@ class Handler extends DecoratorHandler {
         assert(start != null && Number.isFinite(start), 'content-range mismatch')
         assert(end != null && Number.isFinite(end), 'invalid content-length')
         assert(
-          contentLength == null || end == null || contentLength === end + 1 - start,
+          contentLength == null || end == null || contentLength === end - start,
           'content-range mismatch',
         )
 
@@ -168,7 +168,7 @@ class Handler extends DecoratorHandler {
           this.#dispatch(this.#opts, this)
         } else {
           assert(Number.isFinite(this.#pos))
-          assert(this.#end == null || Number.isFinite(this.#end))
+          assert(this.#end == null || (Number.isFinite(this.#end) && this.#end > 0))
 
           this.#opts = {
             ...this.#opts,
@@ -177,7 +177,7 @@ class Handler extends DecoratorHandler {
               ...this.#opts.headers,
               ...opts?.headers,
               'if-match': this.#etag,
-              range: `bytes=${this.#pos}-${this.#end ?? ''}`,
+              range: `bytes=${this.#pos}-${this.#end ? this.#end - 1 : ''}`,
             },
           }
 

package/lib/utils.js

@@ -10,7 +10,9 @@ export function parseCacheControl(str) {
 // Parsed accordingly to RFC 9110
 // https://www.rfc-editor.org/rfc/rfc9110#field.content-range
 export function parseRangeHeader(range) {
-  if (range == null || range === '') return { start: 0, end: null, size: null }
+  if (range == null || range === '') {
+    return { start: 0, end: null, size: null }
+  }
 
   const m = range ? range.match(/^bytes (\d+)-(\d+)\/(\d+)?$/) : null
   return m

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "4.2.24",
+  "version": "4.2.26",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",
@@ -11,16 +11,16 @@
   "dependencies": {
     "cache-control-parser": "^2.0.6",
     "http-errors": "^2.0.0",
-    "lru-cache": "^11.0.1",
-    "undici": "^6.19.8"
+    "lru-cache": "^11.0.2",
+    "undici": "^6.20.1"
   },
   "devDependencies": {
-    "@types/node": "^22.7.4",
+    "@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.10.3",
+    "eslint-plugin-n": "^17.13.1",
     "eslint-plugin-promise": "^7.1.0",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",