Merge remote-tracking branch 'feross/master'

Author: Joe Looney

lib/client/tracker.js

@@ -8,16 +8,15 @@ inherits(Tracker, EventEmitter)
 function Tracker (client, announceUrl) {
   var self = this
   EventEmitter.call(self)
-
   self.client = client
   self.announceUrl = announceUrl
+
   self.interval = null
   self.destroyed = false
 }
 
 Tracker.prototype.setInterval = function (intervalMs) {
   var self = this
-  if (self.interval) return
   if (intervalMs == null) intervalMs = self.DEFAULT_ANNOUNCE_INTERVAL
 
   clearInterval(self.interval)

lib/client/websocket-tracker.js

@@ -18,6 +18,7 @@ var socketPool = {}
 
 var RECONNECT_VARIANCE = 30 * 1000
 var RECONNECT_MINIMUM = 5 * 1000
+var OFFER_TIMEOUT = 50 * 1000
 
 inherits(WebSocketTracker, Tracker)
 
@@ -42,8 +43,7 @@ WebSocketTracker.prototype.announce = function (opts) {
     return self.socket.once('connect', self.announce.bind(self, opts))
   }
 
-  // TODO: Limit number of offers (temporarily)
-  // TODO: remove this when we cleanup old RTCPeerConnections cleanly
+  // Limit the number of offers that are generated, since it can be slow
   var numwant = Math.min(opts.numwant, 10)
 
   self._generateOffers(numwant, function (offers) {
@@ -177,6 +177,7 @@ WebSocketTracker.prototype._onSocketData = function (data) {
 
   var peer
   if (data.offer && data.peer_id) {
+    debug('creating peer (from remote offer)')
     peer = new Peer({
       trickle: false,
       config: self.client._rtcConfig,
@@ -199,11 +200,16 @@ WebSocketTracker.prototype._onSocketData = function (data) {
   }
 
   if (data.answer && data.peer_id) {
-    peer = self.peers[common.binaryToHex(data.offer_id)]
+    var offerId = common.binaryToHex(data.offer_id)
+    peer = self.peers[offerId]
     if (peer) {
       peer.id = common.binaryToHex(data.peer_id)
       peer.signal(data.answer)
       self.client.emit('peer', peer)
+
+      clearTimeout(peer.trackerTimeout)
+      peer.trackerTimeout = null
+      self.peers[offerId] = null
     } else {
       debug('got unexpected answer: ' + JSON.stringify(data.answer))
     }
@@ -253,13 +259,13 @@ WebSocketTracker.prototype._generateOffers = function (numwant, cb) {
   var offers = []
   debug('generating %s offers', numwant)
 
-  // TODO: cleanup dead peers and peers that never get a return offer, from self.peers
   for (var i = 0; i < numwant; ++i) {
     generateOffer()
   }
 
   function generateOffer () {
     var offerId = hat(160)
+    debug('creating peer (from _generateOffers)')
     var peer = self.peers[offerId] = new Peer({
       initiator: true,
       trickle: false,
@@ -273,6 +279,12 @@ WebSocketTracker.prototype._generateOffers = function (numwant, cb) {
       })
       checkDone()
     })
+    peer.trackerTimeout = setTimeout(function () {
+      debug('tracker timeout: destroying peer')
+      peer.trackerTimeout = null
+      self.peers[offerId] = null
+      peer.destroy()
+    }, OFFER_TIMEOUT)
   }
 
   function checkDone () {

lib/server/swarm.js

@@ -30,7 +30,7 @@ Swarm.prototype.announce = function (params, cb) {
   cb(null, {
     complete: self.complete,
     incomplete: self.incomplete,
-    peers: self._getPeers(params.numwant, !!params.socket)
+    peers: self._getPeers(params.numwant, params.peer_id, !!params.socket)
   })
 }
 
@@ -97,14 +97,16 @@ Swarm.prototype._onAnnounceUpdate = function (params, peer) {
   }
 }
 
-Swarm.prototype._getPeers = function (numwant, isWebRTC) {
+Swarm.prototype._getPeers = function (numwant, ownPeerId, isWebRTC) {
   var peers = []
   var ite = randomIterate(Object.keys(this.peers))
   var peerId
   while ((peerId = ite()) && peers.length < numwant) {
     var peer = this.peers[peerId]
     if (!peer) continue
-    if ((isWebRTC && peer.socket) || (!isWebRTC && peer.ip)) peers.push(peer)
+    if (isWebRTC && peer.peerId === ownPeerId) continue // don't send peer to itself
+    if ((isWebRTC && peer.ip) || (!isWebRTC && peer.socket)) continue // send proper peer type
+    peers.push(peer)
   }
   return peers
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bittorrent-tracker",
   "description": "Simple, robust, BitTorrent tracker (client & server) implementation",
-  "version": "6.2.0",
+  "version": "6.3.2",
   "author": {
     "name": "Feross Aboukhadijeh",
     "email": "[email protected]",

server.js

@@ -316,7 +316,10 @@ Server.prototype._onWebSocketRequest = function (socket, params) {
 
     var peers = response.peers
     delete response.peers
-    response.interval = self.intervalMs
+
+    // WebSocket tracker should have a shorter interval – default: 2 minutes
+    response.interval = Math.ceil(self.intervalMs / 1000 / 5)
+
     response.info_hash = common.hexToBinary(params.info_hash)
 
     socket.send(JSON.stringify(response), socket.onSend)

test/client.js

@@ -112,6 +112,8 @@ function testClientUpdate (t, serverType) {
     client.start()
 
     client.once('update', function () {
+      client.setInterval(2000)
+
       // after interval (2s), we should get another update
       client.once('update', function (data) {
         // received an update!