Merge main

4 files changed, 157 insertions, 4 deletions

diff --git a/zenserver/testing/httptest.cpp b/zenserver/testing/httptest.cpp
new file mode 100644
index 000000000..c4fd6003c
--- /dev/null
+++ b/zenserver/testing/httptest.cpp
@@ -0,0 +1,106 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "httptest.h"
+
+#include <zencore/compactbinarypackage.h>
+
+namespace zen {
+
+HttpTestingService::HttpTestingService()
+{
+	m_Router.RegisterRoute(
+		"hello",
+		[this](HttpRouterRequest& Req) { Req.ServerRequest().WriteResponse(HttpResponseCode::OK); },
+		HttpVerb::kGet);
+
+	m_Router.RegisterRoute(
+		"echo",
+		[this](HttpRouterRequest& Req) {
+			IoBuffer Body = Req.ServerRequest().ReadPayload();
+			Req.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, Body);
+		},
+		HttpVerb::kPost);
+
+	m_Router.RegisterRoute(
+		"package",
+		[this](HttpRouterRequest& Req) {
+			CbPackage Pkg = Req.ServerRequest().ReadPayloadPackage();
+			Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Pkg);
+		},
+		HttpVerb::kPost);
+}
+
+HttpTestingService::~HttpTestingService()
+{
+}
+
+const char*
+HttpTestingService::BaseUri() const
+{
+	return "/testing/";
+}
+
+void
+HttpTestingService::HandleRequest(HttpServerRequest& Request)
+{
+	m_Router.HandleRequest(Request);
+}
+
+Ref<IHttpPackageHandler>
+HttpTestingService::HandlePackageRequest(HttpServerRequest& HttpServiceRequest)
+{
+	RwLock::ExclusiveLockScope _(m_RwLock);
+
+	const uint32_t RequestId = HttpServiceRequest.RequestId();
+
+	if (auto It = m_HandlerMap.find(RequestId); It != m_HandlerMap.end())
+	{
+		Ref<HttpTestingService::PackageHandler> Handler = std::move(It->second);
+
+		m_HandlerMap.erase(It);
+
+		return Handler.Get();
+	}
+
+	auto InsertResult = m_HandlerMap.insert({RequestId, nullptr});
+
+	_.ReleaseNow();
+
+	return (InsertResult.first->second = new PackageHandler(*this, RequestId)).Get();
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+HttpTestingService::PackageHandler::PackageHandler(HttpTestingService& Svc, uint32_t RequestId) : m_Svc(Svc), m_RequestId(RequestId)
+{
+}
+
+HttpTestingService::PackageHandler::~PackageHandler()
+{
+}
+
+void
+HttpTestingService::PackageHandler::FilterOffer(std::vector<IoHash>& OfferCids)
+{
+	ZEN_UNUSED(OfferCids);
+	// No-op
+	return;
+}
+void
+HttpTestingService::PackageHandler::OnRequestBegin()
+{
+}
+
+void
+HttpTestingService::PackageHandler::OnRequestComplete()
+{
+}
+
+IoBuffer
+HttpTestingService::PackageHandler::CreateTarget(const IoHash& Cid, uint64_t StorageSize)
+{
+	ZEN_UNUSED(Cid);
+	return IoBuffer{StorageSize};
+}
+
+}  // namespace zen
diff --git a/zenserver/testing/httptest.h b/zenserver/testing/httptest.h
new file mode 100644
index 000000000..5809d4e2e
--- /dev/null
+++ b/zenserver/testing/httptest.h
@@ -0,0 +1,47 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include <zenhttp/httpserver.h>
+
+#include <spdlog/spdlog.h>
+
+namespace zen {
+
+/**
+ * Test service to facilitate testing the HTTP framework and client interactions
+ */
+class HttpTestingService : public HttpService
+{
+public:
+	HttpTestingService();
+	~HttpTestingService();
+
+	virtual const char*				 BaseUri() const override;
+	virtual void					 HandleRequest(HttpServerRequest& Request) override;
+	virtual Ref<IHttpPackageHandler> HandlePackageRequest(HttpServerRequest& HttpServiceRequest) override;
+
+	class PackageHandler : public IHttpPackageHandler
+	{
+	public:
+		PackageHandler(HttpTestingService& Svc, uint32_t RequestId);
+		~PackageHandler();
+
+		virtual void	 FilterOffer(std::vector<IoHash>& OfferCids) override;
+		virtual void	 OnRequestBegin() override;
+		virtual IoBuffer CreateTarget(const IoHash& Cid, uint64_t StorageSize) override;
+		virtual void	 OnRequestComplete() override;
+
+	private:
+		HttpTestingService& m_Svc;
+		uint32_t			m_RequestId;
+	};
+
+private:
+	HttpRequestRouter m_Router;
+
+	RwLock											  m_RwLock;
+	std::unordered_map<uint32_t, Ref<PackageHandler>> m_HandlerMap;
+};
+
+}  // namespace zen
diff --git a/zenserver/testing/launch.cpp b/zenserver/testing/launch.cpp
index d06fae3e2..b031193d5 100644
--- a/zenserver/testing/launch.cpp
+++ b/zenserver/testing/launch.cpp
@@ -409,7 +409,7 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat
 						Cbo.EndArray();
 						CbObject Response = Cbo.Save();
 
-						return HttpReq.WriteResponse(HttpResponse::OK, Response);
+						return HttpReq.WriteResponse(HttpResponseCode::OK, Response);
 					}
 					break;
 			}
@@ -470,7 +470,7 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat
 						if (!AllOk)
 						{
 							// TODO: Could report all the missing pieces in the response here
-							return HttpReq.WriteResponse(HttpResponse::NotFound);
+							return HttpReq.WriteResponse(HttpResponseCode::NotFound);
 						}
 
 						std::string Executable8{RequestObject["cmd"].AsString()};
@@ -492,7 +492,7 @@ HttpLaunchService::HttpLaunchService(CasStore& Store, const std::filesystem::pat
 
 						Response << "exitcode" << Job.ExitCode();
 
-						return HttpReq.WriteResponse(HttpResponse::OK, Response.Save());
+						return HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
 					}
 					break;
 			}
diff --git a/zenserver/testing/launch.h b/zenserver/testing/launch.h
index 00f322624..a6eb137d2 100644
--- a/zenserver/testing/launch.h
+++ b/zenserver/testing/launch.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <zencore/httpserver.h>
+#include <zenhttp/httpserver.h>
 
 #include <spdlog/spdlog.h>
 #include <filesystem>