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

Updates in preparation for standard 12 #1488

Merged
merged 1 commit into from Aug 29, 2018
+28 −28
Merged

Updates in preparation for standard 12 #1488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
6fbef8e
standard
feross Aug 29, 2018
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Loading status checks…

standard

  • Loading branch information
@feross
feross committed Aug 29, 2018
commit 6fbef8e7bcc035b38468fd959c2f2da4d71edf47
4 lib/file.js
View file
Open in desktop
@@ -1,5 +1,5 @@
const {EventEmitter} = require('events')
const {PassThrough} = require('readable-stream')
const { EventEmitter } = require('events')
const { PassThrough } = require('readable-stream')
const eos = require('end-of-stream')
const path = require('path')
const render = require('render-media')
2 test/client-seed.js
View file
Open in desktop
@@ -39,7 +39,7 @@ test('client.seed: torrent file (Buffer), set name on buffer', function (t) {
var buf = Buffer.from(fixtures.leaves.content)
buf.name = 'Leaves of Grass by Walt Whitman.epub'

client.seed(buf, {announce: []}, function (torrent) {
client.seed(buf, { announce: [] }, function (torrent) {
t.equal(client.torrents.length, 1)
t.equal(torrent.infoHash, fixtures.leaves.parsedTorrent.infoHash)
t.equal(torrent.magnetURI, fixtures.leaves.magnetURI)
4 test/node/basic.js
View file
Open in desktop
@@ -99,7 +99,7 @@ test('client.seed: filesystem path to folder with one file, string', function (t
client.on('error', function (err) { t.fail(err) })
client.on('warning', function (err) { t.fail(err) })

client.seed(fixtures.folder.contentPath, {announce: []}, function (torrent) {
client.seed(fixtures.folder.contentPath, { announce: [] }, function (torrent) {
t.equal(client.torrents.length, 1)
t.equal(torrent.infoHash, fixtures.folder.parsedTorrent.infoHash)
t.equal(torrent.magnetURI, fixtures.folder.magnetURI)
@@ -119,7 +119,7 @@ test('client.seed: filesystem path to folder with multiple files, string', funct
client.on('error', function (err) { t.fail(err) })
client.on('warning', function (err) { t.fail(err) })

client.seed(fixtures.numbers.contentPath, {announce: []}, function (torrent) {
client.seed(fixtures.numbers.contentPath, { announce: [] }, function (torrent) {
t.equal(client.torrents.length, 1)
t.equal(torrent.infoHash, fixtures.numbers.parsedTorrent.infoHash)
t.equal(torrent.magnetURI, fixtures.numbers.magnetURI)
4 test/node/download-dht-magnet.js
View file
Open in desktop
@@ -35,7 +35,7 @@ test('Download using DHT (via magnet uri)', function (t) {
client1.on('error', function (err) { t.fail(err) })
client1.on('warning', function (err) { t.fail(err) })

var torrent = client1.add(fixtures.leaves.parsedTorrent, {store: MemoryChunkStore})
var torrent = client1.add(fixtures.leaves.parsedTorrent, { store: MemoryChunkStore })

torrent.on('dhtAnnounce', function () {
t.pass('finished dht announce')
@@ -90,7 +90,7 @@ test('Download using DHT (via magnet uri)', function (t) {
})
})

client2.add(fixtures.leaves.magnetURI, {store: MemoryChunkStore})
client2.add(fixtures.leaves.magnetURI, { store: MemoryChunkStore })

var gotBuffer = false
var gotDone = false
4 test/node/download-dht-torrent.js
View file
Open in desktop
@@ -34,7 +34,7 @@ test('Download using DHT (via .torrent file)', function (t) {
client1.on('error', function (err) { t.fail(err) })
client1.on('warning', function (err) { t.fail(err) })

var torrent = client1.add(fixtures.leaves.parsedTorrent, {store: MemoryChunkStore})
var torrent = client1.add(fixtures.leaves.parsedTorrent, { store: MemoryChunkStore })

torrent.on('ready', function () {
// torrent metadata has been fetched -- sanity check it
@@ -100,7 +100,7 @@ test('Download using DHT (via .torrent file)', function (t) {
}
})

client2.add(fixtures.leaves.parsedTorrent, {store: MemoryChunkStore})
client2.add(fixtures.leaves.parsedTorrent, { store: MemoryChunkStore })
}
], function (err) {
t.error(err)
10 test/node/download-metadata.js
View file
Open in desktop
@@ -33,7 +33,7 @@ test('Download metadata for magnet URI with xs parameter', function (t) {

createServer(fixtures.leaves.torrent, function (url, server) {
var encodedUrl = encodeURIComponent(url)
client.add(fixtures.leaves.magnetURI + '&xs=' + encodedUrl, {store: MemoryChunkStore}, function (torrent) {
client.add(fixtures.leaves.magnetURI + '&xs=' + encodedUrl, { store: MemoryChunkStore }, function (torrent) {
t.equal(torrent.files[0].name, 'Leaves of Grass by Walt Whitman.epub')
client.destroy(function (err) { t.error(err, 'client destroyed') })
server.close(function () { t.pass('server closed') })
@@ -57,7 +57,7 @@ test('Download metadata for magnet URI with 2 xs parameters', function (t) {

var uri = fixtures.leaves.magnetURI + '&xs=' + encodedUrl1 + '&xs=' + encodedUrl2

client.add(uri, {store: MemoryChunkStore}, function (torrent) {
client.add(uri, { store: MemoryChunkStore }, function (torrent) {
t.equal(torrent.files[0].name, 'Leaves of Grass by Walt Whitman.epub')
client.destroy(function (err) { t.error(err, 'client destroyed') })
server1.close(function () { t.pass('server closed') })
@@ -80,7 +80,7 @@ test('Download metadata for magnet URI with 2 xs parameters, with 1 invalid prot
var encodedUrl2 = encodeURIComponent(url)
var uri = fixtures.leaves.magnetURI + '&xs=' + encodedUrl1 + '&xs=' + encodedUrl2

client.add(uri, {store: MemoryChunkStore}, function (torrent) {
client.add(uri, { store: MemoryChunkStore }, function (torrent) {
t.equal(torrent.files[0].name, 'Leaves of Grass by Walt Whitman.epub')
client.destroy(function (err) { t.error(err, 'client destroyed') })
server.close(function () { t.pass('server closed') })
@@ -101,7 +101,7 @@ test('Download metadata for magnet URI with 2 xs parameters, with 1 404 URL', fu
var encodedUrl2 = encodeURIComponent(url)
var uri = fixtures.leaves.magnetURI + '&xs=' + encodedUrl1 + '&xs=' + encodedUrl2

client.add(uri, {store: MemoryChunkStore}, function (torrent) {
client.add(uri, { store: MemoryChunkStore }, function (torrent) {
t.equal(torrent.files[0].name, 'Leaves of Grass by Walt Whitman.epub')
client.destroy(function (err) { t.error(err, 'client destroyed') })
server.close(function () { t.pass('server closed') })
@@ -117,7 +117,7 @@ test('Download metadata magnet URI with unsupported protocol in xs parameter', f
client.on('error', function (err) { t.fail(err) })
client.on('warning', function (err) { t.fail(err) })

client.add(fixtures.leaves.magnetURI + '&xs=' + encodeURIComponent('invalidurl:example'), {store: MemoryChunkStore})
client.add(fixtures.leaves.magnetURI + '&xs=' + encodeURIComponent('invalidurl:example'), { store: MemoryChunkStore })

setTimeout(function () {
// no crash by now
4 test/node/download-private-dht.js
View file
Open in desktop
@@ -29,7 +29,7 @@ test('private torrent should not use DHT', function (t) {
client.on('error', function (err) { t.fail(err) })
client.on('warning', function (err) { t.fail(err) })

var torrent = client.add(fixtures.bunny.parsedTorrent, {store: MemoryChunkStore})
var torrent = client.add(fixtures.bunny.parsedTorrent, { store: MemoryChunkStore })

torrent.on('dhtAnnounce', function () {
t.fail('client announced to dht')
@@ -77,7 +77,7 @@ test('public torrent should use DHT', function (t) {
client.on('error', function (err) { t.fail(err) })
client.on('warning', function (err) { t.fail(err) })

var torrent = client.add(fixtures.leaves.parsedTorrent, {store: MemoryChunkStore})
var torrent = client.add(fixtures.leaves.parsedTorrent, { store: MemoryChunkStore })

torrent.on('dhtAnnounce', function () {
t.pass('client announced to dht')
4 test/node/download-tracker-magnet.js
View file
Open in desktop
@@ -71,7 +71,7 @@ function magnetDownloadTest (t, serverType) {
})
})

client1.add(parsedTorrent, {store: MemoryChunkStore})
client1.add(parsedTorrent, { store: MemoryChunkStore })
},

function (cb) {
@@ -103,7 +103,7 @@ function magnetDownloadTest (t, serverType) {
}
})

client2.add(magnetURI, {store: MemoryChunkStore})
client2.add(magnetURI, { store: MemoryChunkStore })
}

], function (err) {
4 test/node/download-tracker-torrent.js
View file
Open in desktop
@@ -66,15 +66,15 @@ function torrentDownloadTest (t, serverType) {
torrent.load(fs.createReadStream(fixtures.leaves.contentPath), cb)
})

client1.add(parsedTorrent, {store: MemoryChunkStore})
client1.add(parsedTorrent, { store: MemoryChunkStore })
},

function (cb) {
client2 = new WebTorrent({ dht: false })
client2.on('error', function (err) { t.fail(err) })
client2.on('warning', function (err) { t.fail(err) })

client2.add(parsedTorrent, {store: MemoryChunkStore})
client2.add(parsedTorrent, { store: MemoryChunkStore })

client2.on('torrent', function (torrent) {
torrent.files.forEach(function (file) {
4 test/node/download-webseed-magnet.js
View file
Open in desktop
@@ -52,7 +52,7 @@ test('Download using webseed (via magnet uri)', function (t) {
maybeDone()
})

var torrent = client1.add(fixtures.leaves.parsedTorrent, {store: MemoryChunkStore})
var torrent = client1.add(fixtures.leaves.parsedTorrent, { store: MemoryChunkStore })

torrent.on('infoHash', function () {
gotListening = true
@@ -92,7 +92,7 @@ test('Download using webseed (via magnet uri)', function (t) {
}
})

var torrent = client2.add(magnetURI, {store: MemoryChunkStore})
var torrent = client2.add(magnetURI, { store: MemoryChunkStore })

torrent.on('infoHash', function () {
torrent.addPeer('127.0.0.1:' + client1.address().port)
4 test/node/download-webseed-torrent.js
View file
Open in desktop
@@ -64,7 +64,7 @@ test('Download using webseed (via .torrent file)', function (t) {
}
})

client.add(parsedTorrent, {store: MemoryChunkStore})
client.add(parsedTorrent, { store: MemoryChunkStore })
}
], function (err) {
t.error(err)
@@ -102,7 +102,7 @@ test('Disable webseeds', function (t) {
client.on('error', function (err) { t.fail(err) })
client.on('warning', function (err) { t.fail(err) })

client.add(parsedTorrent, {store: MemoryChunkStore})
client.add(parsedTorrent, { store: MemoryChunkStore })

// The test above ensures that we can download the whole torrent over webseeds within a
// short time. Here, we wait the same amount of time and make sure no HTTP requests happen.
8 test/node/seed-while-download.js
View file
Open in desktop
@@ -30,7 +30,7 @@ test('Seed and download a file at the same time', function (t) {
client1.on('error', function (err) { t.fail(err) })
client1.on('warning', function (err) { t.fail(err) })

var torrent = client1.add(fixtures.leaves.torrent, {store: MemoryChunkStore})
var torrent = client1.add(fixtures.leaves.torrent, { store: MemoryChunkStore })

torrent.on('dhtAnnounce', function () {
t.pass('client1 finished dht announce')
@@ -60,7 +60,7 @@ test('Seed and download a file at the same time', function (t) {
client2.on('error', function (err) { t.fail(err) })
client2.on('warning', function (err) { t.fail(err) })

var torrent = client2.add(fixtures.alice.torrent, {store: MemoryChunkStore})
var torrent = client2.add(fixtures.alice.torrent, { store: MemoryChunkStore })

torrent.on('dhtAnnounce', function () {
t.pass('client2 finished dht announce')
@@ -82,7 +82,7 @@ test('Seed and download a file at the same time', function (t) {
},

function (cb) {
client1.add(fixtures.alice.magnetURI, {store: MemoryChunkStore})
client1.add(fixtures.alice.magnetURI, { store: MemoryChunkStore })

client1.on('torrent', function (torrent) {
torrent.files[0].getBuffer(function (err, buf) {
@@ -99,7 +99,7 @@ test('Seed and download a file at the same time', function (t) {
})
})

client2.add(fixtures.leaves.magnetURI, {store: MemoryChunkStore})
client2.add(fixtures.leaves.magnetURI, { store: MemoryChunkStore })

client2.on('torrent', function (torrent) {
torrent.files[0].getBuffer(function (err, buf) {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.