Merge branch 'master' of https://github.com/webtorrent/bittorrent-tracker

Author: nguquen

AUTHORS.md

@@ -42,5 +42,6 @@
 - James M Snell ([email protected])
 - crapthings ([email protected])
 - daiyu ([email protected])
+- LI ([email protected])
 
 #### Generated by tools/update-authors.sh.

client.js

@@ -3,7 +3,6 @@ module.exports = Client
 var Buffer = require('safe-buffer').Buffer
 var debug = require('debug')('bittorrent-tracker:client')
 var EventEmitter = require('events').EventEmitter
-var extend = require('xtend')
 var inherits = require('inherits')
 var once = require('once')
 var parallel = require('run-parallel')
@@ -130,7 +129,7 @@ Client.scrape = function (opts, cb) {
   if (!opts.infoHash) throw new Error('Option `infoHash` is required')
   if (!opts.announce) throw new Error('Option `announce` is required')
 
-  var clientOpts = extend(opts, {
+  var clientOpts = Object.assign({}, opts, {
     infoHash: Array.isArray(opts.infoHash) ? opts.infoHash[0] : opts.infoHash,
     peerId: Buffer.from('01234567890123456789'), // dummy value
     port: 6881 // dummy value
@@ -291,6 +290,6 @@ Client.prototype._defaultAnnounceOpts = function (opts) {
   if (opts.uploaded == null) opts.uploaded = 0
   if (opts.downloaded == null) opts.downloaded = 0
 
-  if (self._getAnnounceOpts) opts = extend(opts, self._getAnnounceOpts())
+  if (self._getAnnounceOpts) opts = Object.assign({}, opts, self._getAnnounceOpts())
   return opts
 }

lib/client/http-tracker.js

@@ -4,7 +4,6 @@ var arrayRemove = require('unordered-array-remove')
 var bencode = require('bencode')
 var compact2string = require('compact2string')
 var debug = require('debug')('bittorrent-tracker:http-tracker')
-var extend = require('xtend')
 var get = require('simple-get')
 var inherits = require('inherits')
 
@@ -47,7 +46,7 @@ HTTPTracker.prototype.announce = function (opts) {
   var self = this
   if (self.destroyed) return
 
-  var params = extend(opts, {
+  var params = Object.assign({}, opts, {
     compact: (opts.compact == null) ? 1 : opts.compact,
     info_hash: self.client._infoHashBinary,
     peer_id: self.client._peerIdBinary,

lib/client/websocket-tracker.js

@@ -1,7 +1,6 @@
 module.exports = WebSocketTracker
 
 var debug = require('debug')('bittorrent-tracker:websocket-tracker')
-var extend = require('xtend')
 var inherits = require('inherits')
 var Peer = require('simple-peer')
 var randombytes = require('randombytes')
@@ -14,6 +13,8 @@ var Tracker = require('./tracker')
 // In practice, WebSockets are pretty slow to establish, so this gives a nice performance
 // boost, and saves browser resources.
 var socketPool = {}
+// Normally this shouldn't be accessed but is occasionally useful
+WebSocketTracker._socketPool = socketPool
 
 var RECONNECT_MINIMUM = 15 * 1000
 var RECONNECT_MAXIMUM = 30 * 60 * 1000
@@ -53,7 +54,7 @@ WebSocketTracker.prototype.announce = function (opts) {
     return
   }
 
-  var params = extend(opts, {
+  var params = Object.assign({}, opts, {
     action: 'announce',
     info_hash: self.client._infoHashBinary,
     peer_id: self.client._peerIdBinary

lib/common.js

@@ -3,7 +3,6 @@
  */
 
 var Buffer = require('safe-buffer').Buffer
-var extend = require('xtend/mutable')
 
 exports.DEFAULT_ANNOUNCE_PEERS = 50
 exports.MAX_ANNOUNCE_PEERS = 82
@@ -23,4 +22,4 @@ exports.hexToBinary = function (str) {
 }
 
 var config = require('./common-node')
-extend(exports, config)
+Object.assign(exports, config)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bittorrent-tracker",
   "description": "Simple, robust, BitTorrent tracker (client & server) implementation",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "[email protected]",
@@ -21,7 +21,7 @@
     "bittorrent-peerid": "^1.0.2",
     "bn.js": "^4.4.0",
     "compact2string": "^1.2.0",
-    "debug": "^3.1.0",
+    "debug": "^4.0.1",
     "inherits": "^2.0.1",
     "ip": "^1.0.1",
     "lru": "^3.0.0",
@@ -38,8 +38,7 @@
     "string2compact": "^1.1.1",
     "uniq": "^1.0.1",
     "unordered-array-remove": "^1.0.2",
-    "ws": "^6.0.0",
-    "xtend": "^4.0.0"
+    "ws": "^6.0.0"
   },
   "devDependencies": {
     "electron-webrtc": "^0.3.0",