Merge pull request #483 from contentful/fix/retries

feat: enable 'fetch' adapter + duplicate request params fix

package.json

@@ -74,7 +74,7 @@
     "@types/qs": "^6.9.10",
     "@typescript-eslint/eslint-plugin": "^5.11.0",
     "@typescript-eslint/parser": "^5.11.0",
-    "axios": "^1.6.0",
+    "axios": "^1.7.2",
     "axios-mock-adapter": "^1.20.0",
     "babel-eslint": "^10.1.0",
     "bundlesize": "^0.18.1",

src/rate-limit.ts

@@ -30,7 +30,7 @@ export default function rateLimit(instance: AxiosInstance, maxRetry = 5): void {
       responseLogger(response)
       return response
     },
-    function (error) {
+    async function (error) {
       const { response } = error
       const { config } = error
       responseLogger(error)
@@ -81,6 +81,14 @@ export default function rateLimit(instance: AxiosInstance, maxRetry = 5): void {
         delete config.httpAgent
         delete config.httpsAgent
 
+        /**
+         * Hack to mitigate (likely) bug introduced in axios v1.7.0 where `url`,
+         * when using the default `xhr` adapter, is a fully qualified URL (instead of a path),
+         * which somehow causes the request params to be repeatedly appended
+         * to the final request URL upon each retry.
+         */
+        config.url = config.url.split('?')[0]
+
         return delay(wait).then(() => instance(config))
       }
       return Promise.reject(error)