@cloudant/couchbackup 2.11.1-SNAPSHOT-261 → 2.11.1-SNAPSHOT-264

package/includes/request.js

@@ -16,7 +16,6 @@
 const pkg = require('../package.json');
 const { CloudantV1, CouchdbSessionAuthenticator } = require('@ibm-cloud/cloudant');
 const { IamAuthenticator, NoAuthAuthenticator } = require('ibm-cloud-sdk-core');
-const retryPlugin = require('retry-axios');
 const debug = require('debug')('couchbackup:request');
 
 const userAgent = 'couchbackup-cloudant/' + pkg.version + ' (Node.js ' +
@@ -25,7 +24,7 @@ const userAgent = 'couchbackup-cloudant/' + pkg.version + ' (Node.js ' +
 // An interceptor function to help augment error bodies with a little
 // extra information so we can continue to use consistent messaging
 // after the ugprade to @ibm-cloud/cloudant
-const errorHelper = async function(err) {
+function errorHelper(err) {
   debug('Entering error helper interceptor');
   let method;
   let requestUrl;
@@ -75,7 +74,18 @@ const errorHelper = async function(err) {
     }
   }
   return Promise.reject(err);
-};
+}
+
+// Interceptor function to add the User-Agent header.
+// An interceptor is used because setting UA in headers
+// option during client initialization means it gets overwritten
+// by the default value during a request.
+// This interceptor is further along the chain and able to
+// replace the default value.
+function userAgentHelper(requestConfig) {
+  requestConfig.headers['User-Agent'] = userAgent;
+  return requestConfig;
+}
 
 function newSimpleClient(rawUrl, opts) {
   const url = new URL(rawUrl);
@@ -120,43 +130,23 @@ function newSimpleClient(rawUrl, opts) {
 function newClient(rawUrl, opts) {
   const { service, dbName, actUrl } = newSimpleClient(rawUrl, opts);
   const authenticator = service.getAuthenticator();
-  // Configure retries
-  const maxRetries = 2; // for 3 total attempts
-  service.getHttpClient().defaults.raxConfig = {
-    // retries for status codes
-    retry: maxRetries,
-    // retries for non-response e.g. ETIMEDOUT
-    noResponseRetries: maxRetries,
-    backoffType: 'exponential',
-    httpMethodsToRetry: ['GET', 'HEAD', 'POST'],
-    statusCodesToRetry: [
-      [429, 429],
-      [500, 599]
-    ],
-    shouldRetry: err => {
-      const cfg = retryPlugin.getConfig(err);
-      // cap at max retries regardless of response/non-response type
-      if (cfg.currentRetryAttempt >= maxRetries) {
-        return false;
-      } else {
-        return retryPlugin.shouldRetryRequest(err);
-      }
-    },
-    instance: service.getHttpClient()
-  };
-  retryPlugin.attach(service.getHttpClient());
 
+  // Add interceptors
+  // Request interceptor to set the User-Agent header
+  // Response interceptor to put URLs in error messages
+  // Add for the token manager if present
   if (authenticator.tokenManager && authenticator.tokenManager.requestWrapperInstance) {
+    authenticator.tokenManager.requestWrapperInstance.axiosInstance.interceptors.request.use(userAgentHelper, null);
     authenticator.tokenManager.requestWrapperInstance.axiosInstance.interceptors.response.use(null, errorHelper);
   }
-  // Add error interceptors to put URLs in error messages
+  // and add for the client
+  service.getHttpClient().interceptors.request.use(userAgentHelper, null);
   service.getHttpClient().interceptors.response.use(null, errorHelper);
 
-  // Add request interceptor to add user-agent (adding it with custom request headers gets overwritten)
-  service.getHttpClient().interceptors.request.use(function(requestConfig) {
-    requestConfig.headers['User-Agent'] = userAgent;
-    return requestConfig;
-  }, null);
+  // Configure retries
+  // Note: this MUST happen last after all other interceptors have been registered
+  const maxRetries = 2; // for 3 total attempts
+  service.enableRetries({ maxRetries });
 
   return { service, dbName, url: actUrl.toString() };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudant/couchbackup",
-  "version": "2.11.1-SNAPSHOT-261",
+  "version": "2.11.1-SNAPSHOT-264",
   "description": "CouchBackup - command-line backup utility for Cloudant/CouchDB",
   "homepage": "https://github.com/IBM/couchbackup",
   "repository": {
@@ -29,7 +29,6 @@
   },
   "peerDependencies": {
     "ibm-cloud-sdk-core": "^5.0.2",
-    "retry-axios": "^2.6.0",
     "axios": "^1.7.4"
   },
   "main": "app.js",
@@ -50,7 +49,7 @@
     "mocha": "10.8.2",
     "nock": "13.5.6",
     "tail": "2.2.6",
-    "uuid": "11.0.2"
+    "uuid": "11.0.3"
   },
   "scripts": {
     "lint": "eslint --ignore-path .gitignore .",