Standard fix and test update

Author: yciabaud

client-socks.js

@@ -0,0 +1,63 @@
+var Client = require('../')
+var Buffer = require('safe-buffer').Buffer
+
+var peerId1 = Buffer.from('01234567890123456789')
+var port = 6881
+
+var client = new Client({
+  infoHash: '4d753474429d817b80ff9e0c441ca660ec5d2450',
+  announce: [
+    // 'udp://tracker.leechers-paradise.org:6969'
+    // 'http://mgtracker.org:2710/announce'
+    'wss://tracker.webtorrent.io'
+  ],
+  peerId: peerId1,
+  port: port,
+  wrtc: {},
+  proxyOpts: {
+    socksProxy: {
+      proxy: {
+        ipAddress: 'localhost',
+        port: 1080,
+        type: 5
+      }
+    }
+  }
+})
+
+client.on('error', function (err) {
+  // fatal client error!
+  console.log(err.message)
+})
+
+client.on('warning', function (err) {
+  // a tracker was unavailable or sent bad data to the client. you can probably ignore it
+  console.log(err.message)
+})
+
+// scrape
+client.scrape()
+
+client.on('scrape', function (data) {
+  console.log('got a scrape response from tracker: ' + data.announce)
+  console.log('number of seeders in the swarm: ' + data.complete)
+  console.log('number of leechers in the swarm: ' + data.incomplete)
+  console.log('number of total downloads of this torrent: ' + data.downloaded)
+
+  // start getting peers from the tracker
+  client.start()
+
+  client.once('update', function (data) {
+    console.log('got an announce response from tracker: ' + data.announce)
+    console.log('number of seeders in the swarm: ' + data.complete)
+    console.log('number of leechers in the swarm: ' + data.incomplete)
+
+    client.once('update', function (data) {
+      client.destroy()
+    })
+  })
+
+  client.once('peer', function (addr) {
+    console.log('found a peer: ' + addr) // 85.10.239.191:48623
+  })
+})

lib/client/http-tracker.js

@@ -91,8 +91,8 @@ HTTPTracker.prototype._request = function (requestUrl, params, cb) {
   var parsedUrl = url.parse(requestUrl + (requestUrl.indexOf('?') === -1 ? '?' : '&') + common.querystringStringify(params))
   var agent
   if (self.client._proxyOpts) {
-      agent = parsedUrl.protocol === 'https:' ?
-          self.client._proxyOpts.httpsAgent : self.client._proxyOpts.httpAgent
+    agent = parsedUrl.protocol === 'https:'
+      ? self.client._proxyOpts.httpsAgent : self.client._proxyOpts.httpAgent
   }
   var u = {
     url: parsedUrl,

lib/client/websocket-tracker.js

@@ -169,8 +169,11 @@ WebSocketTracker.prototype._openSocket = function () {
     socketPool[self.announceUrl].consumers += 1
   } else {
     var parsedUrl = url.parse(self.announceUrl)
-    var agent = self.client._proxyOpts && parsedUrl.protocol === 'wss:' ?
-        self.client._proxyOpts.httpsAgent : self.client._proxyOpts.httpAgent
+    var agent
+    if (self.client._proxyOpts) {
+      agent = parsedUrl.protocol === 'wss:'
+        ? self.client._proxyOpts.httpsAgent : self.client._proxyOpts.httpAgent
+    }
     self.socket = socketPool[self.announceUrl] = new Socket(self.announceUrl, { agent: agent })
     self.socket.consumers = 1
     self.socket.on('connect', self._onSocketConnectBound)

test/client.js

@@ -399,7 +399,9 @@ function testClientStartHttpAgent (t, serverType) {
       peerId: peerId1,
       port: port,
       wrtc: {},
-      httpAgent: agent
+      proxyOpts: {
+        httpAgent: agent
+      }
     })
 
     if (serverType === 'ws') common.mockWebsocketTracker(client)