RequestHandler checks response codes, moved intent time in rpc manager to the failure delegate

Author: andygruening

Plugins/SequencePlugin/Source/SequencePlugin/Private/Errors.cpp

@@ -1,6 +1,8 @@
 // Copyright 2024 Horizon Blockchain Games Inc. All rights reserved.
 #include "Errors.h"
 
-FSequenceError::FSequenceError(const EErrorType Type, const FString Message) : Message(Message), Type(Type)
-{
-}
+FSequenceError::FSequenceError(const EErrorType Type, const FString& Message) :
+	Response(nullptr), Message(Message), Type(Type) { }
+
+FSequenceError::FSequenceError(const EErrorType Type, const FHttpResponsePtr& Response, const FString& Message) :
+	Response(Response), Message(Message), Type(Type) { }

Plugins/SequencePlugin/Source/SequencePlugin/Private/RequestHandler.cpp

@@ -112,24 +112,23 @@ void URequestHandler::ProcessAndThen(const TSuccessCallback<FHttpResponsePtr>& O
 	const FFailureCallback& OnFailure) const
 {
 	Process().BindLambda([OnSuccess, OnFailure](FHttpRequestPtr Req, const FHttpResponsePtr& Response, const bool bWasSuccessful)
+	{
+		const int32 Code = Response->GetResponseCode();
+		if (bWasSuccessful && Code >= 200 && Code < 300)
 		{
-			if (bWasSuccessful)
-			{
-				OnSuccess(Response);
-			}
-			else
-			{
-				if (!Response.IsValid())
-					OnFailure(FSequenceError(RequestFail, "The Request is invalid!"));
-				else
-				{
-					if (Response.IsValid())
-						OnFailure(FSequenceError(RequestFail, "The Request is invalid!"));
-					else
-						OnFailure(FSequenceError(RequestFail, "Request failed: " + Response->GetContentAsString()));
-				}
-			}
-		});
+			OnSuccess(Response);
+			return;
+		}
+
+		if (!Response.IsValid())
+		{
+			OnFailure(FSequenceError(RequestFail, Response, "The Request is invalid!"));
+			return;
+		}
+
+		const FString Content = Response->GetContentAsString();
+		OnFailure(FSequenceError(RequestFail, Response, "Request failed: " + Content));
+	});
 }
 
 

Plugins/SequencePlugin/Source/SequencePlugin/Private/SequenceRPCManager.cpp

@@ -81,30 +81,31 @@ void USequenceRPCManager::SendIntent(const FString& Url, TFunction<FString(TOpti
 
 		SEQ_LOG_EDITOR(Display, TEXT("%d %s"), Code, *Content);
 
-		if(Content.Contains("intent is invalid: intent expired") || Content.Contains("intent is invalid: intent issued in the future"))
-		{
-			FString Date = Response->GetHeader("Date");
-			FDateTime Time;
-			bool IsParsed = FDateTime::ParseHttpDate(Date, Time);
-
-			if(!IsParsed)
-			{
-				OnFailure(FSequenceError(FailedToParseIntentTime, "Failed to parse intent time " + Date));
-				return;
-			}
-			
-			UE_LOG(LogTemp, Display, TEXT("Resending intent with date %i"), Time.ToUnixTimestamp());
-			this->SequenceRPC(Url, ContentGenerator(TOptional(Time.ToUnixTimestamp())), OnSuccess, OnFailure);
-		}
-		else if (Code >= 200 && Code < 300)
+		OnSuccess(Content);
+	}, [this, Url, ContentGenerator, OnSuccess, OnFailure](const FSequenceError& Error)
+	{
+		const FString Content = Error.Response->GetContentAsString();
+		const int32 Code = Error.Response->GetResponseCode();
+		SEQ_LOG_EDITOR(Error, TEXT("%d %s"), Code, *Content);
+		
+		if (!Content.Contains("intent is invalid: intent expired") &&
+			!Content.Contains("intent is invalid: intent issued in the future"))
 		{
-			OnSuccess(Content);
+			OnFailure(Error);
+			return;
 		}
-		else
+		
+		FDateTime Time;
+		const FString Date = Error.Response->GetHeader("Date");
+		if(!FDateTime::ParseHttpDate(Date, Time))
 		{
-			OnFailure(FSequenceError(RequestFail, "Request failed"));
+			OnFailure(FSequenceError(FailedToParseIntentTime, Error.Response, "Failed to parse intent time " + Date));
+			return;
 		}
-	}, OnFailure);
+					
+		UE_LOG(LogTemp, Display, TEXT("Resending intent with date %i"), Time.ToUnixTimestamp());
+		this->SequenceRPC(Url, ContentGenerator(TOptional(Time.ToUnixTimestamp())), OnSuccess, OnFailure);
+	});
 }
 
 FString USequenceRPCManager::BuildGetFeeOptionsIntent(const FCredentials_BE& Credentials, const TArray<TransactionUnion>& Transactions, TOptional<int64> CurrentTime) const

Plugins/SequencePlugin/Source/SequencePlugin/Public/Errors.h

@@ -1,5 +1,6 @@
 // Copyright 2024 Horizon Blockchain Games Inc. All rights reserved.
 #pragma once
+#include "Http.h"
 #include "Templates/ValueOrError.h"
 #include "Containers/UnrealString.h"
 
@@ -20,7 +21,9 @@ enum EErrorType
 class SEQUENCEPLUGIN_API FSequenceError
 {
 public:
-	FSequenceError(EErrorType Type, FString Message);
+	FSequenceError(EErrorType Type, const FString& Message);
+	FSequenceError(EErrorType Type, const FHttpResponsePtr& Response, const FString& Message);
+	FHttpResponsePtr Response;
 	FString Message;
 	EErrorType Type;
 };