Cleanup 2

This commit is contained in:
Noah 2025-04-29 01:08:14 -04:00
parent e48493a5f0
commit f38e15af2b
5 changed files with 15 additions and 13 deletions

View File

@ -41,26 +41,25 @@ void ULuckyDataTransferSubsystem::Internal_OpenWebsocket(const FString& URL, con
Socket = FWebSocketsModule::Get().CreateWebSocket(NewUrl); Socket = FWebSocketsModule::Get().CreateWebSocket(NewUrl);
Socket->Connect(); Socket->Connect();
Socket->OnConnected().AddLambda([]() //Set up callbacks
{ Socket->OnConnectionError().AddUObject(this, &ULuckyDataTransferSubsystem::Callback_OnConnectionError);
UE_LOG(LogTemp, Warning, TEXT("WebSocket connected")); Socket->OnConnected().AddUObject(this, &ULuckyDataTransferSubsystem::Callback_OnConnected);
});
Socket->OnConnectionError().AddLambda([](const FString& Message)
{
UE_LOG(LogTemp, Warning, TEXT("WebSocket connection error"));
});
Socket->OnMessage().AddUObject(this, &ULuckyDataTransferSubsystem::Callback_OnMessage); Socket->OnMessage().AddUObject(this, &ULuckyDataTransferSubsystem::Callback_OnMessage);
} }
//Callbacks / Lambas //Callbacks
void ULuckyDataTransferSubsystem::Callback_OnConnected() void ULuckyDataTransferSubsystem::Callback_OnConnected()
{ {
if (OnSocketReady.IsBound())
{
OnSocketReady.Broadcast(true);
UE_LOG(LogTemp, VeryVerbose, TEXT("WebSocket connected successfully"));
}
} }
void ULuckyDataTransferSubsystem::Callback_OnConnectionError(const FString& Error) void ULuckyDataTransferSubsystem::Callback_OnConnectionError(const FString& Error)
{ {
UE_LOG(LogTemp, VeryVerbose, TEXT("Websocket connection error: %s"), *Error)
} }
void ULuckyDataTransferSubsystem::Callback_OnMessage(const FString& Message) void ULuckyDataTransferSubsystem::Callback_OnMessage(const FString& Message)
@ -96,7 +95,7 @@ void ULuckyDataTransferSubsystem::SendMessage(const FString& Message)
return; return;
} }
UE_LOG(LogTemp, Warning, TEXT("WebSocket message failed")); UE_LOG(LogTemp, Warning, TEXT("WebSocket outgoing message failed"));
} }
FPayload ULuckyDataTransferSubsystem::InterpretData(const FString& Message) FPayload ULuckyDataTransferSubsystem::InterpretData(const FString& Message)

View File

@ -39,6 +39,7 @@ public:
}; };
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCommandReady, const FPayload&, Payload); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FCommandReady, const FPayload&, Payload);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FSocketReady, bool, bSuccessful);
UCLASS() UCLASS()
class LUCKYDATATRANSFER_API ULuckyDataTransferSubsystem : public UWorldSubsystem class LUCKYDATATRANSFER_API ULuckyDataTransferSubsystem : public UWorldSubsystem
@ -65,6 +66,8 @@ public:
UPROPERTY(BlueprintAssignable) UPROPERTY(BlueprintAssignable)
FCommandReady OnCommandReady; FCommandReady OnCommandReady;
UPROPERTY(BlueprintAssignable)
FSocketReady OnSocketReady;
//Callbacks //Callbacks
UFUNCTION() UFUNCTION()