From 2c24cc05dfde4b39b8f786cb92c3ca5d8f620a31 Mon Sep 17 00:00:00 2001
From: rmorshea <ryan.morshead@gmail.com>
Date: Mon, 24 Jan 2022 12:13:46 -0800
Subject: [PATCH] make connection to websocket relative path

---
 src/client/packages/idom-app-react/src/index.js     | 2 +-
 src/client/packages/idom-client-react/src/server.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/client/packages/idom-app-react/src/index.js b/src/client/packages/idom-app-react/src/index.js
index 8d4725603..311f5aeed 100644
--- a/src/client/packages/idom-app-react/src/index.js
+++ b/src/client/packages/idom-app-react/src/index.js
@@ -4,7 +4,7 @@ export function mount(mountPoint) {
   const serverInfo = new LayoutServerInfo({
     host: document.location.hostname,
     port: document.location.port,
-    path: "/",
+    path: "../",
     query: queryParams.user.toString(),
     secture: document.location.protocol == "https",
   });
diff --git a/src/client/packages/idom-client-react/src/server.js b/src/client/packages/idom-client-react/src/server.js
index 725e49e56..41428873e 100644
--- a/src/client/packages/idom-client-react/src/server.js
+++ b/src/client/packages/idom-client-react/src/server.js
@@ -23,13 +23,20 @@ export function LayoutServerInfo({ host, port, path, query, secure }) {
   const httpProtocol = "http" + (secure ? "s" : "");
 
   const uri = host + ":" + port;
+  path = new URL(path, document.baseURI).pathname;
   const url = (uri + path).split("/").slice(0, -1).join("/");
 
   const wsBaseUrl = wsProtocol + "://" + url;
   const httpBaseUrl = httpProtocol + "://" + url;
 
+  if (query) {
+    query = "?" + query;
+  } else {
+    query = "";
+  }
+
   this.path = {
-    stream: wsBaseUrl + "/stream" + "?" + query,
+    stream: wsBaseUrl + "/stream" + query,
     module: (source) => httpBaseUrl + `/modules/${source}`,
   };
 }