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

Better handling of network disconnection/reconnection (#1546)

Browse source 
* Ensure that our preload.js setImmediate call finds right function

FREEBIE

* Our own socket close event, better logging, unregistration

FREEBIE

* Return CLOSED for NetworkStatusView if we've fully disconnected

* background.js: Remove messageReceiver = null, log in connect()

A null messageReciever makes the NetworkStatusView think we're online.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-10-06 16:28:13 -07:00 • committed by GitHub
parent 52cc8355a6
commit b64f2969fd
6 changed files with 363 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libtextsecure/message_receiver.js
View file

@ -28,8 +28,11 @@ MessageReceiver.prototype = new textsecure.EventTarget();
MessageReceiver.prototype.extend({
constructor: MessageReceiver,
connect: function() {
this.hasConnected = true;
if (this.socket && this.socket.readyState !== WebSocket.CLOSED) {
this.socket.close();
this.wsr.close();
}
// initialize the socket and start listening for messages
this.socket = this.server.getMessageSocket();
@ -38,16 +41,45 @@ MessageReceiver.prototype.extend({
this.socket.onopen = this.onopen.bind(this);
this.wsr = new WebSocketResource(this.socket, {
handleRequest: this.handleRequest.bind(this),
keepalive: { path: '/v1/keepalive', disconnect: true }
keepalive: {
path: '/v1/keepalive',
disconnect: true
}
});
// Because sometimes the socket doesn't properly emit its close event
this._onClose = this.onclose.bind(this)
this.wsr.addEventListener('close', this._onClose);
// Ensures that an immediate 'empty' event from the websocket will fire only after
// all cached envelopes are processed.
this.incoming = [this.pending];
},
shutdown: function() {
if (this.socket) {
this.socket.onclose = null;
this.socket.onerror = null;
this.socket.onopen = null;
this.socket = null;
}
if (this.wsr) {
this.wsr.removeEventListener('close', this._onClose);
this.wsr = null;
}
},
close: function() {
console.log('MessageReceiver.close()');
this.calledClose = true;
this.socket.close(3000, 'called close');
// Our WebSocketResource instance will close the socket and emit a 'close' event
// if the socket doesn't emit one quickly enough.
if (this.wsr) {
this.wsr.close(3000, 'called close');
}
this.shutdown();
return this.drain();
},
onopen: function() {
@ -68,6 +100,8 @@ MessageReceiver.prototype.extend({
this.calledClose
);
this.shutdown();
if (this.calledClose) {
return;
}
@ -332,6 +366,8 @@ MessageReceiver.prototype.extend({
getStatus: function() {
if (this.socket) {
return this.socket.readyState;
} else if (this.hasConnected) {
return WebSocket.CLOSED;
} else {
return -1;
}