Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Safari: ensure ws reconnect on reopen (#27867)

Browse source
This commit is contained in:
Michael Geers 2026-03-02 16:01:47 +01:00 • committed by GitHub
parent 8273926a71
commit 4d4df0e589
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
assets/js/views/App.vue
View file

@ -57,6 +57,7 @@ export default defineComponent({
data: () => {
return {
reconnectTimeout: null as number | null,
dataTimeout: null as number | null,
ws: null as WebSocket | null,
authNotConfigured: false,
};
@ -148,6 +149,10 @@ export default defineComponent({
}, 2500);
},
disconnect() {
if (this.dataTimeout) {
window.clearTimeout(this.dataTimeout);
this.dataTimeout = null;
}
if (this.ws) {
this.ws.onerror = null;
this.ws.onopen = null;
@ -189,13 +194,21 @@ export default defineComponent({
};
this.ws.onopen = () => {
console.log("websocket connected");
window.app.setOnline();
};
this.ws.onclose = () => {
if (this.dataTimeout) {
window.clearTimeout(this.dataTimeout);
this.dataTimeout = null;
}
window.app.setOffline();
this.reconnect();
};
this.ws.onmessage = (evt) => {
if (this.dataTimeout) {
window.clearTimeout(this.dataTimeout);
this.dataTimeout = null;
}
window.app.setOnline();
try {
const msg = JSON.parse(evt.data);
if (msg.startupCompleted) {
@ -210,6 +223,15 @@ export default defineComponent({
});
}
};
// Safari/iOS 26 may fail WS handshake or open without delivering data.
// Safari/iOS 26 may fail WS handshake or open without delivering data.
// If no message received within 10s, tear down and retry.
this.dataTimeout = window.setTimeout(() => {
console.log("websocket data timeout, reconnecting");
this.dataTimeout = null;
this.ws?.close();
}, 10000);
},
reload() {
window.location.reload();