mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-21 23:36:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cancel keep alive on rejoin room

Browse source
This commit is contained in:
RobinLinus 2018-09-21 20:39:18 +02:00
parent b67afca8ac
commit 83ff45da15
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
server/index.js
View file

@ -11,7 +11,6 @@ class SnapdropServer {
this._wss.on('headers', (headers, response) => this._onHeaders(headers, response)); this._wss.on('headers', (headers, response) => this._onHeaders(headers, response));
this._rooms = {}; this._rooms = {};
this._timerID = 0;
console.log('Snapdrop is running on port', port); console.log('Snapdrop is running on port', port);
} }
@ -53,7 +52,6 @@ class SnapdropServer {
} }
_joinRoom(peer) { _joinRoom(peer) {
this._cancelKeepAlive(peer);
// if room doesn't exist, create it // if room doesn't exist, create it
if (!this._rooms[peer.ip]) { if (!this._rooms[peer.ip]) {
this._rooms[peer.ip] = {}; this._rooms[peer.ip] = {};
@ -85,10 +83,10 @@ class SnapdropServer {
} }
_leaveRoom(peer) { _leaveRoom(peer) {
this._cancelKeepAlive(peer);
// delete the peer
if (!this._rooms[peer.ip] || !this._rooms[peer.ip][peer.id]) return; if (!this._rooms[peer.ip] || !this._rooms[peer.ip][peer.id]) return;
this._cancelKeepAlive(this._rooms[peer.ip][peer.id]);
// delete the peer
delete this._rooms[peer.ip][peer.id]; delete this._rooms[peer.ip][peer.id];
peer.socket.terminate(); peer.socket.terminate();
@ -109,30 +107,29 @@ class SnapdropServer {
_send(peer, message) { _send(peer, message) {
if (!peer) return console.error('undefined peer'); if (!peer) return console.error('undefined peer');
if (this._wss.readyState !== this._wss.OPEN) return console.error('Socket is closed');
message = JSON.stringify(message); message = JSON.stringify(message);
peer.socket.send(message, error => { peer.socket.send(message, error => console.log(error));
if (error) this._leaveRoom(peer);
});
} }
_keepAlive(peer) { _keepAlive(peer) {
this._cancelKeepAlive(peer);
var timeout = 10000; var timeout = 10000;
// console.log(Date.now() - peer.lastBeat); if (!peer.lastBeat) {
peer.lastBeat = Date.now();
}
if (Date.now() - peer.lastBeat > 2 * timeout) { if (Date.now() - peer.lastBeat > 2 * timeout) {
this._leaveRoom(peer); this._leaveRoom(peer);
return; return;
} }
if (this._wss.readyState == this._wss.OPEN) { this._send(peer, { type: 'ping' });
this._send(peer, {
type: 'ping'
});
}
peer.timerId = setTimeout(() => this._keepAlive(peer), timeout); peer.timerId = setTimeout(() => this._keepAlive(peer), timeout);
} }
_cancelKeepAlive(peer) { _cancelKeepAlive(peer) {
if (peer.timerId) { if (peer && peer.timerId) {
clearTimeout(peer.timerId); clearTimeout(peer.timerId);
} }
} }