@cloudant/couchbackup 2.6.2-SNAPSHOT.21 → 2.7.0

package/CHANGES.md

@@ -1,4 +1,7 @@
-# Unreleased
+# 2.7.0 (2021-09-14)
+- [UPGRADED] Cloudant client dependency from `@cloudant/cloudant` to `@ibm-cloud/cloudant`.
+
+# 2.6.2 (2021-08-27)
 - [FIXED] `Invalid document ID: _bulk_get` error when using `@cloudant/cloudant`
   version `4.5.0`.
 - [UPGRADED] Upgraded `@cloudant/cloudant` dependency to version `4.5.0`.

package/README.md

@@ -122,7 +122,7 @@ couchbackup --db animaldb --log animaldb.log --resume true --output animaldb.txt
 
 ## Restore
 
-Now we have our backup text file, we can restore it to an existing database using the `couchrestore`:
+Now that we have our backup text file, we can restore it to a new, empty, existing database using the `couchrestore`:
 
 ```sh
 cat animaldb.txt | couchrestore
@@ -245,7 +245,7 @@ Then you can import the library into your code:
 The library exports two main functions:
 
 1. `backup` - backup from a database to a writable stream.
-2. `restore` - restore from a readable stream to a database.
+2. `restore` - restore from a readable stream to an empty database.
 
 ### Examples
 
@@ -319,8 +319,9 @@ couchbackup.backup(
 ### Restore
 
 The `restore` function takes a readable stream containing the data emitted
-by the `backup` function. It uploads that to a Cloudant database, which
-should be a **new** database.
+by the `backup` function and uploads that to a Cloudant database.
+
+_Note:_ A target database must be a **new and empty** database.
 
 ```javascript
 restore: function(srcStream, targetUrl, opts, callback) { /* ... */ }

package/app.js

@@ -1,4 +1,4 @@
-// Copyright © 2017, 2020 IBM Corp. All rights reserved.
+// Copyright © 2017, 2021 IBM Corp. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ function validateArgs(url, opts, cb) {
       cb(new error.BackupError('InvalidOption', 'Invalid URL, missing path element (no database).'));
       return;
     }
-    if (opts && opts.iamApiKey && (urlObject.username || url.password)) {
+    if (opts && opts.iamApiKey && (urlObject.username || urlObject.password)) {
       cb(new error.BackupError('InvalidOption', 'URL user information must not be supplied when using IAM API key.'));
       return;
     }
@@ -160,12 +160,12 @@ function addEventListener(indicator, emitter, event, f) {
   @param {function(err)} callback - error is undefined if DB exists
 */
 function proceedIfDbValid(db, callback) {
-  db.server.request({ db: db.config.db, method: 'HEAD' }, function(err) {
+  db.service.headDatabase({ db: db.db }).then(() => callback()).catch(err => {
     err = error.convertResponseError(err, function(err) {
-      if (err && err.statusCode === 404) {
+      if (err && err.status === 404) {
         // Override the error type and mesasge for the DB not found case
-        var msg = `Database ${db.config.url.replace(/\/\/.+@/g, '//****:****@')}` +
-        `/${db.config.db} does not exist. ` +
+        var msg = `Database ${db.url}` +
+        `${db.db} does not exist. ` +
         'Check the URL and database name have been specified correctly.';
         var noDBErr = new Error(msg);
         noDBErr.name = 'DatabaseNotFound';
@@ -175,7 +175,6 @@ function proceedIfDbValid(db, callback) {
         return error.convertResponseError(err);
       }
     });
-    // Callback with or without (i.e. undefined) error
     callback(err);
   });
 }

package/includes/backup.js

@@ -1,4 +1,4 @@
-// Copyright © 2017, 2019 IBM Corp. All rights reserved.
+// Copyright © 2017, 2021 IBM Corp. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -73,24 +73,20 @@ module.exports = function(db, options) {
  * @param {function} callback - called on completion with signature (err)
  */
 function validateBulkGetSupport(db, callback) {
-  db.server.request({ method: 'HEAD', db: db.config.db, path: '_bulk_get' },
-    function(err) {
-      err = error.convertResponseError(err, function(err) {
-        switch (err.statusCode) {
-          case undefined:
-            // There was no status code on the error
-            return err;
-          case 404:
-            return new error.BackupError('BulkGetError', 'Database does not support /_bulk_get endpoint');
-          case 405:
-            // => supports /_bulk_get endpoint
-            return;
-          default:
-            return new error.HTTPError(err);
-        }
-      });
-      callback(err);
+  db.service.postBulkGet({ db: db.db, docs: [] }).then(() => { callback(); }).catch(err => {
+    err = error.convertResponseError(err, function(err) {
+      switch (err.status) {
+        case undefined:
+          // There was no status code on the error
+          return err;
+        case 404:
+          return new error.BackupError('BulkGetError', 'Database does not support /_bulk_get endpoint');
+        default:
+          return new error.HTTPError(err);
+      }
     });
+    callback(err);
+  });
 }
 
 /**
@@ -211,43 +207,40 @@ function processBatchSet(db, parallelism, log, batches, ee, start, grandtotal, c
     }
 
     // do the /db/_bulk_get request
-    // Note: this should use built-in _bulk_get, but revs is not accepted as
-    // part of the request body by the server yet. Working around using request
-    // method to POST with a query string.
-    db.server.request(
-      { method: 'POST', db: db.config.db, path: '_bulk_get', qs: { revs: true }, body: payload },
-      function(err, body) {
-        if (err) {
-          if (!hasErrored) {
-            hasErrored = true;
-            err = error.convertResponseError(err);
-            // Kill the queue for fatal errors
-            q.kill();
-            ee.emit('error', err);
-          }
-          done();
-        } else {
-          // create an output array with the docs returned
-          body.results.forEach(function(d) {
-            if (d.docs) {
-              d.docs.forEach(function(doc) {
-                if (doc.ok) {
-                  output.push(doc.ok);
-                }
-              });
+    db.service.postBulkGet({
+      db: db.db,
+      revs: true,
+      docs: payload.docs
+    }).then(response => {
+      // create an output array with the docs returned
+      response.result.results.forEach(function(d) {
+        if (d.docs) {
+          d.docs.forEach(function(doc) {
+            if (doc.ok) {
+              output.push(doc.ok);
             }
           });
-          total += output.length;
-          var t = (new Date().getTime() - start) / 1000;
-          ee.emit('received', {
-            batch: thisBatch,
-            data: output,
-            length: output.length,
-            time: t,
-            total: total
-          }, q, logCompletedBatch);
         }
       });
+      total += output.length;
+      var t = (new Date().getTime() - start) / 1000;
+      ee.emit('received', {
+        batch: thisBatch,
+        data: output,
+        length: output.length,
+        time: t,
+        total: total
+      }, q, logCompletedBatch);
+    }).catch(err => {
+      if (!hasErrored) {
+        hasErrored = true;
+        err = error.convertResponseError(err);
+        // Kill the queue for fatal errors
+        q.kill();
+        ee.emit('error', err);
+      }
+      done();
+    });
   }, parallelism);
 
   for (var i in batches) {

package/includes/error.js

@@ -1,4 +1,4 @@
-// Copyright © 2017, 2018 IBM Corp. All rights reserved.
+// Copyright © 2017, 2021 IBM Corp. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -37,13 +37,8 @@ class BackupError extends Error {
 
 class HTTPError extends BackupError {
   constructor(responseError, name) {
-    var errMsg = `${responseError.statusCode} ${responseError.statusMessage || ''}: ` +
-     `${responseError.request.method} ${(typeof responseError.request.uri === 'object') ? responseError.request.uri.href : responseError.request.uri}`;
-    if (responseError.error && responseError.reason) {
-      errMsg += ` - Error: ${responseError.error}, Reason: ${responseError.reason}`;
-    }
     // Special case some names for more useful error messages
-    switch (responseError.statusCode) {
+    switch (responseError.status) {
       case 401:
         name = 'Unauthorized';
         break;
@@ -53,7 +48,7 @@ class HTTPError extends BackupError {
       default:
         name = name || 'HTTPFatalError';
     }
-    super(name, errMsg);
+    super(name, responseError.message);
   }
 }
 
@@ -65,7 +60,7 @@ function checkResponse(err) {
   if (err) {
     // Construct an HTTPError if there is request information on the error
     // Codes < 400 are considered OK
-    if (err.statusCode >= 400) {
+    if (err.status >= 400) {
       return new HTTPError(err);
     } else {
       // Send it back again if there was no status code, e.g. a cxn error
@@ -84,10 +79,9 @@ function convertResponseError(responseError, errorFactory) {
 function augmentMessage(err) {
   // For errors that don't have a status code, we are likely looking at a cxn
   // error.
-  // Try to augment the message with more detail
-  // TODO add this extra message detail to nano?
-  if (err && err.code) {
-    err.message = `${err.message} ${err.code}`;
+  // Try to augment the message with more detail (core puts the code in statusText)
+  if (err && err.statusText) {
+    err.message = `${err.message} ${err.statusText}`;
   }
   if (err && err.description) {
     err.message = `${err.message} ${err.description}`;
@@ -101,11 +95,9 @@ module.exports = {
   convertResponseError: convertResponseError,
   terminationCallback: function terminationCallback(err, data) {
     if (err) {
-      process.on('uncaughtException', function(err) {
-        console.error(`ERROR: ${err.message}`);
-        process.exitCode = codes[err.name] || 1;
-      });
-      throw err;
+      console.error(`ERROR: ${err.message}`);
+      process.exitCode = codes[err.name] || 1;
+      process.exit();
     }
   }
 };

package/includes/request.js

@@ -1,4 +1,4 @@
-// Copyright © 2017, 2018 IBM Corp. All rights reserved.
+// Copyright © 2017, 2021 IBM Corp. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,43 +16,170 @@
 const pkg = require('../package.json');
 const http = require('http');
 const https = require('https');
-const cloudant = require('@cloudant/cloudant');
+const stream = require('stream');
+const { CloudantV1, CouchdbSessionAuthenticator } = require('@ibm-cloud/cloudant');
+const { IamAuthenticator, NoAuthAuthenticator } = require('ibm-cloud-sdk-core');
+const retryPlugin = require('retry-axios');
 
 const userAgent = 'couchbackup-cloudant/' + pkg.version + ' (Node.js ' +
       process.version + ')';
 
+// Class for streaming _changes error responses into
+// In general the response is a small error/reason JSON object
+// so it is OK to have this in memory.
+class ResponseWriteable extends stream.Writable {
+  constructor(options) {
+    super(options);
+    this.data = [];
+  }
+
+  _write(chunk, encoding, callback) {
+    this.data.push(chunk);
+    callback();
+  }
+
+  stringBody() {
+    return Buffer.concat(this.data).toString();
+  }
+}
+
+// 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) {
+  let method;
+  let requestUrl;
+  if (err.response) {
+    if (err.response.config.url) {
+      requestUrl = err.response.config.url;
+      method = err.response.config.method;
+    }
+    // Override the status text with an improved message
+    let errorMsg = `${err.response.status} ${err.response.statusText || ''}: ` +
+    `${method} ${requestUrl}`;
+    if (err.response.data) {
+      // Check if we have a JSON response and try to get the error/reason
+      if (err.response.headers['content-type'] === 'application/json') {
+        if (!err.response.data.error && err.response.data.pipe) {
+          // If we didn't find a JSON object with `error` then we might have a stream response.
+          // Detect the stream by the presence of `pipe` and use it to get the body and parse
+          // the error information.
+          const p = new Promise((resolve, reject) => {
+            const errorBody = new ResponseWriteable();
+            err.response.data.pipe(errorBody)
+              .on('finish', () => { resolve(JSON.parse(errorBody.stringBody())); })
+              .on('error', () => { reject(err); });
+          });
+          // Replace the stream on the response with the parsed object
+          err.response.data = await p;
+        }
+        // Append the error/reason if available
+        if (err.response.data.error) {
+          // Override the status text with our more complete message
+          errorMsg += ` - Error: ${err.response.data.error}`;
+          if (err.response.data.reason) {
+            errorMsg += `, Reason: ${err.response.data.reason}`;
+          }
+        }
+      } else {
+        errorMsg += err.response.data;
+      }
+      // Set a new message for use by the node-sdk-core
+      // We use the errors array because it gets processed
+      // ahead of all other service errors.
+      err.response.data.errors = [{ message: errorMsg }];
+    }
+  } else if (err.request) {
+    if (!err.message.includes(err.config.url)) {
+      // Augment the message with the URL and method
+      // but don't do it again if we already have the URL.
+      err.message = `${err.message}: ${err.config.method} ${err.config.url}`;
+    }
+  }
+  return Promise.reject(err);
+};
+
 module.exports = {
-  client: function(url, opts) {
-    var protocol = (url.match(/^https/)) ? https : http;
+  client: function(rawUrl, opts) {
+    const url = new URL(rawUrl);
+    var protocol = (url.protocol.match(/^https/)) ? https : http;
     const keepAliveAgent = new protocol.Agent({
       keepAlive: true,
       keepAliveMsecs: 30000,
       maxSockets: opts.parallelism
     });
-    // Split the URL for use with nodejs-cloudant
-    var actUrl = url.substr(0, url.lastIndexOf('/'));
-    var dbName = url.substr(url.lastIndexOf('/') + 1);
-    // Default set of plugins includes retry
-    var pluginsToUse = ['retry'];
+    // Split the URL to separate service from database
+    // Use origin as the "base" to remove auth elements
+    const actUrl = new URL(url.pathname.substr(0, url.pathname.lastIndexOf('/')), url.origin);
+    const dbName = url.pathname.substr(url.pathname.lastIndexOf('/') + 1);
+    let authenticator;
     // Default to cookieauth unless an IAM key is provided
     if (opts.iamApiKey) {
-      const iamPluginConfig = { iamApiKey: opts.iamApiKey };
+      const iamAuthOpts = { apikey: opts.iamApiKey };
       if (opts.iamTokenUrl) {
-        iamPluginConfig.iamTokenUrl = opts.iamTokenUrl;
+        iamAuthOpts.url = opts.iamTokenUrl;
       }
-      pluginsToUse.push({ iamauth: iamPluginConfig });
+      authenticator = new IamAuthenticator(iamAuthOpts);
+    } else if (url.username) {
+      authenticator = new CouchdbSessionAuthenticator({
+        username: url.username,
+        password: url.password
+      });
     } else {
-      pluginsToUse.push({ cookieauth: { errorOnNoCreds: false } });
+      authenticator = new NoAuthAuthenticator();
     }
-    return cloudant({
-      url: actUrl,
-      plugins: pluginsToUse,
-      requestDefaults: {
-        agent: keepAliveAgent,
-        headers: { 'User-Agent': userAgent },
-        gzip: true,
-        timeout: opts.requestTimeout
-      }
-    }).use(dbName);
+    const serviceOpts = {
+      authenticator: authenticator,
+      timeout: opts.requestTimeout,
+      headers: { 'User-Agent': userAgent },
+      // Axios performance options
+      maxContentLength: -1
+    };
+    if (url.protocol === 'https') {
+      serviceOpts.httpsAgent = keepAliveAgent;
+    } else {
+      serviceOpts.httpAgent = keepAliveAgent;
+    }
+    const service = new CloudantV1(serviceOpts);
+    // 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());
+
+    service.setServiceUrl(actUrl.toString());
+    if (authenticator instanceof CouchdbSessionAuthenticator) {
+      // Awkward workaround for known Couch issue with compression on _session requests
+      // It is not feasible to disable compression on all requests with the amount of
+      // data this lib needs to move, so override the property in the tokenManager instance.
+      authenticator.tokenManager.requestWrapperInstance.compressRequestData = false;
+    }
+    if (authenticator.tokenManager && authenticator.tokenManager.requestWrapperInstance) {
+      authenticator.tokenManager.requestWrapperInstance.axiosInstance.interceptors.response.use(null, errorHelper);
+    }
+    // Add error interceptors to put URLs in error messages
+    service.getHttpClient().interceptors.response.use(null, errorHelper);
+
+    return { service: service, db: dbName, url: actUrl.toString() };
   }
 };

package/includes/shallowbackup.js

@@ -1,4 +1,4 @@
-// Copyright © 2017, 2019 IBM Corp. All rights reserved.
+// Copyright © 2017, 2021 IBM Corp. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -29,20 +29,16 @@ module.exports = function(db, options) {
     function(callback) {
       // Note, include_docs: true is set automatically when using the
       // fetch function.
-      var opts = { limit: options.bufferSize, include_docs: true };
+      var opts = { db: db.db, limit: options.bufferSize, includeDocs: true };
 
       // To avoid double fetching a document solely for the purposes of getting
       // the next ID to use as a startkey for the next page we instead use the
       // last ID of the current page and append the lowest unicode sort
       // character.
       if (startKey) opts.startkey = `${startKey}\0`;
-      db.list(opts, function(err, body) {
-        if (err) {
-          err = error.convertResponseError(err);
-          ee.emit('error', err);
-          hasErrored = true;
-          callback();
-        } else if (!body.rows) {
+      db.service.postAllDocs(opts).then(response => {
+        const body = response.result;
+        if (!body.rows) {
           ee.emit('error', new error.BackupError(
             'AllDocsError', 'ERROR: Invalid all docs response'));
           callback();
@@ -69,6 +65,11 @@ module.exports = function(db, options) {
           }
           callback();
         }
+      }).catch(err => {
+        err = error.convertResponseError(err);
+        ee.emit('error', err);
+        hasErrored = true;
+        callback();
       });
     },
     function(callback) { callback(null, hasErrored || startKey == null); },

package/includes/spoolchanges.js

@@ -1,4 +1,4 @@
-// Copyright © 2017, 2018 IBM Corp. All rights reserved.
+// Copyright © 2017, 2021 IBM Corp. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -62,34 +62,31 @@ module.exports = function(db, log, bufferSize, ee, callback) {
   };
 
   // stream the changes feed to disk
-  var changesRequest = db.changesAsStream({ seq_interval: 10000 })
-    .on('error', function(err) {
+  db.service.postChangesAsStream({ db: db.db, seq_interval: 10000 }).then(response => {
+    response.result.pipe(liner())
+      .on('error', function(err) {
+        callback(err);
+      })
+      .pipe(change(onChange))
+      .on('error', function(err) {
+        callback(err);
+      })
+      .on('finish', function() {
+        processBuffer(true);
+        if (!lastSeq) {
+          logStream.end();
+          debug('changes request terminated before last_seq was sent');
+          callback(new error.BackupError('SpoolChangesError', 'Changes request terminated before last_seq was sent'));
+        } else {
+          debug('finished streaming database changes');
+          logStream.end(':changes_complete ' + lastSeq + '\n', 'utf8', callback);
+        }
+      });
+  }).catch(err => {
+    if (err.status && err.status >= 400) {
+      callback(error.convertResponseError(err));
+    } else {
       callback(new error.BackupError('SpoolChangesError', `Failed changes request - ${err.message}`));
-    })
-    .on('response', function(resp) {
-      if (resp.statusCode >= 400) {
-        changesRequest.abort();
-        callback(error.convertResponseError(resp));
-      } else {
-        changesRequest.pipe(liner())
-          .on('error', function(err) {
-            callback(err);
-          })
-          .pipe(change(onChange))
-          .on('error', function(err) {
-            callback(err);
-          })
-          .on('finish', function() {
-            processBuffer(true);
-            if (!lastSeq) {
-              logStream.end();
-              debug('changes request terminated before last_seq was sent');
-              callback(new error.BackupError('SpoolChangesError', 'Changes request terminated before last_seq was sent'));
-            } else {
-              debug('finished streaming database changes');
-              logStream.end(':changes_complete ' + lastSeq + '\n', 'utf8', callback);
-            }
-          });
-      }
-    });
+    }
+  });
 };

package/includes/writer.js

@@ -1,4 +1,4 @@
-// Copyright © 2017, 2019 IBM Corp. All rights reserved.
+// Copyright © 2017, 2021 IBM Corp. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
 
 const async = require('async');
 const stream = require('stream');
-const zlib = require('zlib');
 const error = require('./error.js');
 const debug = require('debug')('couchbackup:writer');
 
@@ -35,58 +34,22 @@ module.exports = function(db, bufferSize, parallelism, ee) {
       payload.new_edits = false;
     }
 
-    // Stream the payload through a zip stream to the server
-    const payloadStream = new stream.PassThrough();
-    payloadStream.end(Buffer.from(JSON.stringify(payload), 'utf8'));
-    const zipstream = zlib.createGzip();
-
-    // Class for streaming _bulk_docs responses into
-    // In general the response is [] or a small error/reason JSON object
-    // so it is OK to have this in memory.
-    class ResponseWriteable extends stream.Writable {
-      constructor(options) {
-        super(options);
-        this.data = [];
-      }
-
-      _write(chunk, encoding, callback) {
-        this.data.push(chunk);
-        callback();
-      }
-
-      asJson() {
-        return JSON.parse(Buffer.concat(this.data).toString());
-      }
-    }
-
     if (!didError) {
-      var response;
-      const responseBody = new ResponseWriteable();
-      const req = db.server.request({
-        db: db.config.db,
-        path: '_bulk_docs',
-        method: 'POST',
-        headers: { 'content-encoding': 'gzip' },
-        stream: true
-      })
-        .on('response', function(resp) {
-          response = resp;
-        })
-        .on('end', function() {
-          if (response.statusCode >= 400) {
-            const err = error.convertResponseError(Object.assign({}, response, responseBody.asJson()));
-            debug(`Error writing docs ${err.name} ${err.message}`);
-            cb(err, payload);
-          } else {
-            written += payload.docs.length;
-            writer.emit('restored', { documents: payload.docs.length, total: written });
-            cb();
-          }
-        });
-      // Pipe the payload into the request object to POST to _bulk_docs
-      payloadStream.pipe(zipstream).pipe(req);
-      // Pipe the request object's response into our bulkDocsResponse
-      req.pipe(responseBody);
+      db.service.postBulkDocs({
+        db: db.db,
+        bulkDocs: payload
+      }).then(response => {
+        if (!response.result || response.result.length > 0) {
+          throw new Error('Error writing batch.');
+        }
+        written += payload.docs.length;
+        writer.emit('restored', { documents: payload.docs.length, total: written });
+        cb();
+      }).catch(err => {
+        err = error.convertResponseError(err);
+        debug(`Error writing docs ${err.name} ${err.message}`);
+        cb(err, payload);
+      });
     }
   }, parallelism);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudant/couchbackup",
-  "version": "2.6.2-SNAPSHOT.21",
+  "version": "2.7.0",
   "description": "CouchBackup - command-line backup utility for Cloudant/CouchDB",
   "homepage": "https://github.com/cloudant/couchbackup",
   "repository": "https://github.com/cloudant/couchbackup.git",
@@ -20,7 +20,9 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@cloudant/cloudant": "^4.5.0",
+    "@ibm-cloud/cloudant": "0.0.18",
+    "tough-cookie": "^4.0.0",
+    "retry-axios": "^2.4.0",
     "async": "^3.1.0",
     "commander": "^5.0.0",
     "debug": "~4.1.0",