Mirror/bittorrent-tracker
1
0
Fork 0
mirror of https://github.com/webtorrent/bittorrent-tracker.git synced 2025-01-19 04:31:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #98 from feross/fix-udp-scrape

Browse Source 
Fix UDP scrape returning invalid info hashes (Fix #97)
This commit is contained in:
Feross Aboukhadijeh 2015-12-02 15:42:19 -08:00
commit 633f6f5924
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/client/udp-tracker.js
View File

@ -146,7 +146,7 @@ UDPTracker.prototype._request = function (opts) {
}
var infoHashes = (Array.isArray(opts.infoHash) && opts.infoHash.length > 0)
? opts.infoHash.map(function (infoHash) { return infoHash.toString('hex') })
: (opts.infoHash && opts.infoHash.toString('hex')) || self.client._infoHash
: [ (opts.infoHash && opts.infoHash.toString('hex')) || self.client._infoHash ]
for (var i = 0, len = (msg.length - 8) / 12; i < len; i += 1) {
self.client.emit('scrape', {

4
test/scrape.js
View File

@ -36,6 +36,7 @@ function testSingle (t, serverType) {
client.on('scrape', function (data) {
t.equal(data.announce, announceUrl)
t.equal(data.infoHash, parsedBitlove.infoHash)
t.equal(typeof data.complete, 'number')
t.equal(typeof data.incomplete, 'number')
t.equal(typeof data.downloaded, 'number')
@ -60,6 +61,7 @@ function clientScrapeStatic (t, serverType) {
Client.scrape(announceUrl, infoHash1, function (err, data) {
t.error(err)
t.equal(data.announce, announceUrl)
t.equal(data.infoHash, infoHash1)
t.equal(typeof data.complete, 'number')
t.equal(typeof data.incomplete, 'number')
t.equal(typeof data.downloaded, 'number')
@ -84,11 +86,13 @@ function clientScrapeMulti (t, serverType) {
t.error(err)
t.equal(results[infoHash1].announce, announceUrl)
t.equal(results[infoHash1].infoHash, infoHash1)
t.equal(typeof results[infoHash1].complete, 'number')
t.equal(typeof results[infoHash1].incomplete, 'number')
t.equal(typeof results[infoHash1].downloaded, 'number')
t.equal(results[infoHash2].announce, announceUrl)
t.equal(results[infoHash2].infoHash, infoHash2)
t.equal(typeof results[infoHash2].complete, 'number')
t.equal(typeof results[infoHash2].incomplete, 'number')
t.equal(typeof results[infoHash2].downloaded, 'number')