big refactor (#171)v1.10.0-rc1

* use in-file macros rather than global funcs for registering dll load callbacks

* move more things to macros

* fix debug crashes

* move sqvm funcs to sq managers

* get rid of context file

* refactor some squirrel stuff and ingame compilation error message

* move tier0 and playlist funcs to namespaces

* uiscript_reset concommand: don't loop forever if compilation fails

* improve showing console for ui script compile errors

* standardise concommand func naming in c++

* use lambdas for dll load callbacks so intellisense shits itself less

* use cvar change callbacks for unescaping ns_server_name and ns_server_desc

* add proper helpstrings to masterserver cvars

* add cvar help and find

* allow parsing of convar flags from string

* normalise mod fs paths to be lowercase

* move hoststate to its own file and add host_init hooks

* better IsFlagSet def

* replace files in ReadFromCache

* rename g_ModManager to g_pModManager

* formatting changes

* make cvar print work on dedi, move demo fix stuff, add findflags

* add proper map autocompletes and maps command

* formatting changes

* separate gameutils into multiple r2 headers

* Update keyvalues.cpp

* move sqvm funcs into wrappers in the manager class

* remove unnecessary header files

* lots of cleanup and starting moving to new hooking macros

* update more stuff to new hook macros

* rename project folder (:tf: commit log)

* fix up postbuild commands to use relative dir

* almost fully replaced hooking lib

* completely remove old hooking

* add nsprefix because i forgot to include it

* move exploit prevention and limits code out of serverauthentication, and have actual defs for CBasePlayer

* use modular ServerPresence system for registering servers

* add new memory lib

* accidentally pushed broke code oops

* lots of stuff idk

* implement some more prs

* improve rpakfilesystem

* fix line endings on vcxproj

* Revert "fix line endings on vcxproj"

This reverts commit 4ff7d022d2602c2dba37beba8b8df735cf5cd7d9.

* add more prs

* i swear i committed these how are they not there

* Add ability to load Datatables from files (#238)

* first version of kinda working custom datatables

* Fix copy error

* Finish custom datatables

* Fix Merge

* Fix line endings

* Add fallback to rpak when ns_prefere_datatable_from_disk is true

* fix typo

* Bug fixess

* Fix Function Registration hook

* Set convar value

* Fix Client and Ui VM

* enable server auth with ms agian

* Add Filters

* FIx unused import

* Merge remote-tracking branch 'upsteam/bobs-big-refactor-pr' into datatables

Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>

* Add some changes from main to refactor (#243)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Fix line endings (hopefully) (#244)

* Fix line endings (hopefully)

* Fix more line endings

* Update refactor (#250)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Add editorconfig file (#246)

* Add editorconfig file

It's a cross-editor compatible config file that defines certain editor
behaviour (e.g. adding/removing newline at end of file)

It is supported by major editors like Visual Studio (Code) and by
version control  providers like GitHub.

Should end the constant adding/removing of final newline in PRs

* More settings

- unicode by default
- trim newlines
- use tabs for indentation (ugh)

* Ignore folder rename (#245)

* Hot reload banlist on player join (#233)

* added banlist hotreload

* fix formatting

* didnt append, cleared whole file oopsie

* unfuckedunban not rewriting file

* fixed not checking for new line

Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>

* Refactor cleanup (#256)

* Fix indentation

* Fix path in clang-format command in readme

* Refactor cleanup (some formatting fixes) (#257)

* Fix some formatting

* More formatting fixes

* add scriptdatatable.cpp rewrite

* Some formatting fixes (#260)

* More formatting stuff (#261)

* various formatting changes and fixes

* Fix changed icon (#264)

* clang format, fix issues with server registration and rpak loading

* fix more formatting

* update postbuild step

* set launcher directory and error on fail creating log files

* change some stuff in exploitfixes

* only unrestrict dev commands when commandline flag is present

* fix issues with cvar flag commit

* fixup command flags better and reformat

* bring up to date with main

* fixup formatting

* improve cvar flag fixup and remove temp thing from findflags

* set serverfilter better

* avoid ptr decay when setting auth token

* add more entity functions

* Fix the MS server registration issues. (#285)

* Port ms presence reporter to std::async

* Fix crash due to std::optional being assigned nullptr.

* Fix formatting.

* Wait 20 seconds if MS returns DUPLICATE_SERVER.

* Change PERSISTENCE_MAX_SIZE to fix player authentication (#287)

The size check added in the refactor was incorrect:

- 56306: expected pdata size based on the pdef
- 512: allowance for trailing junk (r2 adds 137 bytes of trailing junk)
- 100: for some wiggle room

Co-Authored-By: pg9182 <96569817+pg9182@users.noreply.github.com>

* change miscserverscript to use actual entity arguments rather than
player index jank

* Fix token clearing hook (#290)

A certain someone forgot to put an `0x` in front of their hex number, meaning the offset is wrong.
This would cause token to be leaked again

Co-authored-by: Maya <malte.hoermeyer@web.de>
Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>
Co-authored-by: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>
Co-authored-by: Erlite <ys.aameziane@gmail.com>
Co-authored-by: Emma Miler <emma.pi@protonmail.com>
Co-authored-by: pg9182 <96569817+pg9182@users.noreply.github.com>

1 files changed, 75 insertions, 101 deletions

diff --git a/NorthstarDLL/serverchathooks.cpp b/NorthstarDLL/serverchathooks.cpp
index 2f5be5c1..1dd05830 100644
--- a/NorthstarDLL/serverchathooks.cpp
+++ b/NorthstarDLL/serverchathooks.cpp
@@ -1,14 +1,16 @@
 #include "pch.h"
 #include "serverchathooks.h"
+#include "limits.h"
+#include "squirrel.h"
+#include "r2server.h"
+
 #include <rapidjson/document.h>
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>
-#include "serverauthentication.h"
-#include "squirrel.h"
-#include "miscserverscript.h"
+
+AUTOHOOK_INIT()
 
 class CServerGameDLL;
-class CBasePlayer;
 
 class CRecipientFilter
 {
@@ -17,93 +19,68 @@ class CRecipientFilter
 
 CServerGameDLL* g_pServerGameDLL;
 
-typedef void(__fastcall* CServerGameDLL__OnReceivedSayTextMessageType)(
+void(__fastcall* CServerGameDLL__OnReceivedSayTextMessage)(
 	CServerGameDLL* self, unsigned int senderPlayerId, const char* text, int channelId);
-CServerGameDLL__OnReceivedSayTextMessageType CServerGameDLL__OnReceivedSayTextMessage;
-CServerGameDLL__OnReceivedSayTextMessageType CServerGameDLL__OnReceivedSayTextMessageHookBase;
-
-typedef CBasePlayer*(__fastcall* UTIL_PlayerByIndexType)(int playerIndex);
-UTIL_PlayerByIndexType UTIL_PlayerByIndex;
-
-typedef void(__fastcall* CRecipientFilter__ConstructType)(CRecipientFilter* self);
-CRecipientFilter__ConstructType CRecipientFilter__Construct;
-
-typedef void(__fastcall* CRecipientFilter__DestructType)(CRecipientFilter* self);
-CRecipientFilter__DestructType CRecipientFilter__Destruct;
-
-typedef void(__fastcall* CRecipientFilter__AddAllPlayersType)(CRecipientFilter* self);
-CRecipientFilter__AddAllPlayersType CRecipientFilter__AddAllPlayers;
-
-typedef void(__fastcall* CRecipientFilter__AddRecipientType)(CRecipientFilter* self, const CBasePlayer* player);
-CRecipientFilter__AddRecipientType CRecipientFilter__AddRecipient;
-
-typedef void(__fastcall* CRecipientFilter__MakeReliableType)(CRecipientFilter* self);
-CRecipientFilter__MakeReliableType CRecipientFilter__MakeReliable;
 
-typedef void(__fastcall* UserMessageBeginType)(CRecipientFilter* filter, const char* messagename);
-UserMessageBeginType UserMessageBegin;
-
-typedef void(__fastcall* MessageEndType)();
-MessageEndType MessageEnd;
-
-typedef void(__fastcall* MessageWriteByteType)(int iValue);
-MessageWriteByteType MessageWriteByte;
-
-typedef void(__fastcall* MessageWriteStringType)(const char* sz);
-MessageWriteStringType MessageWriteString;
-
-typedef void(__fastcall* MessageWriteBoolType)(bool bValue);
-MessageWriteBoolType MessageWriteBool;
-
-bool isSkippingHook = false;
-
-static void CServerGameDLL__OnReceivedSayTextMessageHook(CServerGameDLL* self, unsigned int senderPlayerId, const char* text, bool isTeam)
+void(__fastcall* CRecipientFilter__Construct)(CRecipientFilter* self);
+void(__fastcall* CRecipientFilter__Destruct)(CRecipientFilter* self);
+void(__fastcall* CRecipientFilter__AddAllPlayers)(CRecipientFilter* self);
+void(__fastcall* CRecipientFilter__AddRecipient)(CRecipientFilter* self, const R2::CBasePlayer* player);
+void(__fastcall* CRecipientFilter__MakeReliable)(CRecipientFilter* self);
+
+void(__fastcall* UserMessageBegin)(CRecipientFilter* filter, const char* messagename);
+void(__fastcall* MessageEnd)();
+void(__fastcall* MessageWriteByte)(int iValue);
+void(__fastcall* MessageWriteString)(const char* sz);
+void(__fastcall* MessageWriteBool)(bool bValue);
+
+bool bShouldCallSayTextHook = false;
+// clang-format off
+AUTOHOOK(_CServerGameDLL__OnReceivedSayTextMessage, server.dll + 0x1595C0,
+void, __fastcall, (CServerGameDLL* self, unsigned int senderPlayerId, const char* text, bool isTeam))
+// clang-format on
 {
 	// MiniHook doesn't allow calling the base function outside of anywhere but the hook function.
 	// To allow bypassing the hook, isSkippingHook can be set.
-	if (isSkippingHook)
+	if (bShouldCallSayTextHook)
 	{
-		isSkippingHook = false;
-		CServerGameDLL__OnReceivedSayTextMessageHookBase(self, senderPlayerId, text, isTeam);
+		bShouldCallSayTextHook = false;
+		_CServerGameDLL__OnReceivedSayTextMessage(self, senderPlayerId, text, isTeam);
 		return;
 	}
 
-	void* sender = GetPlayerByIndex(senderPlayerId - 1);
-
 	// check chat ratelimits
-	if (!g_ServerAuthenticationManager->CheckPlayerChatRatelimit(sender))
-	{
+	if (!g_pServerLimits->CheckChatLimits(&R2::g_pClientArray[senderPlayerId - 1]))
 		return;
-	}
 
-	if (g_ServerSquirrelManager->setupfunc("CServerGameDLL_ProcessMessageStartThread") != SQRESULT_ERROR)
+	if (g_pSquirrel<ScriptContext::SERVER>->setupfunc("CServerGameDLL_ProcessMessageStartThread") != SQRESULT_ERROR)
 	{
-		g_ServerSquirrelManager->pusharg((int)senderPlayerId - 1);
-		g_ServerSquirrelManager->pusharg(text);
-		g_ServerSquirrelManager->pusharg(isTeam);
-		g_ServerSquirrelManager->call(3);
+		g_pSquirrel<ScriptContext::SERVER>->pushinteger(g_pSquirrel<ScriptContext::SERVER>->m_pSQVM->sqvm, (int)senderPlayerId - 1);
+		g_pSquirrel<ScriptContext::SERVER>->pushstring(g_pSquirrel<ScriptContext::SERVER>->m_pSQVM->sqvm, text);
+		g_pSquirrel<ScriptContext::SERVER>->pushbool(g_pSquirrel<ScriptContext::SERVER>->m_pSQVM->sqvm, isTeam);
+		g_pSquirrel<ScriptContext::SERVER>->call(g_pSquirrel<ScriptContext::SERVER>->m_pSQVM->sqvm, 3);
 	}
 	else
-		CServerGameDLL__OnReceivedSayTextMessageHookBase(self, senderPlayerId, text, isTeam);
+		_CServerGameDLL__OnReceivedSayTextMessage(self, senderPlayerId, text, isTeam);
 }
 
-void ChatSendMessage(unsigned int playerIndex, const char* text, bool isteam)
+void ChatSendMessage(unsigned int playerIndex, const char* text, bool isTeam)
 {
-	isSkippingHook = true;
+	bShouldCallSayTextHook = true;
 	CServerGameDLL__OnReceivedSayTextMessage(
 		g_pServerGameDLL,
 		// Ensure the first bit isn't set, since this indicates a custom message
 		(playerIndex + 1) & CUSTOM_MESSAGE_INDEX_MASK,
 		text,
-		isteam);
+		isTeam);
 }
 
 void ChatBroadcastMessage(int fromPlayerIndex, int toPlayerIndex, const char* text, bool isTeam, bool isDead, CustomMessageType messageType)
 {
-	CBasePlayer* toPlayer = NULL;
+	R2::CBasePlayer* toPlayer = NULL;
 	if (toPlayerIndex >= 0)
 	{
-		toPlayer = UTIL_PlayerByIndex(toPlayerIndex + 1);
+		toPlayer = R2::UTIL_PlayerByIndex(toPlayerIndex + 1);
 		if (toPlayer == NULL)
 			return;
 	}
@@ -111,8 +88,7 @@ void ChatBroadcastMessage(int fromPlayerIndex, int toPlayerIndex, const char* te
 	// Build a new string where the first byte is the message type
 	char sendText[256];
 	sendText[0] = (char)messageType;
-	strncpy(sendText + 1, text, 255);
-	sendText[255] = 0;
+	strncpy_s(sendText + 1, 255, text, 254);
 
 	// Anonymous custom messages use playerId=0, non-anonymous ones use a player ID with the first bit set
 	unsigned int fromPlayerId = fromPlayerIndex < 0 ? 0 : ((fromPlayerIndex + 1) | CUSTOM_MESSAGE_INDEX_BIT);
@@ -139,29 +115,31 @@ void ChatBroadcastMessage(int fromPlayerIndex, int toPlayerIndex, const char* te
 	CRecipientFilter__Destruct(&filter);
 }
 
-SQRESULT SQ_SendMessage(void* sqvm)
+// void function NSSendMessage( int playerIndex, string text, bool isTeam )
+SQRESULT SQ_SendMessage(HSquirrelVM* sqvm)
 {
-	int playerIndex = ServerSq_getinteger(sqvm, 1);
-	const char* text = ServerSq_getstring(sqvm, 2);
-	bool isTeam = ServerSq_getbool(sqvm, 3);
+	int playerIndex = g_pSquirrel<ScriptContext::SERVER>->getinteger(sqvm, 1);
+	const char* text = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
+	bool isTeam = g_pSquirrel<ScriptContext::SERVER>->getbool(sqvm, 3);
 
 	ChatSendMessage(playerIndex, text, isTeam);
 
 	return SQRESULT_NULL;
 }
 
-SQRESULT SQ_BroadcastMessage(void* sqvm)
+// void function NSBroadcastMessage( int fromPlayerIndex, int toPlayerIndex, string text, bool isTeam, bool isDead, int messageType )
+SQRESULT SQ_BroadcastMessage(HSquirrelVM* sqvm)
 {
-	int fromPlayerIndex = ServerSq_getinteger(sqvm, 1);
-	int toPlayerIndex = ServerSq_getinteger(sqvm, 2);
-	const char* text = ServerSq_getstring(sqvm, 3);
-	bool isTeam = ServerSq_getbool(sqvm, 4);
-	bool isDead = ServerSq_getbool(sqvm, 5);
-	int messageType = ServerSq_getinteger(sqvm, 6);
+	int fromPlayerIndex = g_pSquirrel<ScriptContext::SERVER>->getinteger(sqvm, 1);
+	int toPlayerIndex = g_pSquirrel<ScriptContext::SERVER>->getinteger(sqvm, 2);
+	const char* text = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 3);
+	bool isTeam = g_pSquirrel<ScriptContext::SERVER>->getbool(sqvm, 4);
+	bool isDead = g_pSquirrel<ScriptContext::SERVER>->getbool(sqvm, 5);
+	int messageType = g_pSquirrel<ScriptContext::SERVER>->getinteger(sqvm, 6);
 
 	if (messageType < 1)
 	{
-		ServerSq_pusherror(sqvm, fmt::format("Invalid message type {}", messageType).c_str());
+		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, fmt::format("Invalid message type {}", messageType).c_str());
 		return SQRESULT_ERROR;
 	}
 
@@ -170,37 +148,33 @@ SQRESULT SQ_BroadcastMessage(void* sqvm)
 	return SQRESULT_NULL;
 }
 
-void InitialiseServerChatHooks_Engine(HMODULE baseAddress)
+ON_DLL_LOAD("engine.dll", EngineServerChatHooks, (CModule module))
 {
-	g_pServerGameDLL = (CServerGameDLL*)((char*)baseAddress + 0x13F0AA98);
+	g_pServerGameDLL = module.Offset(0x13F0AA98).As<CServerGameDLL*>();
 }
 
-void InitialiseServerChatHooks_Server(HMODULE baseAddress)
+ON_DLL_LOAD_RELIESON("server.dll", ServerChatHooks, ServerSquirrel, (CModule module))
 {
-	CServerGameDLL__OnReceivedSayTextMessage = (CServerGameDLL__OnReceivedSayTextMessageType)((char*)baseAddress + 0x1595C0);
-	UTIL_PlayerByIndex = (UTIL_PlayerByIndexType)((char*)baseAddress + 0x26AA10);
-	CRecipientFilter__Construct = (CRecipientFilter__ConstructType)((char*)baseAddress + 0x1E9440);
-	CRecipientFilter__Destruct = (CRecipientFilter__DestructType)((char*)baseAddress + 0x1E9700);
-	CRecipientFilter__AddAllPlayers = (CRecipientFilter__AddAllPlayersType)((char*)baseAddress + 0x1E9940);
-	CRecipientFilter__AddRecipient = (CRecipientFilter__AddRecipientType)((char*)baseAddress + 0x1E9b30);
-	CRecipientFilter__MakeReliable = (CRecipientFilter__MakeReliableType)((char*)baseAddress + 0x1EA4E0);
-
-	UserMessageBegin = (UserMessageBeginType)((char*)baseAddress + 0x15C520);
-	MessageEnd = (MessageEndType)((char*)baseAddress + 0x158880);
-	MessageWriteByte = (MessageWriteByteType)((char*)baseAddress + 0x158A90);
-	MessageWriteString = (MessageWriteStringType)((char*)baseAddress + 0x158D00);
-	MessageWriteBool = (MessageWriteBoolType)((char*)baseAddress + 0x158A00);
-
-	HookEnabler hook;
-	ENABLER_CREATEHOOK(
-		hook,
-		reinterpret_cast<void*>(CServerGameDLL__OnReceivedSayTextMessage),
-		&CServerGameDLL__OnReceivedSayTextMessageHook,
-		reinterpret_cast<LPVOID*>(&CServerGameDLL__OnReceivedSayTextMessageHookBase));
+	AUTOHOOK_DISPATCH_MODULE(server.dll)
+
+	CServerGameDLL__OnReceivedSayTextMessage =
+		module.Offset(0x1595C0).As<void(__fastcall*)(CServerGameDLL*, unsigned int, const char*, int)>();
+	CRecipientFilter__Construct = module.Offset(0x1E9440).As<void(__fastcall*)(CRecipientFilter*)>();
+	CRecipientFilter__Destruct = module.Offset(0x1E9700).As<void(__fastcall*)(CRecipientFilter*)>();
+	CRecipientFilter__AddAllPlayers = module.Offset(0x1E9940).As<void(__fastcall*)(CRecipientFilter*)>();
+	CRecipientFilter__AddRecipient = module.Offset(0x1E9B30).As<void(__fastcall*)(CRecipientFilter*, const R2::CBasePlayer*)>();
+	CRecipientFilter__MakeReliable = module.Offset(0x1EA4E0).As<void(__fastcall*)(CRecipientFilter*)>();
+
+	UserMessageBegin = module.Offset(0x15C520).As<void(__fastcall*)(CRecipientFilter*, const char*)>();
+	MessageEnd = module.Offset(0x158880).As<void(__fastcall*)()>();
+	MessageWriteByte = module.Offset(0x158A90).As<void(__fastcall*)(int)>();
+	MessageWriteString = module.Offset(0x158D00).As<void(__fastcall*)(const char*)>();
+	MessageWriteBool = module.Offset(0x158A00).As<void(__fastcall*)(bool)>();
 
 	// Chat sending functions
-	g_ServerSquirrelManager->AddFuncRegistration("void", "NSSendMessage", "int playerIndex, string text, bool isTeam", "", SQ_SendMessage);
-	g_ServerSquirrelManager->AddFuncRegistration(
+	g_pSquirrel<ScriptContext::SERVER>->AddFuncRegistration(
+		"void", "NSSendMessage", "int playerIndex, string text, bool isTeam", "", SQ_SendMessage);
+	g_pSquirrel<ScriptContext::SERVER>->AddFuncRegistration(
 		"void",
 		"NSBroadcastMessage",
 		"int fromPlayerIndex, int toPlayerIndex, string text, bool isTeam, bool isDead, int messageType",