Re-enable ws server tests (websocket tracker)

Author: feross

server.js

@@ -516,8 +516,11 @@ Server.prototype._onWebSocketRequest = function (socket, opts, params) {
       response.interval = Math.ceil(self.intervalMs / 1000 / 5)
     }
 
-    socket.send(JSON.stringify(response), socket.onSend)
-    debug('sent response %s to %s', JSON.stringify(response), params.peer_id)
+    // Skip sending update back for 'answer' announce messages – not needed
+    if (!params.answer) {
+      socket.send(JSON.stringify(response), socket.onSend)
+      debug('sent response %s to %s', JSON.stringify(response), params.peer_id)
+    }
 
     if (Array.isArray(params.offers)) {
       debug('got %s offers from %s', params.offers.length, params.peer_id)

test/server.js

@@ -2,20 +2,20 @@ var Buffer = require('safe-buffer').Buffer
 var Client = require('../')
 var common = require('./common')
 var test = require('tape')
-// var wrtc = require('electron-webrtc')()
+var wrtc = require('electron-webrtc')()
 
-// var wrtcReady = false
-// wrtc.electronDaemon.once('ready', function () {
-//   wrtcReady = true
-// })
+var wrtcReady = false
+wrtc.electronDaemon.once('ready', function () {
+  wrtcReady = true
+})
 
 var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
 var peerId = Buffer.from('01234567890123456789')
 var peerId2 = Buffer.from('12345678901234567890')
 var peerId3 = Buffer.from('23456789012345678901')
 
 function serverTest (t, serverType, serverFamily) {
-  t.plan(32)
+  t.plan(36)
 
   var hostname = serverFamily === 'inet6'
     ? '[::1]'
@@ -30,16 +30,19 @@ function serverTest (t, serverType, serverFamily) {
   }
 
   common.createServer(t, opts, function (server) {
+    // Not using announceUrl param from `common.createServer()` since we
+    // want to control IPv4 vs IPv6.
     var port = server[serverType].address().port
     var announceUrl = serverType + '://' + hostname + ':' + port + '/announce'
 
     var client1 = new Client({
       infoHash: infoHash,
       announce: [ announceUrl ],
       peerId: peerId,
-      port: 6881
-      // wrtc: wrtc
+      port: 6881,
+      wrtc: wrtc
     })
+    if (serverType === 'ws') common.mockWebsocketTracker(client1)
 
     client1.start()
 
@@ -88,62 +91,68 @@ function serverTest (t, serverType, serverFamily) {
 
           client1.once('scrape', function (data) {
             t.equal(data.announce, announceUrl)
-            t.equal(typeof data.complete, 'number')
-            t.equal(typeof data.incomplete, 'number')
+            t.equal(data.complete, 1)
+            t.equal(data.incomplete, 0)
             t.equal(typeof data.downloaded, 'number')
 
             var client2 = new Client({
               infoHash: infoHash,
               announce: [ announceUrl ],
               peerId: peerId2,
-              port: 6882
-              // wrtc: wrtc
+              port: 6882,
+              wrtc: wrtc
             })
+            if (serverType === 'ws') common.mockWebsocketTracker(client2)
 
             client2.start()
 
             server.once('start', function () {
               t.pass('got start message from client2')
             })
 
-            client2.once('peer', function (addr) {
-              t.ok(addr === hostname + ':6881' || addr === hostname + ':6882' || addr.id === peerId.toString('hex'))
+            client2.once('update', function (data) {
+              t.equal(data.announce, announceUrl)
+              t.equal(data.complete, 1)
+              t.equal(data.incomplete, 1)
 
-              swarm.peers.once('evict', function (evicted) {
-                t.equals(evicted.value.peerId, peerId.toString('hex'))
-              })
               var client3 = new Client({
                 infoHash: infoHash,
                 announce: [ announceUrl ],
                 peerId: peerId3,
-                port: 6880
-                // wrtc: wrtc
+                port: 6880,
+                wrtc: wrtc
               })
+              if (serverType === 'ws') common.mockWebsocketTracker(client3)
+
               client3.start()
 
               server.once('start', function () {
                 t.pass('got start message from client3')
               })
 
-              client3.once('update', function () {
+              client3.once('update', function (data) {
+                t.equal(data.announce, announceUrl)
+                t.equal(data.complete, 1)
+                t.equal(data.incomplete, 2)
+
                 client2.stop()
                 client2.once('update', function (data) {
                   t.equal(data.announce, announceUrl)
                   t.equal(data.complete, 1)
                   t.equal(data.incomplete, 1)
-                  client2.destroy()
-
-                  client3.stop()
-                  client3.once('update', function (data) {
-                    t.equal(data.announce, announceUrl)
-                    t.equal(data.complete, 1)
-                    t.equal(data.incomplete, 0)
 
-                    client3.destroy(function () {
-                      client1.destroy(function () {
-                        server.close()
+                  client2.destroy(function () {
+                    client3.stop()
+                    client3.once('update', function (data) {
+                      t.equal(data.announce, announceUrl)
+                      t.equal(data.complete, 1)
+                      t.equal(data.incomplete, 0)
+
+                      client3.destroy(function () {
+                        client1.destroy(function () {
+                          server.close()
+                        })
                       })
-                      // if (serverType === 'ws') wrtc.close()
                     })
                   })
                 })
@@ -156,17 +165,6 @@ function serverTest (t, serverType, serverFamily) {
   })
 }
 
-// test('websocket server', function (t) {
-//   if (wrtcReady) {
-//     runTest()
-//   } else {
-//     wrtc.electronDaemon.once('ready', runTest)
-//   }
-//   function runTest () {
-//     serverTest(t, 'ws', 'inet')
-//   }
-// })
-
 test('http ipv4 server', function (t) {
   serverTest(t, 'http', 'inet')
 })
@@ -178,3 +176,17 @@ test('http ipv6 server', function (t) {
 test('udp server', function (t) {
   serverTest(t, 'udp', 'inet')
 })
+
+test('ws server', function (t) {
+  if (wrtcReady) {
+    runTest()
+  } else {
+    wrtc.electronDaemon.once('ready', runTest)
+  }
+  function runTest () {
+    t.once('end', function () {
+      wrtc.close()
+    })
+    serverTest(t, 'ws', 'inet')
+  }
+})