Fix #421

* Doesn't address `ghost lobbies`, as those are a feature
* Removes discord integration
* Adds back explicit protocol, host and port in websocket connection
  > Some browsers (other than chromium and firefox) seem to not support
  relativ URLs for websockets, as this isn't spec compliant.

Author: Bios-Marcel

internal/api/v1.go

@@ -269,34 +269,6 @@ func (handler *V1Handler) postPlayer(writer http.ResponseWriter, request *http.R
 	}
 }
 
-func GetDiscordInstanceId(request *http.Request) string {
-	discordInstanceId := request.URL.Query().Get("instance_id")
-	if discordInstanceId == "" {
-		cookie, _ := request.Cookie("discord-instance-id")
-		if cookie != nil {
-			discordInstanceId = cookie.Value
-		}
-	}
-	return discordInstanceId
-}
-
-const discordDomain = "1320396325925163070.discordsays.com"
-
-func SetDiscordCookies(w http.ResponseWriter, request *http.Request) {
-	discordInstanceId := GetDiscordInstanceId(request)
-	if discordInstanceId != "" {
-		http.SetCookie(w, &http.Cookie{
-			Name:        "discord-instance-id",
-			Value:       discordInstanceId,
-			Domain:      discordDomain,
-			Path:        "/",
-			SameSite:    http.SameSiteNoneMode,
-			Partitioned: true,
-			Secure:      true,
-		})
-	}
-}
-
 // SetGameplayCookies takes the players usersession and lobby id
 // and sets them as a cookie.
 func SetGameplayCookies(
@@ -305,42 +277,18 @@ func SetGameplayCookies(
 	player *game.Player,
 	lobby *game.Lobby,
 ) {
-	discordInstanceId := GetDiscordInstanceId(request)
-	if discordInstanceId != "" {
-		http.SetCookie(w, &http.Cookie{
-			Name:        "usersession",
-			Value:       player.GetUserSession().String(),
-			Domain:      discordDomain,
-			Path:        "/",
-			SameSite:    http.SameSiteNoneMode,
-			Partitioned: true,
-			Secure:      true,
-		})
-		http.SetCookie(w, &http.Cookie{
-			Name:        "lobby-id",
-			Value:       lobby.LobbyID,
-			Domain:      discordDomain,
-			Path:        "/",
-			SameSite:    http.SameSiteNoneMode,
-			Partitioned: true,
-			Secure:      true,
-		})
-	} else {
-		// For the discord case, we need both, as the discord specific cookies
-		// aren't available during the readirect from ssrCreate to ssrEnter.
-		http.SetCookie(w, &http.Cookie{
-			Name:     "usersession",
-			Value:    player.GetUserSession().String(),
-			Path:     "/",
-			SameSite: http.SameSiteStrictMode,
-		})
-		http.SetCookie(w, &http.Cookie{
-			Name:     "lobby-id",
-			Value:    lobby.LobbyID,
-			Path:     "/",
-			SameSite: http.SameSiteStrictMode,
-		})
-	}
+	http.SetCookie(w, &http.Cookie{
+		Name:     "usersession",
+		Value:    player.GetUserSession().String(),
+		Path:     "/",
+		SameSite: http.SameSiteStrictMode,
+	})
+	http.SetCookie(w, &http.Cookie{
+		Name:     "lobby-id",
+		Value:    lobby.LobbyID,
+		Path:     "/",
+		SameSite: http.SameSiteStrictMode,
+	})
 }
 
 func (handler *V1Handler) patchLobby(writer http.ResponseWriter, request *http.Request) {

internal/frontend/index.go

@@ -134,19 +134,6 @@ func (handler *SSRHandler) indexPageHandler(writer http.ResponseWriter, request
 	createPageData.Translation = translation
 	createPageData.Locale = locale
 
-	api.SetDiscordCookies(writer, request)
-	discordInstanceId := api.GetDiscordInstanceId(request)
-	if discordInstanceId != "" {
-		lobby := state.GetLobby(discordInstanceId)
-		if lobby != nil {
-			handler.ssrEnterLobbyNoChecks(lobby, writer, request,
-				func() *game.Player {
-					return api.GetPlayer(lobby, request)
-				})
-			return
-		}
-	}
-
 	err := pageTemplates.ExecuteTemplate(writer, "index", createPageData)
 	if err != nil {
 		log.Printf("Error templating home page: %s\n", err)
@@ -207,7 +194,6 @@ func (handler *SSRHandler) ssrCreateLobby(writer http.ResponseWriter, request *h
 	}
 	customWords, customWordsInvalid := api.ParseCustomWords(lowercaser, request.Form.Get("custom_words"))
 
-	api.SetDiscordCookies(writer, request)
 	// Prevent resetting the form, since that would be annoying as hell.
 	pageData := IndexPageData{
 		BasePageConfig: handler.basePageConfig,
@@ -277,15 +263,6 @@ func (handler *SSRHandler) ssrCreateLobby(writer http.ResponseWriter, request *h
 
 	playerName := api.GetPlayername(request)
 
-	var lobbyId string
-	discordInstanceId := api.GetDiscordInstanceId(request)
-	if discordInstanceId != "" {
-		lobbyId = discordInstanceId
-		// Workaround, since the discord proxy potentially always has the same
-		// IP address, preventing all players from connecting.
-		clientsPerIPLimit = maxPlayers
-	}
-
 	lobbySettings := &game.EditableLobbySettings{
 		Rounds:             rounds,
 		DrawingTime:        drawingTime,
@@ -295,7 +272,7 @@ func (handler *SSRHandler) ssrCreateLobby(writer http.ResponseWriter, request *h
 		Public:             publicLobby,
 		WordsPerTurn:       wordsPerTurn,
 	}
-	player, lobby, err := game.CreateLobby(lobbyId, playerName, languageKey,
+	player, lobby, err := game.CreateLobby("", playerName, languageKey,
 		lobbySettings, customWords, scoreCalculation)
 	if err != nil {
 		pageData.Errors = append(pageData.Errors, err.Error())
@@ -314,15 +291,5 @@ func (handler *SSRHandler) ssrCreateLobby(writer http.ResponseWriter, request *h
 	// We only add the lobby if we could do all necessary pre-steps successfully.
 	state.AddLobby(lobby)
 
-	// Workaround for discord activity case not correctly being able to read
-	// user session, as the cookie isn't being passed.
-	if discordInstanceId != "" {
-		handler.ssrEnterLobbyNoChecks(lobby, writer, request,
-			func() *game.Player {
-				return player
-			})
-		return
-	}
-
 	http.Redirect(writer, request, handler.basePageConfig.RootPath+"/lobby/"+lobby.LobbyID, http.StatusFound)
 }

internal/frontend/index.js

@@ -1,5 +1,4 @@
-const discordInstanceId = getCookie("discord-instance-id");
-const rootPath = `${discordInstanceId ? ".proxy/" : ""}{{.RootPath}}`;
+const rootPath = `{{.RootPath}}`;
 
 Array.from(document.getElementsByClassName("number-input")).forEach(
     (number_input) => {

internal/frontend/lobby.go

@@ -76,7 +76,6 @@ func (handler *SSRHandler) ssrEnterLobbyNoChecks(
 ) {
 	translation, locale := determineTranslation(request)
 	requestAddress := api.GetIPAddressFromRequest(request)
-	api.SetDiscordCookies(writer, request)
 
 	var pageData *lobbyPageData
 	lobby.Synchronized(func() {

internal/frontend/lobby.js

@@ -1,11 +1,10 @@
-import KeyboardManager from "./resources/keyboardManager.js"
+import KeyboardManager from "./resources/keyboardManager.js";
 
 String.prototype.format = function () {
     return [...arguments].reduce((p, c) => p.replace(/%s/, c), this);
 };
 
-const discordInstanceId = getCookie("discord-instance-id");
-const rootPath = `${discordInstanceId ? ".proxy/" : ""}{{.RootPath}}`;
+const rootPath = `{{.RootPath}}`;
 const keyboardManager = new KeyboardManager();
 
 let socketIsConnecting = false;
@@ -174,11 +173,14 @@ function showHelpDialog() {
     const controlsLabel = document.createElement("b");
     controlsLabel.innerText = '{{.Translation.Get "controls"}}';
 
-    const undoModifierKeysString = keyboardManager.get("undoModifier").split("+").map(k => `<kbd>${k}</kbd>`).join("+");
+    const undoModifierKeysString = keyboardManager
+        .get("undoModifier")
+        .split("+")
+        .map((k) => `<kbd>${k}</kbd>`)
+        .join("+");
     const controlsText = document.createElement("div");
     controlsText.classList.add("help-controls-grid");
-    controlsText.innerHTML =
-        `
+    controlsText.innerHTML = `
         <span>{{.Translation.Get "pencil"}}</span><span dir="ltr"><kbd>${keyboardManager.get("pen")}</kbd></span>
         <span>{{.Translation.Get "fill-bucket"}}</span><span dir="ltr"><kbd>${keyboardManager.get("bucket")}</kbd></span>
         <span>{{.Translation.Get "eraser"}}</span><span dir="ltr"><kbd>${keyboardManager.get("rubber")}</kbd></span>
@@ -452,21 +454,31 @@ const toolButtonPen = document.getElementById("tool-type-pencil");
 const toolButtonRubber = document.getElementById("tool-type-rubber");
 const toolButtonFill = document.getElementById("tool-type-fill");
 
-const pencilImage = document.getElementById("use-pencil-button-image"); 
-const eraserImage = document.getElementById("use-eraser-button-image"); 
-const bucketImage = document.getElementById("use-fill-bucket-button-image"); 
-const undoImage = document.getElementById("undo-button-image"); 
+const pencilImage = document.getElementById("use-pencil-button-image");
+const eraserImage = document.getElementById("use-eraser-button-image");
+const bucketImage = document.getElementById("use-fill-bucket-button-image");
+const undoImage = document.getElementById("undo-button-image");
 const size8buttonWrapper = document.getElementById("size-8-button-wrapper");
 const size16buttonWrapper = document.getElementById("size-16-button-wrapper");
 const size24buttonWrapper = document.getElementById("size-24-button-wrapper");
 const size32buttonWrapper = document.getElementById("size-32-button-wrapper");
 
-
-pencilImage.setAttribute("title", `${pencilImage.getAttribute("title")} (${keyboardManager.get("pencil")})`);
-eraserImage.setAttribute("title", `${eraserImage.getAttribute("title")} (${keyboardManager.get("rubber")})`);
-bucketImage.setAttribute("title", `${bucketImage.getAttribute("title")} (${keyboardManager.get("bucket")})`);
-undoImage.setAttribute("title", `${undoImage.getAttribute("title")} (${keyboardManager.get("undoModifier")}+${keyboardManager.get("undo")})`);
-
+pencilImage.setAttribute(
+    "title",
+    `${pencilImage.getAttribute("title")} (${keyboardManager.get("pencil")})`,
+);
+eraserImage.setAttribute(
+    "title",
+    `${eraserImage.getAttribute("title")} (${keyboardManager.get("rubber")})`,
+);
+bucketImage.setAttribute(
+    "title",
+    `${bucketImage.getAttribute("title")} (${keyboardManager.get("bucket")})`,
+);
+undoImage.setAttribute(
+    "title",
+    `${undoImage.getAttribute("title")} (${keyboardManager.get("undoModifier")}+${keyboardManager.get("undo")})`,
+);
 
 if (sizeButton8.checked) {
     setLineWidthNoUpdate(8);
@@ -1894,10 +1906,9 @@ function isAnyDialogVisible() {
 function getModifierKey(event, modifierKey) {
     // Split by "+" and ensure every specified modifier property is true on the event.
     // e.g. "ctrl+shift" checks event.ctrlKey AND event.shiftKey
-    return modifierKey.split("+").every(modifier => event[`${modifier}Key`]);
+    return modifierKey.split("+").every((modifier) => event[`${modifier}Key`]);
 }
 
-
 function onKeyDown(event) {
     //Avoid firing actions if the user is in the chat.
     if (document.activeElement instanceof HTMLInputElement) {
@@ -1921,7 +1932,7 @@ function onKeyDown(event) {
     } else if (event.key === keyboardManager.get("bucket")) {
         toolButtonFill.click();
         chooseTool(fillBucket);
-    } else if (event.key === keyboardManager.get("rubber")){
+    } else if (event.key === keyboardManager.get("rubber")) {
         toolButtonRubber.click();
         chooseTool(rubber);
     } else if (event.key === keyboardManager.get("size8")) {
@@ -1936,7 +1947,10 @@ function onKeyDown(event) {
     } else if (event.key === keyboardManager.get("size32")) {
         sizeButton32.click();
         setLineWidth(32);
-    } else if (getModifierKey(event, keyboardManager.get("undoModifier")) && event.key.toLowerCase() === keyboardManager.get("undo")) {
+    } else if (
+        getModifierKey(event, keyboardManager.get("undoModifier")) &&
+        event.key.toLowerCase() === keyboardManager.get("undo")
+    ) {
         undoAndSendEvent();
     }
 }
@@ -2066,7 +2080,20 @@ const connectToWebsocket = () => {
 
     socketIsConnecting = true;
 
-    socket = new WebSocket(`${rootPath}/v1/lobby/ws`);
+    // rootPath is required to always contain a trailing slash OR be empty.
+    const socketPath = `${rootPath}/v1/lobby/ws`;
+    let host = location.hostname;
+    if (location.port && location.port !== "") {
+        host += ":" + location.port;
+    }
+
+    if (location.protocol === "https:") {
+        console.log("Attempting secure socket connection ...");
+        socket = new WebSocket(`wss://${host}${socketPath}`);
+    } else {
+        console.log("Attempting socket connection ...");
+        socket = new WebSocket(`ws://${host}${socketPath}`);
+    }
 
     socket.onerror = (error) => {
         //Is not connected and we haven't yet said that we are done trying to