@cloudant/couchbackup 2.7.1-SNAPSHOT.53 → 2.7.1-SNAPSHOT.57

package/.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "package-lock.json|test/fixtures|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2021-11-08T12:18:50Z",
+  "generated_at": "2021-11-16T14:34:16Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -82,7 +82,7 @@
         "hashed_secret": "90c240c0ecfb254c589319f022de059fc739c54a",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 140,
+        "line_number": 152,
         "type": "NPM tokens",
         "verified_result": null
       }
@@ -130,7 +130,7 @@
         "hashed_secret": "6367c48dd193d56ea7b0baad25b19455e529f5ee",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 167,
+        "line_number": 178,
         "type": "Secret Keyword",
         "verified_result": null
       },
@@ -138,7 +138,7 @@
         "hashed_secret": "e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 167,
+        "line_number": 178,
         "type": "Basic Auth Credentials",
         "verified_result": null
       }
@@ -200,7 +200,7 @@
         "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 126,
+        "line_number": 143,
         "type": "Basic Auth Credentials",
         "verified_result": null
       },
@@ -208,7 +208,7 @@
         "hashed_secret": "e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 264,
+        "line_number": 305,
         "type": "Basic Auth Credentials",
         "verified_result": null
       }

package/CHANGES.md

@@ -2,6 +2,8 @@
 - [FIXED] Corrected `user-agent` header on requests.
 - [FIXED] Restore of shallow backups created with versions <=2.4.2.
 - [IMPROVED] Added quiet option to backup and restore to suppress batch messages.
+- [IMPROVED] Added a preflight check for restore function to make sure that a target database is new and empty.
+- [IMPROVED] Added handling for errors reading log file.
 
 # 2.7.0 (2021-09-14)
 - [UPGRADED] Cloudant client dependency from `@cloudant/cloudant` to `@ibm-cloud/cloudant`.

package/README.md

@@ -425,6 +425,8 @@ details them.
 
 ### `couchrestore`
 
+* `13`: restore target database is not new and empty.
+
 ## Note on attachments
 
 TLDR; If you backup a database that contains attachments you will not be able to restore it.

package/app.js

@@ -154,31 +154,63 @@ function addEventListener(indicator, emitter, event, f) {
 }
 
 /*
-  Check the referenced database exists and that the credentials used have
+  Check the backup database exists and that the credentials used have
   visibility. Callback with a fatal error if there is a problem with the DB.
   @param {string} db - database object
   @param {function(err)} callback - error is undefined if DB exists
 */
-function proceedIfDbValid(db, callback) {
+function proceedIfBackupDbValid(db, callback) {
   db.service.headDatabase({ db: db.db }).then(() => callback()).catch(err => {
-    err = error.convertResponseError(err, function(err) {
-      if (err && err.status === 404) {
-        // Override the error type and mesasge for the DB not found case
-        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';
-        return noDBErr;
-      } else {
-        // Delegate to the default error factory if it wasn't a 404
-        return error.convertResponseError(err);
-      }
-    });
+    err = error.convertResponseError(err, err => parseIfDbValidResponseError(db, err));
+    callback(err);
+  });
+}
+
+/*
+  Check that the restore database exists, is new and is empty. Also verify that the credentials used have
+  visibility. Callback with a fatal error if there is a problem with the DB.
+  @param {string} db - database object
+  @param {function(err)} callback - error is undefined if DB exists, new and empty
+*/
+function proceedIfRestoreDbValid(db, callback) {
+  db.service.getDatabaseInformation({ db: db.db }).then(response => {
+    const { doc_count: docCount, doc_del_count: deletedDocCount } = response.result;
+    // The system databases can have a validation ddoc(s) injected in them on creation.
+    // This sets the doc count off, so we just complitely exclude the system databases from this check.
+    // The assumption here is that users restoring system databases know what they are doing.
+    if (!db.db.startsWith('_') && (docCount !== 0 || deletedDocCount !== 0)) {
+      const notEmptyDBErr = new Error(`Target database ${db.url}${db.db} is not empty.`);
+      notEmptyDBErr.name = 'DatabaseNotEmpty';
+      callback(notEmptyDBErr);
+    } else {
+      callback();
+    }
+  }).catch(err => {
+    err = error.convertResponseError(err, err => parseIfDbValidResponseError(db, err));
     callback(err);
   });
 }
 
+/*
+  Convert the database validation response error to a special DatabaseNotFound error
+  in case the database is missing. Otherwise delegate to the default error factory.
+  @param {object} db - database object
+  @param {object} err - HTTP response error
+*/
+function parseIfDbValidResponseError(db, err) {
+  if (err && err.status === 404) {
+    // Override the error type and message for the DB not found case
+    const msg = `Database ${db.url}` +
+    `${db.db} does not exist. ` +
+    'Check the URL and database name have been specified correctly.';
+    const noDBErr = new Error(msg);
+    noDBErr.name = 'DatabaseNotFound';
+    return noDBErr;
+  }
+  // Delegate to the default error factory if it wasn't a 404
+  return error.convertResponseError(err);
+}
+
 module.exports = {
 
   /**
@@ -197,7 +229,7 @@ module.exports = {
    * @param {backupRestoreCallback} callback - Called on completion.
    */
   backup: function(srcUrl, targetStream, opts, callback) {
-    var listenerErrorIndicator = { errored: false };
+    const listenerErrorIndicator = { errored: false };
     if (typeof callback === 'undefined' && typeof opts === 'function') {
       callback = opts;
       opts = {};
@@ -222,7 +254,7 @@ module.exports = {
     const backupDB = request.client(srcUrl, opts);
 
     // Validate the DB exists, before proceeding to backup
-    proceedIfDbValid(backupDB, function(err) {
+    proceedIfBackupDbValid(backupDB, function(err) {
       if (err) {
         if (err.name === 'DatabaseNotFound') {
           err.message = `${err.message} Ensure the backup source database exists.`;
@@ -231,7 +263,7 @@ module.exports = {
         callback(err);
         return;
       }
-      var backup = null;
+      let backup = null;
       if (opts.mode === 'shallow') {
         backup = backupShallow;
       } else { // full mode
@@ -316,7 +348,7 @@ module.exports = {
    * @param {backupRestoreCallback} callback - Called on completion.
    */
   restore: function(srcStream, targetUrl, opts, callback) {
-    var listenerErrorIndicator = { errored: false };
+    const listenerErrorIndicator = { errored: false };
     if (typeof callback === 'undefined' && typeof opts === 'function') {
       callback = opts;
       opts = {};
@@ -330,10 +362,12 @@ module.exports = {
     const restoreDB = request.client(targetUrl, opts);
 
     // Validate the DB exists, before proceeding to restore
-    proceedIfDbValid(restoreDB, function(err) {
+    proceedIfRestoreDbValid(restoreDB, function(err) {
       if (err) {
         if (err.name === 'DatabaseNotFound') {
           err.message = `${err.message} Create the target database before restoring.`;
+        } else if (err.name === 'DatabaseNotEmpty') {
+          err.message = `${err.message} A target database must be a new and empty database.`;
         }
         // Didn't exist, or another fatal error, exit
         callback(err);

package/bin/couchbackup.bin.js

@@ -25,10 +25,10 @@ const backupBatchDebug = debug('couchbackup:backup:batch');
 
 backupDebug.enabled = true;
 
-var program = parser.parseBackupArgs();
+const program = parser.parseBackupArgs();
 
-var databaseUrl = cliutils.databaseUrl(program.url, program.db);
-var opts = {
+const databaseUrl = cliutils.databaseUrl(program.url, program.db);
+const opts = {
   bufferSize: program.bufferSize,
   log: program.log,
   mode: program.mode,
@@ -47,11 +47,11 @@ console.error('='.repeat(80));
 
 backupBatchDebug.enabled = !program.quiet;
 
-var ws = process.stdout;
+let ws = process.stdout;
 
 // open output file
 if (program.output) {
-  var flags = 'w';
+  let flags = 'w';
   if (program.log && program.resume) {
     flags = 'a';
   }

package/bin/couchrestore.bin.js

@@ -24,9 +24,9 @@ const restoreBatchDebug = debug('couchbackup:restore:batch');
 
 restoreDebug.enabled = true;
 
-var program = parser.parseRestoreArgs();
-var databaseUrl = cliutils.databaseUrl(program.url, program.db);
-var opts = {
+const program = parser.parseRestoreArgs();
+const databaseUrl = cliutils.databaseUrl(program.url, program.db);
+const opts = {
   bufferSize: program.bufferSize,
   parallelism: program.parallelism,
   requestTimeout: program.requestTimeout,

package/includes/backup.js

@@ -105,8 +105,8 @@ function validateBulkGetSupport(db, callback) {
  *  (err, {batches: batch, docs: doccount}) {@see spoolchanges}.
  */
 function downloadRemainingBatches(log, db, ee, startTime, batchesPerDownloadSession, parallelism) {
-  var total = 0; // running total of documents downloaded so far
-  var noRemainingBatches = false;
+  let total = 0; // running total of documents downloaded so far
+  let noRemainingBatches = false;
 
   // Generate a set of batches (up to batchesPerDownloadSession) to download from the
   // log file and download them. Set noRemainingBatches to `true` for last batch.
@@ -114,12 +114,18 @@ function downloadRemainingBatches(log, db, ee, startTime, batchesPerDownloadSess
     // Fetch the doc IDs for the batches in the current set to
     // download them.
     function batchSetComplete(err, data) {
-      total = data.total;
-      done();
+      if (!err) {
+        total = data.total;
+      }
+      done(err);
     }
     function processRetrievedBatches(err, batches) {
-      // process them in parallelised queue
-      processBatchSet(db, parallelism, log, batches, ee, startTime, total, batchSetComplete);
+      if (!err) {
+        // process them in parallelised queue
+        processBatchSet(db, parallelism, log, batches, ee, startTime, total, batchSetComplete);
+      } else {
+        batchSetComplete(err);
+      }
     }
 
     readBatchSetIdsFromLogFile(log, batchesPerDownloadSession, function(err, batchSetIds) {
@@ -157,18 +163,22 @@ function downloadRemainingBatches(log, db, ee, startTime, batchesPerDownloadSess
  */
 function readBatchSetIdsFromLogFile(log, batchesPerDownloadSession, callback) {
   logfilesummary(log, function processSummary(err, summary) {
-    if (!summary.changesComplete) {
-      callback(new error.BackupError('IncompleteChangesInLogFile',
-        'WARNING: Changes did not finish spooling'));
-      return;
-    }
-    if (Object.keys(summary.batches).length === 0) {
-      return callback(null, []);
-    }
+    if (!err) {
+      if (!summary.changesComplete) {
+        callback(new error.BackupError('IncompleteChangesInLogFile',
+          'WARNING: Changes did not finish spooling'));
+        return;
+      }
+      if (Object.keys(summary.batches).length === 0) {
+        return callback(null, []);
+      }
 
-    // batch IDs are the property names of summary.batches
-    var batchSetIds = getPropertyNames(summary.batches, batchesPerDownloadSession);
-    callback(null, batchSetIds);
+      // batch IDs are the property names of summary.batches
+      const batchSetIds = getPropertyNames(summary.batches, batchesPerDownloadSession);
+      callback(null, batchSetIds);
+    } else {
+      callback(err);
+    }
   });
 }
 
@@ -188,13 +198,13 @@ function readBatchSetIdsFromLogFile(log, batchesPerDownloadSession, callback) {
  * @param {any} callback - completion callback, (err, {total: number}).
  */
 function processBatchSet(db, parallelism, log, batches, ee, start, grandtotal, callback) {
-  var hasErrored = false;
-  var total = grandtotal;
+  let hasErrored = false;
+  let total = grandtotal;
 
   // queue to process the fetch requests in an orderly fashion using _bulk_get
-  var q = async.queue(function(payload, done) {
-    var output = [];
-    var thisBatch = payload.batch;
+  const q = async.queue(function(payload, done) {
+    const output = [];
+    const thisBatch = payload.batch;
     delete payload.batch;
     delete payload.command;
 
@@ -223,7 +233,7 @@ function processBatchSet(db, parallelism, log, batches, ee, start, grandtotal, c
         }
       });
       total += output.length;
-      var t = (new Date().getTime() - start) / 1000;
+      const t = (new Date().getTime() - start) / 1000;
       ee.emit('received', {
         batch: thisBatch,
         data: output,
@@ -243,7 +253,7 @@ function processBatchSet(db, parallelism, log, batches, ee, start, grandtotal, c
     });
   }, parallelism);
 
-  for (var i in batches) {
+  for (const i in batches) {
     q.push(batches[i]);
   }
 
@@ -260,9 +270,9 @@ function processBatchSet(db, parallelism, log, batches, ee, start, grandtotal, c
  */
 function getPropertyNames(obj, count) {
   // decide which batch numbers to deal with
-  var batchestofetch = [];
-  var j = 0;
-  for (var i in obj) {
+  const batchestofetch = [];
+  let j = 0;
+  for (const i in obj) {
     batchestofetch.push(parseInt(i));
     j++;
     if (j >= count) break;

package/includes/change.js

@@ -14,13 +14,13 @@
 'use strict';
 
 // stolen from http://strongloop.com/strongblog/practical-examples-of-the-new-node-js-streams-api/
-var stream = require('stream');
+const stream = require('stream');
 
 module.exports = function(onChange) {
-  var change = new stream.Transform({ objectMode: true });
+  const change = new stream.Transform({ objectMode: true });
 
   change._transform = function(line, encoding, done) {
-    var obj = null;
+    let obj = null;
 
     // one change per line - remove the trailing comma
     line = line.trim().replace(/,$/, '');

package/includes/config.js

@@ -13,8 +13,8 @@
 // limitations under the License.
 'use strict';
 
-var path = require('path');
-var tmp = require('tmp');
+const path = require('path');
+const tmp = require('tmp');
 
 /**
   Return API default settings.
@@ -34,7 +34,7 @@ function apiDefaults() {
   Return CLI default settings.
 */
 function cliDefaults() {
-  var defaults = apiDefaults();
+  const defaults = apiDefaults();
 
   // add additional legacy settings
   defaults.db = 'test';

package/includes/error.js

@@ -20,6 +20,7 @@ const codes = {
   DatabaseNotFound: 10,
   Unauthorized: 11,
   Forbidden: 12,
+  DatabaseNotEmpty: 13,
   NoLogFileName: 20,
   LogDoesNotExist: 21,
   IncompleteChangesInLogFile: 22,

package/includes/liner.js

@@ -14,21 +14,21 @@
 'use strict';
 
 // stolen from http://strongloop.com/strongblog/practical-examples-of-the-new-node-js-streams-api/
-var stream = require('stream');
+const stream = require('stream');
 
 module.exports = function() {
-  var liner = new stream.Transform({ objectMode: true });
+  const liner = new stream.Transform({ objectMode: true });
 
   liner._transform = function(chunk, encoding, done) {
-    var data = chunk.toString();
+    let data = chunk.toString();
     if (this._lastLineData) {
       data = this._lastLineData + data;
     }
 
-    var lines = data.split('\n');
+    const lines = data.split('\n');
     this._lastLineData = lines.splice(lines.length - 1, 1)[0];
 
-    for (var i in lines) {
+    for (const i in lines) {
       this.push(lines[i]);
     }
     done();

package/includes/logfilegetbatches.js

@@ -17,17 +17,17 @@ const fs = require('fs');
 const stream = require('stream');
 const liner = require('./liner.js');
 
-var onLine = function(onCommand, batches) {
-  var change = new stream.Transform({ objectMode: true });
+const onLine = function(onCommand, batches) {
+  const change = new stream.Transform({ objectMode: true });
   change._transform = function(line, encoding, done) {
     if (line && line[0] === ':') {
-      var obj = {
+      const obj = {
         command: null,
         batch: null,
         docs: []
       };
 
-      var matches;
+      let matches;
 
       // extract command
       matches = line.match(/^:([a-z_]+) ?/);
@@ -43,7 +43,7 @@ var onLine = function(onCommand, batches) {
 
       // if this is one we want
       if (obj.command === 't' && batches.indexOf(obj.batch) > -1) {
-        var json = line.replace(/^.* batch[0-9]+ /, '').trim();
+        const json = line.replace(/^.* batch[0-9]+ /, '').trim();
         obj.docs = JSON.parse(json);
         onCommand(obj);
       }
@@ -55,10 +55,10 @@ var onLine = function(onCommand, batches) {
 
 module.exports = function(log, batches, callback) {
   // our sense of state
-  var retval = { };
+  const retval = { };
 
   // called with each line from the log file
-  var onCommand = function(obj) {
+  const onCommand = function(obj) {
     retval[obj.batch] = obj;
   };
 
@@ -66,6 +66,9 @@ module.exports = function(log, batches, callback) {
   fs.createReadStream(log)
     .pipe(liner())
     .pipe(onLine(onCommand, batches))
+    .on('error', function(err) {
+      callback(err);
+    })
     .on('finish', function() {
       callback(null, retval);
     });

package/includes/logfilesummary.js

@@ -17,18 +17,18 @@ const fs = require('fs');
 const stream = require('stream');
 const liner = require('./liner.js');
 
-var onLine = function(onCommand, getDocs) {
-  var change = new stream.Transform({ objectMode: true });
+const onLine = function(onCommand, getDocs) {
+  const change = new stream.Transform({ objectMode: true });
 
   change._transform = function(line, encoding, done) {
     if (line && line[0] === ':') {
-      var obj = {
+      const obj = {
         command: null,
         batch: null,
         docs: []
       };
 
-      var matches;
+      let matches;
 
       // extract command
       matches = line.match(/^:([a-z_]+) ?/);
@@ -44,7 +44,7 @@ var onLine = function(onCommand, getDocs) {
 
       // extract doc ids
       if (getDocs && obj.command === 't') {
-        var json = line.replace(/^.* batch[0-9]+ /, '').trim();
+        const json = line.replace(/^.* batch[0-9]+ /, '').trim();
         obj.docs = JSON.parse(json);
       }
       onCommand(obj);
@@ -65,13 +65,13 @@ var onLine = function(onCommand, getDocs) {
  */
 module.exports = function(log, callback) {
   // our sense of state
-  var state = {
+  const state = {
 
   };
-  var changesComplete = false;
+  let changesComplete = false;
 
   // called with each line from the log file
-  var onCommand = function(obj) {
+  const onCommand = function(obj) {
     if (obj.command === 't') {
       state[obj.batch] = true;
     } else if (obj.command === 'd') {
@@ -86,7 +86,7 @@ module.exports = function(log, callback) {
     .pipe(liner())
     .pipe(onLine(onCommand, false))
     .on('finish', function() {
-      var obj = { changesComplete: changesComplete, batches: state };
+      const obj = { changesComplete: changesComplete, batches: state };
       callback(null, obj);
     });
 };

package/includes/parser.js

@@ -20,7 +20,7 @@ const path = require('path');
 const pkg = require('../package.json');
 
 function parseBackupArgs() {
-  var program = require('commander');
+  const program = require('commander');
 
   // Option CLI defaults
   const defaults = config.cliDefaults();
@@ -84,7 +84,7 @@ function parseBackupArgs() {
 }
 
 function parseRestoreArgs() {
-  var program = require('commander');
+  const program = require('commander');
 
   // Option CLI defaults
   const defaults = config.cliDefaults();

package/includes/request.js

@@ -102,7 +102,7 @@ const errorHelper = async function(err) {
 module.exports = {
   client: function(rawUrl, opts) {
     const url = new URL(rawUrl);
-    var protocol = (url.protocol.match(/^https/)) ? https : http;
+    const protocol = (url.protocol.match(/^https/)) ? https : http;
     const keepAliveAgent = new protocol.Agent({
       keepAlive: true,
       keepAliveMsecs: 30000,

package/includes/restore.js

@@ -14,8 +14,8 @@
 'use strict';
 
 module.exports = function(db, options, readstream, ee, callback) {
-  var liner = require('../includes/liner.js')();
-  var writer = require('../includes/writer.js')(db, options.bufferSize, options.parallelism, ee);
+  const liner = require('../includes/liner.js')();
+  const writer = require('../includes/writer.js')(db, options.bufferSize, options.parallelism, ee);
 
   // pipe the input to the output, via transformation functions
   readstream

package/includes/shallowbackup.js

@@ -20,16 +20,16 @@ const events = require('events');
 module.exports = function(db, options) {
   const ee = new events.EventEmitter();
   const start = new Date().getTime();
-  var batch = 0;
-  var hasErrored = false;
-  var startKey = null;
-  var total = 0;
+  let batch = 0;
+  let hasErrored = false;
+  let startKey = null;
+  let total = 0;
 
   async.doUntil(
     function(callback) {
       // Note, include_docs: true is set automatically when using the
       // fetch function.
-      var opts = { db: db.db, limit: options.bufferSize, includeDocs: true };
+      const 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
@@ -49,7 +49,7 @@ module.exports = function(db, options) {
             startKey = body.rows[opts.limit - 1].id;
           }
 
-          var docs = [];
+          const docs = [];
           body.rows.forEach(function(doc) {
             docs.push(doc.doc);
           });

package/includes/spoolchanges.js

@@ -30,16 +30,16 @@ const debug = require('debug')('couchbackup:spoolchanges');
  */
 module.exports = function(db, log, bufferSize, ee, callback) {
   // list of document ids to process
-  var buffer = [];
-  var batch = 0;
-  var lastSeq = null;
-  var logStream = fs.createWriteStream(log);
+  const buffer = [];
+  let batch = 0;
+  let lastSeq = null;
+  const logStream = fs.createWriteStream(log);
 
   // send documents ids to the queue in batches of bufferSize + the last batch
-  var processBuffer = function(lastOne) {
+  const processBuffer = function(lastOne) {
     if (buffer.length >= bufferSize || (lastOne && buffer.length > 0)) {
       debug('writing', buffer.length, 'changes to the backup file');
-      var b = { docs: buffer.splice(0, bufferSize), batch: batch };
+      const b = { docs: buffer.splice(0, bufferSize), batch: batch };
       logStream.write(':t batch' + batch + ' ' + JSON.stringify(b.docs) + '\n');
       ee.emit('changes', batch);
       batch++;
@@ -47,12 +47,12 @@ module.exports = function(db, log, bufferSize, ee, callback) {
   };
 
   // called once per received change
-  var onChange = function(c) {
+  const onChange = function(c) {
     if (c) {
       if (c.error) {
         ee.emit('error', new error.BackupError('InvalidChange', `Received invalid change: ${c}`));
       } else if (c.changes) {
-        var obj = { id: c.id };
+        const obj = { id: c.id };
         buffer.push(obj);
         processBuffer(false);
       } else if (c.last_seq) {

package/includes/writer.js

@@ -20,15 +20,15 @@ const debug = require('debug')('couchbackup:writer');
 
 module.exports = function(db, bufferSize, parallelism, ee) {
   const writer = new stream.Transform({ objectMode: true });
-  var buffer = [];
-  var written = 0;
-  var linenumber = 0;
+  let buffer = [];
+  let written = 0;
+  let linenumber = 0;
 
   // this is the queue of chunks that are written to the database
   // the queue's payload will be an array of documents to be written,
   // the size of the array will be bufferSize. The variable parallelism
   // determines how many HTTP requests will occur at any one time.
-  var q = async.queue(function(payload, cb) {
+  const q = async.queue(function(payload, cb) {
     // if we are restoring known revisions, we need to supply new_edits=false
     if (payload.docs && payload.docs[0] && payload.docs[0]._rev) {
       payload.new_edits = false;
@@ -55,7 +55,7 @@ module.exports = function(db, bufferSize, parallelism, ee) {
     }
   }, parallelism);
 
-  var didError = false;
+  let didError = false;
 
   // write the contents of the buffer to CouchDB in blocks of bufferSize
   function processBuffer(flush, callback) {
@@ -73,7 +73,7 @@ module.exports = function(db, bufferSize, parallelism, ee) {
       // and feed the chunks to the queue
       do {
         // split the buffer into bufferSize chunks
-        var toSend = buffer.splice(0, bufferSize);
+        const toSend = buffer.splice(0, bufferSize);
 
         // and add the chunk to the queue
         debug(`Adding ${toSend.length} to the write queue.`);
@@ -126,7 +126,7 @@ module.exports = function(db, bufferSize, parallelism, ee) {
     if (!didError && obj !== '') {
       // see if it parses as JSON
       try {
-        var arr = JSON.parse(obj);
+        const arr = JSON.parse(obj);
 
         // if it's an array with a length
         if (typeof arr === 'object' && arr.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudant/couchbackup",
-  "version": "2.7.1-SNAPSHOT.53",
+  "version": "2.7.1-SNAPSHOT.57",
   "description": "CouchBackup - command-line backup utility for Cloudant/CouchDB",
   "homepage": "https://github.com/cloudant/couchbackup",
   "repository": "https://github.com/cloudant/couchbackup.git",
@@ -36,28 +36,23 @@
   "devDependencies": {
     "eslint": "^8.2.0",
     "eslint-config-semistandard": "^16.0.0",
-    "eslint-config-standard": "^15.0.1",
+    "eslint-config-standard": "^16.0.3",
     "eslint-plugin-header": "^3.0.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.0.0",
     "eslint-plugin-react": "^7.14.2",
-    "eslint-plugin-standard": "^5.0.0",
     "http-proxy": "^1.16.2",
     "jsdoc": "^3.6.7",
     "mocha": "^9.1.3",
     "nock": "^13.2.1",
-    "rewire": "^5.0.0",
     "tail": "^2.0.0",
     "toxy": "^0.3.16",
     "uuid": "^8.3.2"
   },
   "scripts": {
-    "test": "eslint --ignore-path .gitignore . && mocha --grep \"#unit\""
-  },
-  "greenkeeper": {
-    "ignore": [
-      "eslint"
-    ]
+    "lint": "eslint --ignore-path .gitignore .",
+    "unit": "mocha --grep \"#unit\"",
+    "test": "npm run lint && npm run unit"
   }
 }