Skip to content

Commit 65b2bdc

Browse files
committed
removed xtend
1 parent a141baa commit 65b2bdc

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

client.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module.exports = Client
33
var Buffer = require('safe-buffer').Buffer
44
var debug = require('debug')('bittorrent-tracker:client')
55
var EventEmitter = require('events').EventEmitter
6-
var extend = require('xtend')
76
var inherits = require('inherits')
87
var once = require('once')
98
var parallel = require('run-parallel')
@@ -130,7 +129,7 @@ Client.scrape = function (opts, cb) {
130129
if (!opts.infoHash) throw new Error('Option `infoHash` is required')
131130
if (!opts.announce) throw new Error('Option `announce` is required')
132131

133-
var clientOpts = extend(opts, {
132+
var clientOpts = Object.assign({}, opts, {
134133
infoHash: Array.isArray(opts.infoHash) ? opts.infoHash[0] : opts.infoHash,
135134
peerId: Buffer.from('01234567890123456789'), // dummy value
136135
port: 6881 // dummy value
@@ -291,6 +290,6 @@ Client.prototype._defaultAnnounceOpts = function (opts) {
291290
if (opts.uploaded == null) opts.uploaded = 0
292291
if (opts.downloaded == null) opts.downloaded = 0
293292

294-
if (self._getAnnounceOpts) opts = extend(opts, self._getAnnounceOpts())
293+
if (self._getAnnounceOpts) opts = Object.assign({}, opts, self._getAnnounceOpts())
295294
return opts
296295
}

lib/client/http-tracker.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var arrayRemove = require('unordered-array-remove')
44
var bencode = require('bencode')
55
var compact2string = require('compact2string')
66
var debug = require('debug')('bittorrent-tracker:http-tracker')
7-
var extend = require('xtend')
87
var get = require('simple-get')
98
var inherits = require('inherits')
109

@@ -47,7 +46,7 @@ HTTPTracker.prototype.announce = function (opts) {
4746
var self = this
4847
if (self.destroyed) return
4948

50-
var params = extend(opts, {
49+
var params = Object.assign({}, opts, {
5150
compact: (opts.compact == null) ? 1 : opts.compact,
5251
info_hash: self.client._infoHashBinary,
5352
peer_id: self.client._peerIdBinary,

lib/client/websocket-tracker.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module.exports = WebSocketTracker
22

33
var debug = require('debug')('bittorrent-tracker:websocket-tracker')
4-
var extend = require('xtend')
54
var inherits = require('inherits')
65
var Peer = require('simple-peer')
76
var randombytes = require('randombytes')
@@ -55,7 +54,7 @@ WebSocketTracker.prototype.announce = function (opts) {
5554
return
5655
}
5756

58-
var params = extend(opts, {
57+
var params = Object.assign({}, opts, {
5958
action: 'announce',
6059
info_hash: self.client._infoHashBinary,
6160
peer_id: self.client._peerIdBinary

lib/common.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44

55
var Buffer = require('safe-buffer').Buffer
6-
var extend = require('xtend/mutable')
76

87
exports.DEFAULT_ANNOUNCE_PEERS = 50
98
exports.MAX_ANNOUNCE_PEERS = 82
@@ -23,4 +22,4 @@ exports.hexToBinary = function (str) {
2322
}
2423

2524
var config = require('./common-node')
26-
extend(exports, config)
25+
Object.assign(exports, config)

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
"string2compact": "^1.1.1",
4242
"uniq": "^1.0.1",
4343
"unordered-array-remove": "^1.0.2",
44-
"ws": "^6.0.0",
45-
"xtend": "^4.0.0"
44+
"ws": "^6.0.0"
4645
},
4746
"devDependencies": {
4847
"electron-webrtc": "^0.3.0",

0 commit comments

Comments
 (0)