Torrent emits 'noPeers' even when swarm is empty after announce

lib/torrent.js

@@ -333,10 +333,12 @@ Torrent.prototype._onListening = function () {
 
   function onTrackerAnnounce () {
     self.emit('trackerAnnounce')
+    if (self.swarm.numPeers === 0) self.emit('noPeers', 'tracker')
   }
 
   function onDHTAnnounce () {
     self.emit('dhtAnnounce')
+    if (self.swarm.numPeers === 0) self.emit('noPeers', 'dht')
   }
 
   function onWarning (err) {

test/node/download-dht-torrent.js

@@ -53,10 +53,17 @@ test('Download using DHT (via .torrent file)', function (t) {
         maybeDone(null)
       })
 
+      torrent.on('noPeers', function (announceType) {
+        t.equal(announceType, 'dht', 'noPeers event seen with correct announceType')
+        noPeersFound = true
+        maybeDone(null)
+      })
+
       var announced = false
       var loaded = false
+      var noPeersFound = false
       function maybeDone (err) {
-        if ((announced && loaded) || err) cb(err, client1)
+        if ((announced && loaded && noPeersFound) || err) cb(err, client1)
       }
     },
 

test/node/download-tracker-magnet.js

@@ -15,7 +15,7 @@ test('Download using HTTP tracker (via magnet uri)', function (t) {
 })
 
 function magnetDownloadTest (t, serverType) {
-  t.plan(9)
+  t.plan(10)
 
   var tracker = new TrackerServer(
     serverType === 'udp' ? { http: false, ws: false } : { udp: false, ws: false }
@@ -59,6 +59,10 @@ function magnetDownloadTest (t, serverType) {
           'Leaves of Grass by Walt Whitman.epub'
         ]
 
+        torrent.on('noPeers', function (announceType) {
+          t.equal(announceType, 'tracker', 'noPeers event seen with correct announceType')
+        })
+
         t.deepEqual(torrent.files.map(function (file) { return file.name }), names)
 
         torrent.load(fs.createReadStream(fixtures.leaves.contentPath), function (err) {