clean up HTTP request options logic to avoid including extra URL properties

Author: eli-darkly

lib/eventsource.js

@@ -68,19 +68,19 @@ function EventSource (url, eventSourceInitDict) {
     config.jitterRatio ? retryDelay.defaultJitter(config.jitterRatio) : null
   )
 
-  function makeRequestOptions () {
-    var options = parse(url)
-    if (config.skipDefaultHeaders) {
-      options.headers = {}
-    } else {
-      options.headers = { 'Cache-Control': 'no-cache', 'Accept': 'text/event-stream' }
+  function makeRequestUrlAndOptions () {
+    // Returns { url, options }; url is null/undefined if the URL properties are in options
+    var actualUrl = url
+    var options = { headers: {} }
+    if (!config.skipDefaultHeaders) {
+      options.headers['Cache-Control'] = 'no-cache'
+      options.headers['Accept'] = 'text/event-stream'
     }
     if (lastEventId) options.headers['Last-Event-ID'] = lastEventId
     if (config.headers) {
-      for (var i in config.headers) {
-        var header = config.headers[i]
-        if (header) {
-          options.headers[i] = header
+      for (var key in config.headers) {
+        if (config.headers.hasOwnProperty(key)) {
+          options.headers[key] = config.headers[key]
         }
       }
     }
@@ -91,15 +91,19 @@ function EventSource (url, eventSourceInitDict) {
 
     // If specify http proxy, make the request to sent to the proxy server,
     // and include the original url in path and Host headers
-    var useProxy = config.proxy
-    if (useProxy) {
+    if (config.proxy) {
+      actualUrl = null
+      var parsedUrl = parse(url)
       var proxy = parse(config.proxy)
       options.protocol = proxy.protocol === 'https:' ? 'https:' : 'http:'
       options.path = url
-      options.headers.Host = options.host
+      options.headers.Host = parsedUrl.host
       options.hostname = proxy.hostname
       options.host = proxy.host
       options.port = proxy.port
+      if (proxy.username) {
+        options.auth = proxy.username + ':' + proxy.password
+      }
     }
 
     // When running in Node, proxies can also be specified as an agent
@@ -130,7 +134,7 @@ function EventSource (url, eventSourceInitDict) {
       options.method = config.method
     }
 
-    return options
+    return { url: actualUrl, options: options }
   }
 
   function defaultErrorFilter (error) {
@@ -179,10 +183,11 @@ function EventSource (url, eventSourceInitDict) {
   }
 
   function connect () {
-    var options = makeRequestOptions()
-    var isSecure = options.protocol === 'https:'
+    var urlAndOptions = makeRequestUrlAndOptions()
+    var isSecure = urlAndOptions.options.protocol === 'https:' ||
+      (urlAndOptions.url && urlAndOptions.url.startsWith('https:'))
 
-    req = (isSecure ? https : http).request(options, function (res) {
+    var callback = function (res) {
       // Handle HTTP redirects
       if (res.statusCode === 301 || res.statusCode === 307) {
         if (!res.headers.location) {
@@ -279,7 +284,11 @@ function EventSource (url, eventSourceInitDict) {
           buf = buf.slice(pos)
         }
       })
-    })
+    }
+    var api = isSecure ? https : http
+    req = urlAndOptions.url ?
+      api.request(urlAndOptions.url, urlAndOptions.options, callback) :
+      api.request(urlAndOptions.options, callback)
 
     if (config.readTimeoutMillis) {
       req.setTimeout(config.readTimeoutMillis)