diff --git a/Source/FicsitRemoteMonitoring/Private/FRMConfigInitSubsystem.cpp b/Source/FicsitRemoteMonitoring/Private/FRMConfigInitSubsystem.cpp index bf878887..88f01760 100644 --- a/Source/FicsitRemoteMonitoring/Private/FRMConfigInitSubsystem.cpp +++ b/Source/FicsitRemoteMonitoring/Private/FRMConfigInitSubsystem.cpp @@ -3,6 +3,8 @@ #include "ConfigPropertyString.h" #include "Engine/Engine.h" +DEFINE_LOG_CATEGORY_STATIC(LogFRMConfigInitSubsystem, Log, All); + void UFRMConfigInitSubsystem::Initialize(FSubsystemCollectionBase& Collection) { Super::Initialize(Collection); @@ -10,7 +12,7 @@ void UFRMConfigInitSubsystem::Initialize(FSubsystemCollectionBase& Collection) UConfigManager* ConfigManager = GetGameInstance()->GetSubsystem(); if (!ConfigManager) { - UE_LOG(LogTemp, Error, TEXT("[FRMConfigInitSubsystem] ConfigManager missing.")); + UE_LOG(LogFRMConfigInitSubsystem, Error, TEXT("ConfigManager missing.")); return; } @@ -26,11 +28,11 @@ void UFRMConfigInitSubsystem::Initialize(FSubsystemCollectionBase& Collection) HttpConfig.Authentication_Token = GenerateAuthToken(32); SaveHttpAuthToken(ConfigManager); - UE_LOG(LogTemp, Log, TEXT("[FRMConfigInitSubsystem] Generated and saved new token: %s"), *HttpConfig.Authentication_Token); + UE_LOG(LogFRMConfigInitSubsystem, Log, TEXT("Generated and saved new token: %s"), *HttpConfig.Authentication_Token); } else { - UE_LOG(LogTemp, Log, TEXT("[FRMConfigInitSubsystem] Token already exists.")); + UE_LOG(LogFRMConfigInitSubsystem, Log, TEXT("Token already exists.")); } AuthenticationToken = HttpConfig.Authentication_Token; @@ -43,16 +45,13 @@ void UFRMConfigInitSubsystem::SaveHttpAuthToken(UConfigManager* ConfigManager) UConfigPropertySection* ConfigurationRootSection = ConfigManager->GetConfigurationRootSection(ConfigId); if (!ConfigurationRootSection) { - UE_LOG(LogTemp, Warning, TEXT("[FRMConfigInitSubsystem] ConfigurationRootSection is null.")); + UE_LOG(LogFRMConfigInitSubsystem, Warning, TEXT("ConfigurationRootSection is null.")); return; } - if (ConfigurationRootSection->SectionProperties.Contains("Authentication_Token")) + if (UConfigPropertyString* AuthTokenProperty = Cast(ConfigurationRootSection->SectionProperties.FindRef("Authentication_Token"))) { - if (UConfigPropertyString* AuthTokenProperty = Cast(ConfigurationRootSection->SectionProperties["Authentication_Token"])) - { - AuthTokenProperty->Value = HttpConfig.Authentication_Token; - } + AuthTokenProperty->Value = HttpConfig.Authentication_Token; } ConfigManager->MarkConfigurationDirty(ConfigId); @@ -63,7 +62,7 @@ FString UFRMConfigInitSubsystem::GenerateAuthToken(const int32 Length) const FString Characters = TEXT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); const int32 CharactersCount = Characters.Len(); - FString RandomString; + FString RandomString{}; for (int32 i = 0; i < Length; ++i) { RandomString.AppendChar(Characters[FMath::RandRange(0, CharactersCount - 1)]); diff --git a/Source/FicsitRemoteMonitoring/Public/Commands/multi.h b/Source/FicsitRemoteMonitoring/Public/Commands/multi.h index 03289004..74ff6548 100644 --- a/Source/FicsitRemoteMonitoring/Public/Commands/multi.h +++ b/Source/FicsitRemoteMonitoring/Public/Commands/multi.h @@ -11,13 +11,13 @@ struct FChatReturn public: UPROPERTY(BlueprintReadWrite, Category = "Ficsit Remote Monitoring") - FString Chat; + FString Chat{}; UPROPERTY(BlueprintReadWrite, Category = "Ficsit Remote Monitoring") - FLinearColor Color; + FLinearColor Color{}; UPROPERTY(BlueprintReadWrite, Category = "Ficsit Remote Monitoring") - EExecutionStatus Status; + EExecutionStatus Status{}; }; UCLASS() diff --git a/Source/FicsitRemoteMonitoring/Public/FRMConfigInitSubsystem.h b/Source/FicsitRemoteMonitoring/Public/FRMConfigInitSubsystem.h index 053045b7..d709776c 100644 --- a/Source/FicsitRemoteMonitoring/Public/FRMConfigInitSubsystem.h +++ b/Source/FicsitRemoteMonitoring/Public/FRMConfigInitSubsystem.h @@ -25,11 +25,11 @@ class FICSITREMOTEMONITORING_API UFRMConfigInitSubsystem : public UGameInstanceS const FConfig_FactoryStruct& GetFactoryConfig() const { return FactoryConfig; } private: - FString AuthenticationToken; + FString AuthenticationToken{}; - FConfig_HTTPStruct HttpConfig; - FConfig_SerialStruct SerialConfig; - FConfig_FactoryStruct FactoryConfig; + FConfig_HTTPStruct HttpConfig{}; + FConfig_SerialStruct SerialConfig{}; + FConfig_FactoryStruct FactoryConfig{}; FString GenerateAuthToken(int32 Length); void SaveHttpAuthToken(UConfigManager* ConfigManager); diff --git a/Source/FicsitRemoteMonitoring/Public/FRM_RequestData.h b/Source/FicsitRemoteMonitoring/Public/FRM_RequestData.h index 75b3b5b9..caa84a74 100644 --- a/Source/FicsitRemoteMonitoring/Public/FRM_RequestData.h +++ b/Source/FicsitRemoteMonitoring/Public/FRM_RequestData.h @@ -10,13 +10,13 @@ struct FRequestData GENERATED_BODY() UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Request Data") - TMap QueryParams; + TMap QueryParams{}; bool bIsAuthorized = false; FString Method = "GET"; - TArray> Body; + TArray> Body{}; - EInterfaceType Interface; + EInterfaceType Interface{}; }; \ No newline at end of file diff --git a/Source/FicsitRemoteMonitoring/Public/FicsitRemoteMonitoring.h b/Source/FicsitRemoteMonitoring/Public/FicsitRemoteMonitoring.h index b6f927c1..7e095d31 100644 --- a/Source/FicsitRemoteMonitoring/Public/FicsitRemoteMonitoring.h +++ b/Source/FicsitRemoteMonitoring/Public/FicsitRemoteMonitoring.h @@ -16,14 +16,14 @@ THIRD_PARTY_INCLUDES_END struct FWebSocketUserData { // Add any fields here you want to track for each WebSocket client - int32 ClientID; - FString ClientName; + int32 ClientID{}; + FString ClientName{}; }; struct FClientInfo { - FString SubscribedEndpoints; // Keep track of all endpoints that have been subscribed - TArray*> Client; // Add the third template argument for USERDATA + FString SubscribedEndpoints{}; // Keep track of all endpoints that have been subscribed + TArray*> Client{}; // Add the third template argument for USERDATA }; UENUM( BlueprintType ) @@ -44,7 +44,7 @@ struct FAPIEndpoint { GENERATED_BODY() // Required for USTRUCT UPROPERTY() - FString APIName; + FString APIName{}; UPROPERTY() FString Method = "GET"; @@ -59,7 +59,7 @@ struct FAPIEndpoint { bool bRequiresAuthentication = false; // Function pointer to the endpoint handler (not a UPROPERTY because function pointers aren’t supported by UPROPERTY) - FEndpointFunction FunctionPtr; + FEndpointFunction FunctionPtr{}; FAPIEndpoint(const FString& InMethod = "GET", const FString& InAPIName = "", const FEndpointFunction InFunctionPtr = nullptr) : APIName(InAPIName), @@ -88,8 +88,8 @@ struct FCallEndpointResponse { GENERATED_BODY() - TArray> JsonValues; - bool bUseFirstObject; + TArray> JsonValues{}; + bool bUseFirstObject{}; }; UCLASS() @@ -99,13 +99,13 @@ class FICSITREMOTEMONITORING_API AFicsitRemoteMonitoring : public AModSubsystem private: - TFuture WebServer; + TFuture WebServer{}; bool JSONDebugMode = false; bool bShouldStop = false; bool bHasRunningPushDataLoop = false; - FString AuthenticationToken; + FString AuthenticationToken{}; friend class UFGPowerCircuitGroup; @@ -155,11 +155,11 @@ class FICSITREMOTEMONITORING_API AFicsitRemoteMonitoring : public AModSubsystem void ResearchTreeNodeUnlockData_BIE(UFGResearchTreeNode* ResearchTreeNode, TArray& Parents, TArray& UnhiddenBy, FIntPoint& Coordinates); // Array of API endpoints - TArray APIEndpoints; + TArray APIEndpoints{}; - TMap*>> EndpointSubscribers; + TMap*>> EndpointSubscribers{}; - TSet*> ConnectedClients; + TSet*> ConnectedClients{}; UFUNCTION(BlueprintImplementableEvent, Category = "Ficsit Remote Monitoring") void InitSerialDevice(); @@ -183,12 +183,12 @@ class FICSITREMOTEMONITORING_API AFicsitRemoteMonitoring : public AModSubsystem void AddResponseHeaders(uWS::HttpResponse* res, bool bIncludeContentType); void AddErrorJson(TArray>& JsonArray, const FString& ErrorMessage); - TArray Flavor_Battery; - TArray Flavor_Doggo; - TArray Flavor_Player; - TArray Flavor_Power; - TArray Flavor_Research; - TArray Flavor_Train; + TArray Flavor_Battery{}; + TArray Flavor_Doggo{}; + TArray Flavor_Player{}; + TArray Flavor_Power{}; + TArray Flavor_Research{}; + TArray Flavor_Train{}; protected: // Called when the game starts or when spawned @@ -200,7 +200,7 @@ class FICSITREMOTEMONITORING_API AFicsitRemoteMonitoring : public AModSubsystem public: // Store the APIName for later use in the function - FString StoredAPIName; + FString StoredAPIName{}; static void getAll(UObject* WorldContext, FRequestData RequestData, TArray>& OutJsonArray) { diff --git a/Source/FicsitRemoteMonitoringServer/Private/FRM_Controller.cpp b/Source/FicsitRemoteMonitoringServer/Private/FRM_Controller.cpp index 88a4d947..2237dbc5 100644 --- a/Source/FicsitRemoteMonitoringServer/Private/FRM_Controller.cpp +++ b/Source/FicsitRemoteMonitoringServer/Private/FRM_Controller.cpp @@ -28,6 +28,7 @@ FFGServerErrorResponse UFRM_Controller::Handler_Frm(FFGFileResponseWrapper& OutF bool bSuccess = false; int32 ErrorCode = 200; + /* If this does not build, add `friend class UFRM_Controller;` inside `class FFGRequestHandlerContext` in `FGServerAPIManager.h` */ TSharedPtr JsonBody = RequestContext.RequestHandlerContext->RawJsonBody; TMap> RequestHeaders = RequestContext.RequestHandlerContext->RequestHeaders; diff --git a/Source/FicsitRemoteMonitoringServer/Public/FRM_Controller.h b/Source/FicsitRemoteMonitoringServer/Public/FRM_Controller.h index 98437154..85ce5f56 100644 --- a/Source/FicsitRemoteMonitoringServer/Public/FRM_Controller.h +++ b/Source/FicsitRemoteMonitoringServer/Public/FRM_Controller.h @@ -23,13 +23,13 @@ class FICSITREMOTEMONITORINGSERVER_API UFRM_Controller : public UFGServerControl public: UPROPERTY() - UWorld* World; + UWorld* World{}; UPROPERTY() - AFicsitRemoteMonitoring* ModSubsystem; + AFicsitRemoteMonitoring* ModSubsystem{}; UPROPERTY() - FString AuthToken; + FString AuthToken{}; UFUNCTION( FGServerRequestHandler, FGServerRequestPrivilegeLevel = "NotAuthenticated" ) FFGServerErrorResponse Handler_Frm(FFGFileResponseWrapper& OutFileResponse, const FFGRequestHandlerContextWrapper& RequestContext); diff --git a/Source/FicsitRemoteMonitoringServer/Public/FicsitRemoteMonitoringServer.h b/Source/FicsitRemoteMonitoringServer/Public/FicsitRemoteMonitoringServer.h index 4b99ee81..03cff857 100644 --- a/Source/FicsitRemoteMonitoringServer/Public/FicsitRemoteMonitoringServer.h +++ b/Source/FicsitRemoteMonitoringServer/Public/FicsitRemoteMonitoringServer.h @@ -12,7 +12,7 @@ class FICSITREMOTEMONITORINGSERVER_API AFicsitRemoteMonitoringServer : public AM public: UPROPERTY() - UFRM_Controller* Controller; + UFRM_Controller* Controller{}; protected: // Called when the game starts or when spawned