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

Safari: ws cache busting (#27945)

Browse source
This commit is contained in:
Michael Geers 2026-03-05 14:28:53 +01:00 • committed by GitHub
parent 1b08a776b3
commit f24dcd5e11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,15 +172,11 @@ export default defineComponent({
return;
}
const loc = window.location;
const protocol = loc.protocol == "https:" ? "wss:" : "ws:";
const uri =
protocol +
"//" +
loc.hostname +
(loc.port ? ":" + loc.port : "") +
loc.pathname +
"ws";
const loc = new URL("ws", window.location.href);
loc.protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
// force Safari to use a fresh connection
loc.searchParams.set("t", String(Date.now()));
const uri = loc.href;
this.ws = new WebSocket(uri);
this.ws.onerror = () => {

8
tests/ws.spec.ts
View file

@ -1,6 +1,8 @@
import { test, expect } from "@playwright/test";
import { start, stop, baseUrl } from "./evcc";
const wsPattern = /\/ws\?/;
test.use({ baseURL: baseUrl() });
test.describe.configure({ mode: "parallel" });
@ -12,7 +14,7 @@ test.afterEach(async () => {
});
test("show loadpoint with connect websocket", async ({ page }) => {
await page.routeWebSocket("/ws", (ws) => {
await page.routeWebSocket(wsPattern, (ws) => {
const server = ws.connectToServer();
ws.onMessage((message) => {
server.send(message);
@ -28,7 +30,7 @@ test("show loadpoint with connect websocket", async ({ page }) => {
});
test("show no config screen while startup", async ({ page }) => {
await page.routeWebSocket("/ws", () => {
await page.routeWebSocket(wsPattern, () => {
// connect, but don't send any messages
});
await page.goto("/");
@ -36,7 +38,7 @@ test("show no config screen while startup", async ({ page }) => {
});
test("show offline when websocket is closed", async ({ page }) => {
await page.routeWebSocket("/ws", (ws) => {
await page.routeWebSocket(wsPattern, (ws) => {
ws.close();
});
await page.goto("/");