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, 73 insertions, 21 deletions

diff --git a/NorthstarDLL/masterserver.h b/NorthstarDLL/masterserver.h
index 3d5f716c..0bbf7c76 100644
--- a/NorthstarDLL/masterserver.h
+++ b/NorthstarDLL/masterserver.h
@@ -1,8 +1,15 @@
 #pragma once
+
 #include "convar.h"
+#include "serverpresence.h"
 #include <winsock2.h>
 #include <string>
 #include <cstring>
+#include <future>
+
+extern ConVar* Cvar_ns_masterserver_hostname;
+extern ConVar* Cvar_ns_curl_log_enable;
+
 struct RemoteModInfo
 {
   public:
@@ -82,8 +89,6 @@ class MasterServerManager
 	char m_sOwnClientAuthToken[33];
 
 	std::string m_sOwnModInfoJson;
-	std::string m_sUnicodeServerName; // Unicode unescaped version of Cvar_ns_auth_servername for support in cjk characters
-	std::string m_sUnicodeServerDesc; // Unicode unescaped version of Cvar_ns_auth_serverdesc for support in cjk characters
 
 	bool m_bOriginAuthWithMasterServerDone = false;
 	bool m_bOriginAuthWithMasterServerInProgress = false;
@@ -97,8 +102,7 @@ class MasterServerManager
 	bool m_bNewgameAfterSelfAuth = false;
 	bool m_bScriptAuthenticatingWithGameServer = false;
 	bool m_bSuccessfullyAuthenticatedWithGameServer = false;
-
-	std::string s_authfail_reason {};
+	std::string m_sAuthFailureReason {};
 
 	bool m_bHasPendingConnectionInfo = false;
 	RemoteServerConnectionInfo m_pendingConnectionInfo;
@@ -108,28 +112,76 @@ class MasterServerManager
 	bool m_bHasMainMenuPromoData = false;
 	MainMenuPromoData m_sMainMenuPromoData;
 
-  private:
-	void SetCommonHttpClientOptions(CURL* curl);
-
   public:
 	MasterServerManager();
+
 	void ClearServerList();
 	void RequestServerList();
 	void RequestMainMenuPromos();
-	void AuthenticateOriginWithMasterServer(char* uid, char* originToken);
-	void AuthenticateWithOwnServer(char* uid, char* playerToken);
-	void AuthenticateWithServer(char* uid, char* playerToken, char* serverId, char* password);
-	void
-	AddSelfToServerList(int port, int authPort, char* name, char* description, char* map, char* playlist, int maxPlayers, char* password);
-	void UpdateServerMapAndPlaylist(char* map, char* playlist, int playerCount);
-	void UpdateServerPlayerCount(int playerCount);
-	void WritePlayerPersistentData(char* playerId, char* pdata, size_t pdataSize);
-	void RemoveSelfFromServerList();
+	void AuthenticateOriginWithMasterServer(const char* uid, const char* originToken);
+	void AuthenticateWithOwnServer(const char* uid, const char* playerToken);
+	void AuthenticateWithServer(const char* uid, const char* playerToken, const char* serverId, const char* password);
+	void WritePlayerPersistentData(const char* playerId, const char* pdata, size_t pdataSize);
 };
-std::string unescape_unicode(const std::string& str);
-void UpdateServerInfoFromUnicodeToUTF8();
-void InitialiseSharedMasterServer(HMODULE baseAddress);
 
-extern MasterServerManager* g_MasterServerManager;
+extern MasterServerManager* g_pMasterServerManager;
 extern ConVar* Cvar_ns_masterserver_hostname;
-extern ConVar* Cvar_ns_server_password;
+
+/** Result returned in the std::future of a MasterServerPresenceReporter::ReportPresence() call. */
+enum class MasterServerReportPresenceResult
+{
+	// Adding this server to the MS was successful.
+	Success,
+	// We failed to add this server to the MS and should retry.
+	Failed,
+	// We failed to add this server to the MS and shouldn't retry.
+	FailedNoRetry,
+	// We failed to even reach the MS.
+	FailedNoConnect,
+	// We failed to add the server because an existing server with the same ip:port exists.
+	FailedDuplicateServer,
+};
+
+class MasterServerPresenceReporter : public ServerPresenceReporter
+{
+  public:
+	/** Full data returned in the std::future of a MasterServerPresenceReporter::ReportPresence() call. */
+	struct ReportPresenceResultData
+	{
+		MasterServerReportPresenceResult result;
+
+		std::optional<std::string> id;
+		std::optional<std::string> serverAuthToken;
+	};
+
+	const int MAX_REGISTRATION_ATTEMPTS = 5;
+
+	// Called to initialise the master server presence reporter's state.
+	void CreatePresence(const ServerPresence* pServerPresence) override;
+
+	// Run on an internal to either add the server to the MS or update it.
+	void ReportPresence(const ServerPresence* pServerPresence) override;
+
+	// Called when we need to remove the server from the master server.
+	void DestroyPresence(const ServerPresence* pServerPresence) override;
+
+	// Called every frame.
+	void RunFrame(double flCurrentTime, const ServerPresence* pServerPresence) override;
+
+  protected:
+	// Contains the async logic to add the server to the MS.
+	void InternalAddServer(const ServerPresence* pServerPresence);
+
+	// Contains the async logic to update the server on the MS.
+	void InternalUpdateServer(const ServerPresence* pServerPresence);
+
+	// The future used for InternalAddServer() calls.
+	std::future<ReportPresenceResultData> addServerFuture;
+
+	// The future used for InternalAddServer() calls.
+	std::future<ReportPresenceResultData> updateServerFuture;
+
+	int m_nNumRegistrationAttempts;
+
+	double m_fNextAddServerAttemptTime;
+};