fix: Socket url compose in entry file (#565)

openpitrix · Dec 4, 2018 · 2356894 · 2356894
1 parent 10c9ef3
commit 2356894
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/server/middleware/store.js b/server/middleware/store.js
@@ -21,7 +21,7 @@ module.exports = async (ctx, next) => {
   if (!serverUrl.startsWith('http')) {
     serverUrl = `http://${serverUrl}`;
   }
-  if (!socketUrl.startsWith('ws://')) {
+  if (!socketUrl.startsWith('ws')) {
     socketUrl = `ws://${socketUrl}`;
   }
 

diff --git a/src/utils/sock-client.js b/src/utils/sock-client.js
@@ -14,15 +14,15 @@ let reopenCount = 0;
 
 class SockClient extends EventEmitter {
   static composeEndpoint = (socketUrl, accessToken = '') => {
-    const re = /(\w+?:\/\/)?([^\\?]+)/;
+    const re = /wss?:\/\/([^\\?]+)/;
     const suffix = `?sid=${accessToken}`;
     const matchParts = `${socketUrl}`.match(re);
-    let wsPrefix = 'ws://';
-    if (typeof window === 'object' && window.location.protocol === 'https:') {
-      wsPrefix = 'wss://';
+
+    if (!matchParts) {
+      throw Error(`Invalid socket url: ${socketUrl}`);
     }
 
-    return `${wsPrefix}${matchParts[2]}${suffix}`;
+    return `${matchParts[0]}${suffix}`;
   };
 
   constructor(endpoint, options = {}) {