Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

if https then use wss

Browse Source
This commit is contained in:
Oliver Giles 2017-09-23 14:36:04 +03:00
parent 6c853f045e
commit 47ef181043
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/resources/js/app.js
View File

@ -2,9 +2,13 @@
* frontend application for Laminar Continuous Integration * frontend application for Laminar Continuous Integration
* https://laminar.ohwg.net * https://laminar.ohwg.net
*/ */
const wsp = function(path) {
return new WebSocket((location.protocol === 'https:'?'wss://':'ws://')
+ location.host + path);
}
const WebsocketHandler = function() { const WebsocketHandler = function() {
function setupWebsocket(path, next) { function setupWebsocket(path, next) {
var ws = new WebSocket("ws://" + window.location.host + path); var ws = wsp(path);
ws.onmessage = function(msg) { ws.onmessage = function(msg) {
msg = JSON.parse(msg.data); msg = JSON.parse(msg.data);
// "status" is the first message the websocket always delivers. // "status" is the first message the websocket always delivers.
@ -406,7 +410,7 @@ const Run = function() {
}, },
beforeRouteEnter(to, from, next) { beforeRouteEnter(to, from, next) {
next(vm => { next(vm => {
vm.logws = new WebSocket("ws://" + location.host + to.path + '/log'); vm.logws = wsp(to.path + '/log');
vm.logws.onmessage = function(msg) { vm.logws.onmessage = function(msg) {
logHandler(vm, msg.data); logHandler(vm, msg.data);
} }
@ -415,7 +419,7 @@ const Run = function() {
beforeRouteUpdate(to, from, next) { beforeRouteUpdate(to, from, next) {
var vm = this; var vm = this;
vm.logws.close(); vm.logws.close();
vm.logws = new WebSocket("ws://" + location.host + to.path + '/log'); vm.logws = wsp(to.path + '/log');
vm.logws.onmessage = function(msg) { vm.logws.onmessage = function(msg) {
logHandler(vm, msg.data); logHandler(vm, msg.data);
} }