Skip to content

Handle peer 'error' events correctly #220

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
feross merged 1 commit into from
Apr 8, 2017
Merged

Handle peer 'error' events correctly #220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 26 additions & 2 deletions lib/client/websocket-tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ WebSocketTracker.prototype._onAnnounceResponse = function (data) {
var peer
if (data.offer && data.peer_id) {
debug('creating peer (from remote offer)')
peer = new Peer({
peer = self._createPeer({
trickle: false,
config: self.client._rtcConfig,
wrtc: self.client._wrtc
Expand Down Expand Up @@ -389,7 +389,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] = new Peer({
var peer = self.peers[offerId] = self._createPeer({
initiator: true,
trickle: false,
config: self.client._rtcConfig,
Expand Down Expand Up @@ -419,4 +419,28 @@ WebSocketTracker.prototype._generateOffers = function (numwant, cb) {
}
}

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

peer.once('error', onError)
peer.once('connect', onConnect)

return peer

// Handle peer 'error' events that are fired *before* the peer is emitted in
// a 'peer' event.
function onError (err) {
self.client.emit('warning', new Error('Connection error: ' + err.message))
peer.destroy()
}

// Once the peer is emitted in a 'peer' event, then it's the consumer's
// responsibility to listen for errors, so the listeners are removed here.
function onConnect () {
peer.removeListener('error', onError)
peer.removeListener('connect', onConnect)
}
}

function noop () {}