aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDedicatedTest/masterserver.cpp
diff options
context:
space:
mode:
authorBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2021-10-19 02:18:24 +0100
committerBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2021-10-19 02:18:24 +0100
commited7e4fed4ddedaf9d4c181052ca552a0914d57bb (patch)
tree0d451e40d82b0513c4f2acd42ea750638b1d4c88 /NorthstarDedicatedTest/masterserver.cpp
parent9b8a6d155a7a2cf1bfb4e8d98980bfb0b6e94d92 (diff)
downloadNorthstarLauncher-ed7e4fed4ddedaf9d4c181052ca552a0914d57bb.tar.gz
NorthstarLauncher-ed7e4fed4ddedaf9d4c181052ca552a0914d57bb.zip
add masterserver mod list support and fix some squirrel issues
Diffstat (limited to 'NorthstarDedicatedTest/masterserver.cpp')
-rw-r--r--NorthstarDedicatedTest/masterserver.cpp59
1 files changed, 55 insertions, 4 deletions
diff --git a/NorthstarDedicatedTest/masterserver.cpp b/NorthstarDedicatedTest/masterserver.cpp
index 4597213c..3072b6b2 100644
--- a/NorthstarDedicatedTest/masterserver.cpp
+++ b/NorthstarDedicatedTest/masterserver.cpp
@@ -7,7 +7,10 @@
#include "serverauthentication.h"
#include "gameutils.h"
#include "rapidjson/document.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/writer.h"
#include "rapidjson/error/en.h"
+#include "modmanager.h"
ConVar* Cvar_ns_masterserver_hostname;
ConVar* Cvar_ns_masterserver_port;
@@ -130,7 +133,8 @@ void MasterServerManager::RequestServerList()
|| !serverObj.HasMember("playlist") || !serverObj["playlist"].IsString()
|| !serverObj.HasMember("playerCount") || !serverObj["playerCount"].IsNumber()
|| !serverObj.HasMember("maxPlayers") || !serverObj["maxPlayers"].IsNumber()
- || !serverObj.HasMember("hasPassword") || !serverObj["hasPassword"].IsBool())
+ || !serverObj.HasMember("hasPassword") || !serverObj["hasPassword"].IsBool()
+ || !serverObj.HasMember("modInfo") || !serverObj["modInfo"].HasMember("Mods") || !serverObj["modInfo"]["Mods"].IsArray() )
{
spdlog::error("Failed reading masterserver response: malformed server object");
goto REQUEST_END_CLEANUP;
@@ -138,6 +142,8 @@ void MasterServerManager::RequestServerList()
const char* id = serverObj["id"].GetString();
+ RemoteServerInfo* newServer = nullptr;
+
bool createNewServerInfo = true;
for (RemoteServerInfo& server : m_remoteServers)
{
@@ -145,6 +151,7 @@ void MasterServerManager::RequestServerList()
if (!strncmp((const char*)server.id, id, 32))
{
server = RemoteServerInfo(id, serverObj["name"].GetString(), serverObj["description"].GetString(), serverObj["map"].GetString(), serverObj["playlist"].GetString(), serverObj["playerCount"].GetInt(), serverObj["maxPlayers"].GetInt(), serverObj["hasPassword"].IsTrue());
+ newServer = &server;
createNewServerInfo = false;
break;
}
@@ -152,7 +159,23 @@ void MasterServerManager::RequestServerList()
// server didn't exist
if (createNewServerInfo)
- m_remoteServers.emplace_back(id, serverObj["name"].GetString(), serverObj["description"].GetString(), serverObj["map"].GetString(), serverObj["playlist"].GetString(), serverObj["playerCount"].GetInt(), serverObj["maxPlayers"].GetInt(), serverObj["hasPassword"].IsTrue());
+ newServer = &m_remoteServers.emplace_back(id, serverObj["name"].GetString(), serverObj["description"].GetString(), serverObj["map"].GetString(), serverObj["playlist"].GetString(), serverObj["playerCount"].GetInt(), serverObj["maxPlayers"].GetInt(), serverObj["hasPassword"].IsTrue());
+
+ newServer->requiredMods.clear();
+ for (auto& requiredMod : serverObj["modInfo"]["Mods"].GetArray())
+ {
+ RemoteModInfo modInfo;
+
+ if (!requiredMod.HasMember("Name") || !requiredMod["Name"].IsString())
+ continue;
+ modInfo.Name = requiredMod["Name"].GetString();
+
+ if (!requiredMod.HasMember("Version") || !requiredMod["Version"].IsString())
+ continue;
+ modInfo.Version = requiredMod["Version"].GetString();
+
+ newServer->requiredMods.push_back(modInfo);
+ }
spdlog::info("Server {} on map {} with playlist {} has {}/{} players", serverObj["name"].GetString(), serverObj["map"].GetString(), serverObj["playlist"].GetString(), serverObj["playerCount"].GetInt(), serverObj["maxPlayers"].GetInt());
}
@@ -378,7 +401,35 @@ void MasterServerManager::AddSelfToServerList(int port, int authPort, char* name
else
request = fmt::format("/server/add_server?port={}&authPort={}&name={}&description={}&map={}&playlist={}&maxPlayers={}&password=", port, authPort, name, description, map, playlist, maxPlayers);
- if (auto result = http.Post(request.c_str()))
+ // build modinfo obj
+ rapidjson::Document modinfoDoc;
+ modinfoDoc.SetObject();
+ modinfoDoc.AddMember("Mods", rapidjson::Value(rapidjson::kArrayType), modinfoDoc.GetAllocator());
+
+ int currentModIndex = 0;
+ for (Mod* mod : g_ModManager->m_loadedMods)
+ {
+ if (!mod->RequiredOnClient)
+ continue;
+
+ modinfoDoc["Mods"].PushBack(rapidjson::Value(rapidjson::kObjectType), modinfoDoc.GetAllocator());
+ modinfoDoc["Mods"][currentModIndex].AddMember("Name", rapidjson::StringRef(mod->Name.c_str()), modinfoDoc.GetAllocator());
+ modinfoDoc["Mods"][currentModIndex].AddMember("Version", rapidjson::StringRef(mod->Version.c_str()), modinfoDoc.GetAllocator());
+
+ currentModIndex++;
+ }
+
+ rapidjson::StringBuffer buffer;
+ buffer.Clear();
+ rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+ modinfoDoc.Accept(writer);
+ const char* modInfoString = buffer.GetString();
+
+ httplib::MultipartFormDataItems requestItems = {
+ {"modinfo", std::string(modInfoString, buffer.GetSize()), "modinfo.json", "application/octet-stream"}
+ };
+
+ if (auto result = http.Post(request.c_str(), requestItems))
{
m_successfullyConnected = true;
@@ -506,7 +557,7 @@ void MasterServerManager::WritePlayerPersistentData(char* playerId, char* pdata,
http.set_connection_timeout(10);
httplib::MultipartFormDataItems requestItems = {
- { "pdata", std::string(&pdata[0], pdataSize), "file.pdata", "application/octet-stream"}
+ { "pdata", std::string(pdata, pdataSize), "file.pdata", "application/octet-stream"}
};
// we dont process this at all atm, maybe do later, but atm not necessary