first commit

lucaswxp · lucaswxp · commit 78cd7dc9ce57 · 2015-12-14T15:38:23.000-03:00
diff --git a/README.md b/README.md
@@ -1,3 +1,45 @@
+This is a fork of the original https-proxy-agent library with the following additions:
+
+- You can set http headers to your agent/proxy
+- You will receive an event from the agent object when the response is ready
+
+I hacked the source so I could use the library to use with ProxyMesh's https integration:
+http://proxymesh.com/blog/pages/proxy-server-headers.html#https-connect-method
+
+It should work with other proxies too.
+
+See example using request library:
+
+```javascript
+var url = require('url'),
+    request = require('request'),
+    HttpsProxyAgent = require('https-proxy-agent');
+
+var u = url.parse('http://username:password@us-ca.proxymesh.com:31280');
+
+var proxy = new HttpsProxyAgent(u);
+
+var previousIp;
+proxy.on('response', function(resp){
+  previousIp = resp.headers['x-proxymesh-ip'];
+  //  get the proxy response
+  //  { statusCode: 200,
+  //  headers: { 'x-proxymesh-ip': '123.123.123' } }
+})
+
+// make request
+request({url: 'https://www.google.com', agent: proxy}, function(err, res){
+  console.log(res.headers)
+
+  // make another request with the same proxy mesh ip:
+  u.headers['X-ProxyMesh-IP'] = previousIp;
+  var proxy = new HttpsProxyAgent(u);
+  request({url: 'https://www.google.com', agent: proxy}, function(err, res){ // get the website response
+    ...
+  })
+})
+```
+
 https-proxy-agent
 ================
 ### An HTTP(s) proxy `http.Agent` implementation for HTTPS
diff --git a/https-proxy-agent.js b/https-proxy-agent.js
@@ -60,7 +60,8 @@ inherits(HttpsProxyAgent, Agent);
 
 function connect (req, opts, fn) {
 
-  var proxy = this.proxy;
+  var proxy = this.proxy,
+      self = this;
 
   // create a socket connection to the proxy server
   var socket;
@@ -124,6 +125,31 @@ function connect (req, opts, fn) {
     var firstLine = str.substring(0, str.indexOf('\r\n'));
     var statusCode = +firstLine.split(' ')[1];
     debug('got proxy server response: %o', firstLine);
+    self.emit('raw_response', buffered);
+
+    var resp = {
+      statusCode: statusCode,
+      headers: {}
+    }
+
+    // simple http header parser
+    var lines = buffered.toString('ascii').split('\r\n');
+    for(var i in lines){
+      var line = lines[i];
+
+      if(i == 0){
+        continue; // first line is: HTTP/1.1 200 Connection established
+      }else{
+        var sep = line.indexOf(':');
+        if(sep !== -1){
+          var headerName = line.slice(0, sep),
+              headerVal  = line.slice(sep+1).trim();
+
+          resp.headers[headerName.toLowerCase()] = headerVal;
+        }
+      }
+    }
+    self.emit('response', resp);
 
     if (200 == statusCode) {
       // 200 Connected status code!
@@ -191,16 +217,20 @@ function connect (req, opts, fn) {
 
   var hostname = opts.host + ':' + opts.port;
   var msg = 'CONNECT ' + hostname + ' HTTP/1.1\r\n';
+  var auth = proxy.auth;
 
-  var headers = extend({}, proxy.headers);
-  if (proxy.auth) {
-    headers['Proxy-Authorization'] = 'Basic ' + new Buffer(proxy.auth).toString('base64');
+  // send extra headers to proxy
+  if(proxy.headers){
+    for(var headerName in proxy.headers){
+      msg += headerName + ': ' + proxy.headers[headerName] + '\r\n';
+    }
   }
-  headers['Host'] = hostname;
-  headers['Connection'] = 'close';
-  Object.keys(headers).forEach(function (name) {
-    msg += name + ': ' + headers[name] + '\r\n';
-  });
 
-  socket.write(msg + '\r\n');
+  if (auth) {
+    msg += 'Proxy-Authorization: Basic ' + new Buffer(auth).toString('base64') + '\r\n';
+  }
+  msg += 'Host: ' + hostname + '\r\n' +
+         'Connection: close\r\n' +
+         '\r\n';
+  socket.write(msg);
 };
