Logging + Updated readme for new flags

- egressOnly:  Uses proxy settings only for outbound requests.
- ingressOnly: Uses proxy settings only for inbound requests.
- dns:         Comma separated list of dns servers
- sshConnType: Specify type of ssh connection (over_22, over_443, over_ws)
- mode:        Specifies in which mode tunnel should run [ssh,ws]
- nows:        Force tunnel to run in non websocket mode

Author: Kanhaiya Lal Singh

README.md

@@ -322,6 +322,12 @@ tunnelArguments = {
   logFile: '/lambdatest/logs.txt'
 };
 ```
+- egressOnly:  Uses proxy settings only for outbound requests.
+- ingressOnly: Uses proxy settings only for inbound requests.
+- dns:         Comma separated list of dns servers
+- sshConnType: Specify type of ssh connection (over_22, over_443, over_ws)
+- mode:        Specifies in which mode tunnel should run [ssh,ws] 
+- nows:        Force tunnel to run in non websocket mode
 
 ## Contribute
 

lib/config.js

@@ -81,9 +81,7 @@ function setupLogger_(options, jsonResponse) {
             reqOptions.agent = new HttpsProxyAgent(proxyOpts);
           }
           var req = https.request(reqOptions, res => {
-            res.on('data', d => {
-              process.stdout.write(d);
-            });
+            res.on('data', _ => {});
           });
 
           req.on('error', _ => {});

lib/tunnel.js

@@ -317,6 +317,9 @@ function runBinary_(self, retries, fnCallback) {
           self.isProcessRunning = true;
           isCallback = true;
           self.getTunnelName(function(tunnelName) {
+            if (tunnelName === null) {
+              return fnCallback(true, false);
+            }
             console.log(`Tunnel successfully initiated. You can start testing now`);
             return fnCallback(null, true);
           });
@@ -841,7 +844,6 @@ function getBinaryPath_(that, options, fnCallback) {
  */
 function retryTunnelName_(self, infoAPIPort, retries, fnCallback) {
   try {
-    var timeoutId = null;
     // Check whether max retries is reached ?.
     if (retries >= 0) {
       // local Server path for getting tunnelName
@@ -856,14 +858,11 @@ function retryTunnelName_(self, infoAPIPort, retries, fnCallback) {
           response.on('end', () => {
             // After successfully getting name clear the timeout and return name
             if (response.statusCode === 200) {
-              clearTimeout_(timeoutId);
               if (typeof json === 'string') json = JSON.parse(json);
               return fnCallback((json.data && json.data.tunnelName) || null);
             } else {
-              clearTimeout_(timeoutId);
-              timeoutId = setTimeout(function() {
-                retryTunnelName_(self, infoAPIPort, retries - 1, fnCallback);
-              }, 500);
+              sleep(500);
+              retryTunnelName_(self, infoAPIPort, retries - 1, fnCallback);
             }
           });
         })
@@ -876,21 +875,20 @@ function retryTunnelName_(self, infoAPIPort, retries, fnCallback) {
             'Getting error while trying to get the tunnel name from running local server. Error : ' +
               e
           );
-          clearTimeout_(timeoutId);
           // wait .5s for next retries
-          timeoutId = setTimeout(function() {
-            retryTunnelName_(self, infoAPIPort, retries - 1, fnCallback);
-          }, 500);
+          sleep(500);
+          retryTunnelName_(self, infoAPIPort, retries - 1, fnCallback);
         });
     } else {
-      clearTimeout_(timeoutId);
+      sleep(500);
       logger.log(
         self.options['user'],
         self.options['key'],
         { filename: __filename },
         self.options,
         'Number of retries to to get tunnel name exceeded.'
       );
+      console.log('Number of retries to to get tunnel name exceeded.');
       return fnCallback(null);
     }
   } catch (e) {
@@ -924,12 +922,11 @@ function clearTimeout_(timeoutId) {
 function killProcess_(that, fnCallback) {
   that.proc.on('exit', function() {
     if (that.proc.pid) {
-      setTimeout(function() {
-        try {
-          process.kill(that.proc.pid);
-        } catch (err) {}
-        return fnCallback();
-      }, 500);
+      sleep(500);
+      try {
+        process.kill(that.proc.pid);
+      } catch (err) {}
+      return fnCallback();
     }
     return fnCallback();
   });
@@ -940,5 +937,9 @@ function killProcess_(that, fnCallback) {
     that.proc.kill('SIGINT');
   }
 }
+function sleep( sleepDuration ){
+  var now = new Date().getTime();
+  while(new Date().getTime() < now + sleepDuration){ /* do nothing */ } 
+}
 module.exports = Tunnel;
 module.exports.Tunnel = Tunnel;