Merge pull request http-party#1 from rstudio/stripped

Updated package, stripped down to basic HTTP proxy and null out memory leaks.

Author: trestletech

.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - 0.6
   - 0.8
+  - "0.10"
+  - "0.11"
 
 notifications:
   email:

README.md

@@ -18,6 +18,9 @@
 * Written entirely in Javascript
 * Easy to use API
 
+
+node-http-proxy is `<= 0.8.x` compatible, if you're looking for a `>= 0.10` compatible version please check [caronte](https://github.com/nodejitsu/node-http-proxy/tree/caronte)
+
 ### When to use node-http-proxy
 
 Let's suppose you were running multiple http application servers, but you only wanted to expose one machine to the internet. You could setup node-http-proxy on that one machine and then reverse-proxy the incoming http requests to locally running services which were not exposed to the outside network. 
@@ -345,7 +348,10 @@ var options = {
   https: {
     SNICallback: function (hostname) {
       return certs[hostname];
-    }
+    },
+    cert: myCert,
+    key: myKey,
+    ca: [myCa]
   },
   hostnameOnly: true,
   router: {
@@ -515,7 +521,7 @@ server.listen(8080);
 
 ### Configuring your Socket limits
 
-By default, `node-http-proxy` will set a 100 socket limit for all `host:port` proxy targets. You can change this in two ways: 
+By default, `node-http-proxy` will set a 200 socket limit for all `host:port` proxy targets. You can change this in two ways: 
 
 1. By passing the `maxSockets` option to `httpProxy.createServer()`
 2. By calling `httpProxy.setMaxSockets(n)`, where `n` is the number of sockets you with to use. 

lib/node-http-proxy.js

@@ -26,9 +26,8 @@
 
 var util = require('util'),
     http = require('http'),
-    https = require('https'),
     events = require('events'),
-    maxSockets = 100;
+    maxSockets = 200;
 
 //
 // Expose version information through `pkginfo`.
@@ -38,10 +37,7 @@ require('pkginfo')(module, 'version');
 //
 // ### Export the relevant objects exposed by `node-http-proxy`
 //
-var HttpProxy    = exports.HttpProxy    = require('./node-http-proxy/http-proxy').HttpProxy,
-    ProxyTable   = exports.ProxyTable   = require('./node-http-proxy/proxy-table').ProxyTable,
-    RoutingProxy = exports.RoutingProxy = require('./node-http-proxy/routing-proxy').RoutingProxy;
-
+var HttpProxy    = exports.HttpProxy    = require('./node-http-proxy/http-proxy').HttpProxy;
 //
 // ### function createServer ([port, host, options, handler])
 // #### @port {number} **Optional** Port to use on the proxy target host.
@@ -82,7 +78,7 @@ exports.createServer = function () {
       case 'function': callback = arg; handlers.push(callback); break;
     };
   });
-  
+
   //
   // Helper function to create intelligent error message(s)
   // for the very liberal arguments parsing performed by
@@ -91,32 +87,32 @@ exports.createServer = function () {
   function validArguments() {
     var conditions = {
       'port and host': function () {
-        return port && host; 
+        return port && host;
       },
       'options.target or options.router': function () {
-        return options && (options.router || 
+        return options && (options.router ||
           (options.target && options.target.host && options.target.port));
       },
       'or proxy handlers': function () {
         return handlers && handlers.length;
       }
     }
-    
+
     var missing = Object.keys(conditions).filter(function (name) {
       return !conditions[name]();
     });
-    
+
     if (missing.length === 3) {
       message = 'Cannot proxy without ' + missing.join(', ');
       return false;
     }
-    
+
     return true;
-  } 
-  
+  }
+
   if (!validArguments()) {
     //
-    // If `host`, `port` and `options` are all not passed (with valid 
+    // If `host`, `port` and `options` are all not passed (with valid
     // options) then this server is improperly configured.
     //
     throw new Error(message);
@@ -131,7 +127,7 @@ exports.createServer = function () {
   options.target      = options.target      || {};
   options.target.port = options.target.port || port;
   options.target.host = options.target.host || host;
-  
+
   if (options.target && options.target.host && options.target.port) {
     //
     // If an explicit `host` and `port` combination has been passed
@@ -144,39 +140,18 @@ exports.createServer = function () {
     });
   }
   else {
-    //
-    // If no explicit `host` or `port` combination has been passed then
-    // we have to assume that this is a "go-anywhere" Proxy (i.e. a `RoutingProxy`).
-    //
-    proxy = new RoutingProxy(options);
-    
-    if (options.router) {
-      //
-      // If a routing table has been supplied than we assume 
-      // the user intends us to add the "proxy" middleware layer
-      // for them  
-      //
-      handlers.push(function (req, res) {
-        proxy.proxyRequest(req, res);
-      });
-      
-      proxy.on('routes', function (routes) {
-        server.emit('routes', routes);
-      });
-    } 
+    console.error("The modified HTTP Proxy can't be used this way anymore.");
   }
-  
+
   //
   // Create the `http[s].Server` instance which will use
   // an instance of `httpProxy.HttpProxy`.
   //
-  handler = handlers.length > 1 
+  handler = handlers.length > 1
     ? exports.stack(handlers, proxy)
     : function (req, res) { handlers[0](req, res, proxy) };
-  
-  server  = options.https
-    ? https.createServer(options.https, handler)
-    : http.createServer(handler);
+
+  server  = http.createServer(handler);
 
   server.on('close', function () {
     proxy.close();
@@ -185,8 +160,8 @@ exports.createServer = function () {
   if (!callback) {
     //
     // If an explicit callback has not been supplied then
-    // automagically proxy the request using the `HttpProxy` 
-    // instance we have created. 
+    // automatically proxy the request using the `HttpProxy`
+    // instance we have created.
     //
     server.on('upgrade', function (req, socket, head) {
       proxy.proxyWebSocketRequest(req, socket, head);
@@ -223,7 +198,7 @@ exports.createServer = function () {
 //
 exports.buffer = function (obj) {
   var events = [],
-      onData, 
+      onData,
       onEnd;
 
   obj.on('data', onData = function (data, encoding) {
@@ -237,14 +212,14 @@ exports.buffer = function (obj) {
   return {
     end: function () {
       obj.removeListener('data', onData);
-      obj.removeListener('end', onEnd);
+      obj.removeListener('end', onEnd);      
     },
     destroy: function () {
       this.end();
      	this.resume = function () {
      	  console.error("Cannot resume buffer after destroying it.");
      	};
-     	
+
      	onData = onEnd = events = obj = null;
     },
     resume: function () {
@@ -276,56 +251,6 @@ exports.setMaxSockets = function (value) {
   maxSockets = value;
 };
 
-//
-// ### function stack (middlewares, proxy)
-// #### @middlewares {Array} Array of functions to stack.
-// #### @proxy {HttpProxy|RoutingProxy} Proxy instance to 
-// Iteratively build up a single handler to the `http.Server`
-// `request` event (i.e. `function (req, res)`) by wrapping
-// each middleware `layer` into a `child` middleware which 
-// is in invoked by the parent (i.e. predecessor in the Array).
-//
-// adapted from https://github.com/creationix/stack
-//
-exports.stack = function stack (middlewares, proxy) {
-  var handle;
-  middlewares.reverse().forEach(function (layer) {
-    var child = handle;
-    handle = function (req, res) {
-      var next = function (err) {
-        if (err) {
-          if (res._headerSent) {
-            res.destroy();
-          } 
-          else {
-            res.statusCode = 500;
-            res.setHeader('Content-Type', 'text/plain');
-            res.end('Internal Server Error');
-          }
-          
-          console.error('Error in middleware(s): %s', err.stack);
-          return;
-        }
-        
-        if (child) {
-          child(req, res);
-        }
-      };
-
-      //
-      // Set the prototype of the `next` function to the instance
-      // of the `proxy` so that in can be used interchangably from
-      // a `connect` style callback and a true `HttpProxy` object.
-      //
-      // e.g. `function (req, res, next)` vs. `function (req, res, proxy)`
-      //
-      next.__proto__ = proxy;
-      layer(req, res, next);
-    };
-  });
-
-  return handle;
-};
 
 //
 // ### function _getAgent (host, port, secure)
@@ -345,12 +270,12 @@ exports._getAgent = function _getAgent (options) {
   if (!options || !options.host) {
     throw new Error('`options.host` is required to create an Agent.');
   }
-  
+
   if (!options.port) {
-    options.port = options.https ? 443 : 80;
+    options.port = 80;
   }
 
-  var Agent = options.https ? https.Agent : http.Agent,
+  var Agent = http.Agent,
       agent;
 
   // require('http-proxy').setMaxSockets() should override http's default
@@ -364,11 +289,11 @@ exports._getAgent = function _getAgent (options) {
 //
 // ### function _getProtocol (options)
 // #### @options {Object} Options for the proxy target.
-// Returns the appropriate node.js core protocol module (i.e. `http` or `https`) 
-// based on the `options` supplied. 
+// Returns the appropriate node.js core protocol module (i.e. `http` or `https`)
+// based on the `options` supplied.
 //
 exports._getProtocol = function _getProtocol (options) {
-  return options.https ? https : http;
+  return http;
 };
 
 
@@ -381,7 +306,7 @@ exports._getProtocol = function _getProtocol (options) {
 //
 exports._getBase = function _getBase (options) {
   var result = function () {};
-  
+
   if (options.https && typeof options.https === 'object') {
     ['ca', 'cert', 'key'].forEach(function (key) {
       if (options.https[key]) {