Fixed crash issue and rcon chat being duplicated on originating server

Author: tsebring

ArkCrossServerChat/ArkCrossServerChat.cpp

@@ -4,6 +4,7 @@
 #include "Plugin.h"
 #include "Hooks.h"
 #include "DatabaseCleanup.h"
+#include "DebugTimer.h"
 #include "MessageHandlers.h"
 
 #pragma comment(lib, "ArkApi.lib")
@@ -159,6 +160,7 @@ void Load()
 	}
 
 	plugin.NextCleanupTime = std::chrono::system_clock::now() + std::chrono::seconds(300); // init with cleanup in 5 min
+	plugin.last_test_time = std::chrono::system_clock::now();
 
 	auto& hooks = ArkApi::GetHooks();
 	auto& commands = ArkApi::GetCommands();
@@ -169,6 +171,8 @@ void Load()
 
 	commands.AddOnChatMessageCallback("ChatMessageCallback", &ChatMessageCallback);
 	commands.AddOnTimerCallback("CleanupTimer", &CleanupTimer);
+	if (plugin.json.value("Debug", false) == true) commands.AddOnTimerCallback("DebugTimer", &DebugTimer);
+	commands.AddOnTickCallback("MessageTimer", &MessageTimer);
 }
 
 void Unload()
@@ -182,6 +186,8 @@ void Unload()
 
 	commands.RemoveOnChatMessageCallback("ChatMessageCallback");
 	commands.RemoveOnTimerCallback("CleanupTimer");
+	if (plugin.json.value("Debug", false) == true) commands.RemoveOnTimerCallback("DebugTimer");
+	commands.RemoveOnTickCallback("MessageTimer");
 
 	SetEvent(plugin.handle_mre_thread);
 

ArkCrossServerChat/ArkCrossServerChat.vcxproj

@@ -117,6 +117,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="DatabaseCleanup.h" />
+    <ClInclude Include="DebugTimer.h" />
     <ClInclude Include="Hooks.h" />
     <ClInclude Include="MessageHandlers.h" />
     <ClInclude Include="Plugin.h" />
@@ -125,6 +126,7 @@
   <ItemGroup>
     <ClCompile Include="ArkCrossServerChat.cpp" />
     <ClCompile Include="DatabaseCleanup.cpp" />
+    <ClCompile Include="DebugTimer.cpp" />
     <ClCompile Include="Hooks.cpp" />
     <ClCompile Include="MessageHandlers.cpp" />
     <ClCompile Include="Plugin.cpp" />

ArkCrossServerChat/ArkCrossServerChat.vcxproj.filters

@@ -30,6 +30,9 @@
     <ClInclude Include="Plugin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="DebugTimer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ArkCrossServerChat.cpp">
@@ -50,5 +53,8 @@
     <ClCompile Include="Plugin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="DebugTimer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

ArkCrossServerChat/DebugTimer.cpp

@@ -0,0 +1,38 @@
+#include "DatabaseCleanup.h"
+
+std::string get_current_time()
+{
+	auto now = time(NULL);
+	struct tm tstruct;
+	char buffer[40];
+	tstruct = *localtime(&now);
+	strftime(buffer, sizeof(buffer), "%X", &tstruct);
+
+	return buffer;
+}
+
+void DebugTimer()
+{
+	auto& plugin = Plugin::Get();
+
+	auto now = std::chrono::system_clock::now();
+	auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(now - plugin.last_test_time);
+
+	// send a test message every two seconds
+	if (diff.count() >= 2000)
+	{
+		plugin.last_test_time = now;
+
+		auto world = ArkApi::GetApiUtils().GetWorld();
+		if (!world) return;
+
+		auto playerController = world->GetFirstPlayerController();
+		if (!playerController) return;
+
+		auto aShooterPC = static_cast<AShooterPlayerController*>(playerController);
+		auto when = get_current_time();
+
+		Log::GetLog()->info("Sending test message ({})", when);
+		aShooterPC->ServerSendChatMessage(&FString::Format("{}", when), EChatSendMode::GlobalChat);
+	}
+}

ArkCrossServerChat/DebugTimer.h

@@ -0,0 +1,4 @@
+#pragma once
+#include "Plugin.h"
+
+void DebugTimer();

ArkCrossServerChat/MessageHandlers.cpp

@@ -1,5 +1,6 @@
 #include "MessageHandlers.h"
 
+// thread waiting for message event signaling
 DWORD WINAPI WaitForNewMessagesThreadProc(LPVOID lpParam)
 {
 	UNREFERENCED_PARAMETER(lpParam);
@@ -16,7 +17,8 @@ DWORD WINAPI WaitForNewMessagesThreadProc(LPVOID lpParam)
 		case WAIT_OBJECT_0 + 0:
 			if (ArkApi::GetApiUtils().GetWorld())
 			{
-				OnNewMessagesFromDatabase();
+				std::lock_guard<std::mutex> lock(plugin.new_message_available_mutex);
+				plugin.new_message_available = true;
 			}
 			break;
 		case WAIT_OBJECT_0 + 1:
@@ -34,6 +36,19 @@ DWORD WINAPI WaitForNewMessagesThreadProc(LPVOID lpParam)
 	return 0;
 }
 
+// check for new messages on game tick 
+void MessageTimer(float delta)
+{
+	auto &plugin = Plugin::Get();
+	if (plugin.new_message_available)
+	{
+		std::lock_guard<std::mutex> lock(plugin.new_message_available_mutex);
+		plugin.new_message_available = false;
+
+		OnNewMessagesFromDatabase();
+	}
+}
+
 // when the database has been updated with new messages
 void OnNewMessagesFromDatabase()
 {
@@ -82,14 +97,14 @@ void HandleMessageFromDatabase(
 	int icon)
 {
 	auto &plugin = Plugin::Get();
+	auto isLocal = serverKey.compare(plugin.serverKey) == 0;
+
 	//send chat message to users
 	if (rcon == 0)
 	{
 		auto chatIcon = static_cast<ChatIcon>(icon);
 		UTexture2D *iconTexture = nullptr;
 
-		auto isLocal = serverKey.compare(plugin.serverKey) == 0;
-
 		// get chat icon
 		if (chatIcon == ChatIcon::Admin)
 		{
@@ -132,7 +147,7 @@ void HandleMessageFromDatabase(
 			FromUTF16(message).c_str(),
 			iconTexture);
 	}
-	else
+	else if (!isLocal)
 	{
 		SendRconChatMessageToAll(FromUTF16(message));
 	}

ArkCrossServerChat/MessageHandlers.h

@@ -2,6 +2,7 @@
 #include "Plugin.h"
 
 DWORD WINAPI WaitForNewMessagesThreadProc(LPVOID lpParam);
+void MessageTimer(float delta);
 void OnNewMessagesFromDatabase();
 void HandleMessageFromDatabase(
 	long long id, 

ArkCrossServerChat/Plugin.h

@@ -17,6 +17,9 @@ class Plugin
 	std::wstring mre_cluster_name;
 	std::chrono::time_point<std::chrono::system_clock> NextCleanupTime;
 	long long lastRowId = 0;
+	bool new_message_available;
+	std::mutex new_message_available_mutex;
+	std::chrono::time_point<std::chrono::system_clock> last_test_time;
 
 	static Plugin& Get();
 

Configs/PluginInfo.json

@@ -1,6 +1,6 @@
 {
   "FullName":"ARK Cross Server Chat",
   "Description": "",
-  "Version":2.01,
+  "Version":2.02,
   "MinApiVersion":2.2
 }