Merge pull request #1184 from browserstack/APS-22106-replace-decompress-with-adm-zip

[APS-22106] replace decompress@4.2.1 with adm-zip@0.6.1

Author: karanshah-browserstack

bin/helpers/buildArtifacts.js

@@ -11,7 +11,7 @@ const logger = require('./logger').winstonLogger,
 const { default: axios } = require('axios');
 const { HttpsProxyAgent = require('https-proxy-agent') } = require('https-proxy-agent');
 const FormData = require('form-data');
-const decompress = require('decompress');
+const AdmZip = require('adm-zip');
 const unzipper = require("unzipper");
 const { setAxiosProxy } = require('./helper');
 
@@ -154,10 +154,11 @@ const downloadAndUnzip = async (filePath, fileName, url) => {
 const unzipFile = async (filePath, fileName) => {
   return new Promise( async (resolve, reject) => {
     try {
-      await decompress(path.join(filePath, fileName), filePath);
+      const zip = new AdmZip(path.join(filePath, fileName));
+      await zip.extractAllToAsync(filePath, /* overwrite */ true);
       resolve();
     } catch (error) {
-      logger.debug(`Error unzipping with decompress, trying with unzipper. Stacktrace: ${error}.`);
+      logger.debug(`Error unzipping with adm-zip, trying with unzipper. Stacktrace: ${error}.`);
       try {
         fs.createReadStream(path.join(filePath, fileName))
           .pipe(unzipper.Extract({ path: filePath }))

bin/helpers/reporterHTML.js

@@ -6,7 +6,7 @@ const fs = require('fs'),
       utils = require("./utils"),
       Constants = require('./constants'),
       config = require("./config"),
-      decompress = require('decompress');
+      AdmZip = require('adm-zip');
 const { isTurboScaleSession } = require('../helpers/atsHelper');
 
 const { setAxiosProxy } = require('./helper');
@@ -171,15 +171,14 @@ function getReportResponse(filePath, fileName, reportJsonUrl) {
 
 const unzipFile = async (filePath, fileName) => {
   return new Promise( async (resolve, reject) => {
-    await decompress(path.join(filePath, fileName), filePath)
-    .then((files) => {
-      let message = "Unzipped the json and html successfully."
-      resolve(message);
-    })
-    .catch((error) => {
+    try {
+      const zip = new AdmZip(path.join(filePath, fileName));
+      await zip.extractAllToAsync(filePath, /* overwrite */ true);
+      resolve("Unzipped the json and html successfully.");
+    } catch (error) {
       reject(error);
       process.exitCode = Constants.ERROR_EXIT_CODE;
-    });
+    }
   });
 }