chore: some stuff

Author: zaucy

Source/Ecsact/Public/EcsactUnreal/Blueprint/EcsactAsyncConnectBlueprintAction.cpp

@@ -23,11 +23,19 @@ auto UEcsactAsyncConnectBlueprintAction::Activate() -> void {
 			TEXT("Cannot use Ecsact async blueprint api with runner that does not "
 					 "implement IEcsactAsyncRunnerEvents")
 		);
+		OnError.Broadcast(EAsyncConnectError::AsyncRunnerEventsUnavailable);
+		OnDone.Broadcast({});
 		return;
 	}
 
 	auto req_id = ecsact_async_connect(Utf8ConnectionString.c_str());
 
+	if(req_id == ECSACT_INVALID_ID(async_request)) {
+		OnError.Broadcast(EAsyncConnectError::InvalidRequestId);
+		OnDone.Broadcast({});
+		return;
+	}
+
 	async_events->OnRequestDone(
 		req_id,
 		IEcsactAsyncRunnerEvents::FAsyncRequestDoneCallback::CreateUObject(

Source/Ecsact/Public/EcsactUnreal/Blueprint/EcsactAsyncConnectBlueprintAction.h

@@ -8,6 +8,8 @@
 UENUM()
 enum class EAsyncConnectError : uint8 {
 	NoError,
+	AsyncRunnerEventsUnavailable,
+	InvalidRequestId,
 	PermissionDenied,
 	InvalidConnectionString,
 };

Source/Ecsact/Public/EcsactUnreal/Ecsact.cpp

@@ -90,7 +90,7 @@ auto FEcsactModule::StartupModule() -> void {
 	}
 #if WITH_EDITOR
 	FEditorDelegates::PreBeginPIE.AddRaw(this, &FEcsactModule::OnPreBeginPIE);
-	FEditorDelegates::EndPIE.AddRaw(this, &FEcsactModule::OnEndPIE);
+	FEditorDelegates::EndPIE.AddRaw(this, &FEcsactModule::OnPrePIEEnded);
 #endif
 }
 
@@ -110,7 +110,7 @@ auto FEcsactModule::OnPreBeginPIE(bool _) -> void {
 	LoadEcsactRuntime();
 }
 
-auto FEcsactModule::OnEndPIE(bool _) -> void {
+auto FEcsactModule::OnPrePIEEnded(bool _) -> void {
 	UnloadEcsactRuntime();
 }
 

Source/Ecsact/Public/EcsactUnreal/Ecsact.h

@@ -16,7 +16,7 @@ class FEcsactModule : public IModuleInterface {
 	auto UnloadEcsactRuntime() -> void;
 	auto Abort() -> void;
 	auto OnPreBeginPIE(bool bIsSimulating) -> void;
-	auto OnEndPIE(const bool bIsSimulating) -> void;
+	auto OnPrePIEEnded(const bool bIsSimulating) -> void;
 
 	auto StartRunner() -> void;
 	auto StopRunner() -> void;

Source/Ecsact/Public/EcsactUnreal/EcsactRunner.cpp

@@ -1,5 +1,6 @@
-#include "UObject/UObjectIterator.h"
 #include "EcsactUnreal/EcsactRunner.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/UObjectIterator.h"
 #include "EcsactUnreal/EcsactRunnerSubsystem.h"
 #include "EcsactUnreal/Ecsact.h"
 #include "ecsact/runtime/common.h"
@@ -55,6 +56,10 @@ auto UEcsactRunner::InitRunnerSubsystems() -> void {
 			continue;
 		}
 
+		if(uclass->HasAnyClassFlags(CLASS_Abstract | CLASS_Deprecated)) {
+			continue;
+		}
+
 		subsystem_types.Add(uclass);
 	}
 
@@ -63,7 +68,9 @@ auto UEcsactRunner::InitRunnerSubsystems() -> void {
 
 	for(auto t : subsystem_types) {
 		UE_LOG(Ecsact, Log, TEXT("Starting ecsact subsystem %s"), *t->GetName());
-		RunnerSubsystems.Add(NewObject<UEcsactRunnerSubsystem>(this, t));
+		auto subsystem = NewObject<UEcsactRunnerSubsystem>(this, t);
+		subsystem->AddToRoot();
+		RunnerSubsystems.Add(subsystem);
 	}
 
 	for(auto subsystem : RunnerSubsystems) {
@@ -73,6 +80,9 @@ auto UEcsactRunner::InitRunnerSubsystems() -> void {
 
 auto UEcsactRunner::ShutdownRunnerSubsystems() -> void {
 	for(auto subsystem : RunnerSubsystems) {
+		if(subsystem == nullptr) {
+			continue;
+		}
 		subsystem->RunnerStop(this);
 	}
 

Source/Ecsact/Public/EcsactUnreal/EcsactRunnerSubsystem.h

@@ -3,7 +3,7 @@
 #include "ecsact/runtime/common.h"
 #include "EcsactRunnerSubsystem.generated.h"
 
-UCLASS(Blueprintable)
+UCLASS(Abstract, Blueprintable)
 
 class ECSACT_API UEcsactRunnerSubsystem : public UObject {
 	GENERATED_BODY() // NOLINT

Source/EcsactUnrealCodegenPlugin/EcsactUnrealCodegenPlugin.cpp

@@ -259,7 +259,7 @@ static auto generate_header(ecsact::codegen_plugin_context ctx) -> void {
 	}
 
 	ctx.write(std::format(
-		"UCLASS(Blueprintable, meta = "
+		"UCLASS(Abstract, Blueprintable, meta = "
 		"(DisplayName = \"Ecsact Runner Package Subsystem ({})\"))\n",
 		ecsact::meta::package_name(ctx.package_id)
 	));