From c70cc864eea72d7a8604d501946c9224959d4763 Mon Sep 17 00:00:00 2001 From: James Read Date: Sun, 26 May 2024 18:03:12 +0100 Subject: [PATCH] feature: Websocket URL is now relocatable (#322) * feature: Websocket URL is now relocatable * feature: Websocket URL is now relocatable --- webui.dev/js/websocket.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/webui.dev/js/websocket.js b/webui.dev/js/websocket.js index 9cb8b72..33e2d72 100644 --- a/webui.dev/js/websocket.js +++ b/webui.dev/js/websocket.js @@ -9,14 +9,19 @@ export function checkWebsocketConnection () { function reconnectWebsocket () { window.websocketAvailable = false - let proto = 'ws:' + const websocketConnectionUrl = new URL(window.location.toString()) + websocketConnectionUrl.hash = '' + websocketConnectionUrl.pathname += 'websocket' if (window.location.protocol === 'https:') { - proto = 'wss:' + websocketConnectionUrl.protocol = 'wss' + } else { + websocketConnectionUrl.protocol = 'ws' } - const websocketConnectionUrl = proto + window.location.host + '/websocket' - const ws = window.ws = new WebSocket(websocketConnectionUrl) + window.websocketConnectionUrl = websocketConnectionUrl + + const ws = window.ws = new WebSocket(websocketConnectionUrl.toString()) ws.addEventListener('open', websocketOnOpen) ws.addEventListener('message', websocketOnMessage)