Fixes and optimizations around title and server names

Server name now supports UTF-8 chars in  Unicode codepoints.
Dedicated server now displays server name for better itentification.

3 files changed, 87 insertions, 7 deletions

diff --git a/NorthstarDedicatedTest/dedicated.cpp b/NorthstarDedicatedTest/dedicated.cpp
index e6115415..1555eaaf 100644
--- a/NorthstarDedicatedTest/dedicated.cpp
+++ b/NorthstarDedicatedTest/dedicated.cpp
@@ -3,7 +3,7 @@
 #include "hookutils.h"
 #include "gameutils.h"
 #include "serverauthentication.h"
-
+#include "masterserver.h"
 bool IsDedicated()
 {
 	//return CommandLine()->CheckParm("-dedicated");
@@ -68,7 +68,7 @@ void RunServer(CDedicatedExports* dedicated)
 		if (!maxPlayers)
 			maxPlayers = "6";
 
-		SetConsoleTitleA(fmt::format("Titanfall 2 dedicated server - {} {}/{} players ({})", g_pHostState->m_levelName, g_ServerAuthenticationManager->m_additionalPlayerData.size(), maxPlayers, GetCurrentPlaylistName()).c_str());		
+		SetConsoleTitleA(fmt::format("{} - {} {}/{} players ({})", g_MasterServerManager->ns_auth_srvName, g_pHostState->m_levelName, g_ServerAuthenticationManager->m_additionalPlayerData.size(), maxPlayers, GetCurrentPlaylistName()).c_str());
 		std::this_thread::sleep_for(std::chrono::duration<double, std::ratio<1>>(Cvar_base_tickinterval_mp->m_fValue - fmin(Plat_FloatTime() - frameStart, 0.25)));
 	}
 }
diff --git a/NorthstarDedicatedTest/masterserver.cpp b/NorthstarDedicatedTest/masterserver.cpp
index c040a239..00310338 100644
--- a/NorthstarDedicatedTest/masterserver.cpp
+++ b/NorthstarDedicatedTest/masterserver.cpp
@@ -11,7 +11,8 @@
 #include "rapidjson/error/en.h"
 #include "modmanager.h"
 #include "misccommands.h"
-
+#include <cstring>
+#include <regex>
 // NOTE for anyone reading this: we used to use httplib for requests here, but it had issues, so we're moving to curl now for masterserver requests
 // so httplib is used exclusively for server stuff now
 
@@ -40,6 +41,79 @@ CHostState__State_ChangeLevelSPType CHostState__State_ChangeLevelSP;
 typedef void(*CHostState__State_GameShutdownType)(CHostState* hostState);
 CHostState__State_GameShutdownType CHostState__State_GameShutdown;
 
+
+int htod(char c) {
+	if (c >= 'A' && c <= 'F') {
+		return c - 'A' + 10;
+	}
+	else if (c >= 'a' && c <= 'f') {
+		return c - 'a' + 10;
+	}
+	else {
+		return c - '0';
+	}
+}
+// Shoutout to Wtz_LASR for helping me with this:
+// These functions should interprets all unicode strings like \u4e2d\u6587 to UTF8.
+
+void unescape_unicode(std::string& str) {
+	std::regex r("\\\\u([a-f\\d]{4})", std::regex::icase);
+	std::smatch sm;
+	while (regex_search(str, sm, r)) {
+		unsigned int cp = 0;
+		std::string conv;
+		for (int i = 2; i <= 5; ++i) {
+			cp *= 16;
+			cp += htod(sm[0].str()[i]);
+		}
+
+		if (cp >= 0x00 && cp <= 0x7F) {
+			conv.push_back(cp);
+		}
+		else if (cp >= 0x80 && cp <= 0x7FF) {
+			unsigned char c1 = cp >> 6;
+			c1 = c1 | (1 << 7);
+			c1 = c1 | (1 << 6);
+			c1 = c1 & (~(1 << 5));
+			unsigned char c2 = cp & ((1 << 6) - 1);
+			c2 = c2 | (1 << 7);
+			c2 = c2 & (~(1 << 6));
+			conv.push_back(c1);
+			conv.push_back(c2);
+		}
+		else if (cp >= 0x800 && cp <= 0xFFFF) {
+			unsigned char c1 = cp >> 12;
+			c1 = c1 | (1 << 7);
+			c1 = c1 | (1 << 6);
+			c1 = c1 | (1 << 5);
+			c1 = c1 & (~(1 << 4));
+			unsigned char c2 = (cp >> 6) & ((1 << 6) - 1);
+			c2 = c2 | (1 << 7);
+			c2 = c2 & (~(1 << 6));
+			unsigned char c3 = cp & ((1 << 6) - 1);
+			c3 = c3 | (1 << 7);
+			c3 = c3 & (~(1 << 6));
+			conv.push_back(c1);
+			conv.push_back(c2);
+			conv.push_back(c3);
+		}
+		str.replace(sm[0].first, sm[0].second, conv);
+	}
+}
+
+
+void UpdateServerInfoFromUnicodeToUTF8()
+{
+	//This reads server name and desc from convar, interprets all unicode strings to UTF8.
+	g_MasterServerManager->ns_auth_srvName = Cvar_ns_server_name->m_pszString;
+	g_MasterServerManager->ns_auth_srvDesc = Cvar_ns_server_desc->m_pszString;
+	unescape_unicode(g_MasterServerManager->ns_auth_srvName);
+	unescape_unicode(g_MasterServerManager->ns_auth_srvDesc);
+	//std::cout << g_MasterServerManager -> ns_auth_srvName << std::endl;
+
+
+}
+
 const char* HttplibErrorToString(httplib::Error error)
 {
 	switch (error)
@@ -786,8 +860,8 @@ void MasterServerManager::AddSelfToServerList(int port, int authPort, char* name
 						// send all registration info so we have all necessary info to reregister our server if masterserver goes down, without a restart
 						// this isn't threadsafe :terror:
 						{
-							char* escapedNameNew = curl_easy_escape(curl, Cvar_ns_server_name->m_pszString, NULL);
-							char* escapedDescNew = curl_easy_escape(curl, Cvar_ns_server_desc->m_pszString, NULL);
+							char* escapedNameNew = curl_easy_escape(curl, g_MasterServerManager->ns_auth_srvName.c_str(), NULL);
+							char* escapedDescNew = curl_easy_escape(curl, g_MasterServerManager->ns_auth_srvDesc.c_str(), NULL);
 							char* escapedMapNew = curl_easy_escape(curl, g_pHostState->m_levelName, NULL);
 							char* escapedPlaylistNew = curl_easy_escape(curl, GetCurrentPlaylistName(), NULL);
 							char* escapedPasswordNew = curl_easy_escape(curl, Cvar_ns_server_password->m_pszString, NULL);
@@ -1044,6 +1118,8 @@ void CHostState__State_NewGameHook(CHostState* hostState)
 	// Copy new server name cvar to source
 	Cvar_hostname->m_pszString = Cvar_ns_server_name->m_pszString;
 	Cvar_hostname->m_StringLength = Cvar_ns_server_name->m_StringLength;
+	// This calls the function that converts unicode strings from servername and serverdesc to UTF-8
+	UpdateServerInfoFromUnicodeToUTF8();
 
 	g_MasterServerManager->AddSelfToServerList(Cvar_hostport->m_nValue, Cvar_ns_player_auth_port->m_nValue, Cvar_ns_server_name->m_pszString, Cvar_ns_server_desc->m_pszString, hostState->m_levelName, (char*)GetCurrentPlaylistName(), maxPlayers, Cvar_ns_server_password->m_pszString);
 	g_ServerAuthenticationManager->StartPlayerAuthServer();
diff --git a/NorthstarDedicatedTest/masterserver.h b/NorthstarDedicatedTest/masterserver.h
index d7071b6c..b1119564 100644
--- a/NorthstarDedicatedTest/masterserver.h
+++ b/NorthstarDedicatedTest/masterserver.h
@@ -1,7 +1,8 @@
 #pragma once
 #include "convar.h"
 #include <WinSock2.h>
-
+#include <string>
+#include <cstring>
 struct RemoteModInfo
 {
 public:
@@ -73,6 +74,8 @@ public:
 	char m_ownClientAuthToken[33];
 
 	std::string m_ownModInfoJson;
+	std::string ns_auth_srvName; // Unicode unescaped version of Cvar_ns_auth_servername for support in cjk characters
+	std::string ns_auth_srvDesc; // Unicode unescaped version of Cvar_ns_auth_serverdesc for support in cjk characters
 
 	bool m_bOriginAuthWithMasterServerDone = false;
 	bool m_bOriginAuthWithMasterServerInProgress = false;
@@ -112,7 +115,8 @@ public:
 	void WritePlayerPersistentData(char* playerId, char* pdata, size_t pdataSize);
 	void RemoveSelfFromServerList();
 };
-
+void unescape_unicode(std::string& str);
+void UpdateServerInfoFromUnicodeToUTF8();
 void InitialiseSharedMasterServer(HMODULE baseAddress);
 
 extern MasterServerManager* g_MasterServerManager;