Use clone to deepcopy socks opts and add socks agent generation to we…

…bconns

lib/torrent.js

@@ -5,6 +5,7 @@ module.exports = Torrent
 var addrToIPPort = require('addr-to-ip-port')
 var BitField = require('bitfield')
 var ChunkStoreWriteStream = require('chunk-store-stream/write')
+var clone = require('clone')
 var debug = require('debug')('webtorrent:torrent')
 var Discovery = require('torrent-discovery')
 var EventEmitter = require('events').EventEmitter
@@ -1660,7 +1661,7 @@ Torrent.prototype._drain = function () {
   }
 
   if (self.client.proxyOpts && self.client.proxyOpts.socksProxy && self.client.proxyOpts.proxyPeerConnections) {
-    var proxyOpts = extend(self.client.proxyOpts.socksProxy, {
+    var proxyOpts = clone(self.client.proxyOpts.socksProxy, {
       command: 'connect',
       target: opts
     })

lib/webconn.js

@@ -2,11 +2,13 @@ module.exports = WebConn
 
 var BitField = require('bitfield')
 var Buffer = require('safe-buffer').Buffer
+var clone = require('clone')
 var debug = require('debug')('webtorrent:webconn')
 var get = require('simple-get')
 var inherits = require('inherits')
 var sha1 = require('simple-sha1')
 var url = require('url')
+var Socks = require('socks')
 var Wire = require('bittorrent-protocol')
 
 var VERSION = require('../package.json').version
@@ -119,9 +121,13 @@ WebConn.prototype.httpRequest = function (pieceIndex, offset, length, cb) {
     )
 
     var agent
-    if (self._torrent.client.proxyOpts && self._torrent.client.proxyOpts.proxyPeerConnections) {
+    var proxyOpts = self._torrent.client.proxyOpts
+    if (proxyOpts && proxyOpts.proxyPeerConnections) {
       agent = parsedUrl.protocol === 'https:'
-        ? self._torrent.client.proxyOpts.httpsAgent : self._torrent.client.proxyOpts.httpAgent
+        ? proxyOpts.httpsAgent : proxyOpts.httpAgent
+      if (!agent && proxyOpts.socksProxy) {
+        agent = new Socks.Agent(clone(proxyOpts.socksProxy), (parsedUrl.protocol === 'https:'))
+      }
     }
     var opts = {
       url: parsedUrl,

package.json

@@ -32,6 +32,7 @@
     "bittorrent-dht": "^7.2.2",
     "bittorrent-protocol": "^2.1.5",
     "chunk-store-stream": "^2.0.2",
+    "clone": "^1.0.2",
     "create-torrent": "^3.24.5",
     "debug": "^2.2.0",
     "end-of-stream": "^1.1.0",