improved errors from jupiter upstream (#636)

* get more detailed error messages from jupiter upstream

1 files changed, 50 insertions, 0 deletions

diff --git a/src/zenserver/upstream/jupiter.cpp b/src/zenserver/upstream/jupiter.cpp
index a67c497ad..e4d45e316 100644
--- a/src/zenserver/upstream/jupiter.cpp
+++ b/src/zenserver/upstream/jupiter.cpp
@@ -157,6 +157,31 @@ namespace detail {
 		return Response;
 	}
 
+	static std::optional<zen::HttpContentType> TryGetContentType(const cpr::Response& Response)
+	{
+		if (auto It = Response.header.find("Content-Type"); It != Response.header.end())
+		{
+			zen::HttpContentType ContentType = zen::ParseContentType(It->second);
+			if (ContentType != zen::HttpContentType::kUnknownContentType)
+			{
+				return ContentType;
+			}
+		}
+		return {};
+	}
+
+	static IoBuffer MakeBufferFromResponseIfKnownFormat(const cpr::Response& Response)
+	{
+		std::optional<zen::HttpContentType> ContentType = TryGetContentType(Response);
+		if (ContentType)
+		{
+			IoBuffer Buffer = IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size());
+			Buffer.SetContentType(ContentType.value());
+			return Buffer;
+		}
+		return {};
+	}
+
 }  // namespace detail
 
 CloudCacheSession::CloudCacheSession(CloudCacheClient* CacheClient) : m_Log(CacheClient->Logger()), m_CacheClient(CacheClient)
@@ -203,6 +228,7 @@ CloudCacheSession::GetRef(std::string_view Namespace, std::string_view BucketId,
 	}
 	else
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::GetRef failed GET. "
 			"Elapsed: {} s, "
@@ -252,6 +278,7 @@ CloudCacheSession::GetBlob(std::string_view Namespace, const IoHash& Key)
 	}
 	else
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::GetBlob failed GET. "
 			"Elapsed: {} s, "
@@ -305,6 +332,12 @@ CloudCacheSession::GetCompressedBlob(std::string_view Namespace, const IoHash& K
 	}
 	else
 	{
+		std::optional<zen::HttpContentType> ContentType = detail::TryGetContentType(Response);
+		if (ContentType.has_value())
+		{
+			Result.Response = std::move(Payload);
+			Result.Response.SetContentType(ContentType.value());
+		}
 		ZEN_WARN(
 			"CloudCacheSession::GetCompressedBlob failed GET. "
 			"Elapsed: {} s, "
@@ -362,6 +395,12 @@ CloudCacheSession::GetInlineBlob(std::string_view	   Namespace,
 	}
 	else
 	{
+		std::optional<zen::HttpContentType> ContentType = detail::TryGetContentType(Response);
+		if (ContentType.has_value())
+		{
+			Result.Response = std::move(Payload);
+			Result.Response.SetContentType(ContentType.value());
+		}
 		ZEN_WARN(
 			"CloudCacheSession::GetInlineBlob failed GET. "
 			"Elapsed: {} s, "
@@ -423,6 +462,7 @@ CloudCacheSession::GetObject(std::string_view Namespace, const IoHash& Key)
 	}
 	else
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::GetObject failed GET. "
 			"Elapsed: {} s, "
@@ -490,6 +530,7 @@ CloudCacheSession::PutRef(std::string_view Namespace, std::string_view BucketId,
 	}
 	else
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::PutRef failed PUT. "
 			"Elapsed: {} s, "
@@ -559,6 +600,7 @@ CloudCacheSession::FinalizeRef(std::string_view Namespace, std::string_view Buck
 	}
 	else
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::FinalizeRef failed PUT. "
 			"Elapsed: {} s, "
@@ -611,6 +653,7 @@ CloudCacheSession::PutBlob(std::string_view Namespace, const IoHash& Key, IoBuff
 	CloudCacheResult Result = detail::ConvertResponse(Response);
 	if (!Result.Success)
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::PutBlob failed PUT. "
 			"Elapsed: {} s, "
@@ -677,6 +720,7 @@ CloudCacheSession::PutCompressedBlob(std::string_view Namespace, const IoHash& K
 	CloudCacheResult Result = detail::ConvertResponse(Response);
 	if (!Result.Success)
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::PutCompressedBlob failed PUT. "
 			"Elapsed: {} s, "
@@ -735,6 +779,7 @@ CloudCacheSession::PutCompressedBlob(std::string_view Namespace, const IoHash& K
 	CloudCacheResult Result = detail::ConvertResponse(Response);
 	if (!Result.Success)
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::PutCompressedBlob failed PUT. "
 			"Elapsed: {} s, "
@@ -784,6 +829,7 @@ CloudCacheSession::PutObject(std::string_view Namespace, const IoHash& Key, IoBu
 	CloudCacheResult Result = detail::ConvertResponse(Response);
 	if (!Result.Success)
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::PutObject failed PUT. "
 			"Elapsed: {} s, "
@@ -833,6 +879,7 @@ CloudCacheSession::RefExists(std::string_view Namespace, std::string_view Bucket
 	CloudCacheResult Result = detail::ConvertResponse(Response);
 	if (!Result.Success)
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::RefExists failed PUT. "
 			"Elapsed: {} s, "
@@ -888,6 +935,7 @@ CloudCacheSession::GetObjectReferences(std::string_view Namespace, const IoHash&
 	}
 	else
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::GetObjectReferences failed PUT. "
 			"Elapsed: {} s, "
@@ -996,6 +1044,7 @@ CloudCacheSession::CacheTypeExists(std::string_view Namespace, std::string_view
 	CloudCacheResult Result = detail::ConvertResponse(Response);
 	if (!Result.Success)
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::CacheTypeExists failed GET. "
 			"Elapsed: {} s, "
@@ -1061,6 +1110,7 @@ CloudCacheSession::CacheTypeExists(std::string_view Namespace, std::string_view
 	}
 	else
 	{
+		Result.Response = detail::MakeBufferFromResponseIfKnownFormat(Response);
 		ZEN_WARN(
 			"CloudCacheSession::CacheTypeExists failed GET. "
 			"Elapsed: {} s, "