Zen upstream support (#7)

1 files changed, 54 insertions, 10 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 395ae5fc2..5f8b23efa 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -140,25 +140,69 @@ public:
 
 		if (ServiceConfig.StructuredCacheEnabled)
 		{
+			using namespace std::literals;
+			auto ValueOrDefault = [](std::string_view Value, std::string_view Default) { return Value.empty() ? Default : Value; };
+
 			spdlog::info("instantiating structured cache service");
 			m_CacheStore = std::make_unique<ZenCacheStore>(*m_CasStore, m_DataRoot / "cache");
 
 			std::unique_ptr<zen::UpstreamCache> UpstreamCache;
-			if (ServiceConfig.UpstreamCacheEnabled)
+			if (ServiceConfig.UpstreamCacheConfig.Enabled)
 			{
-				using namespace std::literals;
+				const ZenUpstreamCacheConfig& UpstreamConfig = ServiceConfig.UpstreamCacheConfig;
 
 				zen::UpstreamCacheOptions UpstreamOptions;
-				UpstreamOptions.ThreadCount				  = 4;
-				UpstreamOptions.JupiterEnabled			  = true;
-				UpstreamOptions.JupiterEndpoint			  = "https://jupiter.devtools-dev.epicgames.com"sv;
-				UpstreamOptions.JupiterDdcNamespace		  = "ue4.ddc"sv;
-				UpstreamOptions.JupiterBlobStoreNamespace = "test.ddc"sv;
-				UpstreamOptions.JupiterOAuthProvider	  = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv;
-				UpstreamOptions.JupiterOAuthClientId	  = "0oao91lrhqPiAlaGD0x7"sv;
-				UpstreamOptions.JupiterOAuthSecret		  = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv;
+
+				if (UpstreamConfig.UpstreamThreadCount > 0 && UpstreamConfig.UpstreamThreadCount < 32)
+				{
+					UpstreamOptions.ThreadCount = static_cast<uint32_t>(UpstreamConfig.UpstreamThreadCount);
+				}
 
 				UpstreamCache = zen::MakeUpstreamCache(UpstreamOptions, *m_CacheStore, *m_CidStore);
+
+				if (!UpstreamConfig.ZenConfig.Url.empty())
+				{
+					std::unique_ptr<zen::UpstreamEndpoint> ZenEndpoint = zen::MakeZenUpstreamEndpoint(UpstreamConfig.ZenConfig.Url);
+					UpstreamCache->AddEndpoint(std::move(ZenEndpoint));
+				}
+
+				{
+					zen::CloudCacheClientOptions Options;
+					if (UpstreamConfig.JupiterConfig.UseDevelopmentSettings)
+					{
+						Options = zen::CloudCacheClientOptions{
+							.ServiceUrl			= "https://jupiter.devtools.epicgames.com"sv,
+							.DdcNamespace		= "ue4.ddc"sv,
+							.BlobStoreNamespace = "test.ddc"sv,
+							.OAuthProvider		= "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv,
+							.OAuthClientId		= "0oao91lrhqPiAlaGD0x7"sv,
+							.OAuthSecret		= "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv,
+						};
+					}
+
+					Options.ServiceUrl		   = ValueOrDefault(UpstreamConfig.JupiterConfig.Url, Options.ServiceUrl);
+					Options.DdcNamespace	   = ValueOrDefault(UpstreamConfig.JupiterConfig.DdcNamespace, Options.DdcNamespace);
+					Options.BlobStoreNamespace = ValueOrDefault(UpstreamConfig.JupiterConfig.Namespace, Options.BlobStoreNamespace);
+					Options.OAuthProvider	   = ValueOrDefault(UpstreamConfig.JupiterConfig.OAuthProvider, Options.OAuthProvider);
+					Options.OAuthClientId	   = ValueOrDefault(UpstreamConfig.JupiterConfig.OAuthClientId, Options.OAuthClientId);
+					Options.OAuthSecret		   = ValueOrDefault(UpstreamConfig.JupiterConfig.OAuthClientSecret, Options.OAuthSecret);
+
+					if (!Options.ServiceUrl.empty())
+					{
+						std::unique_ptr<zen::UpstreamEndpoint> JupiterEndpoint = zen::MakeJupiterUpstreamEndpoint(Options);
+						UpstreamCache->AddEndpoint(std::move(JupiterEndpoint));
+					}
+				}
+
+				if (UpstreamCache->Initialize())
+				{
+					spdlog::info("upstream cache active");
+				}
+				else
+				{
+					UpstreamCache.reset();
+					spdlog::info("upstream cache NOT active");
+				}
 			}
 
 			m_StructuredCacheService.reset(