Move tracker options into `opts.tracker` (#649)

docs/api.md

@@ -51,16 +51,18 @@ If `opts` is specified, then the default options (shown below) will be overridde
 
 ```js
 {
-  dht: Boolean|Object,   // Enable DHT (default=true), or options object for DHT
-  maxConns: Number,      // Max number of connections per torrent (default=55)
-  nodeId: String|Buffer, // DHT protocol node ID (default=randomly generated)
-  peerId: String|Buffer, // Wire protocol peer ID (default=randomly generated)
-  rtcConfig: Object,     // RTCPeerConnection configuration object (default=STUN only)
-  tracker: Boolean,      // Whether or not to enable trackers (default=true)
-  wrtc: Object           // Custom webrtc implementation (in node, specify the [wrtc](https://www.npmjs.com/package/wrtc) or [electron-webrtc](https://github.com/mappum/electron-webrtc) package)
+  dht: Boolean|Object,     // Enable DHT (default=true), or options object for DHT
+  maxConns: Number,        // Max number of connections per torrent (default=55)
+  nodeId: String|Buffer,   // DHT protocol node ID (default=randomly generated)
+  peerId: String|Buffer,   // Wire protocol peer ID (default=randomly generated)
+  tracker: Boolean|Object, // Enable trackers (default=true), or options object for tracker (wrtc and rtcConfig)
 }
 ```
 
++ See the documentation for webrtc implementation (in node, specify the [wrtc](https://www.npmjs.com/package/wrtc) 
++ or [electron-webrtc](https://github.com/mappum/electron-webrtc) package) for information on what options are available 
++ via the `opts` object.
+
 ## `client.add(torrentId, [opts], [function ontorrent (torrent) {}])`
 
 Start downloading a new torrent.

index.js

@@ -68,12 +68,14 @@ function WebTorrent (opts) {
   self.listening = false
   self.torrentPort = opts.torrentPort || 0
   self.dhtPort = opts.dhtPort || 0
-  self.tracker = opts.tracker !== undefined ? opts.tracker : true
+  self.tracker = opts.tracker !== undefined ? opts.tracker : {}
   self.torrents = []
   self.maxConns = Number(opts.maxConns) || 55
 
-  self._rtcConfig = opts.rtcConfig
-  self._wrtc = opts.wrtc || global.WRTC // to support `webtorrent-hybrid` package
+  if (typeof self.tracker === 'object') {
+    self.tracker.rtcConfig = opts.rtcConfig
+    self.tracker.wrtc = opts.wrtc || global.WRTC // to support `webtorrent-hybrid` package
+  }
 
   if (typeof TCPPool === 'function') {
     self._tcpPool = new TCPPool(self)

lib/torrent.js

@@ -292,8 +292,8 @@ Torrent.prototype._onListening = function () {
   var self = this
   if (self.discovery || self.destroyed) return
   var trackerOpts = {
-    rtcConfig: self.client._rtcConfig,
-    wrtc: self.client._wrtc,
+    rtcConfig: self.client.tracker.rtcConfig,
+    wrtc: self.client.tracker.wrtc,
     getAnnounceOpts: function () {
       var opts = {
         uploaded: self.uploaded,