fix: respect protocol from browser for manual setup (#3675)

webpack · Aug 18, 2021 · cdcabb2 · cdcabb2
1 parent 1768d6b
commit cdcabb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client-src/utils/createSocketURL.js b/client-src/utils/createSocketURL.js
@@ -21,7 +21,7 @@ function createSocketURL(parsedURL) {
     hostname = self.location.hostname;
   }
 
-  let socketURLProtocol = parsedURL.protocol || "ws:";
+  let socketURLProtocol = parsedURL.protocol || self.location.protocol;
 
   // When https is used in the app, secure web sockets are always necessary because the browser doesn't accept non-secure web sockets.
   if (

diff --git a/test/client/utils/createSocketURL.test.js b/test/client/utils/createSocketURL.test.js
@@ -55,7 +55,7 @@ describe("'createSocketURL' function ", () => {
 
     ["?hostname=%3A%3A", "http://example.com:8080", "ws://example.com:8080/ws"],
     ["?hostname=%3A%3A1", "http://example.com:8080", "ws://[::1]:8080/ws"],
-    ["?hostname=%3A%3A1", "https://example.com:8080", "ws://[::1]:8080/ws"],
+    ["?hostname=%3A%3A1", "https://example.com:8080", "wss://[::1]:8080/ws"],
     [
       "?hostname=%3A%3A",
       "https://example.com:8080",