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

Move/refactor keepalive logic and add disconnect timer

Browse source 
We now disconnect ourselves if we don't get the server's response to a
keepalive request within 30s. This way we will eventually disconnect if
the network goes away but the socket is not closed.*

* See code.google.com/p/chromium/issues/detail?id=197841 and
https://stackoverflow.com/questions/11755605/chrome-websocket-connection-not-closed-when-browser-closed

We will then try to reconnect once a minute (See 8a10c96);

Keepalives belong at this level anyway, since the format is defined by
both the websocket resource protocol and our specific server url
structure.

// FREEBIE
This commit is contained in:
lilia 2015-07-16 13:16:50 -07:00
parent 8a10c96ab4
commit 7d3d634a2d
6 changed files with 62 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libtextsecure/test/websocket_test.js
View file

@ -75,20 +75,4 @@ describe('TextSecureWebSocket', function() {
mockServer.close();
});
it('sends a keepalive once a minute', function(done) {
this.timeout(60000);
var mockServer = new MockServer('ws://localhost:8081');
mockServer.on('connection', function(server) {
server.on('message', function(data) {
var message = textsecure.protobuf.WebSocketMessage.decode(data);
assert.strictEqual(message.type, textsecure.protobuf.WebSocketMessage.Type.REQUEST);
assert.strictEqual(message.request.verb, 'GET');
assert.strictEqual(message.request.path, '/v1/keepalive');
socket.close();
server.close();
done();
});
});
var socket = new TextSecureWebSocket('ws://localhost:8081');
});
});