From 1f9d5d6197319e95216f877eedfe82a982eb7823 Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Tue, 25 Feb 2020 19:14:10 -0800 Subject: [PATCH] LSP: make preview respect protocol.pubaddr This allows the preview to work even when behind sophisticated reverse- proxy setups and whatnot --- lsp/mist.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lsp/mist.js b/lsp/mist.js index ae975ccb..54311a92 100644 --- a/lsp/mist.js +++ b/lsp/mist.js @@ -4016,15 +4016,26 @@ var UI = { if (other == '') { UI.navto('Streams'); } + var parsed = parseURL(mist.user.host); + var http_protocol = parsed.protocol; + var http_host = parsed.host; var http_port = ':8080'; for (var i in mist.data.config.protocols) { var protocol = mist.data.config.protocols[i]; if ((protocol.connector == 'HTTP') || (protocol.connector == 'HTTP.exe')) { - http_port = (protocol.port ? ':'+protocol.port : ':8080'); + if (protocol.pubaddr) { + var pub_parsed = parseURL(protocol.pubaddr); + http_protocol = pub_parsed.protocol; + http_host = pub_parsed.host; + http_port = pub_parsed.port; + } + else { + http_port = (protocol.port ? ':'+protocol.port : ':8080'); + } } } - var parsed = parseURL(mist.user.host); - var embedbase = parsed.protocol+parsed.host+http_port+'/'; + + var embedbase = http_protocol+http_host+http_port+'/'; var $cont = $('
').css({ 'display':'flex',