Skip to content

Commit b4928f0

Browse files
ferossfeross
committed
Server perf: Use binary info_hash strings (fix webtorrent#29)
1 parent 1681474 commit b4928f0

File tree

5 files changed

+47
-38
lines changed

5 files changed

+47
-38
lines changed

‎client.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ Tracker.prototype._handleResponse = function (requestUrl, data) {
461461
} else if (requestUrl === self._scrapeUrl) {
462462
// NOTE: the unofficial spec says to use the 'files' key but i've seen 'host' in practice
463463
data = data.files || data.host || {}
464-
data = data[common.bytewiseEncodeURIComponent(self.client._infoHash)]
464+
data = data[self.client._infoHash.toString('binary')]
465465

466466
if (!data) {
467467
self.client.emit('warning', new Error('invalid scrape response'))

‎server.js‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,19 @@ Server.prototype.close = function (cb) {
9494
}
9595
}
9696

97-
Server.prototype._getSwarm = function (infoHash) {
97+
Server.prototype.getSwarm = function (infoHash) {
9898
var self = this
99-
var swarm = self.torrents[infoHash]
99+
var binaryInfoHash = Buffer.isBuffer(infoHash)
100+
? infoHash.toString('binary')
101+
: new Buffer(infoHash, 'hex').toString('binary')
102+
return self._getSwarm(binaryInfoHash)
103+
}
104+
105+
Server.prototype._getSwarm = function (binaryInfoHash) {
106+
var self = this
107+
var swarm = self.torrents[binaryInfoHash]
100108
if (!swarm) {
101-
swarm = self.torrents[infoHash] = {
109+
swarm = self.torrents[binaryInfoHash] = {
102110
complete: 0,
103111
incomplete: 0,
104112
peers: {}
@@ -116,13 +124,13 @@ Server.prototype._onHttpRequest = function (req, res) {
116124

117125
if (s[0] === '/announce') {
118126
var infoHash = typeof params.info_hash === 'string' &&
119-
common.bytewiseDecodeURIComponent(params.info_hash).toString('hex')
127+
common.bytewiseDecodeURIComponent(params.info_hash).toString('binary')
120128
var port = Number(params.port)
121129
var peerId = typeof params.peer_id === 'string' &&
122130
common.bytewiseDecodeURIComponent(params.peer_id).toString('utf8')
123131

124132
if (!infoHash) return error('invalid info_hash')
125-
if (infoHash.length !== 40) return error('invalid info_hash')
133+
if (infoHash.length !== 20) return error('invalid info_hash')
126134
if (!port) return error('invalid port')
127135
if (!peerId) return error('invalid peer_id')
128136

@@ -222,9 +230,7 @@ Server.prototype._onHttpRequest = function (req, res) {
222230
params.info_hash = [ params.info_hash ]
223231
} else if (params.info_hash == null) {
224232
// if info_hash param is omitted, stats for all torrents are returned
225-
params.info_hash = Object.keys(self.torrents).map(function (infoHashHex) {
226-
return common.bytewiseEncodeURIComponent(new Buffer(infoHashHex, 'hex'))
227-
})
233+
params.info_hash = Object.keys(self.torrents)
228234
}
229235

230236
if (!Array.isArray(params.info_hash)) return error('invalid info_hash')
@@ -237,13 +243,13 @@ Server.prototype._onHttpRequest = function (req, res) {
237243
}
238244

239245
params.info_hash.some(function (infoHash) {
240-
var infoHashHex = common.bytewiseDecodeURIComponent(infoHash).toString('hex')
241-
if (infoHashHex.length !== 40) {
246+
infoHash = common.bytewiseDecodeURIComponent(infoHash).toString('binary')
247+
if (infoHash.length !== 20) {
242248
error('invalid info_hash')
243249
return true // early return
244250
}
245251

246-
var swarm = self._getSwarm(infoHashHex)
252+
var swarm = self._getSwarm(infoHash)
247253

248254
response.files[infoHash] = {
249255
complete: swarm.complete,
@@ -297,7 +303,7 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
297303
connectionId
298304
]))
299305
} else if (action === common.ACTIONS.ANNOUNCE) {
300-
var infoHash = msg.slice(16, 36).toString('hex') // 20 bytes
306+
var infoHash = msg.slice(16, 36).toString('binary') // 20 bytes
301307
var peerId = msg.slice(36, 56).toString('utf8') // 20 bytes
302308
var downloaded = fromUInt64(msg.slice(56, 64))
303309
var left = fromUInt64(msg.slice(64, 72))
@@ -405,7 +411,7 @@ Server.prototype._onUdpRequest = function (msg, rinfo) {
405411
]))
406412

407413
} else if (action === common.ACTIONS.SCRAPE) { // scrape message
408-
var infoHash = msg.slice(16, 36).toString('hex') // 20 bytes
414+
var infoHash = msg.slice(16, 36).toString('binary') // 20 bytes
409415

410416
// TODO: support multiple info_hash scrape
411417
if (msg.length > 36) {

‎test/scrape.js‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ var infoHash1 = 'aaa67059ed6bd08362da625b3ae77f6f4a075aaa'
1414
var encodedInfoHash1 = common.bytewiseEncodeURIComponent(
1515
new Buffer(infoHash1, 'hex')
1616
)
17+
var binaryinfoHash1 = new Buffer(infoHash1, 'hex').toString('binary')
1718
var infoHash2 = 'bbb67059ed6bd08362da625b3ae77f6f4a075bbb'
1819
var encodedInfoHash2 = common.bytewiseEncodeURIComponent(
1920
new Buffer(infoHash2, 'hex')
2021
)
22+
var binaryinfoHash2 = new Buffer(infoHash2, 'hex').toString('binary')
2123

2224
var bitlove = fs.readFileSync(__dirname + '/torrents/bitlove-intro.torrent')
2325
var parsedBitlove = parseTorrent(bitlove)
2426
var encodedBitlove = common.bytewiseEncodeURIComponent(
2527
new Buffer(parsedBitlove.infoHash, 'hex')
2628
)
29+
var binaryBitlove = new Buffer(parsedBitlove.infoHash, 'hex').toString('binary')
2730
var peerId = new Buffer('01234567890123456789')
2831

2932
test('server: single info_hash scrape', function (t) {
@@ -50,10 +53,10 @@ test('server: single info_hash scrape', function (t) {
5053
data = bencode.decode(data)
5154
t.ok(data.files)
5255
t.equal(Object.keys(data.files).length, 1)
53-
t.ok(data.files[encodedInfoHash1])
54-
t.equal(typeof data.files[encodedInfoHash1].complete, 'number')
55-
t.equal(typeof data.files[encodedInfoHash1].incomplete, 'number')
56-
t.equal(typeof data.files[encodedInfoHash1].downloaded, 'number')
56+
t.ok(data.files[binaryinfoHash1])
57+
t.equal(typeof data.files[binaryinfoHash1].complete, 'number')
58+
t.equal(typeof data.files[binaryinfoHash1].incomplete, 'number')
59+
t.equal(typeof data.files[binaryinfoHash1].downloaded, 'number')
5760

5861
server.close(function () {
5962
t.end()
@@ -91,15 +94,15 @@ test('server: multiple info_hash scrape', function (t) {
9194
t.ok(data.files)
9295
t.equal(Object.keys(data.files).length, 2)
9396

94-
t.ok(data.files[encodedInfoHash1])
95-
t.equal(typeof data.files[encodedInfoHash1].complete, 'number')
96-
t.equal(typeof data.files[encodedInfoHash1].incomplete, 'number')
97-
t.equal(typeof data.files[encodedInfoHash1].downloaded, 'number')
97+
t.ok(data.files[binaryinfoHash1])
98+
t.equal(typeof data.files[binaryinfoHash1].complete, 'number')
99+
t.equal(typeof data.files[binaryinfoHash1].incomplete, 'number')
100+
t.equal(typeof data.files[binaryinfoHash1].downloaded, 'number')
98101

99-
t.ok(data.files[encodedInfoHash2])
100-
t.equal(typeof data.files[encodedInfoHash2].complete, 'number')
101-
t.equal(typeof data.files[encodedInfoHash2].incomplete, 'number')
102-
t.equal(typeof data.files[encodedInfoHash2].downloaded, 'number')
102+
t.ok(data.files[binaryinfoHash2])
103+
t.equal(typeof data.files[binaryinfoHash2].complete, 'number')
104+
t.equal(typeof data.files[binaryinfoHash2].incomplete, 'number')
105+
t.equal(typeof data.files[binaryinfoHash2].downloaded, 'number')
103106

104107
server.close(function () {
105108
t.end()
@@ -149,10 +152,10 @@ test('server: all info_hash scrape', function (t) {
149152
t.ok(data.files)
150153
t.equal(Object.keys(data.files).length, 1)
151154

152-
t.ok(data.files[encodedBitlove])
153-
t.equal(typeof data.files[encodedBitlove].complete, 'number')
154-
t.equal(typeof data.files[encodedBitlove].incomplete, 'number')
155-
t.equal(typeof data.files[encodedBitlove].downloaded, 'number')
155+
t.ok(data.files[binaryBitlove])
156+
t.equal(typeof data.files[binaryBitlove].complete, 'number')
157+
t.equal(typeof data.files[binaryBitlove].incomplete, 'number')
158+
t.equal(typeof data.files[binaryBitlove].downloaded, 'number')
156159

157160
client.stop()
158161
server.close(function () {

‎test/server.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ test('http server', function (t) {
4949
t.equal(data.incomplete, 1)
5050

5151
t.equal(Object.keys(server.torrents).length, 1)
52-
t.equal(server.torrents[infoHash].complete, 0)
53-
t.equal(server.torrents[infoHash].incomplete, 1)
54-
t.equal(Object.keys(server.torrents[infoHash].peers).length, 1)
55-
t.deepEqual(server.torrents[infoHash].peers['127.0.0.1:6881'], {
52+
t.equal(server.getSwarm(infoHash).complete, 0)
53+
t.equal(server.getSwarm(infoHash).incomplete, 1)
54+
t.equal(Object.keys(server.getSwarm(infoHash).peers).length, 1)
55+
t.deepEqual(server.getSwarm(infoHash).peers['127.0.0.1:6881'], {
5656
ip: '127.0.0.1',
5757
port: 6881,
5858
peerId: peerId

‎test/udp-server.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ test('udp server', function (t) {
4949
t.equal(data.incomplete, 1)
5050

5151
t.equal(Object.keys(server.torrents).length, 1)
52-
t.equal(server.torrents[infoHash].complete, 0)
53-
t.equal(server.torrents[infoHash].incomplete, 1)
54-
t.equal(Object.keys(server.torrents[infoHash].peers).length, 1)
55-
t.deepEqual(server.torrents[infoHash].peers['127.0.0.1:6881'], {
52+
t.equal(server.getSwarm(infoHash).complete, 0)
53+
t.equal(server.getSwarm(infoHash).incomplete, 1)
54+
t.equal(Object.keys(server.getSwarm(infoHash).peers).length, 1)
55+
t.deepEqual(server.getSwarm(infoHash).peers['127.0.0.1:6881'], {
5656
ip: '127.0.0.1',
5757
port: 6881,
5858
peerId: peerId

0 commit comments

Comments
 (0)