remove portfinder dep

neviim · Feb 8, 2015 · e0af2a8 · e0af2a8
1 parent 89e1195
commit e0af2a8
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 73 deletions.
diff --git a/package.json b/package.json
@@ -75,7 +75,6 @@
     "bittorrent-tracker": "^2.5.0",
     "brfs": "^1.2.0",
     "browserify": "^8.0.2",
-    "portfinder": "^0.3.0",
     "run-auto": "^1.0.0",
     "standard": "^2.0.0",
     "tape": "^3.0.3",

diff --git a/test/basic-node.js b/test/basic-node.js
@@ -2,7 +2,6 @@ var WebTorrent = require('../')
 var fs = require('fs')
 var http = require('http')
 var parseTorrent = require('parse-torrent')
-var portfinder = require('portfinder')
 var test = require('tape')
 
 var leavesPath = __dirname + '/torrents/leaves.torrent'
@@ -20,17 +19,15 @@ test('client.add (http url to a torrent file (string))', function (t) {
     res.end(leaves)
   })
 
-  portfinder.getPort(function (err, port) {
-    if (err) throw err
-    server.listen(port, function () {
-      var url = 'http://127.0.0.1:' + port
-      var client = new WebTorrent({ dht: false, tracker: false })
-      client.add(url, function (torrent) {
-        t.equal(torrent.infoHash, leavesTorrent.infoHash)
-        t.equal(torrent.magnetURI, leavesMagnetURI)
-        client.destroy()
-        server.close()
-      })
+  server.listen(0, function () {
+    var port = server.address().port
+    var url = 'http://127.0.0.1:' + port
+    var client = new WebTorrent({ dht: false, tracker: false })
+    client.add(url, function (torrent) {
+      t.equal(torrent.infoHash, leavesTorrent.infoHash)
+      t.equal(torrent.magnetURI, leavesMagnetURI)
+      client.destroy()
+      server.close()
     })
   })
 })

diff --git a/test/blocklist.js b/test/blocklist.js
@@ -1,7 +1,6 @@
 var fs = require('fs')
 var http = require('http')
 var parseTorrent = require('parse-torrent')
-var portfinder = require('portfinder')
 var test = require('tape')
 var WebTorrent = require('../')
 var zlib = require('zlib')
@@ -142,25 +141,23 @@ test('blocklist (http url)', function (t) {
     fs.createReadStream(blocklistPath)
       .pipe(res)
   })
-  portfinder.getPort(function (err, port) {
-    if (err) throw err
+
+  server.listen(0, function () {
+    var port = server.address().port
     var url = 'http://127.0.0.1:' + port
+    var client = new WebTorrent({
+      dht: false,
+      tracker: false,
+      blocklist: url
+    })
+    .on('error', function (err) { t.fail(err) })
+    .on('ready', function () {
+      var torrent = client.add(leavesParsed)
+
+      assertList(t, torrent)
 
-    server.listen(port, function () {
-      var client = new WebTorrent({
-        dht: false,
-        tracker: false,
-        blocklist: url
-      })
-      .on('error', function (err) { t.fail(err) })
-      .on('ready', function () {
-        var torrent = client.add(leavesParsed)
-
-        assertList(t, torrent)
-
-        client.destroy()
-        server.close()
-      })
+      client.destroy()
+      server.close()
     })
   })
 })
@@ -176,25 +173,23 @@ test('blocklist (http url with gzip encoding)', function (t) {
       .pipe(zlib.createGzip())
       .pipe(res)
   })
-  portfinder.getPort(function (err, port) {
-    if (err) throw err
+
+  server.listen(0, function () {
+    var port = server.address().port
     var url = 'http://127.0.0.1:' + port
+    var client = new WebTorrent({
+      dht: false,
+      tracker: false,
+      blocklist: url
+    })
+    .on('error', function (err) { t.fail(err) })
+    .on('ready', function () {
+      var torrent = client.add(leavesParsed)
 
-    server.listen(port, function () {
-      var client = new WebTorrent({
-        dht: false,
-        tracker: false,
-        blocklist: url
-      })
-      .on('error', function (err) { t.fail(err) })
-      .on('ready', function () {
-        var torrent = client.add(leavesParsed)
-
-        assertList(t, torrent)
-
-        client.destroy()
-        server.close()
-      })
+      assertList(t, torrent)
+
+      client.destroy()
+      server.close()
     })
   })
 })
@@ -210,25 +205,23 @@ test('blocklist (http url with deflate encoding)', function (t) {
       .pipe(zlib.createDeflate())
       .pipe(res)
   })
-  portfinder.getPort(function (err, port) {
-    if (err) throw err
+
+  server.listen(0, function () {
+    var port = server.address().port
     var url = 'http://127.0.0.1:' + port
+    var client = new WebTorrent({
+      dht: false,
+      tracker: false,
+      blocklist: url
+    })
+    .on('error', function (err) { t.fail(err) })
+    .on('ready', function () {
+      var torrent = client.add(leavesParsed)
+
+      assertList(t, torrent)
 
-    server.listen(port, function () {
-      var client = new WebTorrent({
-        dht: false,
-        tracker: false,
-        blocklist: url
-      })
-      .on('error', function (err) { t.fail(err) })
-      .on('ready', function () {
-        var torrent = client.add(leavesParsed)
-
-        assertList(t, torrent)
-
-        client.destroy()
-        server.close()
-      })
+      client.destroy()
+      server.close()
     })
   })
 })

diff --git a/test/server.js b/test/server.js
@@ -1,6 +1,5 @@
 var fs = require('fs')
 var get = require('simple-get')
-var portfinder = require('portfinder')
 var test = require('tape')
 var WebTorrent = require('../')
 
@@ -10,13 +9,10 @@ var leavesTorrent = fs.readFileSync(__dirname + '/torrents/leaves.torrent')
 test('start http server programmatically', function (t) {
   var client = new WebTorrent()
   var torrent = client.add(leavesTorrent, { dht: false, tracker: false }, function (torrent) {
-    portfinder.getPort(function (err, port) {
-      if (err) throw err
-
-      // create HTTP server for this torrent
-      var server = torrent.createServer()
-      server.listen(port)
-
+    // create HTTP server for this torrent
+    var server = torrent.createServer()
+    server.listen(0, function () {
+      var port = server.address().port
       get.concat('http://localhost:' + port + '/0', function (err, data) {
         if (err) throw err
         // Verify data for first (and only file)