From 26231f778cb24867894eca8cd48bb675cfec8234 Mon Sep 17 00:00:00 2001
From: Brian Peiris <brianpeiris@gmail.com>
Date: Thu, 19 Apr 2018 20:37:54 -0700
Subject: [PATCH] use port from ret server
---
src/hub.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/hub.js b/src/hub.js
index a92326daf..e0175ff0b 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -329,10 +329,10 @@ const onReady = async () => {
console.log(`Hub ID: ${hubId}`);
const socketProtocol = document.location.protocol === "https:" ? "wss:" : "ws:";
- const socketPort = qs.phx_port || (process.env.NODE_ENV === "production" ? document.location.port : 443);
- const socketHost =
- qs.phx_host ||
- (process.env.NODE_ENV === "production" ? document.location.hostname : process.env.DEV_RETICULUM_SERVER);
+ 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";
+ const socketHost = qs.phx_host || (isProd ? document.location.hostname : retHost) || "";
const socketUrl = `${socketProtocol}//${socketHost}${socketPort ? `:${socketPort}` : ""}/socket`;
console.log(`Phoenix Channel URL: ${socketUrl}`);
--
GitLab