Use secure web socket connection for HTTPS host connections

rsms · Mar 13, 2017 · cb1ff20 · cb1ff20
1 parent c77cf4e
commit cb1ff20
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/js/gotalk.js b/js/gotalk.js
diff --git a/js/gotalk.js.go b/js/gotalk.js.go
diff --git a/js/gotalk.js.map b/js/gotalk.js.map
diff --git a/js/gotalk/index.js b/js/gotalk/index.js
@@ -566,7 +566,9 @@ function openWebSocket(s, addr, callback) {
 if (global.gotalkResponderAt !== undefined) {
   var at = global.gotalkResponderAt;
   if (at && at.ws) {
-    gotalk.defaultResponderAddress = 'ws://' + document.location.host + at.ws;
+    gotalk.defaultResponderAddress =
+      (document.location.protocol == 'https:' ? 'wss://' : 'ws://') +
+      document.location.host + at.ws;
   }
   delete global.gotalkResponderAt;
 }
@@ -586,11 +588,7 @@ Sock.prototype.open = function(addr, callback) {
     addr = gotalk.defaultResponderAddress;
   }
 
-  if (addr.substr(0,3) === 'ws:') {
-    openWebSocket(s, addr, callback);
-  } else {
-    throw new Error('unsupported address');
-  }
+  openWebSocket(s, addr, callback);
   return s;
 };