Generate socks http agents on the fly (reuse is not working)

Author: yciabaud

lib/client/http-tracker.js

@@ -6,6 +6,7 @@ var debug = require('debug')('bittorrent-tracker:http-tracker')
 var extend = require('xtend')
 var get = require('simple-get')
 var inherits = require('inherits')
+var Socks = require('socks')
 var url = require('url')
 
 var common = require('../common')
@@ -93,6 +94,9 @@ HTTPTracker.prototype._request = function (requestUrl, params, cb) {
   if (self.client._proxyOpts) {
     agent = parsedUrl.protocol === 'https:'
       ? self.client._proxyOpts.httpsAgent : self.client._proxyOpts.httpAgent
+    if (!agent && self.client._proxyOpts.socksProxy) {
+      agent = new Socks.Agent(extend(self.client._proxyOpts.socksProxy), (parsedUrl.protocol === 'https:'))
+    }
   }
   var u = {
     url: parsedUrl,

lib/client/udp-tracker.js

@@ -79,7 +79,6 @@ UDPTracker.prototype._request = function (opts) {
 
   var proxyOpts = self.client._proxyOpts && extend(self.client._proxyOpts.socksProxy)
   if (proxyOpts) {
-    proxyOpts.proxy = extend(proxyOpts.proxy)
     if (!proxyOpts.proxy) {
       proxyOpts.proxy = {}
     }

lib/client/websocket-tracker.js

@@ -6,6 +6,7 @@ var inherits = require('inherits')
 var Peer = require('simple-peer')
 var randombytes = require('randombytes')
 var Socket = require('simple-websocket')
+var Socks = require('socks')
 var url = require('url')
 
 var common = require('../common')
@@ -173,6 +174,9 @@ WebSocketTracker.prototype._openSocket = function () {
     if (self.client._proxyOpts) {
       agent = parsedUrl.protocol === 'wss:'
         ? self.client._proxyOpts.httpsAgent : self.client._proxyOpts.httpAgent
+      if (!agent && self.client._proxyOpts.socksProxy) {
+        agent = new Socks.Agent(extend(self.client._proxyOpts.socksProxy), (parsedUrl.protocol === 'wss:'))
+      }
     }
     self.socket = socketPool[self.announceUrl] = new Socket(self.announceUrl, { agent: agent })
     self.socket.consumers = 1