R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Near finished master server improvements

Browse Source 
* Added working players/maxplayers fields for master server.
* Fixed popstylevar assert in CBrowser (SetStyleVar and the corresponding PopStyleVar where not within the same scope).
This commit is contained in:
Kawe Mazidjatari 2022-07-01 02:20:47 +02:00
parent 59f43d0157
commit d417b60e69
9 changed files with 86 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
r5dev/gameui/IBrowser.cpp
View File

@ -91,7 +91,7 @@ void CBrowser::Draw(void)
int nVars = 0;
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, m_flFadeAlpha); nVars++;
ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(750, 524)); nVars++;
ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(910, 524)); nVars++;
if (!m_bModernTheme)
{
@ -176,23 +176,24 @@ void CBrowser::BrowserPanel(void)
const float fFooterHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
ImGui::BeginChild("##ServerBrowser_ServerList", { 0, -fFooterHeight }, true, ImGuiWindowFlags_AlwaysVerticalScrollbar);
int nVars = 0;
if (m_bModernTheme)
if (ImGui::BeginTable("##ServerBrowser_ServerListTable", 6, ImGuiTableFlags_Resizable))
{
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{ 8.f, 0.f }); nVars++;
}
else
{
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.f, 0.f)); nVars++;
}
int nVars = 0;
if (m_bModernTheme)
{
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{ 8.f, 0.f }); nVars++;
}
else
{
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4.f, 0.f)); nVars++;
}
if (ImGui::BeginTable("##ServerBrowser_ServerListTable", 5, ImGuiTableFlags_Resizable))
{
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthStretch, 25);
ImGui::TableSetupColumn("Map", ImGuiTableColumnFlags_WidthStretch, 20);
ImGui::TableSetupColumn("Playlist", ImGuiTableColumnFlags_WidthStretch, 10);
ImGui::TableSetupColumn("Players", ImGuiTableColumnFlags_WidthStretch, 5);
ImGui::TableSetupColumn("Port", ImGuiTableColumnFlags_WidthStretch, 5);
ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch, 5);
ImGui::TableHeadersRow();
for (NetGameServer_t& server : m_vServerList)
@ -200,8 +201,7 @@ void CBrowser::BrowserPanel(void)
const char* pszHostName = server.m_svHostName.c_str();
const char* pszHostMap = server.m_svMapName.c_str();
const char* pszPlaylist = server.m_svPlaylist.c_str();
const char* pszHostPort = std::to_string(server.m_nGamePort).c_str();
const char* pszPlayers = std::to_string(server.m_nPlayerCount).c_str();
const char* pszHostPort = server.m_svGamePort.c_str();
if (m_imServerBrowserFilter.PassFilter(pszHostName)
|| m_imServerBrowserFilter.PassFilter(pszHostMap)
@ -217,10 +217,10 @@ void CBrowser::BrowserPanel(void)
ImGui::Text(pszPlaylist);
ImGui::TableNextColumn();
ImGui::Text(pszHostPort);
ImGui::Text(fmt::format("{:3d}/{:3d}", strtol(server.m_svPlayerCount.c_str(), NULL, NULL), strtol(server.m_svMaxPlayers.c_str(), NULL, NULL)).c_str());
ImGui::TableNextColumn();
ImGui::Text(pszPlayers);
ImGui::Text(pszHostPort);
ImGui::TableNextColumn();
string svConnectBtn = "Connect##";
@ -233,9 +233,10 @@ void CBrowser::BrowserPanel(void)
}
}
ImGui::PopStyleVar(nVars);
ImGui::EndTable();
ImGui::PopStyleVar(nVars);
}
ImGui::EndChild();
ImGui::Separator();
@ -396,7 +397,7 @@ void CBrowser::HiddenServersModal(void)
bool result = g_pR5net->GetServerByToken(server, m_svHiddenServerRequestMessage, m_svHiddenServerToken); // Send token connect request.
if (!server.m_svHostName.empty())
{
ConnectToServer(server.m_svIpAddress, std::to_string(server.m_nGamePort), server.m_svEncryptionKey); // Connect to the server
ConnectToServer(server.m_svIpAddress, server.m_svGamePort, server.m_svEncryptionKey); // Connect to the server
m_svHiddenServerRequestMessage = "Found Server: " + server.m_svHostName;
m_ivHiddenServerMessageColor = ImVec4(0.00f, 1.00f, 0.00f, 1.00f);
ImGui::CloseCurrentPopup();
@ -427,6 +428,7 @@ void CBrowser::HostPanel(void)
static string svServerNameErr = "";
ImGui::InputTextWithHint("##ServerHost_ServerName", "Server Name (Required)", &m_Server.m_svHostName);
ImGui::InputTextWithHint("##ServerHost_ServerDesc", "Server Description (Optional)", &m_Server.m_svDescription);
ImGui::Spacing();
if (ImGui::BeginCombo("Playlist", m_Server.m_svPlaylist.c_str()))
@ -634,20 +636,21 @@ void CBrowser::SendHostingPostRequest(void)
bool result = g_pR5net->PostServerHost(m_svHostRequestMessage, m_svHostToken,
NetGameServer_t
{
m_Server.m_svHostName.c_str(),
"", // description.
"", // password.
m_Server.m_svHostName,
m_Server.m_svDescription,
m_Server.m_bHidden,
g_pHostState->m_levelName,
mp_gamemode->GetString(),
hostip->GetString(),
hostport->GetInt(),
g_svNetKey.c_str(),
hostport->GetString(),
g_svNetKey,
std::to_string(*g_nServerRemoteChecksum),
SDK_VERSION,
"",
g_pServer->GetNumHumanPlayers() + g_pServer->GetNumFakeClients(),
g_ServerGlobalVariables->m_nMaxClients
std::to_string(g_pServer->GetNumHumanPlayers() + g_pServer->GetNumFakeClients()),
std::to_string(g_ServerGlobalVariables->m_nMaxClients),
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch()
).count()
}
);
@ -660,7 +663,7 @@ void CBrowser::SendHostingPostRequest(void)
{
ssMessage << "Share the following token for clients to connect: ";
}
m_svHostRequestMessage = ssMessage.str().c_str();
m_svHostRequestMessage = ssMessage.str();
DevMsg(eDLL_T::CLIENT, "PostServerHost replied with: %s\n", m_svHostRequestMessage.c_str());
}
else

35
r5dev/networksystem/pylon.cpp
View File

@ -29,23 +29,24 @@ void KeepAliveToPylon()
std::string m_szHostRequestMessage = std::string();
bool result = g_pR5net->PostServerHost(m_szHostRequestMessage, m_szHostToken,
NetGameServer_t
{
hostname->GetString(),
"", // description.
"", // password.
sv_pylonVisibility->GetInt() == 1,
g_pHostState->m_levelName,
mp_gamemode->GetString(),
hostip->GetString(),
hostport->GetInt(),
g_svNetKey.c_str(),
std::to_string(*g_nServerRemoteChecksum),
SDK_VERSION,
"",
g_pServer->GetNumHumanPlayers() + g_pServer->GetNumFakeClients(),
g_ServerGlobalVariables->m_nMaxClients
}
NetGameServer_t
{
hostname->GetString(),
hostdesc->GetString(),
sv_pylonVisibility->GetInt() == 1,
g_pHostState->m_levelName,
mp_gamemode->GetString(),
hostip->GetString(),
hostport->GetString(),
g_svNetKey,
std::to_string(*g_nServerRemoteChecksum),
SDK_VERSION,
std::to_string(g_pServer->GetNumHumanPlayers() + g_pServer->GetNumFakeClients()),
std::to_string(g_ServerGlobalVariables->m_nMaxClients),
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch()
).count()
}
);
}
#endif // !CLIENT_DLL

64
r5dev/networksystem/r5net.cpp
View File

@ -5,14 +5,6 @@
#include "tier1/cvar.h"
#include "networksystem/r5net.h"
//-----------------------------------------------------------------------------
// Purpose: returns the sdk version string.
//-----------------------------------------------------------------------------
string R5Net::Client::GetSDKVersion()
{
return SDK_VERSION;
}
//-----------------------------------------------------------------------------
// Purpose: returns a vector of hosted servers.
//-----------------------------------------------------------------------------
@ -21,19 +13,16 @@ vector<NetGameServer_t> R5Net::Client::GetServersList(string& svOutMessage)
vector<NetGameServer_t> vslList{};
nlohmann::json jsRequestBody = nlohmann::json::object();
jsRequestBody["version"] = GetSDKVersion();
jsRequestBody["version"] = SDK_VERSION;
string svRequestBody = jsRequestBody.dump(4);
if (r5net_show_debug->GetBool())
{
DevMsg(eDLL_T::ENGINE, "Sending GetServerList post.\n");
DevMsg(eDLL_T::ENGINE, "%s - Sending server list request to comp-server:\n%s\n", __FUNCTION__, svRequestBody.c_str());
}
//httplib::Result htResults = m_HttpClient.Post("/api/game_servers/list", jsRequestBody.dump(4).c_str(), jsRequestBody.dump(4).length(), "application/json");
httplib::Result htResults = m_HttpClient.Get("/api/game_servers/list");
httplib::Result htResults = m_HttpClient.Post("/servers", jsRequestBody.dump(4).c_str(), jsRequestBody.dump(4).length(), "application/json");
if (htResults && r5net_show_debug->GetBool())
{
DevMsg(eDLL_T::ENGINE, "%s - replied with '%d'.\n", __FUNCTION__, htResults->status);
@ -51,19 +40,19 @@ vector<NetGameServer_t> R5Net::Client::GetServersList(string& svOutMessage)
{
obj.value("name",""),
obj.value("description",""),
obj.value("password",""),
obj.value("hidden","false") == "true",
obj.value("map",""),
obj.value("playlist",""),
obj.value("ip",""),
obj.value("port", 0),
obj.value("port", ""),
obj.value("key",""),
obj.value("checksum",""),
obj.value("version", GetSDKVersion()),
obj.value("version", SDK_VERSION),
obj.value("playerCount", ""),
obj.value("maxPlayers", ""),
obj.value("timeStamp", 0),
obj.value("publicRef", ""),
obj.value("playerCount", 0),
obj.value("maxPlayers", 0),
obj.value("lastHeartbeat", 0),
obj.value("cachedID", ""),
}
);
}
@ -118,33 +107,32 @@ vector<NetGameServer_t> R5Net::Client::GetServersList(string& svOutMessage)
// &slServerListing -
// Output : Returns true on success, false on failure.
//-----------------------------------------------------------------------------
bool R5Net::Client::PostServerHost(string& svOutMessage, string& svOutToken, const NetGameServer_t& slServerListing) // isBanned
bool R5Net::Client::PostServerHost(string& svOutMessage, string& svOutToken, const NetGameServer_t& slServerListing)
{
nlohmann::json jsRequestBody = nlohmann::json::object();
jsRequestBody["name"] = slServerListing.m_svHostName;
jsRequestBody["description"] = slServerListing.m_svDescription;
jsRequestBody["password"] = slServerListing.m_svPassword;
jsRequestBody["hidden"] = slServerListing.m_bHidden;
jsRequestBody["map"] = slServerListing.m_svMapName;
jsRequestBody["playlist"] = slServerListing.m_svPlaylist;
jsRequestBody["ip"] = slServerListing.m_svIpAddress;
jsRequestBody["port"] = slServerListing.m_nGamePort;
jsRequestBody["port"] = slServerListing.m_svGamePort;
jsRequestBody["key"] = slServerListing.m_svEncryptionKey;
jsRequestBody["checksum"] = slServerListing.m_svRemoteChecksum;
jsRequestBody["version"] = GetSDKVersion();
jsRequestBody["playerCount"] = slServerListing.m_nPlayerCount;
jsRequestBody["maxPlayers"] = slServerListing.m_nMaxPlayers;
jsRequestBody["lastHeartbeat"] = slServerListing.m_nLastPing;
jsRequestBody["version"] = slServerListing.m_svSDKVersion;
jsRequestBody["playerCount"] = slServerListing.m_svPlayerCount;
jsRequestBody["maxPlayers"] = slServerListing.m_svMaxPlayers;
jsRequestBody["timeStamp"] = slServerListing.m_nTimeStamp;
jsRequestBody["publicRef"] = slServerListing.m_svPublicRef;
jsRequestBody["cachedID"] = slServerListing.m_svCachedID;
string svRequestBody = jsRequestBody.dump(4);
if (r5net_show_debug->GetBool())
{
DevMsg(eDLL_T::ENGINE, "%s - Sending post host request to comp-server:\n%s\n", __FUNCTION__, svRequestBody.c_str());
}
httplib::Result htResults = m_HttpClient.Post("/api/game_servers/update", svRequestBody.c_str(), svRequestBody.length(), "application/json");
httplib::Result htResults = m_HttpClient.Post("/servers/add", svRequestBody.c_str(), svRequestBody.length(), "application/json");
if (htResults && r5net_show_debug->GetBool())
{
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with '%d'\n", __FUNCTION__, htResults->status);
@ -232,7 +220,7 @@ bool R5Net::Client::GetServerByToken(NetGameServer_t& slOutServer, string& svOut
DevMsg(eDLL_T::ENGINE, "%s - Sending token connect request to comp-server:\n%s\n", __FUNCTION__, svRequestBody.c_str());
}
httplib::Result htResults = m_HttpClient.Post("/api/game_servers/game_server_private_info", jsRequestBody.dump(4).c_str(), jsRequestBody.dump(4).length(), "application/json");
httplib::Result htResults = m_HttpClient.Post("/server/byToken", jsRequestBody.dump(4).c_str(), jsRequestBody.dump(4).length(), "application/json");
if (r5net_show_debug->GetBool())
{
@ -251,19 +239,19 @@ bool R5Net::Client::GetServerByToken(NetGameServer_t& slOutServer, string& svOut
{
jsResultBody["server"].value("name",""),
jsResultBody["server"].value("description",""),
jsResultBody["server"].value("password",""),
jsResultBody["server"].value("hidden","false") == "true",
jsResultBody["server"].value("map",""),
jsResultBody["server"].value("playlist",""),
jsResultBody["server"].value("ip",""),
jsResultBody["server"].value("port", 0),
jsResultBody["server"].value("port", ""),
jsResultBody["server"].value("key",""),
jsResultBody["server"].value("checksum",""),
jsResultBody["server"].value("version", GetSDKVersion()),
jsResultBody["server"].value("version", SDK_VERSION),
jsResultBody["server"].value("playerCount", ""),
jsResultBody["server"].value("maxPlayers", ""),
jsResultBody["server"].value("timeStamp", 0),
jsResultBody["server"].value("publicRef", ""),
jsResultBody["server"].value("playerCount", 0),
jsResultBody["server"].value("maxPlayers", 0),
jsResultBody["server"].value("lastHeartbeat", 0),
jsResultBody["server"].value("cachedID", ""),
};
return true;
}
@ -328,12 +316,10 @@ bool R5Net::Client::GetClientIsBanned(const string& svIpAddress, uint64_t nOrigi
jsRequestBody["oid"] = nOriginID;
jsRequestBody["ip"] = svIpAddress;
httplib::Result htResults = m_HttpClient.Post("/api/ban_system/is_user_banned", jsRequestBody.dump(4).c_str(), jsRequestBody.dump(4).length(), "application/json");
httplib::Result htResults = m_HttpClient.Post("/banlist/isBanned", jsRequestBody.dump(4).c_str(), jsRequestBody.dump(4).length(), "application/json");
if (htResults && htResults->status == 200)
{
nlohmann::json jsResultBody = nlohmann::json::parse(htResults->body);
if (jsResultBody["success"].is_boolean() && jsResultBody["success"].get<bool>())
{
if (jsResultBody["banned"].is_boolean() && jsResultBody["banned"].get<bool>())

1
r5dev/networksystem/r5net.h
View File

@ -15,7 +15,6 @@ namespace R5Net
bool PostServerHost(string& svOutMessage, string& svOutToken, const NetGameServer_t& slServerListing);
bool GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage, const string& svToken);
bool GetClientIsBanned(const string& svIpAddress, uint64_t nOriginID, string& svOutErrCl);
string GetSDKVersion();
Client* pR5net = nullptr;
Client* GetR5Net() { return pR5net; }

17
r5dev/networksystem/serverlisting.h
View File

@ -15,25 +15,24 @@ struct NetGameServer_t
{
string m_svHostName;
string m_svDescription;
string m_svPassword;
bool m_bHidden;
string m_svMapName = "mp_lobby";
string m_svPlaylist = "dev_default";
string m_svIpAddress;
int m_nGamePort;
string m_svGamePort;
string m_svEncryptionKey;
string m_svRemoteChecksum;
string m_svSDKVersion;
string m_svPublicRef;
int m_nPlayerCount;
int m_nMaxPlayers;
int m_nLastPing = -1;
string m_svPlayerCount;
string m_svMaxPlayers;
int64_t m_nTimeStamp = -1;
string m_svPublicRef;
string m_svCachedID;
//vector<NetGameMod_t> m_vMods;
};

6
r5dev/squirrel/sqinit.cpp
View File

@ -45,7 +45,7 @@ namespace VSquirrel
//-----------------------------------------------------------------------------
SQRESULT GetSDKVersion(HSQUIRRELVM v)
{
sq_pushstring(v, g_pR5net->GetSDKVersion().c_str(), -1);
sq_pushstring(v, SDK_VERSION, -1);
return SQ_OK;
}
@ -246,7 +246,7 @@ namespace VSquirrel
// !TODO: Create glue class instead.
g_pBrowser->ConnectToServer(g_pBrowser->m_vServerList[iServerIndex].m_svIpAddress,
std::to_string(g_pBrowser->m_vServerList[iServerIndex].m_nGamePort),
g_pBrowser->m_vServerList[iServerIndex].m_svGamePort,
g_pBrowser->m_vServerList[iServerIndex].m_svEncryptionKey);
return SQ_OK;
@ -289,7 +289,7 @@ namespace VSquirrel
bool result = g_pR5net->GetServerByToken(svListing, svHiddenServerRequestMessage, svToken); // Send szToken connect request.
if (result)
{
g_pBrowser->ConnectToServer(svListing.m_svIpAddress, std::to_string(svListing.m_nGamePort), svListing.m_svEncryptionKey);
g_pBrowser->ConnectToServer(svListing.m_svIpAddress, svListing.m_svGamePort, svListing.m_svEncryptionKey);
}
return SQ_OK;

1
r5dev/tier1/IConVar.cpp
View File

@ -40,6 +40,7 @@ void ConVar::Init(void) const
{
//-------------------------------------------------------------------------
// ENGINE |
hostdesc = new ConVar("hostdesc", "", FCVAR_RELEASE, "Host game server description.", false, 0.f, false, 0.f, nullptr, nullptr);
staticProp_defaultBuildFrustum = new ConVar("staticProp_defaultBuildFrustum", "0", FCVAR_DEVELOPMENTONLY, "Use the old solution for building static prop frustum culling.", false, 0.f, false, 0.f, nullptr, nullptr);
cm_debug_cmdquery = new ConVar("cm_debug_cmdquery" , "0", FCVAR_DEVELOPMENTONLY, "Prints the flags of each ConVar/ConCommand query to the console ( !slower! ).", false, 0.f, false, 0.f, nullptr, nullptr);

1
r5dev/tier1/cvar.cpp
View File

@ -17,6 +17,7 @@ ConVar* model_defaultFadeDistScale = nullptr;
ConVar* model_defaultFadeDistMin = nullptr;
ConVar* hostname = nullptr;
ConVar* hostdesc = nullptr;
ConVar* hostip = nullptr;
ConVar* hostport = nullptr;
ConVar* host_hasIrreversibleShutdown = nullptr;

1
r5dev/tier1/cvar.h
View File

@ -15,6 +15,7 @@ extern ConVar* model_defaultFadeDistScale;
extern ConVar* model_defaultFadeDistMin;
extern ConVar* hostname;
extern ConVar* hostdesc;
extern ConVar* hostip;
extern ConVar* hostport;
extern ConVar* host_hasIrreversibleShutdown;