Skip to content

/ webtorrent

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add file.getBuffer() API #230

Merged
merged 4 commits into from Jan 4, 2015
+79 −43
Merged

Add file.getBuffer() API #230

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fd9cb0
Add file.getBuffer() API
feross Jan 4, 2015
8b36f9d
add blacklist.txt.gz file for tests
feross Jan 4, 2015
09e345e
test: verify file content in download tests
feross Jan 4, 2015
5c78cf2
remove concat-stream dep
feross Jan 4, 2015
File filter...
Filter file types
Clear filters
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Prev Next

test: verify file content in download tests

  • Loading branch information
@feross
feross committed Jan 4, 2015
commit 09e345eb12f30f73e9492c7a6921a4442226e38e
12 test/download-dht-magnet.js
View file
Open in desktop
@@ -5,7 +5,8 @@ var parseTorrent = require('parse-torrent')
var test = require('tape')
var WebTorrent = require('../')

var leavesFile = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesPath = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesFile = fs.readFileSync(leavesPath)
var leavesTorrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent')
var leavesParsed = parseTorrent(leavesTorrent)

@@ -14,7 +15,7 @@ leavesParsed.announce = []
leavesParsed.announceList = []

test('Download using DHT (via magnet uri)', function (t) {
t.plan(7)
t.plan(8)

var dhtServer = new DHT({ bootstrap: false })
dhtServer.on('error', function (err) {
@@ -55,7 +56,7 @@ test('Download using DHT (via magnet uri)', function (t) {
maybeDone(null)
})

torrent.storage.load(fs.createReadStream(leavesFile), function (err) {
torrent.storage.load(fs.createReadStream(leavesPath), function (err) {
wroteStorage = true
maybeDone(err)
})
@@ -73,7 +74,10 @@ test('Download using DHT (via magnet uri)', function (t) {

client2.on('torrent', function (torrent) {
torrent.files.forEach(function (file) {
file.createReadStream()
file.getBuffer(function (err, buf) {
if (err) throw err
t.deepEqual(buf, leavesFile, 'downloaded correct content')
})
})

torrent.once('done', function () {
12 test/download-dht-torrent.js
View file
Open in desktop
@@ -5,7 +5,8 @@ var fs = require('fs')
var parseTorrent = require('parse-torrent')
var test = require('tape')

var leavesFile = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesPath = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesFile = fs.readFileSync(leavesPath)
var leavesTorrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent')
var leavesParsed = parseTorrent(leavesTorrent)

@@ -14,7 +15,7 @@ leavesParsed.announce = []
leavesParsed.announceList = []

test('Download using DHT (via .torrent file)', function (t) {
t.plan(7)
t.plan(8)

var dhtServer = new DHT({ bootstrap: false })

@@ -54,7 +55,7 @@ test('Download using DHT (via .torrent file)', function (t) {
maybeDone(null)
})

torrent.storage.load(fs.createReadStream(leavesFile), function (err) {
torrent.storage.load(fs.createReadStream(leavesPath), function (err) {
wroteStorage = true
maybeDone(err)
})
@@ -72,7 +73,10 @@ test('Download using DHT (via .torrent file)', function (t) {

client2.on('torrent', function (torrent) {
torrent.files.forEach(function (file) {
file.createReadStream()
file.getBuffer(function (err, buf) {
if (err) throw err
t.deepEqual(buf, leavesFile, 'downloaded correct content')
})
})

torrent.once('done', function () {
12 test/download-tracker-magnet.js
View file
Open in desktop
@@ -5,7 +5,8 @@ var test = require('tape')
var TrackerServer = require('bittorrent-tracker/server')
var WebTorrent = require('../')

var leavesFile = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesPath = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesFile = fs.readFileSync(leavesPath)
var leavesTorrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent')
var leavesParsed = parseTorrent(leavesTorrent)

@@ -18,7 +19,7 @@ test('Download using HTTP tracker (via magnet uri)', function (t) {
})

function magnetDownloadTest (t, serverType) {
t.plan(8)
t.plan(9)

var trackerStartCount = 0
var magnetUri
@@ -65,7 +66,7 @@ function magnetDownloadTest (t, serverType) {

t.deepEqual(torrent.files.map(function (file) { return file.name }), names)

torrent.storage.load(fs.createReadStream(leavesFile), function (err) {
torrent.storage.load(fs.createReadStream(leavesPath), function (err) {
cb(err, client1)
})
})
@@ -79,7 +80,10 @@ function magnetDownloadTest (t, serverType) {

client2.on('torrent', function (torrent) {
torrent.files.forEach(function (file) {
file.createReadStream()
file.getBuffer(function (err, buf) {
if (err) throw err
t.deepEqual(buf, leavesFile, 'downloaded correct content')
})
})

torrent.once('done', function () {
12 test/download-tracker-torrent.js
View file
Open in desktop
@@ -5,7 +5,8 @@ var test = require('tape')
var TrackerServer = require('bittorrent-tracker/server')
var WebTorrent = require('../')

var leavesFile = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesPath = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesFile = fs.readFileSync(leavesPath)
var leavesTorrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent')
var leavesParsed = parseTorrent(leavesTorrent)

@@ -18,7 +19,7 @@ test('Download using HTTP tracker (via .torrent file)', function (t) {
})

function torrentDownloadTest (t, serverType) {
t.plan(8)
t.plan(9)

var trackerStartCount = 0

@@ -65,7 +66,7 @@ function torrentDownloadTest (t, serverType) {

t.deepEqual(torrent.files.map(function (file) { return file.name }), names)

torrent.storage.load(fs.createReadStream(leavesFile), function (err) {
torrent.storage.load(fs.createReadStream(leavesPath), function (err) {
cb(err, client1)
})
})
@@ -79,7 +80,10 @@ function torrentDownloadTest (t, serverType) {

client2.on('torrent', function (torrent) {
torrent.files.forEach(function (file) {
file.createReadStream()
file.getBuffer(function (err, buf) {
if (err) throw err
t.deepEqual(buf, leavesFile, 'downloaded correct content')
})
})

torrent.once('done', function () {
22 test/server.js
View file
Open in desktop
@@ -1,11 +1,10 @@
var concat = require('concat-stream')
var get = require('simple-get')
var fs = require('fs')
var http = require('http')
var portfinder = require('portfinder')
var test = require('tape')
var WebTorrent = require('../')

var leavesFile = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesPath = __dirname + '/content/Leaves of Grass by Walt Whitman.epub'
var leavesTorrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent')

test('start http server programmatically', function (t) {
@@ -18,20 +17,17 @@ test('start http server programmatically', function (t) {
var server = torrent.createServer()
server.listen(port)

http.get('http://localhost:' + port + '/0', function (res) {
res.pipe(concat(function (data) {
get.concat('http://localhost:' + port + '/0', function (err, data) {
// Verify data for first (and only file)
t.deepEqual(data, fs.readFileSync(leavesPath))

// Verify data for first (and only file)
t.deepEqual(data, fs.readFileSync(leavesFile))

server.close()
client.destroy()
t.end()
}))
server.close()
client.destroy()
t.end()
})
})
})
torrent.on('ready', function () {
torrent.storage.load(fs.createReadStream(leavesFile))
torrent.storage.load(fs.createReadStream(leavesPath))
})
})
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.