Initial support for websockets.

1 files changed, 21 insertions, 0 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index ea0f52db2..78a62e202 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -15,6 +15,7 @@
 #include <zencore/timer.h>
 #include <zencore/trace.h>
 #include <zenhttp/httpserver.h>
+#include <zenhttp/websocket.h>
 #include <zenstore/basicfile.h>
 #include <zenstore/cas.h>
 #include <zenstore/cidstore.h>
@@ -204,6 +205,15 @@ public:
 		m_Http				  = zen::CreateHttpServer(ServerOptions.HttpServerClass);
 		int EffectiveBasePort = m_Http->Initialize(ServerOptions.BasePort);
 
+		if (ServerOptions.WebSocketPort != 0)
+		{
+			const uint32 ThreadCount =
+				ServerOptions.WebSocketThreads > 0 ? uint32_t(ServerOptions.WebSocketThreads) : std::thread::hardware_concurrency();
+
+			m_WebSocket = zen::WebSocketServer::Create(
+				{.Port = gsl::narrow<uint16_t>(ServerOptions.WebSocketPort), .ThreadCount = Max(ThreadCount, uint32_t(16))});
+		}
+
 		// Setup authentication manager
 		{
 			std::string EncryptionKey = ServerOptions.EncryptionKey;
@@ -304,6 +314,11 @@ public:
 		m_Http->RegisterService(m_TestingService);
 		m_Http->RegisterService(m_AdminService);
 
+		if (m_WebSocket)
+		{
+			m_WebSocket->RegisterService(m_TestingService);
+		}
+
 		if (m_HttpProjectService)
 		{
 			m_Http->RegisterService(*m_HttpProjectService);
@@ -396,6 +411,11 @@ public:
 
 		OnReady();
 
+		if (m_WebSocket)
+		{
+			m_WebSocket->Run();
+		}
+
 		m_Http->Run(IsInteractiveMode);
 
 		SetNewState(kShuttingDown);
@@ -559,6 +579,7 @@ private:
 	}
 
 	zen::Ref<zen::HttpServer>						 m_Http;
+	std::unique_ptr<zen::WebSocketServer>			 m_WebSocket;
 	std::unique_ptr<zen::AuthMgr>					 m_AuthMgr;
 	std::unique_ptr<zen::HttpAuthService>			 m_AuthService;
 	zen::HttpStatusService							 m_StatusService;