improving proxy functionality fixes #89

Author: AleksandrRogov

lib/requests/http.js

@@ -1,9 +1,35 @@
 var http = require('http');
 var https = require('https');
 var url = require('url');
+var HttpProxyAgent = require('http-proxy-agent');
+var HttpsProxyAgent = require('https-proxy-agent');
 var parseResponse = require('./helpers/parseResponse');
 var ErrorHelper = require('../helpers/ErrorHelper');
 
+var proxyAgents = {};
+
+function getProxyAgent(options, headers) {
+	var protocol = parsedUrl.protocol.replace(':', '');
+
+	var proxy = options.proxy;
+	var proxyOptions = url.parse(proxy.url);
+
+	headers.host = proxyOptions.host;
+
+	if (!proxyAgents[protocol]) {
+		var proxyAgent = protocol === 'http' ? HttpProxyAgent : HttpsProxyAgent;
+
+		if (proxy.auth) {
+			var base64 = Buffer.from(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64');
+			proxyOptions.headers = { 'Proxy-Authorization': 'Basic ' + base64 };
+		}
+
+		proxyAgents[protocol] = new proxyAgent(proxyOptions);
+	}
+
+	return proxyAgents[protocol];
+}
+
 /**
  * Sends a request to given URL with given parameters
  *
@@ -18,6 +44,7 @@ var httpRequest = function (options) {
 	var errorCallback = options.errorCallback;
 	var timeout = options.timeout;
 	var requestId = options.requestId;
+	var proxy = options.proxy;
 
 	var headers = {};
 
@@ -35,7 +62,8 @@ var httpRequest = function (options) {
 
 	var parsedUrl = url.parse(uri);
 	var protocol = parsedUrl.protocol.replace(':', '');
-	var protocolInterface = protocol === 'http' ? http : https;
+	var isHttp = protocol === 'http';
+	var protocolInterface = isHttp ? http : https;
 
 	var internalOptions = {
 		hostname: parsedUrl.hostname,
@@ -46,24 +74,15 @@ var httpRequest = function (options) {
 		headers: headers
 	};
 
-	if (process.env[`${protocol}_proxy`]) {
-        /*
-         * Proxied requests don't work with Node's https module so use http to
-         * talk to the proxy server regardless of the endpoint protocol. This
-         * is unsuitable for environments where requests are expected to be
-         * using end-to-end TLS.
-         */
-		protocolInterface = http;
-		var proxyUrl = url.parse(process.env.http_proxy);
-		headers.host = parsedUrl.host;
-		internalOptions = {
-			hostname: proxyUrl.hostname,
-			port: proxyUrl.port,
-			path: parsedUrl.href,
-			method: method,
-			timeout: timeout,
-			headers: headers
-		};
+	//support environment variables (deprecated)
+	if (!proxy && process.env[`${protocol}_proxy`]) {
+		options.proxy = {
+			url: process.env[`${protocol}_proxy`]
+		}
+	}
+
+	if (proxy && proxy.url) {
+		internalOptions.agent = getProxyAgent(options, headers);
 	}
 
 	var request = protocolInterface.request(internalOptions, function (res) {
@@ -133,6 +152,7 @@ var httpRequest = function (options) {
 
 	if (internalOptions.timeout) {
 		request.setTimeout(internalOptions.timeout, function () {
+			delete responseParams[requestId];
 			request.abort();
 		});
 	}

package-lock.json

@@ -38,7 +38,10 @@
     "webpack-cli": "^4.2.0",
     "webpack-strip-block": "^0.3.0"
   },
-  "dependencies": {},
+  "dependencies": {
+    "http-proxy-agent": "^4.0.1",
+    "https-proxy-agent": "^5.0.0"
+  },
   "license": "MIT",
   "scripts": {
     "test": "mocha tests/*-tests.js",

package.json

@@ -535,7 +535,7 @@ declare namespace DynamicsWebApi {
 		contentId?: string;
 		/**v.1.4.3 + Casts the AttributeMetadata to a specific type. (Used in requests to Attribute Metadata). */
 		metadataAttributeType?: string;
-		/**A String representing the name of a single - valued navigation property.Useful when needed to retrieve information about a related record in a single request. */
+		/**A String representing the name of a single - valued navigation property. Useful when needed to retrieve information about a related record in a single request. */
 		navigationProperty?: string;
 		/**v.1.4.3 + A String representing navigation property's Primary Key (GUID) or Alternate Key(s). (For example, to retrieve Attribute Metadata). */
 		navigationPropertyKey?: string;