revert other revert, removed all-unpacker with node-unar, corrections, remove unneeded code, retry now part of node-wget-fetch

Author: TheTechsTech

installer.mjs

@@ -12,8 +12,8 @@ import {
   sep,
 } from 'path';
 import spawn from 'cross-spawn';
-import unCompress from 'all-unpacker';
-import fetching from 'node-wget-fetch';
+import { unpack } from 'node-unar';
+import { wget, isString } from 'node-wget-fetch';
 
 const __filename = fileURLToPath(
   import.meta.url);
@@ -92,53 +92,35 @@ function retrieve(path = {
   dest: ''
 }) {
   console.log('Downloading ' + path.url);
-  return new Promise((resolve, reject) => {
-    fetching.wget(path.url, path.dest)
-      .then((info) => resolve(info))
-      .catch((err) => reject('Error downloading file: ' + err));
-  });
+  return wget(path.url, path.dest, { retry: { retries: 5 } })
+    .then((info) => {
+      return info;
+    })
+    .catch((err) => {
+      throw ('Error downloading file: ' + err);
+    });
 }
 
 function platformUnpacker(platformData = windowsPlatform) {
-  return new retryPromise({
-    retries: 5
-  }, (resolve, retry) => {
-    return retrieve({
+  return new Promise((resolve, reject) => {
+    retrieve({
       url: platformData.url + platformData.filename,
       dest: platformData.source
     }).then(() => {
       console.log('Extracting: ' + platformData.filename);
-      if (fetching.isString(platformData.platform)) {
+      if (isString(platformData.platform)) {
         unpack(platformData.source, platformData.destination)
-          .then(() => {
+          .then((results) => {
+            console.log('Archive of type: ' + results.type)
+            console.log('Successfully extracted to: ' + results.directory)
             return resolve(platformData.platform);
           })
-          .catch((err) => retry(err));
+          .catch((err) => reject(err));
       }
-    }).catch((err) => retry(err));
+    }).catch((err) => reject(err));
   }).catch((err) => console.error(err));
 }
 
-function unpack(source, destination, toCopy) {
-  return new Promise((resolve, reject) => {
-    return unCompress.unpack(
-      source, {
-        files: (toCopy == null ? '' : toCopy),
-        targetDir: destination,
-        forceOverwrite: true,
-        noDirectory: true,
-        quiet: true,
-      },
-      (err, files, text) => {
-        if (err)
-          return reject(err);
-        console.log(text);
-        return resolve(files);
-      }
-    );
-  });
-}
-
 function extraUnpack(cmd = '', source = '', destination = '', toCopy = []) {
   let args = ['e', source, '-o' + destination];
   let extraArgs = args.concat(toCopy).concat(['-r', '-aos']);
@@ -170,97 +152,19 @@ function makeExecutable(binary = [], binaryFolder = '') {
   });
 }
 
-/**
- * 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}
- *
- * @see https://github.com/wouter-vdb/retrying-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;
-}
-
 let extractionPromises = [];
 let platforms = [linuxPlatform, appleMacPlatform, windowsOtherPlatform];
 if (process.platform == 'win32')
   platforms = [linuxPlatform, appleMacPlatform, windowsPlatform, windowsOtherPlatform];
 
 platforms.forEach((dataFor) => {
   fs.mkdir(dataFor.destination, (err) => {
-    if (err) {}
+    if (err) { }
   });
   const extracted = retrieve({
-      url: _7zAppUrl + dataFor.extraName,
-      dest: dataFor.extraSourceFile
-    })
+    url: _7zAppUrl + dataFor.extraName,
+    dest: dataFor.extraSourceFile
+  })
     .then(() => {
       return platformUnpacker(dataFor)
         .then(() => {