diff options
-rw-r--r-- | index.js | 6 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | test/node/swarm-basic.js | 6 | ||||
-rw-r--r-- | test/node/swarm-reconnect.js | 6 | ||||
-rw-r--r-- | test/node/swarm-timeout.js | 6 | ||||
-rw-r--r-- | test/rarity-map.js | 4 | ||||
-rw-r--r-- | test/swarm.js | 6 |
7 files changed, 18 insertions, 18 deletions
@@ -9,13 +9,13 @@ var debug = require('debug')('webtorrent') var DHT = require('bittorrent-dht/client') // browser exclude var EventEmitter = require('events').EventEmitter var extend = require('xtend') -var hat = require('hat') var inherits = require('inherits') var loadIPSet = require('load-ip-set') // browser exclude var parallel = require('run-parallel') var parseTorrent = require('parse-torrent') var path = require('path') var Peer = require('simple-peer') +var randombytes = require('randombytes') var speedometer = require('speedometer') var zeroFill = require('zero-fill') @@ -65,7 +65,7 @@ function WebTorrent (opts) { } else if (Buffer.isBuffer(opts.peerId)) { self.peerId = opts.peerId.toString('hex') } else { - self.peerId = Buffer.from(VERSION_PREFIX + hat(48)).toString('hex') + self.peerId = Buffer.from(VERSION_PREFIX + randombytes(6).toString('hex')).toString('hex') } self.peerIdBuffer = Buffer.from(self.peerId, 'hex') @@ -74,7 +74,7 @@ function WebTorrent (opts) { } else if (Buffer.isBuffer(opts.nodeId)) { self.nodeId = opts.nodeId.toString('hex') } else { - self.nodeId = hat(160) + self.nodeId = randombytes(20).toString('hex') } self.nodeIdBuffer = Buffer.from(self.nodeId, 'hex') diff --git a/package.json b/package.json index 889d63b..0969d21 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "debug": "^2.2.0", "end-of-stream": "^1.1.0", "fs-chunk-store": "^1.6.2", - "hat": "^0.0.3", "immediate-chunk-store": "^1.0.8", "inherits": "^2.0.1", "load-ip-set": "^1.2.7", @@ -46,6 +45,7 @@ "parse-torrent": "^5.8.0", "pump": "^1.0.1", "random-iterate": "^1.0.1", + "randombytes": "^2.0.3", "range-parser": "^1.2.0", "readable-stream": "^2.1.4", "render-media": "^2.8.0", diff --git a/test/node/swarm-basic.js b/test/node/swarm-basic.js index cdc54ef..3061f8d 100644 --- a/test/node/swarm-basic.js +++ b/test/node/swarm-basic.js @@ -1,12 +1,12 @@ // var Buffer = require('safe-buffer').Buffer -// var hat = require('hat') +// var randombytes = require('randombytes') // var Swarm = require('../../lib/swarm') // var test = require('tape') // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36' // var infoHash2 = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa37' -// var peerId = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') -// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') +// var peerId = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') +// var peerId2 = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') // test('two swarms listen on same port', function (t) { // t.plan(2) diff --git a/test/node/swarm-reconnect.js b/test/node/swarm-reconnect.js index 1eaec47..cd18d1d 100644 --- a/test/node/swarm-reconnect.js +++ b/test/node/swarm-reconnect.js @@ -1,11 +1,11 @@ // var Buffer = require('safe-buffer').Buffer -// var hat = require('hat') +// var randombytes = require('randombytes') // var Swarm = require('../../lib/swarm') // var test = require('tape') // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36' -// var peerId1 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') -// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') +// var peerId1 = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') +// var peerId2 = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') // test('reconnect when peer disconnects', function (t) { // t.plan(10) diff --git a/test/node/swarm-timeout.js b/test/node/swarm-timeout.js index 97fcdf2..ceac357 100644 --- a/test/node/swarm-timeout.js +++ b/test/node/swarm-timeout.js @@ -1,11 +1,11 @@ // var Buffer = require('safe-buffer').Buffer -// var hat = require('hat') +// var randombytes = require('randombytes') // var Swarm = require('../../lib/swarm') // var test = require('tape') // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36' -// var peerId1 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') -// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') +// var peerId1 = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') +// var peerId2 = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') // test('timeout if no handshake in 25 seconds', function (t) { // t.plan(4) diff --git a/test/rarity-map.js b/test/rarity-map.js index f7da99b..1fb947d 100644 --- a/test/rarity-map.js +++ b/test/rarity-map.js @@ -1,6 +1,6 @@ var extend = require('xtend') var fixtures = require('webtorrent-fixtures') -var hat = require('hat') +var randombytes = require('randombytes') var test = require('tape') var Torrent = require('../lib/torrent') var Wire = require('bittorrent-protocol') @@ -14,7 +14,7 @@ test('Rarity map usage', function (t) { }) var client = { listening: true, - peerId: hat(160), + peerId: randombytes(20).toString('hex'), torrentPort: 6889, dht: false, tracker: false, diff --git a/test/swarm.js b/test/swarm.js index 6b57951..1869b87 100644 --- a/test/swarm.js +++ b/test/swarm.js @@ -1,12 +1,12 @@ // var Buffer = require('safe-buffer').Buffer -// var hat = require('hat') +// var randombytes = require('randombytes') // var Swarm = require('../lib/swarm') // var test = require('tape') // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36' // var infoHash2 = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa37' -// var peerId = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') -// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex') +// var peerId = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') +// var peerId2 = Buffer.from('-WW0001-' + randombytes(6).toString('hex'), 'utf8').toString('hex') // test('create swarm, check invariants', function (t) { // var swarm = new Swarm(infoHash, peerId) |