Skip to content

Commit 5ac7185

Browse files
authored
Merge pull request #76 from team5499/dev/reloadPageOnDisconnect
Reload page when robot program restarts
2 parents e38ab66 + dcb8b42 commit 5ac7185

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
}
2828

2929
group = 'org.team5499'
30-
version = '0.11.1' /* Change this when deploying a new version */
30+
version = '0.11.2' /* Change this when deploying a new version */
3131

3232
task sourcesJar(type: Jar) {
3333
from sourceSets.main.allJava

src/main/resources/static/javascript/socket-handler.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ let variableUpdates = {};
55
let callbacks = {};
66
let isConnected = false;
77
let broadcastInterval = 0;
8+
let wsAddress = "";
89

910
export default class SocketHandler {
11+
1012
static connect(address) {
11-
socket = new WebSocket(address);
13+
wsAddress = address;
14+
socket = new WebSocket(wsAddress);
1215
socket.onopen = SocketHandler.onopen
1316
socket.onclose = SocketHandler.onclose
1417
socket.onmessage = SocketHandler.onmessage
@@ -40,6 +43,17 @@ export default class SocketHandler {
4043
// stop the websocket sender loop
4144
window.clearInterval(broadcastInterval);
4245
// maybe reconnect?
46+
new Promise((resolve) => {
47+
window.setInterval(() => {
48+
socket = new WebSocket(wsAddress);
49+
socket.onopen = () => {
50+
resolve();
51+
}
52+
}, 3000);
53+
54+
}).then(() => {
55+
window.location.reload(true);
56+
});
4357
}
4458

4559
static onmessage(event) {

0 commit comments

Comments
 (0)