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

4 files changed, 9 insertions, 7 deletions

diff --git a/src/zencompute/httpcomputeservice.cpp b/src/zencompute/httpcomputeservice.cpp
index bd3f4e70e..1d28e7137 100644
--- a/src/zencompute/httpcomputeservice.cpp
+++ b/src/zencompute/httpcomputeservice.cpp
@@ -103,7 +103,7 @@ struct HttpComputeService::Impl
 	void HandleSubmitAction(HttpServerRequest& HttpReq, int QueueId, int Priority, const WorkerDesc* Worker);
 
 	// WebSocket / observer
-	void OnWebSocketOpen(Ref<WebSocketConnection> Connection);
+	void OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri);
 	void OnWebSocketClose(WebSocketConnection& Conn, uint16_t Code);
 	void OnActionsCompleted(std::span<const IComputeCompletionObserver::CompletedActionNotification> Actions);
 
@@ -1589,9 +1589,9 @@ HttpComputeService::Impl::HandleWorkerRequest(HttpServerRequest& HttpReq, const
 //
 
 void
-HttpComputeService::OnWebSocketOpen(Ref<WebSocketConnection> Connection)
+HttpComputeService::OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri)
 {
-	m_Impl->OnWebSocketOpen(std::move(Connection));
+	m_Impl->OnWebSocketOpen(std::move(Connection), RelativeUri);
 }
 
 void
@@ -1618,8 +1618,9 @@ HttpComputeService::OnActionsCompleted(std::span<const CompletedActionNotificati
 //
 
 void
-HttpComputeService::Impl::OnWebSocketOpen(Ref<WebSocketConnection> Connection)
+HttpComputeService::Impl::OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri)
 {
+	ZEN_UNUSED(RelativeUri);
 	ZEN_INFO("compute WebSocket client connected");
 	m_WsConnectionsLock.WithExclusiveLock([&] { m_WsConnections.push_back(std::move(Connection)); });
 }
diff --git a/src/zencompute/httporchestrator.cpp b/src/zencompute/httporchestrator.cpp
index 6cbe01e04..d92af8716 100644
--- a/src/zencompute/httporchestrator.cpp
+++ b/src/zencompute/httporchestrator.cpp
@@ -418,8 +418,9 @@ HttpOrchestratorService::HandleRequest(HttpServerRequest& Request)
 
 #	if ZEN_WITH_WEBSOCKETS
 void
-HttpOrchestratorService::OnWebSocketOpen(Ref<WebSocketConnection> Connection)
+HttpOrchestratorService::OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri)
 {
+	ZEN_UNUSED(RelativeUri);
 	if (!m_PushEnabled.load())
 	{
 		return;
diff --git a/src/zencompute/include/zencompute/httpcomputeservice.h b/src/zencompute/include/zencompute/httpcomputeservice.h
index b58e73a0d..de85a295f 100644
--- a/src/zencompute/include/zencompute/httpcomputeservice.h
+++ b/src/zencompute/include/zencompute/httpcomputeservice.h
@@ -45,7 +45,7 @@ public:
 
 	// IWebSocketHandler
 
-	void OnWebSocketOpen(Ref<WebSocketConnection> Connection) override;
+	void OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri) override;
 	void OnWebSocketMessage(WebSocketConnection& Conn, const WebSocketMessage& Msg) override;
 	void OnWebSocketClose(WebSocketConnection& Conn, uint16_t Code, std::string_view Reason) override;
 
diff --git a/src/zencompute/include/zencompute/httporchestrator.h b/src/zencompute/include/zencompute/httporchestrator.h
index da5c5dfc3..58b2c9152 100644
--- a/src/zencompute/include/zencompute/httporchestrator.h
+++ b/src/zencompute/include/zencompute/httporchestrator.h
@@ -70,7 +70,7 @@ public:
 
 	// IWebSocketHandler
 #if ZEN_WITH_WEBSOCKETS
-	void OnWebSocketOpen(Ref<WebSocketConnection> Connection) override;
+	void OnWebSocketOpen(Ref<WebSocketConnection> Connection, std::string_view RelativeUri) override;
 	void OnWebSocketMessage(WebSocketConnection& Conn, const WebSocketMessage& Msg) override;
 	void OnWebSocketClose(WebSocketConnection& Conn, uint16_t Code, std::string_view Reason) override;
 #endif