remove redundant methods

Author: 07souravkunda

lib/Local.js

@@ -34,7 +34,7 @@ function Local(){
     if(typeof options['onlyCommand'] !== 'undefined')
       return;
 
-    const binaryPath = this.getBinaryPathSync();
+    const binaryPath = this.getBinaryPath();
     that.binaryPath = binaryPath;
     childProcess.exec('echo "" > ' + that.logfile);
     that.opcode = 'start';
@@ -236,21 +236,6 @@ function Local(){
     }
   };
 
-  this.getBinaryPathSync = function(){
-    if(typeof(this.binaryPath) == 'undefined'){
-      this.binary = new LocalBinary();
-      var conf = {};
-      if(this.proxyHost && this.proxyPort){
-        conf.proxyHost = this.proxyHost;
-        conf.proxyPort = this.proxyPort;
-      }
-      return this.binary.binaryPathSync(conf);
-    } else {
-      console.log('BINARY PATH IS DEFINED');
-      return this.binaryPath;
-    }
-  }
-
   this.getBinaryPath = function(callback){
     if(typeof(this.binaryPath) == 'undefined'){
       this.binary = new LocalBinary();
@@ -259,10 +244,10 @@ function Local(){
         conf.proxyHost = this.proxyHost;
         conf.proxyPort = this.proxyPort;
       }
-      this.binary.binaryPath(conf, callback);
+      return callback ? this.binary.binaryPath(conf, callback) : this.binary.binaryPath(conf);
     } else {
       console.log('BINARY PATH IS DEFINED');
-      callback(this.binaryPath);
+      return callback ? callback(this.binaryPath) : this.binaryPath;
     }
   };
 

lib/LocalBinary.js

@@ -39,21 +39,7 @@ function LocalBinary(){
 
   this.httpPath = this.getDownloadPath();
 
-  this.retryBinaryDownloadSync = function(conf, destParentDir, retries, binaryPath){
-    var that = this;
-    if(retries > 0) {
-      console.log('Retrying Download. Retries left', retries);
-      try {
-        const stats = fs.statSync(binaryPath)
-        fs.unlinkSync(binaryPath);
-      } catch(er) {}
-
-      that.downloadSync(conf, destParentDir, retries - 1)
 
-    } else {
-      console.error('Number of retries to download exceeded.');
-    }
-  }
 
   this.retryBinaryDownload = function(conf, destParentDir, callback, retries, binaryPath) {
     var that = this;
@@ -63,7 +49,7 @@ function LocalBinary(){
         if(err == null) {
           fs.unlinkSync(binaryPath);
         }
-        that.download(conf, destParentDir, callback, retries - 1);
+        return callback ? that.download(conf, destParentDir, callback, retries - 1) : that.downloadSync(conf, destParentDir, retries - 1);
       });
     } else {
       console.error('Number of retries to download exceeded.');
@@ -118,19 +104,19 @@ function LocalBinary(){
       }
       if(output.includes('failed')){
         console.log('failed to download');
-        that.retryBinaryDownloadSync(conf, destParentDir, retries, binaryPath);
+        return that.retryBinaryDownload(conf, destParentDir, null, retries, binaryPath);
       }else{
         if(fs.existsSync(binaryPath)){
           fs.chmodSync(binaryPath, '0755')
           return binaryPath;
         }else{
           console.log('failed to download');
-          that.retryBinaryDownloadSync(conf, destParentDir, retries, binaryPath);
+          return that.retryBinaryDownload(conf, destParentDir, null, retries, binaryPath);
         }
       }
     } catch(err) {
       console.log('Download failed with error', err);
-      that.retryBinaryDownloadSync(conf, destParentDir, retries, binaryPath);
+      return that.retryBinaryDownload(conf, destParentDir, null, retries, binaryPath);
     }
   }
 
@@ -172,25 +158,14 @@ function LocalBinary(){
     });
   };
 
-  this.binaryPathSync = function(conf){
-    var destParentDir = this.getAvailableDirs();
-    var destBinaryName = (this.windows) ? 'BrowserStackLocal.exe' : 'BrowserStackLocal';
-    var binaryPath = path.join(destParentDir, destBinaryName);
-    if(this.checkPath(binaryPath, fs.X_OK)){
-      return binaryPath;
-    } else {
-      return this.downloadSync(conf, destParentDir, 5);
-    }
-  }
-
   this.binaryPath = function(conf, callback){
     var destParentDir = this.getAvailableDirs();
     var destBinaryName = (this.windows) ? 'BrowserStackLocal.exe' : 'BrowserStackLocal';
     var binaryPath = path.join(destParentDir, destBinaryName);
     if(this.checkPath(binaryPath, fs.X_OK)){
-      callback(binaryPath);
+      return callback ? callback(binaryPath) : binaryPath;
     } else {
-      this.download(conf, destParentDir, callback, 5);
+      return callback ? this.download(conf, destParentDir, callback, 5) : this.downloadSync(conf, destParentDir, 5);
     }
   };