Update FormatedName functionality now just truncates and adds OverflowChar + fixing getter Split, Stage, Contest

Resources/DTFluxRaceResult16x16.svg

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg1"
-   xml:space="preserve"
-   inkscape:export-filename="RaceResult.icone16x16.svg"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   sodipodi:docname="RaceResult.icone16x16.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-     id="namedview1"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"
-     inkscape:document-units="px" /><defs
-     id="defs1" /><g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(3.0517578e-5)"><rect
-       style="fill:#e22c2b;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-       id="rect1"
-       width="512"
-       height="512"
-       x="-3.0517578e-05"
-       y="0" /><path
-       style="fill:none;stroke:#ffffff;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-       d="m 154.64305,277.08769 -1.3605,-151.92206 146.48007,103.3977 v 184.12046 l 54.87334,-50.79185 V 199.53942 L 215.41187,92.967228 V 328.78654 Z"
-       id="path1" /></g></svg>

Source/DTFluxAPIStatus/DTFluxAPIStatus.Build.cs

@@ -31,6 +31,7 @@ public class DTFluxAPIStatus : ModuleRules
 				"DTFluxCoreSubsystem",
 				"InputCore",
 				"OutputLog",
+				"ToolMenus",
 			}
 		);
 	}

Source/DTFluxAPIStatus/Private/DTFluxAPIStatusModule.cpp

@@ -14,9 +14,9 @@ FText DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::StatusTabDisplayName = FText::
 
 void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::StartupModule()
 {
+	FDTFluxStatusStyle::RegisterStyle();
 	InitMenuExtension();
 	RegisterStatusTab();
-	FDTFluxStatusStyle::RegisterStyle();
 }
 
 
@@ -25,45 +25,109 @@ void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::StartupModule()
 
 void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::InitMenuExtension()
 {
-	FLevelEditorModule& LevelEditorModule =
-		FModuleManager::LoadModuleChecked<FLevelEditorModule>(TEXT("LevelEditor"));
-	// FDTFluxAPIModule& DTFluxApi =
-	// 	FModuleManager::LoadModuleChecked<FDTFluxAPIModule>(TEXT("DTFluxAPI"));
-	const TSharedPtr<FExtender> MenuExtender = MakeShareable(new FExtender());
+	// FLevelEditorModule& LevelEditorModule =
+	// 	FModuleManager::LoadModuleChecked<FLevelEditorModule>(TEXT("LevelEditor"));
+	// // FDTFluxAPIModule& DTFluxApi =
+	// // 	FModuleManager::LoadModuleChecked<FDTFluxAPIModule>(TEXT("DTFluxAPI"));
+	// const TSharedPtr<FExtender> MenuExtender = MakeShareable(new FExtender());
+	//
+	// MenuExtender->AddMenuBarExtension(
+	// 	"Help",
+	// 	EExtensionHook::Before,
+	// 	nullptr,
+	// 	FMenuBarExtensionDelegate::CreateRaw(this, &FDTFluxAPIStatusModule::AddMenu)
+	// 	);
+	// LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender);
 	
-	MenuExtender->AddMenuBarExtension(
-		"Help",
-		EExtensionHook::Before,
-		nullptr,
-		FMenuBarExtensionDelegate::CreateRaw(this, &FDTFluxAPIStatusModule::AddMenu)
+	UToolMenus::RegisterStartupCallback(
+		FSimpleMulticastDelegate::FDelegate::CreateRaw(this, &FDTFluxAPIStatusModule::RegisterMenus)
 	);
-	LevelEditorModule.GetMenuExtensibilityManager()->AddExtender(MenuExtender);
-
 
 }
 
-void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::AddMenu(FMenuBarBuilder& MenuBarBuilder)
+void FDTFluxAPIStatusModule::RegisterMenus()
 {
-	MenuBarBuilder.AddPullDownMenu(
+	UE_LOG(logDTFluxStatus, Warning, TEXT("Creating DTFlux menu"));
+    
+	// 1. Enregistrer le menu DTFlux
+	UToolMenu* DTFluxMenu = UToolMenus::Get()->RegisterMenu("DTFlux.MainMenu");
+	if (DTFluxMenu)
+	{
+		CreateSubmenu(DTFluxMenu);
+	}
+    
+	// 2. Ajouter ce menu à la barre principale
+	if (UToolMenu* MainMenu = UToolMenus::Get()->ExtendMenu("MainFrame.MainMenu"))
+	{
+		FToolMenuSection& DTFluxMenuSection = MainMenu->FindOrAddSection("DTFlux");
+		DTFluxMenuSection.Label = FText::FromString("DTFlux");
+        
+		DTFluxMenuSection.AddSubMenu(
+			"DTFluxSubmenu",
 			FText::FromString("DTFlux"),
 			FText::FromString("DTFlux API Tools"),
-		FNewMenuDelegate::CreateRaw(this, &FDTFluxAPIStatusModule::FillMenu)
+			FNewToolMenuDelegate::CreateLambda([](UToolMenu* Menu)
+			{
+				// Référencer le menu enregistré
+				if (UToolMenu* RegisteredMenu = UToolMenus::Get()->FindMenu("DTFlux.MainMenu"))
+				{
+					// Copier la structure du menu enregistré
+					for (const FToolMenuSection& Section : RegisteredMenu->Sections)
+					{
+						Menu->Sections.Add(Section);
+					}
+				}
+			}),
+			false,
+			FSlateIcon(FAppStyle::GetAppStyleSetName(), "LevelEditor.Tab.Icon")
 		);
+	}
+
 }
 
-void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::FillMenu(FMenuBuilder& MenuBuilder)
+void FDTFluxAPIStatusModule::CreateSubmenu(UToolMenu* Menu)
 {
-	MenuBuilder.BeginSection(NAME_None, FText::FromString("DTFlux API"));
-	MenuBuilder.AddMenuEntry(
-	FText::FromString("Status"),
-	FText::FromString("Launch DTFlux Status"),
-	FSlateIcon(FDTFluxStatusStyle::GetStyleSetName(), "LevelEditor.Tab.Icon"),
-	FExecuteAction::CreateRaw(this, &FDTFluxAPIStatusModule::OnButtonClicked)
-	);
-	MenuBuilder.EndSection();
+	FToolMenuSection& DTFluxAPISection = Menu->FindOrAddSection("DTFluxAPI");
+	DTFluxAPISection.Label = FText::FromString("DTFlux API");
+	// Cette section est vide pour le moment, prête pour de futurs boutons
 
+	
+	// Section 2 : Tools
+	FToolMenuSection& ToolsSection = Menu->FindOrAddSection("Tools");
+	ToolsSection.Label = FText::FromString("Tools");
+
+    
+	// Ajouter le bouton Status dans la section Tools
+	DTFluxAPISection.AddMenuEntry(
+		"DTFluxStatus",
+		FText::FromString("DTFlux Status"),
+		FText::FromString("Launch DTFlux Status Control Panel"),
+		FSlateIcon(FDTFluxStatusStyle::GetStyleSetName(), "LevelEditor.Tab.Icon"),
+		FUIAction(FExecuteAction::CreateRaw(this, &FDTFluxAPIStatusModule::OnButtonClicked))
+	);
 }
 
+// void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::AddMenu(FMenuBarBuilder& MenuBarBuilder)
+// {
+// 	MenuBarBuilder.AddPullDownMenu(
+// 		FText::FromString("DTFlux"),
+// 		FText::FromString("DTFlux API Tools"),
+// 		FNewMenuDelegate::CreateRaw(this, &FDTFluxAPIStatusModule::FillMenu)
+// 		);
+// }
+
+// void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::FillMenu(FMenuBuilder& MenuBuilder)
+// {
+// 	MenuBuilder.BeginSection(NAME_None, FText::FromString("DTFlux API"));
+// 	MenuBuilder.AddMenuEntry(
+// 	FText::FromString("Status"),
+// 	FText::FromString("Launch DTFlux Status"),
+// 	FSlateIcon(FDTFluxStatusStyle::GetStyleSetName(), "LevelEditor.Tab.Icon"),
+// 	FExecuteAction::CreateRaw(this, &FDTFluxAPIStatusModule::OnButtonClicked)
+// 	);
+// 	MenuBuilder.EndSection();
+// }
+
 void DTFLUXAPISTATUS_API FDTFluxAPIStatusModule::OnButtonClicked()
 {
 	FGlobalTabmanager::Get()->TryInvokeTab(StatusTabId);

Source/DTFluxAPIStatus/Private/widgets/DTFluxStatusWidget.cpp

@@ -416,7 +416,7 @@ FSlateColor SDTFluxStatusWidget::GetComboItemRankingColor(const TSharedPtr<FComb
 
 FReply SDTFluxStatusWidget::OnRankingButtonClicked() const
 {
-	if (DTFluxNetwork)
+	if (DTFluxCore)
 	{
 		// Exemple d'envoi de requête basée sur la sélection
 		int ForContest = SelectedContestComboBoxItem.IsValid() ? SelectedContestComboBoxItem->ContestId : -1;
@@ -432,13 +432,19 @@ FReply SDTFluxStatusWidget::OnRankingButtonClicked() const
 		if (ForStage == -1)
 		{
 			UE_LOG(logDTFluxStatus, Warning, TEXT("Stage not selected !!!! Requesting contest Ranking"));
-			RequestType = EDTFluxApiDataType::ContestRanking;
-			DTFluxNetwork->SendRequest(RequestType, ForContest);
+			DTFluxCore->TrackedRequestContestRankings({ForContest});
 			return FReply::Handled();
 		}
-		RequestType = ForSplit == -1 ? EDTFluxApiDataType::StageRanking : EDTFluxApiDataType::SplitRanking;
+		if (ForSplit == -1)
+		{
+			UE_LOG(logDTFluxStatus, Warning, TEXT("Split not selected !!!! Requesting stage Ranking"));
+			FDTFluxStageKey StageKey = {ForContest, ForStage};
+			DTFluxCore->TrackedRequestStageRankings({StageKey});
+			return FReply::Handled();
+		}
+		FDTFluxSplitKey SplitKey = {ForContest, ForStage, ForSplit};
+		DTFluxCore->TrackedRequestSplitRankings({SplitKey});
 		UE_LOG(logDTFluxStatus, Warning, TEXT("Requesting %s Ranking"), *UEnum::GetValueAsString(RequestType));
-		DTFluxNetwork->SendRequest(RequestType, ForContest, ForStage, ForSplit);
 	}
 
 	return FReply::Handled();

Source/DTFluxAPIStatus/Private/widgets/styles/DTFluxStatusStyle.cpp

@@ -13,7 +13,7 @@ TSharedPtr<ISlateStyle> FDTFluxStatusStyle::StyleSet = nullptr;
 
 void FDTFluxStatusStyle::RegisterStyle()
 {
-	if(StyleSet.IsValid()) return;
+	if (StyleSet.IsValid()) return;
 
 	StyleSet = Create();
 	FSlateStyleRegistry::RegisterSlateStyle(*StyleSet);
@@ -21,14 +21,12 @@ void FDTFluxStatusStyle::RegisterStyle()
 
 void FDTFluxStatusStyle::UnregisterStyle()
 {
-	if(StyleSet.IsValid())
+	if (StyleSet.IsValid())
 	{
 		FSlateStyleRegistry::UnRegisterSlateStyle(*StyleSet);
 		ensure(StyleSet.IsUnique());
 		StyleSet.Reset();
 	}
-
-	
 }
 
 void FDTFluxStatusStyle::ReloadTextures()
@@ -38,9 +36,8 @@ void FDTFluxStatusStyle::ReloadTextures()
 TSharedPtr<ISlateStyle> FDTFluxStatusStyle::Create()
 {
 	TSharedPtr<FSlateStyleSet> Style = MakeShareable(new FSlateStyleSet("DTFluxAPIStatusStyle"));
-	Style->SetContentRoot(IPluginManager::Get().FindPlugin("DTFluxAPI")->GetBaseDir()/TEXT("Resources"));
+	Style->SetContentRoot(IPluginManager::Get().FindPlugin("DTFluxAPI")->GetBaseDir() / TEXT("Resources"));
 
-	Style->Set("LevelEditor.Tab.Icon", new IMAGE_BRUSH_SVG("DTFluxServerStatusWhite", FVector2d(16)) );
+	Style->Set("LevelEditor.Tab.Icon", new IMAGE_BRUSH_SVG("DTFluxServerStatusWhite", FVector2d(16)));
 	return Style;
 }
-

Source/DTFluxAPIStatus/Public/DTFluxAPIStatusModule.h

@@ -13,10 +13,11 @@ public:
 
 #pragma region MenuExtention
     void InitMenuExtension();
-    void AddMenu(FMenuBarBuilder& MenuBarBuilder);
-    void FillMenu(FMenuBuilder& MenuBuilder);
+    void RegisterMenus();
+    void CreateSubmenu(UToolMenu* Menu);
+    // void AddMenu(FMenuBarBuilder& MenuBarBuilder);
+    // void FillMenu(FMenuBuilder& MenuBuilder);
     void OnButtonClicked();
-    // void OnWsEvent(TEnumAsByte<EDTFluxWsStatus> WsResponseEvent) const;
 #pragma endregion
 
 #pragma region EditorTab
@@ -25,7 +26,6 @@ public:
 private:
     static FName StatusTabId;
     static FText StatusTabDisplayName;
-
     TSharedPtr<class SDTFluxStatusWidget> StatusWidget;
 #pragma endregion
 };

Source/DTFluxAssetsEditor/Private/DTFluxModelAssetDetailCustomization.cpp

@@ -100,6 +100,20 @@ void FDTFluxModelAssetCustomization::CustomizeDetailsWithoutRawDataAsset(IDetail
 
 void FDTFluxModelAssetCustomization::CustomizeDetailsWithRawDataAccess(IDetailLayoutBuilder& DetailBuilder)
 {
+	// Edit object
+	TArray<TWeakObjectPtr<UObject>> ObjectsBeingCustomized;
+	DetailBuilder.GetObjectsBeingCustomized(ObjectsBeingCustomized);
+
+	if (ObjectsBeingCustomized.Num() > 0)
+	{
+		ModelAsset = Cast<UDTFluxModelAsset>(ObjectsBeingCustomized[0].Get());
+	}
+
+	if (!ModelAsset.IsValid())
+	{
+		UE_LOG(LogTemp, Error, TEXT("No valid DTFluxModelAsset found"));
+		return;
+	}
 	// ===== WIDGET PRINCIPAL =====
 	IDetailCategoryBuilder& MainCategory = DetailBuilder.EditCategory(
 		"DTFlux Model Explorer",

Source/DTFluxCore/Private/Types/Struct/DTFluxRaceDataStucts.cpp

@@ -1,3 +1,67 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 #include "Types/Struct/DTFluxRaceDataStructs.h"
+
+bool FDTFluxContest::IsFinished() const
+{
+	return EndTime <= FDateTime::Now();
+}
+
+void FDTFluxContest::UpdateEndTime()
+{
+	TArray<FDTFluxStage> TempStages = Stages;
+	TempStages.Sort([](const FDTFluxStage& A, const FDTFluxStage& B)
+	{
+		return A.EndTime < B.EndTime;
+	});
+	EndTime = TempStages.Last().EndTime;
+}
+
+int FDTFluxContest::GetLastStageId()
+{
+	if (LastStageId <= 0)
+	{
+		UpdateLastStageId();
+	}
+	return LastStageId;
+}
+
+void FDTFluxContest::UpdateLastStageId()
+{
+	TArray<FDTFluxStage> TempStages = Stages;
+	TempStages.Sort([](const FDTFluxStage& A, const FDTFluxStage& B)
+	{
+		return A.StageId < B.StageId;
+	});
+	LastStageId = TempStages.Last().StageId;
+}
+
+FDTFluxStage& FDTFluxContest::GetLastStage() const
+{
+	TArray<FDTFluxStage> TempStages = Stages;
+	TempStages.Sort([](const FDTFluxStage& A, const FDTFluxStage& B)
+	{
+		return A.StageId < B.StageId;
+	});
+	return TempStages.Last();
+}
+
+bool FDTFluxContest::GetStage(const int StageID, FDTFluxStage& OutStage) const
+{
+	if (Stages.Num() == 0)
+	{
+		return false;
+	}
+	for (const FDTFluxStage& Stage : Stages)
+	{
+		if (Stage.StageId == StageID)
+		{
+			OutStage = Stage;
+			return true;
+		}
+	}
+	return false;
+}
+
+
+

Source/DTFluxCore/Private/Types/Struct/DTFluxTeamListStruct.cpp

@@ -1,93 +1,56 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-
 #include "Types/Struct/DTFluxTeamListStruct.h"
-
 #include "DTFluxCoreModule.h"
+#include "Dom/JsonObject.h"
 
+// ===================================
+// FDTFluxPerson Implementation
+// ===================================
 
-void FDTFluxParticipant::AddTeammate(const FDTFluxPerson& Person)
+bool FDTFluxPerson::operator==(const FDTFluxPerson& Right) const
 {
-	Teammate.Add(Person);
+	return GetNormalizedString() == Right.GetNormalizedString();
 }
 
-void FDTFluxParticipant::AddTeammate(const FString LastName, const FString FirstName, const FString Gender)
+bool FDTFluxPerson::operator!=(const FDTFluxPerson& Right) const
 {
+	return !(*this == Right);
 }
 
-FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString OverflowChars) const
+bool FDTFluxPerson::operator==(const int Length) const
 {
-	{
-		if (MaxChar <= 0)
-		{
-			return "";
-		}
-
-		FString FirstName;
-		FString LastName;
-		if (IsTeam())
-		{
-			LastName = Team;
-		}
-		else
-		{
-			FirstName = Teammate[0].FirstName;
-			LastName = Teammate[0].LastName;
-		}
-		FString Initial;
-		if (!FirstName.IsEmpty())
-		{
-			Initial = FirstName.Left(1).ToUpper() + " ";
-		}
-
-		FString FormattedLastName = LastName.ToUpper();
-
-		FString FullName = Initial + FormattedLastName;
-		UE_LOG(logDTFluxCore, Error, TEXT("FullName for Bib %i is %s"), Bib, *FullName);
-
-		if (FullName.Len() <= MaxChar)
-		{
-			return FullName;
-		}
-
-		const int32 OverflowLength = OverflowChars.Len();
-
-		if (OverflowLength > MaxChar)
-		{
-			return FullName.Left(MaxChar);
-		}
-
-		if (Initial.Len() + OverflowLength > MaxChar)
-		{
-			return FullName.Left(MaxChar);
-		}
-
-		const int32 AvailableForLastName = MaxChar - Initial.Len() - OverflowLength;
-
-		if (AvailableForLastName <= 0)
-		{
-			return FullName.Left(MaxChar);
-		}
-
-		FString TruncatedName = Initial + FormattedLastName.Left(AvailableForLastName) + OverflowChars;
-
-		if (TruncatedName.Len() > MaxChar)
-		{
-			return TruncatedName.Left(MaxChar);
-		}
-
-		return TruncatedName;
-	}
+	return GetNormalizedString().Len() == Length;
 }
 
-FString FDTFluxParticipant::GetConcatFormattedName(const int MaxChar, const FString OverflowChar) const
+bool FDTFluxPerson::operator!=(const int Length) const
 {
-	FString BibText = FString::FromInt(Bib) + " ";
-	FString FormattedName = GetFormattedName(MaxChar - BibText.Len(), OverflowChar);
-	return BibText + FormattedName;
+	return !(*this == Length);
+}
+
+FString FDTFluxPerson::GetNormalizedString() const
+{
+	return FirstName.ToLower() + LastName.ToLower() + Gender.ToLower();
+}
+
+bool FDTFluxPerson::IsValid() const
+{
+	return !FirstName.TrimStartAndEnd().IsEmpty() &&
+		!LastName.TrimStartAndEnd().IsEmpty() &&
+		!Gender.TrimStartAndEnd().IsEmpty();
+}
+
+FDTFluxParticipant::FDTFluxParticipant()
+	: Bib(-1)
+	  , ContestId(-1)
+	  , Elite(false)
+	  , Status(static_cast<EDTFluxParticipantStatusType>(0))
+	  , bIsMassStartParticipant(false)
+	  , CurrentSplit(-1)
+{
+	Teammate.Reset();
 }
 
-// Constructeur privé depuis JSON
 FDTFluxParticipant::FDTFluxParticipant(const TSharedPtr<FJsonObject>& JsonObject)
 	: Bib(JsonObject->GetIntegerField(TEXT("bib")))
 	  , ContestId(JsonObject->GetIntegerField(TEXT("contestId")))
@@ -96,43 +59,88 @@ FDTFluxParticipant::FDTFluxParticipant(const TSharedPtr<FJsonObject>& JsonObject
 	  , Elite(JsonObject->GetBoolField(TEXT("elite")))
 	  , Status(static_cast<EDTFluxParticipantStatusType>(JsonObject->GetIntegerField(TEXT("status"))))
 	  , Team(JsonObject->GetStringField(TEXT("team")))
-	  , bIsMassStartParticipant(false)
 	  , CurrentSplit(-1)
 {
-	UE_LOG(logDTFluxCore, Error, TEXT("Ctor with JSON Object"))
-	for (uint8 Index = 1; ; Index++)
+	UE_LOG(logDTFluxCore, Log, TEXT("Creating participant from JSON - Bib: %d, Contest: %d"), Bib, ContestId);
+
+	for (uint8 Index = 1; Index <= 10; Index++)
 	{
-		FString FirstNameKey = Index == 1 ? "firstName" : FString::Printf(TEXT("firstName%i"), Index);
-		FString LastNameKey = Index == 1 ? "lastName" : FString::Printf(TEXT("lastName%i"), Index);
-		FString GenderKey = Index == 1 ? "gender" : FString::Printf(TEXT("gender%i"), Index);
-		// max 10 Persons
-		if (Index >= 10)
+		FString FirstNameKey = Index == 1 ? TEXT("firstName") : FString::Printf(TEXT("firstName%d"), Index);
+		FString LastNameKey = Index == 1 ? TEXT("lastName") : FString::Printf(TEXT("lastName%d"), Index);
+		FString GenderKey = Index == 1 ? TEXT("gender") : FString::Printf(TEXT("gender%d"), Index);
+
+		// Vérifie si au moins un des champs existe
+		if (!JsonObject->HasField(FirstNameKey) && !JsonObject->HasField(LastNameKey) && !JsonObject->
+			HasField(GenderKey))
 		{
 			break;
 		}
-		if (!JsonObject->HasField(FirstNameKey) && !JsonObject->HasField(LastNameKey)
-			&& !JsonObject->HasField(GenderKey))
-		{
-			UE_LOG(logDTFluxCore, Error, TEXT("No Corresponding Field!!!"))
-			break;
-		}
+
 		const FString FirstName = JsonObject->GetStringField(FirstNameKey);
 		const FString LastName = JsonObject->GetStringField(LastNameKey);
 		const FString Gender = JsonObject->GetStringField(GenderKey);
-		if (FirstName.IsEmpty() && LastName.IsEmpty())
+
+		if (FirstName.TrimStartAndEnd().IsEmpty() && LastName.TrimStartAndEnd().IsEmpty())
+		{
 			continue;
-		FDTFluxPerson Person;
-		Person.FirstName = FirstName;
-		Person.LastName = LastName;
-		Person.Gender = Gender;
-		Teammate.Add(Person);
 		}
-	UE_LOG(logDTFluxCore, Error, TEXT("Ctor with JSON Object Teammate is now %i long"), Teammate.Num());
+
+		FDTFluxPerson Person;
+		Person.FirstName = FirstName.TrimStartAndEnd();
+		Person.LastName = LastName.TrimStartAndEnd();
+		Person.Gender = Gender.TrimStartAndEnd();
+
+		if (Person.IsValid())
+		{
+			Teammate.Add(Person);
+			UE_LOG(logDTFluxCore, Verbose, TEXT("Added person %d: %s %s (%s)"),
+			       Index, *Person.FirstName, *Person.LastName, *Person.Gender);
+		}
+		else
+		{
+			UE_LOG(logDTFluxCore, Warning, TEXT("Invalid person data at index %d: '%s' '%s' '%s'"),
+			       Index, *FirstName, *LastName, *Gender);
+		}
+	}
+
+	UE_LOG(logDTFluxCore, Log, TEXT("Participant created with %d teammates"), Teammate.Num());
 }
 
-FDTFluxParticipant FDTFluxParticipant::CreateFromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool FDTFluxParticipant::IsDefault() const
 {
-	return FDTFluxParticipant(JsonObject);
+	return Bib == -1
+		&& ContestId == -1
+		&& Category.IsEmpty()
+		&& Club.IsEmpty()
+		&& !Elite
+		&& Status == static_cast<EDTFluxParticipantStatusType>(0)
+		&& Team.IsEmpty()
+		&& !bIsMassStartParticipant
+		&& CurrentSplit == -1
+		&& Teammate.IsEmpty();
+}
+
+void FDTFluxParticipant::AddTeammate(const FDTFluxPerson& Person)
+{
+	if (Person.IsValid())
+	{
+		Teammate.Add(Person);
+		UE_LOG(logDTFluxCore, Verbose, TEXT("Added teammate: %s %s"), *Person.FirstName, *Person.LastName);
+	}
+	else
+	{
+		UE_LOG(logDTFluxCore, Warning, TEXT("Cannot add invalid teammate: %s %s"), *Person.FirstName, *Person.LastName);
+	}
+}
+
+void FDTFluxParticipant::AddTeammate(const FString& LastName, const FString& FirstName, const FString& Gender)
+{
+	FDTFluxPerson Person;
+	Person.FirstName = FirstName.TrimStartAndEnd();
+	Person.LastName = LastName.TrimStartAndEnd();
+	Person.Gender = Gender.TrimStartAndEnd();
+
+	AddTeammate(Person);
 }
 
 int FDTFluxParticipant::GetTeammateNum() const
@@ -142,5 +150,128 @@ int FDTFluxParticipant::GetTeammateNum() const
 
 bool FDTFluxParticipant::IsTeam() const
 {
-	return Teammate.Num() < 1;
+	return Teammate.Num() > 1;
+}
+
+const TArray<FDTFluxPerson>& FDTFluxParticipant::GetTeammate() const
+{
+	return Teammate;
+}
+
+FString FDTFluxParticipant::GetFormattedName(const int MaxChar, const FString& Separator,
+                                             const FString& OverflowChar) const
+{
+	if (MaxChar <= 0)
+	{
+		return TEXT("");
+	}
+	FString FirstName;
+	FString LastName;
+	if (IsTeam())
+	{
+		if (!Team.IsEmpty())
+		{
+			LastName = Team;
+		}
+		else
+		{
+			TArray<FString> Names;
+			for (const FDTFluxPerson& Person : Teammate)
+			{
+				Names.Add(Person.LastName);
+			}
+			LastName = FString::Join(Names, TEXT("/"));
+		}
+	}
+	else if (Teammate.Num() > 0)
+	{
+		FirstName = Teammate[0].FirstName;
+		LastName = Teammate[0].LastName;
+	}
+	else
+	{
+		LastName = TEXT("Unknown");
+	}
+	FString Initial;
+	if (!FirstName.IsEmpty())
+	{
+		Initial = FirstName.Left(1).ToUpper() + Separator;
+	}
+	FString FormattedLastName = LastName.ToUpper();
+	FString FullName = Initial + FormattedLastName;
+	if (FullName.Len() <= MaxChar)
+	{
+		return FullName;
+	}
+	return FullName.Left(MaxChar) + OverflowChar;
+}
+
+FString FDTFluxParticipant::GetConcatFormattedName(const int MaxChar, const FString& Separator,
+                                                   const FString& OverflowChar, const FString& BibSeparator) const
+{
+	FString BibText = FString::FromInt(Bib) + BibSeparator;
+	int32 RemainingChars = MaxChar - BibText.Len();
+
+	if (RemainingChars <= 0)
+	{
+		return BibText.Left(MaxChar);
+	}
+
+	FString FormattedName = GetFormattedName(RemainingChars, Separator, OverflowChar);
+	return BibText + FormattedName;
+}
+
+FText FDTFluxParticipant::GetFormattedNameText(const int MaxChar, const FString& Separator,
+                                               const FString& OverflowChar) const
+{
+	return FText::FromString(GetFormattedName(MaxChar, Separator, OverflowChar));
+}
+
+FText FDTFluxParticipant::GetConcatFormattedNameText(const int MaxChar, const FString& Separator,
+                                                     const FString& OverflowChar, const FString& BibSeparator) const
+{
+	return FText::FromString(GetConcatFormattedName(MaxChar, Separator, OverflowChar, BibSeparator));
+}
+
+FString FDTFluxParticipant::GetFormattedName(const FDTFluxParticipant& Participant, const int MaxChar,
+                                             const FString& Separator, const FString& OverflowChar)
+{
+	return Participant.GetFormattedName(MaxChar, Separator, OverflowChar);
+}
+
+FString FDTFluxParticipant::GetConcatFormattedName(const FDTFluxParticipant& Participant, const int MaxChar,
+                                                   const FString& Separator, const FString& OverflowChar,
+                                                   const FString& BibSeparator)
+{
+	return Participant.GetConcatFormattedName(MaxChar, Separator, OverflowChar, BibSeparator);
+}
+
+FText FDTFluxParticipant::GetFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar,
+                                               const FString& Separator, const FString& OverflowChar)
+{
+	return Participant.GetFormattedNameText(MaxChar, Separator, OverflowChar);
+}
+
+FText FDTFluxParticipant::GetConcatFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar,
+                                                     const FString& Separator, const FString& OverflowChar,
+                                                     const FString& BibSeparator)
+{
+	return Participant.GetConcatFormattedNameText(MaxChar, Separator, OverflowChar, BibSeparator);
+}
+
+FDTFluxParticipant FDTFluxParticipant::CreateFromJson(const TSharedPtr<FJsonObject>& JsonObject)
+{
+	if (!JsonObject.IsValid())
+	{
+		UE_LOG(logDTFluxCore, Error, TEXT("Cannot create participant from invalid JSON object"));
+		return FDTFluxParticipant();
+	}
+
+	return FDTFluxParticipant(JsonObject);
+}
+
+FDTFluxTeamStatusUpdate::FDTFluxTeamStatusUpdate(const int InBib, const int InStatus)
+	: Bib(InBib)
+	  , Status(static_cast<EDTFluxParticipantStatusType>(InStatus))
+{
 }

Source/DTFluxCore/Public/Types/Struct/DTFluxRaceDataStructs.h

@@ -89,68 +89,6 @@ public:
 	bool GetStage(const int StageID, FDTFluxStage& OutStage) const;
 };
 
-inline bool FDTFluxContest::IsFinished() const
-{
-	return EndTime <= FDateTime::Now();
-}
-
-inline void FDTFluxContest::UpdateEndTime()
-{
-	TArray<FDTFluxStage> TempStages = Stages;
-	TempStages.Sort([](const FDTFluxStage& A, const FDTFluxStage& B)
-	{
-		return A.EndTime < B.EndTime;
-	});
-	EndTime = TempStages.Last().EndTime;
-}
-
-inline int FDTFluxContest::GetLastStageId()
-{
-	if (LastStageId <= 0)
-	{
-		UpdateLastStageId();
-	}
-	return LastStageId;
-}
-
-inline void FDTFluxContest::UpdateLastStageId()
-{
-	TArray<FDTFluxStage> TempStages = Stages;
-	TempStages.Sort([](const FDTFluxStage& A, const FDTFluxStage& B)
-	{
-		return A.StageId < B.StageId;
-	});
-	LastStageId = TempStages.Last().StageId;
-}
-
-inline FDTFluxStage& FDTFluxContest::GetLastStage() const
-{
-	TArray<FDTFluxStage> TempStages = Stages;
-	TempStages.Sort([](const FDTFluxStage& A, const FDTFluxStage& B)
-	{
-		return A.StageId < B.StageId;
-	});
-	return TempStages.Last();
-}
-
-inline bool FDTFluxContest::GetStage(const int StageID, FDTFluxStage& OutStage) const
-{
-	if (Stages.Num() == 0)
-	{
-		return false;
-	}
-	for (const FDTFluxStage& Stage : Stages)
-	{
-		if (Stage.StageId == StageID)
-		{
-			OutStage = Stage;
-			return true;
-		}
-	}
-	return false;
-}
-
-
 USTRUCT()
 struct DTFLUXCORE_API FDTFluxRaceData
 {

Source/DTFluxCore/Public/Types/Struct/DTFluxRankingStructs.h

@@ -165,6 +165,7 @@ struct FDTFluxStageRankings : public FDTFluxDetailedRankings
 				Ranking.TimeStart.ParseIntoArray(Exploded, TEXT(":"), true);
 				if (Exploded.Num() == 3)
 				{
+					//TODO: Pas sur que ce soit super de le mettre à ce jour ???
 					FDateTime Now = FDateTime::Now();
 					RankingStartTime = FDateTime(Now.GetYear(), Now.GetMonth(), Now.GetDay(),
 					                             FCString::Atoi(*Exploded[0]), FCString::Atoi(*Exploded[1]),

Source/DTFluxCore/Public/Types/Struct/DTFluxTeamListStruct.h

@@ -7,6 +7,10 @@
 #include "Types/Enum/DTFluxModelEnums.h"
 #include "DTFluxTeamListStruct.generated.h"
 
+// Forward declarations
+class UDTFluxModelAsset;
+class UDTFluxParticipantFactory;
+
 USTRUCT()
 struct DTFLUXCORE_API FDTFluxTeamListItemDefinition
 {
@@ -15,76 +19,78 @@ struct DTFLUXCORE_API FDTFluxTeamListItemDefinition
 public:
 	UPROPERTY()
 	FString Type = "team-list-item";
+
 	UPROPERTY()
-	int ContestId;
+	int ContestId = 0;
+
 	UPROPERTY()
-	int Bib;
+	int Bib = 0;
+
 	UPROPERTY()
 	FString FirstName;
+
 	UPROPERTY()
 	FString LastName;
+
 	UPROPERTY()
 	FString FirstName2 = "";
+
 	UPROPERTY()
 	FString LastName2 = "";
+
 	UPROPERTY()
 	FString Team = "";
+
 	UPROPERTY()
 	FString Gender;
+
 	UPROPERTY()
 	FString Gender2;
+
 	UPROPERTY()
-	bool Elite;
+	bool Elite = false;
+
 	UPROPERTY()
 	FString Category;
+
 	UPROPERTY()
-	int Status;
+	int Status = 0;
+
 	UPROPERTY()
 	FString Club;
 };
 
-
 USTRUCT(BlueprintType, Category="DTFlux|Model")
 struct DTFLUXCORE_API FDTFluxPerson
 {
 	GENERATED_BODY()
 
 public:
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	FString FirstName;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	FString LastName;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	FString Gender;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	FString FunctionLine1 = TEXT("");
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	FString FunctionLine2 = TEXT("");
 
-	bool operator==(const FDTFluxPerson& Right) const
-	{
-		return FirstName.ToLower() + LastName.ToLower() + Gender.ToLower()
-			== Right.FirstName.ToLower() + Right.LastName.ToLower() + Right.Gender.ToLower();
-	}
+	bool operator==(const FDTFluxPerson& Right) const;
+	bool operator!=(const FDTFluxPerson& Right) const;
+	bool operator==(const int Length) const;
+	bool operator!=(const int Length) const;
 
-	bool operator==(const int Length) const
-	{
-		return (FirstName.ToLower() + LastName.ToLower() + Gender.ToLower()).Len() == Length;
-	}
+	FString GetNormalizedString() const;
 
-	bool operator!=(const int Length) const
-	{
-		return !(*this == Length);
-	}
-
-	bool operator!=(const FDTFluxPerson& Right) const
-	{
-		return FirstName.ToLower() + LastName.ToLower() + Gender.ToLower()
-			!= Right.FirstName.ToLower() + Right.LastName.ToLower() + Right.Gender.ToLower();
-	}
+	bool IsValid() const;
 };
 
-
 USTRUCT(BlueprintType, Category="DTFlux|Model")
 struct DTFLUXCORE_API FDTFluxParticipant
 {
@@ -94,117 +100,98 @@ struct DTFLUXCORE_API FDTFluxParticipant
 	friend class UDTFluxParticipantFactory;
 
 public:
-	// Constructeur public par défaut requis par Unreal
-	FDTFluxParticipant()
-		: Bib(-1)
-		  , ContestId(-1)
-		  , Elite(false)
-		  , Status(static_cast<EDTFluxParticipantStatusType>(0))
-		  , bIsMassStartParticipant(false)
-		  , CurrentSplit(-1)
-	{
-		Teammate.Reset();
-	}
+	FDTFluxParticipant();
 
-
-	/**
-	 * Vérifie si le participant est dans son état par défaut (non initialisé)
-	 * @return True si tous les champs sont à leur valeur par défaut
-	 */
-	bool IsDefault() const
-	{
-		return Bib == -1
-			&& ContestId == -1
-			&& Category.IsEmpty()
-			&& Club.IsEmpty()
-			&& !Elite
-			&& Status == static_cast<EDTFluxParticipantStatusType>(0)
-			&& Team.IsEmpty()
-			&& !bIsMassStartParticipant
-			&& CurrentSplit == -1
-			&& Teammate.IsEmpty();
-	}
-
-
-	UPROPERTY(BlueprintReadOnly, Category="DTFlux|model", EditAnywhere)
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Model", EditAnywhere)
 	int Bib = -1;
-	UPROPERTY(BlueprintReadOnly, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Model", EditAnywhere)
 	int ContestId = -1;
-	UPROPERTY(BlueprintReadOnly, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Model", EditAnywhere)
 	FString Category;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	FString Club;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
-	bool Elite;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
+	bool Elite = false;
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	EDTFluxParticipantStatusType Status;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	FString Team;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
 	bool bIsMassStartParticipant = false;
-	UPROPERTY(BlueprintReadWrite, Category="DTFlux|model")
+
+	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
 	int CurrentSplit = -1;
 
-	// void Dump() const;
+	bool IsDefault() const;
+
 	void AddTeammate(const FDTFluxPerson& Person);
-	void AddTeammate(const FString LastName, const FString FirstName, const FString Gender);
+	void AddTeammate(const FString& LastName, const FString& FirstName, const FString& Gender);
 
-	FText GetFormattedNameText(const int MaxChar = 15, const FString OverflowChar = FString("...")) const
-	{
-		return FText::FromString(GetFormattedName(MaxChar, OverflowChar));
-	};
+	int GetTeammateNum() const;
 
-	FText GetConcatFormattedNameText(const int MaxChar = 20, const FString OverflowChar = FString("...")) const
-	{
-		return FText::FromString(GetConcatFormattedName(MaxChar, OverflowChar));
-	};
-	FString GetFormattedName(const int MaxChar = 15, const FString OverflowChar = FString("...")) const;
-	FString GetConcatFormattedName(const int MaxChar = 20, const FString OverflowChar = FString("...")) const;
+	bool IsTeam() const;
 
-	static FString GetFormattedName(const FDTFluxParticipant& Participant, const int MaxChar = 15,
-	                                const FString OverflowChar = FString("..."))
-	{
-		return Participant.GetFormattedName(MaxChar, OverflowChar);
-	};
 
-	static FString GetConcatFormattedName(const FDTFluxParticipant& Participant, const int MaxChar = 15,
-	                                      const FString OverflowChar = FString("..."))
-	{
-		return Participant.GetConcatFormattedName(MaxChar, OverflowChar);
-	};
+	const TArray<FDTFluxPerson>& GetTeammate() const;
 
-	static FText GetFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar = 15,
-	                                  const FString OverflowChar = FString("..."))
-	{
-		return Participant.GetFormattedNameText();
-	};
+	FString GetFormattedName(const int MaxChar = 15, 
+	                        const FString& Separator = FString(". "),
+	                        const FString& OverflowChar = FString("...")) const;
 
-	static FText GetConcatFormattedNameText(const FDTFluxParticipant& Participant, const int MaxChar = 15,
-	                                        const FString OverflowChar = FString("..."))
-	{
-		return Participant.GetConcatFormattedNameText();
-	};
-	const TArray<FDTFluxPerson> GetTeammate() const { return Teammate; }
+	FString GetConcatFormattedName(const int MaxChar = 20, 
+	                              const FString& Separator = FString(". "),
+	                              const FString& OverflowChar = FString("..."),
+	                              const FString& BibSeparator = FString(". ")) const;
 
-private:
-	// --- Constructeur privé ---
-	explicit FDTFluxParticipant(const TSharedPtr<FJsonObject>& JsonObject);
+	FText GetFormattedNameText(const int MaxChar = 15, 
+	                          const FString& Separator = FString(". "),
+	                          const FString& OverflowChar = FString("...")) const;
+
+	FText GetConcatFormattedNameText(const int MaxChar = 20, 
+	                                const FString& Separator = FString(". "),
+	                                const FString& OverflowChar = FString("..."),
+	                                const FString& BibSeparator = FString(". ")) const;
+
+	static FString GetFormattedName(const FDTFluxParticipant& Participant, 
+	                               const int MaxChar = 15,
+	                               const FString& Separator = FString(". "),
+	                               const FString& OverflowChar = FString("..."));
+
+	static FString GetConcatFormattedName(const FDTFluxParticipant& Participant, 
+	                                     const int MaxChar = 15,
+	                                     const FString& Separator = FString(". "),
+	                                     const FString& OverflowChar = FString("..."),
+	                                     const FString& BibSeparator = FString(". "));
+
+	static FText GetFormattedNameText(const FDTFluxParticipant& Participant, 
+	                                 const int MaxChar = 15,
+	                                 const FString& Separator = FString(". "),
+	                                 const FString& OverflowChar = FString("..."));
+
+	static FText GetConcatFormattedNameText(const FDTFluxParticipant& Participant, 
+	                                       const int MaxChar = 15,
+	                                       const FString& Separator = FString(". "),
+	                                       const FString& OverflowChar = FString("..."),
+	                                       const FString& BibSeparator = FString(". "));
+
+	static FDTFluxParticipant CreateFromJson(const TSharedPtr<FJsonObject>& JsonObject);
 
 protected:
-	UPROPERTY(Category="DTFlux|model", VisibleAnywhere)
+	UPROPERTY(Category="DTFlux|Model", VisibleAnywhere)
 	TArray<FDTFluxPerson> Teammate;
-	// Méthode publique pour construire à partir d'un JSON (utilisée par la factory)
-	static FDTFluxParticipant CreateFromJson(const TSharedPtr<FJsonObject>& JsonObject);
-	int GetTeammateNum() const;
-	bool IsTeam() const;
+
+private:
+	explicit FDTFluxParticipant(const TSharedPtr<FJsonObject>& JsonObject);
 };
 
 
-/**
- *	@struct FDTFluxTeamListDefinition
- *	Struct representing the Participant List definition
- * Used to exchange data between Objects in the system
- */
 USTRUCT(BlueprintType)
 struct DTFLUXCORE_API FDTFluxTeamListDefinition
 {
@@ -212,27 +199,22 @@ struct DTFLUXCORE_API FDTFluxTeamListDefinition
 
 public:
 	UPROPERTY()
-	// ReSharper disable once IdentifierTypo
 	TArray<FDTFluxParticipant> Participants;
 };
 
+
 USTRUCT(BlueprintType)
-struct FDTFluxTeamStatusUpdate
+struct DTFLUXCORE_API FDTFluxTeamStatusUpdate
 {
 	GENERATED_BODY()
 
 public:
 	FDTFluxTeamStatusUpdate() = default;
-
-	FDTFluxTeamStatusUpdate(const int InBib, const int InStatus)
-		: Bib(InBib)
-		  , Status(static_cast<EDTFluxParticipantStatusType>(InStatus))
-	{
-	};
-
+	FDTFluxTeamStatusUpdate(const int InBib, const int InStatus);
 
 	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Participant")
 	int Bib = -1;
+
 	UPROPERTY(BlueprintReadWrite, Category="DTFlux|Participant")
 	EDTFluxParticipantStatusType Status = EDTFluxParticipantStatusType::Unknown;
 };

Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp

@@ -10,6 +10,7 @@
 #include "FileHelpers.h"
 #include "Assets/DTFluxModelAsset.h"
 #include "Subsystems/DTFluxNetworkSubsystem.h"
+#include "Struct/DTFluxServerResponseStruct.h"
 #include "UObject/SavePackage.h"
 
 void UDTFluxCoreSubsystem::Initialize(FSubsystemCollectionBase& Collection)
@@ -32,7 +33,7 @@ void UDTFluxCoreSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 	{
 		RegisterDelegates();
 	}
-	PursuitManager = NewObject<UDTFluxPursuitManager>();
+	PursuitManager = NewObject<UDTFluxPursuitManager>(this);
 }
 
 void UDTFluxCoreSubsystem::Deinitialize()
@@ -52,6 +53,89 @@ void UDTFluxCoreSubsystem::SaveDataStorage()
 	}
 }
 
+void UDTFluxCoreSubsystem::ProcessTrackedResponse(FDTFluxServerResponse& InResponse)
+{
+	switch (InResponse.GetResponseType())
+	{
+	case EDTFluxApiDataType::ContestRanking:
+		{
+			FDTFluxContestRankings Rankings;
+			if (InResponse.ParseContestRanking(Rankings))
+			{
+				OnContestRankings.Broadcast(Rankings.ContestId, Rankings);
+				ProcessContestRanking(Rankings);
+				UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestRanking added for Contest %s"),
+				       *Rankings.ContestName);
+			}
+			else
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Unable to parse ContestRanking"));
+			}
+			break;
+		}
+	case EDTFluxApiDataType::StageRanking:
+		{
+			FDTFluxStageRankings Rankings;
+			if (InResponse.ParseStageRanking(Rankings))
+			{
+				FDTFluxStageKey StageKey(Rankings.ContestId, Rankings.StageId);
+				OnStageRankings.Broadcast(StageKey, Rankings);
+				ProcessStageRanking(Rankings);
+				UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestRanking added for Stage %i of Contest %i"),
+				       Rankings.StageId, Rankings.ContestId);
+			}
+			else
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Unable to parse StageRanking"));
+			}
+			break;
+		}
+	case EDTFluxApiDataType::SplitRanking:
+		{
+			FDTFluxSplitRankings Rankings;
+			if (InResponse.ParseSplitRanking(Rankings))
+			{
+				FDTFluxSplitKey SplitKey(Rankings.ContestId, Rankings.StageId, Rankings.SplitId);
+				OnSplitRankings.Broadcast(SplitKey, Rankings);
+				ProcessSplitRanking(Rankings);
+				UE_LOG(logDTFluxCoreSubsystem, Warning,
+				       TEXT("ContestRanking added for Split %i of Stage %i of Contest %i"),
+				       Rankings.SplitId, Rankings.StageId, Rankings.ContestId);
+			}
+			else
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Unable to parse SplitRanking"));
+			}
+			break;
+		}
+	case EDTFluxApiDataType::RaceData:
+		{
+			FDTFluxRaceData RaceData;
+			if (InResponse.ParseRaceData(RaceData))
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("RaceDataDefinition added for Contest %s"),
+				       *RaceData.Datas[0].Name);
+				ProcessRaceData(RaceData);
+			}
+			break;
+		}
+	case EDTFluxApiDataType::TeamList:
+		{
+			FDTFluxTeamListDefinition TeamList;
+			if (InResponse.ParseTeamList(TeamList))
+			{
+				ProcessTeamList(TeamList);
+				UE_LOG(logDTFluxCoreSubsystem, Log, TEXT("Process TeamList"))
+			}
+			break;
+		}
+	default:
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Unknown DataType %s"),
+		       *UEnum::GetValueAsString(InResponse.GetResponseType()));
+		break;
+	}
+}
+
 void UDTFluxCoreSubsystem::RegisterDelegates()
 {
 	if (NetworkSubsystem)
@@ -84,9 +168,6 @@ void UDTFluxCoreSubsystem::RegisterDelegates()
 			&UDTFluxCoreSubsystem::ProcessSplitRanking
 		);
 
-		// ⚠️ ATTENTION : Vous avez un doublon ici !
-		// NetworkSubsystem->OnReceivedTeamUpdate().BindUFunction(this, "ProcessTeamList");
-
 		NetworkSubsystem->OnReceivedTeamStatusUpdate().BindUObject(
 			this,
 			&UDTFluxCoreSubsystem::ProcessTeamStatusUpdate
@@ -151,21 +232,24 @@ void UDTFluxCoreSubsystem::ProcessContestRanking(const FDTFluxContestRankings& C
 	DataStorage->AddContestRanking(NewContestRankings);
 	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestRankings added for Contest %s"),
 	       *NewContestRankings.ContestName);
+	if (bShouldKeepRankings)
+	{
 		SaveDataStorage();
+	}
 }
 
 void UDTFluxCoreSubsystem::ProcessStageRanking(const FDTFluxStageRankings& StageRankings)
 {
 	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Received StageRankings with %i Items"), StageRankings.Rankings.Num());
 	DataStorage->UpdateOrCreateStageRanking(StageRankings);
-	SaveDataStorage();
+	if (bShouldKeepRankings) { SaveDataStorage(); }
 }
 
 void UDTFluxCoreSubsystem::ProcessSplitRanking(const FDTFluxSplitRankings& SplitRankings)
 {
 	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Received SplitRanking with %i Items"), SplitRankings.Rankings.Num());
 	DataStorage->UpdateOrCreateSplitRanking(SplitRankings);
-	SaveDataStorage();
+	if (bShouldKeepRankings) { SaveDataStorage(); }
 }
 
 void UDTFluxCoreSubsystem::ProcessTeamStatusUpdate(const FDTFluxTeamStatusUpdate& NewParticipantStatus)
@@ -196,7 +280,6 @@ void UDTFluxCoreSubsystem::ProcessSplitSensor(const FDTFluxSplitSensorInfo& Spli
 	       SplitSensorInfo.SplitId, SplitSensorInfo.Bib, *Participant.GetFormattedName());
 }
 
-
 void UDTFluxCoreSubsystem::SendRequest(const FString& Message)
 {
 	if (NetworkSubsystem)
@@ -205,64 +288,184 @@ void UDTFluxCoreSubsystem::SendRequest(const FString& Message)
 	}
 }
 
-void UDTFluxCoreSubsystem::SendTeamListRequest()
+bool UDTFluxCoreSubsystem::GetContestRankings(const int ContestId,
+                                              FDTFluxContestRankings& OutContestRankings)
+{
+	if (DataStorage->ContestRankings.Contains(ContestId))
+	{
+		OutContestRankings = DataStorage->ContestRankings[ContestId];
+		return true;
+	}
+	if (NetworkSubsystem)
+	{
+		TArray<int> TackedContestIds = {ContestId};
+		TrackedRequestContestRankings(TackedContestIds);
+		return false;
+	}
+	UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("NetworkSubsystem unavailable"));
+	return false;
+}
+
+bool UDTFluxCoreSubsystem::GetStageRankings(const int ContestId, const int StageId,
+                                            FDTFluxStageRankings& OutStageRankings)
+{
+	return GetStageRankingsWithKey(FDTFluxStageKey(ContestId, StageId), OutStageRankings);
+}
+
+bool UDTFluxCoreSubsystem::GetSplitRankings(const int ContestId, const int StageId, const int SplitId,
+                                            FDTFluxSplitRankings& OutSplitRankings)
+{
+	return GetSplitRankingsWithKey(FDTFluxSplitKey(ContestId, StageId, SplitId), OutSplitRankings);
+}
+
+bool UDTFluxCoreSubsystem::GetStageRankingsWithKey(const FDTFluxStageKey StageKey,
+                                                   FDTFluxStageRankings& OutStageRankings, const bool bShouldUseCached)
+{
+	//We Have the data
+	if (DataStorage->StageRankings.Contains(StageKey) && bShouldUseCached)
+	{
+		OutStageRankings = DataStorage->StageRankings[StageKey];
+		return true;
+	}
+	else
+	{
+		if (NetworkSubsystem)
+		{
+			TArray<FDTFluxStageKey> TackedStageKeys = {StageKey};
+			TrackedRequestStageRankings(TackedStageKeys);
+			OutStageRankings = FDTFluxStageRankings();
+			return false;
+		}
+		UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("NetworkSubsystem unavailable"))
+	}
+	return false;
+}
+
+bool UDTFluxCoreSubsystem::GetSplitRankingsWithKey(const FDTFluxSplitKey SplitKey,
+                                                   FDTFluxSplitRankings& OutSplitRankings, const bool bShouldUseCached)
+{
+	//We Have the data
+	if (DataStorage->SplitRankings.Contains(SplitKey) && bShouldUseCached)
+	{
+		OutSplitRankings = DataStorage->SplitRankings[SplitKey];
+		return true;
+	}
+	else
+	{
+		if (NetworkSubsystem)
+		{
+			TArray<FDTFluxSplitKey> TackedSplitKey = {SplitKey};
+			TrackedRequestSplitRankings(TackedSplitKey);
+			OutSplitRankings = FDTFluxSplitRankings();
+			return false;
+		}
+		UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("NetworkSubsystem unavailable"))
+		return false;
+	}
+}
+
+TArray<FGuid> UDTFluxCoreSubsystem::TrackedRequestContestRankings(const TArray<int> ForContests, bool bEnableCache)
 {
 	if (NetworkSubsystem)
 	{
-		NetworkSubsystem->SendRequest(EDTFluxRequestType::TeamList);
+		TArray<FGuid> RequestIds;
+		FOnDTFluxRequestSuccess OnSuccess = FOnDTFluxRequestSuccess::CreateLambda(
+			[this](const FDTFluxTrackedRequest& Request)
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Log, TEXT("ContestRanking Request %s %s Success"),
+				       *Request.RequestId.ToString(), *UEnum::GetValueAsString(Request.RequestType));
+				if (Request.ParsedResponse.IsSet())
+				{
+					ProcessTrackedResponse(*Request.ParsedResponse.GetValue());
 				}
+			});
+
+		FOnDTFluxRequestError OnError = FOnDTFluxRequestError::CreateLambda(
+			[this](const FDTFluxTrackedRequest& InReq, const FString& InError)
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Log, TEXT("ContestRanking Request [%s] Error %s"),
+				       *InReq.RequestId.ToString(), *InError);
+			});
+		// if Contest is not ended 
+		for (auto ContestId : ForContests)
+		{
+			FGuid ContestRequest = NetworkSubsystem->SendTrackedRequestWithCallbacks(EDTFluxApiDataType::ContestRanking,
+				ContestId, -1, -1, OnSuccess, OnError, bEnableCache);
+			RequestIds.Add(ContestRequest);
+		}
+		return RequestIds;
+	}
+	return TArray<FGuid>();
 }
 
-void UDTFluxCoreSubsystem::SendRaceDataRequest()
+TArray<FGuid> UDTFluxCoreSubsystem::TrackedRequestStageRankings(const TArray<FDTFluxStageKey> ForStages,
+                                                                bool bEnableCache)
 {
 	if (NetworkSubsystem)
 	{
-		NetworkSubsystem->SendRequest(EDTFluxRequestType::RaceData);
+		TArray<FGuid> RequestIds;
+		FOnDTFluxRequestSuccess OnSuccess = FOnDTFluxRequestSuccess::CreateLambda(
+			[this](const FDTFluxTrackedRequest& Request)
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Stage Request %s %s Success"),
+				       *Request.RequestId.ToString(), *UEnum::GetValueAsString(Request.RequestType));
+				if (Request.ParsedResponse.IsSet())
+				{
+					ProcessTrackedResponse(*Request.ParsedResponse.GetValue());
 				}
+			});
+
+		FOnDTFluxRequestError OnError = FOnDTFluxRequestError::CreateLambda(
+			[this](const FDTFluxTrackedRequest& InReq, const FString& InError)
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("StageRanking Request [%s] Error %s"),
+				       *InReq.RequestId.ToString(), *InError);
+			});
+		// if Contest is not ended 
+		for (auto StageKey : ForStages)
+		{
+			FGuid ContestRequest = NetworkSubsystem->SendTrackedRequestWithCallbacks(EDTFluxApiDataType::StageRanking,
+				StageKey.ContestId, StageKey.StageId, -1, OnSuccess, OnError, bEnableCache);
+			RequestIds.Add(ContestRequest);
+		}
+		return RequestIds;
+	}
+	return TArray<FGuid>();
 }
 
-void UDTFluxCoreSubsystem::SendContestRankingRequest(int InContestId)
+TArray<FGuid> UDTFluxCoreSubsystem::TrackedRequestSplitRankings(const TArray<FDTFluxSplitKey> ForSplits,
+                                                                bool bEnableCache)
 {
 	if (NetworkSubsystem)
 	{
-		NetworkSubsystem->SendRequest(EDTFluxRequestType::ContestRanking, InContestId);
-	}
-}
-
-void UDTFluxCoreSubsystem::SendStageRankingRequest(int InContestId, int InStageId, bool bShouldIncludeSplitRanking)
-{
-	// TODO Implement this
-}
-
-void UDTFluxCoreSubsystem::RequestAllStageRankingOfContest(int InContestId, int InStageId,
-                                                           bool bShouldIncludeSplitRanking)
-{
-	// TODO Implement this
-}
-
-void UDTFluxCoreSubsystem::SendSplitRankingRequest(int InContestId, int InStageId, int InSplitId)
-{
-	// TODO Implement this
-}
-
-void UDTFluxCoreSubsystem::RequestAllSplitRankingOfContest(int InContestId, int InStageId)
-{
-	// TODO Implement this
-}
-
-FDTFluxStageRankings UDTFluxCoreSubsystem::GetStageRankings(FDTFluxStageKey StageKey)
-{
-	if (DataStorage->StageRankings.Contains(StageKey))
+		TArray<FGuid> RequestIds;
+		FOnDTFluxRequestSuccess OnSuccess = FOnDTFluxRequestSuccess::CreateLambda(
+			[this](const FDTFluxTrackedRequest& Request)
 			{
-		return DataStorage->StageRankings[StageKey];
+				UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Stage Request %s %s Success"),
+				       *Request.RequestId.ToString(), *UEnum::GetValueAsString(Request.RequestType));
+				if (Request.ParsedResponse.IsSet())
+				{
+					ProcessTrackedResponse(*Request.ParsedResponse.GetValue());
 				}
-	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Cannot find StageRankings for key [%s]"), *StageKey.GetDisplayName());
-	return FDTFluxStageRankings();
-}
+			});
 
-void UDTFluxCoreSubsystem::RequestAllSplitRankingOfStage(int InContestId, int InStageId, int InSplitId)
-{
-	// TODO Implement this
+		FOnDTFluxRequestError OnError = FOnDTFluxRequestError::CreateLambda(
+			[this](const FDTFluxTrackedRequest& InReq, const FString& InError)
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("StageRanking Request [%s] Error %s"),
+				       *InReq.RequestId.ToString(), *InError);
+			});
+		// if Contest is not ended 
+		for (auto SplitKey : ForSplits)
+		{
+			FGuid ContestRequest = NetworkSubsystem->SendTrackedRequestWithCallbacks(EDTFluxApiDataType::SplitRanking,
+				SplitKey.ContestId, SplitKey.StageId, SplitKey.SplitId, OnSuccess, OnError, bEnableCache);
+			RequestIds.Add(ContestRequest);
+		}
+		return RequestIds;
+	}
+	return TArray<FGuid>();
 }
 
 const FDTFluxParticipant UDTFluxCoreSubsystem::GetParticipant(int InBib)
@@ -274,11 +477,6 @@ const FDTFluxParticipant UDTFluxCoreSubsystem::GetParticipant(int InBib)
 	return FDTFluxParticipant();
 }
 
-void UDTFluxCoreSubsystem::RefreshStorage()
-{
-	// TODO Implement this
-}
-
 TArray<int> UDTFluxCoreSubsystem::GetCurrentContestsId()
 {
 	return GetContestsIdForTime(FDateTime::Now());
@@ -289,7 +487,7 @@ TArray<FDTFluxContest> UDTFluxCoreSubsystem::GetCurrentContests()
 	return GetContestsForTime(FDateTime::Now());
 }
 
-TArray<int> UDTFluxCoreSubsystem::GetContestsIdForTime(const FDateTime Time)
+TArray<int> UDTFluxCoreSubsystem::GetContestsIdForTime(const FDateTime Time) const
 {
 	TArray<int> Contests;
 	for (const auto& Pair : DataStorage->Contests)
@@ -347,22 +545,3 @@ TArray<FDTFluxContest> UDTFluxCoreSubsystem::GetContests()
 	}
 	return TArray<FDTFluxContest>();
 }
-
-void UDTFluxCoreSubsystem::LaunchPursuitSequenceFor(const TArray<int> ContestIds)
-{
-	TArray<FDTFluxContest> Contests = TArray<FDTFluxContest>();
-	for (const auto& ContestId : ContestIds)
-	{
-		FDTFluxContest Contest;
-		GetContestForId(ContestId, Contest);
-		Contests.Add(Contest);
-		if (PursuitManager)
-		{
-			PursuitManager->LaunchPursuitSequenceFor(Contests);
-		}
-		else
-		{
-			UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("PursuitManager is null"));
-		}
-	}
-}

Source/DTFluxCoreSubsystem/Private/DTFluxPursuitManager.cpp

@@ -3,83 +3,212 @@
 
 #include "DTFluxPursuitManager.h"
 
+#include <ImportExport.h>
+
+#include "DTFluxCoreSubsystem.h"
 #include "DTFluxCoreSubsystemModule.h"
+#include "Dataflow/DataflowContextCache.h"
 
 UDTFluxPursuitManager::UDTFluxPursuitManager(const FObjectInitializer& ObjectInitializer):
 	Super(ObjectInitializer)
 {
 }
 
-// TODO : Add way to pass MaxSimultaneousPursuit and MassStartDelay
-// For now it's done in UPROPERTIES
-void UDTFluxPursuitManager::LaunchPursuitSequenceFor(const TArray<FDTFluxContest> InContests)
+void UDTFluxPursuitManager::InitPursuit(const TArray<int> InContestIds, const int MaxSimultaneousPursuit)
 {
-	if (InitSubSystems())
+	CoreSubsystem = Cast<UDTFluxCoreSubsystem>(GetOuter());
+	if (!CoreSubsystem)
 	{
-		for (const auto Contest : InContests)
+		UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("CoreSubsystem is not Available !!!"));
+		return;
+	}
+	AllRankings.Reset();
+	for (const auto& ContestId : InContestIds)
 	{
-			FRequestData RequestData;
-			RequestData.ContestId = Contest.ContestId;
-			uint8 StageId = Contest.Stages.Last().StageId;
-			FGuid Guid = NetworkSubsystem->SendTrackedRequestWithCallback(EDTFluxApiDataType::StageRanking,
-			                                                              Contest.ContestId, StageId, -1,
-			                                                              FOnDTFluxTrackedRequestResponse::CreateUObject(
-				                                                              this,
-				                                                              &UDTFluxPursuitManager::OnRequestResponse),
-			                                                              FOnDTFluxTrackedRequestTimeout::CreateUObject(
-				                                                              this,
-				                                                              &UDTFluxPursuitManager::OnRequestTimeoutResponse),
-			                                                              FOnDTFluxRequestResponseError::CreateUObject(
-				                                                              this,
-				                                                              &UDTFluxPursuitManager::OnRequestError));
-
-			RequestData.RequestIds.Add(Guid);
-			PendingRequestData.Add(RequestData);
+		FDTFluxContest Contest;
+		if (CoreSubsystem->GetContestForId(ContestId, Contest))
+		{
+			BindRankings();
+			FDTFluxStageKey StageKey = FDTFluxStageKey(ContestId, Contest.GetLastStageId());
+			FDTFluxStageRankings TempStageRankings;
+			//Obtenir les ranking Frais.
+			CoreSubsystem->GetStageRankingsWithKey(StageKey, TempStageRankings, false);
+			PendingStageRanking.Add(StageKey, false);
 		}
 	}
 }
 
-void UDTFluxPursuitManager::OnRequestResponse(const FGuid& RequestId, FDTFluxServerResponse& Response)
+void UDTFluxPursuitManager::SetPursuitInfoIsMassStart(FDTFluxPursuitGroup NextFocusGroup)
 {
-	UE_LOG(logDTFluxCoreSubsystem, Log,
-	       TEXT("UDTFluxPursuitManager::OnRequestResponse() Received Ranking For Stage %i"), Response.StageID)
-	UE_LOG(logDTFluxCoreSubsystem, Log, TEXT("Response is %s"), *UEnum::GetValueAsString(Response.GetResponseType()))
-	//check if request
-	if (Response.GetResponseType() == EDTFluxApiDataType::StageRanking)
+	for (auto& Pursuit : NextFocusGroup.PursuitGroup)
 	{
-		FDTFluxStageRankings Rankings;
-		FRequestData FoundData;
-		if (Response.ParseStageRankingResponse(Rankings))
-		{
-			for (auto& PendingReq : PendingRequestData)
-			{
-				// Check for a matching PendingReq
-				if (PendingReq.IsWaitingFor(RequestId, Rankings))
-				{
-					FoundData = PendingReq;
-					// A request Is Terminated
-					UE_LOG(logDTFluxCoreSubsystem, Log,
-					       TEXT("UDTFluxPursuitManager::OnRequestResponse() Ranking for Stage %i is complete"),
-					       Response.StageID)
-					break;
-				}
-			}
-			if (InitPursuit(FoundData))
-			{
-				OnPursuitSequenceReady.Broadcast(NextFocusPursuits, NextFocusPursuits, bFocusIsTruncate);
-			}
-		}
+		Pursuit.bIsMassStart = Pursuit.StartTime >= MassStartTime;
 	}
 }
 
-void UDTFluxPursuitManager::OnRequestTimeoutResponse(const FGuid& RequestId, const FString& TimeoutMessage)
+void UDTFluxPursuitManager::DebugFocusNext(const TArray<FDTFluxPursuitInfo>& OutPursuitFocusNext)
 {
-	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Request Timeout [%s]"), *TimeoutMessage);
+	FString FocusBibs;
+	for (const auto& Pursuit : OutPursuitFocusNext)
+	{
+		FocusBibs += FString::Printf(TEXT("%d "), Pursuit.Bib);
+	}
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Focus Bibs: %s"), *FocusBibs);
 }
 
-void UDTFluxPursuitManager::OnRequestError(const FGuid& RequestId, const FString& ErrorMessage)
+void UDTFluxPursuitManager::DebugOutPoursuitNext(const TArray<FDTFluxPursuitInfo>& OutPursuitNext)
 {
-	UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Request Error [%s]"), *ErrorMessage);
+	FString NextBibs;
+	for (int32 i = 0; i < OutPursuitNext.Num(); i++)
+	{
+		NextBibs += FString::Printf(TEXT("%d "), OutPursuitNext[i].Bib);
+	}
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Next Bibs: %s"), *NextBibs);
+}
+
+void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFocusNext,
+                                       TArray<FDTFluxPursuitInfo>& OutPursuitNext, bool& BIsFocusTruncate,
+                                       const int MaxSimultaneousPursuit)
+{
+	FDateTime MetricsStartFunction = FDateTime::UtcNow();
+	FDateTime CurrentTime = FDateTime::Now();
+
+	// UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("=== GetPursuit CALLED ==="));
+	// UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("MaxSimultaneousPursuit: %d"), MaxSimultaneousPursuit);
+	// UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Available groups: %d"), GroupedPursuit.Num());
+
+	// BAd Parameter
+	if (MaxSimultaneousPursuit <= 0)
+	{
+		UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Invalid MaxSimultaneousPursuit: %d"), MaxSimultaneousPursuit);
+		OutPursuitFocusNext.Reset();
+		OutPursuitNext.Reset();
+		BIsFocusTruncate = false;
+		return;
+	}
+	if (bIsSequenceDone || GroupedPursuit.IsEmpty())
+	{
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("No groups available or sequence completed"));
+		OutPursuitFocusNext.Reset();
+		OutPursuitNext.Reset();
+		BIsFocusTruncate = false;
+		return;
+	}
+	for (int32 i = GroupedPursuit.Num() - 1; i >= 0; i--) // Parcours inverse pour éviter les problèmes d'index
+	{
+		const FDTFluxPursuitGroup& Group = GroupedPursuit[i];
+		UE_LOG(logDTFluxCoreSubsystem, Log, TEXT("Group.StartTimeGlobal(%s)  < CurrentTime(%s) "),
+		       *Group.StartTimeGlobal.ToString(), *CurrentTime.ToString())
+		// Vérifier si le StartTime du groupe est déjà passé
+		if (Group.StartTimeGlobal < CurrentTime)
+		{
+			UE_LOG(logDTFluxCoreSubsystem, Warning,
+			       TEXT("Removing expired group: StartTime=%s (Current=%s), Participants=%d"),
+			       *Group.StartTimeGlobal.ToString(),
+			       *CurrentTime.ToString(),
+			       Group.PursuitGroup.Num());
+
+			GroupedPursuit.RemoveAt(i);
+		}
+	}
+
+
+	OutPursuitFocusNext.Reset();
+	OutPursuitNext.Reset();
+
+	// === VÉRIFICATION CRITIQUE : S'assurer qu'il reste des groupes après suppression ===
+	if (GroupedPursuit.IsEmpty())
+	{
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("All groups were expired and removed - no groups available"));
+		OutPursuitFocusNext.Reset();
+		OutPursuitNext.Reset();
+		BIsFocusTruncate = false;
+		bIsSequenceDone = true; // Marquer la séquence comme terminée
+		return;
+	}
+
+	FDTFluxPursuitGroup FocusGroup = GroupedPursuit[0];
+	GroupedPursuit.RemoveAt(0);
+
+	SetPursuitInfoIsMassStart(FocusGroup);
+	OutPursuitFocusNext = FocusGroup.PursuitGroup;
+	BIsFocusTruncate = FocusGroup.PursuitGroup.Num() > 1;
+
+	UE_LOG(logDTFluxCoreSubsystem, Warning,
+	       TEXT("Focus Group: StartTime=%s, Participants=%d"),
+	       *FocusGroup.StartTimeGlobal.ToString(),
+	       FocusGroup.PursuitGroup.Num());
+
+	// === ÉTAPE 2: NEXT = GROUPES SUIVANTS (SANS les supprimer) ===
+	int32 TargetNextCount = MaxSimultaneousPursuit - 1; // -1 pour le focus
+	int32 AddedNextCount = 0;
+
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Target Next Count: %d"), TargetNextCount);
+
+	for (int32 GroupIndex = 0;
+	     GroupIndex < GroupedPursuit.Num() && AddedNextCount < TargetNextCount;
+	     GroupIndex++)
+	{
+		FDTFluxPursuitGroup& NextGroup = GroupedPursuit[GroupIndex]; // Référence (pour SetPursuitInfoIsMassStart)
+
+		if (NextGroup.PursuitGroup.Num() == 0)
+		{
+			continue; // Groupe vide
+		}
+
+		int32 AvailableInGroup = NextGroup.PursuitGroup.Num();
+		int32 NeededFromGroup = FMath::Min(TargetNextCount - AddedNextCount, AvailableInGroup);
+
+		UE_LOG(logDTFluxCoreSubsystem, Warning,
+		       TEXT("Processing Next Group %d: StartTime=%s, Available=%d, Taking=%d"),
+		       GroupIndex,
+		       *NextGroup.StartTimeGlobal.ToString(),
+		       AvailableInGroup,
+		       NeededFromGroup);
+
+		for (int32 ParticipantIndex = 0; ParticipantIndex < NeededFromGroup; ParticipantIndex++)
+		{
+			FDTFluxPursuitInfo NextParticipant = NextGroup.PursuitGroup[ParticipantIndex]; // Copie
+
+			// Appliquer MassStart
+			NextParticipant.bIsMassStart = NextParticipant.StartTime >= MassStartTime;
+
+			OutPursuitNext.Add(NextParticipant);
+			AddedNextCount++;
+
+			UE_LOG(logDTFluxCoreSubsystem, VeryVerbose,
+			       TEXT("Added to Next: Bib %d from Group %d"),
+			       NextParticipant.Bib, GroupIndex);
+		}
+	}
+
+	// === LOGS DE RÉSUMÉ ===
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("=== PURSUIT RESULTS ==="));
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Focus: %d participants"), OutPursuitFocusNext.Num());
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Next: %d participants"), OutPursuitNext.Num());
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Remaining groups for future: %d"), GroupedPursuit.Num());
+
+	if (OutPursuitFocusNext.Num() > 0)
+	{
+		DebugFocusNext(OutPursuitFocusNext);
+	}
+
+	// Log détaillé des Next (limité pour éviter spam)
+	if (OutPursuitNext.Num() > 0)
+	{
+		DebugOutPoursuitNext(OutPursuitNext);
+	}
+
+	// Vérifier si la séquence est terminée
+	if (GroupedPursuit.IsEmpty())
+	{
+		bIsSequenceDone = true;
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Pursuit sequence will be completed after this round"));
+	}
+	FTimespan Duration = FDateTime::UtcNow() - MetricsStartFunction;
+
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Metrics Time Out: %d fraction seconds"),
+	       Duration.GetDuration().GetFractionMicro());
 }
 
 bool UDTFluxPursuitManager::InitSubSystems()
@@ -92,22 +221,64 @@ bool UDTFluxPursuitManager::InitSubSystems()
 	return NetworkSubsystem != nullptr;
 }
 
-bool UDTFluxPursuitManager::InitPursuit(FRequestData Data)
+bool UDTFluxPursuitManager::BindRankings()
 {
-	//Clean Data
-	NextFocusPursuits.Empty();
-	NextPursuits.Empty();
-	PursuitGrouped.Empty();
-	TArray<FDTFluxDetailedRankingItem> AllRankings;
+	if (CoreSubsystem)
+	{
+		if (!bIsRankingBounded)
+		{
+			CoreSubsystem->OnStageRankings.AddDynamic(this, &UDTFluxPursuitManager::OnRankingsReceived);
+			bIsRankingBounded = true;
+		}
+		return bIsRankingBounded;
+	}
+	UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("CoreSubsystem is not Available !!!"));
+	return bIsRankingBounded = false;
+}
+
+void UDTFluxPursuitManager::UnbindRankings()
+{
+	if (CoreSubsystem)
+	{
+		if (bIsRankingBounded)
+		{
+			CoreSubsystem->OnStageRankings.RemoveDynamic(this, &UDTFluxPursuitManager::OnRankingsReceived);
+			bIsRankingBounded = false;
+			return;
+		}
+	}
+	bIsRankingBounded = false;
+	UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("CoreSubsystem is not Available !!!"));
+}
+
+void UDTFluxPursuitManager::OnRankingsReceived(const FDTFluxStageKey NewStageKey,
+                                               const FDTFluxStageRankings NewStageRankings)
+{
+	if (PendingStageRanking.Contains(NewStageKey))
+	{
+		PendingStageRanking.Remove(NewStageKey);
+		AllRankings.Add(NewStageRankings);
+		if (PendingStageRanking.IsEmpty())
+		{
+			//everything is ready to go compute and start
+			UnbindRankings();
+			LaunchPursuitSequence();
+		}
+	}
+}
+
+bool UDTFluxPursuitManager::LaunchPursuitSequence()
+{
+	GroupedPursuit.Empty();
 	TArray<FDTFluxPursuitInfo> AllPursuits;
 	TMap<FDateTime, FDTFluxPursuitGroup> TempGroups;
-
+	bIsSequenceDone = false;
 	// Full the Array Of Rankings
-	for (auto& KeyPair : Data.StageRankings)
+	for (auto& Ranking : AllRankings)
 	{
-		for (auto StageRanking : KeyPair.Value.Rankings)
+		for (auto StageRanking : Ranking.Rankings)
 		{
-			int ContestId = KeyPair.Value.ContestId;
+			int ContestId = Ranking.ContestId;
 			FDTFluxPursuitInfo PursuitInfo;
 			PursuitInfo.StartTime = StageRanking.StartTime;
 			PursuitInfo.Bib = StageRanking.Bib;
@@ -115,38 +286,67 @@ bool UDTFluxPursuitManager::InitPursuit(FRequestData Data)
 			AllPursuits.Add(PursuitInfo);
 		}
 	}
-	// Sort Rankings
-	// AllPursuits.Sort([](const FDTFluxPursuitInfo& A, const FDTFluxPursuitInfo& B) {
-	// 	return A.StartTime < B.StartTime;
-	// });
-
+	UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("AllPursuits.Num() = %i"), AllPursuits.Num());
 	for (auto& Pursuit : AllPursuits)
 	{
 		if (TempGroups.Contains(Pursuit.StartTime))
 		{
-			TempGroups[Pursuit.StartTime].PursuitGroup.Add(Pursuit);
+			FDTFluxPursuitGroup& Group = TempGroups[Pursuit.StartTime];
+			Group.PursuitGroup.Add(Pursuit);
+			UE_LOG(logDTFluxCoreSubsystem, Warning,
+			       TEXT("Adding [%i] To PursuitGroup starting At %s, PursuitGroup.Num() %i"),
+			       Pursuit.Bib, *Pursuit.StartTime.ToString(), Group.PursuitGroup.Num());
 		}
 		else
 		{
-			FDTFluxPursuitGroup Group;
-			Group.StartTimeGlobal = Pursuit.StartTime;
-			Group.PursuitGroup.Add(Pursuit);
-			TempGroups.Add(Pursuit.StartTime, Group);
+			FDTFluxPursuitGroup NewGroup;
+			UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("New Group starting At %s, Adding Bib [%i]"),
+			       *Pursuit.StartTime.ToString(), Pursuit.Bib);
+			NewGroup.StartTimeGlobal = Pursuit.StartTime;
+			NewGroup.PursuitGroup.Add(Pursuit);
+			TempGroups.Add(Pursuit.StartTime, NewGroup);
+			for (const auto& Group : TempGroups)
+			{
+				UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Group.StartTime = %s, Group.PursuitGroup.Num() = %i"),
+				       *Group.Key.ToString(), Group.Value.PursuitGroup.Num());
+			}
 		}
 	}
 	TempGroups.KeySort([](const FDateTime& A, const FDateTime& B)
 	{
 		return A < B;
 	});
-	PursuitGrouped.Reserve(TempGroups.Num());
+	TMap<FDateTime, int> StartTimeFrequency;
+	int32 MaxFrequency = 0;
+	GroupedPursuit.Reserve(TempGroups.Num());
+	// parcours du TMap
 	for (const auto& Pair : TempGroups)
 	{
-		PursuitGrouped.Add(Pair.Value);
+		if (Pair.Value.StartTimeGlobal != FDateTime::MinValue() && Pair.Value.StartTimeGlobal != FDateTime::MaxValue())
+		{
+			// récuperation de la ref de la valeur actuel de la fréquence dans la TMap Freq
+			int& CurrentFreq = StartTimeFrequency.FindOrAdd(Pair.Value.StartTimeGlobal, 0);
+			CurrentFreq = Pair.Value.PursuitGroup.Num();
+			if (CurrentFreq > MaxFrequency)
+			{
+				MaxFrequency = CurrentFreq;
+				MassStartTime = Pair.Value.StartTimeGlobal;
+			}
+		}
+		GroupedPursuit.Add(Pair.Value);
 	}
 
-	PursuitGrouped.Sort([](const FDTFluxPursuitGroup& A, const FDTFluxPursuitGroup& B)
+	GroupedPursuit.Sort([](const FDTFluxPursuitGroup& A, const FDTFluxPursuitGroup& B)
 	{
 		return A.StartTimeGlobal < B.StartTimeGlobal;
 	});
+
+	TArray<FDTFluxPursuitInfo> FocusPursuits;
+	TArray<FDTFluxPursuitInfo> NextPursuits;
+	bool bIsFocusTruncate = false;
+
+	GetPursuit(FocusPursuits, NextPursuits, bIsFocusTruncate);
+	FPursuitStarterData PursuitData = FPursuitStarterData(FocusPursuits, NextPursuits, MassStartTime, bIsFocusTruncate);
+	OnPursuitSequenceReady.Broadcast(PursuitData);
 	return true;
 }

Source/DTFluxCoreSubsystem/Public/DTFluxCoreSubsystem.h

@@ -1,7 +1,10 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "DTFluxCoreSubsystemModule.h"
+#include "Assets/DTFluxModelAsset.h"
 #include "Containers/Deque.h"
+#include "Types/Struct/FDTFluxPursuitInfo.h"
 #include "Subsystems/EngineSubsystem.h"
 #include "Types/Struct/DTFluxRaceDataStructs.h"
 #include "Types/Struct/DTFluxTeamListStruct.h"
@@ -14,27 +17,32 @@ class UDTFluxNetworkSubsystem;
 /** Forward Decl */
 class UDTFluxModelAsset;
 class UDTFluxPursuitManager;
+struct FDTFluxServerResponse;
+
 
 /**
  * 
  */
-UCLASS()
+UCLASS(BlueprintType, meta=(DisplayName="DTFlux Core Subsystem"))
 class DTFLUXCORESUBSYSTEM_API UDTFluxCoreSubsystem : public UEngineSubsystem
 {
 	GENERATED_BODY()
 
 public:
-	DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnSplitRankings, FDTFluxSplitRankings&, SplitRankings);
+	DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnSplitRankings, FDTFluxSplitKey, SplitKey, FDTFluxSplitRankings,
+	                                             SplitRankings);
 
 	UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
 	FOnSplitRankings OnSplitRankings;
 
-	DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnStageRankings, FDTFluxStageRankings&, StageRankings);
+	DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnStageRankings, FDTFluxStageKey, StageKey, FDTFluxStageRankings,
+	                                             StageRankings);
 
 	UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
 	FOnStageRankings OnStageRankings;
 
-	DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnContestRankings, FDTFluxContestRankings&, ContestRankings);
+	DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnContestRankings, const int, ContestId, FDTFluxContestRankings,
+	                                             ContestRankings);
 
 	UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
 	FOnContestRankings OnContestRankings;
@@ -43,62 +51,58 @@ public:
 
 	UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
 	FOnTeamList OnTeamList;
-
 	DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnTeamStatusUpdate, FDTFluxParticipant, TeamUpdated);
 
 	UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
 	FOnTeamStatusUpdate OnTeamStatusUpdate;
 
-	DECLARE_DELEGATE_TwoParams(FOnRequestedStageRankings, const FDTFluxStageKey&, const FDTFluxContestRankings&);
-	FOnRequestedStageRankings OnRequestedStageRankings;
-	//
-	// DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnTeamUpdate, FDateTime, ReceivedAt, FDTFluxParticipant, TeamUpdatedList);
-	// UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
-	// FOnTeamUpdate OnTeamUpdate;
-
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Core Subsystem")
+	UDTFluxPursuitManager* PursuitManager = nullptr;
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void SendTeamListRequest();
+	bool GetContestRankings(const int ContestId, FDTFluxContestRankings& OutContestRankings);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void SendRaceDataRequest();
+	bool GetStageRankings(const int ContestId, const int StageId, FDTFluxStageRankings& OutStageRankings);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void SendContestRankingRequest(int InContestId);
+	bool GetSplitRankings(const int ContestId, const int StageId, const int SplitId,
+	                      FDTFluxSplitRankings& OutSplitRankings);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void SendStageRankingRequest(int InContestId, int InStageId, bool bShouldIncludeSplitRanking = true);
+	bool GetStageRankingsWithKey(const FDTFluxStageKey StageKey, FDTFluxStageRankings& OutStageRankings,
+	                             const bool bShouldUseCached = true);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void RequestAllStageRankingOfContest(int InContestId, int InStageId, bool bShouldIncludeSplitRanking = true);
+	bool GetSplitRankingsWithKey(const FDTFluxSplitKey SplitKey, FDTFluxSplitRankings& OutSplitRankings,
+	                             const bool bShouldUseCached = true);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void SendSplitRankingRequest(int InContestId, int InStageId, int InSplitId);
+	TArray<FGuid> TrackedRequestContestRankings(const TArray<int> ForContests, bool bEnableCache = true);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void RequestAllSplitRankingOfContest(int InContestId, int InStageId);
+	TArray<FGuid> TrackedRequestStageRankings(const TArray<FDTFluxStageKey> ForStages, bool bEnableCache = true);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	FDTFluxStageRankings GetStageRankings(FDTFluxStageKey StageKey);
+	TArray<FGuid> TrackedRequestSplitRankings(const TArray<FDTFluxSplitKey> ForSplits, bool bEnableCache = true);
 
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void RequestAllSplitRankingOfStage(int InContestId, int InStageId, int InSplitId);
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
 	const FDTFluxParticipant GetParticipant(int InBib);
 
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void RefreshStorage();
+	//TODO : this must be a ProjectSetting
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Core Subsystem")
+	bool bShouldKeepRankings = true;
 
 	UFUNCTION()
 	TArray<int> GetCurrentContestsId();
 	UFUNCTION()
 	TArray<FDTFluxContest> GetCurrentContests();
 	UFUNCTION()
-	TArray<int> GetContestsIdForTime(const FDateTime Time);
-	UFUNCTION()
+	TArray<int> GetContestsIdForTime(const FDateTime Time) const;
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
 	bool GetContestForId(const int Id, FDTFluxContest& OutContest);
-	UFUNCTION()
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
 	TArray<FDTFluxContest> GetContestsForTime(const FDateTime Time);
 
 	UFUNCTION()
@@ -106,24 +110,99 @@ public:
 	UFUNCTION()
 	TArray<FDTFluxContest> GetContests();
 
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	void GetContest(const int ContestId, FDTFluxContest& OutContest)
+	{
+		OutContest = FDTFluxContest();
+		if (GetContestForId(ContestId, OutContest))
+		{
+			return;
+		}
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d not found in ContestDefinition"), ContestId)
+	}
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
-	void LaunchPursuitSequenceFor(const TArray<int> ContestIds);
+	bool GetStageDefinition(const FDTFluxStageKey StageKey, FDTFluxStage& OutStageDefinition)
+	{
+		int ContestId = StageKey.ContestId;
+		int StageId = StageKey.StageId;
+		FDTFluxContest ContestDefinition;
+		if (GetContestForId(ContestId, ContestDefinition))
+		{
+			for (auto& Stage : ContestDefinition.Stages)
+			{
+				if (Stage.StageId == StageId)
+				{
+					OutStageDefinition = Stage;
+					return true;
+				}
+			}
+		}
+		OutStageDefinition = FDTFluxStage();
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d, StageId %d not found in ContestDefinition"),
+		       ContestId, StageId)
+		return false;
+	}
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	bool GetSplitDefinition(const FDTFluxSplitKey SplitKey, FDTFluxSplit& OutSplitDefinition)
+	{
+		int ContestId = SplitKey.ContestId;
+		int SplitId = SplitKey.SplitId;
+		FDTFluxContest ContestDefinition;
+		if (GetContestForId(ContestId, ContestDefinition))
+		{
+			for (auto& Split : ContestDefinition.Splits)
+			{
+				if (Split.SplitId == SplitId)
+				{
+					OutSplitDefinition = Split;
+					return true;
+				}
+			}
+		}
+		OutSplitDefinition = FDTFluxSplit();
+		UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d, SplitId %d not found in ContestDefinition"),
+		       ContestId, SplitId);
+		return false;
+	}
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	void GetStage(const int ContestId, const int StageId, FDTFluxStage& OutStageDefinition)
+	{
+		if (GetStageDefinition(FDTFluxStageKey(ContestId, StageId),
+		                       OutStageDefinition))
+		{
+			return;
+		}
+		OutStageDefinition = FDTFluxStage();
+	}
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	void GetSplit(const int ContestId, const int StageId, const int SplitId, FDTFluxSplit& OutSplitDefinition)
+	{
+		if (GetSplitDefinition(FDTFluxSplitKey(ContestId, StageId, SplitId),
+		                       OutSplitDefinition))
+		{
+			return;
+		}
+		OutSplitDefinition = FDTFluxSplit();
+	}
 
 protected:
 	// ~Subsystem Interface
 	virtual void Initialize(FSubsystemCollectionBase& Collection) override;
 	virtual void Deinitialize() override;
 	// ~Subsystem Interface
-
-	UPROPERTY()
-	UDTFluxPursuitManager* PursuitManager = nullptr;
-
 	UFUNCTION()
 	void SaveDataStorage();
+	UFUNCTION()
+	void ProcessTrackedResponse(FDTFluxServerResponse& InResponse);
 
 private:
 	UDTFluxNetworkSubsystem* NetworkSubsystem = nullptr;
+	UPROPERTY()
+	UDTFluxModelAsset* DataStorage = nullptr;
 
 	UFUNCTION()
 	void ProcessRaceData(const FDTFluxRaceData& RaceDataDefinition);
@@ -145,8 +224,4 @@ private:
 	void SendRequest(const FString& Message);
 	UFUNCTION()
 	void RegisterDelegates();
-
-
-	UPROPERTY()
-	UDTFluxModelAsset* DataStorage = nullptr;
 };

Source/DTFluxCoreSubsystem/Public/DTFluxPursuitManager.h

@@ -8,44 +8,33 @@
 #include "DTFluxPursuitManager.generated.h"
 
 
-USTRUCT()
-struct FRequestData
+class UDTFluxCoreSubsystem;
+
+
+USTRUCT(BlueprintType)
+struct FPursuitStarterData
 {
 	GENERATED_BODY()
 
-	UPROPERTY()
-	TArray<FGuid> RequestIds;
-	UPROPERTY()
-	TMap<FGuid, FDTFluxStageRankings> StageRankings;
-	UPROPERTY()
-	int ContestId;
+public:
+	FPursuitStarterData() = default;
 
-	UPROPERTY()
-	bool bIsReady = false;
-
-
-	FRequestData() = default;
-
-	FRequestData(const TArray<FGuid>& InRequestIds, const TMap<FGuid, FDTFluxStageRankings>& InStageRankings)
-		: RequestIds(InRequestIds), StageRankings(InStageRankings)
+	FPursuitStarterData(const TArray<FDTFluxPursuitInfo>& InPursuitFocusNext,
+	                    const TArray<FDTFluxPursuitInfo>& InPursuitNext, const FDateTime& InMassStartTime,
+	                    const bool InIsFocusTruncate)
+		: PursuitFocusNext(InPursuitFocusNext), PursuitNext(InPursuitNext), MassStartTime(InMassStartTime),
+		  bIsFocusTruncate(InIsFocusTruncate)
 	{
 	};
 
-	/**
-	 * 
-	 * @param RequestId 
-	 * @param InRankings 
-	 * @return True if all needed requests have responses
-	 */
-	bool IsWaitingFor(const FGuid& RequestId, const FDTFluxStageRankings& InRankings)
-	{
-		if (!StageRankings.Contains(RequestId))
-		{
-			StageRankings.Add(RequestId, InRankings);
-		}
-		bIsReady = StageRankings.Num() <= RequestIds.Num();
-		return bIsReady;
-	}
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Pursuit")
+	TArray<FDTFluxPursuitInfo> PursuitFocusNext = TArray<FDTFluxPursuitInfo>();
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Pursuit")
+	TArray<FDTFluxPursuitInfo> PursuitNext = TArray<FDTFluxPursuitInfo>();
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Pursuit")
+	FDateTime MassStartTime = FDateTime::MinValue();
+	UPROPERTY(BlueprintReadOnly, Category="DTFlux|Pursuit")
+	bool bIsFocusTruncate = false;
 };
 
 USTRUCT()
@@ -53,6 +42,7 @@ struct FDTFluxPursuitGroup
 {
 	GENERATED_BODY()
 
+
 	UPROPERTY()
 	TArray<FDTFluxPursuitInfo> PursuitGroup = TArray<FDTFluxPursuitInfo>();
 	UPROPERTY()
@@ -63,10 +53,6 @@ struct FDTFluxPursuitGroup
 	bool bIsFocus = false;
 };
 
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnPursuitSequenceReady, const TArray<FDTFluxPursuitInfo>,
-                                               NextFocusPursuits,
-                                               const TArray<FDTFluxPursuitInfo>, NextPursuit, bool, bIsTrtuncate);
-
 /**
  * 
  */
@@ -78,56 +64,66 @@ class DTFLUXCORESUBSYSTEM_API UDTFluxPursuitManager : public UObject
 public:
 	UDTFluxPursuitManager(const FObjectInitializer& ObjectInitializer);
 
-	UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
-	TArray<FDTFluxPursuitInfo> NextFocusPursuits;
 
-	UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
-	TArray<FDTFluxPursuitInfo> NextPursuits;
+	DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnPursuitSequenceReady, const FPursuitStarterData, PursuitData);
+
+	UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
+	FOnPursuitSequenceReady OnPursuitSequenceReady;
 
 	UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
 	bool bFocusIsTruncate = false;
-	//
-	// UPROPERTY()
-	// TArray<FDTFluxStage> TargetStages;
 
 	UPROPERTY()
-	int MaxSimultaneousPursuit = 7;
-	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="DTFlux|Pursuit",
-		meta=(ClampMin="1", ClampMax="60", UIMin="0", UIMax="60"))
+	int PursuitMaxSimultaneousPursuit = 7;
+
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="DTFlux|Pursuit")
 	int MassStartDelay = 10;
 
 	UPROPERTY()
-	TArray<FDTFluxPursuitGroup> PursuitGrouped;
+	FDateTime MassStartTime = FDateTime::MinValue();
+
+	UPROPERTY()
+	TArray<FDTFluxPursuitGroup> GroupedPursuit;
 
 	UPROPERTY()
 	int CurrentIndex = -1;
 
-	UPROPERTY(BlueprintCallable, Category="DTFlux|Pursuit")
-	FOnPursuitSequenceReady OnPursuitSequenceReady;
-
 
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Pursuit", meta=(Keywords="pursuit, launch, poursuite"))
-	void LaunchPursuitSequenceFor(const TArray<FDTFluxContest> InContests);
+	void InitPursuit(const TArray<int> InContestIds, const int MaxSimultaneousPursuit = 7);
 
-	UFUNCTION()
-	void OnRequestResponse(const FGuid& RequestId, FDTFluxServerResponse& Response);
-
-	UFUNCTION()
-	void OnRequestTimeoutResponse(const FGuid& RequestId, const FString& TimeoutMessage);
-
-	UFUNCTION()
-	void OnRequestError(const FGuid& RequestId, const FString& ErrorMessage);
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Pursuit", meta=(Keywords="pursuit, launch, poursuite"))
+	void GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFocusNext, TArray<FDTFluxPursuitInfo>& OutPursuitNext,
+	                bool& BIsFocusTruncate, const int MaxSimultaneousPursuit = 7);
 
 	UFUNCTION()
 	bool InitSubSystems();
 
-private:
-	TArray<FRequestData> PendingRequestData;
-
-public:
 	UFUNCTION()
-	bool InitPursuit(FRequestData Data);
+	bool BindRankings();
+
+	UFUNCTION()
+	void UnbindRankings();
+
+	UFUNCTION()
+	void OnRankingsReceived(const FDTFluxStageKey NewStageKey, const FDTFluxStageRankings NewStageRankings);
+
+
+	void DebugFocusNext(const TArray<FDTFluxPursuitInfo>& OutPursuitFocusNext);
+	void DebugOutPoursuitNext(const TArray<FDTFluxPursuitInfo>& OutPursuitNext);
 
 private:
+	TMap<FDTFluxStageKey, bool> PendingStageRanking;
+	TArray<FDTFluxStageRankings> AllRankings;
+	UDTFluxCoreSubsystem* CoreSubsystem = nullptr;
 	UDTFluxNetworkSubsystem* NetworkSubsystem = nullptr;
+
+	UPROPERTY()
+	bool bIsSequenceDone = true;
+	UPROPERTY()
+	bool bIsRankingBounded = false;
+	UFUNCTION()
+	void SetPursuitInfoIsMassStart(FDTFluxPursuitGroup NextFocusGroup);
+	UFUNCTION()
+	bool LaunchPursuitSequence();
 };

Source/DTFluxNetwork/Private/DTFluxAsyncParser.cpp

@@ -0,0 +1,318 @@
+#include "DTFluxAsyncParser.h"
+
+#include "DTFluxNetworkModule.h"
+#include "Struct/DTFluxServerResponseStruct.h"
+#include "Async/AsyncWork.h"
+
+// ================================================================================================
+// IMPLÉMENTATION DE LA TÂCHE DE PARSING
+// ================================================================================================
+
+DECLARE_STATS_GROUP(TEXT("DTFlux"), STATGROUP_DTFlux, STATCAT_Advanced);
+
+DECLARE_CYCLE_STAT(TEXT("DTFlux Parsing Task"), STAT_FDTFluxParsingTask, STATGROUP_DTFlux);
+DECLARE_CYCLE_STAT(TEXT("DTFlux Parsing Task DoWork"), STAT_FDTFluxParsingTask_DoWork, STATGROUP_DTFlux);
+
+FDTFluxParsingTask::FDTFluxParsingTask(
+	const FGuid& InRequestId,
+	const FString& InRawJsonData,
+	FOnParsingCompleted InOnCompleted,
+	FOnParsingFailed InOnFailed
+)
+	: RequestId(InRequestId)
+	  , RawJsonData(InRawJsonData)
+	  , OnCompleted(InOnCompleted)
+	  , OnFailed(InOnFailed)
+	  , StartTime(FPlatformTime::Seconds())
+{
+}
+
+void FDTFluxParsingTask::DoTask(ENamedThreads::Type CurrentThread, const FGraphEventRef& MyCompletionGraphEvent)
+{
+	SCOPE_CYCLE_COUNTER(STAT_FDTFluxParsingTask_DoWork);
+
+	UE_LOG(logDTFluxNetwork, VeryVerbose, TEXT("Starting async parsing for request %s"), *RequestId.ToString());
+
+	TSharedPtr<FDTFluxServerResponse> ParsedResponse;
+	bool bParsingSuccess = false;
+	FString ErrorMessage;
+
+	try
+	{
+		// === PARSING SUR LE THREAD WORKER ===
+
+		EDTFluxResponseStatus Status;
+		ParsedResponse = MakeShared<FDTFluxServerResponse>(RawJsonData, Status, false); // Pas de logs sur worker thread
+
+		if (Status == EDTFluxResponseStatus::Success)
+		{
+			bParsingSuccess = true;
+			UE_LOG(logDTFluxNetwork, VeryVerbose, TEXT("Async parsing successful for request %s"),
+			       *RequestId.ToString());
+		}
+		else
+		{
+			ErrorMessage = FString::Printf(TEXT("Parsing failed with status: %s"),
+			                               *UEnum::GetValueAsString(Status));
+			UE_LOG(logDTFluxNetwork, Warning, TEXT("Async parsing failed for request %s: %s"),
+			       *RequestId.ToString(), *ErrorMessage);
+		}
+	}
+	catch (const std::exception& e)
+	{
+		ErrorMessage = FString::Printf(TEXT("Exception during parsing: %s"), ANSI_TO_TCHAR(e.what()));
+		UE_LOG(logDTFluxNetwork, Error, TEXT("Exception during async parsing for request %s: %s"),
+		       *RequestId.ToString(), *ErrorMessage);
+	}
+	catch (...)
+	{
+		ErrorMessage = TEXT("Unknown exception during parsing");
+		UE_LOG(logDTFluxNetwork, Error, TEXT("Unknown exception during async parsing for request %s"),
+		       *RequestId.ToString());
+	}
+
+	const float ParsingTime = (FPlatformTime::Seconds() - StartTime) * 1000.0f; // En millisecondes
+
+	// === PROGRAMMER LA CALLBACK SUR LE MAIN THREAD ===
+
+	FFunctionGraphTask::CreateAndDispatchWhenReady(
+		[this, ParsedResponse, bParsingSuccess, ErrorMessage, ParsingTime]()
+		{
+			// Cette lambda s'exécute sur le main thread
+			if (bParsingSuccess && ParsedResponse.IsValid())
+			{
+				OnCompleted.ExecuteIfBound(RequestId, ParsedResponse, true);
+			}
+			else
+			{
+				OnFailed.ExecuteIfBound(RequestId, ErrorMessage);
+			}
+		},
+		TStatId(),
+		nullptr,
+		ENamedThreads::GameThread // Forcer l'exécution sur le main thread
+	);
+}
+
+// ================================================================================================
+// IMPLÉMENTATION DU PARSER ASYNCHRONE
+// ================================================================================================
+
+FDTFluxAsyncParser::FDTFluxAsyncParser()
+{
+	UE_LOG(logDTFluxNetwork, Log, TEXT("AsyncParser initialized"));
+}
+
+FDTFluxAsyncParser::~FDTFluxAsyncParser()
+{
+	CancelAllParsing();
+	UE_LOG(logDTFluxNetwork, Log, TEXT("AsyncParser destroyed"));
+}
+
+void FDTFluxAsyncParser::ParseResponseAsync(
+	const FGuid& RequestId,
+	const FString& RawJsonData,
+	FOnParsingCompleted OnCompleted,
+	FOnParsingFailed OnFailed)
+{
+	if (RawJsonData.IsEmpty())
+	{
+		OnFailed.ExecuteIfBound(RequestId, TEXT("Empty JSON data"));
+		return;
+	}
+	UE_LOG(logDTFluxNetwork, Verbose, TEXT("Starting async parsing for request %s"), *RequestId.ToString());
+
+	// Créer la tâche de parsing
+	FGraphEventRef Task = FFunctionGraphTask::CreateAndDispatchWhenReady(
+		[RequestId, RawJsonData, OnCompleted, OnFailed]()
+		{
+			// Ce code s'exécute sur le worker thread
+			const double StartTime = FPlatformTime::Seconds();
+
+			TSharedPtr<FDTFluxServerResponse> ParsedResponse;
+			bool bParsingSuccess = false;
+			FString ErrorMessage;
+
+			try
+			{
+				EDTFluxResponseStatus Status;
+				ParsedResponse = MakeShared<FDTFluxServerResponse>(RawJsonData, Status, false);
+
+				if (Status == EDTFluxResponseStatus::Success)
+				{
+					bParsingSuccess = true;
+				}
+				else
+				{
+					ErrorMessage = FString::Printf(TEXT("Parsing failed with status: %s"),
+					                               *UEnum::GetValueAsString(Status));
+				}
+			}
+			catch (const std::exception& e)
+			{
+				ErrorMessage = FString::Printf(TEXT("Exception during parsing: %s"), ANSI_TO_TCHAR(e.what()));
+			}
+			catch (...)
+			{
+				ErrorMessage = TEXT("Unknown exception during parsing");
+			}
+
+			const float ParsingTime = (FPlatformTime::Seconds() - StartTime) * 1000.0f;
+			FFunctionGraphTask::CreateAndDispatchWhenReady(
+				[RequestId, ParsedResponse, bParsingSuccess, ErrorMessage, OnCompleted, OnFailed]()
+				{
+					// Cette lambda s'exécute sur le main thread
+					if (bParsingSuccess && ParsedResponse.IsValid())
+					{
+						OnCompleted.ExecuteIfBound(RequestId, ParsedResponse, true);
+					}
+					else
+					{
+						OnFailed.ExecuteIfBound(RequestId, ErrorMessage);
+					}
+				},
+				TStatId(),
+				nullptr,
+				ENamedThreads::GameThread // Forcer main thread
+			);
+		},
+		TStatId(),
+		nullptr,
+		ENamedThreads::AnyBackgroundThreadNormalTask
+	);
+
+	// Tracker la tâche
+	{
+		FScopeLock Lock(&TasksLock);
+		ActiveTasks.Add(Task);
+	}
+
+	UE_LOG(logDTFluxNetwork, Verbose, TEXT("Queued async parsing task for request %s"), *RequestId.ToString());
+}
+
+TSharedPtr<FDTFluxServerResponse> FDTFluxAsyncParser::ParseResponseSync(
+	const FString& RawJsonData,
+	float TimeoutSeconds)
+{
+	if (RawJsonData.IsEmpty())
+	{
+		return nullptr;
+	}
+
+	// Variables pour la synchronisation
+	TSharedPtr<FDTFluxServerResponse> Result;
+	std::atomic<bool> bCompleted{false};
+
+	// Lancer le parsing async avec callback sync
+	FOnParsingCompleted OnCompleted = FOnParsingCompleted::CreateLambda(
+		[&Result, &bCompleted](const FGuid& RequestId, TSharedPtr<FDTFluxServerResponse> ParsedResponse, bool bSuccess)
+		{
+			if (bSuccess)
+			{
+				Result = ParsedResponse;
+			}
+			bCompleted.store(true);
+		}
+	);
+
+	FOnParsingFailed OnFailed = FOnParsingFailed::CreateLambda(
+		[&bCompleted](const FGuid& RequestId, const FString& ErrorMessage)
+		{
+			UE_LOG(logDTFluxNetwork, Warning, TEXT("Sync parsing failed: %s"), *ErrorMessage);
+			bCompleted.store(true);
+		}
+	);
+
+	FGuid TempId = FGuid::NewGuid();
+	ParseResponseAsync(TempId, RawJsonData, OnCompleted, OnFailed);
+
+	// Attendre avec timeout
+	const double StartTime = FPlatformTime::Seconds();
+	while (!bCompleted.load() && (FPlatformTime::Seconds() - StartTime) < TimeoutSeconds)
+	{
+		FPlatformProcess::Sleep(0.001f); // 1ms
+	}
+
+	return Result;
+}
+
+void FDTFluxAsyncParser::CancelAllParsing()
+{
+	FScopeLock Lock(&TasksLock);
+
+	for (const FGraphEventRef& Task : ActiveTasks)
+	{
+		// Note: On ne peut pas vraiment "cancel" une tâche TaskGraph en cours,
+		// mais on peut marquer qu'on ne veut plus les résultats
+	}
+
+	ActiveTasks.Empty();
+	UE_LOG(logDTFluxNetwork, Log, TEXT("Cancelled all pending parsing tasks"));
+}
+
+FDTFluxAsyncParser::FParsingStats FDTFluxAsyncParser::GetStats() const
+{
+	FScopeLock StatsLock_Local(&StatsLock);
+	FScopeLock TasksLock_Local(&TasksLock);
+
+	FParsingStats Stats;
+	Stats.TasksInProgress = ActiveTasks.Num();
+	Stats.TasksCompleted = TasksCompletedCount;
+	Stats.TasksFailed = TasksFailedCount;
+
+	if (ParsingTimes.Num() > 0)
+	{
+		float Sum = 0.0f;
+		for (float Time : ParsingTimes)
+		{
+			Sum += Time;
+		}
+		Stats.AverageParsingTimeMs = Sum / ParsingTimes.Num();
+	}
+
+	return Stats;
+}
+
+void FDTFluxAsyncParser::ResetStats()
+{
+	FScopeLock Lock(&StatsLock);
+	TasksCompletedCount = 0;
+	TasksFailedCount = 0;
+	ParsingTimes.Empty();
+}
+
+void FDTFluxAsyncParser::OnTaskCompleted(bool bSuccess, float ParsingTimeMs)
+{
+	FScopeLock Lock(&StatsLock);
+
+	if (bSuccess)
+	{
+		TasksCompletedCount++;
+	}
+	else
+	{
+		TasksFailedCount++;
+	}
+
+	ParsingTimes.Add(ParsingTimeMs);
+
+	// Garder seulement les 100 derniers temps pour la moyenne
+	if (ParsingTimes.Num() > 100)
+	{
+		ParsingTimes.RemoveAt(0);
+	}
+}
+
+void FDTFluxAsyncParser::CleanupCompletedTasks()
+{
+	FScopeLock Lock(&TasksLock);
+
+	for (auto It = ActiveTasks.CreateIterator(); It; ++It)
+	{
+		const FGraphEventRef& Task = *It;
+		if (Task.IsValid() && Task->IsComplete())
+		{
+			It.RemoveCurrent(); // Supprime l'élément actuel de manière sécurisée
+		}
+	}
+}

Source/DTFluxNetwork/Private/DTFluxQueuedManager.cpp

@@ -1,51 +1,83 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// ================================================================================================
+// DTFluxRequestManager.cpp - Implémentation du gestionnaire de requêtes
+// ================================================================================================
 
 #include "DTFluxQueuedManager.h"
+
+#include "DTFluxAsyncParser.h"
 #include "DTFluxNetworkModule.h"
+#include "Struct/DTFluxServerResponseStruct.h"
+#include "Struct/DTFluxRequestStructs.h"
 #include "JsonObjectConverter.h"
 
+bool FDTFluxTrackedRequest::HasTimedOut() const
+{
+	if (State != EDTFluxRequestState::Pending && State != EDTFluxRequestState::Sent)
+		return false;
+	return (FDateTime::Now() - CreatedAt).GetTotalSeconds() > Config.TimeoutSeconds;
+}
 
-const FString FDTFluxQueuedRequest::Serialize() const
+bool FDTFluxTrackedRequest::CanRetry() const
+{
+	return CurrentRetries < Config.MaxRetries &&
+		(State == EDTFluxRequestState::Failed || State == EDTFluxRequestState::TimedOut);
+}
+
+
+float FDTFluxTrackedRequest::GetRetryDelay() const
+{
+	return FMath::Pow(Config.RetryBackoffMultiplier, CurrentRetries);
+}
+
+bool FDTFluxTrackedRequest::Matches(EDTFluxApiDataType InType, int32 InContestId, int32 InStageId,
+                                    int32 InSplitId) const
+{
+	return RequestType == InType && ContestId == InContestId && StageId == InStageId && SplitId == InSplitId;
+}
+
+
+void FDTFluxTrackedRequest::SetRawResponse(const FString& RawData)
+{
+	RawResponseData = RawData;
+	ParsedResponse.Reset();
+	bIsResponseParsed = false;
+}
+
+FString FDTFluxTrackedRequest::Serialize() const
 {
 	FString JSONString;
 	switch (RequestType)
 	{
-	case EDTFluxRequestType::RaceData:
-
+	case EDTFluxApiDataType::RaceData:
 		{
 			FDTFluxRaceDataRequest RaceData;
 			FJsonObjectConverter::UStructToJsonObjectString(RaceData, JSONString);
 			break;
 		}
-
-	case EDTFluxRequestType::TeamList:
+	case EDTFluxApiDataType::TeamList:
 		{
 			const FDTFluxTeamListRequest TeamList;
 			FJsonObjectConverter::UStructToJsonObjectString(TeamList, JSONString);
 			break;
 		}
-
-	case EDTFluxRequestType::ContestRanking:
+	case EDTFluxApiDataType::ContestRanking:
 		{
 			FDTFluxContestRankingRequest ContestRanking(ContestId);
 			FJsonObjectConverter::UStructToJsonObjectString(ContestRanking, JSONString);
 			break;
 		}
-
-	case EDTFluxRequestType::StageRanking:
+	case EDTFluxApiDataType::StageRanking:
 		{
 			FDTFluxStageRankingRequest StageRanking(ContestId, StageId);
 			FJsonObjectConverter::UStructToJsonObjectString(StageRanking, JSONString);
 			break;
 		}
-
-	case EDTFluxRequestType::SplitRanking:
+	case EDTFluxApiDataType::SplitRanking:
 		{
 			FDTFluxSplitRankingRequest SplitRanking(ContestId, StageId, SplitId);
 			FJsonObjectConverter::UStructToJsonObjectString(SplitRanking, JSONString);
 			break;
 		}
-
 	default:
 		JSONString = "";
 		break;
@@ -53,387 +85,586 @@ const FString FDTFluxQueuedRequest::Serialize() const
 	return JSONString;
 }
 
-UDTFluxQueuedManager::UDTFluxQueuedManager()
-	: bIsInitialized(false)
-	  , CheckInterval(0.5f)
-	  , TimeSinceLastCheck(0.0f)
+FDTFluxQueuedRequestManager::FDTFluxQueuedRequestManager()
 {
+	AsyncParser = MakeUnique<FDTFluxAsyncParser>();
+	UE_LOG(logDTFluxNetwork, Verbose, TEXT("RequestManager created"));
 }
 
-UDTFluxQueuedManager::~UDTFluxQueuedManager()
+FDTFluxQueuedRequestManager::~FDTFluxQueuedRequestManager()
 {
-	ClearAllRequests();
+	Shutdown();
+	UE_LOG(logDTFluxNetwork, Verbose, TEXT("RequestManager destroyed"));
 }
 
-void UDTFluxQueuedManager::Initialize()
+void FDTFluxQueuedRequestManager::Initialize(const FDTFluxRequestConfig& InDefaultConfig)
 {
-	if (!bIsInitialized)
+	if (bIsInitialized.load())
 	{
-		UE_LOG(logDTFluxNetwork, Log, TEXT("Initializing DTFluxQueuedManager"));
-		bIsInitialized = true;
+		UE_LOG(logDTFluxNetwork, Warning, TEXT("RequestManager already initialized"));
+		return;
 	}
+
+	DefaultConfig = InDefaultConfig;
+	bIsInitialized.store(true);
+
+	UE_LOG(logDTFluxNetwork, Log, TEXT("RequestManager initialized with timeout=%.1fs"),
+	       DefaultConfig.TimeoutSeconds);
 }
 
-FGuid UDTFluxQueuedManager::QueueRequest(EDTFluxRequestType RequestType, int32 ContestId, int32 StageId, int32 SplitId,
-                                         const FString& RawMessage)
+void FDTFluxQueuedRequestManager::Shutdown()
 {
-	// Créer la requête avec les structs existants
-	FDTFluxQueuedRequest NewRequest(RequestType, ContestId, StageId, SplitId);
-	NewRequest.RawResponse = RawMessage;
+	if (!bIsInitialized.load())
+		return;
 
-	// Ajouter à la queue des requêtes en attente
-	PendingRequestsQueue.Enqueue(NewRequest);
+	bIsInitialized.store(false);
+	// Nettoyer toutes les données
+	{
+		FScopeLock RequestsLock_Local(&RequestsLock);
+		FScopeLock CallbacksLock_Local(&CallbacksLock);
 
-	UE_LOG(logDTFluxNetwork, Verbose, TEXT("Queued request %s: Type=%d, ContestId=%d, StageId=%d, SplitId=%d"),
-	       *NewRequest.RequestId.ToString(), (int32)RequestType, ContestId, StageId, SplitId);
+		AllRequests.Empty();
+		SuccessCallbacks.Empty();
+		ErrorCallbacks.Empty();
+	}
 
-	return NewRequest.RequestId;
+	UE_LOG(logDTFluxNetwork, Log, TEXT("RequestManager shutdown"));
 }
 
-bool UDTFluxQueuedManager::MarkRequestAsError(const FGuid& TargetRequestGuid)
+FGuid FDTFluxQueuedRequestManager::CreateTrackedRequest(
+	EDTFluxApiDataType RequestType,
+	int32 ContestId,
+	int32 StageId,
+	int32 SplitId,
+	const FDTFluxRequestConfig& CustomConfig)
 {
-	// TODO: Implement a retry mechanism
-	// For now we simply suppress the request and log a message
-	bool bFoundMatch = false;
-	FDTFluxQueuedRequest Request;
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> TempQueue;
-	while (PendingRequestsQueue.Dequeue(Request))
+	if (!bIsInitialized.load())
 	{
-		if (Request.RequestId == TargetRequestGuid)
+		UE_LOG(logDTFluxNetwork, Error, TEXT("RequestManager not initialized"));
+		return FGuid();
+	}
+	// Create new request
+	auto NewRequest = MakeShared<FDTFluxTrackedRequest>();
+	NewRequest->RequestType = RequestType;
+	NewRequest->ContestId = ContestId;
+	NewRequest->StageId = StageId;
+	NewRequest->SplitId = SplitId;
+	NewRequest->Config = (CustomConfig.TimeoutSeconds > 0) ? CustomConfig : DefaultConfig;
+
+	FGuid RequestId = NewRequest->RequestId;
+
 	{
-			UE_LOG(logDTFluxNetwork, Error,
-			       TEXT("Marked request %s as error: Type=%d, ContestId=%d, StageId=%d, SplitId=%d"),
-			       *Request.RequestId.ToString(), (int32)Request.RequestType, Request.ContestId, Request.StageId,
-			       Request.SplitId);
+		FScopeLock Lock(&RequestsLock);
+		AllRequests.Add(RequestId, NewRequest);
+		TotalRequests++;
+	}
+	UE_LOG(logDTFluxNetwork, Log, TEXT("Created tracked request %s: Type=%s, Contest=%d, Stage=%d, Split=%d"),
+	       *RequestId.ToString(), *UEnum::GetValueAsString(RequestType), ContestId, StageId, SplitId);
+	return RequestId;
+}
+
+FGuid FDTFluxQueuedRequestManager::CreateTrackedRequestWithCallbacks(
+	EDTFluxApiDataType RequestType,
+	int32 ContestId,
+	int32 StageId,
+	int32 SplitId,
+	FOnDTFluxRequestSuccess OnSuccess,
+	FOnDTFluxRequestError OnError,
+	const FDTFluxRequestConfig& CustomConfig)
+{
+	FGuid RequestId = CreateTrackedRequest(RequestType, ContestId, StageId, SplitId, CustomConfig);
+
+	if (RequestId.IsValid())
+	{
+		FScopeLock Lock(&CallbacksLock);
+
+		if (OnSuccess.IsBound())
+		{
+			SuccessCallbacks.Add(RequestId, OnSuccess);
+		}
+		if (OnError.IsBound())
+		{
+			ErrorCallbacks.Add(RequestId, OnError);
+		}
+	}
+
+	return RequestId;
+}
+
+bool FDTFluxQueuedRequestManager::MarkRequestAsSent(const FGuid& RequestId)
+{
+	FScopeLock Lock(&RequestsLock);
+
+	if (TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
+	{
+		TSharedPtr<FDTFluxTrackedRequest> Request = *RequestPtr;
+		Request->SentAt = FDateTime::Now();
+		Request->LastAttemptTime = FDateTime::Now();
+		ChangeRequestState(Request, EDTFluxRequestState::Sent);
+		return true;
+	}
+
+	return false;
+}
+
+bool FDTFluxQueuedRequestManager::CompleteRequest(const FGuid& RequestId, const FString& RawResponseData,
+                                                  bool bUseAsyncParsing)
+{
+	UE_LOG(logDTFluxNetwork, Log, TEXT("FDTFluxQueuedRequestManager::CompleteRequest() %s"), *RequestId.ToString());
+	TSharedPtr<FDTFluxTrackedRequest> Request;
+	{
+		FScopeLock Lock(&RequestsLock);
+		if (TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
+		{
+			Request = *RequestPtr;
+		}
+	}
+	if (!Request.IsValid())
+	{
+		UE_LOG(logDTFluxNetwork, Warning, TEXT("Request %s not found"), *RequestId.ToString());
+		return false;
+	}
+
+	// Store RawResponse
+	Request->SetRawResponse(RawResponseData);
+	Request->CompletedAt = FDateTime::Now();
+	UE_LOG(logDTFluxNetwork, Log, TEXT("Request %s completed at %s"), *RequestId.ToString(),
+	       *Request->CompletedAt.ToString());
+	// Decide to parse based upon config
+	bool bHasCallbacks = false;
+	{
+		FScopeLock Lock(&CallbacksLock);
+		bHasCallbacks = SuccessCallbacks.Contains(RequestId) || ErrorCallbacks.Contains(RequestId);
+	}
+
+	if (bHasCallbacks && bUseAsyncParsing && !RawResponseData.IsEmpty())
+	{
+		UE_LOG(logDTFluxNetwork, Log,
+		       TEXT("Request %s [bHasCallbacks=%s], [bUseAsyncParsing=%s], [bIsRawResponseEmpty=%s]"),
+		       *RequestId.ToString(),
+		       bHasCallbacks ? TEXT("true") : TEXT("false"), bUseAsyncParsing ? TEXT("true") : TEXT("false"),
+		       RawResponseData.IsEmpty() ? TEXT("true") : TEXT("false"));
+
+		// Async parsing for Cb
+		FOnParsingCompleted OnCompleted = FOnParsingCompleted::CreateRaw(
+			this, &FDTFluxQueuedRequestManager::OnParsingCompleted
+		);
+
+		FOnParsingFailed OnFailed = FOnParsingFailed::CreateRaw(
+			this, &FDTFluxQueuedRequestManager::OnParsingFailed
+		);
+		// Maybe send to parser in another place
+		AsyncParser->ParseResponseAsync(RequestId, RawResponseData, OnCompleted, OnFailed);
+		UE_LOG(logDTFluxNetwork, Verbose, TEXT("Started async parsing for request %s"), *RequestId.ToString());
+		return true;
 	}
 	else
 	{
-			TempQueue.Enqueue(Request);
+		UE_LOG(logDTFluxNetwork, Warning, TEXT("request %s completed without sync"), *RequestId.ToString());
+		// Compléter immédiatement sans parsing ou avec parsing sync
+		EDTFluxRequestState NewState = EDTFluxRequestState::Completed;
+		ChangeRequestState(Request, NewState);
+		// Déclencher les callbacks avec les données brutes
+		TriggerCallbacks(*Request);
+		CleanupCallbacks(RequestId);
+		return true;
 	}
-	}
-	while (TempQueue.Dequeue(Request))
+}
+
+/**
+ * @todo Check protocol errors ???
+ * @param RequestId 
+ * @param ErrorMessage 
+ * @return 
+ */
+bool FDTFluxQueuedRequestManager::FailRequest(const FGuid& RequestId, const FString& ErrorMessage)
+{
+	TSharedPtr<FDTFluxTrackedRequest> Request;
+
 	{
-		PendingRequestsQueue.Enqueue(Request);
-	}
-	if (bFoundMatch)
+		FScopeLock Lock(&RequestsLock);
+		if (TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
 		{
-		UE_LOG(logDTFluxNetwork, Error, TEXT("No Request Found with GUID %s"), *TargetRequestGuid.ToString());
+			Request = *RequestPtr;
 		}
+	}
+
+	if (!Request.IsValid())
+	{
+		return false;
+	}
+
+	Request->LastErrorMessage = ErrorMessage;
+	ChangeRequestState(Request, EDTFluxRequestState::Failed);
+
+	TriggerCallbacks(*Request);
+	CleanupCallbacks(RequestId);
+
+	UE_LOG(logDTFluxNetwork, Error, TEXT("Failed request %s: %s"), *RequestId.ToString(), *ErrorMessage);
 	return true;
 }
 
-bool UDTFluxQueuedManager::MarkRequestAsResponded(const FGuid& TargetRequestGuid)
+bool FDTFluxQueuedRequestManager::RetryRequest(const FGuid& RequestId)
 {
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> TempQueue;
-	bool bFoundMatch = false;
+	TSharedPtr<FDTFluxTrackedRequest> Request;
 
-	// Parcourir toutes les requêtes en attente
-	FDTFluxQueuedRequest Request;
-	while (PendingRequestsQueue.Dequeue(Request))
 	{
-		if (!bFoundMatch && Request.RequestId == TargetRequestGuid)
+		FScopeLock Lock(&RequestsLock);
+		if (TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
 		{
-			// Marquer comme ayant reçu une réponse
-			Request.bHasReceivedResponse = true;
-			bFoundMatch = true;
-
-			// Ajouter à la queue des requêtes terminées
-			CompletedRequestsQueue.Enqueue(Request);
-
-			UE_LOG(logDTFluxNetwork, Verbose,
-			       TEXT("Marked request %s as responded: Type=%d, ContestId=%d, StageId=%d, SplitId=%d"),
-			       *Request.RequestId.ToString(), (int32)Request.RequestType, Request.ContestId, Request.StageId,
-			       Request.SplitId);
-		}
-		else
-		{
-			// Remettre dans la queue temporaire
-			TempQueue.Enqueue(Request);
+			Request = *RequestPtr;
 		}
 	}
 
-	// Remettre les requêtes non traitées dans la queue principale
-	while (TempQueue.Dequeue(Request))
+	if (!Request.IsValid() || !Request->CanRetry())
 	{
-		PendingRequestsQueue.Enqueue(Request);
+		return false;
 	}
 
-	return bFoundMatch;
+	Request->CurrentRetries++;
+	Request->LastAttemptTime = FDateTime::Now();
+	ChangeRequestState(Request, EDTFluxRequestState::Retrying);
+
+	UE_LOG(logDTFluxNetwork, Log, TEXT("Retrying request %s (attempt %d/%d)"),
+	       *RequestId.ToString(), Request->CurrentRetries, Request->Config.MaxRetries);
+
+	return true;
 }
 
-bool UDTFluxQueuedManager::MarkRequestAsResponded(const FDTFluxQueuedRequest& TargetRequest)
-{
-	return MarkRequestAsResponded(TargetRequest.RequestId);
-}
-
-bool UDTFluxQueuedManager::IsRequestPending(FGuid& OutRequestId, EDTFluxApiDataType RequestType, int32 ContestId,
+bool FDTFluxQueuedRequestManager::FindPendingRequest(
+	FGuid& OutRequestId,
+	EDTFluxApiDataType RequestType,
+	int32 ContestId,
 	int32 StageId,
-                                            int32 SplitId)
+	int32 SplitId) const
 {
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> TempQueue;
-	bool bFoundMatch = false;
+	FScopeLock Lock(&RequestsLock);
 
-	// Parcourir toutes les requêtes en attente
-	FDTFluxQueuedRequest Request;
-	while (PendingRequestsQueue.Dequeue(Request))
+	for (const auto& [RequestId, Request] : AllRequests)
 	{
-		// Vérifier si cette requête correspond
-		if (!bFoundMatch && Request.Matches(RequestType, ContestId, StageId, SplitId))
+		if ((Request->State == EDTFluxRequestState::Pending || Request->State == EDTFluxRequestState::Sent) &&
+			Request->Matches(RequestType, ContestId, StageId, SplitId))
 		{
-			bFoundMatch = true;
-			OutRequestId = Request.RequestId;
-			UE_LOG(logDTFluxNetwork, Verbose,
-			       TEXT("Found pending request %s: Type=%d, ContestId=%d, StageId=%d, SplitId=%d"),
-			       *Request.RequestId.ToString(), (int32)Request.RequestType, Request.ContestId, Request.StageId,
-			       Request.SplitId);
+			OutRequestId = RequestId;
+			return true;
+		}
 	}
 
-		// Remettre dans la queue temporaire
-		TempQueue.Enqueue(Request);
-	}
-
-	// Remettre toutes les requêtes dans la queue principale
-	while (TempQueue.Dequeue(Request))
-	{
-		PendingRequestsQueue.Enqueue(Request);
-	}
-
-	return bFoundMatch;
+	return false;
 }
 
-FDTFluxQueuedRequest* UDTFluxQueuedManager::GetRequestPending(EDTFluxRequestType RequestType, int32 ContestId,
-                                                              int32 StageId, int32 SplitId)
-{
-	auto SearchInQueue = [&RequestType, ContestId, StageId, SplitId](
-		TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc>& Queue) -> FDTFluxQueuedRequest*
-	{
-		// Copie temporaire de la queue pour la recherche
-		TQueue<FDTFluxQueuedRequest> TempQueue;
+// === ACCESSEURS ===
 
-		FDTFluxQueuedRequest* FoundItem = nullptr;
-		FDTFluxQueuedRequest Item;
-		while (Queue.Dequeue(Item))
+bool FDTFluxQueuedRequestManager::GetRequest(const FGuid& RequestId, FDTFluxTrackedRequest& OutRequest) const
+{
+	FScopeLock Lock(&RequestsLock);
+
+	if (const TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
 	{
-			if (Item.RequestType == RequestType && Item.ContestId == ContestId && Item.StageId == StageId && Item.
-				SplitId == SplitId) // Assuming RequestId is your GUID field
-			{
-				FoundItem = &Item;
+		OutRequest = **RequestPtr;
+		return true;
 	}
-			// Remettre dans la queue temporaire
-			TempQueue.Enqueue(Item);
-		}
-		while (TempQueue.Dequeue(Item))
-		{
-			Queue.Enqueue(Item);
-		}
-		return FoundItem;
-	};
-	return SearchInQueue(PendingRequestsQueue);
+
+	return false;
 }
 
-const FDTFluxQueuedRequest* UDTFluxQueuedManager::GetRequest(const FGuid& SearchedGuid)
+const FDTFluxTrackedRequest* FDTFluxQueuedRequestManager::GetRequestPtr(const FGuid& RequestId) const
 {
-	auto SearchInQueue = [&SearchedGuid](TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc>& Queue) -> FDTFluxQueuedRequest*
-	{
-		// Copie temporaire de la queue pour la recherche
-		TQueue<FDTFluxQueuedRequest> TempQueue;
+	FScopeLock Lock(&RequestsLock);
 
-		FDTFluxQueuedRequest* FoundItem = nullptr;
-		FDTFluxQueuedRequest Item;
-		while (Queue.Dequeue(Item))
+	if (const TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
 	{
-			if (Item.RequestId == SearchedGuid) // Assuming RequestId is your GUID field
-			{
-				// Trouver l'élément dans la queue originale
-				// On doit refaire une copie car on ne peut pas retourner l'adresse de 'Item'
-				FoundItem = &Item;
+		return RequestPtr->Get();
 	}
-			// Remettre dans la queue temporaire
-			TempQueue.Enqueue(Item);
-		}
-		while (TempQueue.Dequeue(Item))
-		{
-			Queue.Enqueue(Item);
-		}
-		return FoundItem;
-	};
-
-	// Chercher dans chaque queue
-	if (FDTFluxQueuedRequest* Found = SearchInQueue(PendingRequestsQueue))
-		return Found;
-
-	if (const FDTFluxQueuedRequest* Found = SearchInQueue(CompletedRequestsQueue))
-		return Found;
-
-	if (const FDTFluxQueuedRequest* Found = SearchInQueue(TimedOutRequestsQueue))
-		return Found;
 
 	return nullptr;
 }
 
-int32 UDTFluxQueuedManager::GetPendingRequestCount()
+TArray<FDTFluxTrackedRequest> FDTFluxQueuedRequestManager::GetRequestsByState(EDTFluxRequestState State) const
 {
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> TempQueue;
-	int32 Count = 0;
+	FScopeLock Lock(&RequestsLock);
 
-	// Compter les requêtes en attente
-	FDTFluxQueuedRequest Request;
-	while (PendingRequestsQueue.Dequeue(Request))
+	TArray<FDTFluxTrackedRequest> Results;
+
+	for (const auto& [RequestId, Request] : AllRequests)
 	{
-		Count++;
-		TempQueue.Enqueue(Request);
+		if (Request->State == State)
+		{
+			Results.Add(*Request);
+		}
 	}
 
-	// Remettre toutes les requêtes dans la queue principale
-	while (TempQueue.Dequeue(Request))
+	return Results;
+}
+
+int32 FDTFluxQueuedRequestManager::GetRequestCount(EDTFluxRequestState State) const
+{
+	FScopeLock Lock(&RequestsLock);
+
+	int32 Count = 0;
+
+	for (const auto& [RequestId, Request] : AllRequests)
 	{
-		PendingRequestsQueue.Enqueue(Request);
+		if (Request->State == State)
+		{
+			Count++;
+		}
 	}
 
 	return Count;
 }
 
-int32 UDTFluxQueuedManager::CleanupTimedOutRequests()
+FDTFluxQueuedRequestManager::FRequestStatistics FDTFluxQueuedRequestManager::GetStatistics() const
 {
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> TempQueue;
-	int32 TimeoutCount = 0;
+	FScopeLock RequestsLock_Local(&RequestsLock);
+	FScopeLock MetricsLock_Local(&MetricsLock);
 
-	// Parcourir toutes les requêtes en attente
-	FDTFluxQueuedRequest Request;
-	while (PendingRequestsQueue.Dequeue(Request))
-	{
-		if (Request.HasTimedOut())
-		{
-			// Ajouter à la queue des requêtes expirées
-			TimedOutRequestsQueue.Enqueue(Request);
-			TimeoutCount++;
+	FRequestStatistics Stats;
 
-			UE_LOG(logDTFluxNetwork, Warning,
-			       TEXT("Request %s timed out: Type=%d, ContestId=%d, StageId=%d, SplitId=%d"),
-			       *Request.RequestId.ToString(), (int32)Request.RequestType, Request.ContestId, Request.StageId,
-			       Request.SplitId);
+	for (const auto& [RequestId, Request] : AllRequests)
+	{
+		switch (Request->State)
+		{
+		case EDTFluxRequestState::Pending:
+		case EDTFluxRequestState::Sent:
+		case EDTFluxRequestState::Retrying:
+			Stats.Pending++;
+			break;
+		case EDTFluxRequestState::Completed:
+			Stats.Completed++;
+			break;
+		case EDTFluxRequestState::Failed:
+		case EDTFluxRequestState::TimedOut:
+			Stats.Failed++;
+			break;
+		}
+	}
+
+	Stats.TotalRequests = TotalRequests;
+	return Stats;
+}
+
+// === NETTOYAGE ===
+int32 FDTFluxQueuedRequestManager::CleanupCompletedRequests(float OlderThanSeconds)
+{
+	FScopeLock Lock(&RequestsLock);
+
+	TArray<FGuid> OldRequests;
+	const FDateTime Threshold = FDateTime::Now() - FTimespan::FromSeconds(OlderThanSeconds);
+
+	for (const auto& [RequestId, Request] : AllRequests)
+	{
+		if ((Request->State == EDTFluxRequestState::Completed || Request->State == EDTFluxRequestState::Failed ||
+			Request->State == EDTFluxRequestState::TimedOut) && Request->CompletedAt < Threshold)
+		{
+			OldRequests.Add(RequestId);
+		}
+	}
+
+	for (const FGuid& RequestId : OldRequests)
+	{
+		AllRequests.Remove(RequestId);
+	}
+
+	return OldRequests.Num();
+}
+
+void FDTFluxQueuedRequestManager::ClearAllRequests()
+{
+	FScopeLock RequestsLock_Local(&RequestsLock);
+	FScopeLock CallbacksLock_Local(&CallbacksLock);
+
+	AllRequests.Empty();
+	SuccessCallbacks.Empty();
+	ErrorCallbacks.Empty();
+
+	UE_LOG(logDTFluxNetwork, Log, TEXT("Cleared all requests"));
+}
+
+void FDTFluxQueuedRequestManager::Tick(float DeltaTime)
+{
+	if (!bIsInitialized.load())
+		return;
+
+	// Mise à jour des timers
+	TimeSinceLastTimeoutCheck += DeltaTime;
+	TimeSinceLastRetryCheck += DeltaTime;
+
+	// Vérifier les timeouts
+	if (TimeSinceLastTimeoutCheck >= TimeoutCheckInterval)
+	{
+		ProcessTimeouts();
+		TimeSinceLastTimeoutCheck = 0.0f;
+	}
+
+	// Vérifier les retries
+	if (TimeSinceLastRetryCheck >= RetryCheckInterval)
+	{
+		ProcessRetries();
+		TimeSinceLastRetryCheck = 0.0f;
+	}
+}
+
+void FDTFluxQueuedRequestManager::ChangeRequestState(TSharedPtr<FDTFluxTrackedRequest> Request,
+                                                     EDTFluxRequestState NewState)
+{
+	if (!Request.IsValid())
+		return;
+
+	const EDTFluxRequestState OldState = Request->State;
+	Request->State = NewState;
+
+	// Déclencher l'événement de changement d'état
+	OnRequestStateChanged.Broadcast(Request->RequestId, NewState);
+
+	UE_LOG(logDTFluxNetwork, VeryVerbose, TEXT("DTFluxQueuedRequestManager: Request %s state changed from %s to %s"),
+	       *Request->RequestId.ToString(),
+	       *UEnum::GetValueAsString(OldState),
+	       *UEnum::GetValueAsString(NewState));
+}
+
+void FDTFluxQueuedRequestManager::ProcessTimeouts()
+{
+	FScopeLock Lock(&RequestsLock);
+
+	TArray<TSharedPtr<FDTFluxTrackedRequest>> TimedOutRequests;
+
+	for (const auto& Pair : AllRequests)
+	{
+		const auto& Request = Pair.Value;
+		if (Request->HasTimedOut())
+		{
+			TimedOutRequests.Add(Request);
+		}
+	}
+
+	for (const auto& Request : TimedOutRequests)
+	{
+		Request->LastErrorMessage = FString::Printf(
+			TEXT("Request timed out after %.1f seconds"), Request->Config.TimeoutSeconds);
+
+		if (Request->CanRetry())
+		{
+			Request->CurrentRetries++;
+			ChangeRequestState(Request, EDTFluxRequestState::Retrying);
 		}
 		else
 		{
-			// Remettre dans la queue temporaire
-			TempQueue.Enqueue(Request);
+			ChangeRequestState(Request, EDTFluxRequestState::TimedOut);
+			TriggerCallbacks(*Request);
+			OnRequestFailed.Broadcast(*Request);
 		}
 	}
-
-	// Remettre les requêtes non expirées dans la queue principale
-	while (TempQueue.Dequeue(Request))
-	{
-		PendingRequestsQueue.Enqueue(Request);
-	}
-
-	return TimeoutCount;
 }
 
-int32 UDTFluxQueuedManager::CleanCashedRequests()
+void FDTFluxQueuedRequestManager::ProcessRetries()
 {
-	int32 CleanedRequestsCount = 0;
+	FScopeLock Lock(&RequestsLock);
 
-	// Queue temporaire pour stocker les requêtes encore valides
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> ValidCompletedRequests;
+	const FDateTime Now = FDateTime::Now();
+	TArray<TSharedPtr<FDTFluxTrackedRequest>> ReadyToRetry;
 
-	// Traiter toutes les requêtes terminées
-	FDTFluxQueuedRequest CompletedRequest;
-	while (CompletedRequestsQueue.Dequeue(CompletedRequest))
+	for (const auto& Pair : AllRequests)
 	{
-		// Vérifier si la requête est cacheable et a reçu une réponse
-		if (CompletedRequest.bIsCacheable && CompletedRequest.bHasReceivedResponse)
+		const auto& Request = Pair.Value;
+		if (Request->State == EDTFluxRequestState::Retrying)
 		{
-			// Calculer l'âge de la requête en secondes
-			float RequestAge = (FDateTime::Now() - CompletedRequest.CreatedAt).GetTotalSeconds();
-
-			// Vérifier si le cache est encore valide
-			if (RequestAge <= CompletedRequest.CachedValidity)
+			const float ElapsedSinceLastAttempt = (Now - Request->LastAttemptTime).GetTotalSeconds();
+			if (ElapsedSinceLastAttempt >= Request->GetRetryDelay())
 			{
-				// Le cache est encore valide, conserver la requête
-				ValidCompletedRequests.Enqueue(CompletedRequest);
+				ReadyToRetry.Add(Request);
 			}
-			else
-			{
-				// Le cache a expiré, compter cette requête comme nettoyée
-				CleanedRequestsCount++;
-
-				UE_LOG(LogTemp, Verbose,
-				       TEXT("DTFluxQueuedManager: Cleaned expired cached request %s (Age: %.2fs, Validity: %.2fs)"),
-				       *CompletedRequest.RequestId.ToString(), RequestAge, CompletedRequest.CachedValidity);
-			}
-		}
-		else
-		{
-			// Requête non cacheable ou sans réponse, la conserver
-			ValidCompletedRequests.Enqueue(CompletedRequest);
 		}
 	}
 
-	// Restaurer la queue avec uniquement les requêtes valides
-	while (ValidCompletedRequests.Dequeue(CompletedRequest))
+	for (const auto& Request : ReadyToRetry)
 	{
-		CompletedRequestsQueue.Enqueue(CompletedRequest);
+		Request->LastAttemptTime = Now;
+		ChangeRequestState(Request, EDTFluxRequestState::Pending);
 	}
-
-	// Log du résultat si des requêtes ont été nettoyées
-	if (CleanedRequestsCount > 0)
-	{
-		UE_LOG(LogTemp, Log, TEXT("DTFluxQueuedManager: Cleaned %d expired cached requests"), CleanedRequestsCount);
-	}
-
-	return CleanedRequestsCount;
 }
 
-void UDTFluxQueuedManager::ClearAllRequests()
+void FDTFluxQueuedRequestManager::TriggerCallbacks(const FDTFluxTrackedRequest& Request)
 {
-	// Vider toutes les queues
-	FDTFluxQueuedRequest DummyRequest;
-	while (PendingRequestsQueue.Dequeue(DummyRequest))
-	{
-	}
-	while (CompletedRequestsQueue.Dequeue(DummyRequest))
-	{
-	}
-	while (TimedOutRequestsQueue.Dequeue(DummyRequest))
-	{
-	}
+	FScopeLock Lock(&CallbacksLock);
 
-	UE_LOG(logDTFluxNetwork, Log, TEXT("Cleared all pending requests"));
+	if (Request.State == EDTFluxRequestState::Completed)
+	{
+		// Success Cb
+		const FOnDTFluxRequestSuccess* SuccessCallback = SuccessCallbacks.Find(Request.RequestId);
+		if (SuccessCallback && SuccessCallback->IsBound())
+		{
+			SuccessCallback->Execute(Request);
+		}
+	}
+	else if (Request.State == EDTFluxRequestState::Failed || Request.State == EDTFluxRequestState::TimedOut)
+	{
+		// Error Cb
+		const FOnDTFluxRequestError* ErrorCallback = ErrorCallbacks.Find(Request.RequestId);
+		if (ErrorCallback && ErrorCallback->IsBound())
+		{
+			ErrorCallback->Execute(Request, Request.LastErrorMessage);
+		}
+	}
 }
 
-
-void UDTFluxQueuedManager::Tick(float DeltaTime)
+void FDTFluxQueuedRequestManager::CleanupCallbacks(const FGuid& RequestId)
 {
-	if (!bIsInitialized)
+	FScopeLock Lock(&CallbacksLock);
+	SuccessCallbacks.Remove(RequestId);
+	ErrorCallbacks.Remove(RequestId);
+}
+
+void FDTFluxQueuedRequestManager::OnParsingCompleted(const FGuid& RequestId,
+                                                     TSharedPtr<FDTFluxServerResponse> ParsedResponse, bool bSuccess)
+{
+	UE_LOG(logDTFluxNetwork, Log, TEXT("FDTFluxQueuedRequestManager::OnParsingCompleted() request %s"),
+	       *RequestId.ToString())
+	TSharedPtr<FDTFluxTrackedRequest> Request;
 	{
+		FScopeLock Lock(&RequestsLock);
+
+		auto* RequestPtr = AllRequests.Find(RequestId);
+		if (!RequestPtr || !RequestPtr->IsValid())
+		{
+			UE_LOG(logDTFluxNetwork, Error,
+			       TEXT(
+				       "DTFluxQueuedRequestManager::OnParsingCompleted() RequestId%s [InvalidRequestId=%s], [RequestPtrValid=%s]"
+			       ),
+			       *RequestId.ToString(), RequestPtr ? TEXT("true") : TEXT("false"),
+			       RequestPtr->IsValid() ? TEXT("true") : TEXT("false"));
 			return;
 		}
 
-	// Incrémenter le temps écoulé
-	TimeSinceLastCheck += DeltaTime;
-
-	// Vérifier si c'est le moment de nettoyer les requêtes expirées
-	if (TimeSinceLastCheck >= CheckInterval)
-	{
-		TimeSinceLastCheck = 0.0f;
-		CleanupTimedOutRequests();
+		Request = *RequestPtr;
 	}
 
-	// Traiter les requêtes expirées
-	FDTFluxQueuedRequest TimedOutRequest;
-	while (TimedOutRequestsQueue.Dequeue(TimedOutRequest))
+	if (bSuccess && ParsedResponse.IsValid())
 	{
-		// Déclencher l'événement pour chaque requête expirée
-		OnRequestTimedOut.Broadcast(TimedOutRequest);
+		Request->ParsedResponse = ParsedResponse;
+		Request->bIsResponseParsed = true;
+		EDTFluxRequestState NewState = EDTFluxRequestState::Completed;
+
+		ChangeRequestState(Request, NewState);
+		UE_LOG(logDTFluxNetwork, Log,
+		       TEXT("DTFluxQueuedRequestManager: Async parsing completed for request %s"),
+		       *RequestId.ToString());
 	}
+	else
+	{
+		Request->LastErrorMessage = TEXT("Async parsing failed");
+		ChangeRequestState(Request, EDTFluxRequestState::Failed);
+
+		UE_LOG(logDTFluxNetwork, Error, TEXT("Async parsing failed for request %s"), *RequestId.ToString());
+	}
+	TriggerCallbacks(*Request);
+	CleanupCallbacks(RequestId);
 }
 
-bool UDTFluxQueuedManager::IsTickable() const
+void FDTFluxQueuedRequestManager::OnParsingFailed(const FGuid& RequestId, const FString& ErrorMessage)
 {
-	return bIsInitialized;
-}
-
-TStatId UDTFluxQueuedManager::GetStatId() const
-{
-	RETURN_QUICK_DECLARE_CYCLE_STAT(UDTFluxQueuedManager, STATGROUP_Tickables);
+	UE_LOG(logDTFluxNetwork, Error, TEXT("DTFluxQueuedRequestManager: Async parsing failed for request %s: %s"),
+	       *RequestId.ToString(),
+	       *ErrorMessage);
+	FailRequest(RequestId, FString::Printf(TEXT("Parsing failed: %s"), *ErrorMessage));
 }

Source/DTFluxNetwork/Private/Struct/DTFluxServerResponseStruct.cpp

@@ -1,6 +1,7 @@
-#pragma  once
+#include "Struct/DTFluxServerResponseStruct.h"
+#include "DTFluxNetworkModule.h"
+#include "Types/Objects/UDTFluxParticipantFactory.h"
 
-#include "Struct/DTFluxServerResponseStruct.h"
 
 // === IMPLÉMENTATION DES CONSTRUCTEURS ===
 
@@ -194,7 +195,7 @@ FString FDTFluxServerResponse::ToDebugString() const
 		*UEnum::GetValueAsString(ParsingStatus), *Type, Code, ContestID, StageID, SplitID, *ReceivedAt.ToString());
 }
 
-bool FDTFluxServerResponse::ParseTeamListResponse(FDTFluxTeamListDefinition& OutTeamList)
+bool FDTFluxServerResponse::ParseTeamList(FDTFluxTeamListDefinition& OutTeamList)
 {
 	ParsingStatus = EDTFluxResponseStatus::Unset;
 	if (!ValidateResponseType(TEXT("team-list")))
@@ -256,9 +257,9 @@ bool FDTFluxServerResponse::ParseTeamListResponse(FDTFluxTeamListDefinition& Out
 	return false;
 }
 
-bool FDTFluxServerResponse::ParseTeamUpdateResponse(FDTFluxTeamListDefinition& OutTeamUpdate)
+bool FDTFluxServerResponse::ParseTeamUpdate(FDTFluxTeamListDefinition& OutTeamUpdate)
 {
-	return ParseTeamListResponse(OutTeamUpdate);
+	return ParseTeamList(OutTeamUpdate);
 }
 
 bool FDTFluxServerResponse::ParseRaceData(FDTFluxRaceData& OutRaceData)
@@ -368,7 +369,7 @@ bool FDTFluxServerResponse::ParseContestRanking(FDTFluxContestRankings& OutConte
 	return true;
 }
 
-bool FDTFluxServerResponse::ParseStageRankingResponse(FDTFluxStageRankings& OutStageRankings)
+bool FDTFluxServerResponse::ParseStageRanking(FDTFluxStageRankings& OutStageRankings)
 {
 	// UE_LOG(logDTFluxNetwork, Log, TEXT("Response is stage-ranking type %s"), *RawMessage);
 	if (!ValidateResponseType(TEXT("stage-ranking")))
@@ -396,7 +397,7 @@ bool FDTFluxServerResponse::ParseStageRankingResponse(FDTFluxStageRankings& OutS
 	return true;
 }
 
-bool FDTFluxServerResponse::ParseSplitRankingResponse(FDTFluxSplitRankings& OutSplitRankings)
+bool FDTFluxServerResponse::ParseSplitRanking(FDTFluxSplitRankings& OutSplitRankings)
 {
 	if (!ValidateResponseType(TEXT("stage-ranking")) || SplitID == -1)
 	{
@@ -427,7 +428,7 @@ bool FDTFluxServerResponse::ParseSplitRankingResponse(FDTFluxSplitRankings& OutS
 	return true;
 }
 
-bool FDTFluxServerResponse::ParseStatusUpdateResponse(FDTFluxTeamStatusUpdate& OutStatusUpdate)
+bool FDTFluxServerResponse::ParseStatusUpdate(FDTFluxTeamStatusUpdate& OutStatusUpdate)
 {
 	if (!ValidateResponseType(TEXT("status-update")))
 	{
@@ -448,7 +449,7 @@ bool FDTFluxServerResponse::ParseStatusUpdateResponse(FDTFluxTeamStatusUpdate& O
 	return true;
 }
 
-bool FDTFluxServerResponse::ParseSplitSensorResponse(TArray<FDTFluxSplitSensorInfo>& OutSplitSensorInfos)
+bool FDTFluxServerResponse::ParseSplitSensor(TArray<FDTFluxSplitSensorInfo>& OutSplitSensorInfos)
 {
 	if (!ValidateResponseType(TEXT("split-sensor")))
 	{

Source/DTFluxNetwork/Public/DTFluxAsyncParser.h

@@ -0,0 +1,171 @@
+// ================================================================================================
+// DTFluxAsyncParser.h - Async Response Parser
+// ================================================================================================
+#pragma once
+
+#include "CoreMinimal.h"
+#include "HAL/CriticalSection.h"
+#include "Async/TaskGraphInterfaces.h"
+#include "Struct/DTFluxServerResponseStruct.h"
+
+// Forward declarations
+
+// ================================================================================================
+// DELEGATES POUR LE PARSING ASYNCHRONE
+// ================================================================================================
+
+DECLARE_DELEGATE_ThreeParams(FOnParsingCompleted, const FGuid& /*RequestId*/,
+                             TSharedPtr<FDTFluxServerResponse> /*ParsedResponse*/, bool /*bSuccess*/);
+DECLARE_DELEGATE_TwoParams(FOnParsingFailed, const FGuid& /*RequestId*/, const FString& /*ErrorMessage*/);
+
+// ================================================================================================
+// ASYNC PARSER - Délégation du parsing avec TaskGraph
+// ================================================================================================
+
+/**
+ * Gestionnaire centralisé pour le parsing asynchrone des réponses JSON
+ * Utilise le TaskGraph d'Unreal Engine pour déléguer le parsing sur des worker threads
+ */
+class DTFLUXNETWORK_API FDTFluxAsyncParser
+{
+public:
+	FDTFluxAsyncParser();
+	~FDTFluxAsyncParser();
+
+	// === INTERFACE PUBLIQUE ===
+
+	/**
+	 * Lancer le parsing asynchrone d'une réponse JSON
+	 * @param RequestId - ID de la requête pour le suivi
+	 * @param RawJsonData - Données JSON brutes à parser
+	 * @param OnCompleted - Callback appelé en cas de succès (sur main thread)
+	 * @param OnFailed - Callback appelé en cas d'échec (sur main thread)
+	 */
+	void ParseResponseAsync(
+		const FGuid& RequestId,
+		const FString& RawJsonData,
+		FOnParsingCompleted OnCompleted,
+		FOnParsingFailed OnFailed = FOnParsingFailed()
+	);
+
+	/**
+	 * Parsing synchrone avec timeout (pour les cas urgents)
+	 * @param RawJsonData - Données JSON à parser
+	 * @param TimeoutSeconds - Timeout maximum pour le parsing
+	 * @return Réponse parsée ou nullptr en cas d'échec
+	 */
+	TSharedPtr<FDTFluxServerResponse> ParseResponseSync(
+		const FString& RawJsonData,
+		float TimeoutSeconds = 1.0f
+	);
+
+	/**
+	 * Annuler toutes les tâches de parsing en attente
+	 */
+	void CancelAllParsing();
+
+	// === STATISTIQUES ===
+
+	/**
+	 * Statistiques de performance du parsing
+	 */
+	struct FParsingStats
+	{
+		int32 TasksInProgress = 0; // Tâches actuellement en cours
+		int32 TasksCompleted = 0; // Tâches terminées avec succès
+		int32 TasksFailed = 0; // Tâches échouées
+		float AverageParsingTimeMs = 0.0f; // Temps moyen de parsing en ms
+	};
+
+	/**
+	 * Obtenir les statistiques de parsing
+	 */
+	FParsingStats GetStats() const;
+
+	/**
+	 * Réinitialiser les statistiques
+	 */
+	void ResetStats();
+
+private:
+	// === TRACKING DES TÂCHES ===
+	mutable FCriticalSection TasksLock;
+	TSet<FGraphEventRef> ActiveTasks;
+
+	// === STATISTIQUES ===
+	mutable FCriticalSection StatsLock;
+	mutable int32 TasksCompletedCount = 0;
+	mutable int32 TasksFailedCount = 0;
+	mutable TArray<float> ParsingTimes; // Historique des temps de parsing
+
+	// === MÉTHODES PRIVÉES ===
+
+	/**
+	 * Callback appelé quand une tâche se termine
+	 * @param bSuccess - Succès ou échec de la tâche
+	 * @param ParsingTimeMs - Temps de parsing en millisecondes
+	 */
+	void OnTaskCompleted(bool bSuccess, float ParsingTimeMs);
+
+	/**
+	 * Nettoyer les tâches terminées de la liste active
+	 */
+	void CleanupCompletedTasks();
+};
+
+// ================================================================================================
+// TÂCHE DE PARSING POUR LE TASKGRAPH
+// ================================================================================================
+
+/**
+ * Tâche de parsing JSON exécutée sur un thread worker
+ * Compatible avec le TaskGraph d'Unreal Engine
+ */
+class FDTFluxParsingTask
+{
+public:
+	FDTFluxParsingTask(
+		const FGuid& InRequestId,
+		const FString& InRawJsonData,
+		FOnParsingCompleted InOnCompleted,
+		FOnParsingFailed InOnFailed
+	);
+
+	// === INTERFACE TASK GRAPH ===
+
+	FORCEINLINE TStatId GetStatId() const
+	{
+		RETURN_QUICK_DECLARE_CYCLE_STAT(FDTFluxParsingTask, STATGROUP_TaskGraphTasks);
+	}
+
+	static FORCEINLINE TStatId GetStatId_DoWork()
+	{
+		RETURN_QUICK_DECLARE_CYCLE_STAT(FDTFluxParsingTask_DoWork, STATGROUP_TaskGraphTasks);
+	}
+
+	static FORCEINLINE ENamedThreads::Type GetDesiredThread()
+	{
+		// Exécuter sur un thread worker (pas le main thread)
+		return ENamedThreads::AnyBackgroundThreadNormalTask;
+	}
+
+	static FORCEINLINE ESubsequentsMode::Type GetSubsequentsMode()
+	{
+		return ESubsequentsMode::TrackSubsequents;
+	}
+
+	// === EXÉCUTION DE LA TÂCHE ===
+
+	/**
+	 * Méthode principale d'exécution de la tâche
+	 * Appelée automatiquement par le TaskGraph sur un worker thread
+	 */
+	void DoTask(ENamedThreads::Type CurrentThread, const FGraphEventRef& MyCompletionGraphEvent);
+
+private:
+	FGuid RequestId;
+	FString RawJsonData;
+	FOnParsingCompleted OnCompleted;
+	FOnParsingFailed OnFailed;
+	double StartTime;
+};

Source/DTFluxNetwork/Public/DTFluxQueuedManager.h

@@ -1,66 +1,375 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// ================================================================================================
+// DTFluxRequestManager.h - Gestionnaire C++ optimisé avec cache, timeout et retry
+// ================================================================================================
 
 #pragma once
 
 #include "CoreMinimal.h"
-#include "UObject/Object.h"
-#include "Containers/Queue.h"
 #include "Tickable.h"
-#include "Struct/DTFluxRequestStructs.h"
+#include "HAL/CriticalSection.h"
 #include "Struct/DTFluxServerResponseStruct.h"
 #include "Types/Enum/DTFluxCoreEnum.h"
 #include "DTFluxQueuedManager.generated.h"
 
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnRequestTimedOut, const FDTFluxQueuedRequest&, TimedOutRequest);
+class FDTFluxAsyncParser;
 
-/**
- * @brief Classe Tickable gérant les requêtes WebSockets qui ne sont pas traçables nativement par l'API.
- * Cette classe utilise TQueue pour gérer efficacement les requêtes en attente et vérifie leur état dans le tick.
- */
-UCLASS()
-class DTFLUXNETWORK_API UDTFluxQueuedManager : public UObject, public FTickableGameObject
+
+// ================================================================================================
+// ENUMS ET STRUCTURES POUR LES REQUÊTES
+// ================================================================================================
+
+UENUM(BlueprintType)
+enum class EDTFluxRequestState : uint8
+{
+	Pending UMETA(DisplayName = "Pending"),
+	Sent UMETA(DisplayName = "Sent"),
+	Completed UMETA(DisplayName = "Completed"),
+	Failed UMETA(DisplayName = "Failed"),
+	TimedOut UMETA(DisplayName = "TimedOut"),
+	Retrying UMETA(DisplayName = "Retrying")
+};
+
+USTRUCT(BlueprintType)
+struct DTFLUXNETWORK_API FDTFluxRequestConfig
 {
 	GENERATED_BODY()
 
-public:
-	/** Constructeur par défaut */
-	UDTFluxQueuedManager();
-	virtual ~UDTFluxQueuedManager() override;
-	void Initialize();
-	FGuid QueueRequest(EDTFluxRequestType RequestType, int32 ContestId = -1, int32 StageId = -1, int32 SplitId = -1,
-	                   const FString& RawMessage = "");
-	bool MarkRequestAsError(const FGuid& TargetRequestGuid);
-	bool MarkRequestAsResponded(const FGuid& TargetRequestGuid);
-	bool MarkRequestAsResponded(const FDTFluxQueuedRequest& TargetRequest);
-	bool IsRequestPending(FGuid& OutRequestId, EDTFluxRequestType RequestType, int32 ContestId = -1, int32 StageId = -1,
-	                      int32 SplitId = -1);
-	FDTFluxQueuedRequest* GetRequestPending(EDTFluxRequestType RequestType, int32 ContestId = -1, int32 StageId = -1,
-	                                        int32 SplitId = -1);
-	const FDTFluxQueuedRequest* GetRequest(const FGuid& SearchedGuid);
-	int32 GetPendingRequestCount();
-	int32 CleanupTimedOutRequests();
-	int32 CleanCashedRequests();
-	void ClearAllRequests();
-	// bool TryProcessResponse(const FDTFluxServerResponse& Response);
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	float TimeoutSeconds = 5.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	int32 MaxRetries = 3;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite)
+	float RetryBackoffMultiplier = 1.5f;
+};
+
+USTRUCT(BlueprintType)
+struct DTFLUXNETWORK_API FDTFluxTrackedRequest
+{
+	GENERATED_BODY()
+
+	// === IDENTIFICATION ===
+	UPROPERTY(BlueprintReadOnly)
+	FGuid RequestId = FGuid::NewGuid();
+
+	UPROPERTY(BlueprintReadOnly)
+	EDTFluxApiDataType RequestType = EDTFluxApiDataType::None;
+
+	UPROPERTY(BlueprintReadOnly)
+	int32 ContestId = -1;
+
+	UPROPERTY(BlueprintReadOnly)
+	int32 StageId = -1;
+
+	UPROPERTY(BlueprintReadOnly)
+	int32 SplitId = -1;
+
+	// === ÉTAT ET TIMING ===
+	UPROPERTY(BlueprintReadOnly)
+	EDTFluxRequestState State = EDTFluxRequestState::Pending;
+
+	UPROPERTY(BlueprintReadOnly)
+	FDateTime CreatedAt = FDateTime::Now();
+
+	UPROPERTY(BlueprintReadOnly)
+	FDateTime SentAt = FDateTime::MinValue();
+
+	UPROPERTY(BlueprintReadOnly)
+	FDateTime CompletedAt = FDateTime::MinValue();
+
+	UPROPERTY(BlueprintReadOnly)
+	FDateTime LastAttemptTime = FDateTime::Now();
+
+	// === CONFIGURATION ===
+	FDTFluxRequestConfig Config;
+
+	// === RETRY LOGIC ===
+	UPROPERTY(BlueprintReadOnly)
+	int32 CurrentRetries = 0;
+
+	// === DONNÉES DE RÉPONSE ===
+	UPROPERTY(BlueprintReadOnly)
+	FString RawResponseData;
+
+	// Réponse parsée (lazy loading)
+	mutable TOptional<TSharedPtr<FDTFluxServerResponse>> ParsedResponse;
+
+	UPROPERTY(BlueprintReadOnly)
+	bool bIsResponseParsed = false;
+
+	UPROPERTY(BlueprintReadOnly)
+	FString LastErrorMessage;
+
+	// === MÉTHODES UTILITAIRES ===
+
+	bool HasTimedOut() const;
+	bool CanRetry() const;
+	float GetRetryDelay() const;
+	bool Matches(EDTFluxApiDataType InType, int32 InContestId = -1, int32 InStageId = -1, int32 InSplitId = -1) const;
+	void SetRawResponse(const FString& RawData);
+	FString Serialize() const;
+};
+
+// ================================================================================================
+// DELEGATES POUR LES CALLBACKS
+// ================================================================================================
+
+DECLARE_DELEGATE_OneParam(FOnDTFluxRequestSuccess, const FDTFluxTrackedRequest&);
+DECLARE_DELEGATE_TwoParams(FOnDTFluxRequestError, const FDTFluxTrackedRequest&, const FString& /*ErrorMessage*/);
+
+DECLARE_MULTICAST_DELEGATE_TwoParams(FOnRequestStateChangedNative, const FGuid& /*RequestId*/,
+                                     EDTFluxRequestState& /*NewState*/);
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnRequestCompletedNative, const FDTFluxTrackedRequest& /*CompletedRequest*/);
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnRequestFailedNative, const FDTFluxTrackedRequest& /*FailedRequest*/);
+
+// ================================================================================================
+// REQUEST MANAGER - Classe C++ principale avec SmartPointers
+// ================================================================================================
+
+/**
+ * Gestionnaire de requêtes trackées timeout, retry et parsing asynchrone
+ * Implémentation C++ pure avec SmartPointers pour des performances optimales
+ */
+class DTFLUXNETWORK_API FDTFluxQueuedRequestManager : public FTickableGameObject
+{
+public:
+	FDTFluxQueuedRequestManager();
+	virtual ~FDTFluxQueuedRequestManager();
+
+	// === LIFECYCLE ===
+
+	/**
+	 * Initialiser le gestionnaire de requêtes
+	 * @param DefaultConfig Configuration par défaut pour les nouvelles requêtes
+	 */
+	void Initialize(const FDTFluxRequestConfig& DefaultConfig = FDTFluxRequestConfig());
+
+	/**
+	 * Arrêter le gestionnaire et nettoyer toutes les ressources
+	 */
+	void Shutdown();
+
+	/**
+	 * Vérifier si le gestionnaire est initialisé
+	 */
+	bool IsInitialized() const { return bIsInitialized.load(); }
+
+	// === CRÉATION DE REQUÊTES ===
+
+	/**
+	 * Créer une nouvelle requête trackée
+	 * @param RequestType Type de requête (ContestRanking, StageRanking, etc.)
+	 * @param ContestId ID du contest (-1 si non applicable)
+	 * @param StageId ID du stage (-1 si non applicable)  
+	 * @param SplitId ID du split (-1 si non applicable)
+	 * @param CustomConfig Configuration spécifique pour cette requête
+	 * @return GUID de la requête créée
+	 */
+	FGuid CreateTrackedRequest(
+		EDTFluxApiDataType RequestType,
+		int32 ContestId = -1,
+		int32 StageId = -1,
+		int32 SplitId = -1,
+		const FDTFluxRequestConfig& CustomConfig = FDTFluxRequestConfig()
+	);
+
+	/**
+	 * Créer une requête trackée avec callbacks C++
+	 * @param RequestType Type de requête
+	 * @param ContestId ID du contest
+	 * @param StageId ID du stage
+	 * @param SplitId ID du split
+	 * @param OnSuccess Callback appelé en cas de succès
+	 * @param OnError Callback appelé en cas d'erreur
+	 * @param CustomConfig Configuration spécifique
+	 * @return GUID de la requête créée
+	 */
+	FGuid CreateTrackedRequestWithCallbacks(
+		EDTFluxApiDataType RequestType,
+		int32 ContestId,
+		int32 StageId,
+		int32 SplitId,
+		FOnDTFluxRequestSuccess OnSuccess,
+		FOnDTFluxRequestError OnError,
+		const FDTFluxRequestConfig& CustomConfig = FDTFluxRequestConfig()
+	);
+
+	// === GESTION DES REQUÊTES ===
+
+	/**
+	 * Marquer une requête comme envoyée
+	 */
+	bool MarkRequestAsSent(const FGuid& RequestId);
+
+	/**
+	 * Compléter une requête avec la réponse reçue
+	 * @param RequestId ID de la requête
+	 * @param RawResponseData Données JSON brutes de la réponse
+	 * @param bUseAsyncParsing Utiliser le parsing asynchrone (recommandé)
+	 */
+	bool CompleteRequest(const FGuid& RequestId, const FString& RawResponseData, bool bUseAsyncParsing = true);
+
+	/**
+	 * Marquer une requête comme échouée
+	 */
+	bool FailRequest(const FGuid& RequestId, const FString& ErrorMessage);
+
+	/**
+	 * Relancer une requête (si retry possible)
+	 */
+	bool RetryRequest(const FGuid& RequestId);
+
+	// === RECHERCHE ===
+
+	/**
+	 * Chercher une requête en attente correspondant aux critères
+	 */
+	bool FindPendingRequest(
+		FGuid& OutRequestId,
+		EDTFluxApiDataType RequestType,
+		int32 ContestId = -1,
+		int32 StageId = -1,
+		int32 SplitId = -1
+	) const;
+
+	// === ACCESSEURS ===
+
+	/**
+	 * Récupérer une requête par son ID
+	 */
+	bool GetRequest(const FGuid& RequestId, FDTFluxTrackedRequest& OutRequest) const;
+
+	/**
+	 * Récupérer un pointeur vers une requête (plus efficace)
+	 */
+	const FDTFluxTrackedRequest* GetRequestPtr(const FGuid& RequestId) const;
+
+	/**
+	 * Récupérer toutes les requêtes dans un état donné
+	 */
+	TArray<FDTFluxTrackedRequest> GetRequestsByState(EDTFluxRequestState State) const;
+
+	/**
+	 * Compter les requêtes dans un état donné
+	 */
+	int32 GetRequestCount(EDTFluxRequestState State = EDTFluxRequestState::Pending) const;
+
+	// === STATISTIQUES ===
+
+	/**
+	 * Statistiques complètes du gestionnaire de requêtes
+	 */
+	struct FRequestStatistics
+	{
+		int32 Pending = 0;
+		int32 Completed = 0;
+		int32 Failed = 0;
+		int32 TotalRequests = 0;
+	};
+
+	FRequestStatistics GetStatistics() const;
+
+	// === NETTOYAGE ===
+
+	/**
+	 * Nettoyer les requêtes terminées anciennes
+	 * @param OlderThanSeconds Supprimer les requêtes plus anciennes que ce délai
+	 * @return Nombre de requêtes supprimées
+	 */
+	int32 CleanupCompletedRequests(float OlderThanSeconds = 300.0f);
+
+	/**
+	 * Vider toutes les requêtes
+	 */
+	void ClearAllRequests();
+
+	// === EVENTS ===
+
+	FOnRequestStateChangedNative OnRequestStateChanged;
+	FOnRequestCompletedNative OnRequestCompleted;
+	FOnRequestFailedNative OnRequestFailed;
+
+	// === INTERFACE TICKABLE ===
 
-	// Interface FTickableGameObject
 	virtual void Tick(float DeltaTime) override;
-	virtual bool IsTickable() const override;
-	virtual TStatId GetStatId() const override;
+	virtual bool IsTickable() const override { return true; };
+
+	virtual TStatId GetStatId() const override
+	{
+		RETURN_QUICK_DECLARE_CYCLE_STAT(FDTFluxQueuedRequestManager, STATGROUP_Tickables);
+	};
 	virtual bool IsTickableWhenPaused() const override { return true; }
 	virtual bool IsTickableInEditor() const override { return true; }
-	// Interface ~FTickableGameObject
 
-
-	UPROPERTY(BlueprintAssignable, Category = "DTFlux|Network")
-	FOnRequestTimedOut OnRequestTimedOut;
+	// === ACCESSEUR POUR LE PARSER (debug/stats) ===
+	const FDTFluxAsyncParser* GetAsyncParser() const { return AsyncParser.Get(); }
 
 private:
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> PendingRequestsQueue;
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> CompletedRequestsQueue;
-	TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> TimedOutRequestsQueue;
+	// === CONFIGURATION ===
+	FDTFluxRequestConfig DefaultConfig;
+	std::atomic<bool> bIsInitialized{false};
 
-	bool bIsInitialized;
-	float CheckInterval;
-	float TimeSinceLastCheck;
+	// === TIMING POUR LE TICK ===
+	float TimeSinceLastTimeoutCheck = 0.0f;
+	float TimeSinceLastRetryCheck = 0.0f;
+
+	static constexpr float TimeoutCheckInterval = 1.0f;
+	static constexpr float RetryCheckInterval = 0.5f;
+
+	// === STOCKAGE THREAD-SAFE ===
+	mutable FCriticalSection RequestsLock;
+	TMap<FGuid, TSharedPtr<FDTFluxTrackedRequest>> AllRequests;
+
+	// === CALLBACKS C++ ===
+	mutable FCriticalSection CallbacksLock;
+	TMap<FGuid, FOnDTFluxRequestSuccess> SuccessCallbacks;
+	TMap<FGuid, FOnDTFluxRequestError> ErrorCallbacks;
+
+	// === MÉTRIQUES ===
+	mutable FCriticalSection MetricsLock;
+	mutable int32 TotalRequests = 0;
+
+
+	// === PARSER ASYNCHRONE ===
+	TUniquePtr<FDTFluxAsyncParser> AsyncParser;
+
+	// === MÉTHODES PRIVÉES ===
+
+	/**
+	 * Changer l'état d'une requête et notifier les observers
+	 */
+	void ChangeRequestState(TSharedPtr<FDTFluxTrackedRequest> Request, EDTFluxRequestState NewState);
+
+	/**
+	 * Traiter les requêtes en timeout (appelé périodiquement)
+	 */
+	void ProcessTimeouts();
+
+	/**
+	 * Traiter les requêtes à relancer (appelé périodiquement)
+	 */
+	void ProcessRetries();
+
+	/**
+	 * Déclencher les callbacks pour une requête
+	 */
+	void TriggerCallbacks(const FDTFluxTrackedRequest& Request);
+
+	/**
+	 * Nettoyer les callbacks d'une requête
+	 */
+	void CleanupCallbacks(const FGuid& RequestId);
+
+	// === CALLBACKS POUR LE PARSING ASYNCHRONE ===
+
+	/**
+	 * Callback appelé quand le parsing asynchrone réussit
+	 */
+	void OnParsingCompleted(const FGuid& RequestId, TSharedPtr<FDTFluxServerResponse> ParsedResponse, bool bSuccess);
+
+	/**
+	 * Callback appelé quand le parsing asynchrone échoue
+	 */
+	void OnParsingFailed(const FGuid& RequestId, const FString& ErrorMessage);
 };

Source/DTFluxNetwork/Public/Struct/DTFluxServerResponseStruct.h

@@ -4,13 +4,11 @@
 
 #include "CoreMinimal.h"
 #include "UObject/Object.h"
-#include "DTFluxNetworkModule.h"
 #include "DTFluxRaceDataServerResponse.h"
 #include "DTFluxRankingServerResponse.h"
 #include "DTFluxSplitSensorServerResponse.h"
 #include "JsonObjectConverter.h"
 #include "Types/Enum/DTFluxCoreEnum.h"
-#include "Types/Objects/UDTFluxParticipantFactory.h"
 #include "Types/Struct/DTFluxRaceDataStructs.h"
 #include "Types/Struct/DTFluxRankingStructs.h"
 #include "Types/Struct/DTFluxSplitSensor.h"
@@ -85,14 +83,14 @@ public:
 
 	EDTFluxResponseStatus TryParse(bool bLogErrors = true);
 
-	bool ParseTeamListResponse(FDTFluxTeamListDefinition& OutTeamList);
-	bool ParseTeamUpdateResponse(FDTFluxTeamListDefinition& OutTeamUpdate);
+	bool ParseTeamList(FDTFluxTeamListDefinition& OutTeamList);
+	bool ParseTeamUpdate(FDTFluxTeamListDefinition& OutTeamUpdate);
 	bool ParseRaceData(FDTFluxRaceData& OutRaceData);
 	bool ParseContestRanking(FDTFluxContestRankings& OutContestRankings);
-	bool ParseStageRankingResponse(FDTFluxStageRankings& OutStageRankings);
-	bool ParseSplitRankingResponse(FDTFluxSplitRankings& OutSplitRankings);
-	bool ParseStatusUpdateResponse(FDTFluxTeamStatusUpdate& OutStatusUpdate);
-	bool ParseSplitSensorResponse(TArray<FDTFluxSplitSensorInfo>& OutSplitSensorInfos);
+	bool ParseStageRanking(FDTFluxStageRankings& OutStageRankings);
+	bool ParseSplitRanking(FDTFluxSplitRankings& OutSplitRankings);
+	bool ParseStatusUpdate(FDTFluxTeamStatusUpdate& OutStatusUpdate);
+	bool ParseSplitSensor(TArray<FDTFluxSplitSensorInfo>& OutSplitSensorInfos);
 
 
 	// === MÉTHODES UTILITAIRES ===

Source/DTFluxNetwork/Public/Subsystems/DTFluxNetworkSubsystem.h

@@ -1,41 +1,54 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+// ================================================================================================
+// DTFluxNetworkSubsystem.h - Interface UObject avec compatibilité Blueprint
+// ================================================================================================
 
 #pragma once
 
 #include "CoreMinimal.h"
-#include "DTFluxQueuedManager.h"
-#include "Struct/DTFluxServerResponseStruct.h"
 #include "Subsystems/EngineSubsystem.h"
 #include "Types/DTFluxNetworkSettingsTypes.h"
 #include "Types/Enum/DTFluxCoreEnum.h"
-#include "Types/Struct/DTFluxRaceDataStructs.h"
-#include "Types/Struct/DTFluxRankingStructs.h"
-#include "Types/Struct/DTFluxSplitSensor.h"
-#include "Types/Struct/DTFluxTeamListStruct.h"
+#include "DTFluxQueuedManager.h"
 #include "DTFluxNetworkSubsystem.generated.h"
 
-
+// Forward declarations
 class FDTFluxWebSocketClient;
-class UDTFluxQueuedManager;
+class FDTFluxQueuedRequestManager;
+
 typedef TSharedPtr<FDTFluxWebSocketClient> FDTFluxWebSocketClientSP;
-class FDTFluxHttpClient;
-typedef TSharedPtr<FDTFluxHttpClient> FDTFluxHttpClientSP;
 
+// ================================================================================================
+// DELEGATES BLUEPRINT POUR LES REQUÊTES TRACKÉES
+// ================================================================================================
 
-// Delegates pour les requêtes avec callback
-DECLARE_DELEGATE_TwoParams(FOnDTFluxRequestResponseError, const FGuid&, const FString&);
-DECLARE_DELEGATE_TwoParams(FOnDTFluxTrackedRequestResponse, const FGuid&, FDTFluxServerResponse&);
-DECLARE_DELEGATE_TwoParams(FOnDTFluxTrackedRequestTimeout, const FGuid&, const FString& /*ErrorMessage*/);
-// Delegates Blueprint pour les requêtes avec tracking
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnDTFluxTrackedRequestCompleted, const FGuid&, RequestId,
                                                EDTFluxApiDataType, RequestType, const FString&, ResponseData);
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnDTFluxTrackedRequestFailed, const FGuid&, RequestId,
                                                EDTFluxApiDataType, RequestType, const FString&, ErrorMessage);
 
+// ================================================================================================
+// DELEGATES LEGACY POUR LA COMPATIBILITÉ
+// ================================================================================================
+
+DECLARE_DELEGATE_OneParam(FOnRaceDataReceived, const FDTFluxRaceData& /*RaceDataDefinition*/);
+DECLARE_DELEGATE_OneParam(FOnTeamListReceived, const FDTFluxTeamListDefinition& /*TeamListDefinition*/);
+DECLARE_DELEGATE_OneParam(FOnStageRankingReceived, const FDTFluxStageRankings& /*StageRankings*/);
+DECLARE_DELEGATE_OneParam(FOnSplitRankingReceived, const FDTFluxSplitRankings& /*SplitRankings*/);
+DECLARE_DELEGATE_OneParam(FOnContestRankingReceived, const FDTFluxContestRankings& /*ContestRankings*/);
+DECLARE_DELEGATE_OneParam(FOnSplitSensorReceived, const FDTFluxSplitSensorInfo& /*SplitSensorInfo*/);
+DECLARE_DELEGATE_OneParam(FOnTeamUpdateReceived, const FDTFluxTeamListDefinition& /*ParticipantToUpdate*/);
+DECLARE_DELEGATE_OneParam(FOnTeamStatusUpdateReceived, const FDTFluxTeamStatusUpdate& /*TeamToUpdate*/);
+
+DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnWebSocketConnected);
+
+// ================================================================================================
+// NETWORK SUBSYSTEM - Interface UObject avec compatibilité Blueprint
+// ================================================================================================
 
 /**
- * 
+ * Subsystem réseau DTFlux avec support complet des requêtes trackées et compatibilité legacy
+ * Combine l'efficacité du RequestManager C++ avec l'interface Blueprint UObject
  */
 UCLASS(Blueprintable)
 class DTFLUXNETWORK_API UDTFluxNetworkSubsystem : public UEngineSubsystem
@@ -43,180 +56,234 @@ class DTFLUXNETWORK_API UDTFluxNetworkSubsystem : public UEngineSubsystem
 	GENERATED_BODY()
 
 public:
-	UPROPERTY()
+	// === ÉTAT DE CONNEXION ===
+	UPROPERTY(BlueprintReadOnly, Category = "DTFlux|Network")
 	EDTFluxConnectionStatus WsStatus = EDTFluxConnectionStatus::Unset;
 
-	DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnWebSocketConnected);
+	// === CONNEXION WEBSOCKET (Legacy) ===
 
-	UPROPERTY(BlueprintAssignable, Category="DTFlux|Network")
-	FOnWebSocketConnected OnWebSocketConnected;
-
-	DECLARE_DELEGATE_OneParam(FOnRaceDataReceived, const FDTFluxRaceData& /*RaceDataDefinition*/);
-	FOnRaceDataReceived OnRaceDataReceived;
-
-	FOnRaceDataReceived& OnReceivedRaceData()
-	{
-		return OnRaceDataReceived;
-	};
-
-	// === DELEGATES POUR LES DONNÉES REÇUES (PUSH) ===
-	DECLARE_DELEGATE_OneParam(FOnTeamListReceived, const FDTFluxTeamListDefinition& /*TeamListDefinition*/);
-	FOnTeamListReceived OnTeamListReceived;
-
-	FOnTeamListReceived& OnReceivedTeamList()
-	{
-		return OnTeamListReceived;
-	};
-
-	DECLARE_DELEGATE_OneParam(FOnStageRankingReceived, const FDTFluxStageRankings& /*StageRankings*/);
-	FOnStageRankingReceived OnStageRankingReceived;
-
-	FOnStageRankingReceived& OnReceivedStageRanking()
-	{
-		return OnStageRankingReceived;
-	}
-
-	DECLARE_DELEGATE_OneParam(FOnSplitRankingReceived, const FDTFluxSplitRankings& /*SplitRankings*/);
-	FOnSplitRankingReceived OnSplitRankingReceived;
-
-	FOnSplitRankingReceived& OnReceivedSplitRanking()
-	{
-		return OnSplitRankingReceived;
-	}
-
-	DECLARE_DELEGATE_OneParam(FOnContestRankingReceived, const FDTFluxContestRankings& /*ContestRankings*/);
-	FOnContestRankingReceived OnContestRankingReceived;
-
-	FOnContestRankingReceived& OnReceivedContestRanking()
-	{
-		return OnContestRankingReceived;
-	};
-
-	// === DELEGATES POUR LES DONNÉES REÇUES (PULL) ===
-	DECLARE_DELEGATE_OneParam(FOnSplitSensorReceived, const FDTFluxSplitSensorInfo& /*ContestRankings*/);
-	FOnSplitSensorReceived OnSplitSensorReceived;
-
-	FOnSplitSensorReceived& OnReceivedSplitSensor()
-	{
-		return OnSplitSensorReceived;
-	};
-
-	DECLARE_DELEGATE_OneParam(FOnTeamUpdateReceived, const FDTFluxTeamListDefinition& /*ParticipantToUpdate*/);
-	FOnTeamUpdateReceived OnTeamUpdateReceived;
-
-	FOnTeamUpdateReceived& OnReceivedTeamUpdate()
-	{
-		return OnTeamUpdateReceived;
-	};
-
-	DECLARE_DELEGATE_OneParam(FOnTeamStatusUpdateReceived, const FDTFluxTeamStatusUpdate& /*TeamToUpdate*/);
-	FOnTeamStatusUpdateReceived OnTeamStatusUpdateReceived;
-
-	FOnTeamStatusUpdateReceived& OnReceivedTeamStatusUpdate()
-	{
-		return OnTeamStatusUpdateReceived;
-	};
-
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Network")
+	/**
+	 * Se connecter au serveur WebSocket
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Network")
 	void Connect();
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Network")
+
+	/**
+	 * Se déconnecter du serveur WebSocket
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Network")
 	void Disconnect();
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Network")
+
+	/**
+	 * Reconnecter au serveur WebSocket
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Network")
 	void Reconnect();
 
+	// === REQUÊTES TRACKÉES (Nouveau système optimisé) ===
 
-	// === REQUÊTES AVEC QUEUE ET TRACKING ===
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
-	FGuid SendTrackedRequest(EDTFluxApiDataType RequestType, int32 ContestId = -1, int32 StageId = -1,
-	                         int32 SplitId = -1, float TimeoutSeconds = 30.0f);
+	/**
+	 * Envoyer une requête trackée avec cache, timeout et retry
+	 * @param RequestType Type de requête (ContestRanking, StageRanking, etc.)
+	 * @param ContestId ID du contest (-1 si non applicable)
+	 * @param StageId ID du stage (-1 si non applicable)
+	 * @param SplitId ID du split (-1 si non applicable)
+	 * @param TimeoutSeconds Timeout en secondes
+	 * @param MaxRetries Nombre maximum de tentatives
+	 * @param bEnableCache Activer le cache pour cette requête
+	 * @return GUID de la requête pour le suivi
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
+	FGuid SendTrackedRequest(
+		EDTFluxApiDataType RequestType,
+		int32 ContestId = -1,
+		int32 StageId = -1,
+		int32 SplitId = -1,
+		float TimeoutSeconds = 5.0f,
+		int32 MaxRetries = 3,
+		bool bEnableCache = true
+	);
 
-	FGuid SendTrackedRequestWithCallback(EDTFluxApiDataType RequestType, int32 ContestId, int32 StageId, int32 SplitId,
-	                                     FOnDTFluxTrackedRequestResponse OnCompleted,
-	                                     FOnDTFluxTrackedRequestTimeout OnTimeout,
-	                                     TOptional<FOnDTFluxRequestResponseError> OnError = TOptional<
-		                                     FOnDTFluxRequestResponseError>(),
-	                                     float TimeoutSeconds = 30.0f);
+	/**
+	 * Envoyer une requête trackée avec callbacks C++ (non Blueprint)
+	 * @param RequestType Type de requête
+	 * @param ContestId ID du contest
+	 * @param StageId ID du stage
+	 * @param SplitId ID du split
+	 * @param OnSuccess Callback appelé en cas de succès
+	 * @param OnError Callback appelé en cas d'erreur
+	 * @param TimeoutSeconds Timeout en secondes
+	 * @param MaxRetries Nombre maximum de tentatives
+	 * @param bEnableCache Activer le cache
+	 * @return GUID de la requête
+	 */
+	FGuid SendTrackedRequestWithCallbacks(
+		EDTFluxApiDataType RequestType,
+		int32 ContestId,
+		int32 StageId,
+		int32 SplitId,
+		FOnDTFluxRequestSuccess& OnSuccess,
+		FOnDTFluxRequestError& OnError,
+		float TimeoutSeconds = 5.0f,
+		int32 MaxRetries = 3
+	);
 
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
-	bool GetTrackedRequest(const FGuid& RequestId, FDTFluxQueuedRequest& OutRequest) const;
-	const FDTFluxQueuedRequest* GetTrackedRequestPtr(const FGuid& RequestId) const;
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests", CallInEditor)
+	// === ACCESSEURS BLUEPRINT POUR LES REQUÊTES TRACKÉES ===
+
+	/**
+	 * Récupérer une requête trackée par son ID
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
+	bool GetTrackedRequest(const FGuid& RequestId, FDTFluxTrackedRequest& OutRequest) const;
+
+	/**
+	 * Vérifier si une requête a reçu une réponse
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
 	bool HasRequestReceivedResponse(const FGuid& RequestId) const;
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
+
+	/**
+	 * Récupérer les données de réponse d'une requête
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
 	FString GetRequestResponseData(const FGuid& RequestId) const;
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
+
+	/**
+	 * Vérifier si une requête similaire est en attente
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
 	bool IsRequestPending(EDTFluxApiDataType RequestType, int32 ContestId = -1, int32 StageId = -1,
 	                      int32 SplitId = -1) const;
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
+
+	/**
+	 * Compter le nombre de requêtes en attente
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
 	int32 GetPendingRequestCount() const;
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
-	UDTFluxQueuedManager* GetQueueManager() const;
 
-	// === EVENTS BLUEPRINT POUR LE TRACKING ===
-	UPROPERTY(BlueprintAssignable, Category="DTFlux|Tracked Requests")
-	FOnDTFluxTrackedRequestCompleted OnTrackedRequestCompleted;
-	UPROPERTY(BlueprintAssignable, Category="DTFlux|Tracked Requests")
-	FOnDTFluxTrackedRequestFailed OnTrackedRequestFailed;
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
+	/**
+	 * Récupérer les statistiques du gestionnaire de requêtes
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
+	void GetRequestStatistics(int32& OutPending, int32& OutCompleted, int32& OutFailed) const;
 
-	// === REQUÊTES DIRECTES (LEGACY) ===
+	// === REQUÊTES LEGACY (Compatibilité totale) ===
+
+	/**
+	 * Envoyer une requête en mode legacy (pour compatibilité)
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Legacy")
 	void SendRequest(const EDTFluxApiDataType RequestType, int InContestId = -1, int InStageId = -1,
 	                 int InSplitId = -1);
-	UFUNCTION(BlueprintCallable, Category="DTFlux|Network")
+
+	/**
+	 * Envoyer un message brut via WebSocket
+	 */
+	UFUNCTION(BlueprintCallable, Category = "DTFlux|Network")
 	void SendMessage(const FString& Message);
 
+	// === EVENTS BLUEPRINT ===
+
+	/**
+	 * Event déclenché lors de la connexion WebSocket
+	 */
+	UPROPERTY(BlueprintAssignable, Category = "DTFlux|Network")
+	FOnWebSocketConnected OnWebSocketConnected;
+
+	/**
+	 * Event déclenché quand une requête trackée se termine avec succès
+	 */
+	UPROPERTY(BlueprintAssignable, Category = "DTFlux|Tracked Requests")
+	FOnDTFluxTrackedRequestCompleted OnTrackedRequestCompleted;
+
+	/**
+	 * Event déclenché quand une requête trackée échoue
+	 */
+	UPROPERTY(BlueprintAssignable, Category = "DTFlux|Tracked Requests")
+	FOnDTFluxTrackedRequestFailed OnTrackedRequestFailed;
+
+	// === DELEGATES LEGACY (Compatibilité totale) ===
+
+	FOnRaceDataReceived OnRaceDataReceived;
+	FOnTeamListReceived OnTeamListReceived;
+	FOnStageRankingReceived OnStageRankingReceived;
+	FOnSplitRankingReceived OnSplitRankingReceived;
+	FOnContestRankingReceived OnContestRankingReceived;
+	FOnSplitSensorReceived OnSplitSensorReceived;
+	FOnTeamUpdateReceived OnTeamUpdateReceived;
+	FOnTeamStatusUpdateReceived OnTeamStatusUpdateReceived;
+
+	// Accesseurs pour la compatibilité legacy
+	FOnRaceDataReceived& OnReceivedRaceData() { return OnRaceDataReceived; }
+	FOnTeamListReceived& OnReceivedTeamList() { return OnTeamListReceived; }
+	FOnStageRankingReceived& OnReceivedStageRanking() { return OnStageRankingReceived; }
+	FOnSplitRankingReceived& OnReceivedSplitRanking() { return OnSplitRankingReceived; }
+	FOnContestRankingReceived& OnReceivedContestRanking() { return OnContestRankingReceived; }
+	FOnSplitSensorReceived& OnReceivedSplitSensor() { return OnSplitSensorReceived; }
+	FOnTeamUpdateReceived& OnReceivedTeamUpdate() { return OnTeamUpdateReceived; }
+	FOnTeamStatusUpdateReceived& OnReceivedTeamStatusUpdate() { return OnTeamStatusUpdateReceived; }
+
+	// === ACCESSEUR PUBLIC POUR LE REQUEST MANAGER ===
+
+	/**
+	 * Accéder au gestionnaire de requêtes (pour usage avancé)
+	 */
+	TSharedPtr<FDTFluxQueuedRequestManager> GetRequestManager() const { return RequestManager; }
+
 protected:
-	// ~Subsystem Interface
+	// === LIFECYCLE DU SUBSYSTEM ===
 	virtual void Initialize(FSubsystemCollectionBase& Collection) override;
 	virtual void Deinitialize() override;
-	// ~Subsystem Interface
-
 
 private:
 	// === CONFIGURATION ===
 	FDTFluxWsSettings WsSettings;
-	FDTFluxHttpSettings HttpSettings;
-
-	UPROPERTY()
-	UDTFluxQueuedManager* QueueManager;
-
-	// === MAPPING DES CALLBACKS C++ ===
-	TMap<FGuid, FOnDTFluxTrackedRequestResponse> PendingCallbacks;
-	TMap<FGuid, FOnDTFluxTrackedRequestTimeout> PendingTimeoutCallbacks;
-	TMap<FGuid, FOnDTFluxRequestResponseError> PendingErrorCallbacks;
 
 	// === CLIENTS RÉSEAU ===
 	FDTFluxWebSocketClientSP WsClient = nullptr;
-	FDTFluxHttpClientSP HttpClient = nullptr;
 
-	// === MÉTHODES DE CONFIGURATION ===
-	UFUNCTION()
-	void WsSettingsChanged(const FDTFluxWsSettings& NewWsSettings);
-	UFUNCTION()
-	void HttpSettingsChanged(const FDTFluxHttpSettings& NewHttpSettings);
-	void ReconnectWs(const FName WsClientId);
-	void ReconnectHttp(const FName WsClientId);
+	// === REQUEST MANAGER C++ ===
+	TSharedPtr<FDTFluxQueuedRequestManager> RequestManager;
 
 	// === GESTION DES ÉVÉNEMENTS WEBSOCKET ===
 	void RegisterWebSocketEvents();
-	void UnregisterWebSocketEvents();
-
+	void UnregisterWebSocketEvents() const;
 	void OnWebSocketConnected_Subsystem();
 	void OnWebSocketConnectionError_Subsystem(const FString& Error);
 	void OnWebSocketClosedEvent_Subsystem(int32 StatusCode, const FString& Reason, bool bWasClean);
+	void OnWebSocketMessageEvent_Subsystem(const FString& MessageString);
+	void OnWebSocketMessageSentEvent_Subsystem(const FString& MessageSent);
 
+	// Handles pour les événements WebSocket
 	FDelegateHandle OnWsConnectedEventDelegateHandle;
 	FDelegateHandle OnWsConnectionErrorEventDelegateHandle;
 	FDelegateHandle OnWsClosedEventDelegateHandle;
 	FDelegateHandle OnWsMessageEventDelegateHandle;
 	FDelegateHandle OnWsMessageSentEventDelegateHandle;
 
-	// === GESTION DES ÉVÉNEMENTS HTTP ===
-	void RegisterHttpEvents();
-	void UnregisterHttpEvents();
+	// === PARSING ET TRAITEMENT DES RÉPONSES ===
 
-	// === PARSING DES RÉPONSES ===
-	void ParseTeamListResponse(FDTFluxServerResponse& ServerResponse);
+	/**
+	 * Essayer de matcher une réponse à une requête trackée
+	 * @param MessageString Message JSON reçu
+	 * @return true si la réponse correspond à une requête trackée
+	 */
+	bool TryMatchResponseToQueuedRequest(const FString& MessageString);
+
+	/**
+	 * Traiter une réponse en mode legacy
+	 * @param MessageString Message JSON à traiter
+	 */
+	void ProcessLegacyResponse(const FString& MessageString);
+
+	/**
+	 * Traiter une réponse déjà parsée
+	 * @param ParsedResponse Réponse parsée à traiter
+	 */
+	void ProcessParsedResponse(TSharedPtr<FDTFluxServerResponse> ParsedResponse);
+
+	// === MÉTHODES DE PARSING LEGACY (pour compatibilité) ===
+	void ParseTeamListResponse(FDTFluxServerResponse& Response);
 	void ParseRaceData(FDTFluxServerResponse& Response);
 	void ParseContestRanking(FDTFluxServerResponse& Response);
 	void ParseStageRankingResponse(FDTFluxServerResponse& Response);
@@ -225,19 +292,45 @@ private:
 	void ParseSplitSensorResponse(FDTFluxServerResponse& Response);
 	EDTFluxResponseStatus ProcessPushMessage(FDTFluxServerResponse& Response);
 
-	void Parse(FDTFluxServerResponse& Response);
-	void OnWebSocketMessageEvent_Subsystem(const FString& MessageString);
-	void OnWebSocketMessageSentEvent_Subsystem(const FString& MessageSent);
-	bool CleanRequestCallbacks(const FGuid& RequestId);
+	// === CALLBACKS POUR LE REQUEST MANAGER ===
 
-	// === GESTION DES REQUÊTES TRACKÉES ===
+	/**
+	 * Callback appelé quand une requête trackée se termine
+	 */
+	void OnRequestCompleted_Internal(const FDTFluxTrackedRequest& CompletedRequest);
+
+	/**
+	 * Callback appelé quand une requête trackée échoue
+	 */
+	void OnRequestFailed_Internal(const FDTFluxTrackedRequest& FailedRequest);
+
+	// === CONFIGURATION DYNAMIQUE ===
+
+	/**
+	 * Callback appelé quand les paramètres WebSocket changent
+	 */
 	UFUNCTION()
-	void OnRequestTimedOut_Internal(const FDTFluxQueuedRequest& TimedOutRequest);
-	bool TryMatchResponseToQueuedRequest(FDTFluxServerResponse& Response);
-	void CompleteTrackedRequest(const FGuid& RequestId, const FString& ResponseData, EDTFluxRequestType RequestType);
-	void FailTrackedRequest(const FGuid& RequestId, const FString& ErrorMessage, EDTFluxRequestType RequestType);
-	void SendQueuedRequest(const FDTFluxQueuedRequest& QueuedRequest);
+	void WsSettingsChanged(const FDTFluxWsSettings& NewWsSettings);
+
+	/**
+	 * Reconnecter le client WebSocket
+	 */
+	void ReconnectWs(const FName WsClientId);
 
 	// === UTILITAIRES ===
+
+	/**
+	 * Construire une adresse WebSocket complète
+	 */
 	static FString ConstructWsAddress(const FString& Address, const FString& Path, const int& Port);
+
+	/**
+	 * Envoyer une requête trackée via le réseau
+	 */
+	void SendQueuedRequest(const FDTFluxTrackedRequest& QueuedRequest);
+
+	/**
+	 * Déterminer si on doit utiliser le parsing asynchrone
+	 */
+	bool ShouldUseAsyncParsing(const FString& JsonData) const;
 };

Source/DTFluxRaceResult/DTFluxRaceResult.Build.cs

@@ -1,34 +0,0 @@
-using UnrealBuildTool;
-
-public class DTFluxRaceResult : ModuleRules
-{
-    public DTFluxRaceResult(ReadOnlyTargetRules Target) : base(Target)
-    {
-        PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
-
-        PublicDependencyModuleNames.AddRange(
-            new string[]
-            {
-                "Core"
-            }
-        );
-
-        PrivateDependencyModuleNames.AddRange(
-            new string[]
-            {
-                "CoreUObject",
-                "Engine",
-                "Slate",
-                "SlateCore",
-                "DTFluxProjectSettings",
-                "UMG",
-                "WebBrowser",
-                "Projects",
-                "ToolMenus",
-                "HTTP",
-                "JsonUtilities",
-                "Json"
-            }
-        );
-    }
-}

Source/DTFluxRaceResult/Private/DTFluxRaceResultModule.cpp

@@ -1,161 +0,0 @@
-#include "DTFluxRaceResultModule.h"
-
-#include "LevelEditor.h"
-#include "Widget/SDTFluxRaceResultWidget.h"
-#include "Widget/Style/DTFluxRaceResultStyle.h"
-
-#define LOCTEXT_NAMESPACE "FDTFluxRaceResultModule"
-
-DEFINE_LOG_CATEGORY(logDTFluxRaceResult)
-
-FName DTFLUXRACERESULT_API FDTFluxRaceResult::RaceResultTabId = "DTFluxRaceResult";
-FText DTFLUXRACERESULT_API FDTFluxRaceResult::RaceResultTabDisplayName = FText::FromString(TEXT("DTFlux RaceResult"));
-
-
-void DTFLUXRACERESULT_API FDTFluxRaceResult::StartupModule()
-{
-	UE_LOG(logDTFluxRaceResult, Warning, TEXT("DTFluxRaceResult Module Started"))
-	FDTFluxRaceResultStyle::RegisterStyle();
-	InitMenuExtension();
-	RegisterRaceResultTab();
-}
-
-#pragma region MenuExtension
-
-
-void DTFLUXRACERESULT_API FDTFluxRaceResult::InitMenuExtension()
-{
-	UToolMenus::RegisterStartupCallback(
-		FSimpleMulticastDelegate::FDelegate::CreateRaw(this,
-		                                               &FDTFluxRaceResult::RegisterMenuExtensions));
-}
-
-
-void DTFLUXRACERESULT_API FDTFluxRaceResult::RegisterMenuExtensions()
-{
-    
-	// Étendre le menu enregistré
-	if (UToolMenu* DTFluxMenu = UToolMenus::Get()->ExtendMenu("DTFlux.MainMenu"))
-	{
-		FToolMenuSection& ToolsSection = DTFluxMenu->FindOrAddSection("Tools");
-		ToolsSection.AddMenuEntry(
-			"DTFluxRaceResult",
-			FText::FromString("RaceResult"),
-			FText::FromString("Launch DTFlux RaceResult Control Panel"),
-			FSlateIcon(FDTFluxRaceResultStyle::GetStyleSetName(), "LevelEditor.Tab.IconRaceResult"),
-			FUIAction(FExecuteAction::CreateRaw(this, &FDTFluxRaceResult::OnButtonClicked))
-		);
-	}
-	
-}
-
-void FDTFluxRaceResult::CreateSubmenu(UToolMenu* Menu)
-{
-	// Section 2 : Tools
-	FToolMenuSection& ToolsSection = Menu->FindOrAddSection("Tools");
-	ToolsSection.Label = FText::FromString("Tools");
-	ToolsSection.AddMenuEntry(
-		"DTFluxRaceResult",
-		FText::FromString("RaceResult"),
-		FText::FromString("Launch Race Result WebAdmin Console"),
-		FSlateIcon(FDTFluxRaceResultStyle::GetStyleSetName(), "LevelEditor.Tab.IconRaceResult"),
-		// Adaptez selon votre icône
-		FUIAction(FExecuteAction::CreateRaw(this, &FDTFluxRaceResult::OnButtonClicked))
-	);
-}
-
-void DTFLUXRACERESULT_API FDTFluxRaceResult::OnButtonClicked()
-{
-	FGlobalTabmanager::Get()->TryInvokeTab(RaceResultTabId);
-	UE_LOG(LogTemp, Log, TEXT("Race Result Launched"))
-}
-
-#pragma endregion EditorTab
-
-#pragma region
-void DTFLUXRACERESULT_API FDTFluxRaceResult::RegisterRaceResultTab()
-{
-	FTabSpawnerEntry& SpawnerEntry =
-		FGlobalTabmanager::Get()->RegisterNomadTabSpawner(
-			                        RaceResultTabId,
-			                        FOnSpawnTab::CreateRaw(this, &FDTFluxRaceResult::OnSpawnTab)
-		                        )
-		                        .SetDisplayName(RaceResultTabDisplayName)
-		                        .SetTooltipText(FText::FromString(TEXT("Race Result Control Panel")));
-}
-
-TSharedRef<SDockTab> DTFLUXRACERESULT_API FDTFluxRaceResult::OnSpawnTab(const FSpawnTabArgs& SpawnTabArgs)
-{
-	return
-			SNew(
-				SDockTab
-			)
-			.TabRole(ETabRole::NomadTab)
-			// .ShouldAutosize(true)
-			[
-				SNew(SDTFluxRaceResultWidget)
-			];
-}
-
-#pragma endregion
-void DTFLUXRACERESULT_API FDTFluxRaceResult::ShutdownModule()
-{
-	FGlobalTabmanager::Get()->UnregisterNomadTabSpawner(RaceResultTabId);
-	FDTFluxRaceResultStyle::UnregisterStyle();
-}
-
-
-//
-// // Dans votre code de debug
-// void DTFLUXRACERESULT_API FDTFluxRaceResult::DebugMenus()
-// {
-// 	UToolMenus* ToolMenus = UToolMenus::Get();
-// 	if (ToolMenus)
-// 	{
-// 		TArray<FName> MenuNames;
-// 		ToolMenus->GetAllMenuNames(MenuNames);
-//         
-// 		UE_LOG(logDTFluxRaceResult, Warning, TEXT("=== ALL AVAILABLE MENUS ==="));
-// 		for (const FName& MenuName : MenuNames)
-// 		{
-// 			UE_LOG(logDTFluxRaceResult, Warning, TEXT("Menu: %s"), *MenuName.ToString());
-//             
-// 			// Obtenir les sections de chaque menu
-// 			UToolMenu* Menu = ToolMenus->FindMenu(MenuName);
-// 			if (Menu)
-// 			{
-// 				for (const FToolMenuSection& Section : Menu->Sections)
-// 				{
-// 					UE_LOG(logDTFluxRaceResult, Warning, TEXT("  Section: %s"), *Section.Name.ToString());
-// 				}
-// 			}
-// 		}
-// 		UE_LOG(logDTFluxRaceResult, Warning, TEXT("=== END MENU LIST ==="));
-// 	}
-// }
-
-
-// void DTFLUXRACERESULT_API FDTFluxRaceResult::AddMenu(FMenuBarBuilder& MenuBarBuilder)
-// {
-// 	MenuBarBuilder.AddPullDownMenu(
-// 		FText::FromString("DTFlux"),
-// 		FText::FromString("DTFlux API Tools"),
-// 		FNewMenuDelegate::CreateRaw(this, &FDTFluxRaceResult::FillMenu)
-// 		);
-// }
-
-// void DTFLUXRACERESULT_API FDTFluxRaceResult::FillMenu(FMenuBuilder& MenuBuilder)
-// {
-// 	MenuBuilder.AddMenuEntry(
-// 	FText::FromString("RaceResult ControlPanel"),
-// 	FText::FromString("Launch RaceResult Control Panel"),
-// 	FSlateIcon(FDTFluxRaceResultStyle::GetStyleSetName(), "LevelEditor.Tab.IconRaceResult"),
-// 	FExecuteAction::CreateRaw(this, &FDTFluxRaceResult::OnButtonClicked)
-// 	);
-// 	MenuBuilder.EndSection();
-// }
-
-
-#undef LOCTEXT_NAMESPACE
-
-IMPLEMENT_MODULE(FDTFluxRaceResult, DTFluxRaceResult)

Source/DTFluxRaceResult/Private/Widget/SDTFluxRaceResultWidget.cpp

@@ -1,283 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "Widget/SDTFluxRaceResultWidget.h"
-
-#include "DTFluxRaceResultModule.h"
-#include "HttpModule.h"
-#include "IWebBrowserCookieManager.h"
-#include "IWebBrowserWindow.h"
-#include "SlateOptMacros.h"
-#include "WebBrowserModule.h"
-#include "Interfaces/IHttpRequest.h"
-#include "Interfaces/IHttpResponse.h"
-
-BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
-
-void SDTFluxRaceResultWidget::Construct(const FArguments& InArgs)
-{
-
-	FWebBrowserInitSettings browserInitSettings = FWebBrowserInitSettings();
-	
-	IWebBrowserModule::Get().CustomInitialize(browserInitSettings);
-	WindowSettings.InitialURL = TEXT("about:blank");
-	WindowSettings.BrowserFrameRate = 25;
-
-	if (IWebBrowserModule::IsAvailable() && IWebBrowserModule::Get().IsWebModuleAvailable())
-	{
-		IWebBrowserSingleton* WebBrowserSingleton = IWebBrowserModule::Get().GetSingleton();
-		Browser = WebBrowserSingleton->CreateBrowserWindow(WindowSettings);
-		// Browser->OnLoadUrl().BindRaw(this, &SDTFluxRaceResultWidget::OnLoadOverride);
-		
-	}
-
-	
-	ChildSlot
-	[
-		SNew(SBox)
-		.Padding(5.0f)
-		[
-			SNew(SBorder)
-			.BorderImage(FCoreStyle::Get().GetBrush("ToolPanel.GroupBorder"))
-			[
-				SNew(SVerticalBox)
-				+ SVerticalBox::Slot()
-				[
-					SAssignNew(WebBrowser, SWebBrowser, Browser)
-					.ShowControls(true)
-					.SupportsTransparency(true)
-					.OnUrlChanged(this, &SDTFluxRaceResultWidget::OnUrlChanged)
-					.OnBeforeNavigation(this, &SDTFluxRaceResultWidget::OnBeforeNavigation)
-					.OnLoadCompleted(FSimpleDelegate::CreateRaw(this, &SDTFluxRaceResultWidget::OnLoadCompleted))
-					.OnLoadError(FSimpleDelegate::CreateRaw(this, &SDTFluxRaceResultWidget::OnLoadError))
-					.OnLoadStarted(FSimpleDelegate::CreateRaw(this, &SDTFluxRaceResultWidget::OnLoadStarted))
-					.ShowErrorMessage(true)
-					.ShowAddressBar(true)
-				]
-			]
-		]
-	];
-	
-}
-
-void SDTFluxRaceResultWidget::OnCookieSet(bool bSuccess)
-{
-}
-
-
-void SDTFluxRaceResultWidget::LoadContentViaHTTP()
-{
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("Loading initial content via HTTP: %s"), *RaceResultUrl);
-	LoadSpecificURL(RaceResultUrl);
-}
-
-
-void SDTFluxRaceResultWidget::LoadSpecificURL(const FString& Url)
-{
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("Loading via HTTP: %s"), *Url);
-    
-	// Créer la requête HTTP
-	TSharedRef<IHttpRequest, ESPMode::ThreadSafe> Request = FHttpModule::Get().CreateRequest();
-    
-	// Ajouter l'authentification Basic pour TOUTES les requêtes
-	FString Credentials = Username + TEXT(":") + Password;
-	FString EncodedCredentials = FBase64::Encode(Credentials);
-    
-	Request->SetURL(Url);
-	Request->SetVerb("GET");
-	Request->SetHeader("Authorization", "Basic " + EncodedCredentials);
-	Request->SetHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36");
-	Request->SetHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8");
-	Request->SetHeader("Accept-Language", "en-US,en;q=0.5");
-	Request->SetHeader("Accept-Encoding", "gzip, deflate");
-	Request->SetHeader("Connection", "keep-alive");
-    
-	Request->OnProcessRequestComplete().BindRaw(this, &SDTFluxRaceResultWidget::OnHTTPContentLoaded);
-	Request->ProcessRequest();
-    
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("HTTP request sent with Basic Auth"));
-}
-
-void SDTFluxRaceResultWidget::OnHTTPContentLoaded(TSharedPtr<IHttpRequest> Request,
-	TSharedPtr<IHttpResponse> HttpResponse, bool bWasSuccessful)
-{
-	if (bWasSuccessful && HttpResponse.IsValid())
-	{
-		int32 ResponseCode = HttpResponse->GetResponseCode();
-		UE_LOG(logDTFluxRaceResult, Log, TEXT("HTTP Response Code: %d"), ResponseCode);
-        
-		if (ResponseCode == 200)
-		{
-			FString Content = HttpResponse->GetContentAsString();
-			UE_LOG(logDTFluxRaceResult, Log, TEXT("Content loaded successfully, size: %d characters"), Content.Len());
-            
-			// Traiter le contenu HTML
-			FString ProcessedContent = ProcessHTMLContent(Content, Request->GetURL());
-            
-			// Charger le contenu dans le browser via LoadString
-			if (Browser.IsValid())
-			{
-				Browser->LoadString(ProcessedContent, Request->GetURL());
-				UE_LOG(logDTFluxRaceResult, Log, TEXT("Content loaded into browser"));
-			}
-		}
-		else if (ResponseCode == 401)
-		{
-			UE_LOG(logDTFluxRaceResult, Error, TEXT("Authentication failed - 401 Unauthorized. Check your credentials."));
-		}
-		else if (ResponseCode == 403)
-		{
-			UE_LOG(logDTFluxRaceResult, Error, TEXT("Access forbidden - 403 Forbidden"));
-		}
-		else if (ResponseCode == 404)
-		{
-			UE_LOG(logDTFluxRaceResult, Error, TEXT("Page not found - 404 Not Found"));
-		}
-		else
-		{
-			UE_LOG(logDTFluxRaceResult, Error, TEXT("HTTP request failed with code: %d"), ResponseCode);
-		}
-	}
-	else
-	{
-		UE_LOG(logDTFluxRaceResult, Error, TEXT("HTTP request failed completely"));
-	}
-}
-
-void SDTFluxRaceResultWidget::OnLoadOverride()
-{
-}
-
-
-void SDTFluxRaceResultWidget::OnUrlChanged(const FText& NewUrl)
-{
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("URL changed to: %s"), *NewUrl.ToString());
-}
-
-FString SDTFluxRaceResultWidget::ProcessHTMLContent(const FString& Content, const FString& BaseUrl)
-{
-	FString ProcessedContent = Content;
-    
-	// Extraire le domaine de base
-	FString BaseDomain = ExtractDomain(BaseUrl);
-    
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("Processing HTML content, base domain: %s"), *BaseDomain);
-    
-	// Convertir tous les liens relatifs en liens absolus
-	ProcessedContent = ProcessedContent.Replace(TEXT("src=\"/"), *FString::Printf(TEXT("src=\"%s/"), *BaseDomain));
-	ProcessedContent = ProcessedContent.Replace(TEXT("href=\"/"), *FString::Printf(TEXT("href=\"%s/"), *BaseDomain));
-	ProcessedContent = ProcessedContent.Replace(TEXT("src='/"), *FString::Printf(TEXT("src='%s/"), *BaseDomain));
-	ProcessedContent = ProcessedContent.Replace(TEXT("href='/"), *FString::Printf(TEXT("href='%s/"), *BaseDomain));
-    
-	// Gérer les liens relatifs avec ./
-	ProcessedContent = ProcessedContent.Replace(TEXT("src=\"./"), *FString::Printf(TEXT("src=\"%s/"), *BaseDomain));
-	ProcessedContent = ProcessedContent.Replace(TEXT("href=\"./"), *FString::Printf(TEXT("href=\"%s/"), *BaseDomain));
-    
-	// Ajouter une balise base pour aider avec les liens relatifs restants
-	FString BaseTag = FString::Printf(TEXT("<base href=\"%s/\">"), *BaseDomain);
-	if (ProcessedContent.Contains(TEXT("<head>")))
-	{
-		FString HeadReplacement = TEXT("<head>") + BaseTag;
-		ProcessedContent = ProcessedContent.Replace(TEXT("<head>"), *HeadReplacement);
-	}
-	else if (ProcessedContent.Contains(TEXT("<HEAD>")))
-	{
-		FString HeadReplacement = TEXT("<HEAD>") + BaseTag;
-		ProcessedContent = ProcessedContent.Replace(TEXT("<HEAD>"), *HeadReplacement);
-	}
-    
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("HTML content processed"));
-	return ProcessedContent;
-}
-
-
-FString SDTFluxRaceResultWidget::ExtractDomain(const FString& Url)
-{
-	FString Domain = Url;
-    
-	// Enlever le protocole
-	if (Url.StartsWith(TEXT("https://")))
-	{
-		Domain = Url.Mid(8);
-	}
-	else if (Url.StartsWith(TEXT("http://")))
-	{
-		Domain = Url.Mid(7);
-	}
-    
-	// Trouver le premier slash (début du path)
-	int32 SlashIndex;
-	if (Domain.FindChar(TEXT('/'), SlashIndex))
-	{
-		Domain = Url.Left(Url.Len() - (Domain.Len() - SlashIndex));
-	}
-    
-	// Enlever le port si présent
-	FString DomainPart = Domain;
-	if (Domain.StartsWith(TEXT("https://")))
-	{
-		DomainPart = Domain.Mid(8);
-	}
-	else if (Domain.StartsWith(TEXT("http://")))
-	{
-		DomainPart = Domain.Mid(7);
-	}
-    
-	int32 ColonIndex;
-	if (DomainPart.FindChar(TEXT(':'), ColonIndex))
-	{
-		Domain = Domain.Left(Domain.Len() - (DomainPart.Len() - ColonIndex));
-	}
-    
-	return Domain;
-}
-
-bool SDTFluxRaceResultWidget::OnBeforeNavigation(const FString& Url, const FWebNavigationRequest& Request)
-{
-
-		UE_LOG(logDTFluxRaceResult, Log, TEXT("Loading via HTTP: %s"), *Url);
-    
-		TSharedRef<IHttpRequest, ESPMode::ThreadSafe> HTTPRequest = FHttpModule::Get().CreateRequest();
-    
-		// Authentification pour toutes les requêtes
-		FString Credentials = Username + TEXT(":") + Password;
-		FString EncodedCredentials = FBase64::Encode(Credentials);
-    
-		HTTPRequest->SetURL(RaceResultUrl);
-		HTTPRequest->SetVerb("GET");
-		HTTPRequest->SetHeader("Authorization", "Basic " + EncodedCredentials);
-		HTTPRequest->SetHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36");
-		HTTPRequest->SetHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
-    
-		HTTPRequest->OnProcessRequestComplete().BindRaw(this, &SDTFluxRaceResultWidget::OnHTTPContentLoaded);
-		HTTPRequest->ProcessRequest();
-
-	return true;
-}
-
-void SDTFluxRaceResultWidget::OnLoadCompleted()
-{
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("Load Completed"));
-
-}
-
-void SDTFluxRaceResultWidget::OnLoadStarted()
-{
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("Load Started"));
-}
-
-void SDTFluxRaceResultWidget::OnLoadError()
-{
-	UE_LOG(logDTFluxRaceResult, Log, TEXT("Load Error"));
-}
-
-void SDTFluxRaceResultWidget::OnBeforeResourceLoad(FString Url, FString ResourceType, FContextRequestHeaders& AdditionalHeaders, const bool AllowUserCredentials)
-{
-}
-
-void SDTFluxRaceResultWidget::SetupBasicAuth()
-{
-	
-}
-
-END_SLATE_FUNCTION_BUILD_OPTIMIZATION

Source/DTFluxRaceResult/Private/Widget/Style/DTFluxRaceResultStyle.cpp

@@ -1,47 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "Widget/Style/DTFluxRaceResultStyle.h"
-
-
-#include "Interfaces/IPluginManager.h"
-#include "Styling/SlateStyleRegistry.h"
-#include "Styling/SlateStyleMacros.h"
-
-#define RootToContentDir Style->RootToContentDir
-
-TSharedPtr<ISlateStyle> FDTFluxRaceResultStyle::StyleSet = nullptr;
-
-void FDTFluxRaceResultStyle::RegisterStyle()
-{
-	if(StyleSet.IsValid()) return;
-
-	StyleSet = Create();
-	FSlateStyleRegistry::RegisterSlateStyle(*StyleSet);
-}
-
-void FDTFluxRaceResultStyle::UnregisterStyle()
-{
-	if(StyleSet.IsValid())
-	{
-		FSlateStyleRegistry::UnRegisterSlateStyle(*StyleSet);
-		ensure(StyleSet.IsUnique());
-		StyleSet.Reset();
-	}
-
-	
-}
-
-void FDTFluxRaceResultStyle::ReloadTextures()
-{
-}
-
-TSharedPtr<ISlateStyle> FDTFluxRaceResultStyle::Create()
-{
-	TSharedPtr<FSlateStyleSet> Style = MakeShareable(new FSlateStyleSet("DTFluxRaceResultStyle"));
-	Style->SetContentRoot(IPluginManager::Get().FindPlugin("DTFluxAPI")->GetBaseDir()/TEXT("Resources"));
-
-	Style->Set("LevelEditor.Tab.IconRaceResult", new IMAGE_BRUSH_SVG("DTFluxRaceResult16x16", FVector2d(16)) );
-	return Style;
-}
-

Source/DTFluxRaceResult/Public/DTFluxRaceResultModule.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Modules/ModuleManager.h"
-
-DTFLUXRACERESULT_API DECLARE_LOG_CATEGORY_EXTERN(logDTFluxRaceResult, All, All);
-
-class DTFLUXRACERESULT_API FDTFluxRaceResult : public IModuleInterface
-{
-public:
-    virtual void StartupModule() override;
-    virtual void ShutdownModule() override;
-
-#pragma region MenuExtention
-    void RegisterMenuExtensions();
-    void InitMenuExtension();
-    void CreateSubmenu(UToolMenu* Menu);
-
-    // void AddMenu(FMenuBarBuilder& MenuBarBuilder);
-    // void FillMenu(FMenuBuilder& MenuBuilder);
-    void OnButtonClicked();
-#pragma endregion
-
-#pragma region EditorTab
-    void RegisterRaceResultTab();
-    TSharedRef<SDockTab> OnSpawnTab(const FSpawnTabArgs& SpawnTabArgs);
-private:
-    // static void DebugMenus();
-    static FName RaceResultTabId;
-    static FText RaceResultTabDisplayName;
-    TSharedPtr<class SDTFluxRaceResultWidget> RaceResultWidget;
-#pragma endregion
-};

Source/DTFluxRaceResult/Public/Widget/SDTFluxRaceResultWidget.h

@@ -1,54 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "SWebBrowser.h"
-#include "Widgets/SCompoundWidget.h"
-
-class IHttpResponse;
-class IHttpRequest;
-/**
- * 
- */
-class DTFLUXRACERESULT_API SDTFluxRaceResultWidget : public SCompoundWidget
-{
-public:
-	SLATE_BEGIN_ARGS(SDTFluxRaceResultWidget)
-		{
-		}
-
-	SLATE_END_ARGS()
-
-	/** Constructs this widget with InArgs */
-	void Construct(const FArguments& InArgs);
-	void OnCookieSet(bool bSuccess);
-	void LoadSpecificURL(const FString& Url);
-	void LoadContentViaHTTP();
-
-private:
-	TSharedPtr<SWebBrowser> WebBrowser;
-	TSharedPtr<IWebBrowserWindow> Browser;
-	TSharedPtr<IWebBrowserAdapter> BrowserAdapter;
-	FCreateBrowserWindowSettings WindowSettings;
-	
-	void OnUrlChanged(const FText& NewUrl);
-	FString ProcessHTMLContent(const FString& Content, const FString& BaseUrl);
-	FString ExtractDomain(const FString& Url);
-	void OnHTTPContentLoaded(TSharedPtr<IHttpRequest> Request, TSharedPtr<IHttpResponse> HttpResponse, bool bWasSuccessful);
-	bool OnBeforeNavigation(const FString& Url, const FWebNavigationRequest& Request);
-	void OnLoadCompleted();
-	void OnLoadStarted();
-	void OnLoadError();
-
-	void OnLoadOverride();
-	
-	void OnBeforeResourceLoad(FString Url, FString ResourceType, FContextRequestHeaders& AdditionalHeaders, const bool AllowUserCredentials);
-
-	FString RaceResultUrl = "https://raceresult.tds-france.com";
-	FString Username = "sporkrono";
-	FString Password = "Notre 3ème décennie d'action pour le climat";
-	
-
-	void SetupBasicAuth();
-};

Source/DTFluxRaceResult/Public/Widget/Style/DTFluxRaceResultStyle.h

@@ -1,34 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Styling/ISlateStyle.h"
-
-
-/**
- * 
- */
-class DTFLUXRACERESULT_API FDTFluxRaceResultStyle
-{
-
-public:
-	static void RegisterStyle();
-	static void UnregisterStyle();
-
-	static void ReloadTextures();
-
-	static const ISlateStyle& Get()
-	{
-		return *StyleSet;
-	}
-
-	static const FName& GetStyleSetName()
-	{
-		return StyleSet->GetStyleSetName();
-	}
-
-private:
-	static TSharedPtr<ISlateStyle> Create();
-	static TSharedPtr<ISlateStyle> StyleSet;
-};

Source/DTFluxUtilities/Private/DTFluxDatesUtilities.cpp

@@ -1,6 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-
 #include "DTFluxDatesUtilities.h"
 
 #include "DTFluxUtilitiesModule.h"
@@ -16,18 +15,20 @@ DTFluxDatesUtilities::~DTFluxDatesUtilities()
 
 bool DTFluxDatesUtilities::CompileDateAndTime(const FString& Time, const FString& Date, FDateTime& OutDateTime)
 {
-	if(Time.Len() < 8 && Date.Len() < 10)
+	if (Time.Len() < 8 && Date.Len() < 10)
 	{
 		TArray<FString> ExplodedTime;
 		Time.ParseIntoArray(ExplodedTime, TEXT(":"));
-		if(ExplodedTime.Num() != 3 && !ExplodedTime[0].IsNumeric() && !ExplodedTime[1].IsNumeric() & !ExplodedTime[2].IsNumeric())
+		if (ExplodedTime.Num() != 3 && !ExplodedTime[0].IsNumeric() && !ExplodedTime[1].IsNumeric() & !ExplodedTime[2].
+			IsNumeric())
 		{
 			UE_LOG(logDTFluxUtilities, Error, TEXT("Bad Time Format [%s]. Unable to parse"), *Time);
 			return false;
 		}
 		TArray<FString> ExplodedDate;
 		Date.ParseIntoArray(ExplodedDate, TEXT("-"));
-		if(ExplodedDate.Num() != 3 && !ExplodedDate[0].IsNumeric() && !ExplodedDate[1].IsNumeric() && !ExplodedDate[2].IsNumeric() )
+		if (ExplodedDate.Num() != 3 && !ExplodedDate[0].IsNumeric() && !ExplodedDate[1].IsNumeric() && !ExplodedDate[2].
+			IsNumeric())
 		{
 			UE_LOG(logDTFluxUtilities, Error, TEXT("Bad Date Format [%s]. Unable to parse"), *Date);
 			return false;
@@ -38,7 +39,7 @@ bool DTFluxDatesUtilities::CompileDateAndTime(const FString& Time, const FString
 		int32 Day = FCString::Atoi(*ExplodedDate[2]);
 		int32 Month = FCString::Atoi(*ExplodedDate[1]);
 		int32 Year = FCString::Atoi(*ExplodedDate[0]);
-		if(FDateTime::Validate(Year, Month, Day, Hours, Minutes, Seconds, 0))
+		if (FDateTime::Validate(Year, Month, Day, Hours, Minutes, Seconds, 0))
 		{
 			OutDateTime = FDateTime(Year, Month, Day, Hours, Minutes, Seconds);
 			return true;

Source/DTFluxUtilities/Private/FTDFluxUtils.cpp

@@ -5,15 +5,17 @@
 
 #include "DTFluxCoreSubsystem.h"
 
-FText UFTDFluxUtils::GetFormatedName(const int& Bib, const int MaxChar, const FString OverFlowChar)
+FText UFTDFluxUtils::GetFormatedName(const int& Bib, const int MaxChar, const FString Separator,
+                                     const FString OverFlowChar)
 {
 	UDTFluxCoreSubsystem* CoreSubsystem = GEngine->GetEngineSubsystem<UDTFluxCoreSubsystem>();
 	const FDTFluxParticipant OutParticipant = CoreSubsystem->GetParticipant(Bib);
-	return OutParticipant.GetFormattedNameText(MaxChar, OverFlowChar);
+	return OutParticipant.GetFormattedNameText(MaxChar, Separator, OverFlowChar);
 }
 
 FText UFTDFluxUtils::GetParticipantFormatedName(FDTFluxParticipant& Participant, const int MaxChar,
+                                                const FString Separator,
                                                 const FString OverFlowChar)
 {
-	return Participant.GetFormattedNameText(MaxChar, OverFlowChar);
+	return Participant.GetFormattedNameText(MaxChar, Separator, OverFlowChar);
 }

Source/DTFluxUtilities/Public/DTFluxDatesUtilities.h

@@ -1,11 +1,8 @@
 // Fill out your copyright notice in the Description page of Project Settings.
-
 #pragma once
 
 #include "CoreMinimal.h"
-/**
- * 
- */
+
 class DTFLUXUTILITIES_API DTFluxDatesUtilities
 {
 public:

Source/DTFluxUtilities/Public/FTDFluxUtils.h

@@ -17,9 +17,10 @@ class DTFLUXUTILITIES_API UFTDFluxUtils : public UBlueprintFunctionLibrary
 
 public:
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="name, concat, participant"))
-	static FText GetFormatedName(const int& Bib, const int MaxChar = 10,
+	static FText GetFormatedName(const int& Bib, const int MaxChar = 10, const FString Separator = ".",
 	                             const FString OverFlowChar = "...");
 	UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="name, concat, participant"))
 	static FText GetParticipantFormatedName(FDTFluxParticipant& Participant, const int MaxChar = 10,
+	                                        const FString Separator = ".",
 	                                        const FString OverFlowChar = "...");
 };