From c165f6cad958d39ea5123a94bb46c7df55efa23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Bla=C5=BEej?= <trogper@gmail.com>
Date: Fri, 24 Dec 2021 12:31:09 +0100
Subject: [PATCH] fix socket.io path

---
 server/server.js     | 6 +++---
 src/mixins/socket.js | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/server.js b/server/server.js
index 23218f506..d40924333 100644
--- a/server/server.js
+++ b/server/server.js
@@ -123,7 +123,7 @@ if (sslKey && sslCert) {
     server = http.createServer(app);
 }
 
-const io = new Server(server, {path: basePath + '/socket.io'});
+const io = new Server(server, {path: basePath + 'socket.io'});
 module.exports.io = io;
 
 // Must be after io instantiation
@@ -203,9 +203,9 @@ exports.entryPage = "dashboard";
     // Entry Page
     mainRouter.get("/", async (_request, response) => {
         if (exports.entryPage === "statusPage") {
-            response.redirect("status");
+            response.redirect(basePath + "status");
         } else {
-            response.redirect("dashboard");
+            response.redirect(basePath + "dashboard");
         }
     });
 
diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index dc0459938..1a9728010 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -67,11 +67,12 @@ export default {
                 wsHost = protocol + location.host;
             }
 
-            const urlBase = document.querySelector("head base").getAttribute("href");
+            // always starts and ends with '/'
+            const basePath = document.querySelector("head base").getAttribute("href");
 
             socket = io(wsHost, {
                 transports: ["websocket"],
-                path: urlBase + "/socket.io"
+                path: basePath + "socket.io"
             });
 
             socket.on("info", (info) => {