Compare commits
48 Commits
7ce81040e9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 892e282d1d | |||
| adc46114d8 | |||
| c88718fe35 | |||
| 8fe2750a54 | |||
| 33d3ea1e37 | |||
| 0bc765cd29 | |||
| dbe904e388 | |||
| 1f35fcbcf5 | |||
| 65c32d9240 | |||
| 609f623737 | |||
| e02ed8538f | |||
| 9b85bfc94a | |||
| da89e35eb2 | |||
| d6b8874827 | |||
| 193d8d4094 | |||
| 3291eb366d | |||
| 714e616fb1 | |||
| 17368f359f | |||
| 880ca9a3b1 | |||
| c02993057f | |||
| 69536766b1 | |||
| e63f54a882 | |||
| 6b58525349 | |||
| 505e4b7af2 | |||
| ae8b694f69 | |||
| a0b3ad6d8c | |||
| f644fb99a8 | |||
| fdae0fddc8 | |||
| f304685f01 | |||
| 07c83b5c8e | |||
| de5ed7f328 | |||
| 0a175f7813 | |||
| 4bbdf43ffa | |||
| 51e5898d4b | |||
| 1c04ae6bd7 | |||
| e6d878aeef | |||
| a1e6902a15 | |||
| c2733a2b97 | |||
| 76a199e95e | |||
| 6a88fec83a | |||
| 700a7120f0 | |||
| f1d583926b | |||
| a08bcd98a4 | |||
| d7a189f905 | |||
| 0d851b7298 | |||
| d92ca63ea4 | |||
| f1f300a351 | |||
| 73413e44b4 |
@ -49,6 +49,11 @@
|
||||
"Name": "DTFluxAPIStatus",
|
||||
"Type": "Editor",
|
||||
"LoadingPhase": "Default"
|
||||
},
|
||||
{
|
||||
"Name": "DTFluxRemote",
|
||||
"Type": "Editor",
|
||||
"LoadingPhase": "Default"
|
||||
}
|
||||
],
|
||||
"Plugins": [
|
||||
|
||||
@ -338,7 +338,8 @@ void SDTFluxStatusWidget::PopulateComboBoxItems()
|
||||
{
|
||||
FString Separator = " | ";
|
||||
FString RootSeparator = " -> ";
|
||||
TArray<FDTFluxContest> DataFromSubsystem = DTFluxCore->GetContests();
|
||||
TArray<FDTFluxContest> DataFromSubsystem = TArray<FDTFluxContest>();
|
||||
DTFluxCore->GetContests(DataFromSubsystem);
|
||||
|
||||
for (const auto& Contest : DataFromSubsystem)
|
||||
{
|
||||
@ -416,7 +417,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 +433,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();
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
#include "Widget/DTFluxAssetModelDetailsWidget.h"
|
||||
|
||||
#include "DTFluxAssetsEditorModule.h"
|
||||
#include "Widgets/Layout/SBorder.h"
|
||||
#include "Widgets/Layout/SBox.h"
|
||||
#include "Widgets/Text/STextBlock.h"
|
||||
@ -23,19 +24,19 @@ TSharedRef<SWidget> SHierarchicalTreeItemRow::GenerateWidgetForColumn(const FNam
|
||||
{
|
||||
if (!Item.IsValid())
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("GenerateWidgetForColumn: Invalid item for column %s"), *ColumnName.ToString());
|
||||
// UE_LOG(logDTFluxAssetEditor, Warning, TEXT("GenerateWidgetForColumn: Invalid item for column %s"), *ColumnName.ToString());
|
||||
return SNew(STextBlock).Text(FText::FromString("Invalid Item"));
|
||||
}
|
||||
|
||||
if (!ParentWidget)
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("GenerateWidgetForColumn: Invalid ParentWidget for column %s"),
|
||||
*ColumnName.ToString());
|
||||
// UE_LOG(logDTFluxAssetEditor, Warning, TEXT("GenerateWidgetForColumn: Invalid ParentWidget for column %s"),
|
||||
// *ColumnName.ToString());
|
||||
return SNew(STextBlock).Text(FText::FromString("Invalid Parent"));
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, VeryVerbose, TEXT("GenerateWidgetForColumn: %s for item %s"),
|
||||
*ColumnName.ToString(), *Item->Name);
|
||||
// UE_LOG(logDTFluxAssetEditor, VeryVerbose, TEXT("GenerateWidgetForColumn: %s for item %s"),
|
||||
// *ColumnName.ToString(), *Item->Name);
|
||||
|
||||
if (ColumnName == "Name")
|
||||
{
|
||||
@ -93,7 +94,7 @@ TSharedRef<SWidget> SHierarchicalTreeItemRow::GenerateWidgetForColumn(const FNam
|
||||
.OverflowPolicy(ETextOverflowPolicy::Ellipsis);
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Warning, TEXT("GenerateWidgetForColumn: Unknown column %s"), *ColumnName.ToString());
|
||||
UE_LOG(logDTFluxAssetEditor, Warning, TEXT("GenerateWidgetForColumn: Unknown column %s"), *ColumnName.ToString());
|
||||
return SNew(STextBlock).Text(FText::FromString(FString::Printf(TEXT("Unknown: %s"), *ColumnName.ToString())));
|
||||
}
|
||||
|
||||
@ -411,7 +412,7 @@ void SDTFluxAssetModelDetailsWidget::BuildContestHierarchy()
|
||||
RootItems.Add(ContestItem);
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("Built contest hierarchy with %d root contests"), RootItems.Num());
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("Built contest hierarchy with %d root contests"), RootItems.Num());
|
||||
}
|
||||
|
||||
void SDTFluxAssetModelDetailsWidget::BuildParticipantList()
|
||||
@ -420,11 +421,11 @@ void SDTFluxAssetModelDetailsWidget::BuildParticipantList()
|
||||
|
||||
if (!ModelAsset)
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("BuildParticipantList: ModelAsset is null!"));
|
||||
return;
|
||||
UE_LOG(logDTFluxAssetEditor, Warning, TEXT("BuildParticipantList: ModelAsset is null!"));
|
||||
// return;
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("BuildParticipantList: ModelAsset has %d participants"), ModelAsset->Participants.Num());
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("BuildParticipantList: ModelAsset has %d participants"), ModelAsset->Participants.Num());
|
||||
|
||||
// Créer la liste des participants (pas de hiérarchie pour les participants)
|
||||
for (const auto& ParticipantPair : ModelAsset->Participants)
|
||||
@ -433,12 +434,12 @@ void SDTFluxAssetModelDetailsWidget::BuildParticipantList()
|
||||
auto ParticipantItem = FHierarchicalTreeItem::CreateParticipant(Participant);
|
||||
ParticipantItems.Add(ParticipantItem);
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("BuildParticipantList: Added participant %s (Bib: %d)"),
|
||||
*ParticipantItem->Name, ParticipantItem->Bib);
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("BuildParticipantList: Added participant %s (Bib: %d)"),
|
||||
// *ParticipantItem->Name, ParticipantItem->Bib);
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("BuildParticipantList: Built participant list with %d participants"),
|
||||
ParticipantItems.Num());
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("BuildParticipantList: Built participant list with %d participants"),
|
||||
// ParticipantItems.Num());
|
||||
}
|
||||
|
||||
// ===== CALLBACKS TREEVIEW =====
|
||||
@ -448,12 +449,12 @@ TSharedRef<ITableRow> SDTFluxAssetModelDetailsWidget::OnGenerateRowForTree(
|
||||
{
|
||||
if (!Item.IsValid())
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("OnGenerateRowForTree: Invalid item!"));
|
||||
UE_LOG(logDTFluxAssetEditor, Warning, TEXT("OnGenerateRowForTree: Invalid item!"));
|
||||
return SNew(STableRow<FHierarchicalTreeItemPtr>, OwnerTable);
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("OnGenerateRowForTree: Generating row for %s (Type: %d)"),
|
||||
*Item->Name, (int32)Item->Type);
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("OnGenerateRowForTree: Generating row for %s (Type: %d)"),
|
||||
// *Item->Name, (int32)Item->Type);
|
||||
|
||||
return SNew(SHierarchicalTreeItemRow, OwnerTable)
|
||||
.Item(Item)
|
||||
@ -536,7 +537,7 @@ FReply SDTFluxAssetModelDetailsWidget::OnExpandAllClicked()
|
||||
}
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("Expanded all contests"));
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("Expanded all contests"));
|
||||
return FReply::Handled();
|
||||
}
|
||||
|
||||
@ -550,14 +551,14 @@ FReply SDTFluxAssetModelDetailsWidget::OnCollapseAllClicked()
|
||||
}
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("Collapsed all contests"));
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("Collapsed all contests"));
|
||||
return FReply::Handled();
|
||||
}
|
||||
|
||||
FReply SDTFluxAssetModelDetailsWidget::OnRefreshClicked()
|
||||
{
|
||||
RefreshData();
|
||||
UE_LOG(LogTemp, Log, TEXT("Data refreshed"));
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("Data refreshed"));
|
||||
return FReply::Handled();
|
||||
}
|
||||
|
||||
@ -567,21 +568,17 @@ void SDTFluxAssetModelDetailsWidget::RefreshData()
|
||||
{
|
||||
if (!ModelAsset)
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("ModelAsset is null!"));
|
||||
UE_LOG(logDTFluxAssetEditor, Warning, TEXT("ModelAsset is null!"));
|
||||
return;
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("RefreshData: Starting refresh for ModelAsset %s"), *ModelAsset->GetName());
|
||||
|
||||
// Nettoyer les données existantes
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("RefreshData: Starting refresh for ModelAsset %s"), *ModelAsset->GetName());
|
||||
RootItems.Empty();
|
||||
ParticipantItems.Empty();
|
||||
|
||||
// Construire la hiérarchie
|
||||
BuildContestHierarchy();
|
||||
BuildParticipantList();
|
||||
|
||||
// Refresh les vues
|
||||
if (ContestTreeView.IsValid())
|
||||
{
|
||||
ContestTreeView->RequestTreeRefresh();
|
||||
@ -591,9 +588,8 @@ void SDTFluxAssetModelDetailsWidget::RefreshData()
|
||||
{
|
||||
ParticipantTreeView->RequestTreeRefresh();
|
||||
}
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("RefreshData: Completed successfully - %d contests, %d participants"), RootItems.Num(),
|
||||
ParticipantItems.Num());
|
||||
// UE_LOG(logDTFluxAssetEditor, Log, TEXT("RefreshData: Completed successfully - %d contests, %d participants"), RootItems.Num(),
|
||||
// ParticipantItems.Num());
|
||||
}
|
||||
|
||||
// ===== MÉTHODES UTILITAIRES =====
|
||||
@ -635,7 +631,6 @@ FText SDTFluxAssetModelDetailsWidget::GetStatsText() const
|
||||
{
|
||||
if (!ModelAsset)
|
||||
return FText::FromString("No data");
|
||||
|
||||
return FText::FromString(FString::Printf(
|
||||
TEXT("Contests: [%d] Participants: [%d] Persons: [%d]"),
|
||||
ModelAsset->Contests.Num(),
|
||||
|
||||
@ -108,7 +108,7 @@ struct FHierarchicalTreeItem
|
||||
Item->ContestId = InContestId;
|
||||
Item->SplitId = Split.SplitId;
|
||||
Item->ID = FString::Printf(TEXT("%d"), Split.SplitId);
|
||||
Item->Details = FString::Printf(TEXT("%d rankings"), Split.SplitRankings.Num());
|
||||
Item->Details = FString::Printf(TEXT("rankings"));
|
||||
Item->Status = TEXT("-");
|
||||
Item->Extra = TEXT("-");
|
||||
return Item;
|
||||
@ -137,7 +137,7 @@ struct FHierarchicalTreeItem
|
||||
typedef TSharedPtr<FHierarchicalTreeItem> FHierarchicalTreeItemPtr;
|
||||
|
||||
/**
|
||||
* Widget avec STreeView simple et efficace
|
||||
* ModelAsset TreeviewWidget
|
||||
*/
|
||||
class DTFLUXASSETSEDITOR_API SDTFluxAssetModelDetailsWidget : public SCompoundWidget
|
||||
{
|
||||
@ -152,40 +152,33 @@ public:
|
||||
void Construct(const FArguments& InArgs);
|
||||
void RefreshData();
|
||||
|
||||
// Méthodes publiques pour la sous-classe Row
|
||||
FSlateColor GetItemTypeColor(FHierarchicalTreeItem::EItemType Type) const;
|
||||
const FSlateBrush* GetItemIcon(FHierarchicalTreeItem::EItemType Type) const;
|
||||
|
||||
private:
|
||||
// Données
|
||||
UDTFluxModelAsset* ModelAsset = nullptr;
|
||||
TArray<FHierarchicalTreeItemPtr> RootItems; // Contests racines avec hiérarchie
|
||||
TArray<FHierarchicalTreeItemPtr> ParticipantItems; // Participants séparés
|
||||
TArray<FHierarchicalTreeItemPtr> RootItems;
|
||||
TArray<FHierarchicalTreeItemPtr> ParticipantItems;
|
||||
|
||||
// Widgets - TreeView simple
|
||||
TSharedPtr<STreeView<FHierarchicalTreeItemPtr>> ContestTreeView;
|
||||
TSharedPtr<STreeView<FHierarchicalTreeItemPtr>> ParticipantTreeView;
|
||||
TSharedPtr<STextBlock> StatsText;
|
||||
TSharedPtr<STextBlock> SelectionText;
|
||||
|
||||
// Méthodes de construction
|
||||
void BuildContestHierarchy();
|
||||
void BuildParticipantList();
|
||||
|
||||
// Callbacks TreeView
|
||||
TSharedRef<ITableRow> OnGenerateRowForTree(FHierarchicalTreeItemPtr Item,
|
||||
const TSharedRef<STableViewBase>& OwnerTable);
|
||||
void OnGetChildrenForTree(FHierarchicalTreeItemPtr Item, TArray<FHierarchicalTreeItemPtr>& OutChildren);
|
||||
void OnTreeSelectionChanged(FHierarchicalTreeItemPtr SelectedItem, ESelectInfo::Type SelectInfo);
|
||||
void OnSetExpansionRecursive(FHierarchicalTreeItemPtr Item, bool bIsExpanded);
|
||||
|
||||
// Callbacks des boutons
|
||||
FReply OnRefreshClicked();
|
||||
FReply OnExpandAllClicked();
|
||||
FReply OnCollapseAllClicked();
|
||||
|
||||
EActiveTimerReturnType ForceInitialLayout(double InCurrentTime, float InDeltaTime);
|
||||
|
||||
// Utilitaires
|
||||
FText GetStatsText() const;
|
||||
};
|
||||
|
||||
@ -13,6 +13,20 @@ UDTFluxModelAsset::UDTFluxModelAsset(const FObjectInitializer& ObjectInitializer
|
||||
void UDTFluxModelAsset::AddContest(const FDTFluxContest& Contest)
|
||||
{
|
||||
Contests.Add(Contest.Name, Contest);
|
||||
// initialisation
|
||||
for (const auto& Stage : Contest.Stages)
|
||||
{
|
||||
FinishedStagesCache.Add(FDTFluxStageKey(Contest.ContestId, Stage.StageId), Stage.IsFinished());
|
||||
}
|
||||
TArray<FDTFluxSplit> Splits = Contest.Splits;
|
||||
Splits.Sort([](const FDTFluxSplit& A, const FDTFluxSplit& B)
|
||||
{
|
||||
return A.SplitId < B.SplitId;
|
||||
});
|
||||
// last and Penultimate split cache for contest
|
||||
LastSplitIdCache.Add(Contest.ContestId, Splits.Pop().SplitId);
|
||||
PenultimateSplitIdCache.Add(Contest.ContestId, Splits.Pop().SplitId);
|
||||
|
||||
}
|
||||
|
||||
bool UDTFluxModelAsset::GetContestById(const int InContestId, FDTFluxContest& OutContest)
|
||||
@ -132,6 +146,38 @@ bool UDTFluxModelAsset::GetParticipantByBib(int Bib, FDTFluxParticipant& OutPart
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxModelAsset::IsStageFinished(FDTFluxStageKey StageKey)
|
||||
{
|
||||
if (!FinishedStagesCache.Contains(StageKey))
|
||||
{
|
||||
if (FinishedStagesCache[StageKey])
|
||||
{
|
||||
return true;
|
||||
}
|
||||
//maybe stage is finished because we have not be able to set it ?
|
||||
return CheckStageIsFinished(StageKey);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void UDTFluxModelAsset::CacheSplitSensorInfo(const FDTFluxSplitSensorKey SplitSensorKey,
|
||||
const FDTFluxSplitSensorInfo& SplitSensorInfo)
|
||||
{
|
||||
SplitSensorInfoCache.Add(SplitSensorKey, SplitSensorInfo);
|
||||
}
|
||||
|
||||
|
||||
bool UDTFluxModelAsset::CheckStageIsFinished(FDTFluxStageKey StageKey)
|
||||
{
|
||||
FDTFluxStage Stage;
|
||||
if (GetStage(StageKey, Stage))
|
||||
{
|
||||
FinishedStagesCache.Add(StageKey, Stage.IsFinished());
|
||||
return FinishedStagesCache[StageKey];
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
void UDTFluxModelAsset::UpdateOrCreateStageRanking(const FDTFluxStageRankings& InStageRankings)
|
||||
{
|
||||
|
||||
@ -1,3 +1,69 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
#include "Types/Struct/DTFluxRaceDataStructs.h"
|
||||
|
||||
bool FDTFluxStage::IsFinished() const
|
||||
{
|
||||
return EndTime <= FDateTime::Now();
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@ -3,6 +3,12 @@
|
||||
#include "Types/Struct/DTFluxRankingStructs.h"
|
||||
#include "DTFluxCoreModule.h"
|
||||
|
||||
bool FDTFluxBaseRankings::IsSealed(const FDateTime EndTime) const
|
||||
|
||||
{
|
||||
return ReceivedAt >= EndTime;
|
||||
}
|
||||
|
||||
void FDTFluxContestRanking::Dump() const
|
||||
{
|
||||
UE_LOG(logDTFluxCore, Log,
|
||||
|
||||
@ -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);
|
||||
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, Error, TEXT("Ctor with JSON Object Teammate is now %i long"), Teammate.Num());
|
||||
|
||||
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,134 @@ int FDTFluxParticipant::GetTeammateNum() const
|
||||
|
||||
bool FDTFluxParticipant::IsTeam() const
|
||||
{
|
||||
return Teammate.Num() < 1;
|
||||
UE_LOG(logDTFluxCore, Verbose, TEXT("IsTeam() -> %s, Teamate Num %i"),
|
||||
Team.IsEmpty() ? TEXT("TRUE") : TEXT("FALSE"), Teammate.Num());
|
||||
return !Team.IsEmpty();
|
||||
}
|
||||
|
||||
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("");
|
||||
}
|
||||
|
||||
if (Teammate.Num() == 0)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
if (IsTeam())
|
||||
{
|
||||
FString FullName;
|
||||
UE_LOG(logDTFluxCore, Verbose, TEXT("Participant is a team"));
|
||||
if (!Team.IsEmpty())
|
||||
{
|
||||
FullName = Team;
|
||||
}
|
||||
else
|
||||
{
|
||||
TArray<FString> Names;
|
||||
for (const FDTFluxPerson& Person : Teammate)
|
||||
{
|
||||
Names.Add(Person.LastName);
|
||||
}
|
||||
FullName = FString::Join(Names, TEXT("/"));
|
||||
}
|
||||
FullName = FullName.ToUpper();
|
||||
if (FullName.Len() <= MaxChar)
|
||||
{
|
||||
return FullName;
|
||||
}
|
||||
return FullName.Left(MaxChar) + OverflowChar;
|
||||
}
|
||||
FString FirstName = Teammate[0].FirstName;
|
||||
FString LastName = Teammate[0].LastName;
|
||||
FString Initial;
|
||||
if (!FirstName.IsEmpty())
|
||||
{
|
||||
Initial = FirstName.Left(1).ToUpper() + Separator;
|
||||
}
|
||||
const 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))
|
||||
{
|
||||
}
|
||||
|
||||
@ -35,15 +35,24 @@ public:
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TMap<FString /* ContestName */, FDTFluxContest> Contests;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TMap<int /*ContestId*/, FDTFluxContestRankings> ContestRankings;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TMap<FDTFluxStageKey, FDTFluxStageRankings> StageRankings;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TMap<FDTFluxSplitKey, FDTFluxSplitRankings> SplitRankings;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TMap<FDTFluxSplitSensorKey, FDTFluxSplitSensorInfo> SplitSensorInfoCache;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TMap<int /*ContestId*/, int /*SplitId*/> LastSplitIdCache;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TMap<int/*ContestId*/, int /*Penultimate*/>PenultimateSplitIdCache;
|
||||
|
||||
UFUNCTION(BlueprintCallable, CallInEditor, Category="DTFlux|ModelAsset")
|
||||
void AddContest(const FDTFluxContest& Contest);
|
||||
|
||||
@ -89,4 +98,15 @@ public:
|
||||
|
||||
UFUNCTION(BlueprintCallable, CallInEditor, Category="DTFlux|Participant")
|
||||
bool GetParticipantByBib(int Bib, FDTFluxParticipant& OutParticipant);
|
||||
|
||||
UFUNCTION()
|
||||
bool IsStageFinished(FDTFluxStageKey StageKey);
|
||||
UFUNCTION()
|
||||
void CacheSplitSensorInfo(const FDTFluxSplitSensorKey SplitSensorKey, const FDTFluxSplitSensorInfo& SplitSensorInfo);
|
||||
|
||||
private:
|
||||
UPROPERTY()
|
||||
TMap<FDTFluxStageKey, bool /*bIsFinished*/> FinishedStagesCache;
|
||||
UFUNCTION()
|
||||
bool CheckStageIsFinished(FDTFluxStageKey StageKey);
|
||||
};
|
||||
|
||||
@ -11,79 +11,80 @@
|
||||
UENUM(BlueprintType, Category="DTFlux|Model")
|
||||
enum class EDTFluxParticipantStatusType : uint8
|
||||
{
|
||||
Normal = 0 UMETA(DisplayName="Normal"),
|
||||
OutOfRace = 1 UMETA(DisplayName="HorsCourse"),
|
||||
DSQ = 2 UMETA(DisplayName="Disqualifié"),
|
||||
DNF = 3 UMETA(DisplayName="Abandon"),
|
||||
DNS = 4 UMETA(DisplayName="NonPartant"),
|
||||
NotLinedUp = 5 UMETA(DisplayName="NonPresentAuDépart"),
|
||||
Unknown = 1 << 4 UMETA(DisplayName="Unknown")
|
||||
Normal = 0 UMETA(DisplayName="Normal"),
|
||||
OutOfRace = 1 UMETA(DisplayName="HorsCourse"),
|
||||
DSQ = 2 UMETA(DisplayName="Disqualifié"),
|
||||
DNF = 3 UMETA(DisplayName="Abandon"),
|
||||
DNS = 4 UMETA(DisplayName="NonPartant"),
|
||||
NotLinedUp = 5 UMETA(DisplayName="NonPresentAuDépart"),
|
||||
Unknown = 1 << 4 UMETA(DisplayName="Unknown")
|
||||
};
|
||||
|
||||
|
||||
UENUM(BlueprintType, meta=(Bitflags, UseEnumValuesAsMaskValuesInEditor=true))
|
||||
enum class EParticipantSortingType : uint8
|
||||
{
|
||||
|
||||
None = 0 << 1 UMETA(DisplayName="Normal"),
|
||||
Alpha = 1 << 1 UMETA(DisplayName="Aplha"),
|
||||
PoursuiteStartTime = 1 << 2 UMETA(DisplayName="Poursuite StartTime"),
|
||||
Rank = 1 << 3 UMETA(DisplayName="Rank"),
|
||||
IgnoreEmpty = 1 << 4 UMETA(DisplayName="IgnoreEmpty"),
|
||||
None = 0 << 1 UMETA(DisplayName="Normal"),
|
||||
Alpha = 1 << 1 UMETA(DisplayName="Aplha"),
|
||||
PoursuiteStartTime = 1 << 2 UMETA(DisplayName="Poursuite StartTime"),
|
||||
Rank = 1 << 3 UMETA(DisplayName="Rank"),
|
||||
IgnoreEmpty = 1 << 4 UMETA(DisplayName="IgnoreEmpty"),
|
||||
};
|
||||
|
||||
ENUM_CLASS_FLAGS(EParticipantSortingType);
|
||||
|
||||
|
||||
UENUM(BlueprintType, meta=(Bitflags, UseEnumValuesAsMaskValuesInEditor=true))
|
||||
UENUM(BlueprintType)
|
||||
enum class EDTFluxFinisherType : uint8
|
||||
{
|
||||
None = 0b0000000 UMETA(DisplayName="Unknown"),
|
||||
Finish = 0b0000001 UMETA(DisplayName="Finish"),
|
||||
Winner = 0b0000010 UMETA(DisplayName="Winner"),
|
||||
Spotter = 0b0000100 UMETA(DisplayName="Spotter"),
|
||||
None = 0b0000000 UMETA(DisplayName="Unknown"),
|
||||
Finish = 0b0000001 UMETA(DisplayName="Finish"),
|
||||
Winner = 0b0000010 UMETA(DisplayName="Winner"),
|
||||
Spotter = 0b0000100 UMETA(DisplayName="Spotter"),
|
||||
};
|
||||
ENUM_CLASS_FLAGS(EDTFluxFinisherType);
|
||||
|
||||
UENUM(BlueprintType, meta=(Bitflags, UseEnumValuesAsMaskValuesInEditor=true))
|
||||
enum class EDTFluxSplitType : uint8
|
||||
{
|
||||
None = 0b00000000 UMETA(DisplayName="Undefined"),
|
||||
PreFinnish = 0b00000001 UMETA(DisplayName="PreFinnishSplit"),
|
||||
Finish = 0b00000010 UMETA(DisplayName="FinishSplit"),
|
||||
Regular = 0b00000100 UMETA(DisplayName="Regular"),
|
||||
None = 0b00000000 UMETA(DisplayName="Undefined"),
|
||||
PreFinnish = 0b00000001 UMETA(DisplayName="PreFinnishSplit"),
|
||||
Finish = 0b00000010 UMETA(DisplayName="FinishSplit"),
|
||||
Regular = 0b00000100 UMETA(DisplayName="Regular"),
|
||||
};
|
||||
|
||||
ENUM_CLASS_FLAGS(EDTFluxSplitType);
|
||||
|
||||
|
||||
UENUM(BlueprintType, meta=(Bitflags, UseEnumValuesAsMaskValuesInEditor=true))
|
||||
enum class EDTFluxSortingFilter : uint8
|
||||
enum class EDTFluxSortingFilter : uint8
|
||||
{
|
||||
None = 0b00000000 UMETA(DisplayName="No Sorting"),
|
||||
IgnoreStatusOut = 0b00000001 UMETA(DisplayName="IgnoreStatusOut"),
|
||||
Ascending = 0b00000010 UMETA(DisplayName="Ascending"),
|
||||
Descending = 0b00000100 UMETA(DisplayName="Descending"),
|
||||
IgnoreEmpty = 0b00001000 UMETA(DisplayName="IgnoreEmpty"),
|
||||
ByRank = 0b00010000 UMETA(DisplayName="ByRank"),
|
||||
ByAlpha = 0b01000000 UMETA(DisplayName="ByAlpha"),
|
||||
ByStartTime = 0b00100000 UMETA(DisplayName="ByStartTime"),
|
||||
AscendingByRank = Ascending | ByRank UMETA(DisplayName="AscendingByRank"),
|
||||
DescendingByRank= Descending | ByRank UMETA(DisplayName="DescendingByRank")
|
||||
None = 0b00000000 UMETA(DisplayName="No Sorting"),
|
||||
IgnoreStatusOut = 0b00000001 UMETA(DisplayName="IgnoreStatusOut"),
|
||||
Ascending = 0b00000010 UMETA(DisplayName="Ascending"),
|
||||
Descending = 0b00000100 UMETA(DisplayName="Descending"),
|
||||
IgnoreEmpty = 0b00001000 UMETA(DisplayName="IgnoreEmpty"),
|
||||
ByRank = 0b00010000 UMETA(DisplayName="ByRank"),
|
||||
ByAlpha = 0b01000000 UMETA(DisplayName="ByAlpha"),
|
||||
ByStartTime = 0b00100000 UMETA(DisplayName="ByStartTime"),
|
||||
AscendingByRank = Ascending | ByRank UMETA(DisplayName="AscendingByRank"),
|
||||
DescendingByRank = Descending | ByRank UMETA(DisplayName="DescendingByRank")
|
||||
};
|
||||
|
||||
ENUM_CLASS_FLAGS(EDTFluxSortingFilter);
|
||||
|
||||
|
||||
UENUM(BlueprintType)
|
||||
enum class EDTFluxSortingRankingType: uint8
|
||||
{
|
||||
Rank = 0b00000000 UMETA(DisplayName="Rank (Default)"),
|
||||
Name = 0b00000001 UMETA(DisplayName="Name"),
|
||||
Bib = 0b00000010 UMETA(DisplayName="Bib"),
|
||||
TimeSwim = 0b00000100 UMETA(DisplayName="Swimming Time"),
|
||||
TimeTransition = 0b00001000 UMETA(DisplayName="Transition Time"),
|
||||
TimeRun = TimeSwim|TimeTransition UMETA(DisplayName="Running Time"),
|
||||
StartTime = 0b00001110 UMETA(DisplayName="StartTime"),
|
||||
Gap = 0b00010000 UMETA(DisplayName="StartTime"),
|
||||
SwimSpeed = 0b00100000 UMETA(DisplayName="StartTime"),
|
||||
RunningSpeed = 0b01000000 UMETA(DisplayName="StartTime"),
|
||||
TotalSpeed = 0b10000000 UMETA(DisplayName="StartTime"),
|
||||
Rank = 0b00000000 UMETA(DisplayName="Rank (Default)"),
|
||||
Name = 0b00000001 UMETA(DisplayName="Name"),
|
||||
Bib = 0b00000010 UMETA(DisplayName="Bib"),
|
||||
TimeSwim = 0b00000100 UMETA(DisplayName="Swimming Time"),
|
||||
TimeTransition = 0b00001000 UMETA(DisplayName="Transition Time"),
|
||||
TimeRun = TimeSwim | TimeTransition UMETA(DisplayName="Running Time"),
|
||||
StartTime = 0b00001110 UMETA(DisplayName="StartTime"),
|
||||
Gap = 0b00010000 UMETA(DisplayName="StartTime"),
|
||||
SwimSpeed = 0b00100000 UMETA(DisplayName="StartTime"),
|
||||
RunningSpeed = 0b01000000 UMETA(DisplayName="StartTime"),
|
||||
TotalSpeed = 0b10000000 UMETA(DisplayName="StartTime"),
|
||||
};
|
||||
@ -109,3 +109,61 @@ struct DTFLUXCORE_API FDTFluxSplitKey : public FDTFluxCompositeKey
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct DTFLUXCORE_API FDTFluxSplitSensorKey : public FDTFluxCompositeKey
|
||||
{
|
||||
GENERATED_BODY()
|
||||
public:
|
||||
FDTFluxSplitSensorKey() = default;
|
||||
|
||||
FDTFluxSplitSensorKey(const int InContestId, const int InStageId, const int InSplitId, const int InBib) :
|
||||
ContestId(InContestId),
|
||||
StageId(InStageId),
|
||||
SplitId(InSplitId),
|
||||
Bib(InBib){};
|
||||
|
||||
|
||||
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="DTFlux|Model")
|
||||
int ContestId = 0;
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="DTFlux|Model")
|
||||
int StageId = 0;
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="DTFlux|Model")
|
||||
int SplitId = 0;
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category="DTFlux|Model")
|
||||
int Bib = 0;
|
||||
|
||||
|
||||
friend uint32 GetTypeHash(const FDTFluxSplitSensorKey& Key)
|
||||
{
|
||||
return HashCombine(
|
||||
GetTypeHash(Key.ContestId),
|
||||
GetTypeHash(Key.StageId),
|
||||
GetTypeHash(Key.SplitId),
|
||||
GetTypeHash(Key.Bib)
|
||||
);
|
||||
}
|
||||
|
||||
bool operator==(const FDTFluxSplitSensorKey& Other) const
|
||||
{
|
||||
return ContestId == Other.ContestId && StageId == Other.StageId
|
||||
&& SplitId == Other.SplitId && Bib == Other.Bib;
|
||||
}
|
||||
|
||||
FString GetDisplayName() const
|
||||
{
|
||||
return FString::Printf(TEXT("Contest%i | Stage%i | Split%i | Bib%i"), ContestId, StageId, SplitId, Bib);
|
||||
}
|
||||
|
||||
FText GetTooltipText() const
|
||||
{
|
||||
return FText::Format(INVTEXT("Contest{0}|Stage{1}|Split{2}"),
|
||||
FText::AsNumber(ContestId),
|
||||
FText::AsNumber(StageId),
|
||||
FText::AsNumber(SplitId),
|
||||
FText::AsNumber(Bib)
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
@ -15,6 +15,7 @@ USTRUCT(BlueprintType, Category="DTFlux|Model")
|
||||
struct DTFLUXCORE_API FDTFluxFinisherData
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
|
||||
int ContestId;
|
||||
@ -23,9 +24,7 @@ public:
|
||||
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
|
||||
int Bib = -1;
|
||||
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
|
||||
FDTFluxStageRanking SplitRanking;
|
||||
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model")
|
||||
FDTFluxStageRanking StageRanking;
|
||||
FString Time;
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType, Category="FDTFlux|Model")
|
||||
@ -64,4 +63,3 @@ struct DTFLUXCORE_API FDTFluxContestFinished
|
||||
UPROPERTY(BlueprintReadOnly, Category="DTFlux|Subsystem|Events")
|
||||
TArray<FDTFluxStageRanking> Rankings;
|
||||
};
|
||||
|
||||
|
||||
@ -23,12 +23,7 @@ public:
|
||||
int SplitId = -1;
|
||||
UPROPERTY(BlueprintReadWrite, Category="DTFlux|Model", EditAnywhere)
|
||||
FString Name;
|
||||
UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
|
||||
TArray<FDTFluxStageRanking> SplitRankings;
|
||||
// void Dump() const;
|
||||
// // void InsertOrReplace(const FDTFluxStageRankingResponseItem& SplitRankingItemResp);
|
||||
// void SortByRank();
|
||||
// TArray<FDTFluxSplitRanking> GetSplitRanking(const int From = 0, const int DisplayNumber = 0);
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
@ -51,6 +46,7 @@ public:
|
||||
FDateTime EndTime;
|
||||
UPROPERTY(BlueprintReadWrite, Category="DTFlux|model", EditAnywhere)
|
||||
FDateTime CutOff;
|
||||
bool IsFinished() const;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -89,68 +85,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
|
||||
{
|
||||
|
||||
@ -8,6 +8,18 @@
|
||||
#include "DTFluxRankingStructs.generated.h"
|
||||
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct DTFLUXCORE_API FDTFluxBaseRankings
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
UPROPERTY(BlueprintReadOnly, Category="DTFlux|Model", VisibleAnywhere)
|
||||
FDateTime ReceivedAt = FDateTime::Now();
|
||||
|
||||
bool IsSealed(const FDateTime EndTime) const;
|
||||
};
|
||||
|
||||
/**
|
||||
* @struct FDTFluxContestRanking
|
||||
* Representing a contest ranking for a participant
|
||||
@ -37,7 +49,7 @@ public:
|
||||
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDTFluxContestRankings
|
||||
struct FDTFluxContestRankings : public FDTFluxBaseRankings
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
@ -57,7 +69,7 @@ public:
|
||||
};
|
||||
|
||||
/**
|
||||
* @struct FDTFluxStageRanking
|
||||
* @struct FDTFluxDetailedRankingItem
|
||||
* Representing a stage ranking for a participant
|
||||
*/
|
||||
USTRUCT(BlueprintType, Category="DTFlux|Model")
|
||||
@ -94,7 +106,7 @@ public:
|
||||
};
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDTFluxDetailedRankings
|
||||
struct FDTFluxDetailedRankings : public FDTFluxBaseRankings
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
@ -125,7 +137,7 @@ struct FDTFluxStageRanking : public FDTFluxDetailedRankingItem
|
||||
* This struct is only a cosmetic Struct
|
||||
*/
|
||||
USTRUCT(BlueprintType, Category="DTFlux|Model")
|
||||
struct DTFLUXCORE_API FDTFluxSplitRanking : public FDTFluxStageRanking
|
||||
struct DTFLUXCORE_API FDTFluxSplitRanking : public FDTFluxDetailedRankingItem
|
||||
{
|
||||
GENERATED_BODY()
|
||||
};
|
||||
@ -165,6 +177,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]),
|
||||
|
||||
@ -17,7 +17,17 @@ struct FDTFluxSplitSensorInfo
|
||||
|
||||
public:
|
||||
FDTFluxSplitSensorInfo() = default;
|
||||
|
||||
FDTFluxSplitSensorInfo(const FString InSplitName):
|
||||
Bib(-1),
|
||||
ContestId(-1),
|
||||
StageId(-1),
|
||||
SplitId(-1),
|
||||
Time(""),
|
||||
Gap("-"),
|
||||
Rank(-1),
|
||||
SplitName(InSplitName)
|
||||
{
|
||||
};
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
int Bib = -1;
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
@ -31,7 +41,23 @@ public:
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
FString Gap = "-";
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
int Rank;
|
||||
|
||||
int Rank = -1;
|
||||
UPROPERTY(BlueprintReadOnly, VisibleAnywhere)
|
||||
FString SplitName = "";
|
||||
};
|
||||
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDTFluxSplitHistory
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
FDTFluxSplitHistory() = default;
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
FDTFluxParticipant Participant = FDTFluxParticipant();
|
||||
|
||||
UPROPERTY(BlueprintReadOnly, EditAnywhere)
|
||||
TArray<FDTFluxSplitSensorInfo> SplitSensors = TArray<FDTFluxSplitSensorInfo>();
|
||||
};
|
||||
|
||||
@ -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;
|
||||
};
|
||||
@ -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
|
||||
@ -104,12 +185,77 @@ void UDTFluxCoreSubsystem::RegisterDelegates()
|
||||
}
|
||||
}
|
||||
|
||||
bool UDTFluxCoreSubsystem::IsStageRankingSealed(FDTFluxStageKey StageKey)
|
||||
{
|
||||
FDTFluxStageRankings StageRankings;
|
||||
if (GetStageRankingsWithKey(StageKey, StageRankings))
|
||||
{
|
||||
FDTFluxStage Stage;
|
||||
if (GetStageDefinition(StageKey, Stage))
|
||||
{
|
||||
return StageRankings.IsSealed(Stage.EndTime);
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Unable to find Stage %i"), StageKey.StageId);
|
||||
return false;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Unable to find StageRankings for StageKey %i"), StageKey.StageId);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxCoreSubsystem::IsContestRankingSealed(int ContestId)
|
||||
{
|
||||
if (DataStorage)
|
||||
{
|
||||
FDTFluxContestRankings ContestRankings;
|
||||
if (GetContestRankings(ContestId, ContestRankings))
|
||||
{
|
||||
FDTFluxContest Contest;
|
||||
if (GetContestForId(ContestId, Contest))
|
||||
{
|
||||
return ContestRankings.IsSealed(Contest.EndTime);
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Unable to find Contest %i"), ContestId);
|
||||
return false;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Unable to find ContestRankings for ContestId %i"), ContestId);
|
||||
return false;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage not available"));
|
||||
return false;
|
||||
}
|
||||
|
||||
EDTFluxFinisherType UDTFluxCoreSubsystem::GetSplitSensorType(const FDTFluxSplitSensorInfo& SplitSensorInfo)
|
||||
{
|
||||
if (DataStorage != nullptr)
|
||||
{
|
||||
if (DataStorage->LastSplitIdCache.Contains(SplitSensorInfo.ContestId))
|
||||
{
|
||||
int LastSplitIdForContest = DataStorage->LastSplitIdCache[SplitSensorInfo.ContestId];
|
||||
if (LastSplitIdForContest == SplitSensorInfo.SplitId)
|
||||
{
|
||||
if (SplitSensorInfo.Rank == 1 )
|
||||
{
|
||||
return EDTFluxFinisherType::Winner;
|
||||
}
|
||||
return EDTFluxFinisherType::Finish;
|
||||
}
|
||||
return EDTFluxFinisherType::None;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("LastSplitIdCache not found for ContestId %i"), SplitSensorInfo.ContestId);
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage not available"));
|
||||
return EDTFluxFinisherType::None;
|
||||
|
||||
}
|
||||
|
||||
|
||||
void UDTFluxCoreSubsystem::ProcessRaceData(const FDTFluxRaceData& RaceDataDefinition)
|
||||
{
|
||||
if (RaceDataDefinition.Datas.Num() > 0)
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Receiving RaceDataDefinition [%s]"),
|
||||
*RaceDataDefinition.Datas[0].Name);
|
||||
// UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Receiving RaceDataDefinition [%s]"),
|
||||
// *RaceDataDefinition.Datas[0].Name);
|
||||
if (DataStorage != nullptr)
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage Name %s"), *DataStorage->EventName);
|
||||
@ -151,21 +297,24 @@ void UDTFluxCoreSubsystem::ProcessContestRanking(const FDTFluxContestRankings& C
|
||||
DataStorage->AddContestRanking(NewContestRankings);
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestRankings added for Contest %s"),
|
||||
*NewContestRankings.ContestName);
|
||||
SaveDataStorage();
|
||||
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)
|
||||
@ -183,20 +332,51 @@ void UDTFluxCoreSubsystem::ProcessTeamUpdate(const FDTFluxTeamListDefinition& Te
|
||||
|
||||
void UDTFluxCoreSubsystem::ProcessSplitSensor(const FDTFluxSplitSensorInfo& SplitSensorInfo)
|
||||
{
|
||||
FDTFluxContest Contest;
|
||||
FDTFluxStageKey StageKey(SplitSensorInfo.ContestId, SplitSensorInfo.StageId);
|
||||
FDTFluxStage Stage;
|
||||
DataStorage->GetStage(StageKey, Stage);
|
||||
FDTFluxParticipant Participant;
|
||||
DataStorage->GetParticipantByBib(SplitSensorInfo.Bib, Participant);
|
||||
|
||||
DataStorage->GetContestById(SplitSensorInfo.ContestId, Contest);
|
||||
UE_LOG(logDTFluxCoreSubsystem, Log, TEXT("%s|%s Split %i Sensor for Participant [Bib] %i [FullName] %s"),
|
||||
*Contest.Name, *Stage.Name,
|
||||
SplitSensorInfo.SplitId, SplitSensorInfo.Bib, *Participant.GetFormattedName());
|
||||
if (DataStorage != nullptr)
|
||||
{
|
||||
FString DebugString = FString::Printf(TEXT("Received SplitSensorInfo for Bib %i"), SplitSensorInfo.Bib);
|
||||
DebugString += FString::Printf(TEXT("ContestId[%i] StageId[%i] SplitId[%i] Time[%s], Gap[%s] Rank[%i]"),
|
||||
SplitSensorInfo.ContestId, SplitSensorInfo.StageId, SplitSensorInfo.SplitId, *SplitSensorInfo.Time,
|
||||
*SplitSensorInfo.Gap, SplitSensorInfo.Rank);
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Received SplitSensorInfo :\n%s"), *DebugString)
|
||||
// Gestion Cache Split Sensor
|
||||
FDTFluxSplitSensorKey SplitSensorKey(SplitSensorInfo.ContestId, SplitSensorInfo.StageId, SplitSensorInfo.SplitId, -1);
|
||||
FDTFluxSplitSensorInfo NewSplitSensorInfo = SplitSensorInfo;
|
||||
if (DataStorage->SplitSensorInfoCache.Contains(SplitSensorKey))
|
||||
{
|
||||
NewSplitSensorInfo.SplitName = DataStorage->SplitSensorInfoCache[SplitSensorKey].SplitName;
|
||||
}
|
||||
SplitSensorKey.Bib = SplitSensorInfo.Bib;
|
||||
DataStorage->SplitSensorInfoCache.Add(SplitSensorKey, NewSplitSensorInfo);
|
||||
// Update Current currentSplit
|
||||
FDTFluxParticipant Participant;
|
||||
if (DataStorage->Participants.Contains(SplitSensorInfo.Bib))
|
||||
{
|
||||
DataStorage->Participants[SplitSensorInfo.Bib].CurrentSplit = SplitSensorInfo.SplitId;
|
||||
}
|
||||
// Gestion Finnish Status
|
||||
switch (GetSplitSensorType(SplitSensorInfo))
|
||||
{
|
||||
case EDTFluxFinisherType::Winner:
|
||||
{
|
||||
OnWinner.Broadcast(SplitSensorInfo);
|
||||
break;
|
||||
}
|
||||
case EDTFluxFinisherType::Finish :
|
||||
{
|
||||
OnFinisher.Broadcast(SplitSensorInfo);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
OnSplitSensor.Broadcast(SplitSensorInfo);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void UDTFluxCoreSubsystem::SendRequest(const FString& Message)
|
||||
{
|
||||
if (NetworkSubsystem)
|
||||
@ -205,78 +385,422 @@ void UDTFluxCoreSubsystem::SendRequest(const FString& Message)
|
||||
}
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::SendTeamListRequest()
|
||||
void UDTFluxCoreSubsystem::InitParticipantTracking(const int Bib, const int ContestId, const int StageId)
|
||||
{
|
||||
FDTFluxContest Contest;
|
||||
if (GetContestForId(ContestId, Contest))
|
||||
{
|
||||
// get all splits
|
||||
TArray<FDTFluxSplitSensorInfo> SplitSensorInfos;
|
||||
FDTFluxSplitSensorKey SplitSensorKey;
|
||||
for (auto Split : Contest.Splits)
|
||||
{
|
||||
SplitSensorKey = FDTFluxSplitSensorKey();
|
||||
SplitSensorKey.ContestId = ContestId;
|
||||
SplitSensorKey.StageId = StageId;
|
||||
SplitSensorKey.Bib = Bib;
|
||||
SplitSensorKey.SplitId = Split.SplitId;
|
||||
if (DataStorage->SplitSensorInfoCache.Contains(SplitSensorKey))
|
||||
{
|
||||
FDTFluxSplitSensorInfo SplitSensorInfoToAdd = DataStorage->SplitSensorInfoCache[SplitSensorKey];
|
||||
SplitSensorInfos.Add(SplitSensorInfoToAdd);
|
||||
FString DebugString = FString::Printf(TEXT("SplitSensorInfo for Bib %i "), Bib);
|
||||
DebugString += FString::Printf(TEXT("SplitSensorInfo [Rank] %i "), SplitSensorInfoToAdd.Rank);
|
||||
DebugString += FString::Printf(TEXT("SplitSensorInfo [Rank] %s "), *SplitSensorInfoToAdd.Gap);
|
||||
DebugString += FString::Printf(TEXT("SplitSensorInfo [Rank] %s "), *SplitSensorInfoToAdd.Time);
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("SplitSensorInfoCache contains SplitSensorInfo for Bib %i\nData : %s"), Bib, *DebugString);
|
||||
}
|
||||
else
|
||||
{
|
||||
SplitSensorInfos.Add(FDTFluxSplitSensorInfo(Split.Name));
|
||||
}
|
||||
}
|
||||
FDTFluxSplitHistory History;
|
||||
History.SplitSensors = SplitSensorInfos;
|
||||
if (GetParticipant(Bib, History.Participant))
|
||||
{
|
||||
OnParticipantTrackingReady.Broadcast(History);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
FGuid UDTFluxCoreSubsystem::InitContestRankingsDisplay(const int ContestId)
|
||||
{
|
||||
if (NetworkSubsystem)
|
||||
{
|
||||
NetworkSubsystem->SendRequest(EDTFluxRequestType::TeamList);
|
||||
if (DataStorage)
|
||||
{
|
||||
// no need to request ContestRankings;
|
||||
if (IsContestRankingSealed(ContestId))
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestRankings already Sealed for ContestId %i"), ContestId);
|
||||
const FGuid DisplayRequestId = FGuid::NewGuid();
|
||||
OnContestRankingDisplayReady.Broadcast(DisplayRequestId, true);
|
||||
return DisplayRequestId;
|
||||
}
|
||||
else
|
||||
{
|
||||
FOnDTFluxRequestSuccess OnSuccess = FOnDTFluxRequestSuccess::CreateLambda(
|
||||
[this](const FDTFluxTrackedRequest& Request)
|
||||
{
|
||||
FDTFluxContestRankings Rankings = FDTFluxContestRankings();
|
||||
if (Request.ParsedResponse.IsSet())
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Request IsSet()"));
|
||||
TSharedPtr<FDTFluxServerResponse> ResponsePtr = Request.ParsedResponse.GetValue();
|
||||
ResponsePtr->ParseContestRanking(Rankings);
|
||||
this->DataStorage->AddContestRanking(Rankings);
|
||||
this->OnContestRankingDisplayReady.Broadcast(Request.RequestId, true);
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Request IsSet(FALSE)"));
|
||||
this->OnStageRankingDisplayReady.Broadcast(Request.RequestId, false);
|
||||
});
|
||||
FOnDTFluxRequestError OnError = FOnDTFluxRequestError::CreateLambda(
|
||||
[this](const FDTFluxTrackedRequest& InReq, const FString& InError)
|
||||
{
|
||||
this->OnStageRankingDisplayReady.Broadcast(InReq.RequestId, false);
|
||||
});
|
||||
FGuid DisplayRequestId = NetworkSubsystem->SendTrackedRequestWithCallbacks(
|
||||
EDTFluxApiDataType::ContestRanking, ContestId, -1, -1, OnSuccess, OnError, true);
|
||||
return DisplayRequestId;
|
||||
}
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DTFluxDataStorage unavailable ..."));
|
||||
OnContestRankingDisplayReady.Broadcast(FGuid(), false);
|
||||
return FGuid();
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DTFluxNetworkSubsystem unavailable ..."));
|
||||
OnContestRankingDisplayReady.Broadcast(FGuid(), false);
|
||||
return FGuid();
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::SendRaceDataRequest()
|
||||
FGuid UDTFluxCoreSubsystem::InitStageRankingsDisplay(const int ContestId, const int StageId)
|
||||
{
|
||||
if (NetworkSubsystem)
|
||||
{
|
||||
NetworkSubsystem->SendRequest(EDTFluxRequestType::RaceData);
|
||||
if (DataStorage)
|
||||
{
|
||||
// no need to request StageRankings;
|
||||
if (IsStageRankingSealed(FDTFluxStageKey(ContestId, StageId)))
|
||||
{
|
||||
const FGuid DisplayRequestId = FGuid::NewGuid();
|
||||
OnStageRankingDisplayReady.Broadcast(DisplayRequestId, true);
|
||||
return DisplayRequestId;
|
||||
}
|
||||
else
|
||||
{
|
||||
FOnDTFluxRequestSuccess OnSuccess = FOnDTFluxRequestSuccess::CreateLambda(
|
||||
[this](const FDTFluxTrackedRequest& Request)
|
||||
{
|
||||
FDTFluxStageRankings Rankings = FDTFluxStageRankings();
|
||||
if (Request.ParsedResponse.IsSet())
|
||||
{
|
||||
TSharedPtr<FDTFluxServerResponse> ResponsePtr = Request.ParsedResponse.GetValue();
|
||||
ResponsePtr->ParseStageRanking(Rankings);
|
||||
this->DataStorage->AddStageRanking(Rankings);
|
||||
this->OnStageRankingDisplayReady.Broadcast(Request.RequestId, true);
|
||||
return;
|
||||
}
|
||||
this->OnStageRankingDisplayReady.Broadcast(Request.RequestId, false);
|
||||
});
|
||||
FOnDTFluxRequestError OnError = FOnDTFluxRequestError::CreateLambda(
|
||||
[this](const FDTFluxTrackedRequest& InReq, const FString& InError)
|
||||
{
|
||||
this->OnStageRankingDisplayReady.Broadcast(InReq.RequestId, false);
|
||||
});
|
||||
FGuid DisplayRequestId = NetworkSubsystem->SendTrackedRequestWithCallbacks(
|
||||
EDTFluxApiDataType::StageRanking, ContestId, StageId, -1, OnSuccess, OnError, true);
|
||||
return DisplayRequestId;
|
||||
}
|
||||
}
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DTFluxNetworkSubsystem unavailable ..."));
|
||||
const FGuid RequestId = FGuid::NewGuid();
|
||||
OnStageRankingDisplayReady.Broadcast(RequestId, false);
|
||||
return RequestId;
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::SendContestRankingRequest(int InContestId)
|
||||
FGuid UDTFluxCoreSubsystem::InitSplitRankingsDisplay(const int ContestId, const int StageId, const int SplitId)
|
||||
{
|
||||
if (NetworkSubsystem)
|
||||
{
|
||||
NetworkSubsystem->SendRequest(EDTFluxRequestType::ContestRanking, InContestId);
|
||||
if (DataStorage)
|
||||
{
|
||||
FOnDTFluxRequestSuccess OnSuccess = FOnDTFluxRequestSuccess::CreateLambda(
|
||||
[this](const FDTFluxTrackedRequest& Request)
|
||||
{
|
||||
FDTFluxSplitRankings Rankings = FDTFluxSplitRankings();
|
||||
if (Request.ParsedResponse.IsSet())
|
||||
{
|
||||
TSharedPtr<FDTFluxServerResponse> ResponsePtr = Request.ParsedResponse.GetValue();
|
||||
ResponsePtr->ParseSplitRanking(Rankings);
|
||||
this->DataStorage->AddSplitRanking(Rankings);
|
||||
this->OnSplitRankingDisplayReady.Broadcast(Request.RequestId, true);
|
||||
return;
|
||||
}
|
||||
this->OnSplitRankingDisplayReady.Broadcast(Request.RequestId, false);
|
||||
});
|
||||
FOnDTFluxRequestError OnError = FOnDTFluxRequestError::CreateLambda(
|
||||
[this](const FDTFluxTrackedRequest& InReq, const FString& InError)
|
||||
{
|
||||
this->OnSplitRankingDisplayReady.Broadcast(InReq.RequestId, false);
|
||||
});
|
||||
FGuid DisplayRequestId = NetworkSubsystem->SendTrackedRequestWithCallbacks(
|
||||
EDTFluxApiDataType::SplitRanking, ContestId, StageId, SplitId, OnSuccess, OnError, true);
|
||||
return DisplayRequestId;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DTFluxDataStorage unavailable ..."));
|
||||
OnSplitRankingDisplayReady.Broadcast(FGuid(), false);
|
||||
return FGuid();
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DTFluxNetworkSubsystem unavailable ..."));
|
||||
OnSplitRankingDisplayReady.Broadcast(FGuid(), false);
|
||||
return FGuid();
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::SendStageRankingRequest(int InContestId, int InStageId, bool bShouldIncludeSplitRanking)
|
||||
bool UDTFluxCoreSubsystem::GetStageRankingForBib(const int ContestId, const int StageId, const int Bib,
|
||||
FDTFluxStageRanking& OutStageRanking)
|
||||
{
|
||||
// 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))
|
||||
if (DataStorage)
|
||||
{
|
||||
return DataStorage->StageRankings[StageKey];
|
||||
FDTFluxStageKey StageKey(ContestId, StageId);
|
||||
if (DataStorage->StageRankings.Contains(StageKey))
|
||||
{
|
||||
FDTFluxStageRankings StageRankings = DataStorage->StageRankings[StageKey];
|
||||
for (auto& Ranking : StageRankings.Rankings)
|
||||
{
|
||||
if (Ranking.Bib == Bib)
|
||||
{
|
||||
OutStageRanking = static_cast<FDTFluxStageRanking>(Ranking);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Unable to find StageRanking for Bib %i"), Bib);
|
||||
return false;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Cannot find StageRankings for key [%s]"), *StageKey.GetDisplayName());
|
||||
return FDTFluxStageRankings();
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage not available"));
|
||||
return false;
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::RequestAllSplitRankingOfStage(int InContestId, int InStageId, int InSplitId)
|
||||
bool UDTFluxCoreSubsystem::GetSplitRankingForBib(const int ContestId, const int StageId, const int SplitId,
|
||||
const int Bib, FDTFluxSplitRanking& OutSplitRankings)
|
||||
{
|
||||
// TODO Implement this
|
||||
if (DataStorage)
|
||||
{
|
||||
FDTFluxSplitKey SplitKey(ContestId, StageId, SplitId);
|
||||
if (DataStorage->SplitRankings.Contains(SplitKey))
|
||||
{
|
||||
FDTFluxSplitRankings SplitRankings = DataStorage->SplitRankings[SplitKey];
|
||||
for (auto& Ranking : SplitRankings.Rankings)
|
||||
{
|
||||
if (Ranking.Bib == Bib)
|
||||
{
|
||||
OutSplitRankings = static_cast<FDTFluxSplitRanking>(Ranking);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Unable to find SplitRanking for Bib %i"), Bib);
|
||||
return false;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage not available"));
|
||||
return false;
|
||||
}
|
||||
|
||||
const FDTFluxParticipant UDTFluxCoreSubsystem::GetParticipant(int InBib)
|
||||
|
||||
|
||||
bool UDTFluxCoreSubsystem::GetContestRankings(const int ContestId,
|
||||
FDTFluxContestRankings& OutContestRankings)
|
||||
{
|
||||
if (DataStorage->ContestRankings.Contains(ContestId))
|
||||
{
|
||||
OutContestRankings = DataStorage->ContestRankings[ContestId];
|
||||
return true;
|
||||
}
|
||||
if (NetworkSubsystem)
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Requesting ContestRankings for ContestId %i"), ContestId);
|
||||
TArray<int> TrackedContestIds;
|
||||
TrackedContestIds.Add(ContestId);
|
||||
TrackedRequestContestRankings(TrackedContestIds);
|
||||
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)
|
||||
{
|
||||
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>();
|
||||
}
|
||||
|
||||
TArray<FGuid> UDTFluxCoreSubsystem::TrackedRequestStageRankings(const TArray<FDTFluxStageKey> ForStages,
|
||||
bool bEnableCache)
|
||||
{
|
||||
if (NetworkSubsystem)
|
||||
{
|
||||
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);
|
||||
});
|
||||
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>();
|
||||
}
|
||||
|
||||
TArray<FGuid> UDTFluxCoreSubsystem::TrackedRequestSplitRankings(const TArray<FDTFluxSplitKey> ForSplits,
|
||||
bool bEnableCache)
|
||||
{
|
||||
if (NetworkSubsystem)
|
||||
{
|
||||
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 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>();
|
||||
}
|
||||
|
||||
bool UDTFluxCoreSubsystem::GetParticipant(int InBib, FDTFluxParticipant& OutParticipant)
|
||||
{
|
||||
if (DataStorage->Participants.Contains(InBib))
|
||||
{
|
||||
return DataStorage->Participants[InBib];
|
||||
OutParticipant = DataStorage->Participants[InBib];
|
||||
return true;
|
||||
}
|
||||
return FDTFluxParticipant();
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::RefreshStorage()
|
||||
{
|
||||
// TODO Implement this
|
||||
return false;
|
||||
}
|
||||
|
||||
TArray<int> UDTFluxCoreSubsystem::GetCurrentContestsId()
|
||||
@ -284,24 +808,30 @@ TArray<int> UDTFluxCoreSubsystem::GetCurrentContestsId()
|
||||
return GetContestsIdForTime(FDateTime::Now());
|
||||
}
|
||||
|
||||
TArray<FDTFluxContest> UDTFluxCoreSubsystem::GetCurrentContests()
|
||||
bool UDTFluxCoreSubsystem::GetCurrentContests(TArray<FDTFluxContest>& OutContests)
|
||||
{
|
||||
return GetContestsForTime(FDateTime::Now());
|
||||
return GetContestsForTime(FDateTime::Now(), OutContests);
|
||||
}
|
||||
|
||||
TArray<int> UDTFluxCoreSubsystem::GetContestsIdForTime(const FDateTime Time)
|
||||
{
|
||||
TArray<int> Contests;
|
||||
for (const auto& Pair : DataStorage->Contests)
|
||||
if (DataStorage)
|
||||
{
|
||||
FDTFluxContest Contest = Pair.Value;
|
||||
int ContestId = Contest.ContestId;
|
||||
if (Contest.Date < Time && Contest.EndTime > Time)
|
||||
TArray<FDTFluxContest> Contests;
|
||||
if (GetContestsForTime(Time, Contests))
|
||||
{
|
||||
Contests.Add(ContestId);
|
||||
TArray<int> ContestIds = TArray<int>();
|
||||
for (const auto& Contest : Contests)
|
||||
{
|
||||
ContestIds.Add(Contest.ContestId);
|
||||
}
|
||||
return ContestIds;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("No Contest running for Time [%s]"), *Time.ToString());
|
||||
return TArray<int>();
|
||||
}
|
||||
return Contests;
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage not available"));
|
||||
return TArray<int>();
|
||||
}
|
||||
|
||||
bool UDTFluxCoreSubsystem::GetContestForId(const int Id, FDTFluxContest& OutContest)
|
||||
@ -318,60 +848,119 @@ bool UDTFluxCoreSubsystem::GetContestForId(const int Id, FDTFluxContest& OutCont
|
||||
return false;
|
||||
}
|
||||
|
||||
TArray<FDTFluxContest> UDTFluxCoreSubsystem::GetContestsForTime(const FDateTime Time)
|
||||
{
|
||||
TArray<FDTFluxContest> Contests;
|
||||
for (const auto& Pair : DataStorage->Contests)
|
||||
{
|
||||
FDTFluxContest Contest = Pair.Value;
|
||||
int ContestId = Contest.ContestId;
|
||||
if (Contest.Date < Time && Contest.EndTime > Time)
|
||||
{
|
||||
Contests.Add(Contest);
|
||||
}
|
||||
}
|
||||
return Contests;
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::RequestRankingsForStages(TArray<FDTFluxStage> RequestedStages) const
|
||||
{
|
||||
}
|
||||
|
||||
TArray<FDTFluxContest> UDTFluxCoreSubsystem::GetContests()
|
||||
bool UDTFluxCoreSubsystem::GetContestsForTime(const FDateTime Time, TArray<FDTFluxContest>& OutContests)
|
||||
{
|
||||
if (DataStorage)
|
||||
{
|
||||
TArray<FDTFluxContest> OutContests;
|
||||
OutContests.Empty();
|
||||
for (const auto& Pair : DataStorage->Contests)
|
||||
{
|
||||
FDTFluxContest Contest = Pair.Value;
|
||||
int ContestId = Contest.ContestId;
|
||||
|
||||
//ils ont commencé.
|
||||
if (Contest.Date < Time && Contest.EndTime > Time)
|
||||
{
|
||||
// ils sont finis
|
||||
if (!Contest.IsFinished())
|
||||
{
|
||||
OutContests.Add(Contest);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!OutContests.IsEmpty())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("No Contest running for Time [%s]"), *Time.ToString());
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage not available"));
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxCoreSubsystem::GetContests(TArray<FDTFluxContest>& OutContests)
|
||||
{
|
||||
OutContests.Empty();
|
||||
if (DataStorage)
|
||||
{
|
||||
DataStorage->Contests.GenerateValueArray(OutContests);
|
||||
return OutContests;
|
||||
return !OutContests.IsEmpty();
|
||||
}
|
||||
return TArray<FDTFluxContest>();
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("DataStorage not available"));
|
||||
return false;
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::LaunchPursuitSequenceFor(const TArray<int> ContestIds)
|
||||
void UDTFluxCoreSubsystem::GetContest(const int ContestId, FDTFluxContest& OutContest)
|
||||
{
|
||||
TArray<FDTFluxContest> Contests = TArray<FDTFluxContest>();
|
||||
for (const auto& ContestId : ContestIds)
|
||||
OutContest = FDTFluxContest();
|
||||
if (GetContestForId(ContestId, OutContest))
|
||||
{
|
||||
FDTFluxContest Contest;
|
||||
GetContestForId(ContestId, Contest);
|
||||
Contests.Add(Contest);
|
||||
if (PursuitManager)
|
||||
{
|
||||
PursuitManager->LaunchPursuitSequenceFor(Contests);
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("PursuitManager is null"));
|
||||
}
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d not found in ContestDefinition"), ContestId)
|
||||
}
|
||||
|
||||
FOnPursuitSequenceReady& UDTFluxCoreSubsystem::InitPursuit(const TArray<FDTFluxContest> Contests)
|
||||
bool UDTFluxCoreSubsystem::GetStageDefinition(const FDTFluxStageKey StageKey, FDTFluxStage& OutStageDefinition)
|
||||
{
|
||||
if (PursuitManager)
|
||||
int ContestId = StageKey.ContestId;
|
||||
int StageId = StageKey.StageId;
|
||||
FDTFluxContest ContestDefinition;
|
||||
if (GetContestForId(ContestId, ContestDefinition))
|
||||
{
|
||||
PursuitManager->LaunchPursuitSequenceFor(Contests);
|
||||
for (auto& Stage : ContestDefinition.Stages)
|
||||
{
|
||||
if (Stage.StageId == StageId)
|
||||
{
|
||||
OutStageDefinition = Stage;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return PursuitManager->OnPursuitSequenceReady;
|
||||
OutStageDefinition = FDTFluxStage();
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("ContestId %d, StageId %d not found in ContestDefinition"),
|
||||
ContestId, StageId)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxCoreSubsystem::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;
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::GetStage(const int ContestId, const int StageId, FDTFluxStage& OutStageDefinition)
|
||||
{
|
||||
if (GetStageDefinition(FDTFluxStageKey(ContestId, StageId),
|
||||
OutStageDefinition))
|
||||
{
|
||||
return;
|
||||
}
|
||||
OutStageDefinition = FDTFluxStage();
|
||||
}
|
||||
|
||||
void UDTFluxCoreSubsystem::GetSplit(const int ContestId, const int StageId, const int SplitId,
|
||||
FDTFluxSplit& OutSplitDefinition)
|
||||
{
|
||||
if (GetSplitDefinition(FDTFluxSplitKey(ContestId, StageId, SplitId),
|
||||
OutSplitDefinition))
|
||||
{
|
||||
return;
|
||||
}
|
||||
OutSplitDefinition = FDTFluxSplit();
|
||||
}
|
||||
|
||||
@ -3,83 +3,189 @@
|
||||
|
||||
#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)
|
||||
{
|
||||
FDTFluxContest Contest;
|
||||
if (CoreSubsystem->GetContestForId(ContestId, Contest))
|
||||
{
|
||||
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);
|
||||
// BindRankings();
|
||||
FDTFluxStageKey StageKey = FDTFluxStageKey(ContestId, Contest.GetLastStageId());
|
||||
FDTFluxStageRankings TempStageRankings;
|
||||
//Obtenir les ranking Frais.
|
||||
CoreSubsystem->GetStageRankingsWithKey(StageKey, TempStageRankings, true);
|
||||
AllRankings.Add(TempStageRankings);
|
||||
LaunchPursuitSequence();
|
||||
// CoreSubsystem->GetStageRankings()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Warning, TEXT("Request Timeout [%s]"), *TimeoutMessage);
|
||||
}
|
||||
|
||||
void UDTFluxPursuitManager::OnRequestError(const FGuid& RequestId, const FString& ErrorMessage)
|
||||
void UDTFluxPursuitManager::GetPursuit(TArray<FDTFluxPursuitInfo>& OutPursuitFocusNext,
|
||||
TArray<FDTFluxPursuitInfo>& OutPursuitNext, bool& BIsFocusTruncate,
|
||||
const int MaxSimultaneousPursuit)
|
||||
{
|
||||
UE_LOG(logDTFluxCoreSubsystem, Error, TEXT("Request Error [%s]"), *ErrorMessage);
|
||||
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();
|
||||
|
||||
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;
|
||||
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());
|
||||
|
||||
int32 TargetNextCount = MaxSimultaneousPursuit - 1;
|
||||
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];
|
||||
|
||||
if (NextGroup.PursuitGroup.Num() == 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
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 +198,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 +263,88 @@ 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())
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void UDTFluxPursuitManager::DebugFocusNext(const TArray<FDTFluxPursuitInfo>& OutPursuitFocusNext)
|
||||
{
|
||||
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::DebugOutPoursuitNext(const TArray<FDTFluxPursuitInfo>& OutPursuitNext)
|
||||
{
|
||||
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);
|
||||
}
|
||||
@ -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,51 @@ class UDTFluxNetworkSubsystem;
|
||||
/** Forward Decl */
|
||||
class UDTFluxModelAsset;
|
||||
class UDTFluxPursuitManager;
|
||||
struct FDTFluxServerResponse;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
UCLASS(Blueprintable, BlueprintType)
|
||||
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(FOnContestRankingDisplayReady, const FGuid, RequestId, const bool,
|
||||
bSuccesRequest);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnContestRankingDisplayReady OnContestRankingDisplayReady;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnStageRankingDisplayReady, const FGuid, RequestId, const bool,
|
||||
bSuccesRequest);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnStageRankingDisplayReady OnStageRankingDisplayReady;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnSplitRankingDisplayReady, const FGuid, RequestId, const bool,
|
||||
bSuccesRequest);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnSplitRankingDisplayReady OnSplitRankingDisplayReady;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnContestRankings, const int, ContestId, FDTFluxContestRankings,
|
||||
ContestRankings);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnContestRankings OnContestRankings;
|
||||
@ -43,87 +70,124 @@ 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;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnSplitSensor, FDTFluxSplitSensorInfo, SplitSensorInfo);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnSplitSensor OnSplitSensor;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnFinisher, FDTFluxSplitSensorInfo, SplitSensorInfo);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnFinisher OnFinisher;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnPreFinish, FDTFluxSplitSensorInfo, SplitSensorInfo);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnPreFinish OnPreFinish;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnWinner, FDTFluxSplitSensorInfo, SplitSensorInfo);
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnWinner OnWinner;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnParticipantTrackingReady, FDTFluxSplitHistory, SplitHistory);
|
||||
UPROPERTY(BlueprintAssignable, Category="DTFlux|Core Subsystem")
|
||||
FOnParticipantTrackingReady OnParticipantTrackingReady;
|
||||
|
||||
//TODO : this must be a ProjectSetting
|
||||
UPROPERTY(BlueprintReadOnly, Category="DTFlux|Core Subsystem")
|
||||
bool bShouldKeepRankings = true;
|
||||
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void SendTeamListRequest();
|
||||
void InitParticipantTracking(const int Bib, const int ContestId, const int StageId);
|
||||
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void SendRaceDataRequest();
|
||||
FGuid InitContestRankingsDisplay(const int ContestIds);
|
||||
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void SendContestRankingRequest(int InContestId);
|
||||
FGuid InitStageRankingsDisplay(const int ContestId, const int StageId);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void SendStageRankingRequest(int InContestId, int InStageId, bool bShouldIncludeSplitRanking = true);
|
||||
FGuid InitSplitRankingsDisplay(const int ContestId, const int StageId, const int SplitId);
|
||||
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void RequestAllStageRankingOfContest(int InContestId, int InStageId, bool bShouldIncludeSplitRanking = true);
|
||||
bool GetStageRankingForBib(const int ContestId, const int StageId, const int Bib,
|
||||
FDTFluxStageRanking& OutStageRankings);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
bool GetSplitRankingForBib(const int ContestId, const int StageId, const int SplitId, const int Bib,
|
||||
FDTFluxSplitRanking& OutSplitRankings);
|
||||
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void SendSplitRankingRequest(int InContestId, int InStageId, int InSplitId);
|
||||
|
||||
bool GetContestRankings(const int ContestId, FDTFluxContestRankings& OutContestRankings);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void RequestAllSplitRankingOfContest(int InContestId, int InStageId);
|
||||
|
||||
bool GetStageRankings(const int ContestId, const int StageId, FDTFluxStageRankings& OutStageRankings);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
FDTFluxStageRankings GetStageRankings(FDTFluxStageKey StageKey);
|
||||
|
||||
bool GetSplitRankings(const int ContestId, const int StageId, const int SplitId,
|
||||
FDTFluxSplitRankings& OutSplitRankings);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void RequestAllSplitRankingOfStage(int InContestId, int InStageId, int InSplitId);
|
||||
|
||||
bool GetStageRankingsWithKey(const FDTFluxStageKey StageKey, FDTFluxStageRankings& OutStageRankings,
|
||||
const bool bShouldUseCached = true);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
const FDTFluxParticipant GetParticipant(int InBib);
|
||||
|
||||
bool GetSplitRankingsWithKey(const FDTFluxSplitKey SplitKey, FDTFluxSplitRankings& OutSplitRankings,
|
||||
const bool bShouldUseCached = true);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
TArray<FGuid> TrackedRequestContestRankings(const TArray<int> ForContests, bool bEnableCache = true);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
TArray<FGuid> TrackedRequestStageRankings(const TArray<FDTFluxStageKey> ForStages, bool bEnableCache = true);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
TArray<FGuid> TrackedRequestSplitRankings(const TArray<FDTFluxSplitKey> ForSplits, bool bEnableCache = true);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
bool GetParticipant(int InBib, FDTFluxParticipant& OutParticipant);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void RefreshStorage();
|
||||
|
||||
UFUNCTION()
|
||||
TArray<int> GetCurrentContestsId();
|
||||
UFUNCTION()
|
||||
TArray<FDTFluxContest> GetCurrentContests();
|
||||
UFUNCTION()
|
||||
TArray<int> GetContestsIdForTime(const FDateTime Time);
|
||||
UFUNCTION()
|
||||
bool GetContestForId(const int Id, FDTFluxContest& OutContest);
|
||||
UFUNCTION()
|
||||
TArray<FDTFluxContest> GetContestsForTime(const FDateTime Time);
|
||||
|
||||
UFUNCTION()
|
||||
void RequestRankingsForStages(const TArray<FDTFluxStage> RequestedStages) const;
|
||||
UFUNCTION()
|
||||
TArray<FDTFluxContest> GetContests();
|
||||
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void LaunchPursuitSequenceFor(const TArray<int> ContestIds);
|
||||
bool GetCurrentContests(TArray<FDTFluxContest>& OutContests);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
TArray<int> GetContestsIdForTime(const FDateTime Time);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
bool GetContestForId(const int Id, FDTFluxContest& OutContest);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
bool GetContestsForTime(const FDateTime Time, TArray<FDTFluxContest>& OutContests);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
bool GetContests(TArray<FDTFluxContest>& OutContests);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void GetContest(const int ContestId, FDTFluxContest& OutContest);
|
||||
UFUNCTION()
|
||||
bool GetStageDefinition(const FDTFluxStageKey StageKey, FDTFluxStage& OutStageDefinition);
|
||||
UFUNCTION()
|
||||
bool GetSplitDefinition(const FDTFluxSplitKey SplitKey, FDTFluxSplit& OutSplitDefinition);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void GetStage(const int ContestId, const int StageId, FDTFluxStage& OutStageDefinition);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem")
|
||||
void GetSplit(const int ContestId, const int StageId, const int SplitId, FDTFluxSplit& OutSplitDefinition);
|
||||
|
||||
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 +209,11 @@ private:
|
||||
void SendRequest(const FString& Message);
|
||||
UFUNCTION()
|
||||
void RegisterDelegates();
|
||||
UFUNCTION()
|
||||
bool IsStageRankingSealed(FDTFluxStageKey StageKey);
|
||||
UFUNCTION()
|
||||
bool IsContestRankingSealed(int ContestId);
|
||||
|
||||
EDTFluxFinisherType GetSplitSensorType(const FDTFluxSplitSensorInfo& SplitSensorInfo);
|
||||
|
||||
UPROPERTY()
|
||||
UDTFluxModelAsset* DataStorage = nullptr;
|
||||
};
|
||||
|
||||
@ -29,6 +29,7 @@ public:
|
||||
|
||||
UFUNCTION(Blueprintable, Category="DTFlux|Core Subsystem|Tools")
|
||||
static float ConvertTimeStringToSeconds(const FString& TimeString);
|
||||
|
||||
UFUNCTION(Blueprintable, Category="DTFlux|Core Subsystem|Tools")
|
||||
static bool CompareTimeString(const FString& A_TimeStr, const FString& B_TimeStr, bool bAscendant = true);
|
||||
|
||||
|
||||
@ -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(BlueprintAssignable, 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();
|
||||
};
|
||||
|
||||
318
Source/DTFluxNetwork/Private/DTFluxAsyncParser.cpp
Normal file
318
Source/DTFluxNetwork/Private/DTFluxAsyncParser.cpp
Normal file
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Verbose, TEXT("Queued request %s: Type=%d, ContestId=%d, StageId=%d, SplitId=%d"),
|
||||
*NewRequest.RequestId.ToString(), (int32)RequestType, ContestId, StageId, SplitId);
|
||||
|
||||
return NewRequest.RequestId;
|
||||
}
|
||||
|
||||
bool UDTFluxQueuedManager::MarkRequestAsError(const FGuid& TargetRequestGuid)
|
||||
{
|
||||
// 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))
|
||||
bIsInitialized.store(false);
|
||||
// Nettoyer toutes les données
|
||||
{
|
||||
if (Request.RequestId == TargetRequestGuid)
|
||||
FScopeLock RequestsLock_Local(&RequestsLock);
|
||||
FScopeLock CallbacksLock_Local(&CallbacksLock);
|
||||
|
||||
AllRequests.Empty();
|
||||
SuccessCallbacks.Empty();
|
||||
ErrorCallbacks.Empty();
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("RequestManager shutdown"));
|
||||
}
|
||||
|
||||
FGuid FDTFluxQueuedRequestManager::CreateTrackedRequest(
|
||||
EDTFluxApiDataType RequestType,
|
||||
int32 ContestId,
|
||||
int32 StageId,
|
||||
int32 SplitId,
|
||||
const FDTFluxRequestConfig& CustomConfig)
|
||||
{
|
||||
if (!bIsInitialized.load())
|
||||
{
|
||||
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;
|
||||
|
||||
{
|
||||
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())
|
||||
{
|
||||
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);
|
||||
SuccessCallbacks.Add(RequestId, OnSuccess);
|
||||
}
|
||||
else
|
||||
if (OnError.IsBound())
|
||||
{
|
||||
TempQueue.Enqueue(Request);
|
||||
ErrorCallbacks.Add(RequestId, OnError);
|
||||
}
|
||||
}
|
||||
while (TempQueue.Dequeue(Request))
|
||||
|
||||
return RequestId;
|
||||
}
|
||||
|
||||
bool FDTFluxQueuedRequestManager::MarkRequestAsSent(const FGuid& RequestId)
|
||||
{
|
||||
FScopeLock Lock(&RequestsLock);
|
||||
|
||||
if (TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
|
||||
{
|
||||
PendingRequestsQueue.Enqueue(Request);
|
||||
TSharedPtr<FDTFluxTrackedRequest> Request = *RequestPtr;
|
||||
Request->SentAt = FDateTime::Now();
|
||||
Request->LastAttemptTime = FDateTime::Now();
|
||||
ChangeRequestState(Request, EDTFluxRequestState::Sent);
|
||||
return true;
|
||||
}
|
||||
if (bFoundMatch)
|
||||
|
||||
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;
|
||||
{
|
||||
UE_LOG(logDTFluxNetwork, Error, TEXT("No Request Found with GUID %s"), *TargetRequestGuid.ToString());
|
||||
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
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo Check protocol errors ???
|
||||
* @param RequestId
|
||||
* @param ErrorMessage
|
||||
* @return
|
||||
*/
|
||||
bool FDTFluxQueuedRequestManager::FailRequest(const FGuid& RequestId, const FString& ErrorMessage)
|
||||
{
|
||||
TSharedPtr<FDTFluxTrackedRequest> Request;
|
||||
|
||||
{
|
||||
FScopeLock Lock(&RequestsLock);
|
||||
if (TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
|
||||
{
|
||||
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)
|
||||
bool FDTFluxQueuedRequestManager::FindPendingRequest(
|
||||
FGuid& OutRequestId,
|
||||
EDTFluxApiDataType RequestType,
|
||||
int32 ContestId,
|
||||
int32 StageId,
|
||||
int32 SplitId) const
|
||||
{
|
||||
return MarkRequestAsResponded(TargetRequest.RequestId);
|
||||
}
|
||||
FScopeLock Lock(&RequestsLock);
|
||||
|
||||
bool UDTFluxQueuedManager::IsRequestPending(FGuid& OutRequestId, EDTFluxApiDataType RequestType, int32 ContestId,
|
||||
int32 StageId,
|
||||
int32 SplitId)
|
||||
{
|
||||
TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> TempQueue;
|
||||
bool bFoundMatch = false;
|
||||
|
||||
// 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))
|
||||
return false;
|
||||
}
|
||||
|
||||
// === ACCESSEURS ===
|
||||
|
||||
bool FDTFluxQueuedRequestManager::GetRequest(const FGuid& RequestId, FDTFluxTrackedRequest& OutRequest) const
|
||||
{
|
||||
FScopeLock Lock(&RequestsLock);
|
||||
|
||||
if (const TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
|
||||
{
|
||||
PendingRequestsQueue.Enqueue(Request);
|
||||
OutRequest = **RequestPtr;
|
||||
return true;
|
||||
}
|
||||
|
||||
return bFoundMatch;
|
||||
return false;
|
||||
}
|
||||
|
||||
FDTFluxQueuedRequest* UDTFluxQueuedManager::GetRequestPending(EDTFluxRequestType RequestType, int32 ContestId,
|
||||
int32 StageId, int32 SplitId)
|
||||
const FDTFluxTrackedRequest* FDTFluxQueuedRequestManager::GetRequestPtr(const FGuid& RequestId) const
|
||||
{
|
||||
auto SearchInQueue = [&RequestType, ContestId, StageId, SplitId](
|
||||
TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc>& Queue) -> FDTFluxQueuedRequest*
|
||||
FScopeLock Lock(&RequestsLock);
|
||||
|
||||
if (const TSharedPtr<FDTFluxTrackedRequest>* RequestPtr = AllRequests.Find(RequestId))
|
||||
{
|
||||
// Copie temporaire de la queue pour la recherche
|
||||
TQueue<FDTFluxQueuedRequest> TempQueue;
|
||||
|
||||
FDTFluxQueuedRequest* FoundItem = nullptr;
|
||||
FDTFluxQueuedRequest Item;
|
||||
while (Queue.Dequeue(Item))
|
||||
{
|
||||
if (Item.RequestType == RequestType && Item.ContestId == ContestId && Item.StageId == StageId && Item.
|
||||
SplitId == SplitId) // Assuming RequestId is your GUID field
|
||||
{
|
||||
FoundItem = &Item;
|
||||
}
|
||||
// Remettre dans la queue temporaire
|
||||
TempQueue.Enqueue(Item);
|
||||
}
|
||||
while (TempQueue.Dequeue(Item))
|
||||
{
|
||||
Queue.Enqueue(Item);
|
||||
}
|
||||
return FoundItem;
|
||||
};
|
||||
return SearchInQueue(PendingRequestsQueue);
|
||||
}
|
||||
|
||||
const FDTFluxQueuedRequest* UDTFluxQueuedManager::GetRequest(const FGuid& SearchedGuid)
|
||||
{
|
||||
auto SearchInQueue = [&SearchedGuid](TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc>& Queue) -> FDTFluxQueuedRequest*
|
||||
{
|
||||
// Copie temporaire de la queue pour la recherche
|
||||
TQueue<FDTFluxQueuedRequest> TempQueue;
|
||||
|
||||
FDTFluxQueuedRequest* FoundItem = nullptr;
|
||||
FDTFluxQueuedRequest Item;
|
||||
while (Queue.Dequeue(Item))
|
||||
{
|
||||
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;
|
||||
}
|
||||
// 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 RequestPtr->Get();
|
||||
}
|
||||
|
||||
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))
|
||||
FRequestStatistics Stats;
|
||||
|
||||
for (const auto& [RequestId, Request] : AllRequests)
|
||||
{
|
||||
if (Request.HasTimedOut())
|
||||
switch (Request->State)
|
||||
{
|
||||
// Ajouter à la queue des requêtes expirées
|
||||
TimedOutRequestsQueue.Enqueue(Request);
|
||||
TimeoutCount++;
|
||||
|
||||
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);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Remettre dans la queue temporaire
|
||||
TempQueue.Enqueue(Request);
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
// Remettre les requêtes non expirées dans la queue principale
|
||||
while (TempQueue.Dequeue(Request))
|
||||
{
|
||||
PendingRequestsQueue.Enqueue(Request);
|
||||
}
|
||||
|
||||
return TimeoutCount;
|
||||
Stats.TotalRequests = TotalRequests;
|
||||
return Stats;
|
||||
}
|
||||
|
||||
int32 UDTFluxQueuedManager::CleanCashedRequests()
|
||||
// === NETTOYAGE ===
|
||||
int32 FDTFluxQueuedRequestManager::CleanupCompletedRequests(float OlderThanSeconds)
|
||||
{
|
||||
int32 CleanedRequestsCount = 0;
|
||||
FScopeLock Lock(&RequestsLock);
|
||||
|
||||
// Queue temporaire pour stocker les requêtes encore valides
|
||||
TQueue<FDTFluxQueuedRequest, EQueueMode::Mpsc> ValidCompletedRequests;
|
||||
TArray<FGuid> OldRequests;
|
||||
const FDateTime Threshold = FDateTime::Now() - FTimespan::FromSeconds(OlderThanSeconds);
|
||||
|
||||
// Traiter toutes les requêtes terminées
|
||||
FDTFluxQueuedRequest CompletedRequest;
|
||||
while (CompletedRequestsQueue.Dequeue(CompletedRequest))
|
||||
for (const auto& [RequestId, Request] : AllRequests)
|
||||
{
|
||||
// Vérifier si la requête est cacheable et a reçu une réponse
|
||||
if (CompletedRequest.bIsCacheable && CompletedRequest.bHasReceivedResponse)
|
||||
if ((Request->State == EDTFluxRequestState::Completed || Request->State == EDTFluxRequestState::Failed ||
|
||||
Request->State == EDTFluxRequestState::TimedOut) && Request->CompletedAt < Threshold)
|
||||
{
|
||||
// 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)
|
||||
{
|
||||
// Le cache est encore valide, conserver la requête
|
||||
ValidCompletedRequests.Enqueue(CompletedRequest);
|
||||
}
|
||||
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);
|
||||
OldRequests.Add(RequestId);
|
||||
}
|
||||
}
|
||||
|
||||
// Restaurer la queue avec uniquement les requêtes valides
|
||||
while (ValidCompletedRequests.Dequeue(CompletedRequest))
|
||||
for (const FGuid& RequestId : OldRequests)
|
||||
{
|
||||
CompletedRequestsQueue.Enqueue(CompletedRequest);
|
||||
AllRequests.Remove(RequestId);
|
||||
}
|
||||
|
||||
// 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;
|
||||
return OldRequests.Num();
|
||||
}
|
||||
|
||||
void UDTFluxQueuedManager::ClearAllRequests()
|
||||
void FDTFluxQueuedRequestManager::ClearAllRequests()
|
||||
{
|
||||
// Vider toutes les queues
|
||||
FDTFluxQueuedRequest DummyRequest;
|
||||
while (PendingRequestsQueue.Dequeue(DummyRequest))
|
||||
{
|
||||
}
|
||||
while (CompletedRequestsQueue.Dequeue(DummyRequest))
|
||||
{
|
||||
}
|
||||
while (TimedOutRequestsQueue.Dequeue(DummyRequest))
|
||||
{
|
||||
}
|
||||
FScopeLock RequestsLock_Local(&RequestsLock);
|
||||
FScopeLock CallbacksLock_Local(&CallbacksLock);
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Cleared all pending requests"));
|
||||
AllRequests.Empty();
|
||||
SuccessCallbacks.Empty();
|
||||
ErrorCallbacks.Empty();
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Cleared all requests"));
|
||||
}
|
||||
|
||||
|
||||
void UDTFluxQueuedManager::Tick(float DeltaTime)
|
||||
void FDTFluxQueuedRequestManager::Tick(float DeltaTime)
|
||||
{
|
||||
if (!bIsInitialized)
|
||||
{
|
||||
if (!bIsInitialized.load())
|
||||
return;
|
||||
}
|
||||
|
||||
// Incrémenter le temps écoulé
|
||||
TimeSinceLastCheck += DeltaTime;
|
||||
// Mise à jour des timers
|
||||
TimeSinceLastTimeoutCheck += DeltaTime;
|
||||
TimeSinceLastRetryCheck += DeltaTime;
|
||||
|
||||
// Vérifier si c'est le moment de nettoyer les requêtes expirées
|
||||
if (TimeSinceLastCheck >= CheckInterval)
|
||||
// Vérifier les timeouts
|
||||
if (TimeSinceLastTimeoutCheck >= TimeoutCheckInterval)
|
||||
{
|
||||
TimeSinceLastCheck = 0.0f;
|
||||
CleanupTimedOutRequests();
|
||||
ProcessTimeouts();
|
||||
TimeSinceLastTimeoutCheck = 0.0f;
|
||||
}
|
||||
|
||||
// Traiter les requêtes expirées
|
||||
FDTFluxQueuedRequest TimedOutRequest;
|
||||
while (TimedOutRequestsQueue.Dequeue(TimedOutRequest))
|
||||
// Vérifier les retries
|
||||
if (TimeSinceLastRetryCheck >= RetryCheckInterval)
|
||||
{
|
||||
// Déclencher l'événement pour chaque requête expirée
|
||||
OnRequestTimedOut.Broadcast(TimedOutRequest);
|
||||
ProcessRetries();
|
||||
TimeSinceLastRetryCheck = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
bool UDTFluxQueuedManager::IsTickable() const
|
||||
void FDTFluxQueuedRequestManager::ChangeRequestState(TSharedPtr<FDTFluxTrackedRequest> Request,
|
||||
EDTFluxRequestState NewState)
|
||||
{
|
||||
return bIsInitialized;
|
||||
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));
|
||||
}
|
||||
|
||||
TStatId UDTFluxQueuedManager::GetStatId() const
|
||||
void FDTFluxQueuedRequestManager::ProcessTimeouts()
|
||||
{
|
||||
RETURN_QUICK_DECLARE_CYCLE_STAT(UDTFluxQueuedManager, STATGROUP_Tickables);
|
||||
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
|
||||
{
|
||||
ChangeRequestState(Request, EDTFluxRequestState::TimedOut);
|
||||
TriggerCallbacks(*Request);
|
||||
OnRequestFailed.Broadcast(*Request);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void FDTFluxQueuedRequestManager::ProcessRetries()
|
||||
{
|
||||
FScopeLock Lock(&RequestsLock);
|
||||
|
||||
const FDateTime Now = FDateTime::Now();
|
||||
TArray<TSharedPtr<FDTFluxTrackedRequest>> ReadyToRetry;
|
||||
|
||||
for (const auto& Pair : AllRequests)
|
||||
{
|
||||
const auto& Request = Pair.Value;
|
||||
if (Request->State == EDTFluxRequestState::Retrying)
|
||||
{
|
||||
const float ElapsedSinceLastAttempt = (Now - Request->LastAttemptTime).GetTotalSeconds();
|
||||
if (ElapsedSinceLastAttempt >= Request->GetRetryDelay())
|
||||
{
|
||||
ReadyToRetry.Add(Request);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (const auto& Request : ReadyToRetry)
|
||||
{
|
||||
Request->LastAttemptTime = Now;
|
||||
ChangeRequestState(Request, EDTFluxRequestState::Pending);
|
||||
}
|
||||
}
|
||||
|
||||
void FDTFluxQueuedRequestManager::TriggerCallbacks(const FDTFluxTrackedRequest& Request)
|
||||
{
|
||||
FScopeLock Lock(&CallbacksLock);
|
||||
|
||||
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 FDTFluxQueuedRequestManager::CleanupCallbacks(const FGuid& RequestId)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
Request = *RequestPtr;
|
||||
}
|
||||
|
||||
if (bSuccess && ParsedResponse.IsValid())
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
void FDTFluxQueuedRequestManager::OnParsingFailed(const FGuid& RequestId, const FString& ErrorMessage)
|
||||
{
|
||||
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));
|
||||
}
|
||||
|
||||
@ -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)
|
||||
@ -362,13 +363,13 @@ bool FDTFluxServerResponse::ParseContestRanking(FDTFluxContestRankings& OutConte
|
||||
OutContestRankings.Rankings.Add(Ranking);
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Successfully parsed contest ranking for Contest %d with %d entries"),
|
||||
OutContestRankings.ContestId, OutContestRankings.Rankings.Num());
|
||||
// UE_LOG(logDTFluxNetwork, Log, TEXT("Successfully parsed contest ranking for Contest %d with %d entries"),
|
||||
// OutContestRankings.ContestId, OutContestRankings.Rankings.Num());
|
||||
ParsingStatus = EDTFluxResponseStatus::Success;
|
||||
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")))
|
||||
{
|
||||
@ -474,12 +475,14 @@ bool FDTFluxServerResponse::ParseSplitSensorResponse(TArray<FDTFluxSplitSensorIn
|
||||
NewSplitSensorInfo.StageId = SplitSensorInfoResponse.StageID;
|
||||
NewSplitSensorInfo.SplitId = SplitSensorInfoResponse.SplitID;
|
||||
NewSplitSensorInfo.Time = SplitSensorInfoResponse.Time;
|
||||
NewSplitSensorInfo.Gap = SplitSensorInfoResponse.Gap;
|
||||
NewSplitSensorInfo.Rank = SplitSensorInfoResponse.Rank;
|
||||
|
||||
OutSplitSensorInfos.Add(NewSplitSensorInfo);
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Verbose, TEXT("Split sensor info for bib %d in Contest %d, Stage %d, Split %d"),
|
||||
UE_LOG(logDTFluxNetwork, Verbose, TEXT("Split sensor info for bib %d in Contest %d, Stage %d, Split %d Rank [%i] Gap [%s] Time [%s]"),
|
||||
NewSplitSensorInfo.Bib, NewSplitSensorInfo.ContestId, NewSplitSensorInfo.StageId,
|
||||
NewSplitSensorInfo.SplitId);
|
||||
NewSplitSensorInfo.SplitId, NewSplitSensorInfo.Rank, *NewSplitSensorInfo.Gap,*NewSplitSensorInfo.Time);
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxNetwork, Log, TEXT("Successfully parsed %d split sensor entries"), OutSplitSensorInfos.Num());
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
171
Source/DTFluxNetwork/Public/DTFluxAsyncParser.h
Normal file
171
Source/DTFluxNetwork/Public/DTFluxAsyncParser.h
Normal file
@ -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;
|
||||
};
|
||||
@ -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);
|
||||
};
|
||||
|
||||
@ -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 ===
|
||||
|
||||
@ -14,17 +14,21 @@ struct DTFLUXNETWORK_API FDTFluxSplitSensorItemResponse
|
||||
public:
|
||||
|
||||
UPROPERTY()
|
||||
int Bib;
|
||||
int Bib = -1;
|
||||
UPROPERTY()
|
||||
FString Type = "split-sensor-item";
|
||||
UPROPERTY()
|
||||
int ContestID;
|
||||
int ContestID =-1;
|
||||
UPROPERTY()
|
||||
int StageID;
|
||||
int StageID =-1;
|
||||
UPROPERTY()
|
||||
int SplitID;
|
||||
int SplitID = -1;
|
||||
UPROPERTY()
|
||||
FString Time = "-";
|
||||
UPROPERTY()
|
||||
int Rank = -1;
|
||||
UPROPERTY()
|
||||
FString Gap = "";
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -1,215 +1,198 @@
|
||||
// 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 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);
|
||||
|
||||
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);
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
UCLASS(Blueprintable)
|
||||
class DTFLUXNETWORK_API UDTFluxNetworkSubsystem : public UEngineSubsystem
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
UPROPERTY()
|
||||
UPROPERTY(BlueprintReadOnly, Category = "DTFlux|Network")
|
||||
EDTFluxConnectionStatus WsStatus = EDTFluxConnectionStatus::Unset;
|
||||
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnWebSocketConnected);
|
||||
|
||||
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();
|
||||
|
||||
/**
|
||||
* 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
|
||||
);
|
||||
|
||||
// === 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 = 5.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
|
||||
);
|
||||
|
||||
FGuid SendTrackedRequestWithCallback(EDTFluxApiDataType RequestType, int32 ContestId, int32 StageId, int32 SplitId,
|
||||
FOnDTFluxTrackedRequestResponse OnCompleted,
|
||||
FOnDTFluxTrackedRequestTimeout OnTimeout,
|
||||
TOptional<FOnDTFluxRequestResponseError> OnError = TOptional<
|
||||
FOnDTFluxRequestResponseError>(),
|
||||
float TimeoutSeconds = 5.0f);
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
|
||||
bool GetTrackedRequest(const FGuid& RequestId, FDTFluxTrackedRequest& OutRequest) const;
|
||||
|
||||
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)
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
|
||||
bool HasRequestReceivedResponse(const FGuid& RequestId) const;
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
|
||||
FString GetRequestResponseData(const FGuid& RequestId) const;
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Tracked Requests")
|
||||
|
||||
|
||||
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")
|
||||
|
||||
|
||||
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")
|
||||
|
||||
// === REQUÊTES DIRECTES (LEGACY) ===
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux|Tracked Requests")
|
||||
void GetRequestStatistics(int32& OutPending, int32& OutCompleted, int32& OutFailed) const;
|
||||
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux|Legacy")
|
||||
void SendRequest(const EDTFluxApiDataType RequestType, int InContestId = -1, int InStageId = -1,
|
||||
int InSplitId = -1);
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Network")
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux|Network")
|
||||
void SendMessage(const FString& Message);
|
||||
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux|Network")
|
||||
FOnWebSocketConnected OnWebSocketConnected;
|
||||
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux|Tracked Requests")
|
||||
FOnDTFluxTrackedRequestCompleted OnTrackedRequestCompleted;
|
||||
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux|Tracked Requests")
|
||||
FOnDTFluxTrackedRequestFailed OnTrackedRequestFailed;
|
||||
|
||||
FOnRaceDataReceived OnRaceDataReceived;
|
||||
FOnTeamListReceived OnTeamListReceived;
|
||||
FOnStageRankingReceived OnStageRankingReceived;
|
||||
FOnSplitRankingReceived OnSplitRankingReceived;
|
||||
FOnContestRankingReceived OnContestRankingReceived;
|
||||
FOnSplitSensorReceived OnSplitSensorReceived;
|
||||
FOnTeamUpdateReceived OnTeamUpdateReceived;
|
||||
FOnTeamStatusUpdateReceived OnTeamStatusUpdateReceived;
|
||||
|
||||
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; }
|
||||
|
||||
|
||||
|
||||
TSharedPtr<FDTFluxQueuedRequestManager> GetRequestManager() const { return RequestManager; }
|
||||
|
||||
protected:
|
||||
// ~Subsystem Interface
|
||||
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);
|
||||
void ReconnectWs(const FName WsClientId);
|
||||
TSharedPtr<FDTFluxQueuedRequestManager> RequestManager;
|
||||
|
||||
UFUNCTION()
|
||||
void HttpSettingsChanged(const FDTFluxHttpSettings& NewHttpSettings);
|
||||
void ReconnectHttp(const FName WsClientId);
|
||||
|
||||
// === GESTION DES ÉVÉNEMENTS HTTP ===
|
||||
void RegisterHttpEvents();
|
||||
void UnregisterHttpEvents();
|
||||
|
||||
// === 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);
|
||||
|
||||
FDelegateHandle OnWsConnectedEventDelegateHandle;
|
||||
FDelegateHandle OnWsConnectionErrorEventDelegateHandle;
|
||||
FDelegateHandle OnWsClosedEventDelegateHandle;
|
||||
@ -217,8 +200,27 @@ private:
|
||||
FDelegateHandle OnWsMessageSentEventDelegateHandle;
|
||||
|
||||
|
||||
// === 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);
|
||||
@ -226,19 +228,43 @@ private:
|
||||
void ParseStatusUpdateResponse(FDTFluxServerResponse& Response);
|
||||
void ParseSplitSensorResponse(FDTFluxServerResponse& Response);
|
||||
EDTFluxResponseStatus ProcessPushMessage(FDTFluxServerResponse& Response);
|
||||
void Parse(FDTFluxServerResponse& Response);
|
||||
|
||||
|
||||
bool CleanRequestCallbacks(const FGuid& RequestId);
|
||||
/**
|
||||
* Callback appelé quand une requête trackée se termine
|
||||
*/
|
||||
void OnRequestCompleted_Internal(const FDTFluxTrackedRequest& CompletedRequest);
|
||||
|
||||
// === GESTION DES REQUÊTES TRACKÉES ===
|
||||
/**
|
||||
* Callback appelé quand une requête trackée échoue
|
||||
*/
|
||||
void OnRequestFailed_Internal(const FDTFluxTrackedRequest& FailedRequest);
|
||||
|
||||
|
||||
/**
|
||||
* 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);
|
||||
|
||||
// === UTILITAIRES ===
|
||||
/**
|
||||
* Reconnecter le client WebSocket
|
||||
*/
|
||||
void ReconnectWs(const FName WsClientId);
|
||||
|
||||
|
||||
/**
|
||||
* 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;
|
||||
};
|
||||
|
||||
@ -23,7 +23,7 @@ public class DTFluxProjectSettings : ModuleRules
|
||||
"DeveloperSettings",
|
||||
"DTFluxCore",
|
||||
"Settings",
|
||||
"DeveloperSettings"
|
||||
"DeveloperSettings","AvalancheMedia"
|
||||
|
||||
}
|
||||
);
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "DTFluxGeneralSettings.h"
|
||||
#include "Assets/DTFluxModelAsset.h"
|
||||
|
||||
#include "DTFluxProjectSettingsModule.h"
|
||||
|
||||
@ -14,3 +15,17 @@ UDTFluxGeneralSettings::UDTFluxGeneralSettings()
|
||||
UE_LOG(logDTFluxProjectSettings, Log, TEXT("Category Name -> %s"), *GetCategoryName().ToString());
|
||||
|
||||
}
|
||||
|
||||
void UDTFluxGeneralSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
|
||||
{
|
||||
Super::PostEditChangeProperty(PropertyChangedEvent);
|
||||
if (PropertyChangedEvent.Property &&
|
||||
PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(UDTFluxGeneralSettings, RemoteTargetRundown))
|
||||
{
|
||||
UE_LOG(LogTemp, Log, TEXT("RemoteTargetRundown property changed to: %s"),
|
||||
RemoteTargetRundown.IsNull() ? TEXT("None") : *RemoteTargetRundown.ToString());
|
||||
|
||||
OnRemoteRundownChanged.Broadcast(RemoteTargetRundown);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -3,10 +3,11 @@
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Assets/DTFluxModelAsset.h"
|
||||
#include "Engine/DeveloperSettings.h"
|
||||
#include "DTFluxGeneralSettings.generated.h"
|
||||
|
||||
class UAvaRundown;
|
||||
class UDTFluxModelAsset;
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@ -20,5 +21,14 @@ public:
|
||||
UDTFluxGeneralSettings();
|
||||
UPROPERTY(Category="General", Config, EditAnywhere, BlueprintReadOnly, DisplayName="Datastorage File")
|
||||
TSoftObjectPtr<UDTFluxModelAsset> ModelAsset;
|
||||
UPROPERTY(Category="General|Remote HTTP", Config, EditAnywhere, BlueprintReadOnly, DisplayName="Rundown Remote Target")
|
||||
TSoftObjectPtr<UAvaRundown> RemoteTargetRundown;
|
||||
|
||||
#if WITH_EDITOR
|
||||
virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
|
||||
|
||||
DECLARE_MULTICAST_DELEGATE_OneParam(FOnRemoteRundownChanged, const TSoftObjectPtr<UAvaRundown>& );
|
||||
FOnRemoteRundownChanged OnRemoteRundownChanged;
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
31
Source/DTFluxRemote/DTFluxRemote.Build.cs
Normal file
31
Source/DTFluxRemote/DTFluxRemote.Build.cs
Normal file
@ -0,0 +1,31 @@
|
||||
using UnrealBuildTool;
|
||||
|
||||
public class DTFluxRemote : ModuleRules
|
||||
{
|
||||
public DTFluxRemote(ReadOnlyTargetRules Target) : base(Target)
|
||||
{
|
||||
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
|
||||
|
||||
PublicDependencyModuleNames.AddRange(
|
||||
new string[]
|
||||
{
|
||||
"Core",
|
||||
}
|
||||
);
|
||||
|
||||
PrivateDependencyModuleNames.AddRange(
|
||||
new string[]
|
||||
{
|
||||
"CoreUObject",
|
||||
"Engine",
|
||||
"Slate",
|
||||
"SlateCore",
|
||||
"HttpServer",
|
||||
"JsonUtilities",
|
||||
"Json",
|
||||
"DTFluxProjectSettings",
|
||||
"AvalancheMedia"
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
6
Source/DTFluxRemote/Private/DTFluxRemoteMessage.cpp
Normal file
6
Source/DTFluxRemote/Private/DTFluxRemoteMessage.cpp
Normal file
@ -0,0 +1,6 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
|
||||
#include "DTFluxRemoteMessage.h"
|
||||
|
||||
|
||||
19
Source/DTFluxRemote/Private/DTFluxRemoteModule.cpp
Normal file
19
Source/DTFluxRemote/Private/DTFluxRemoteModule.cpp
Normal file
@ -0,0 +1,19 @@
|
||||
#include "DTFluxRemoteModule.h"
|
||||
|
||||
#define LOCTEXT_NAMESPACE "FDTFluxRemoteModule"
|
||||
|
||||
DEFINE_LOG_CATEGORY(logDTFluxRemote);
|
||||
|
||||
void FDTFluxRemoteModule::StartupModule()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void FDTFluxRemoteModule::ShutdownModule()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
#undef LOCTEXT_NAMESPACE
|
||||
|
||||
IMPLEMENT_MODULE(FDTFluxRemoteModule, DTFluxRemote)
|
||||
549
Source/DTFluxRemote/Private/DTFluxRemoteSubsystem.cpp
Normal file
549
Source/DTFluxRemote/Private/DTFluxRemoteSubsystem.cpp
Normal file
@ -0,0 +1,549 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
|
||||
#include "DTFluxRemoteSubsystem.h"
|
||||
#include "DTFluxRemoteSubsystem.h"
|
||||
|
||||
#include "DTFluxGeneralSettings.h"
|
||||
#include "DTFluxRemoteModule.h"
|
||||
#include "DTFluxRemoteModule.h"
|
||||
#include "HttpServerModule.h"
|
||||
#include "IHttpRouter.h"
|
||||
#include "Rundown/AvaRundown.h"
|
||||
#include "Json.h"
|
||||
#include "JsonObjectConverter.h"
|
||||
#include "Engine/Engine.h"
|
||||
#include "Misc/DateTime.h"
|
||||
|
||||
|
||||
void UDTFluxRemoteSubsystem::Initialize(FSubsystemCollectionBase& Collection)
|
||||
{
|
||||
Super::Initialize(Collection);
|
||||
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("DTFlux API Subsystem Initialized"));
|
||||
|
||||
#if WITH_EDITOR
|
||||
// S'abonner aux changements de settings
|
||||
if (UDTFluxGeneralSettings* Settings = GetMutableDefault<UDTFluxGeneralSettings>())
|
||||
{
|
||||
SettingsRundownChangedHandle = Settings->OnRemoteRundownChanged.AddUObject(
|
||||
this, &UDTFluxRemoteSubsystem::OnSettingsRundownChanged
|
||||
);
|
||||
}
|
||||
#endif
|
||||
LoadRundownFromSettings();
|
||||
// Auto-start server (optionnel)
|
||||
StartHTTPServer(63350);
|
||||
}
|
||||
|
||||
void UDTFluxRemoteSubsystem::Deinitialize()
|
||||
{
|
||||
StopHTTPServer();
|
||||
|
||||
|
||||
#if WITH_EDITOR
|
||||
// Se désabonner du delegate
|
||||
if (UDTFluxGeneralSettings* Settings = GetMutableDefault<UDTFluxGeneralSettings>())
|
||||
{
|
||||
if (SettingsRundownChangedHandle.IsValid())
|
||||
{
|
||||
Settings->OnRemoteRundownChanged.Remove(SettingsRundownChangedHandle);
|
||||
SettingsRundownChangedHandle.Reset();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Décharger proprement le rundown
|
||||
UnloadCurrentRundown();
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("DTFlux API Subsystem Deinitialized"));
|
||||
|
||||
Super::Deinitialize();
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::StartHTTPServer(int32 Port)
|
||||
{
|
||||
if (bServerRunning)
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Warning, TEXT("HTTP Server already running on port %d"), ServerPort);
|
||||
return true;
|
||||
}
|
||||
|
||||
ServerPort = Port;
|
||||
|
||||
// Get HTTP Server Module
|
||||
FHttpServerModule& HttpServerModule = FHttpServerModule::Get();
|
||||
|
||||
// Create router
|
||||
HttpRouter = HttpServerModule.GetHttpRouter(ServerPort);
|
||||
|
||||
if (!HttpRouter.IsValid())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Failed to create HTTP router for port %d"), ServerPort);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Setup routes
|
||||
SetupRoutes();
|
||||
|
||||
// Start listening
|
||||
HttpServerModule.StartAllListeners();
|
||||
|
||||
bServerRunning = true;
|
||||
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("DTFlux HTTP API Server started on port %d"), ServerPort);
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Base URL: http://localhost:%d/dtflux/api/v1"), ServerPort);
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Available routes:"));
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT(" PUT /dtflux/api/v1/title"));
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT(" PUT /dtflux/api/v1/title-bib"));
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT(" PUT /dtflux/api/v1/commands"));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void UDTFluxRemoteSubsystem::StopHTTPServer()
|
||||
{
|
||||
if (!bServerRunning)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Remove route handlers
|
||||
if (HttpRouter.IsValid())
|
||||
{
|
||||
HttpRouter->UnbindRoute(TitleRouteHandle);
|
||||
HttpRouter->UnbindRoute(TitleBibRouteHandle);
|
||||
HttpRouter->UnbindRoute(CommandsRouteHandle);
|
||||
}
|
||||
|
||||
// Stop server
|
||||
FHttpServerModule& HttpServerModule = FHttpServerModule::Get();
|
||||
HttpServerModule.StopAllListeners();
|
||||
|
||||
HttpRouter.Reset();
|
||||
bServerRunning = false;
|
||||
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("DTFlux HTTP API Server stopped"));
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::IsHTTPServerRunning() const
|
||||
{
|
||||
return bServerRunning;
|
||||
}
|
||||
|
||||
void UDTFluxRemoteSubsystem::ResetPendingTitleData()
|
||||
{
|
||||
bHasPendingTitleRequest = false;
|
||||
}
|
||||
|
||||
void UDTFluxRemoteSubsystem::ResetPendingBibData()
|
||||
{
|
||||
bHasPendingTitleBibRequest = false;
|
||||
}
|
||||
|
||||
void UDTFluxRemoteSubsystem::SetupRoutes()
|
||||
{
|
||||
if (!HttpRouter.IsValid())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Route: POST /dtflux/api/v1/title
|
||||
TitleRouteHandle = HttpRouter->BindRoute(
|
||||
FHttpPath(TEXT("/dtflux/api/v1/title")),
|
||||
EHttpServerRequestVerbs::VERB_PUT,
|
||||
FHttpRequestHandler::CreateUObject(this, &UDTFluxRemoteSubsystem::HandleTitleRequest)
|
||||
);
|
||||
|
||||
// Route: POST /dtflux/api/v1/title-bib
|
||||
TitleBibRouteHandle = HttpRouter->BindRoute(
|
||||
FHttpPath(TEXT("/dtflux/api/v1/title-bib")),
|
||||
EHttpServerRequestVerbs::VERB_PUT,
|
||||
FHttpRequestHandler::CreateUObject(this, &UDTFluxRemoteSubsystem::HandleTitleBibRequest)
|
||||
);
|
||||
|
||||
// Route: POST /dtflux/api/v1/commands
|
||||
CommandsRouteHandle = HttpRouter->BindRoute(
|
||||
FHttpPath(TEXT("/dtflux/api/v1/commands")),
|
||||
EHttpServerRequestVerbs::VERB_PUT,
|
||||
FHttpRequestHandler::CreateUObject(this, &UDTFluxRemoteSubsystem::HandleCommandsRequest)
|
||||
);
|
||||
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("HTTP routes configured successfully"));
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::HandleTitleRequest(const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete)
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Received Title request"));
|
||||
|
||||
// Parse JSON
|
||||
TSharedPtr<FJsonObject> JsonObject = ParseJsonFromRequest(Request);
|
||||
if (!JsonObject.IsValid())
|
||||
{
|
||||
OnComplete(FHttpServerResponse::Create(CreateErrorResponse(TEXT("Invalid JSON")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
// Parse title data
|
||||
FDTFluxRemoteTitleData TitleData;
|
||||
if (!ParseTitleData(JsonObject, TitleData))
|
||||
{
|
||||
OnComplete(FHttpServerResponse::Create(CreateErrorResponse(TEXT("Invalid title data format")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
// Broadcast event (execute on Game Thread)
|
||||
AsyncTask(ENamedThreads::GameThread, [this, TitleData]()
|
||||
{
|
||||
OnTitleReceived.Broadcast(TitleData);
|
||||
if (RemotedRundown && RemotedRundown->IsValidLowLevel())
|
||||
{
|
||||
PendingTitleData = TitleData;
|
||||
bHasPendingTitleRequest = true;
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Playing page %i"), TitleData.RundownPageId);
|
||||
RemotedRundown->PlayPage(TitleData.RundownPageId, EAvaRundownPagePlayType::PlayFromStart);
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Warning, TEXT("No rundown loaded"));
|
||||
}
|
||||
});
|
||||
|
||||
OnComplete(FHttpServerResponse::Create(CreateSuccessResponse(TEXT("Title data received")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::HandleTitleBibRequest(const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete)
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Received Title-Bib request"));
|
||||
|
||||
TSharedPtr<FJsonObject> JsonObject = ParseJsonFromRequest(Request);
|
||||
if (!JsonObject.IsValid())
|
||||
{
|
||||
OnComplete(FHttpServerResponse::Create(CreateErrorResponse(TEXT("Invalid JSON")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
FDTFluxRemoteBibData BibData;
|
||||
if (!ParseTitleBibData(JsonObject, BibData))
|
||||
{
|
||||
OnComplete(FHttpServerResponse::Create(CreateErrorResponse(TEXT("Invalid title-bib data format")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
AsyncTask(ENamedThreads::GameThread, [this, BibData]()
|
||||
{
|
||||
OnTitleBibReceived.Broadcast(BibData);
|
||||
});
|
||||
|
||||
OnComplete(FHttpServerResponse::Create(CreateSuccessResponse(TEXT("Title-bib data received")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::HandleCommandsRequest(const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete)
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Received Commands request"));
|
||||
|
||||
TSharedPtr<FJsonObject> JsonObject = ParseJsonFromRequest(Request);
|
||||
if (!JsonObject.IsValid())
|
||||
{
|
||||
OnComplete(FHttpServerResponse::Create(CreateErrorResponse(TEXT("Invalid JSON")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
FDTFluxRemoteCommandData CommandData;
|
||||
if (!ParseCommandData(JsonObject, CommandData))
|
||||
{
|
||||
OnComplete(FHttpServerResponse::Create(CreateErrorResponse(TEXT("Invalid command data format")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
AsyncTask(ENamedThreads::GameThread, [this, CommandData]()
|
||||
{
|
||||
OnCommandReceived.Broadcast(CommandData);
|
||||
if (RemotedRundown && RemotedRundown->IsValidLowLevel())
|
||||
{
|
||||
RemotedRundown->StopPage(CommandData.RundownPageId, EAvaRundownPageStopOptions::None, false);
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Stoping page %i"), CommandData.RundownPageId);
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Warning, TEXT("No rundown loaded"));
|
||||
}
|
||||
});
|
||||
|
||||
OnComplete(FHttpServerResponse::Create(CreateErrorResponse(TEXT("OK")), TEXT("application/json")));
|
||||
return true;
|
||||
}
|
||||
|
||||
TSharedPtr<FJsonObject> UDTFluxRemoteSubsystem::ParseJsonFromRequest(const FHttpServerRequest& Request)
|
||||
{
|
||||
// Get request body
|
||||
TArray<uint8> Body = Request.Body;
|
||||
FString JsonString;
|
||||
if (Body.Num() > 0)
|
||||
{
|
||||
// Ajouter un null terminator si nécessaire
|
||||
if (Body.Last() != 0)
|
||||
{
|
||||
Body.Add(0);
|
||||
}
|
||||
|
||||
JsonString = FString(UTF8_TO_TCHAR(reinterpret_cast<const char*>(Body.GetData())));
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxRemote, Verbose, TEXT("Received JSON: %s"), *JsonString);
|
||||
|
||||
// Parse JSON
|
||||
TSharedPtr<FJsonObject> JsonObject;
|
||||
TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(JsonString);
|
||||
|
||||
if (!FJsonSerializer::Deserialize(Reader, JsonObject) || !JsonObject.IsValid())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Failed to parse JSON: %s"), *JsonString);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return JsonObject;
|
||||
}
|
||||
|
||||
FString UDTFluxRemoteSubsystem::CreateSuccessResponse(const FString& Message)
|
||||
{
|
||||
TSharedPtr<FJsonObject> ResponseObject = MakeShareable(new FJsonObject);
|
||||
ResponseObject->SetBoolField(TEXT("success"), true);
|
||||
ResponseObject->SetStringField(TEXT("message"), Message);
|
||||
ResponseObject->SetStringField(TEXT("timestamp"), FDateTime::Now().ToIso8601());
|
||||
|
||||
FString OutputString;
|
||||
TSharedRef<TJsonWriter<>> Writer = TJsonWriterFactory<>::Create(&OutputString);
|
||||
FJsonSerializer::Serialize(ResponseObject.ToSharedRef(), Writer);
|
||||
|
||||
return OutputString;
|
||||
}
|
||||
|
||||
FString UDTFluxRemoteSubsystem::CreateErrorResponse(const FString& Error, int32 Code)
|
||||
{
|
||||
TSharedPtr<FJsonObject> ResponseObject = MakeShareable(new FJsonObject);
|
||||
ResponseObject->SetBoolField(TEXT("success"), false);
|
||||
ResponseObject->SetStringField(TEXT("error"), Error);
|
||||
ResponseObject->SetNumberField(TEXT("code"), Code);
|
||||
ResponseObject->SetStringField(TEXT("timestamp"), FDateTime::Now().ToIso8601());
|
||||
|
||||
FString OutputString;
|
||||
TSharedRef<TJsonWriter<>> Writer = TJsonWriterFactory<>::Create(&OutputString);
|
||||
FJsonSerializer::Serialize(ResponseObject.ToSharedRef(), Writer);
|
||||
|
||||
return OutputString;
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::ParseTitleData(const TSharedPtr<FJsonObject>& JsonObject, FDTFluxRemoteTitleData& OutData)
|
||||
{
|
||||
if (!JsonObject.IsValid())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Invalid JSON object for %s"), TEXT("FDTFluxRemoteTitleData"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (FJsonObjectConverter::JsonObjectToUStruct<FDTFluxRemoteTitleData>(JsonObject.ToSharedRef(), &OutData))
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Successfully parsed %s"), TEXT("FDTFluxRemoteTitleData"));
|
||||
return true;
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Failed to convert JSON to %s struct"),TEXT("FDTFluxRemoteTitleData"));
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::ParseTitleBibData(const TSharedPtr<FJsonObject>& JsonObject, FDTFluxRemoteBibData& OutData)
|
||||
{
|
||||
if (!JsonObject.IsValid())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Invalid JSON object for %s"), TEXT("FDTFluxRemoteBibData"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (FJsonObjectConverter::JsonObjectToUStruct<FDTFluxRemoteBibData>(JsonObject.ToSharedRef(), &OutData))
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Successfully parsed %s"), TEXT("FDTFluxRemoteBibData"));
|
||||
return true;
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Failed to convert JSON to %s struct"),TEXT("FDTFluxRemoteBibData"));
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::ParseCommandData(const TSharedPtr<FJsonObject>& JsonObject, FDTFluxRemoteCommandData& OutData)
|
||||
{
|
||||
if (!JsonObject.IsValid())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Invalid JSON object for %s"), TEXT("FDTFluxRemoteCommandData"));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (FJsonObjectConverter::JsonObjectToUStruct<FDTFluxRemoteCommandData>(JsonObject.ToSharedRef(), &OutData))
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Successfully parsed %s"), TEXT("FDTFluxRemoteCommandData"));
|
||||
return true;
|
||||
}
|
||||
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Failed to convert JSON to %s struct"),TEXT("FDTFluxRemoteCommandData"));
|
||||
return false;
|
||||
}
|
||||
|
||||
void UDTFluxRemoteSubsystem::UnloadCurrentRundown()
|
||||
{
|
||||
if (RemotedRundown)
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Unloading current rundown"));
|
||||
// Ici vous pouvez ajouter une logique de nettoyage si nécessaire
|
||||
// Par exemple : RemotedRundown->StopAllPages();
|
||||
RemotedRundown = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
void UDTFluxRemoteSubsystem::LoadRundownFromSettings()
|
||||
{
|
||||
const UDTFluxGeneralSettings* Settings = GetDefault<UDTFluxGeneralSettings>();
|
||||
if (!Settings)
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Warning, TEXT("Cannot access DTFlux settings"));
|
||||
return;
|
||||
}
|
||||
|
||||
TSoftObjectPtr<UAvaRundown> RundownAsset = Settings->RemoteTargetRundown;
|
||||
|
||||
if (RundownAsset.IsNull())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("No rundown specified in settings"));
|
||||
UnloadCurrentRundown();
|
||||
return;
|
||||
}
|
||||
|
||||
if (RemotedRundown && RemotedRundown == RundownAsset.LoadSynchronous())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Rundown already loaded: %s"), *RundownAsset.ToString());
|
||||
return;
|
||||
}
|
||||
|
||||
// Décharger l'ancien rundown d'abord
|
||||
UnloadCurrentRundown();
|
||||
RundownAsset = RundownAsset.LoadSynchronous();
|
||||
// Charger le nouveau rundown
|
||||
if ( RundownAsset.IsValid())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Successfully loaded rundown from settings: %s"), *RundownAsset.ToString());
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Failed to load rundown from settings: %s"), *RundownAsset.ToString());
|
||||
}
|
||||
LoadRundown(RundownAsset);
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::LoadRundown(const TSoftObjectPtr<UAvaRundown>& RundownAsset)
|
||||
{
|
||||
if (RundownAsset.IsNull())
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Warning, TEXT("Cannot load rundown: asset is null"));
|
||||
UnloadCurrentRundown();
|
||||
return false;
|
||||
}
|
||||
|
||||
// Charger le rundown de manière synchrone
|
||||
UAvaRundown* LoadedRundown = RundownAsset.LoadSynchronous();
|
||||
|
||||
// Vérifier si le rundown est déjà chargé
|
||||
if (RemotedRundown && RemotedRundown == LoadedRundown)
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Rundown already loaded: %s"), *RundownAsset.ToString());
|
||||
return true;
|
||||
}
|
||||
|
||||
// Décharger l'ancien rundown d'abord
|
||||
UnloadCurrentRundown();
|
||||
|
||||
// Assigner le nouveau rundown
|
||||
RemotedRundown = LoadedRundown;
|
||||
|
||||
// Vérifier que le chargement a réussi
|
||||
if (RemotedRundown && RemotedRundown->IsValidLowLevel())
|
||||
{
|
||||
RemotedRundown->InitializePlaybackContext();
|
||||
UE_LOG(logDTFluxRemote, Log, TEXT("Successfully loaded rundown: %s"), *RundownAsset.ToString());
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(logDTFluxRemote, Error, TEXT("Failed to load rundown: %s"), *RundownAsset.ToString());
|
||||
RemotedRundown = nullptr;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
#if WITH_EDITOR
|
||||
void UDTFluxRemoteSubsystem::OnSettingsRundownChanged(const TSoftObjectPtr<UAvaRundown>& NewRundown)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// Manual processing functions for testing
|
||||
bool UDTFluxRemoteSubsystem::ProcessTitleData(const FString& JsonString)
|
||||
{
|
||||
TSharedPtr<FJsonObject> JsonObject;
|
||||
TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(JsonString);
|
||||
|
||||
if (!FJsonSerializer::Deserialize(Reader, JsonObject) || !JsonObject.IsValid())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
FDTFluxRemoteTitleData TitleData;
|
||||
if (ParseTitleData(JsonObject, TitleData))
|
||||
{
|
||||
OnTitleReceived.Broadcast(TitleData);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::ProcessTitleBibData(const FString& JsonString)
|
||||
{
|
||||
TSharedPtr<FJsonObject> JsonObject;
|
||||
TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(JsonString);
|
||||
|
||||
if (!FJsonSerializer::Deserialize(Reader, JsonObject) || !JsonObject.IsValid())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
FDTFluxRemoteBibData TitleBibData;
|
||||
if (ParseTitleBibData(JsonObject, TitleBibData))
|
||||
{
|
||||
OnTitleBibReceived.Broadcast(TitleBibData);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool UDTFluxRemoteSubsystem::ProcessCommandData(const FString& JsonString)
|
||||
{
|
||||
TSharedPtr<FJsonObject> JsonObject;
|
||||
TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(JsonString);
|
||||
|
||||
if (!FJsonSerializer::Deserialize(Reader, JsonObject) || !JsonObject.IsValid())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
FDTFluxRemoteCommandData CommandData;
|
||||
if (ParseCommandData(JsonObject, CommandData))
|
||||
{
|
||||
OnCommandReceived.Broadcast(CommandData);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
220
Source/DTFluxRemote/Private/DTFluxRemotedLevelController.cpp
Normal file
220
Source/DTFluxRemote/Private/DTFluxRemotedLevelController.cpp
Normal file
@ -0,0 +1,220 @@
|
||||
// DTFluxRemoteActor.cpp
|
||||
#include "DTFluxRemotedLevelController.h"
|
||||
#include "DTFluxRemoteSubsystem.h"
|
||||
#include "Engine/Engine.h"
|
||||
#include "Engine/World.h"
|
||||
|
||||
ADTFluxRemotedLevelController::ADTFluxRemotedLevelController()
|
||||
{
|
||||
PrimaryActorTick.bCanEverTick = false;
|
||||
RemoteSubsystem = nullptr;
|
||||
bEventsBound = false;
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: Constructor called"));
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::PostInitializeComponents()
|
||||
{
|
||||
Super::PostInitializeComponents();
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: PostInitializeComponents called"));
|
||||
|
||||
// Essayer de bind dès que possible
|
||||
InitializeSubsystemBinding();
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::BeginPlay()
|
||||
{
|
||||
Super::BeginPlay();
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: BeginPlay called"));
|
||||
|
||||
// S'assurer que le binding est fait (au cas où PostInitializeComponents aurait échoué)
|
||||
if (!bEventsBound)
|
||||
{
|
||||
InitializeSubsystemBinding();
|
||||
}
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::InitializeSubsystemBinding()
|
||||
{
|
||||
// Éviter le double binding
|
||||
if (bEventsBound)
|
||||
{
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: Events already bound, skipping"));
|
||||
return;
|
||||
}
|
||||
|
||||
// Récupérer le subsystem
|
||||
if (UWorld* World = GetWorld())
|
||||
{
|
||||
RemoteSubsystem = GEngine->GetEngineSubsystem<UDTFluxRemoteSubsystem>();
|
||||
|
||||
if (RemoteSubsystem)
|
||||
{
|
||||
// Bind les events du subsystem
|
||||
RemoteSubsystem->OnTitleReceived.AddDynamic(
|
||||
this, &ADTFluxRemotedLevelController::OnTitleDataReceived
|
||||
);
|
||||
RemoteSubsystem->OnTitleBibReceived.AddDynamic(
|
||||
this, &ADTFluxRemotedLevelController::OnTitleBibDataReceived
|
||||
);
|
||||
|
||||
RemoteSubsystem->OnCommandReceived.AddDynamic(
|
||||
this, &ADTFluxRemotedLevelController::OnCommandDataReceived
|
||||
);
|
||||
|
||||
bEventsBound = true;
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: Successfully bound to subsystem events"));
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("DTFluxRemoteActor: DTFluxRemoteSubsystem not available yet"));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("DTFluxRemoteActor: World not available yet"));
|
||||
}
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::EnsureSubsystemBinding()
|
||||
{
|
||||
if (!bEventsBound)
|
||||
{
|
||||
InitializeSubsystemBinding();
|
||||
}
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::EndPlay(const EEndPlayReason::Type EndPlayReason)
|
||||
{
|
||||
// Unbind les events pour éviter les fuites mémoire
|
||||
if (RemoteSubsystem && bEventsBound)
|
||||
{
|
||||
if (TitleReceivedHandle.IsValid())
|
||||
{
|
||||
RemoteSubsystem->OnTitleReceived.RemoveDynamic(this, &ADTFluxRemotedLevelController::OnTitleDataReceived);
|
||||
TitleReceivedHandle.Reset();
|
||||
}
|
||||
|
||||
if (TitleBibReceivedHandle.IsValid())
|
||||
{
|
||||
RemoteSubsystem->OnTitleBibReceived.RemoveDynamic(this, &ADTFluxRemotedLevelController::OnTitleBibDataReceived);
|
||||
TitleBibReceivedHandle.Reset();
|
||||
}
|
||||
|
||||
if (CommandReceivedHandle.IsValid())
|
||||
{
|
||||
RemoteSubsystem->OnCommandReceived.RemoveDynamic(this, &ADTFluxRemotedLevelController::OnCommandDataReceived);
|
||||
CommandReceivedHandle.Reset();
|
||||
}
|
||||
|
||||
bEventsBound = false;
|
||||
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: Unbound from subsystem events"));
|
||||
}
|
||||
|
||||
Super::EndPlay(EndPlayReason);
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::OnTitleDataReceived(const FDTFluxRemoteTitleData& TitleData)
|
||||
{
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: Received Title Data - %s %s (RundownPageId: %d)"),
|
||||
*TitleData.FirstName, *TitleData.LastName, TitleData.RundownPageId);
|
||||
|
||||
// Broadcast l'event Blueprint
|
||||
OnTitleReceived.Broadcast(TitleData);
|
||||
|
||||
// Appeler l'event Blueprint implémentable
|
||||
BP_OnTitleDataReceived(TitleData);
|
||||
|
||||
// Appeler la fonction virtuelle C++ (peut être overridée dans les classes dérivées)
|
||||
HandleTitleData(TitleData);
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::OnTitleBibDataReceived(const FDTFluxRemoteBibData& BibData)
|
||||
{
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: Received Title Bib Data - Bib: %d"), BibData.Bib);
|
||||
|
||||
// Broadcast l'event Blueprint
|
||||
OnTitleBibReceived.Broadcast(BibData);
|
||||
|
||||
// Appeler l'event Blueprint implémentable
|
||||
BP_OnTitleBibDataReceived(BibData);
|
||||
|
||||
// Appeler la fonction virtuelle C++ (peut être overridée dans les classes dérivées)
|
||||
HandleTitleBibData(BibData);
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::OnCommandDataReceived(const FDTFluxRemoteCommandData& CommandData)
|
||||
{
|
||||
UE_LOG(LogTemp, Log, TEXT("DTFluxRemoteActor: Received Command Data - Type: %s, : RundownPageId %i"),
|
||||
*CommandData.Type, CommandData.RundownPageId);
|
||||
|
||||
// Broadcast l'event Blueprint
|
||||
OnCommandReceived.Broadcast(CommandData);
|
||||
|
||||
// Appeler l'event Blueprint implémentable
|
||||
BP_OnCommandDataReceived(CommandData);
|
||||
|
||||
// Appeler la fonction virtuelle C++ (peut être overridée dans les classes dérivées)
|
||||
HandleCommandData(CommandData);
|
||||
}
|
||||
|
||||
bool ADTFluxRemotedLevelController::IsSubsystemAvailable() const
|
||||
{
|
||||
return RemoteSubsystem && RemoteSubsystem->IsValidLowLevel();
|
||||
}
|
||||
|
||||
bool ADTFluxRemotedLevelController::IsHTTPServerRunning() const
|
||||
{
|
||||
if (RemoteSubsystem)
|
||||
{
|
||||
return RemoteSubsystem->IsHTTPServerRunning();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::StartHTTPServer(int32 Port)
|
||||
{
|
||||
if (RemoteSubsystem)
|
||||
{
|
||||
RemoteSubsystem->StartHTTPServer(Port);
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("DTFluxRemoteActor: Cannot start HTTP server - subsystem not available"));
|
||||
}
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::StopHTTPServer()
|
||||
{
|
||||
if (RemoteSubsystem)
|
||||
{
|
||||
RemoteSubsystem->StopHTTPServer();
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(LogTemp, Warning, TEXT("DTFluxRemoteActor: Cannot stop HTTP server - subsystem not available"));
|
||||
}
|
||||
}
|
||||
|
||||
// Implémentations par défaut des fonctions virtuelles C++
|
||||
void ADTFluxRemotedLevelController::HandleTitleData_Implementation(const FDTFluxRemoteTitleData& TitleData)
|
||||
{
|
||||
// Implémentation par défaut - peut être overridée dans les classes dérivées
|
||||
UE_LOG(LogTemp, Verbose, TEXT("DTFluxRemoteActor: Handling Title Data (default implementation)"));
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::HandleTitleBibData_Implementation(const FDTFluxRemoteBibData& BibData)
|
||||
{
|
||||
// Implémentation par défaut - peut être overridée dans les classes dérivées
|
||||
UE_LOG(LogTemp, Verbose, TEXT("DTFluxRemoteActor: Handling Title Bib Data (default implementation)"));
|
||||
}
|
||||
|
||||
void ADTFluxRemotedLevelController::HandleCommandData_Implementation(const FDTFluxRemoteCommandData& CommandData)
|
||||
{
|
||||
// Implémentation par défaut - peut être overridée dans les classes dérivées
|
||||
UE_LOG(LogTemp, Verbose, TEXT("DTFluxRemoteActor: Handling Command Data (default implementation)"));
|
||||
}
|
||||
76
Source/DTFluxRemote/Public/DTFluxRemoteMessage.h
Normal file
76
Source/DTFluxRemote/Public/DTFluxRemoteMessage.h
Normal file
@ -0,0 +1,76 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "DTFluxRemoteMessage.generated.h"
|
||||
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDTFluxRemoteBasicData
|
||||
{
|
||||
GENERATED_BODY()
|
||||
public:
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
FDateTime UpdateAt = FDateTime::Now();
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
int RundownPageId = -1;
|
||||
FDTFluxRemoteBasicData() = default;
|
||||
FDTFluxRemoteBasicData(const FDateTime& InUpdateAt): UpdateAt(InUpdateAt){};
|
||||
};
|
||||
|
||||
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDTFluxRemoteTitleData : public FDTFluxRemoteBasicData
|
||||
{
|
||||
GENERATED_BODY()
|
||||
public:
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
FString FirstName = "";
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
FString LastName = "";
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
FString Function1 = "";
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
FString Function2 = "";
|
||||
|
||||
|
||||
FDTFluxRemoteTitleData() = default;
|
||||
FDTFluxRemoteTitleData(const FString InFirstName, const FString InLastName, const FString InFunction1, const FString InFunction2):
|
||||
FirstName(InFirstName), LastName(InLastName), Function1(InFunction1), Function2(InFunction2){};
|
||||
};
|
||||
|
||||
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDTFluxRemoteBibData : public FDTFluxRemoteBasicData
|
||||
{
|
||||
GENERATED_BODY()
|
||||
public:
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
int Bib = -1;
|
||||
|
||||
FDTFluxRemoteBibData() = default;
|
||||
FDTFluxRemoteBibData(int InBib): Bib(InBib){};
|
||||
};
|
||||
USTRUCT(BlueprintType)
|
||||
struct FDTFluxRemoteCommandData : public FDTFluxRemoteBasicData
|
||||
{
|
||||
GENERATED_BODY()
|
||||
public:
|
||||
FDTFluxRemoteCommandData() = default;
|
||||
|
||||
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="DTFlux|Remote")
|
||||
FString Type = "Stop";
|
||||
|
||||
|
||||
FDTFluxRemoteCommandData(FString InType):
|
||||
Type(InType){};
|
||||
};
|
||||
|
||||
13
Source/DTFluxRemote/Public/DTFluxRemoteModule.h
Normal file
13
Source/DTFluxRemote/Public/DTFluxRemoteModule.h
Normal file
@ -0,0 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Modules/ModuleManager.h"
|
||||
|
||||
DTFLUXREMOTE_API DECLARE_LOG_CATEGORY_EXTERN(logDTFluxRemote, Log, All);
|
||||
|
||||
class DTFLUXREMOTE_API FDTFluxRemoteModule : public IModuleInterface
|
||||
{
|
||||
public:
|
||||
virtual void StartupModule() override;
|
||||
virtual void ShutdownModule() override;
|
||||
};
|
||||
117
Source/DTFluxRemote/Public/DTFluxRemoteSubsystem.h
Normal file
117
Source/DTFluxRemote/Public/DTFluxRemoteSubsystem.h
Normal file
@ -0,0 +1,117 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Subsystems/EngineSubsystem.h"
|
||||
#include "DTFluxRemoteMessage.h"
|
||||
#include "HttpRouteHandle.h"
|
||||
#include "IHttpRouter.h"
|
||||
#include "DTFluxRemoteSubsystem.generated.h"
|
||||
|
||||
class UAvaRundown;
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnTitleReceived, const FDTFluxRemoteTitleData&, TitleData);
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnTitleBibReceived, const FDTFluxRemoteBibData&, TitleBibData);
|
||||
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnCommandReceived, const FDTFluxRemoteCommandData&, CommandData);
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
UCLASS(BlueprintType, Category="DTFlux|Remote")
|
||||
class DTFLUXREMOTE_API UDTFluxRemoteSubsystem : public UEngineSubsystem
|
||||
{
|
||||
GENERATED_BODY()
|
||||
public:
|
||||
virtual void Initialize(FSubsystemCollectionBase& Collection) override;
|
||||
virtual void Deinitialize() override;
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux API")
|
||||
FOnTitleReceived OnTitleReceived;
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux API")
|
||||
FOnTitleBibReceived OnTitleBibReceived;
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux API")
|
||||
FOnCommandReceived OnCommandReceived;
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API")
|
||||
bool StartHTTPServer(int32 Port = 63350);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API")
|
||||
void StopHTTPServer();
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API", BlueprintPure)
|
||||
bool IsHTTPServerRunning() const;
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API", BlueprintPure)
|
||||
int32 GetServerPort() const { return ServerPort; }
|
||||
|
||||
// Manual data processing (for testing)
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API")
|
||||
bool ProcessTitleData(const FString& JsonString);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API")
|
||||
bool ProcessTitleBibData(const FString& JsonString);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API")
|
||||
bool ProcessCommandData(const FString& JsonString);
|
||||
|
||||
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "DTFlux API")
|
||||
bool bHasPendingTitleRequest = false;
|
||||
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "DTFlux API")
|
||||
bool bHasPendingTitleBibRequest = false;
|
||||
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "DTFlux API")
|
||||
FDTFluxRemoteTitleData PendingTitleData;
|
||||
|
||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "DTFlux API")
|
||||
FDTFluxRemoteBibData PendingTitleBibData;
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API")
|
||||
void ResetPendingTitleData();
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux API")
|
||||
void ResetPendingBibData();
|
||||
|
||||
private:
|
||||
void SetupRoutes();
|
||||
|
||||
bool HandleTitleRequest(const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete);
|
||||
bool HandleTitleBibRequest(const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete);
|
||||
bool HandleCommandsRequest(const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete);
|
||||
|
||||
TSharedPtr<FJsonObject> ParseJsonFromRequest(const FHttpServerRequest& Request);
|
||||
FString CreateSuccessResponse(const FString& Message = TEXT("Success"));
|
||||
FString CreateErrorResponse(const FString& Error, int32 Code = 400);
|
||||
|
||||
bool ParseTitleData(const TSharedPtr<FJsonObject>& JsonObject, FDTFluxRemoteTitleData& OutData);
|
||||
bool ParseTitleBibData(const TSharedPtr<FJsonObject>& JsonObject, FDTFluxRemoteBibData& OutData);
|
||||
bool ParseCommandData(const TSharedPtr<FJsonObject>& JsonObject, FDTFluxRemoteCommandData& OutData);
|
||||
|
||||
private:
|
||||
TSharedPtr<IHttpRouter> HttpRouter;
|
||||
TSoftObjectPtr<UAvaRundown> RemotedRundown;
|
||||
int32 ServerPort = 63350;
|
||||
bool bServerRunning = false;
|
||||
|
||||
FHttpRouteHandle TitleRouteHandle;
|
||||
FHttpRouteHandle TitleBibRouteHandle;
|
||||
FHttpRouteHandle CommandsRouteHandle;
|
||||
|
||||
void UnloadCurrentRundown();
|
||||
void LoadRundownFromSettings();
|
||||
bool LoadRundown(const TSoftObjectPtr<UAvaRundown>& RundownAsset);
|
||||
|
||||
#if WITH_EDITOR
|
||||
FDelegateHandle SettingsRundownChangedHandle;
|
||||
#endif
|
||||
|
||||
|
||||
#if WITH_EDITOR
|
||||
// Callback pour les changements de settings
|
||||
UFUNCTION()
|
||||
void OnSettingsRundownChanged(const TSoftObjectPtr<UAvaRundown>& NewRundown);
|
||||
#endif
|
||||
};
|
||||
94
Source/DTFluxRemote/Public/DTFluxRemotedLevelController.h
Normal file
94
Source/DTFluxRemote/Public/DTFluxRemotedLevelController.h
Normal file
@ -0,0 +1,94 @@
|
||||
// DTFluxRemotedLevelController.h
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "GameFramework/Actor.h"
|
||||
#include "DTFluxRemoteSubsystem.h"
|
||||
#include "DTFluxRemotedLevelController.generated.h"
|
||||
|
||||
UCLASS(BlueprintType, Blueprintable)
|
||||
class DTFLUXREMOTE_API ADTFluxRemotedLevelController : public AActor
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
ADTFluxRemotedLevelController();
|
||||
|
||||
protected:
|
||||
virtual void PostInitializeComponents() override;
|
||||
virtual void BeginPlay() override;
|
||||
virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
|
||||
|
||||
// Subsystem et binding
|
||||
UPROPERTY(BlueprintReadOnly, Category = "DTFlux")
|
||||
UDTFluxRemoteSubsystem* RemoteSubsystem;
|
||||
|
||||
FDelegateHandle TitleReceivedHandle;
|
||||
FDelegateHandle TitleBibReceivedHandle;
|
||||
FDelegateHandle CommandReceivedHandle;
|
||||
bool bEventsBound;
|
||||
|
||||
// Fonctions de binding
|
||||
void InitializeSubsystemBinding();
|
||||
|
||||
// ✅ CORRECTION : Callbacks avec UFUNCTION()
|
||||
UFUNCTION()
|
||||
void OnTitleDataReceived(const FDTFluxRemoteTitleData& TitleData);
|
||||
|
||||
UFUNCTION()
|
||||
void OnTitleBibDataReceived(const FDTFluxRemoteBibData& BibData);
|
||||
|
||||
UFUNCTION()
|
||||
void OnCommandDataReceived(const FDTFluxRemoteCommandData& CommandData);
|
||||
|
||||
public:
|
||||
// Events Blueprint-friendly
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux Events")
|
||||
FOnTitleReceived OnTitleReceived;
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux Events")
|
||||
FOnTitleBibReceived OnTitleBibReceived;
|
||||
|
||||
UPROPERTY(BlueprintAssignable, Category = "DTFlux Events")
|
||||
FOnCommandReceived OnCommandReceived;
|
||||
|
||||
// Fonctions utilitaires
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
bool IsSubsystemAvailable() const;
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
bool IsHTTPServerRunning() const;
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
void StartHTTPServer(int32 Port = 63350);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
void StopHTTPServer();
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
void EnsureSubsystemBinding();
|
||||
|
||||
protected:
|
||||
// Events Blueprint implémentables
|
||||
UFUNCTION(BlueprintImplementableEvent, Category = "DTFlux Events")
|
||||
void BP_OnTitleDataReceived(const FDTFluxRemoteTitleData& TitleData);
|
||||
|
||||
UFUNCTION(BlueprintImplementableEvent, Category = "DTFlux Events")
|
||||
void BP_OnTitleBibDataReceived(const FDTFluxRemoteBibData& BibData);
|
||||
|
||||
UFUNCTION(BlueprintImplementableEvent, Category = "DTFlux Events")
|
||||
void BP_OnCommandDataReceived(const FDTFluxRemoteCommandData& CommandData);
|
||||
|
||||
// Fonctions virtuelles C++
|
||||
UFUNCTION(BlueprintNativeEvent, Category = "DTFlux Events")
|
||||
void HandleTitleData(const FDTFluxRemoteTitleData& TitleData);
|
||||
virtual void HandleTitleData_Implementation(const FDTFluxRemoteTitleData& TitleData);
|
||||
|
||||
UFUNCTION(BlueprintNativeEvent, Category = "DTFlux Events")
|
||||
void HandleTitleBibData(const FDTFluxRemoteBibData& BibData);
|
||||
virtual void HandleTitleBibData_Implementation(const FDTFluxRemoteBibData& BibData);
|
||||
|
||||
UFUNCTION(BlueprintNativeEvent, Category = "DTFlux Events")
|
||||
void HandleCommandData(const FDTFluxRemoteCommandData& CommandData);
|
||||
virtual void HandleCommandData_Implementation(const FDTFluxRemoteCommandData& CommandData);
|
||||
};
|
||||
@ -9,7 +9,7 @@ public class DTFluxUtilities : ModuleRules
|
||||
PublicDependencyModuleNames.AddRange(
|
||||
new string[]
|
||||
{
|
||||
"Core",
|
||||
"Core"
|
||||
}
|
||||
);
|
||||
|
||||
@ -22,6 +22,7 @@ public class DTFluxUtilities : ModuleRules
|
||||
"SlateCore",
|
||||
"DTFluxCore",
|
||||
"DTFluxCoreSubsystem",
|
||||
"AvalancheMedia",
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
67
Source/DTFluxUtilities/Private/DTFluxUtils.cpp
Normal file
67
Source/DTFluxUtilities/Private/DTFluxUtils.cpp
Normal file
@ -0,0 +1,67 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
|
||||
#include "DTFluxUtils.h"
|
||||
|
||||
#include "DTFluxCoreSubsystem.h"
|
||||
#include "DTFluxUtilitiesModule.h"
|
||||
|
||||
FText UFTDFluxUtils::GetFormatedName(const int& Bib, const int MaxChar, const FString Separator,
|
||||
const FString OverFlowChar)
|
||||
{
|
||||
UDTFluxCoreSubsystem* CoreSubsystem = GEngine->GetEngineSubsystem<UDTFluxCoreSubsystem>();
|
||||
if (CoreSubsystem != nullptr)
|
||||
{
|
||||
FDTFluxParticipant OutParticipant;
|
||||
CoreSubsystem->GetParticipant(Bib, OutParticipant);
|
||||
return OutParticipant.GetFormattedNameText(MaxChar, Separator, OverFlowChar);
|
||||
}
|
||||
UE_LOG(logDTFluxUtilities, Error, TEXT("DTFluxCoreSubsystem not available"));
|
||||
return FText();
|
||||
}
|
||||
|
||||
FText UFTDFluxUtils::GetParticipantFormatedName(FDTFluxParticipant& Participant, const int MaxChar,
|
||||
const FString Separator,
|
||||
const FString OverFlowChar)
|
||||
{
|
||||
return Participant.GetFormattedNameText(MaxChar, Separator, OverFlowChar);
|
||||
}
|
||||
|
||||
void UFTDFluxUtils::GetFullName(const int Bib, FText& OutFullName)
|
||||
{
|
||||
OutFullName = FText();
|
||||
UDTFluxCoreSubsystem* CoreSubsystem = GEngine->GetEngineSubsystem<UDTFluxCoreSubsystem>();
|
||||
if(CoreSubsystem != nullptr)
|
||||
{
|
||||
FDTFluxParticipant Participant;
|
||||
if(CoreSubsystem->GetParticipant(Bib, Participant))
|
||||
{
|
||||
FString FormattedName = "";
|
||||
if (Participant.IsTeam())
|
||||
{
|
||||
OutFullName = FText::FromString(Participant.Team);
|
||||
return;
|
||||
}
|
||||
if (Participant.GetTeammate().IsEmpty())
|
||||
{
|
||||
UE_LOG(logDTFluxUtilities, Warning, TEXT("Non teammate found with Bib %i"), Bib)
|
||||
return;
|
||||
}
|
||||
OutFullName = FText::FromString(FString::Printf(TEXT("%s %s"), *Participant.GetTeammate()[0].FirstName,
|
||||
*Participant.GetTeammate()[0].LastName));
|
||||
return;
|
||||
}
|
||||
UE_LOG(logDTFluxUtilities, Warning, TEXT("Participant not found with Bib %i"), Bib);
|
||||
}
|
||||
UE_LOG(logDTFluxUtilities, Error, TEXT("DTFluxCoreSubsystem not available"));
|
||||
}
|
||||
|
||||
TArray<FDTFluxSplitSensorInfo> UFTDFluxUtils::SortSplitRankingsByRank(const TArray<FDTFluxSplitSensorInfo>& Rankings)
|
||||
{
|
||||
TArray<FDTFluxSplitSensorInfo> CopyRankings = Rankings;
|
||||
CopyRankings.Sort([](const FDTFluxSplitSensorInfo& A, const FDTFluxSplitSensorInfo& B)
|
||||
{
|
||||
return A.Rank < B.Rank;
|
||||
});
|
||||
return CopyRankings;
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
|
||||
#include "FTDFluxUtils.h"
|
||||
|
||||
#include "DTFluxCoreSubsystem.h"
|
||||
|
||||
FText UFTDFluxUtils::GetFormatedName(const int& Bib, const int MaxChar, const FString OverFlowChar)
|
||||
{
|
||||
UDTFluxCoreSubsystem* CoreSubsystem = GEngine->GetEngineSubsystem<UDTFluxCoreSubsystem>();
|
||||
const FDTFluxParticipant OutParticipant = CoreSubsystem->GetParticipant(Bib);
|
||||
return OutParticipant.GetFormattedNameText(MaxChar, OverFlowChar);
|
||||
}
|
||||
|
||||
FText UFTDFluxUtils::GetParticipantFormatedName(FDTFluxParticipant& Participant, const int MaxChar,
|
||||
const FString OverFlowChar)
|
||||
{
|
||||
return Participant.GetFormattedNameText(MaxChar, OverFlowChar);
|
||||
}
|
||||
114
Source/DTFluxUtilities/Private/RundownController.cpp
Normal file
114
Source/DTFluxUtilities/Private/RundownController.cpp
Normal file
@ -0,0 +1,114 @@
|
||||
// ===============================================
|
||||
// 3. SOURCE FILE (.CPP) - TOUS LES INCLUDES
|
||||
// ===============================================
|
||||
|
||||
// YourRundownController.cpp
|
||||
#include "RundownController.h"
|
||||
|
||||
#include "DTFluxUtilitiesModule.h"
|
||||
#include "Rundown/AvaRundown.h"
|
||||
#include "Rundown/AvaRundownPage.h"
|
||||
#include "Engine/Engine.h"
|
||||
#include "Engine/World.h"
|
||||
#include "UObject/UObjectGlobals.h"
|
||||
#include "UObject/ConstructorHelpers.h"
|
||||
#include "TimerManager.h"
|
||||
#include "Logging/LogMacros.h"
|
||||
#include "Components/StaticMeshComponent.h"
|
||||
#include "Materials/MaterialInterface.h"
|
||||
#include "Blueprint/UserWidget.h"
|
||||
|
||||
DEFINE_LOG_CATEGORY_STATIC(LogYourRundownController, Log, All);
|
||||
|
||||
// ===============================================
|
||||
// 4. IMPLÉMENTATION SIMPLE
|
||||
// ===============================================
|
||||
|
||||
ARundownController::ARundownController()
|
||||
{
|
||||
PrimaryActorTick.bCanEverTick = false;
|
||||
}
|
||||
|
||||
bool ARundownController::LoadRundown(const TSoftObjectPtr<UAvaRundown> RundownAsset)
|
||||
{
|
||||
if (RundownAsset.IsNull())
|
||||
{
|
||||
UE_LOG(logDTFluxUtilities, Error, TEXT("RundownAsset Null"));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Charger l'asset rundown
|
||||
CurrentRundown = RundownAsset.LoadSynchronous();
|
||||
|
||||
if (!CurrentRundown)
|
||||
{
|
||||
UE_LOG(LogYourRundownController, Error, TEXT("Failed to load rundown: %s"), *RundownAsset.ToString());
|
||||
return false;
|
||||
}
|
||||
|
||||
// Initialiser le contexte de playback
|
||||
CurrentRundown->InitializePlaybackContext();
|
||||
|
||||
UE_LOG(LogYourRundownController, Log, TEXT("Successfully loaded rundown: %s"), *RundownAsset.ToString());
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ARundownController::PlayPage(int32 PageId)
|
||||
{
|
||||
if (!CurrentRundown)
|
||||
{
|
||||
UE_LOG(LogYourRundownController, Error, TEXT("No rundown loaded. Call LoadRundown first."));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Vérifier que la page existe
|
||||
const FAvaRundownPage& Page = CurrentRundown->GetPage(PageId);
|
||||
if (!Page.IsValidPage())
|
||||
{
|
||||
UE_LOG(LogYourRundownController, Error, TEXT("Invalid page ID: %d"), PageId);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Jouer la page
|
||||
bool bSuccess = CurrentRundown->PlayPage(PageId, EAvaRundownPagePlayType::PlayFromStart);
|
||||
|
||||
if (bSuccess)
|
||||
{
|
||||
CurrentPageId = PageId;
|
||||
UE_LOG(LogYourRundownController, Log, TEXT("Playing page %d: %s"), PageId, *Page.GetPageName());
|
||||
}
|
||||
else
|
||||
{
|
||||
UE_LOG(LogYourRundownController, Warning, TEXT("Failed to play page %d"), PageId);
|
||||
}
|
||||
|
||||
return bSuccess;
|
||||
}
|
||||
|
||||
bool ARundownController::StopPage(int32 PageId)
|
||||
{
|
||||
if (!CurrentRundown)
|
||||
{
|
||||
UE_LOG(LogYourRundownController, Error, TEXT("No rundown loaded"));
|
||||
return false;
|
||||
}
|
||||
|
||||
bool bSuccess = CurrentRundown->StopPage(PageId, EAvaRundownPageStopOptions::Default, false);
|
||||
|
||||
if (bSuccess)
|
||||
{
|
||||
UE_LOG(LogYourRundownController, Log, TEXT("Stopped page %d"), PageId);
|
||||
}
|
||||
|
||||
return bSuccess;
|
||||
}
|
||||
|
||||
FString ARundownController::ListePages()
|
||||
{
|
||||
if (!CurrentRundown)
|
||||
{
|
||||
UE_LOG(logDTFluxUtilities, Error, TEXT("No rundown loaded"));
|
||||
return FString();
|
||||
}
|
||||
return FString();
|
||||
}
|
||||
@ -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:
|
||||
|
||||
77
Source/DTFluxUtilities/Public/DTFluxUtils.h
Normal file
77
Source/DTFluxUtilities/Public/DTFluxUtils.h
Normal file
@ -0,0 +1,77 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "DTFluxCore/Public/Types/Struct/DTFluxTeamListStruct.h"
|
||||
#include "Kismet/BlueprintFunctionLibrary.h"
|
||||
#include "Types/Struct/DTFluxSplitSensor.h"
|
||||
#include "DTFluxUtils.generated.h"
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
UCLASS()
|
||||
class DTFLUXUTILITIES_API UFTDFluxUtils : public UBlueprintFunctionLibrary
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="name, concat, participant"))
|
||||
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 = "...");
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="convert, StageRankings, DTFlux"))
|
||||
static void CastToDTFluxStageRanking(const FDTFluxDetailedRankingItem& ItemRanking, FDTFluxStageRanking& OutRanking)
|
||||
{
|
||||
CastRankingItem<FDTFluxStageRanking>(ItemRanking, OutRanking);
|
||||
}
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="convert, StageRankings, DTFlux"))
|
||||
static void CastToDTFluxStageRankingArray(const TArray<FDTFluxDetailedRankingItem>& ItemRanking,
|
||||
TArray<FDTFluxStageRanking>& OutRanking)
|
||||
{
|
||||
CastRankingArray<FDTFluxStageRanking>(ItemRanking, OutRanking);
|
||||
}
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="convert, StageRankings, DTFlux"))
|
||||
static void CastToDTFluxSplitRanking(const FDTFluxDetailedRankingItem& ItemRanking, FDTFluxSplitRanking& OutRanking)
|
||||
{
|
||||
CastRankingItem<FDTFluxSplitRanking>(ItemRanking, OutRanking);
|
||||
}
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="convert, StageRankings, DTFlux"))
|
||||
static void CastToDTFluxSplitRankingArray(const TArray<FDTFluxDetailedRankingItem>& ItemRanking,
|
||||
TArray<FDTFluxSplitRanking>& OutRanking)
|
||||
{
|
||||
CastRankingArray<FDTFluxSplitRanking>(ItemRanking, OutRanking);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static void CastRankingItem(const FDTFluxDetailedRankingItem& ItemRanking, T& OutRanking)
|
||||
{
|
||||
OutRanking = static_cast<T>(ItemRanking);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static void CastRankingArray(const TArray<FDTFluxDetailedRankingItem>& ItemRanking, TArray<T>& OutRanking)
|
||||
{
|
||||
OutRanking.Empty();
|
||||
for (auto& Item : ItemRanking)
|
||||
{
|
||||
OutRanking.Add(static_cast<T>(Item));
|
||||
}
|
||||
}
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils")
|
||||
static void GetFullName(const int Bib, FText& OutFullName);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils")
|
||||
static TArray<FDTFluxSplitSensorInfo> SortSplitRankingsByRank(const TArray<FDTFluxSplitSensorInfo>& Rankings);
|
||||
};
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
// Fill out your copyright notice in the Description page of Project Settings.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "DTFluxCore/Public/Types/Struct/DTFluxTeamListStruct.h"
|
||||
#include "Kismet/BlueprintFunctionLibrary.h"
|
||||
#include "FTDFluxUtils.generated.h"
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
UCLASS()
|
||||
class DTFLUXUTILITIES_API UFTDFluxUtils : public UBlueprintFunctionLibrary
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="name, concat, participant"))
|
||||
static FText GetFormatedName(const int& Bib, const int MaxChar = 10,
|
||||
const FString OverFlowChar = "...");
|
||||
UFUNCTION(BlueprintCallable, Category="DTFlux|Utils", Meta=(Keywords="name, concat, participant"))
|
||||
static FText GetParticipantFormatedName(FDTFluxParticipant& Participant, const int MaxChar = 10,
|
||||
const FString OverFlowChar = "...");
|
||||
};
|
||||
41
Source/DTFluxUtilities/Public/RundownController.h
Normal file
41
Source/DTFluxUtilities/Public/RundownController.h
Normal file
@ -0,0 +1,41 @@
|
||||
#pragma once
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "GameFramework/Actor.h"
|
||||
#include "Engine/World.h"
|
||||
#include "TimerManager.h"
|
||||
#include "Rundown/AvaRundown.h"
|
||||
#include "UObject/SoftObjectPath.h"
|
||||
#include "UObject/ObjectMacros.h"
|
||||
#include "RundownController.generated.h"
|
||||
|
||||
|
||||
|
||||
|
||||
UCLASS(BlueprintType, Blueprintable)
|
||||
class DTFLUXUTILITIES_API ARundownController : public AActor
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
ARundownController();
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
bool LoadRundown(const TSoftObjectPtr<UAvaRundown> RundownAsset);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
bool PlayPage(int32 PageId);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
bool StopPage(int32 PageId);
|
||||
|
||||
UFUNCTION(BlueprintCallable, Category = "DTFlux")
|
||||
FString ListePages();
|
||||
|
||||
protected:
|
||||
UPROPERTY(BlueprintReadOnly, Category = "DTFlux")
|
||||
TObjectPtr<UAvaRundown> CurrentRundown;
|
||||
|
||||
UPROPERTY(BlueprintReadWrite, Category = "DTFlux")
|
||||
int32 CurrentPageId = 1;
|
||||
};
|
||||
Reference in New Issue
Block a user