mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify keepalive resets

Browse source 
Websocket resources should have their keepalive timers reset whenever a
message comes in. This is a nicety that slightly reduces the amount of
traffic we send when actively messaging.

Previously this was handled by MessageReceiver, but it's a bit cleaner
to just have the WebsocketResource add an extra 'message' event handler.

// FREEBIE
This commit is contained in:
lilia 2015-10-23 14:43:15 -07:00
parent 5a8787f91a
commit 9be5efc571
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/libtextsecure.js
View file

@ -38461,8 +38461,9 @@ axolotlInternal.RecipientRecord = function() {
path : opts.keepalive.path,
disconnect : opts.keepalive.disconnect
});
this.resetKeepAliveTimer = keepalive.reset.bind(keepalive);
socket.addEventListener('connect', this.resetKeepAliveTimer);
var resetKeepAliveTimer = keepalive.reset.bind(keepalive);
socket.addEventListener('connect', resetKeepAliveTimer);
socket.addEventListener('message', resetKeepAliveTimer);
socket.addEventListener('close', keepalive.stop.bind(keepalive));
}
@ -39261,7 +39262,6 @@ MessageReceiver.prototype = {
});
},
handleRequest: function(request) {
this.wsr.resetKeepAliveTimer();
// TODO: handle different types of requests. for now we only expect
// PUT /messages <encrypted IncomingPushMessageSignal>
textsecure.crypto.decryptWebsocketMessage(request.body, this.signalingKey).then(function(plaintext) {

1
libtextsecure/message_receiver.js
View file

@ -53,7 +53,6 @@ MessageReceiver.prototype = {
});
},
handleRequest: function(request) {
this.wsr.resetKeepAliveTimer();
// TODO: handle different types of requests. for now we only expect
// PUT /messages <encrypted IncomingPushMessageSignal>
textsecure.crypto.decryptWebsocketMessage(request.body, this.signalingKey).then(function(plaintext) {

5
libtextsecure/websocket-resources.js
View file

@ -134,8 +134,9 @@
path : opts.keepalive.path,
disconnect : opts.keepalive.disconnect
});
this.resetKeepAliveTimer = keepalive.reset.bind(keepalive);
socket.addEventListener('connect', this.resetKeepAliveTimer);
var resetKeepAliveTimer = keepalive.reset.bind(keepalive);
socket.addEventListener('connect', resetKeepAliveTimer);
socket.addEventListener('message', resetKeepAliveTimer);
socket.addEventListener('close', keepalive.stop.bind(keepalive));
}