remove/update dependencies, embed retry

Author: TheTechsTech

installer.js

@@ -6,7 +6,6 @@ const fs = require('fs-extra'),
   path = require('path'),
   spawn = require('cross-spawn'),
   unCompress = require('all-unpacker'),
-  retryPromise = require('retrying-promise'),
   fetching = require('node-wget-fetch'),
   system_installer = require('system-installer'),
   macos_release = require('macos-release');
@@ -348,3 +347,79 @@ Promise.all(extractionPromises)
     });
   })
   .catch((err) => console.log(err));
+
+/**
+ * Returns a promise that conditionally tries to resolve multiple times, as specified by the retry
+ * policy.
+ * @param {retryPolicy} [options] - Either An object that specifies the retry policy.
+ * @param {retryExecutor} executor - A function that is called for each attempt to resolve the promise.
+ * @returns {Promise}
+ */
+function retryPromise(options, executor) {
+  if (executor == undefined) {
+    executor = options;
+    options = {};
+  }
+
+  var opts = prepOpts(options);
+  var attempts = 1;
+
+  return new Promise((resolve, reject) => {
+    let retrying = false;
+
+    function retry(err) {
+      if (retrying) return;
+      retrying = true;
+      if (attempts < opts.retries) {
+        setTimeout(() => {
+          attempts++;
+          retrying = false;
+          executor(resolve, retry, reject, attempts);
+        }, createTimeout(attempts, opts));
+      } else {
+        //console.log(attempts, opts.retries);
+        reject(err);
+      }
+    }
+
+    executor(resolve, retry, reject, attempts);
+  });
+}
+
+/*
+ * Preps the options object, initializing default values and checking constraints.
+ * @param {Object} options - The options as provided to `retryingPromise`.
+ */
+function prepOpts(options) {
+  var opts = {
+    retries: 10,
+    factor: 2,
+    minTimeout: 1000,
+    maxTimeout: Infinity,
+    randomize: false
+  };
+  for (var key in options) {
+    opts[key] = options[key];
+  }
+
+  if (opts.minTimeout > opts.maxTimeout) {
+    throw new Error('minTimeout is greater than maxTimeout');
+  }
+
+  return opts;
+}
+
+/**
+ * Get a timeout value in milliseconds.
+ * @param {number} attempt - The attempt count.
+ * @param {Object} opts - The options.
+ * @returns {number} The timeout value in milliseconds.
+ */
+function createTimeout(attempt, opts) {
+  var random = opts.randomize ? Math.random() + 1 : 1;
+
+  var timeout = Math.round(random * opts.minTimeout * Math.pow(opts.factor, attempt));
+  timeout = Math.min(timeout, opts.maxTimeout);
+
+  return timeout;
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "node-7z-forall",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "description": "A CommonJs and ESM frontend to 7-Zip, downloads binaries in for Linux, Windows, and Mac OSX, with methods to create SFX self extracting 7z archives targeting different platforms.",
     "type": "commonjs",
     "main": "lib/index.js",
@@ -10,7 +10,7 @@
     },
     "scripts": {
         "test": "mocha --recursive test/ --timeout=0 --extension mjs --extension js",
-        "coverage": "npx nyc@latest --reporter json --reporter text mocha --recursive test/ --timeout=0 --extension mjs --extension js && codecov -f coverage/coverage-final.json",
+        "coverage": "npx nyc@latest --reporter json --reporter text mocha --recursive test/ --timeout=0 --extension mjs --extension js && npx codecov -f coverage/coverage-final.json",
         "install": "node installer.js"
     },
     "repository": {
@@ -60,18 +60,16 @@
         "node": ">=10.0.0"
     },
     "dependencies": {
-        "all-unpacker": "^0.1.12",
+        "all-unpacker": "^0.1.13",
         "cross-spawn": "^7.0.3",
         "fs-extra": "^9.0.1",
         "macos-release": "^2.4.1",
         "node-wget-fetch": "^1.0.5",
-        "retrying-promise": "^0.0.4",
         "system-installer": "^1.1.5",
         "when": "^3.7.8"
     },
     "devDependencies": {
         "chai": "^4.2.0",
-        "codecov": "^3.8.0",
         "mocha": "^8.2.0"
     }
 }