Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

websocket-api: only reconnect if we had a least one successful connection (closes #179)

Browse source
This commit is contained in:
Steffen Vogel 2018-06-14 19:53:26 +02:00
parent 109b939373
commit 42c814b237
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/api/websocket-api.js
View file

@ -24,6 +24,7 @@ class WebsocketAPI {
this.endpoint = endpoint;
this.callbacks = callbacks;
this.wasConnected = false;
this.isClosing = false;
this.connect(endpoint, callbacks);
@ -34,14 +35,12 @@ class WebsocketAPI {
this.socket = new WebSocket(WebsocketAPI.getURL(endpoint), 'live');
this.socket.binaryType = 'arraybuffer';
this.socket.onclose = this.onClose;
this.socket.onopen = this.onOpen;
this.socket.onerror = this.onError;
// register callbacks
if (callbacks.onOpen)
this.socket.onopen = callbacks.onOpen;
if (callbacks.onMessage)
this.socket.onmessage = callbacks.onMessage;
if (callbacks.onError)
this.socket.onerror = callbacks.onError;
}
reconnect() {
@ -62,14 +61,30 @@ class WebsocketAPI {
this.socket.close(code, reason);
}
onError = e => {
console.error('Error on WebSocket connection to: ' + this.endpoint + ':', e);
if ('onError' in this.callbacks)
this.callbacks.onError(e);
}
onOpen = e => {
this.wasConnected = true;
if ('onOpen' in this.callbacks)
this.callbacks.onOpen(e);
}
onClose = e => {
if (this.isClosing) {
if (this.callbacks.onClose)
if ('onClose' in this.callbacks)
this.callbacks.onClose(e);
}
else {
//console.log("Connection to " + this.endpoint + " dropped. Attempt reconnect in 1 sec");
window.setTimeout(() => { this.reconnect(); }, 500);
if (this.wasConnected) {
console.log("Connection to " + this.endpoint + " dropped. Attempt reconnect in 1 sec");
window.setTimeout(() => { this.reconnect(); }, 1000);
}
}
}