hub instance dashboard proxy (#914)

- Feature: Hub dashboard proxy - instance dashboards are accessible through the hub server at `/hub/proxy/{port}/` without requiring direct port access

3 files changed, 16 insertions, 4 deletions

diff --git a/src/zenhttp/servers/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp
index 7972777b8..6cda84875 100644
--- a/src/zenhttp/servers/httpasio.cpp
+++ b/src/zenhttp/servers/httpasio.cpp
@@ -1275,7 +1275,9 @@ HttpServerConnectionT<SocketType>::HandleRequest()
 					asio::buffer(ResponseStr->data(), ResponseStr->size()),
 					asio::bind_executor(
 						m_Strand,
-						[Conn = AsSharedPtr(), WsHandler, OwnedResponse = ResponseStr](const asio::error_code& Ec, std::size_t) {
+						[Conn = AsSharedPtr(), WsHandler, OwnedResponse = ResponseStr, PrefixLen = Service->UriPrefixLength()](
+							const asio::error_code& Ec,
+							std::size_t) {
 							if (Ec)
 							{
 								ZEN_WARN("WebSocket 101 send failed: {}", Ec.message());
@@ -1287,7 +1289,9 @@ HttpServerConnectionT<SocketType>::HandleRequest()
 							Ref<WsConnType> WsConn(new WsConnType(std::move(Conn->m_Socket), *WsHandler, Conn->m_Server.m_HttpServer));
 							Ref<WebSocketConnection> WsConnRef(WsConn.Get());
 
-							WsHandler->OnWebSocketOpen(std::move(WsConnRef));
+							std::string_view FullUrl	 = Conn->m_RequestData.Url();
+							std::string_view RelativeUri = FullUrl.substr(std::min(PrefixLen, static_cast<int>(FullUrl.size())));
+							WsHandler->OnWebSocketOpen(std::move(WsConnRef), RelativeUri);
 							WsConn->Start();
 						}));
 
diff --git a/src/zenhttp/servers/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp
index 2cad97725..1b722940d 100644
--- a/src/zenhttp/servers/httpsys.cpp
+++ b/src/zenhttp/servers/httpsys.cpp
@@ -2595,7 +2595,14 @@ InitialRequestHandler::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesT
 																					&Transaction().Server()));
 							Ref<WebSocketConnection> WsConnRef(WsConn.Get());
 
-							WsHandler->OnWebSocketOpen(std::move(WsConnRef));
+							ExtendableStringBuilder<128> UrlUtf8;
+							WideToUtf8({(wchar_t*)HttpReq->CookedUrl.pAbsPath,
+										gsl::narrow<size_t>(HttpReq->CookedUrl.AbsPathLength / sizeof(wchar_t))},
+									   UrlUtf8);
+							int				 PrefixLen = Service->UriPrefixLength();
+							std::string_view RelativeUri{UrlUtf8.ToView()};
+							RelativeUri.remove_prefix(std::min(PrefixLen, static_cast<int>(RelativeUri.size())));
+							WsHandler->OnWebSocketOpen(std::move(WsConnRef), RelativeUri);
 							WsConn->Start();
 
 							return nullptr;
diff --git a/src/zenhttp/servers/wstest.cpp b/src/zenhttp/servers/wstest.cpp
index 59c46a418..363c478ae 100644
--- a/src/zenhttp/servers/wstest.cpp
+++ b/src/zenhttp/servers/wstest.cpp
@@ -335,8 +335,9 @@ namespace {
 		}
 
 		// IWebSocketHandler
-		void OnWebSocketOpen(Ref<WebSocketConnection> Connection) override
+		void OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri) override
 		{
+			ZEN_UNUSED(RelativeUri);
 			m_OpenCount.fetch_add(1);
 
 			m_ConnectionsLock.WithExclusiveLock([&] { m_Connections.push_back(Connection); });