https-proxy-agent: use "extend" module

TooTallNate · TooTallNate · commit 11e54c80da75 · 2013-09-10T18:38:34.000-07:00
This allows us to default the "port" in a cleaner manner, as well as
we are now mixing in the `proxy` options to the destination server as well.

Mixing in the `proxy` options fixes the failing tests on node &lt; node v0.11.6.
diff --git a/https-proxy-agent.js b/https-proxy-agent.js
@@ -6,6 +6,7 @@
 var net = require('net');
 var tls = require('tls');
 var url = require('url');
+var extend = require('extend');
 var Agent = require('agent-base');
 var inherits = require('util').inherits;
 var debug = require('debug')('https-proxy-agent');
@@ -30,7 +31,7 @@ function HttpsProxyAgent (opts) {
   debug('creating new HttpsProxyAgent instance: %j', opts);
   Agent.call(this, connect);
 
-  var proxy = clone(opts, {});
+  var proxy = extend({}, opts);
 
   // if `true`, then connect to the proxy server over TLS. defaults to `false`.
   this.secureProxy = proxy.protocol ? proxy.protocol == 'https:' : false;
@@ -53,14 +54,20 @@ function HttpsProxyAgent (opts) {
 }
 inherits(HttpsProxyAgent, Agent);
 
+/**
+ * Defaults for the "connect" opts object.
+ */
+
+var defaults = { port: 443 };
+
 /**
  * Called when the node-core HTTP client library is creating a new HTTP request.
  *
  * @api public
  */
 
-function connect (req, opts, fn) {
-  if (null == opts.port) opts.port = 443;
+function connect (req, _opts, fn) {
+  var opts = extend({}, this.proxy, defaults, _opts);
 
   var socket;
   if (this.secureProxy) {
@@ -112,8 +119,3 @@ function connect (req, opts, fn) {
     '\r\n';
   socket.write(msg);
 };
-
-function clone (src, dest) {
-  for (var i in src) dest[i] = src[i];
-  return dest;
-}
diff --git a/package.json b/package.json
@@ -23,7 +23,8 @@
   },
   "dependencies": {
     "agent-base": "~1.0.1",
-    "debug": "~0.7.2"
+    "debug": "~0.7.2",
+    "extend": "~1.2.0"
   },
   "devDependencies": {
     "mocha": "~1.12.0",
