Skip to content

[pull] master from webtorrent:master #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Apr 13, 2021
Merged

[pull] master from webtorrent:master #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce8ea41
Lower the max number of WebRTC peers in an announce to 5
feross Apr 12, 2021
dd02cdd
ensure that 'peer' is emitted before 'connect' event fires
feross Apr 12, 2021
77d409a
9.17.0
feross Apr 12, 2021
2a12b75
package metadata
feross Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ runner.node }}
node-version: ${{ matrix.node }}
- run: npm install
- run: npm run build --if-present
- run: npm test
6 changes: 3 additions & 3 deletions lib/client/websocket-tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class WebSocketTracker extends Tracker {
this._send(params)
} else {
// Limit the number of offers that are generated, since it can be slow
const numwant = Math.min(opts.numwant, 10)
const numwant = Math.min(opts.numwant, 5)

this._generateOffers(numwant, offers => {
params.numwant = numwant
Expand Down Expand Up @@ -278,17 +278,17 @@ class WebSocketTracker extends Tracker {
if (this._trackerId) params.trackerid = this._trackerId
this._send(params)
})
peer.signal(data.offer)
this.client.emit('peer', peer)
peer.signal(data.offer)
}

if (data.answer && data.peer_id) {
const offerId = common.binaryToHex(data.offer_id)
peer = this.peers[offerId]
if (peer) {
peer.id = common.binaryToHex(data.peer_id)
peer.signal(data.answer)
this.client.emit('peer', peer)
peer.signal(data.answer)

clearTimeout(peer.trackerTimeout)
peer.trackerTimeout = null
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
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.16.1",
"version": "9.17.0",
"author": {
"name": "WebTorrent LLC",
"email": "[email protected]",
Expand Down