Merge branch 'master' into nat-traversal

index.js

@@ -95,13 +95,13 @@ class WebTorrent extends EventEmitter {
       }
     }
 
-  self._natTraversal = require('./lib/nat-traversal') // browser exclude
+  this._natTraversal = require('./lib/nat-traversal') // browser exclude
 
   if (typeof TCPPool === 'function') {
-    self._tcpPool = new TCPPool(self)
+    this._tcpPool = new TCPPool(this)
   } else {
     process.nextTick(function () {
-      self._onListening()
+      this._onListening()
     })
   }
 
@@ -117,12 +117,12 @@ class WebTorrent extends EventEmitter {
         this._destroy(err)
       })
 
-    self.dht.once('listening', function () {
-      var address = self.dht.address()
+    this.dht.once('listening', function () {
+      var address = this.dht.address()
       if (address) {
-        self.dhtPort = address.port
+        this.dhtPort = address.port
         if (self._natTraversal.portMapping) {
-          self._natTraversal.portMapping(self.dhtPort, 'udp')
+          this._natTraversal.portMapping(this.dhtPort, 'udp')
         }
       }
     })
@@ -384,15 +384,15 @@ class WebTorrent extends EventEmitter {
       })
     }
 
-    parallel(tasks, cb)
-
-  if (self._natTraversal.destroy) {
-    tasks.push(function (cb) {
-      self._natTraversal.destroy(cb)
-    })
-  }
+    if (this._natTraversal.destroy) {
+      tasks.push(function (cb) {
+        this._natTraversal.destroy(cb)
+      })
+    }
 
-  parallel(tasks, cb)
+    parallel(tasks, cb)
+
+    if (err) this.emit('error', err)
 
     this.torrents = []
     this._tcpPool = null
@@ -418,6 +418,7 @@ class WebTorrent extends EventEmitter {
         this._natTraversal.portMapping(this.torrentPort, 'tcp')
       }
     }
+    this.emit('listening')
   }
 
   _debug () {

lib/server.js

@@ -1,16 +1,12 @@
-module.exports = Server
-
-var arrayRemove = require('unordered-array-remove')
-var http = require('http')
-var mime = require('mime')
-var pump = require('pump')
-var rangeParser = require('range-parser')
-var url = require('url')
-
-function Server (torrent, opts) {
-  var server = http.createServer()
-  var natTraversal = require('./nat-traversal')
-  if (!opts) opts = {}
+const arrayRemove = require('unordered-array-remove')
+const http = require('http')
+const mime = require('mime')
+const pump = require('pump')
+const rangeParser = require('range-parser')
+const url = require('url')
+
+function Server (torrent, opts = {}) {
+  const server = http.createServer()
   if (!opts.origin) opts.origin = '*' // allow all origins by default
 
   const sockets = []