Skip to content

Commit

Permalink
Update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@G-Ray
G-Ray committed Nov 21, 2018
1 parent ade9a4e commit fa97c3b
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 63 deletions.
75 changes: 39 additions & 36 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ var path = require('path')
var fs = require('fs')
var os = require('os')
var eos = require('end-of-stream')
var piece = require('torrent-piece')
var Piece = require('torrent-piece')
var rimraf = require('rimraf')
var FSChunkStore = require('fs-chunk-store')
var ImmediateChunkStore = require('immediate-chunk-store')
var peerDiscovery = require('torrent-discovery')
var PeerDiscovery = require('torrent-discovery')
var bufferFrom = require('buffer-from')

var blocklist = require('ip-set')
Expand All @@ -24,7 +24,7 @@ var fileStream = require('./lib/file-stream')
var MAX_REQUESTS = 5
var CHOKE_TIMEOUT = 5000
var REQUEST_TIMEOUT = 30000
var SPEED_THRESHOLD = 3 * piece.BLOCK_LENGTH
var SPEED_THRESHOLD = 3 * Piece.BLOCK_LENGTH
var DEFAULT_PORT = 6881

var BAD_PIECE_STRIKES_MAX = 3
Expand All @@ -33,7 +33,7 @@ var BAD_PIECE_STRIKES_DURATION = 120000 // 2 minutes
var RECHOKE_INTERVAL = 10000
var RECHOKE_OPTIMISTIC_DURATION = 2

var TMP = fs.existsSync('/tmp') ? '/tmp' : os.tmpDir()
var TMP = fs.existsSync('/tmp') ? '/tmp' : os.tmpdir()

var noop = function () {}

Expand Down Expand Up @@ -108,27 +108,39 @@ var torrentStream = function (link, opts, cb) {
engine._flood = opts.flood
engine._pulse = opts.pulse

var discovery = peerDiscovery({
peerId: bufferFrom(opts.id),
dht: (opts.dht !== undefined) ? opts.dht : true,
tracker: (opts.tracker !== undefined) ? opts.tracker : true,
port: DEFAULT_PORT,
announce: opts.trackers
})
var discovery = null

var blocked = blocklist(opts.blocklist)

discovery.on('peer', function (addr) {
if (blocked.contains(addr.split(':')[0])) {
engine.emit('blocked-peer', addr)
} else {
engine.emit('peer', addr)
engine.connect(addr)
}
var startDiscovery = function () {
discovery = new PeerDiscovery({
infoHash: engine.infoHash,
peerId: bufferFrom(opts.id),
dht: (opts.dht !== undefined) ? opts.dht : true,
tracker: (opts.tracker !== undefined) ? opts.tracker : true,
port: engine.port || DEFAULT_PORT,
announce: opts.trackers || link.announce
})

discovery.on('peer', function (addr) {
if (blocked.contains(addr.split(':')[0])) {
engine.emit('blocked-peer', addr)
} else {
engine.emit('peer', addr)
engine.connect(addr)
}
})
}

process.nextTick(function () {
// Gives the user a chance to call engine.listen(PORT) on the same tick,
// so discovery will start using the correct torrent port.
startDiscovery()
})

var ontorrent = function (torrent) {
var storage = opts.storage || FSChunkStore
engine.store = ImmediateChunkStore(storage(torrent.pieceLength, {
engine.store = new ImmediateChunkStore(storage(torrent.pieceLength, {
files: torrent.files.map(function (file) {
return {
path: path.join(opts.path, file.path),
Expand All @@ -144,18 +156,12 @@ var torrentStream = function (link, opts, cb) {
var pieceRemainder = (torrent.length % pieceLength) || pieceLength

var pieces = torrent.pieces.map(function (hash, i) {
return piece(i === torrent.pieces.length - 1 ? pieceRemainder : pieceLength)
return new Piece(i === torrent.pieces.length - 1 ? pieceRemainder : pieceLength)
})
var reservations = torrent.pieces.map(function () {
return []
})

process.nextTick(function () {
// Gives the user a chance to call engine.listen(PORT) on the same tick,
// so discovery will start using the correct torrent port.
discovery.setTorrent(torrent)
})

engine.files = torrent.files.map(function (file) {
file = Object.create(file)
var offsetPiece = (file.offset / torrent.pieceLength) | 0
Expand Down Expand Up @@ -236,7 +242,7 @@ var torrentStream = function (link, opts, cb) {

var onhotswap = opts.hotswap === false ? falsy : function (wire, index) {
var speed = wire.downloadSpeed()
if (speed < piece.BLOCK_LENGTH) return
if (speed < Piece.BLOCK_LENGTH) return
if (!reservations[index] || !pieces[index]) return

var r = reservations[index]
Expand Down Expand Up @@ -264,7 +270,7 @@ var torrentStream = function (link, opts, cb) {
for (i = 0; i < min.requests.length; i++) {
var req = min.requests[i]
if (req.piece !== index) continue
pieces[index].cancel((req.offset / piece.BLOCK_SIZE) | 0)
pieces[index].cancel((req.offset / Piece.BLOCK_SIZE) | 0)
}

engine.emit('hotswap', min, wire, index)
Expand Down Expand Up @@ -309,7 +315,7 @@ var torrentStream = function (link, opts, cb) {
var buffer = p.flush()

if (sha1(buffer) !== torrent.pieces[index]) {
pieces[index] = piece(p.length)
pieces[index] = new Piece(p.length)
engine.emit('invalid-piece', index, buffer)
onupdatetick()

Expand Down Expand Up @@ -353,7 +359,7 @@ var torrentStream = function (link, opts, cb) {
var speed = wire.downloadSpeed() || 1
if (speed > SPEED_THRESHOLD) return thruthy

var secs = MAX_REQUESTS * piece.BLOCK_LENGTH / speed
var secs = MAX_REQUESTS * Piece.BLOCK_LENGTH / speed
var tries = 10
var ptr = 0

Expand Down Expand Up @@ -613,14 +619,12 @@ var torrentStream = function (link, opts, cb) {
if (destroyed) return
swarm.resume()

// We know only infoHash here, not full infoDictionary.
// But infoHash is enough to connect to trackers and get peers.
if (!buf) return discovery.setTorrent(link)
if (!buf) return

var torrent = parseTorrent(buf)

// Bad cache file - fetch it again
if (torrent.infoHash !== infoHash) return discovery.setTorrent(link)
if (torrent.infoHash !== infoHash) return

if (!torrent.announce || !torrent.announce.length) {
opts.trackers = [].concat(opts.trackers || []).concat(link.announce || [])
Expand Down Expand Up @@ -750,7 +754,7 @@ var torrentStream = function (link, opts, cb) {
destroyed = true
swarm.destroy()
clearInterval(rechokeIntervalId)
discovery.stop()
if (discovery) discovery.destroy()
if (engine.store && engine.store.close) {
engine.store.close(cb)
} else if (cb) {
Expand Down Expand Up @@ -779,7 +783,6 @@ var torrentStream = function (link, opts, cb) {
if (!port) return findPort(opts.port || DEFAULT_PORT, cb)
engine.port = port
swarm.listen(engine.port, cb)
discovery.updatePort(engine.port)
}

return engine
Expand Down
8 changes: 4 additions & 4 deletions lib/exchange-metadata.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ module.exports = function (engine, callback) {
if (message.msg_type === 2) return

if (message.msg_type === 0) {
if (!metadata) return wire.extended(channel, {msg_type: 2, piece: piece})
if (!metadata) return wire.extended(channel, { msg_type: 2, piece: piece })
var offset = piece * METADATA_BLOCK_SIZE
var buf = metadata.slice(offset, offset + METADATA_BLOCK_SIZE)
wire.extended(channel, Buffer.concat([bncode.encode({msg_type: 1, piece: piece}), buf]))
wire.extended(channel, Buffer.concat([bncode.encode({ msg_type: 1, piece: piece }), buf]))
return
}

Expand All @@ -77,11 +77,11 @@ module.exports = function (engine, callback) {

for (var i = 0; i * METADATA_BLOCK_SIZE < size; i++) {
if (metadataPieces[i]) continue
wire.extended(channel, {msg_type: 0, piece: i})
wire.extended(channel, { msg_type: 0, piece: i })
}
})

if (!wire.peerExtensions.extended) return
wire.extended(0, metadata ? {m: {ut_metadata: 1}, metadata_size: metadata.length} : {m: {ut_metadata: 1}})
wire.extended(0, metadata ? { m: { ut_metadata: 1 }, metadata_size: metadata.length } : { m: { ut_metadata: 1 } })
}
}
36 changes: 18 additions & 18 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@
"test": "standard && tap test/*.js"
},
"dependencies": {
"bitfield": "^0.1.0",
"bncode": "^0.5.2",
"buffer-from": "^1.0.0",
"end-of-stream": "^0.1.4",
"fs-chunk-store": "^1.3.0",
"bitfield": "^2.0.0",
"bncode": "^0.5.3",
"buffer-from": "^1.1.1",
"end-of-stream": "^1.4.1",
"fs-chunk-store": "^1.7.0",
"hat": "0.0.3",
"immediate-chunk-store": "^1.0.5",
"ip-set": "^1.0.0",
"mkdirp": "^0.3.5",
"parse-torrent": "^4.0.0",
"peer-wire-swarm": "^0.12.0",
"rimraf": "^2.2.5",
"torrent-discovery": "^5.2.0",
"torrent-piece": "^1.0.0"
"immediate-chunk-store": "^2.0.0",
"ip-set": "^1.0.1",
"mkdirp": "^0.5.1",
"parse-torrent": "^6.1.2",
"peer-wire-swarm": "^0.12.2",
"rimraf": "^2.6.2",
"torrent-discovery": "^9.1.1",
"torrent-piece": "^2.0.0"
},
"devDependencies": {
"buffer-alloc": "^1.1.0",
"bittorrent-tracker": "^7.7.0",
"fs-extra": "^0.26.4",
"standard": "^5.1.0",
"tap": "^0.4.8"
"buffer-alloc": "^1.2.0",
"bittorrent-tracker": "^9.10.1",
"fs-extra": "^7.0.1",
"standard": "^12.0.1",
"tap": "^12.1.0"
}
}
2 changes: 1 addition & 1 deletion test/meta-exchange.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test('fixture should be ready', function (t) {
})

test('torrent should be emitted', function (t) {
t.plan(1)
t.plan(2)
var e = engine()
e.on('torrent', function (torrent) {
t.equal(torrent.infoHash, 'ef330b39f4801d25b4245212e75a38634bfc856e')
Expand Down
8 changes: 4 additions & 4 deletions test/storage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test('fixture can read the file contents', function (t) {
})
})
t.test('can read from stream with offset', function (t) {
var stream = file.createReadStream({start: 36109})
var stream = file.createReadStream({ start: 36109 })
stream.setEncoding('ascii')
t.plan(1)
stream.once('readable', function () {
Expand All @@ -55,15 +55,15 @@ test('fixture can read the file contents', function (t) {
})
t.test('can read from storage with offset', function (t) {
t.plan(6)
fixture.store.get(0, {length: 11}, function (_, buffer) {
fixture.store.get(0, { length: 11 }, function (_, buffer) {
t.equal(buffer.length, 11)
t.equal(buffer.toString('ascii'), 'Lorem ipsum')
})
fixture.store.get(0, {offset: 588, length: 10}, function (_, buffer) {
fixture.store.get(0, { offset: 588, length: 10 }, function (_, buffer) {
t.equal(buffer.length, 10)
t.equal(buffer.toString('ascii'), 'Vestibulum')
})
fixture.store.get(1, {offset: 3341}, function (_, buffer) {
fixture.store.get(1, { offset: 3341 }, function (_, buffer) {
t.equal(buffer.length, 6)
t.equal(buffer.toString('ascii'), 'amet. ')
})
Expand Down

0 comments on commit fa97c3b

Please sign in to comment.