From 6ec3ca923809c9d7099b0b279fb0044b4e7e9a01 Mon Sep 17 00:00:00 2001
From: Joe Kirchoff <joe.kirchoff@epicgames.com>
Date: Wed, 19 May 2021 13:53:00 -0700
Subject: Use vcpkg --overlay-ports to handle asio

---
 zenserver/zenserver.vcxproj | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'zenserver')

diff --git a/zenserver/zenserver.vcxproj b/zenserver/zenserver.vcxproj
index b47ec2f04..2ba6bd551 100644
--- a/zenserver/zenserver.vcxproj
+++ b/zenserver/zenserver.vcxproj
@@ -58,10 +58,12 @@
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgEnableManifest>true</VcpkgEnableManifest>
     <VcpkgUseStatic>true</VcpkgUseStatic>
+    <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgEnableManifest>true</VcpkgEnableManifest>
     <VcpkgUseStatic>true</VcpkgUseStatic>
+    <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-- 
cgit v1.2.3


From 949cf64f620529b3a943828333a176d2f3bfb494 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan@boberg.org>
Date: Thu, 20 May 2021 14:02:02 +0200
Subject: Added tentative Jupiter structured data endpoints

---
 zenserver/upstream/jupiter.cpp | 22 ++++++++++++++++++++++
 zenserver/upstream/jupiter.h   |  6 ++++++
 2 files changed, 28 insertions(+)

(limited to 'zenserver')

diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 6b54f3d01..88a164fbd 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -110,6 +110,28 @@ CloudCacheSession::Put(std::string_view BucketId, std::string_view Key, IoBuffer
 
 //////////////////////////////////////////////////////////////////////////
 
+IoBuffer
+CloudCacheSession::Get(std::string_view BucketId, const IoHash& Key)
+{
+	StringBuilder<64> KeyString;
+	Key.ToHexString(KeyString);
+
+	return Get(BucketId, KeyString);
+}
+
+void
+CloudCacheSession::Put(std::string_view BucketId, const IoHash& Key, IoBuffer Data, HttpContentType ContentType)
+{
+	ZEN_UNUSED(ContentType);
+
+	StringBuilder<64> KeyString;
+	Key.ToHexString(KeyString);
+
+	return Put(BucketId, KeyString, Data);
+}
+
+//////////////////////////////////////////////////////////////////////////
+
 std::string
 CloudCacheAccessToken::GetAuthorizationHeaderValue()
 {
diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h
index dd01cfb86..c17ffb047 100644
--- a/zenserver/upstream/jupiter.h
+++ b/zenserver/upstream/jupiter.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <zencore/httpserver.h>
 #include <zencore/refcount.h>
 #include <zencore/thread.h>
 
@@ -47,9 +48,14 @@ public:
 	CloudCacheSession(CloudCacheClient* OuterClient);
 	~CloudCacheSession();
 
+	// Key-value cache operations
 	IoBuffer Get(std::string_view BucketId, std::string_view Key);
 	void	 Put(std::string_view BucketId, std::string_view Key, IoBuffer Data);
 
+	// Structured cache operations
+	IoBuffer Get(std::string_view BucketId, const IoHash& Key);
+	void	 Put(std::string_view BucketId, const IoHash& Key, IoBuffer Data, HttpContentType ContentType);
+
 private:
 	RefPtr<CloudCacheClient>		m_CacheClient;
 	detail::CloudCacheSessionState* m_SessionState;
-- 
cgit v1.2.3