changes for exit when zip upload failed

Author: roshan04

bin/helpers/zipUpload.js

@@ -10,9 +10,9 @@ const config = require("./config"),
   Constants = require("./constants"),
   utils = require("./utils");
 
-const uploadSuits = (bsConfig, filePath, opts) => {
+const uploadSuits = (bsConfig, filePath, opts, obj) => {
   return new Promise(function (resolve, reject) {
-    let startTime = Date.now();
+    obj.startTime = Date.now();
 
     if (opts.urlPresent) {
       return resolve({ [opts.md5ReturnKey]: opts.url });
@@ -21,28 +21,26 @@ const uploadSuits = (bsConfig, filePath, opts) => {
       return resolve({});
     }
 
-    let size = fs.lstatSync(filePath).size;
+    let size = obj.size;
 
     // create new progress bar
-    let bar1 = new cliProgress.SingleBar({
-      format: `${filePath} [{bar}] {percentage}% | ETA: {eta}s | Speed: {speed} kbps | Duration: {duration}s [${(size / 1000000).toFixed(2)} MB]`,
-      hideCursor: true,
+    obj.bar1 = new cliProgress.SingleBar({
+      format: `${filePath} [{bar}] {percentage}% | ETA: {eta}s | Speed: {speed} kbps | Duration: {duration}s [${(size / 1000000).toFixed(2)} MB]`
     });
 
-    bar1.start(100, 0, {
+    obj.bar1.start(100, 0, {
       speed: "N/A"
     });
 
-    bar1.on('start', () => {
+    obj.bar1.on('start', () => {
     });
 
-    bar1.on('stop', () => {
+    obj.bar1.on('stop', () => {
     });
 
     let options = utils.generateUploadParams(bsConfig, filePath, opts.md5Data, opts.fileDetails)
     let responseData = null;
     var r = request.post(options, function (err, resp, body) {
-      clearInterval(q);
 
       if (err) {
         reject(err);
@@ -55,7 +53,7 @@ const uploadSuits = (bsConfig, filePath, opts) => {
         if (resp.statusCode != 200) {
           if (resp.statusCode == 401) {
             if (responseData && responseData["error"]) {
-              responseData["time"] = Date.now() - startTime;
+              responseData["time"] = Date.now() - obj.startTime;
               return reject(responseData["error"]);
             } else {
               return reject(Constants.validationMessages.INVALID_DEFAULT_AUTH_PARAMS);
@@ -65,7 +63,7 @@ const uploadSuits = (bsConfig, filePath, opts) => {
             return resolve({});
           }
           if(responseData && responseData["error"]){
-            responseData["time"] = Date.now() - startTime;
+            responseData["time"] = Date.now() - obj.startTime;
             reject(responseData["error"]);
           } else {
             if (resp.statusCode == 413) {
@@ -75,30 +73,35 @@ const uploadSuits = (bsConfig, filePath, opts) => {
             }
           }
         } else {
-          bar1.update(100, {
-            speed: ((size / (Date.now() - startTime)) / 125).toFixed(2) //kbits per sec
-          });
-          bar1.stop();
+          purgeUploadBar(obj);
           logger.info(`${opts.messages.uploadingSuccess} (${responseData[opts.md5ReturnKey]})`);
           opts.cleanupMethod();
-          responseData["time"] = Date.now() - startTime;
+          responseData["time"] = Date.now() - obj.startTime;
           resolve(responseData);
         }
       }
     });
 
-    var q = setInterval(function () {
+    obj.zipInterval = 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
+      obj.bar1.update(percent, {
+        speed: ((dispatched / (Date.now() - obj.startTime)) / 125).toFixed(2) //kbits per sec
       });
     }, 150);
 
   });
 }
 
 
+const purgeUploadBar = (obj) => {
+  obj.bar1.update(100, {
+    speed: ((obj.size / (Date.now() - obj.startTime)) / 125).toFixed(2) //kbits per sec
+  });
+  obj.bar1.stop();
+  clearInterval(obj.zipInterval);
+}
+
 const uploadCypressZip = (bsConfig, md5data, packageData) => {
   return new Promise(function (resolve, reject) {
     let obj = {}
@@ -116,8 +119,22 @@ const uploadCypressZip = (bsConfig, md5data, packageData) => {
       logger.info(npmOptions.messages.uploading);
     }
 
-    let zipUpload = uploadSuits(bsConfig, config.fileName, zipOptions);
-    let npmPackageUpload = uploadSuits(bsConfig, config.packageFileName, npmOptions);
+    var testZipUploadObj = {
+      bar1: null,
+      zipInterval: null,
+      size: fs.existsSync(config.fileName) ? fs.lstatSync(config.fileName).size : 0,
+      startTime: null
+    }
+
+    var npmPackageZipUploadObj = {
+      bar1: null,
+      zipInterval: null,
+      size: fs.existsSync(config.packageFileName) ? fs.lstatSync(config.packageFileName).size : 0,
+      startTime: null
+    }
+
+    let zipUpload = uploadSuits(bsConfig, config.fileName, zipOptions, testZipUploadObj);
+    let npmPackageUpload = uploadSuits(bsConfig, config.packageFileName, npmOptions, npmPackageZipUploadObj);
     Promise.all([zipUpload, npmPackageUpload]).then(function (uploads) {
       uploads.forEach(upload => {
         if(upload.zip_url && upload.time) {
@@ -130,6 +147,8 @@ const uploadCypressZip = (bsConfig, md5data, packageData) => {
       });
       return resolve(obj);
     }).catch((error) => {
+      purgeUploadBar(testZipUploadObj);
+      purgeUploadBar(npmPackageZipUploadObj);
       return reject(error);
     })
   })