Proxy fix Refactor code

Author: kanhaiya

lib/config.js

@@ -3,25 +3,11 @@ var httpTunnelConfigPath =
   httpTunnelLogUrl = 'https://oinwgsy681.execute-api.us-east-1.amazonaws.com/prod/addLog',
   https = require('https'),
   urlParse = require('url'),
-  HttpsProxyAgent = require('https-proxy-agent');
+  HttpsProxyAgent = require('https-proxy-agent'),
+  util = require('./util');
 module.exports = function(options, fnCallback) {
   var reqOptions = urlParse.parse(httpTunnelConfigPath);
-  var proxyOpts = {};
-  if (options.proxyHost && options.proxyPort) {
-    proxyOpts = {
-      host: options.proxyHost,
-      port: options.proxyPort
-    };
-  } else if (process.env.http_proxy) {
-    proxyOpts = urlParse.parse(process.env.http_proxy);
-  }
-  if ((options.proxyUser && !options.proxyPass) || (!options.proxyUser && options.proxyPass)) {
-    throw Error('proxyUser and proxyPass must be both or none');
-  } else if (options.proxyUser && options.proxyPass) {
-    if (Object.keys(proxyOpts).length) {
-      proxyOpts.auth = options.proxyUser + ':' + options.proxyPass;
-    }
-  }
+  var proxyOpts = util.getProxyOpts_(options);
   if (Object.keys(proxyOpts).length) {
     reqOptions.agent = new HttpsProxyAgent(proxyOpts);
   }
@@ -91,26 +77,7 @@ function setupLogger_(options, jsonResponse) {
               'Content-Length': data.length
             }
           };
-
-          var proxyOpts = {};
-          if (options.proxyHost && options.proxyPort) {
-            proxyOpts = {
-              host: options.proxyHost,
-              port: options.proxyPort
-            };
-          } else if (process.env.http_proxy) {
-            proxyOpts = urlParse.parse(process.env.http_proxy);
-          }
-          if (
-            (options.proxyUser && !options.proxyPass) ||
-            (!options.proxyUser && options.proxyPass)
-          ) {
-            throw Error('proxyUser and proxyPass must be both or none');
-          } else if (options.proxyUser && options.proxyPass) {
-            if (Object.keys(proxyOpts).length) {
-              proxyOpts.auth = options.proxyUser + ':' + options.proxyPass;
-            }
-          }
+          var proxyOpts = util.getProxyOpts_(options);
           if (Object.keys(proxyOpts).length) {
             reqOptions.agent = new HttpsProxyAgent(proxyOpts);
           }

lib/tunnel.js

@@ -5,6 +5,7 @@ var childProcess = require('child_process'),
   http = require('http'),
   urlParse = require('url'),
   HttpsProxyAgent = require('https-proxy-agent'),
+  util = require('./util'),
   getPort = require('get-port'),
   os = require('os'),
   logger,
@@ -403,23 +404,7 @@ function verifyToken_(options, fnCallback) {
         version: packageVersion
       }
     };
-
-    var proxyOpts = {};
-    if (options.proxyHost && options.proxyPort) {
-      proxyOpts = {
-        host: options.proxyHost,
-        port: options.proxyPort
-      };
-    } else if (process.env.http_proxy) {
-      proxyOpts = urlParse.parse(process.env.http_proxy);
-    }
-    if ((options.proxyUser && !options.proxyPass) || (!options.proxyUser && options.proxyPass)) {
-      throw Error('proxyUser and proxyPass must be both or none');
-    } else if (options.proxyUser && options.proxyPass) {
-      if (Object.keys(proxyOpts).length) {
-        proxyOpts.auth = options.proxyUser + ':' + options.proxyPass;
-      }
-    }
+    var proxyOpts = util.getProxyOpts_(options);
     if (Object.keys(proxyOpts).length) {
       reqOptions.agent = new HttpsProxyAgent(proxyOpts);
     }

lib/tunnel_binary.js

@@ -3,6 +3,7 @@ var localTunnelConfig_ = require('./conf/node-tunnel-config.json'),
   https = require('https'),
   urlParse = require('url'),
   HttpsProxyAgent = require('https-proxy-agent'),
+  util = require('./util'),
   unzip = require('unzipper'),
   fs = require('fs'),
   path = require('path'),
@@ -91,22 +92,7 @@ function TunnelBinary(httpTunnelConfig) {
       var self = this;
       // Set Proxy If User passed this to in arguments.
       var options = urlParse.parse(this.httpPath);
-      var proxyOpts = {};
-      if (conf.proxyHost && conf.proxyPort) {
-        proxyOpts = {
-          host: conf.proxyHost,
-          port: conf.proxyPort
-        };
-      } else if (process.env.http_proxy) {
-        proxyOpts = urlParse.parse(process.env.http_proxy);
-      }
-      if ((conf.proxyUser && !conf.proxyPass) || (!conf.proxyUser && conf.proxyPass)) {
-        throw Error('proxyUser and proxyPass must be both or none');
-      } else if (conf.proxyUser && conf.proxyPass) {
-        if (Object.keys(proxyOpts).length) {
-          proxyOpts.auth = conf.proxyUser + ':' + conf.proxyPass;
-        }
-      }
+      var proxyOpts = util.getProxyOpts_(conf);
       if (Object.keys(proxyOpts).length) {
         options.agent = new HttpsProxyAgent(proxyOpts);
       }

lib/util.js

@@ -0,0 +1,29 @@
+var urlParse = require('url');
+module.exports = {
+  getProxyOpts_
+};
+
+/**
+ * getProxyOpts_ is used to configre request
+ * @param {Object} options.
+ * @return {Object|Error} Return proxyOpts
+ */
+function getProxyOpts_(options) {
+  var proxyOpts = {};
+  if (options.proxyHost && options.proxyPort) {
+    proxyOpts = {
+      host: options.proxyHost,
+      port: options.proxyPort
+    };
+  } else if (process.env.http_proxy) {
+    proxyOpts = urlParse.parse(process.env.http_proxy);
+  }
+  if ((options.proxyUser && !options.proxyPass) || (!options.proxyUser && options.proxyPass)) {
+    throw Error('proxyUser and proxyPass must be both or none');
+  } else if (options.proxyUser && options.proxyPass) {
+    if (Object.keys(proxyOpts).length) {
+      proxyOpts.auth = options.proxyUser + ':' + options.proxyPass;
+    }
+  }
+  return proxyOpts
+}