Use reverse proxyed terminado websocket

This commit is contained in:
Kristóf Tóth 2018-01-25 12:26:53 +01:00
parent 8313b89590
commit 7e4bc12616
2 changed files with 4 additions and 2 deletions

View File

@ -12,7 +12,8 @@ export class TerminadoService {
Terminal.applyAddon(fit);
Terminal.applyAddon(terminado);
this.xterm = new Terminal();
this.ws = new WebSocket('ws://localhost:7878/terminal');
let wsproto = (location.protocol === 'https:') ? 'wss://' : 'ws://';
this.ws = new WebSocket(wsproto + window.location.host + '/terminal');
}
attach(element: HTMLElement) {

View File

@ -30,8 +30,9 @@ export class WebSocketService {
// Using share() causes a single WebSocket to be created when the first
// observer subscribes. This socket is shared with subsequent observers
// and closed when the observer count falls to zero.
let wsproto = (location.protocol === 'https:') ? 'wss://' : 'ws://';
this.downlink = jsonWebsocketConnect(
'ws://' + window.location.host + '/ws',
wsproto + window.location.host + '/ws',
this.uplink = new QueueingSubject<object>()
).messages.pipe(
map(message => <WSMessage<undefined>> message),