diff --git a/scripts/build_local_reticulum.sh b/scripts/build_local_reticulum.sh index f883958f8f18e028a32916f50c6af38002938893..3f5e3a00136a84adf99b68926ee0dd1b17a09af3 100755 --- a/scripts/build_local_reticulum.sh +++ b/scripts/build_local_reticulum.sh @@ -4,4 +4,4 @@ if [ ! -e ../reticulum ]; then echo "This script assumes reticulum is checked out in a sibling to this folder." fi -rm -rf ../reticulum/priv/static ; GENERATE_SMOKE_TESTS=true BASE_ASSETS_PATH=http://localhost:4000/ yarn build -- --output-path ../reticulum/priv/static +rm -rf ../reticulum/priv/static ; GENERATE_SMOKE_TESTS=true BASE_ASSETS_PATH=https://localhost:4000/ yarn build -- --output-path ../reticulum/priv/static diff --git a/src/hub.js b/src/hub.js index feb07c11faff1a700d1fe3262cbd32bf204f1729..e249ffe161b688f355ee9ed9ef13b5675f6aae06 100644 --- a/src/hub.js +++ b/src/hub.js @@ -360,7 +360,7 @@ const onReady = async () => { const hubId = qs.hub_id || document.location.pathname.substring(1).split("/")[0]; console.log(`Hub ID: ${hubId}`); - const socketProtocol = document.location.protocol === "https:" ? "wss:" : "ws:"; + const socketProtocol = qs.phx_protocol || (document.location.protocol === "https:" ? "wss:" : "ws:"); const [retHost, retPort] = (process.env.DEV_RETICULUM_SERVER || "").split(":"); const isProd = process.env.NODE_ENV === "production"; const socketPort = qs.phx_port || (isProd ? document.location.port : retPort) || "443";