SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2026-02-16 11:00:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

add /modlist endpoint, DownloadThreads config option

Browse Source
This commit is contained in:
Lion Kortlepel
2022-07-26 17:57:19 +02:00
parent f48b8ff1a1
commit 5394122d77
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -56,7 +56,7 @@ elseif (WIN32)
STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
# ------------------------ LINUX ---------------------------------
elseif (UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++ -static-libgcc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
option(SANITIZE "Turns on thread and UB sanitizers" OFF)

2
deps/dlhttp vendored

Submodule deps/dlhttp updated: 5229149298...206d5be365

1
include/Common.h
View File

@@ -55,6 +55,7 @@ public:
int MaxCars { 1 };
bool DebugModeEnabled { false };
int Port { 30814 };
int DownloadThreads { 4 };
std::string CustomIP {};
bool LogChat { true };
bool SendErrors { true };

38
src/TConfig.cpp
View File

@@ -18,6 +18,7 @@ static constexpr std::string_view StrDescription = "Description";
static constexpr std::string_view StrResourceFolder = "ResourceFolder";
static constexpr std::string_view StrAuthKey = "AuthKey";
static constexpr std::string_view StrLogChat = "LogChat";
static constexpr std::string_view StrDownloadThreads = "DownloadThreads";
// Misc
static constexpr std::string_view StrSendErrors = "SendErrors";
@@ -103,6 +104,8 @@ void TConfig::FlushToFile() {
data["General"][StrMap.data()] = Application::Settings.MapName;
data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
data["General"][StrDownloadThreads.data()] = Application::Settings.DownloadThreads;
SetComment(data["General"][StrDownloadThreads.data()].comments(), " How many simultaneous downloads may run at the same time");
// Misc
data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
@@ -186,6 +189,7 @@ void TConfig::ParseFromFile(std::string_view name) {
TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
TryReadValue(data, "General", StrDownloadThreads, Application::Settings.DownloadThreads);
// Misc
TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
@@ -221,22 +225,26 @@ void TConfig::ParseFromFile(std::string_view name) {
}
void TConfig::PrintDebug() {
beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
beammp_debug(std::string(StrSSLKeyPath) + ": \"" + Application::Settings.SSLKeyPath + "\"");
beammp_debug(std::string(StrSSLCertPath) + ": \"" + Application::Settings.SSLCertPath + "\"");
beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
beammp_debugf("{}: {}", StrDebug, Application::Settings.DebugModeEnabled ? "true" : "false");
beammp_debugf("{}: {}", StrPrivate, Application::Settings.Private ? "true" : "false");
beammp_debugf("{}: {}", StrPort, Application::Settings.Port);
beammp_debugf("{}: {}", StrMaxCars, Application::Settings.MaxCars);
beammp_debugf("{}: {}", StrMaxPlayers, Application::Settings.MaxPlayers);
beammp_debugf("{}: '{}'", StrMap, Application::Settings.MapName);
beammp_debugf("{}: '{}'", StrName, Application::Settings.ServerName);
beammp_debugf("{}: '{}'", StrDescription, Application::Settings.ServerDesc);
beammp_debugf("{}: {}", StrLogChat, Application::Settings.LogChat ? "true" : "false");
beammp_debugf("{}: '{}'", StrResourceFolder, Application::Settings.Resource);
beammp_debugf("{}: '{}'", StrSSLKeyPath, Application::Settings.SSLKeyPath);
beammp_debugf("{}: '{}'", StrSSLCertPath, Application::Settings.SSLCertPath);
beammp_debugf("{}: {}", StrHTTPServerPort, Application::Settings.HTTPServerPort);
beammp_debugf("{}: '{}'", StrHTTPServerIP, Application::Settings.HTTPServerIP);
beammp_debugf("{}: {}", StrDownloadThreads, Application::Settings.DownloadThreads);
if (Application::Settings.DownloadThreads < 1) {
beammp_warnf("'{}' of <1 is not allowed, will use 1", StrDownloadThreads);
}
// special!
beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
beammp_debugf("Key Length: {}", Application::Settings.Key.length());
}
void TConfig::ParseOldFormat() {

7
src/TNetwork.cpp
View File

@@ -149,10 +149,11 @@ void TNetwork::TCPServerMain() {
}
Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good);
beammp_info("Vehicle event network online");
dlhttp::AsyncContext Ctx(4);
const auto ThreadCount = std::max(1, Application::Settings.DownloadThreads);
beammp_debugf("Using {} download threads", ThreadCount);
dlhttp::AsyncContext Ctx(ThreadCount);
dlhttp::EndpointHandlerMap Map {
{ "/", []() -> dlhttp::Response { return { 200, "Hello! :)" }; } },
{ "/fuck", []() -> dlhttp::Response { return { 200, "fuck lol" }; } },
{ "/modlist", [this]() -> dlhttp::Response { return { mResourceManager.FileList() }; } },
};
do {
try {