Adds Custom DataAsset UI + Added Request buttons for RaceDatas/TeamList/Rankings request to ApiStatus Tab + Addes Tracked Requests For Rankings + Added Utils Module For Blueprint Utilities Functions
This commit is contained in:
@ -5,6 +5,8 @@
|
||||
#include "DTFluxCoreModule.h"
|
||||
#include "DTFluxNetworkModule.h"
|
||||
#include "DTFluxNetworkSettings.h"
|
||||
#include "DTFluxQueuedManager.h"
|
||||
#include "DTFluxQueuedManager.h"
|
||||
#include "JsonObjectConverter.h"
|
||||
#include "Clients/DTFluxHttpClient.h"
|
||||
#include "Clients/DTFluxWebSocketClient.h"
|
||||
@ -19,10 +21,11 @@
|
||||
#include "Types/Struct/DTFluxSplitSensor.h"
|
||||
|
||||
|
||||
// === CONNEXION WEBSOCKET ===
|
||||
void UDTFluxNetworkSubsystem::Connect()
|
||||
{
|
||||
WsClient->SetAddress(ConstructWsAddress(WsSettings.Address, WsSettings.Path, WsSettings.Port));
|
||||
WsClient->Connect();
|
||||
WsClient->SetAddress(ConstructWsAddress(WsSettings.Address, WsSettings.Path, WsSettings.Port));
|
||||
WsClient->Connect();
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::Disconnect()
|
||||
@ -35,6 +38,141 @@ void UDTFluxNetworkSubsystem::Reconnect()
|
||||
ReconnectWs(FName("Ws_Client_0"));
|
||||
}
|
||||
|
||||
// === REQUÊTES AVEC TRACKING ===
|
||||
|
||||
FGuid UDTFluxNetworkSubsystem::SendTrackedRequest(
|
||||
EDTFluxApiDataType RequestType,
|
||||
int32 ContestId,
|
||||
int32 StageId,
|
||||
int32 SplitId,
|
||||
float TimeoutSeconds)
|
||||
{
|
||||
if (!QueueManager)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("QueueManager is not initialized"));
|
||||
return FGuid();
|
||||
}
|
||||
|
||||
// Vérifier si une requête similaire est déjà en cours (optionnel)
|
||||
if (IsRequestPending(RequestType, ContestId, StageId, SplitId))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning,
|
||||
TEXT("Similar request already pending: Type=%d, Contest=%d, Stage=%d, Split=%d"),
|
||||
(int32)RequestType, ContestId, StageId, SplitId);
|
||||
}
|
||||
|
||||
// Créer et enqueue la requête
|
||||
FGuid RequestId = QueueManager->QueueRequest(RequestType, ContestId, StageId, SplitId);
|
||||
|
||||
// Envoyer immédiatement si possible (le QueueManager gère la queue)
|
||||
if (const FDTFluxQueuedRequest* QueuedRequest = QueueManager->GetRequest(RequestId))
|
||||
{
|
||||
SendQueuedRequest(*QueuedRequest);
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Queued tracked request %s: Type=%d, Contest=%d, Stage=%d, Split=%d"),
|
||||
*RequestId.ToString(), (int32)RequestType, ContestId, StageId, SplitId);
|
||||
|
||||
return RequestId;
|
||||
}
|
||||
|
||||
FGuid UDTFluxNetworkSubsystem::SendTrackedRequestWithCallback(
|
||||
EDTFluxApiDataType RequestType,
|
||||
int32 ContestId,
|
||||
int32 StageId,
|
||||
int32 SplitId,
|
||||
FOnDTFluxRequestResponse OnCompleted,
|
||||
FOnDTFluxRequestTimeout OnTimeout,
|
||||
float TimeoutSeconds)
|
||||
{
|
||||
FGuid RequestId = SendTrackedRequest(RequestType, ContestId, StageId, SplitId, TimeoutSeconds);
|
||||
|
||||
if (RequestId.IsValid())
|
||||
{
|
||||
// Stocker les callbacks pour cette requête
|
||||
if (OnCompleted.IsBound())
|
||||
{
|
||||
PendingCallbacks.Add(RequestId, OnCompleted);
|
||||
}
|
||||
if (OnTimeout.IsBound())
|
||||
{
|
||||
PendingTimeoutCallbacks.Add(RequestId, OnTimeout);
|
||||
}
|
||||
}
|
||||
|
||||
return RequestId;
|
||||
}
|
||||
|
||||
bool UDTFluxNetworkSubsystem::GetTrackedRequest(const FGuid& RequestId, FDTFluxQueuedRequest& OutRequest) const
|
||||
{
|
||||
if (!QueueManager)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
const FDTFluxQueuedRequest* Request = QueueManager->GetRequest(RequestId);
|
||||
if (Request)
|
||||
{
|
||||
OutRequest = *Request;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
const FDTFluxQueuedRequest* UDTFluxNetworkSubsystem::GetTrackedRequestPtr(const FGuid& RequestId) const
|
||||
{
|
||||
if (!QueueManager)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
return QueueManager->GetRequest(RequestId);
|
||||
}
|
||||
|
||||
bool UDTFluxNetworkSubsystem::HasRequestReceivedResponse(const FGuid& RequestId) const
|
||||
{
|
||||
FDTFluxQueuedRequest Request;
|
||||
if (GetTrackedRequest(RequestId, Request))
|
||||
{
|
||||
return Request.bHasReceivedResponse;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
FString UDTFluxNetworkSubsystem::GetRequestResponseData(const FGuid& RequestId) const
|
||||
{
|
||||
FDTFluxQueuedRequest Request;
|
||||
if (GetTrackedRequest(RequestId, Request))
|
||||
{
|
||||
return Request.RawResponse;
|
||||
}
|
||||
return FString();
|
||||
}
|
||||
|
||||
bool UDTFluxNetworkSubsystem::IsRequestPending(EDTFluxRequestType RequestType, int32 ContestId, int32 StageId,
|
||||
int32 SplitId) const
|
||||
{
|
||||
if (!QueueManager)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return QueueManager->IsRequestPending(RequestType, ContestId, StageId, SplitId);
|
||||
}
|
||||
|
||||
int32 UDTFluxNetworkSubsystem::GetPendingRequestCount() const
|
||||
{
|
||||
if (!QueueManager)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
return QueueManager->GetPendingRequestCount();
|
||||
}
|
||||
|
||||
UDTFluxQueuedManager* UDTFluxNetworkSubsystem::GetQueueManager() const
|
||||
{
|
||||
return QueueManager;
|
||||
}
|
||||
|
||||
|
||||
void UDTFluxNetworkSubsystem::SendRequest(const EDTFluxRequestType RequestType, int InContestId, int InStageId,
|
||||
int InSplitId)
|
||||
{
|
||||
@ -48,7 +186,8 @@ void UDTFluxNetworkSubsystem::SendRequest(const EDTFluxRequestType RequestType,
|
||||
FJsonObjectConverter::UStructToJsonObjectString(FDTFluxStageRankingRequest(InContestId, InStageId), Message);
|
||||
break;
|
||||
case EDTFluxRequestType::SplitRanking:
|
||||
FJsonObjectConverter::UStructToJsonObjectString(FDTFluxSplitRankingRequest(InContestId, InStageId, InSplitId), Message);
|
||||
FJsonObjectConverter::UStructToJsonObjectString(FDTFluxSplitRankingRequest(InContestId, InStageId, InSplitId),
|
||||
Message);
|
||||
break;
|
||||
case EDTFluxRequestType::TeamList:
|
||||
FJsonObjectConverter::UStructToJsonObjectString(FDTFluxTeamListRequest(), Message);
|
||||
@ -60,7 +199,7 @@ void UDTFluxNetworkSubsystem::SendRequest(const EDTFluxRequestType RequestType,
|
||||
return;
|
||||
}
|
||||
//Dirty trick to fix Case
|
||||
Message = Message.Replace(TEXT("Id"),TEXT( "ID"), ESearchCase::CaseSensitive);
|
||||
Message = Message.Replace(TEXT("Id"),TEXT("ID"), ESearchCase::CaseSensitive);
|
||||
UE_LOG(logDTFluxCore, Warning, TEXT("Sending Request %s"), *Message);
|
||||
SendMessage(Message);
|
||||
}
|
||||
@ -70,11 +209,10 @@ void UDTFluxNetworkSubsystem::SendMessage(const FString& Message)
|
||||
UE_LOG(logDTFluxCore, Warning, TEXT("Sending Message %s"), *Message);
|
||||
|
||||
|
||||
if(WsClient.IsValid() && WsClient->CanSend())
|
||||
if (WsClient.IsValid() && WsClient->CanSend())
|
||||
{
|
||||
WsClient->Send(Message);
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Can send request"));
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -86,8 +224,7 @@ void UDTFluxNetworkSubsystem::Initialize(FSubsystemCollectionBase& Collection)
|
||||
{
|
||||
Super::Initialize(Collection);
|
||||
FDTFluxCoreModule& DTFluxCore = FModuleManager::Get().LoadModuleChecked<FDTFluxCoreModule>("DTFluxCore");
|
||||
FString StatusString = UEnum::GetValueAsString(WsStatus);
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Status is %s"), *StatusString);
|
||||
|
||||
UDTFluxNetworkSettings* NetworkSettings = GetMutableDefault<UDTFluxNetworkSettings>();
|
||||
UDTFluxNetworkSettings::GetWebSocketSettings(NetworkSettings, WsSettings);
|
||||
UDTFluxNetworkSettings::GetHTTPSettings(NetworkSettings, HttpSettings);
|
||||
@ -99,16 +236,36 @@ void UDTFluxNetworkSubsystem::Initialize(FSubsystemCollectionBase& Collection)
|
||||
NetworkSettings->OnDTFluxWebSocketSettingsChanged.AddUFunction(this, FName("WsSettingsChanged"));
|
||||
NetworkSettings->OnDTFluxHttpSettingsChanged.AddUFunction(this, FName("HttpSettingsChanged"));
|
||||
#endif
|
||||
if(WsSettings.bShouldConnectAtStartup)
|
||||
if (WsSettings.bShouldConnectAtStartup)
|
||||
{
|
||||
WsClient->SetAddress(ConstructWsAddress(WsSettings.Address, WsSettings.Path, WsSettings.Port));
|
||||
WsClient->Connect();
|
||||
}
|
||||
|
||||
// Initialisation du Queue Manager
|
||||
QueueManager = NewObject<UDTFluxQueuedManager>(this);
|
||||
QueueManager->Initialize();
|
||||
|
||||
// Connexion au delegate de timeout du Queue Manager
|
||||
QueueManager->OnRequestTimedOut.AddDynamic(this, &UDTFluxNetworkSubsystem::OnRequestTimedOut_Internal);
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::Deinitialize()
|
||||
{
|
||||
Super::Deinitialize();
|
||||
// Nettoyer le Queue Manager
|
||||
if (QueueManager)
|
||||
{
|
||||
QueueManager->OnRequestTimedOut.RemoveDynamic(this, &UDTFluxNetworkSubsystem::OnRequestTimedOut_Internal);
|
||||
QueueManager->ClearAllRequests();
|
||||
}
|
||||
|
||||
// Nettoyer les callbacks
|
||||
PendingCallbacks.Empty();
|
||||
PendingTimeoutCallbacks.Empty();
|
||||
// Déconnexion des clients
|
||||
UnregisterWebSocketEvents();
|
||||
UnregisterHttpEvents();
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::WsSettingsChanged(const FDTFluxWsSettings& NewWsSettings)
|
||||
@ -117,7 +274,7 @@ void UDTFluxNetworkSubsystem::WsSettingsChanged(const FDTFluxWsSettings& NewWsSe
|
||||
bool bNeedsReload = WsSettings != NewWsSettings;
|
||||
|
||||
WsSettings = NewWsSettings;
|
||||
if( bNeedsReload || WsSettings.bShouldConnectAtStartup)
|
||||
if (bNeedsReload || WsSettings.bShouldConnectAtStartup)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("WSocket Settings needs Reloding client"))
|
||||
ReconnectWs(FName("Ws_Client_0"));
|
||||
@ -137,9 +294,9 @@ void UDTFluxNetworkSubsystem::ReconnectWs(const FName WsClientId)
|
||||
WsClient->SetAddress(NewAddress);
|
||||
WsClient->Reconnect();
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ReconnectHttp(const FName WsClientId)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::RegisterWebSocketEvents()
|
||||
@ -148,16 +305,16 @@ void UDTFluxNetworkSubsystem::RegisterWebSocketEvents()
|
||||
WsClient->RegisterConnectedEvent().AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketConnected_Subsystem);
|
||||
OnWsConnectionErrorEventDelegateHandle =
|
||||
WsClient->RegisterConnectionError()
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketConnectionError_Subsystem);
|
||||
OnWsClosedEventDelegateHandle =
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketConnectionError_Subsystem);
|
||||
OnWsClosedEventDelegateHandle =
|
||||
WsClient->RegisterClosedEvent()
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketClosedEvent_Subsystem);
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketClosedEvent_Subsystem);
|
||||
OnWsMessageEventDelegateHandle =
|
||||
WsClient->RegisterMessageEvent()
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketMessageEvent_Subsystem);
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketMessageEvent_Subsystem);
|
||||
OnWsMessageSentEventDelegateHandle =
|
||||
WsClient->RegisterMessageSentEvent()
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketMessageSentEvent_Subsystem);
|
||||
WsClient->RegisterMessageSentEvent()
|
||||
.AddUObject(this, &UDTFluxNetworkSubsystem::OnWebSocketMessageSentEvent_Subsystem);
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::RegisterHttpEvents()
|
||||
@ -166,25 +323,25 @@ void UDTFluxNetworkSubsystem::RegisterHttpEvents()
|
||||
|
||||
void UDTFluxNetworkSubsystem::UnregisterWebSocketEvents()
|
||||
{
|
||||
if(OnWsConnectedEventDelegateHandle.IsValid())
|
||||
if (OnWsConnectedEventDelegateHandle.IsValid())
|
||||
{
|
||||
WsClient->UnregisterConnectedEvent().Remove(OnWsConnectedEventDelegateHandle);
|
||||
}
|
||||
if(OnWsConnectionErrorEventDelegateHandle.IsValid())
|
||||
if (OnWsConnectionErrorEventDelegateHandle.IsValid())
|
||||
{
|
||||
WsClient->UnregisterConnectionError();
|
||||
WsClient->UnregisterConnectionError().Remove(OnWsConnectionErrorEventDelegateHandle);
|
||||
}
|
||||
if(OnWsClosedEventDelegateHandle.IsValid())
|
||||
if (OnWsClosedEventDelegateHandle.IsValid())
|
||||
{
|
||||
WsClient->UnregisterClosedEvent();
|
||||
WsClient->UnregisterClosedEvent().Remove(OnWsClosedEventDelegateHandle);
|
||||
}
|
||||
if(OnWsMessageEventDelegateHandle.IsValid())
|
||||
if (OnWsMessageEventDelegateHandle.IsValid())
|
||||
{
|
||||
WsClient->UnregisterMessageEvent();
|
||||
WsClient->UnregisterMessageEvent().Remove(OnWsMessageEventDelegateHandle);
|
||||
}
|
||||
if(OnWsMessageSentEventDelegateHandle.IsValid())
|
||||
if (OnWsMessageSentEventDelegateHandle.IsValid())
|
||||
{
|
||||
WsClient->UnregisterRawMessageEvent();
|
||||
WsClient->UnregisterRawMessageEvent().Remove(OnWsMessageSentEventDelegateHandle);
|
||||
}
|
||||
}
|
||||
|
||||
@ -203,7 +360,7 @@ void UDTFluxNetworkSubsystem::OnWebSocketConnectionError_Subsystem(const FString
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Ws Error with %s : %s"), *WsClient->GetAddress(), *Error);
|
||||
WsStatus = EDTFluxConnectionStatus::Error;
|
||||
if(WsSettings.bShouldAutoReconnectOnError)
|
||||
if (WsSettings.bShouldAutoReconnectOnError)
|
||||
{
|
||||
WsClient->Reconnect();
|
||||
}
|
||||
@ -212,261 +369,239 @@ void UDTFluxNetworkSubsystem::OnWebSocketConnectionError_Subsystem(const FString
|
||||
void UDTFluxNetworkSubsystem::OnWebSocketClosedEvent_Subsystem(int32 StatusCode, const FString& Reason, bool bWasClean)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Ws Error with %s :\n Reason : %s \tStatusCode : %i, bWasClean : %s"),
|
||||
*WsClient->GetAddress(), *Reason, StatusCode, bWasClean ? TEXT("True") : TEXT("False"));
|
||||
*WsClient->GetAddress(), *Reason, StatusCode, bWasClean ? TEXT("True") : TEXT("False"));
|
||||
WsStatus = EDTFluxConnectionStatus::Closed;
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseTeamListResponse(const FDTFluxServerResponse& ServerResponse)
|
||||
void UDTFluxNetworkSubsystem::ParseTeamListResponse(FDTFluxServerResponse& Response)
|
||||
{
|
||||
TSharedPtr<FJsonObject> JsonObject;
|
||||
TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(ServerResponse.RawMessage);
|
||||
|
||||
if (!FJsonSerializer::Deserialize(Reader, JsonObject) || !JsonObject.IsValid())
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("JSON invalide : %s"), *ServerResponse.RawMessage);
|
||||
return;
|
||||
}
|
||||
const TArray<TSharedPtr<FJsonValue>>* DataArray;
|
||||
if (!JsonObject->TryGetArrayField(TEXT("datas"), DataArray))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("Aucun champ 'datas' trouvé dans le team-list"));
|
||||
return;
|
||||
}
|
||||
FDTFluxTeamListDefinition TeamListDefinition;
|
||||
for (const TSharedPtr<FJsonValue>& Value : *DataArray)
|
||||
Response.ParseTeamListResponse(TeamListDefinition);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Parsing Team List Response"));
|
||||
if (Response.GetParsingStatus() != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
if (Value->Type == EJson::Object)
|
||||
{
|
||||
const TSharedPtr<FJsonObject> Item = Value->AsObject();
|
||||
|
||||
FDTFluxParticipant Participant;
|
||||
UDTFluxParticipantFactory::CreateFromJsonCpp(Item, Participant);
|
||||
TeamListDefinition.Participants.Add(Participant);
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseTeamListResponse() for JSON Response : %s"), *Response.RawMessage);
|
||||
return;
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("PArsing OK. Sending to Core..."));
|
||||
const bool bIsSuccessfullyBounded = OnTeamListReceived.ExecuteIfBound(TeamListDefinition);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Inserting %i Participants [%s]"), TeamListDefinition.Participants.Num(),
|
||||
OnTeamListReceived.ExecuteIfBound(TeamListDefinition) ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
bIsSuccessfullyBounded ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseRaceData(const FDTFluxServerResponse& Response)
|
||||
void UDTFluxNetworkSubsystem::ParseRaceData(FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxRaceDataResponse RaceData;
|
||||
if(FJsonObjectConverter::JsonObjectStringToUStruct<FDTFluxRaceDataResponse>(Response.RawMessage, &RaceData))
|
||||
FDTFluxRaceData RaceData;
|
||||
Response.ParseRaceData(RaceData);
|
||||
if (Response.GetParsingStatus() != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
//convert
|
||||
FDTFluxRaceData RaceDataDefinition;
|
||||
for(auto Contest : RaceData.Datas)
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseRaceData() for JSON Response : %s"), *Response.RawMessage);
|
||||
return;
|
||||
}
|
||||
const bool bIsSuccessfullyBounded = OnRaceDataReceived.ExecuteIfBound(RaceData);
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Sending %i Contests, [%s]"), RaceData.Datas.Num(),
|
||||
bIsSuccessfullyBounded ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseContestRanking(FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxContestRankings ContestRankings;
|
||||
Response.ParseContestRanking(ContestRankings);
|
||||
if (Response.GetParsingStatus() != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseContestRanking() for JSON Response : %s"), *Response.RawMessage);
|
||||
return;
|
||||
}
|
||||
const bool bIsSuccessfullyBounded = OnContestRankingReceived.ExecuteIfBound(ContestRankings);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Ws ContestRanking Data Sent for Contest %i, [%s]"),
|
||||
ContestRankings.ContestId,
|
||||
bIsSuccessfullyBounded ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseStageRankingResponse(FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxStageRankings StageRankings;
|
||||
Response.ParseStageRankingResponse(StageRankings);
|
||||
if (Response.GetParsingStatus() != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseStageRankingResponse() for JSON Response : %s"),
|
||||
*Response.RawMessage);
|
||||
}
|
||||
const bool bIsSuccessfullyBounded = OnStageRankingReceived.ExecuteIfBound(StageRankings);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("StageRanking Data Sent for Contest %i, Stage %i\n[Result] : %s"),
|
||||
StageRankings.ContestId, StageRankings.StageId,
|
||||
bIsSuccessfullyBounded ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseSplitRankingResponse(FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxSplitRankings SplitRankings;
|
||||
Response.ParseSplitRankingResponse(SplitRankings);
|
||||
if (Response.GetParsingStatus() != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseSplitRankingResponse() for JSON Response : %s"),
|
||||
*Response.RawMessage);
|
||||
}
|
||||
const bool bIsSuccessfullyBounded = OnSplitRankingReceived.ExecuteIfBound(SplitRankings);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("SplitRanking Data Sent for Contest %i, Stage %i, Split %i\n[Result] : %s"),
|
||||
SplitRankings.ContestId, SplitRankings.StageId, SplitRankings.SplitId,
|
||||
bIsSuccessfullyBounded ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseStatusUpdateResponse(FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxTeamStatusUpdate StatusUpdate;
|
||||
Response.ParseStatusUpdateResponse(StatusUpdate);
|
||||
if (Response.GetParsingStatus() != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseStatusUpdateResponse() for JSON Response : %s"),
|
||||
*Response.RawMessage);
|
||||
}
|
||||
const bool bIsSuccessfullyBounded = OnTeamStatusUpdateReceived.ExecuteIfBound(StatusUpdate);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("StatusUpdate Data Sent for Bib %i with new status %s\n[Result] : %s"),
|
||||
StatusUpdate.Bib, *UEnum::GetValueAsString(StatusUpdate.Status),
|
||||
bIsSuccessfullyBounded ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseSplitSensorResponse(FDTFluxServerResponse& Response)
|
||||
{
|
||||
TArray<FDTFluxSplitSensorInfo> SplitSensorInfos = TArray<FDTFluxSplitSensorInfo>();
|
||||
Response.ParseSplitSensorResponse(SplitSensorInfos);
|
||||
if (Response.GetParsingStatus() != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseSplitSensorResponse() for JSON Response : %s"),
|
||||
*Response.RawMessage);
|
||||
}
|
||||
for (auto& SplitSensorInfo : SplitSensorInfos)
|
||||
{
|
||||
const bool bIsSuccessfullyBounded = OnSplitSensorReceived.ExecuteIfBound(SplitSensorInfo);
|
||||
UE_LOG(logDTFluxNetwork, Warning,
|
||||
TEXT("SplitSensor Data Sent for Bib %i on [Split %i] of [Stage %i] in [Contest %i]\n[Result] : %s"),
|
||||
SplitSensorInfo.Bib, SplitSensorInfo.SplitId, SplitSensorInfo.StageId, SplitSensorInfo.ContestId,
|
||||
bIsSuccessfullyBounded ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
}
|
||||
}
|
||||
|
||||
EDTFluxResponseStatus UDTFluxNetworkSubsystem::ProcessPushMessage(FDTFluxServerResponse& Response)
|
||||
{
|
||||
EDTFluxResponseStatus ResponseStatus = EDTFluxResponseStatus::UnknownError;
|
||||
if (DTFluxDataTypeUtils::IsPushOnly(Response.GetResponseType()))
|
||||
{
|
||||
switch (Response.GetResponseType())
|
||||
{
|
||||
FDTFluxContest NewContest;
|
||||
NewContest.Name = Contest.Name;
|
||||
NewContest.ContestId = Contest.Id;
|
||||
NewContest.Date = Contest.Date;
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Contest %i [%s] Starting at %s \nStages: \n"), Contest.Id, *Contest.Date.ToString(),*Contest.Name);
|
||||
for(auto Stage : Contest.Stages)
|
||||
case EDTFluxApiDataType::SplitSensor:
|
||||
{
|
||||
FDTFluxStage NewStage;
|
||||
NewStage.StageId = Stage.Id;
|
||||
NewStage.Name = Stage.Name;
|
||||
FString StartTimeFString = FString::Printf(TEXT("%s %s"),
|
||||
*NewContest.Date.ToFormattedString(TEXT("%Y-%m-%d")),
|
||||
*Stage.StartTime
|
||||
);
|
||||
FString EndTimeFString = FString::Printf(TEXT("%s %s"),
|
||||
*NewContest.Date.ToFormattedString(TEXT("%Y-%m-%d")),
|
||||
*Stage.EndTime
|
||||
);
|
||||
FString CutOffFString = FString::Printf(TEXT("%s %s"),
|
||||
*NewContest.Date.ToFormattedString(TEXT("%Y-%m-%d")),
|
||||
*Stage.CutOff
|
||||
);
|
||||
FDateTime::Parse(StartTimeFString, NewStage.StartTime);
|
||||
FDateTime::Parse(EndTimeFString, NewStage.EndTime);
|
||||
FDateTime::Parse(CutOffFString, NewStage.CutOff);
|
||||
NewContest.Stages.Add(NewStage);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Stage %i [%s]: \nSTartTime Received [%s] -> Datetime[%s], CutOff [%s], EndTime [%s] \n"), Stage.Id, *Stage.Name,
|
||||
*Stage.StartTime, *NewStage.StartTime.ToString(), *NewStage.CutOff.ToString(), *NewStage.EndTime.ToString());
|
||||
TArray<FDTFluxSplitSensorInfo> SplitSensorInfos;
|
||||
if (Response.ParseSplitSensorResponse(SplitSensorInfos))
|
||||
{
|
||||
for (const auto& SplitSensorInfo : SplitSensorInfos)
|
||||
{
|
||||
OnSplitSensorReceived.ExecuteIfBound(SplitSensorInfo);
|
||||
}
|
||||
}
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
NewContest.UpdateEndTime();
|
||||
NewContest.UpdateLastStageId();
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Contest %i [%s]\nSplits: \n"), Contest.Id, *Contest.Name);
|
||||
for(auto Split: Contest.Splits)
|
||||
case EDTFluxApiDataType::StatusUpdate:
|
||||
{
|
||||
FDTFluxSplit NewSplit;
|
||||
NewSplit.SplitId = Split.Id;
|
||||
NewSplit.Name = Split.Name;
|
||||
NewContest.Splits.Add(NewSplit);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Split %i [%s]: \n"), Split.Id, *Split.Name);
|
||||
FDTFluxTeamStatusUpdate StatusUpdate;
|
||||
if (Response.ParseStatusUpdateResponse(StatusUpdate))
|
||||
{
|
||||
OnTeamStatusUpdateReceived.ExecuteIfBound(StatusUpdate);
|
||||
}
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
case EDTFluxApiDataType::TeamUpdate:
|
||||
{
|
||||
FDTFluxTeamListDefinition TeamUpdateList;
|
||||
if (Response.ParseTeamUpdateResponse(TeamUpdateList))
|
||||
{
|
||||
OnTeamUpdateReceived.ExecuteIfBound(TeamUpdateList);
|
||||
}
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
ResponseStatus = EDTFluxResponseStatus::UnknownError;
|
||||
break;
|
||||
}
|
||||
RaceDataDefinition.Datas.Add(NewContest);
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Sending %i Contests, [%s]"), RaceDataDefinition.Datas.Num(),
|
||||
OnRaceDataReceived.ExecuteIfBound(RaceDataDefinition) ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseRaceData() for JSON Response : %s"), *Response.RawMessage);
|
||||
return ResponseStatus;
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseContestRanking(const FDTFluxServerResponse& Response)
|
||||
void UDTFluxNetworkSubsystem::Parse(FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxContestRankingResponse ContestRankingResponse;
|
||||
if(FJsonObjectConverter::JsonObjectStringToUStruct<FDTFluxContestRankingResponse>(Response.RawMessage, &ContestRankingResponse))
|
||||
EDTFluxResponseStatus ResponseStatus = EDTFluxResponseStatus::Success;
|
||||
switch (Response.GetResponseType())
|
||||
{
|
||||
FDTFluxContestRankings ContestRankings;
|
||||
ContestRankings.ContestId = ContestRankingResponse.ContestID;
|
||||
for(auto& RankingItem : ContestRankingResponse.Datas)
|
||||
case EDTFluxApiDataType::RaceData:
|
||||
{
|
||||
FDTFluxContestRanking Temp = RankingItem;
|
||||
ContestRankings.Rankings.Add(Temp);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Legacy Parsing RaceData"));
|
||||
ParseRaceData(Response);
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Ws ContestRanking Data Sent for Contest %i, [%s]"), ContestRankings.ContestId,
|
||||
OnContestRankingReceived.ExecuteIfBound(ContestRankings) ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseContestRanking() for JSON Response : %s"), *Response.RawMessage);
|
||||
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseStageRankingResponse(const FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxStageRankingResponse RankingResponse;
|
||||
if(FJsonObjectConverter::JsonObjectStringToUStruct<FDTFluxStageRankingResponse>(Response.RawMessage, &RankingResponse))
|
||||
{
|
||||
FDTFluxStageRankings NewRankings;
|
||||
NewRankings.ContestId = Response.ContestID;
|
||||
NewRankings.StageId = Response.StageID;
|
||||
NewRankings.Rankings = static_cast<TArray<FDTFluxDetailedRankingItem>>(RankingResponse.Datas);
|
||||
NewRankings.Initialize();
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("StageRanking Data Sent for Contest %i, Stage %i\n[Result] : %s"),
|
||||
NewRankings.ContestId, NewRankings.StageId,
|
||||
OnStageRankingReceived.ExecuteIfBound(NewRankings) ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED")
|
||||
);
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseStageRankingResponse() for JSON Response : %s"), *Response.RawMessage);
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseSplitRankingResponse(const FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxSplitRankingResponse SplitRankingResponse;
|
||||
if(FJsonObjectConverter::JsonObjectStringToUStruct<FDTFluxSplitRankingResponse>(Response.RawMessage, &SplitRankingResponse))
|
||||
{
|
||||
FDTFluxSplitRankings NewSplitRankings;
|
||||
NewSplitRankings.ContestId = Response.ContestID;
|
||||
NewSplitRankings.StageId = Response.StageID;
|
||||
NewSplitRankings.SplitId = Response.SplitID;
|
||||
NewSplitRankings.Rankings = static_cast<TArray<FDTFluxDetailedRankingItem>>(SplitRankingResponse.Datas);
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("SplitRanking Data Sent for Contest %i, Stage %i and Split %i\n[Result] : %s"),
|
||||
NewSplitRankings.ContestId, NewSplitRankings.StageId, NewSplitRankings.SplitId,
|
||||
OnSplitRankingReceived.ExecuteIfBound(NewSplitRankings) ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseSplitRankingResponse() for JSON Response : %s"), *Response.RawMessage);
|
||||
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseStatusUpdateResponse(const FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxTeamStatusUpdate StatusUpdateResponse;
|
||||
|
||||
if (FJsonObjectConverter::JsonObjectStringToUStruct<FDTFluxTeamStatusUpdate>(Response.RawMessage, &StatusUpdateResponse))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Status Update for bib %i \n[Result] : %s\n"),
|
||||
StatusUpdateResponse.Bib,
|
||||
OnTeamStatusUpdateReceived.ExecuteIfBound(StatusUpdateResponse) ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseStatusUpdateResponse() for JSON Response : %s"), *Response.RawMessage);
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::ParseSplitSensorResponse(const FDTFluxServerResponse& Response)
|
||||
{
|
||||
FDTFluxSplitSensorResponse SplitSensorResponse;
|
||||
if(FJsonObjectConverter::JsonObjectStringToUStruct(Response.RawMessage, &SplitSensorResponse))
|
||||
{
|
||||
for(const auto& SplitSensorInfoResponse : SplitSensorResponse.Datas)
|
||||
case EDTFluxApiDataType::TeamList:
|
||||
{
|
||||
FDTFluxSplitSensorInfo NewSplitSensorInfo;
|
||||
NewSplitSensorInfo.Bib = SplitSensorInfoResponse.Bib;
|
||||
NewSplitSensorInfo.ContestId = SplitSensorInfoResponse.ContestID;
|
||||
NewSplitSensorInfo.StageId = SplitSensorInfoResponse.StageID;
|
||||
NewSplitSensorInfo.SplitId = SplitSensorInfoResponse.SplitID;
|
||||
NewSplitSensorInfo.Time = SplitSensorInfoResponse.Time;
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Status Update for bib %i in Contest %i, Stage %i in split %i\n[Result] : %s\n"),
|
||||
NewSplitSensorInfo.Bib, NewSplitSensorInfo.ContestId, NewSplitSensorInfo.StageId, NewSplitSensorInfo.SplitId,
|
||||
OnSplitSensorReceived.ExecuteIfBound(NewSplitSensorInfo) ? TEXT("SUCCESS_SEND") : TEXT("NOT_BOUNDED"));
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Legacy Parsing TeamList"));
|
||||
ParseTeamListResponse(Response);
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
case EDTFluxApiDataType::ContestRanking:
|
||||
{
|
||||
ParseContestRanking(Response);
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
case EDTFluxApiDataType::StageRanking:
|
||||
{
|
||||
ParseStageRankingResponse(Response);
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
case EDTFluxApiDataType::SplitRanking:
|
||||
{
|
||||
ParseSplitRankingResponse(Response);
|
||||
ResponseStatus = Response.GetParsingStatus();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("Legacy Parsing Unknown"));
|
||||
ResponseStatus = EDTFluxResponseStatus::UnknownError;
|
||||
break;
|
||||
}
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("ParseSplitSensorResponse() failed for JSON Response : %s"), *Response.RawMessage);
|
||||
if (ResponseStatus != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("UDTFluxNetworkSubsystem::Parse() Parsing failed"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//TODO reforge API to keep track of Requests
|
||||
void UDTFluxNetworkSubsystem::OnWebSocketMessageEvent_Subsystem(const FString& MessageString)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Client %s :\nMessage Received : %s"), *WsClient->GetAddress(), *MessageString);
|
||||
// UE_LOG(logDTFluxNetwork, Warning, TEXT("Client %s :\nMessage Received : %s"), *WsClient->GetAddress(), *MessageString);
|
||||
//Do Something With the message
|
||||
FDTFluxServerResponse Response;
|
||||
Response.ReceivedAt = FDateTime::Now();
|
||||
Response.RawMessage = MessageString;
|
||||
Response.FailureReason = FText::FromString("--");
|
||||
if(FJsonObjectConverter::JsonObjectStringToUStruct(MessageString, &Response, 0, 0, false, &(Response.FailureReason)))
|
||||
EDTFluxResponseStatus ResponseStatus;
|
||||
FDTFluxServerResponse Response(MessageString, ResponseStatus);
|
||||
if (!TryMatchResponseToQueuedRequest(Response))
|
||||
{
|
||||
if(Response.Code == -1)
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Response %s does not match any queued request"),
|
||||
*UEnum::GetValueAsString(Response.GetResponseType()));
|
||||
if (ProcessPushMessage(Response) != EDTFluxResponseStatus::Success)
|
||||
{
|
||||
// return DataReceived.Broadcast(Response);
|
||||
if(Response.Type.Contains("race-data"))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Race-Data Received"));
|
||||
return ParseRaceData(Response);
|
||||
}
|
||||
if(Response.Type.Contains("team-list"))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Team-List Received"));
|
||||
return ParseTeamListResponse(Response);
|
||||
}
|
||||
if(Response.Type.Contains("contest-ranking"))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Contest-Ranking Received"));
|
||||
return ParseContestRanking(Response);
|
||||
}
|
||||
if(Response.Type.Contains("stage-ranking") )
|
||||
{
|
||||
if(Response.SplitID == -1)
|
||||
{
|
||||
// StageRanking
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Stage-Ranking Data"));
|
||||
ParseStageRankingResponse(Response);
|
||||
}
|
||||
else
|
||||
{
|
||||
// StageRanking
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Split-Ranking Data"));
|
||||
return ParseSplitRankingResponse(Response);
|
||||
}
|
||||
}
|
||||
if(Response.Type.Contains("split-sensor"))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("split-sensor Data"));
|
||||
ParseSplitSensorResponse(Response);
|
||||
|
||||
}
|
||||
if(Response.Type.Contains("status-update"))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("status-update Data"));
|
||||
ParseStatusUpdateResponse(Response);
|
||||
|
||||
}
|
||||
if(Response.Type.Contains("team-update"))
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("team-update Data"));
|
||||
ParseTeamListResponse(Response);
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Not a push message"));
|
||||
// Legacy
|
||||
Parse(Response);
|
||||
}
|
||||
|
||||
}
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("Ws %s :\nMessage Received : %s Cannot be Parsed"), *WsClient->GetAddress(), *MessageString);
|
||||
// return DataReceived.Broadcast(Response);
|
||||
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::OnWebSocketMessageSentEvent_Subsystem(const FString& MessageSent)
|
||||
@ -474,15 +609,144 @@ void UDTFluxNetworkSubsystem::OnWebSocketMessageSentEvent_Subsystem(const FStrin
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Ws %s :\nMessage Sent: %s"), *WsClient->GetAddress(), *MessageSent);
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::OnRequestTimedOut_Internal(const FDTFluxQueuedRequest& TimedOutRequest)
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Warning, TEXT("Request %s timed out: Type=%d, Contest=%d, Stage=%d, Split=%d"),
|
||||
*TimedOutRequest.RequestId.ToString(),
|
||||
(int32)TimedOutRequest.RequestType,
|
||||
TimedOutRequest.ContestId,
|
||||
TimedOutRequest.StageId,
|
||||
TimedOutRequest.SplitId);
|
||||
|
||||
// Appeler le callback de timeout si présent
|
||||
if (FOnDTFluxRequestTimeout* TimeoutCallback = PendingTimeoutCallbacks.Find(TimedOutRequest.RequestId))
|
||||
{
|
||||
if (TimeoutCallback->IsBound())
|
||||
{
|
||||
TimeoutCallback->Execute(TimedOutRequest.RequestId, TEXT("Request timeout"));
|
||||
}
|
||||
PendingTimeoutCallbacks.Remove(TimedOutRequest.RequestId);
|
||||
}
|
||||
|
||||
// Nettoyer les callbacks de succès aussi
|
||||
PendingCallbacks.Remove(TimedOutRequest.RequestId);
|
||||
|
||||
// Broadcaster l'événement Blueprint
|
||||
OnTrackedRequestFailed.Broadcast(TimedOutRequest.RequestId, TimedOutRequest.RequestType, TEXT("Request timeout"));
|
||||
}
|
||||
|
||||
bool UDTFluxNetworkSubsystem::TryMatchResponseToQueuedRequest(const FDTFluxServerResponse& Response)
|
||||
{
|
||||
if (!QueueManager)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// Essayer de trouver une requête correspondante
|
||||
// Note: Cette méthode nécessiterait une modification de UDTFluxQueuedManager pour supporter le matching par type et paramètres
|
||||
|
||||
// Pour l'instant, on utilise une approche simple : chercher la première requête du bon type
|
||||
// Vous devrez probablement modifier UDTFluxQueuedManager pour ajouter une méthode comme FindMatchingRequest()
|
||||
|
||||
|
||||
// Implémentation temporaire : on assume qu'il n'y a qu'une requête de chaque type en cours
|
||||
if (QueueManager->IsRequestPending(Response.GetResponseType(), Response.ContestID, Response.StageID,
|
||||
Response.SplitID))
|
||||
{
|
||||
// Marquer comme répondu - vous devrez adapter cette méthode selon votre logique de matching
|
||||
// Pour l'instant, on va faire un workaround simple
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log,
|
||||
TEXT("Matched response to queued request: Type=%s, Contest=%d, Stage=%d, Split=%d"),
|
||||
*UEnum::GetValueAsString(Response.GetResponseType()), Response.ContestID, Response.StageID,
|
||||
Response.SplitID);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::CompleteTrackedRequest(const FGuid& RequestId, const FString& ResponseData,
|
||||
EDTFluxRequestType RequestType)
|
||||
{
|
||||
// Marquer la requête comme ayant reçu une réponse
|
||||
if (QueueManager)
|
||||
{
|
||||
QueueManager->MarkRequestAsResponded(RequestId);
|
||||
}
|
||||
|
||||
// Appeler le callback de succès si présent
|
||||
if (FOnDTFluxRequestResponse* SuccessCallback = PendingCallbacks.Find(RequestId))
|
||||
{
|
||||
if (SuccessCallback->IsBound())
|
||||
{
|
||||
SuccessCallback->Execute(RequestId, ResponseData);
|
||||
}
|
||||
PendingCallbacks.Remove(RequestId);
|
||||
}
|
||||
|
||||
// Nettoyer le callback de timeout
|
||||
PendingTimeoutCallbacks.Remove(RequestId);
|
||||
|
||||
// Broadcaster l'événement Blueprint
|
||||
OnTrackedRequestCompleted.Broadcast(RequestId, RequestType, ResponseData);
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Completed tracked request %s"), *RequestId.ToString());
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::FailTrackedRequest(const FGuid& RequestId, const FString& ErrorMessage,
|
||||
EDTFluxRequestType RequestType)
|
||||
{
|
||||
// Appeler le callback d'erreur si présent
|
||||
if (FOnDTFluxRequestTimeout* ErrorCallback = PendingTimeoutCallbacks.Find(RequestId))
|
||||
{
|
||||
if (ErrorCallback->IsBound())
|
||||
{
|
||||
ErrorCallback->Execute(RequestId, ErrorMessage);
|
||||
}
|
||||
PendingTimeoutCallbacks.Remove(RequestId);
|
||||
}
|
||||
|
||||
// Nettoyer les callbacks
|
||||
PendingCallbacks.Remove(RequestId);
|
||||
|
||||
// Broadcaster l'événement Blueprint
|
||||
OnTrackedRequestFailed.Broadcast(RequestId, RequestType, ErrorMessage);
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("Failed tracked request %s: %s"), *RequestId.ToString(), *ErrorMessage);
|
||||
}
|
||||
|
||||
void UDTFluxNetworkSubsystem::SendQueuedRequest(const FDTFluxQueuedRequest& QueuedRequest)
|
||||
{
|
||||
// Générer le message JSON à partir de la requête
|
||||
FString Message = QueuedRequest.Serialize();
|
||||
|
||||
if (Message.IsEmpty())
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("Failed to serialize queued request %s"),
|
||||
*QueuedRequest.RequestId.ToString());
|
||||
FailTrackedRequest(QueuedRequest.RequestId, TEXT("Serialization failed"), QueuedRequest.RequestType);
|
||||
return;
|
||||
}
|
||||
|
||||
// Dirty trick to fix Case (comme dans l'original)
|
||||
Message = Message.Replace(TEXT("Id"), TEXT("ID"), ESearchCase::CaseSensitive);
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Sending queued request %s: %s"), *QueuedRequest.RequestId.ToString(), *Message);
|
||||
|
||||
// Envoyer via WebSocket
|
||||
SendMessage(Message);
|
||||
}
|
||||
|
||||
|
||||
FString UDTFluxNetworkSubsystem::ConstructWsAddress(const FString& Address, const FString& Path, const int& Port)
|
||||
{
|
||||
FString NewAddress;
|
||||
if( !Address.Contains("ws://") && !Address.Contains("wss://"))
|
||||
if (!Address.Contains("ws://") && !Address.Contains("wss://"))
|
||||
{
|
||||
NewAddress += FString("ws://");
|
||||
}
|
||||
NewAddress +=Address + FString(":") + FString::FromInt(Port) + Path;
|
||||
NewAddress += Address + FString(":") + FString::FromInt(Port) + Path;
|
||||
return NewAddress;
|
||||
// UE_LOG(logDTFluxNetwork, Log, TEXT("NewAddress : %s"), *NewAddress);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user