toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

PLT-5543 Fix WebSocket keeps trying to reconnect (#261)

Browse source 
* PLT-5543 Fix WebSocket keeps trying to reconnect when the session has expired

* force connection when initializing the websocket
This commit is contained in:
enahum 2017-02-16 11:44:14 -03:00 committed by Harrison Healey
parent 5a5772bcd0
commit 7ed9ca54f2
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
service/actions/websocket.js
View file

@ -60,13 +60,13 @@ export function init(siteUrl, token, optionalWebSocket) {
websocketClient.setReconnectCallback(handleReconnect);
websocketClient.setCloseCallback(handleClose);
websocketClient.setConnectingCallback(handleConnecting);
return websocketClient.initialize(connUrl, authToken, dispatch, getState, optionalWebSocket);
return websocketClient.initialize(true, connUrl, authToken, dispatch, getState, optionalWebSocket);
};
}
export function close() {
return async (dispatch, getState) => {
websocketClient.close();
websocketClient.close(true);
if (dispatch) {
dispatch({type: GeneralTypes.WEBSOCKET_FAILURE, error: 'Closed'}, getState);
}

17
service/client/websocket_client.js
View file

@ -22,9 +22,14 @@ class WebSocketClient {
this.connectingCallback = null;
this.dispatch = null;
this.getState = null;
this.stop = false;
}
initialize(connectionUrl = this.connectionUrl, token, dispatch, getState, webSocketConnector = WebSocket) {
initialize(forceConnection = true, connectionUrl = this.connectionUrl, token, dispatch, getState, webSocketConnector = WebSocket) {
if (forceConnection) {
this.stop = false;
}
return new Promise((resolve, reject) => {
if (this.conn) {
resolve();
@ -104,7 +109,10 @@ class WebSocketClient {
setTimeout(
() => {
this.initialize(connectionUrl, token, dispatch, getState, webSocketConnector);
if (this.stop) {
return;
}
this.initialize(false, connectionUrl, token, dispatch, getState, webSocketConnector);
},
retryTime
);
@ -158,7 +166,8 @@ class WebSocketClient {
this.closeCallback = callback;
}
close() {
close(stop = false) {
this.stop = stop;
this.connectFailCount = 0;
this.sequence = 1;
if (this.conn && this.conn.readyState === Socket.OPEN) {
@ -180,7 +189,7 @@ class WebSocketClient {
this.conn.send(JSON.stringify(msg));
} else if (!this.conn || this.conn.readyState === Socket.CLOSED) {
this.conn = null;
this.initialize(this.connectionUrl, this.token, this.dispatch, this.getState);
this.initialize(false, this.connectionUrl, this.token, this.dispatch, this.getState);
}
}