Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webtorrent/bittorrent-tracker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v9.2.0
Choose a base ref
...
head repository: webtorrent/bittorrent-tracker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v9.2.1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 8, 2017

  1. dry some code

    @feross
    feross committed Apr 8, 2017
    Copy the full SHA
    63c953c View commit details

  2. 9.2.1

    @feross
    feross committed Apr 8, 2017
    Copy the full SHA
    3e87df8 View commit details
Showing with 10 additions and 12 deletions.
  1. +9 −11 lib/client/websocket-tracker.js
  2. +1 −1 package.json
20 changes: 9 additions & 11 deletions lib/client/websocket-tracker.js
View file
Original file line number Diff line number Diff line change
@@ -276,11 +276,7 @@ WebSocketTracker.prototype._onAnnounceResponse = function (data) {
var peer
if (data.offer && data.peer_id) {
debug('creating peer (from remote offer)')
peer = self._createPeer({
trickle: false,
config: self.client._rtcConfig,
wrtc: self.client._wrtc
})
peer = self._createPeer()
peer.id = common.binaryToHex(data.peer_id)
peer.once('signal', function (answer) {
var params = {
@@ -389,12 +385,7 @@ WebSocketTracker.prototype._generateOffers = function (numwant, cb) {
function generateOffer () {
var offerId = randombytes(20).toString('hex')
debug('creating peer (from _generateOffers)')
var peer = self.peers[offerId] = self._createPeer({
initiator: true,
trickle: false,
config: self.client._rtcConfig,
wrtc: self.client._wrtc
})
var peer = self.peers[offerId] = self._createPeer({ initiator: true })
peer.once('signal', function (offer) {
offers.push({
offer: offer,
@@ -421,6 +412,13 @@ WebSocketTracker.prototype._generateOffers = function (numwant, cb) {

WebSocketTracker.prototype._createPeer = function (opts) {
var self = this

opts = Object.assign({
trickle: false,
config: self.client._rtcConfig,
wrtc: self.client._wrtc
}, opts)

var peer = new Peer(opts)

peer.once('error', onError)
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bittorrent-tracker",
"description": "Simple, robust, BitTorrent tracker (client & server) implementation",
"version": "9.2.0",
"version": "9.2.1",
"author": {
"name": "Feross Aboukhadijeh",
"email": "feross@feross.org",