@nxtedition/nxt-undici 2.1.0 → 2.2.0

package/lib/index.js

@@ -106,8 +106,8 @@ export async function request(url, opts) {
     dispatch = interceptors.requestId(dispatch)
     dispatch = interceptors.responseRetry(dispatch)
     dispatch = interceptors.responseVerify(dispatch)
-    dispatch = interceptors.cache(dispatch)
     dispatch = interceptors.redirect(dispatch)
+    dispatch = interceptors.cache(dispatch)
     dispatch = interceptors.proxy(dispatch)
     dispatcherCache.set(dispatcher, dispatch)
   }

package/lib/interceptor/cache.js

@@ -107,7 +107,7 @@ class CacheStore {
 
 function makeKey(opts) {
   // NOTE: Ignores headers...
-  return `${opts.method}:${opts.path}`
+  return `${opts.origin}:${opts.method}:${opts.path}`
 }
 
 const DEFAULT_CACHE_STORE = new CacheStore({ maxSize: 128 * 1024, maxEntrySize: 1024 })

package/lib/interceptor/response-retry.js

@@ -153,7 +153,7 @@ class Handler extends DecoratorHandler {
     this.#error = err
 
     retryPromise
-      .then(() => {
+      .then((opts) => {
         if (this.#aborted) {
           this.#onError(this.#reason)
         } else if (isDisturbed(this.#opts.body)) {
@@ -167,8 +167,10 @@ class Handler extends DecoratorHandler {
 
           this.#opts = {
             ...this.#opts,
+            ...opts,
             headers: {
               ...this.#opts.headers,
+              ...opts?.headers,
               'if-match': this.#etag,
               range: `bytes=${this.#pos}-${this.#end ?? ''}`,
             },
@@ -204,25 +206,3 @@ export default (dispatch) => (opts, handler) => {
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)
 }
-
-export function isConnectionError(err) {
-  // AWS compat.
-  const statusCode = err?.statusCode ?? err?.$metadata?.httpStatusCode
-  return err
-    ? err.code === 'ECONNRESET' ||
-        err.code === 'ECONNREFUSED' ||
-        err.code === 'ENOTFOUND' ||
-        err.code === 'ENETDOWN' ||
-        err.code === 'ENETUNREACH' ||
-        err.code === 'EHOSTDOWN' ||
-        err.code === 'EHOSTUNREACH' ||
-        err.code === 'EPIPE' ||
-        err.code === 'ETIMEDOUT' ||
-        err.message === 'other side closed' ||
-        statusCode === 420 ||
-        statusCode === 429 ||
-        statusCode === 502 ||
-        statusCode === 503 ||
-        statusCode === 504
-    : false
-}

package/package.json

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