Generates and queues offers if socket is not connected. Once socket connects, queued offers are sent.

Author: guanzo

lib/client/websocket-tracker.js

@@ -26,6 +26,7 @@ class WebSocketTracker extends Tracker {
 
     this.trickle = opts.trickle !== undefined ? opts.trickle : false
     this.peers = {} // peers (offer id -> peer)
+    this.pendingWrites = []
     this.socket = null
 
     this.reconnecting = false
@@ -43,16 +44,19 @@ class WebSocketTracker extends Tracker {
     if (this.destroyed || this.reconnecting) return
     if (!this.socket.connected) {
       this.socket.once('connect', () => {
-        this.announce(opts)
+        // Send writes in FIFO order.
+        while (this.pendingWrites.length) {
+          const write = this.pendingWrites.shift()
+          this._send(write)
+        }
       })
-      return
     }
-
-    const params = Object.assign({}, opts, {
-      action: 'announce',
-      info_hash: this.client._infoHashBinary,
-      peer_id: this.client._peerIdBinary,
-    })
+    const baseParams = {
+        action: 'announce',
+        info_hash: this.client._infoHashBinary,
+        peer_id: this.client._peerIdBinary,
+    }
+    const params = Object.assign({}, opts, baseParams)
     if (this._trackerId) params.trackerid = this._trackerId
 
     if (opts.event === 'stopped' || opts.event === 'completed') {
@@ -66,15 +70,10 @@ class WebSocketTracker extends Tracker {
         params.offers = offers
         this._send(params)
       }, offer => {
-        let offerParams = Object.assign({}, params)
-        offerParams.offers = [offer]
-        offerParams.event = 'trickle'
-
-        delete offerParams.left
-        delete offerParams.numwant
-        delete offerParams.uploaded
-        delete offerParams.downloaded
-        this._send(offerParams)
+        const trickleParams = Object.assign({}, baseParams)
+        trickleParams.offers = [offer]
+        trickleParams.event = 'trickle'
+        this._send(trickleParams)
       })
     } else {
         // Limit the number of offers that are generated, since it can be slow
@@ -401,6 +400,10 @@ class WebSocketTracker extends Tracker {
 
   _send (params) {
     if (this.destroyed) return
+    if (!this.socket.connected) {
+        this.pendingWrites.push(params)
+        return
+    }
     this.expectingResponse = true
     const message = JSON.stringify(params)
     debug('send %s', message)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bittorrent-tracker",
   "description": "Simple, robust, BitTorrent tracker (client & server) implementation",
-  "version": "9.14.2",
+  "version": "9.14.2-arc-1",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "[email protected]",