merge master

Author: Karan Nagpal

bin/helpers/zipUpload.js

@@ -1,6 +1,11 @@
 'use strict';
+
+const request = require("request"),
+  fs = require("fs");
+
+const cliProgress = require('cli-progress');
+
 const config = require("./config"),
-  request = require("request"),
   logger = require("./logger").winstonLogger,
   Constants = require("./constants"),
   utils = require("./utils");
@@ -16,11 +21,29 @@ const uploadSuits = (bsConfig, filePath, opts) => {
       return resolve({});
     }
 
-    logger.info(opts.messages.uploading);
+    let size = fs.lstatSync(filePath).size;
+
+    // create new progress bar
+    let bar1 = new cliProgress.SingleBar({
+      format: `${filePath} [{bar}] {percentage}% | ETA: {eta}s | Speed: {speed} kbps | Duration: {duration}s`,
+      hideCursor: true,
+    });
+
+    bar1.start(100, 0, {
+      speed: "N/A"
+    });
+
+    bar1.on('start', () => {
+    });
+
+    bar1.on('stop', () => {
+    });
 
     let options = utils.generateUploadParams(bsConfig, filePath, opts.md5Data, opts.fileDetails)
     let responseData = null;
-    request.post(options, function (err, resp, body) {
+    var r = request.post(options, function (err, resp, body) {
+      clearInterval(q);
+
       if (err) {
         reject(err);
       } else {
@@ -52,13 +75,26 @@ const uploadSuits = (bsConfig, filePath, opts) => {
             }
           }
         } else {
+          bar1.update(100, {
+            speed: ((size / (Date.now() - startTime)) / 125).toFixed(2) //kbits per sec
+          });
+          bar1.stop();
           logger.info(`${opts.messages.uploadingSuccess} (${responseData[opts.md5ReturnKey]})`);
           opts.cleanupMethod();
           responseData["time"] = Date.now() - startTime;
           resolve(responseData);
         }
       }
     });
+
+    var q = setInterval(function () {
+      let dispatched = r.req.connection._bytesDispatched;
+      let percent = dispatched * 100.0 / size;
+      bar1.update(percent, {
+        speed: ((dispatched / (Date.now() - startTime)) / 125).toFixed(2) //kbits per sec
+      });
+    }, 150);
+
   });
 }
 
@@ -68,6 +104,15 @@ const uploadCypressZip = (bsConfig, md5data, packageData) => {
     let obj = {}
     const zipOptions = utils.generateUploadOptions('zip', md5data, packageData);
     const npmOptions = utils.generateUploadOptions('npm', md5data, packageData);
+
+    if (!zipOptions.urlPresent && zipOptions.archivePresent) {
+      logger.info(zipOptions.messages.uploading);
+    }
+
+    if (!npmOptions.urlPresent && npmOptions.archivePresent) {
+      logger.info(npmOptions.messages.uploading);
+    }
+
     let zipUpload = uploadSuits(bsConfig, config.fileName, zipOptions);
     let npmPackageUpload = uploadSuits(bsConfig, config.packageFileName, npmOptions);
     Promise.all([zipUpload, npmPackageUpload]).then(function (uploads) {

package.json

@@ -14,20 +14,22 @@
   "dependencies": {
     "archiver": "^5.2.0",
     "async": "^3.2.0",
+    "axios": "^0.21.1",
     "browserstack-local": "^1.4.8",
     "chalk": "^4.1.0",
+    "cli-progress": "^3.9.1",
     "fs-extra": "^8.1.0",
     "getmac": "^5.17.0",
     "glob": "^7.1.6",
     "mkdirp": "^1.0.3",
     "request": "^2.88.0",
     "requestretry": "^4.1.0",
     "table": "^5.4.6",
+    "unzipper": "^0.10.11",
+    "update-notifier": "^5.1.0",
     "uuid": "^8.3.2",
     "winston": "^2.3.1",
-    "yargs": "^14.2.3",
-    "unzipper": "^0.10.11",
-    "update-notifier": "^5.1.0"
+    "yargs": "^14.2.3"
   },
   "repository": {
     "type": "git",