Merged main

1 files changed, 59 insertions, 13 deletions

diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 177184591..0670c94cd 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -115,7 +115,11 @@ CloudCacheSession::GetDerivedData(std::string_view BucketId, std::string_view Ke
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
+	return {.Response		= Buffer,
+			.Bytes			= Response.downloaded_bytes,
+			.ElapsedSeconds = Response.elapsed,
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -160,7 +164,11 @@ CloudCacheSession::GetRef(std::string_view BucketId, const IoHash& Key, ZenConte
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
+	return {.Response		= Buffer,
+			.Bytes			= Response.downloaded_bytes,
+			.ElapsedSeconds = Response.elapsed,
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -197,7 +205,11 @@ CloudCacheSession::GetBlob(const IoHash& Key)
 	const IoBuffer Buffer =
 		Success && Response.text.size() > 0 ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
+	return {.Response		= Buffer,
+			.Bytes			= Response.downloaded_bytes,
+			.ElapsedSeconds = Response.elapsed,
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -233,7 +245,11 @@ CloudCacheSession::GetCompressedBlob(const IoHash& Key)
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
+	return {.Response		= Buffer,
+			.Bytes			= Response.downloaded_bytes,
+			.ElapsedSeconds = Response.elapsed,
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -269,7 +285,11 @@ CloudCacheSession::GetObject(const IoHash& Key)
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
+	return {.Response		= Buffer,
+			.Bytes			= Response.downloaded_bytes,
+			.ElapsedSeconds = Response.elapsed,
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -306,9 +326,12 @@ CloudCacheSession::PutDerivedData(std::string_view BucketId, std::string_view Ke
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
+	const bool Success = Response.status_code == 200 || Response.status_code == 201;
+
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -364,6 +387,7 @@ CloudCacheSession::PutRef(std::string_view BucketId, const IoHash& Key, IoBuffer
 
 	PutRefResult Result;
 	Result.Success		  = (Response.status_code == 200 || Response.status_code == 201);
+	Result.ErrorCode	  = !Result.Success ? Response.status_code : 0;
 	Result.Bytes		  = Response.uploaded_bytes;
 	Result.ElapsedSeconds = Response.elapsed;
 
@@ -428,6 +452,7 @@ CloudCacheSession::FinalizeRef(std::string_view BucketId, const IoHash& Key, con
 
 	FinalizeRefResult Result;
 	Result.Success		  = (Response.status_code == 200 || Response.status_code == 201);
+	Result.ErrorCode	  = !Result.Success ? Response.status_code : 0;
 	Result.Bytes		  = Response.uploaded_bytes;
 	Result.ElapsedSeconds = Response.elapsed;
 
@@ -478,9 +503,12 @@ CloudCacheSession::PutBlob(const IoHash& Key, IoBuffer Blob)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
+	const bool Success = Response.status_code == 200 || Response.status_code == 201;
+
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -513,9 +541,12 @@ CloudCacheSession::PutCompressedBlob(const IoHash& Key, IoBuffer Blob)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
+	const bool Success = Response.status_code == 200 || Response.status_code == 201;
+
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -548,9 +579,12 @@ CloudCacheSession::PutObject(const IoHash& Key, IoBuffer Object)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
+	const bool Success = Response.status_code == 200 || Response.status_code == 201;
+
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -584,7 +618,9 @@ CloudCacheSession::RefExists(std::string_view BucketId, const IoHash& Key)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
+	const bool Success = Response.status_code == 200;
+
+	return {.ElapsedSeconds = Response.elapsed, .ErrorCode = !Success ? Response.status_code : 0, .Success = Success};
 }
 
 CloudCacheResult
@@ -653,7 +689,9 @@ CloudCacheSession::PostComputeTasks(std::string_view ChannelId, IoBuffer TasksDa
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
+	const bool Success = Response.status_code == 200;
+
+	return {.ElapsedSeconds = Response.elapsed, .ErrorCode = !Success ? Response.status_code : 0, .Success = Success};
 }
 
 CloudCacheResult
@@ -689,7 +727,11 @@ CloudCacheSession::GetComputeUpdates(std::string_view ChannelId, const uint32_t
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
+	return {.Response		= Buffer,
+			.Bytes			= Response.downloaded_bytes,
+			.ElapsedSeconds = Response.elapsed,
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 CloudCacheResult
@@ -725,7 +767,11 @@ CloudCacheSession::GetObjectTree(const IoHash& Key)
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
+	return {.Response		= Buffer,
+			.Bytes			= Response.downloaded_bytes,
+			.ElapsedSeconds = Response.elapsed,
+			.ErrorCode		= !Success ? Response.status_code : 0,
+			.Success		= Success};
 }
 
 std::vector<IoHash>