Skip to content

Add testing for websocket server #129

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

Closed
yciabaud wants to merge 5 commits into from
Closed

Add testing for websocket server #129

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1c2a83
Adds unit testing for websocket server
yciabaud Mar 13, 2016
26c201d
Close the websocket only when no one is using it
yciabaud Mar 14, 2016
c7a5367
Clear reconnect timeout on destroy
yciabaud Mar 16, 2016
92066a8
Destroy peers and tracker timeouts on destroy
yciabaud Mar 14, 2016
ce77a6b
Make electron webrtc working in headless and stabdard fix
yciabaud Mar 16, 2016
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
Prev Previous commit
Next Next commit
Clear reconnect timeout on destroy
  • Loading branch information
@yciabaud
yciabaud committed Mar 16, 2016
commit c7a5367e7d0b35d5905ecf1db498fafe2ca084dc
5 changes: 3 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 @@ -87,6 +87,7 @@ WebSocketTracker.prototype.destroy = function (cb) {
if (self.destroyed) return cb(null)
self.destroyed = true
clearInterval(self.interval)
clearTimeout(self.reconnectTimer)
Copy link
Member

@feross feross Mar 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good idea!


if (socketPool[self.announceUrl]) socketPool[self.announceUrl].consumers--
Copy link
Member

@feross feross Mar 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer -= 1 to --


Expand Down Expand Up @@ -299,11 +300,11 @@ WebSocketTracker.prototype._startReconnectTimer = function () {
var ms = Math.floor(Math.random() * RECONNECT_VARIANCE) + Math.min(Math.pow(2, self.retries) * RECONNECT_MINIMUM, RECONNECT_MAXIMUM)

self.reconnecting = true
var reconnectTimer = setTimeout(function () {
self.reconnectTimer = setTimeout(function () {
Copy link
Member

@feross feross Mar 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add self.reconnectTimer = null to the constructor, as a form of "documentation".

self.retries++
self._openSocket()
}, ms)
if (reconnectTimer.unref) reconnectTimer.unref()
if (self.reconnectTimer.unref) self.reconnectTimer.unref()

debug('reconnecting socket in %s ms', ms)
}
Expand Down