From d924bbe21131224ab505c8d3d3aa3daa550f1811 Mon Sep 17 00:00:00 2001 From: Olivier Lalonde Date: Wed, 27 May 2015 15:03:28 +0800 Subject: [PATCH 1/3] Webseed: wrote simple webseed test --- lib/torrent.js | 14 ++++++ package.json | 2 + test/download-webseed-torrent.js | 79 ++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 test/download-webseed-torrent.js diff --git a/lib/torrent.js b/lib/torrent.js index acb4c3ea..4032497f 100644 --- a/lib/torrent.js +++ b/lib/torrent.js @@ -256,6 +256,10 @@ Torrent.prototype._onSwarmListening = function () { // if full metadata was included in initial torrent id, use it if (self.parsedTorrent.info) self._onMetadata(self.parsedTorrent) + if (self.parsedTorrent.urlList) { + self.parsedTorrent.urlList.forEach(self.addWebPeer.bind(self)); + } + self.emit('listening', self.client.torrentPort) } @@ -402,6 +406,16 @@ Torrent.prototype.addPeer = function (peer) { } } +/** + * Add a web peer to the swarm + * @param {string} web peer url + */ +Torrent.prototype.addWebPeer = function (webPeer) { + var self = this + self.emit('webPeer', webPeer); + self.swarm.addWebPeer(webPeer, self.parsedTorrent); +} + /** * Select a range of pieces to prioritize. * diff --git a/package.json b/package.json index d3b13396..0501f460 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,9 @@ "bittorrent-tracker": "^4.0.0", "brfs": "^1.2.0", "browserify": "^10.0.0", + "finalhandler": "^0.3.6", "run-auto": "^1.0.0", + "serve-static": "^1.9.3", "standard": "^3.1.1", "tape": "^4.0.0", "uglify-js": "^2.4.15", diff --git a/test/download-webseed-torrent.js b/test/download-webseed-torrent.js new file mode 100644 index 00000000..b2e8501a --- /dev/null +++ b/test/download-webseed-torrent.js @@ -0,0 +1,79 @@ +var auto = require('run-auto') +var DHT = require('bittorrent-dht/server') +var fs = require('fs') +var parseTorrent = require('parse-torrent') +var test = require('tape') +var WebTorrent = require('../') + +var http = require('http') +var serveStatic = require('serve-static') +var finalhandler = require('finalhandler') +var path = require('path') + +var leavesPath = __dirname + '/content/Leaves of Grass by Walt Whitman.epub' +var leavesFilename = 'Leaves of Grass by Walt Whitman.epub' +var leavesFile = fs.readFileSync(leavesPath) +var leavesTorrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent') +var leavesParsed = parseTorrent(leavesTorrent) + +// remove trackers from .torrent file +leavesParsed.announce = [] + +test('Download using webseed (via .torrent file)', function (t) { + t.plan(5) + + var serve = serveStatic(path.join(__dirname, './content')); + var httpServer = http.createServer(function(req, res){ + var done = finalhandler(req, res) + serve(req, res, done) + }) + + httpServer.on('error', function (err) { + t.fail(err) + }) + + auto({ + httpPort: function (cb) { + httpServer.listen(function () { + var port = httpServer.address().port + cb(null, port) + }) + }, + client1: ['httpPort', function (cb, r) { + + leavesParsed.urlList.push('http://localhost:' + r.httpPort + '/' + leavesFilename); + + var client1 = new WebTorrent({ + tracker: false, + dht: { bootstrap: false } + }) + + client1.on('error', function (err) { t.fail(err) }) + + client1.on('torrent', function (torrent) { + torrent.files.forEach(function (file) { + file.getBuffer(function (err, buf) { + if (err) throw err + t.deepEqual(buf, leavesFile, 'downloaded correct content') + }) + }) + + torrent.once('done', function () { + t.pass('client1 downloaded torrent from webseed') + cb(null, client1) + }) + }); + + client1.add(leavesParsed) + + }] + }, function (err, r) { + t.error(err) + r.client1.destroy(function () { + t.pass('client1 destroyed') + }) + httpServer.close(function () { + t.pass('http server closed') + }) + }) +}) From db45a50b7e4fe0ea57ed127b8bf71a1b2e3a3457 Mon Sep 17 00:00:00 2001 From: Olivier Lalonde Date: Thu, 28 May 2015 09:47:33 +0800 Subject: [PATCH 2/3] Use standard JS style --- lib/torrent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/torrent.js b/lib/torrent.js index 4032497f..aba70e22 100644 --- a/lib/torrent.js +++ b/lib/torrent.js @@ -257,7 +257,7 @@ Torrent.prototype._onSwarmListening = function () { if (self.parsedTorrent.info) self._onMetadata(self.parsedTorrent) if (self.parsedTorrent.urlList) { - self.parsedTorrent.urlList.forEach(self.addWebPeer.bind(self)); + self.parsedTorrent.urlList.forEach(self.addWebPeer.bind(self)) } self.emit('listening', self.client.torrentPort) @@ -412,8 +412,8 @@ Torrent.prototype.addPeer = function (peer) { */ Torrent.prototype.addWebPeer = function (webPeer) { var self = this - self.emit('webPeer', webPeer); - self.swarm.addWebPeer(webPeer, self.parsedTorrent); + self.emit('webPeer', webPeer) + self.swarm.addWebPeer(webPeer, self.parsedTorrent) } /** From 9df26f6fcd8e6fb32a81127cfd6bb84192604fa5 Mon Sep 17 00:00:00 2001 From: Olivier Lalonde Date: Thu, 28 May 2015 13:52:11 +0800 Subject: [PATCH 3/3] Use standard JS style --- test/download-webseed-torrent.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/download-webseed-torrent.js b/test/download-webseed-torrent.js index b2e8501a..5c048f84 100644 --- a/test/download-webseed-torrent.js +++ b/test/download-webseed-torrent.js @@ -1,5 +1,4 @@ var auto = require('run-auto') -var DHT = require('bittorrent-dht/server') var fs = require('fs') var parseTorrent = require('parse-torrent') var test = require('tape') @@ -22,8 +21,8 @@ leavesParsed.announce = [] test('Download using webseed (via .torrent file)', function (t) { t.plan(5) - var serve = serveStatic(path.join(__dirname, './content')); - var httpServer = http.createServer(function(req, res){ + var serve = serveStatic(path.join(__dirname, './content')) + var httpServer = http.createServer(function (req, res) { var done = finalhandler(req, res) serve(req, res, done) }) @@ -41,7 +40,7 @@ test('Download using webseed (via .torrent file)', function (t) { }, client1: ['httpPort', function (cb, r) { - leavesParsed.urlList.push('http://localhost:' + r.httpPort + '/' + leavesFilename); + leavesParsed.urlList.push('http://localhost:' + r.httpPort + '/' + leavesFilename) var client1 = new WebTorrent({ tracker: false, @@ -62,7 +61,7 @@ test('Download using webseed (via .torrent file)', function (t) { t.pass('client1 downloaded torrent from webseed') cb(null, client1) }) - }); + }) client1.add(leavesParsed)