From 7ef7abe6be8fb87bc8dc4584a0ffe50d0b358292 Mon Sep 17 00:00:00 2001
From: xNewz <pargornruasijan@gmail.com>
Date: Tue, 30 Dec 2025 14:15:21 +0700
Subject: [PATCH] fix: remove accidental websocket changes

---
 server/monitor-types/websocket-upgrade.js | 14 ++------------
 test/backend-test/test-websocket.js       | 10 +++-------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/server/monitor-types/websocket-upgrade.js b/server/monitor-types/websocket-upgrade.js
index a89bb21f0..762e8df3b 100644
--- a/server/monitor-types/websocket-upgrade.js
+++ b/server/monitor-types/websocket-upgrade.js
@@ -36,23 +36,13 @@ class WebSocketMonitorType extends MonitorType {
             });
 
             ws.onerror = (error) => {
-                const invalidAcceptCodes = [ "WS_ERR_INVALID_SEC_WEBSOCKET_ACCEPT_HEADER" ];
-                let message = error?.message || "";
-
-                // Some ws versions may not populate the message even for invalid accept headers
-                if (!message && invalidAcceptCodes.includes(error?.code)) {
-                    message = "Invalid Sec-WebSocket-Accept header";
-                } else if (!message) {
-                    message = "Unknown websocket error";
-                }
-
                 // Give user the choice to ignore Sec-WebSocket-Accept header
-                if (monitor.wsIgnoreSecWebsocketAcceptHeader && (message === "Invalid Sec-WebSocket-Accept header" || invalidAcceptCodes.includes(error?.code))) {
+                if (monitor.wsIgnoreSecWebsocketAcceptHeader && error.message === "Invalid Sec-WebSocket-Accept header") {
                     resolve([ "101 - OK", 1000 ]);
                     return;
                 }
                 // Upgrade failed, return message to user
-                resolve([ message, error?.code ]);
+                resolve([ error.message, error.code ]);
             };
 
             ws.onclose = (event) => {
diff --git a/test/backend-test/test-websocket.js b/test/backend-test/test-websocket.js
index d9f18e7f8..33660d134 100644
--- a/test/backend-test/test-websocket.js
+++ b/test/backend-test/test-websocket.js
@@ -48,16 +48,12 @@ describe("Websocket Test", {
     });
 
     test("Insecure Websocket", async (t) => {
-        const websocketMonitor = new WebSocketMonitorType();
-        const wss = new WebSocketServer({ port: 0 });
         t.after(() => wss.close());
-        await new Promise((resolve) => wss.on("listening", resolve));
-
-        const address = wss.address();
-        const port = typeof address === "object" && address ? address.port : 0;
+        const websocketMonitor = new WebSocketMonitorType();
+        const wss = new WebSocketServer({ port: 8080 });
 
         const monitor = {
-            url: `ws://localhost:${port}`,
+            url: "ws://localhost:8080",
             wsIgnoreSecWebsocketAcceptHeader: false,
         };