Merge remote-tracking branch 'refs/remotes/origin/dev'

SocketIOClient.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.5.4",
+	"VersionName": "0.6.0",
 	"FriendlyName": "Socket.IO Client",
 	"Description": "Real-time networking library Socket.IO Client usable from blueprints and c++.",
 	"Category": "Networking",

Source/SIOJson/Private/SIOJConvert.cpp

@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+
 
 #include "SIOJsonPrivatePCH.h"
 

Source/SIOJson/Public/SIOJConvert.h

@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+
 
 #pragma once
 

Source/SocketIOClient/Private/SIOLambdaRunnable.cpp

@@ -44,7 +44,7 @@ uint32 FSIOLambdaRunnable::Run()
 	{
 		FunctionPointer();
 	}
-	UE_LOG(LogClass, Log, TEXT("FLambdaRunnable %d Run complete"), Number);
+	//UE_LOG(LogClass, Log, TEXT("FLambdaRunnable %d Run complete"), Number);
 	return 0;
 }
 
@@ -56,7 +56,6 @@ void FSIOLambdaRunnable::Stop()
 
 void FSIOLambdaRunnable::Kill()
 {
-	UE_LOG(LogClass, Log, TEXT("Yolo!"));
 	Thread->Kill(false);
 	Finished = true;
 }

Source/SocketIOClient/Private/SIOMessageConvert.cpp

@@ -1,4 +1,4 @@
-// Fill out your copyright notice in the Description page of Project Settings.
+
 
 #include "SocketIOClientPrivatePCH.h"
 

Source/SocketIOClient/Private/SocketIOClient.cpp

@@ -1,20 +1,79 @@
-// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
-
 #include "SocketIOClientPrivatePCH.h"
+#include "SocketIONative.h"
+#include "SIOLambdaRunnable.h"
 
+#define LOCTEXT_NAMESPACE "FSocketIOClientModule"
 
+class FSocketIOClientModule : public ISocketIOClientModule
+{
+public:
+	virtual FSocketIONative* NewValidNativePointer() override;
+	void ReleaseNativePointer(FSocketIONative* PointerToRelease) override;
+
+	/** IModuleInterface implementation */
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+
+private:
+	FCriticalSection DeleteSection;
+	TArray<FSocketIONative*> ModulePointers;
+};
 
-#define LOCTEXT_NAMESPACE "FSocketIOClientModule"
 
 void FSocketIOClientModule::StartupModule()
 {
 	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
+
+	ModulePointers.Empty();
 }
 
 void FSocketIOClientModule::ShutdownModule()
 {
 	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
 	// we call this function before unloading the module.
+	FScopeLock Lock(&DeleteSection);
+
+	ModulePointers.Empty();
+
+	/*for (auto& Pointer : ModulePointers)
+	{
+		if (Pointer)
+		{
+			delete Pointer;
+			Pointer = nullptr;
+		}
+	}*/
+}
+
+FSocketIONative* FSocketIOClientModule::NewValidNativePointer()
+{
+	FSocketIONative* NewPointer = new FSocketIONative;
+	ModulePointers.Add(NewPointer);
+
+	return NewPointer;
+}
+
+void FSocketIOClientModule::ReleaseNativePointer(FSocketIONative* PointerToRelease)
+{
+	PointerToRelease->OnConnectedCallback = [PointerToRelease](const FString& SessionId)
+	{
+		//If we're still connected, disconnect us
+		if (PointerToRelease)
+		{
+			PointerToRelease->SyncDisconnect();
+		}
+	};
+
+	//Release the pointer on the background thread
+	FSIOLambdaRunnable::RunLambdaOnBackGroundThread([PointerToRelease, this]
+	{
+		FScopeLock Lock(&DeleteSection);
+
+		if (PointerToRelease)
+		{
+			delete PointerToRelease;
+		}
+	});
 }
 
 #undef LOCTEXT_NAMESPACE