add RateLimiter class

.github/workflows/linux.yml

@@ -26,7 +26,7 @@ jobs:
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
-            version: 24.04
+            version: 20.04
     container:
       image: ${{ matrix.distro }}:${{ matrix.version }}
     steps:
@@ -63,13 +63,13 @@ jobs:
         run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
 
       - name: Archive server artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
           path: ./bin/BeamMP-Server
 
       - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
           path: ./bin/BeamMP-Server.debug
@@ -97,7 +97,7 @@ jobs:
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
-            version: 24.04
+            version: 20.04
     container:
       image: ${{ matrix.distro }}:${{ matrix.version }}
     steps:
@@ -134,13 +134,13 @@ jobs:
         run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
 
       - name: Archive server artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
           path: ./bin/BeamMP-Server
 
       - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
           path: ./bin/BeamMP-Server.debug

.github/workflows/release.yml

@@ -45,7 +45,7 @@ jobs:
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
-            version: 24.04
+            version: 20.04
     container:
       image: ${{ matrix.distro }}:${{ matrix.version }}
     steps:
@@ -116,7 +116,7 @@ jobs:
           - distro: ubuntu
             version: 22.04
           - distro: ubuntu
-            version: 24.04
+            version: 20.04
     env:
       VCPKG_DEFAULT_TRIPLET: "arm64-linux"
       VCPKG_FORCE_SYSTEM_BINARIES: 1

.github/workflows/windows.yml

@@ -41,7 +41,7 @@ jobs:
         run: bash ./scripts/windows/2-build.sh
 
       - name: Archive server artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: BeamMP-Server-windows
           path: ./bin/Release/BeamMP-Server.exe

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/Microsoft/vcpkg.git
-[submodule "deps/toml11"]
-	path = deps/toml11
-	url = https://github.com/ToruNiina/toml11

CMakeLists.txt

@@ -20,7 +20,7 @@ include(cmake/Git.cmake)
 ### SETTINGS ###
 
 # add all headers (.h, .hpp) to this
-set(PRJ_HEADERS
+set(PRJ_HEADERS 
     include/ArgsParser.h
     include/BoostAliases.h
     include/Client.h
@@ -35,6 +35,7 @@ set(PRJ_HEADERS
     include/Json.h
     include/LuaAPI.h
     include/RWMutex.h
+    include/RateLimiter.h
     include/SignalHandling.h
     include/TConfig.h
     include/TConsole.h
@@ -49,7 +50,6 @@ set(PRJ_HEADERS
     include/TServer.h
     include/VehicleData.h
     include/Env.h
-    include/Settings.h
     include/Profiling.h
     include/ChronoWrapper.h
 )
@@ -73,9 +73,9 @@ set(PRJ_SOURCES
     src/TResourceManager.cpp
     src/TScopedTimer.cpp
     src/TServer.cpp
+    src/RateLimiter.cpp
     src/VehicleData.cpp
     src/Env.cpp
-    src/Settings.cpp
     src/Profiling.cpp
     src/ChronoWrapper.cpp
 )
@@ -93,7 +93,7 @@ set(PRJ_COMPILE_FEATURES cxx_std_20)
 # set #defines (test enable/disable not included here)
 set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT)
 # add all libraries used by the project (WARNING: also set them in vcpkg.json!)
-set(PRJ_LIBRARIES
+set(PRJ_LIBRARIES 
     fmt::fmt
     doctest::doctest
     Threads::Threads
@@ -116,7 +116,7 @@ find_package(httplib CONFIG REQUIRED)
 find_package(libzip CONFIG REQUIRED)
 find_package(RapidJSON CONFIG REQUIRED)
 find_package(sol2 CONFIG REQUIRED)
-add_subdirectory("deps/toml11")
+find_package(toml11 CONFIG REQUIRED)
 
 include_directories(include)
 
@@ -125,7 +125,7 @@ include(FindThreads)
 
 ### END SETTINGS ###
 
-# DONT change anything beyond this point unless you've read the cmake bible and
+# DONT change anything beyond this point unless you've read the cmake bible and 
 # swore on it not to bonk up the ci/cd pipelines with your changes.
 
 ####################
@@ -164,7 +164,7 @@ set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
 )
 
 # build commandline manually for funky windows flags to carry over without a custom toolchain file
-add_library(commandline_static
+add_library(commandline_static 
     deps/commandline/src/impls.h
     deps/commandline/src/windows_impl.cpp
     deps/commandline/src/linux_impl.cpp

README.md

@@ -19,7 +19,7 @@ Feel free to ask any questions via the following channels:
 
 These values are guesstimated and are subject to change with each release.
 
-* RAM: 30-100 MiB usable (not counting OS overhead)
+* RAM: 50+ MiB usable (not counting OS overhead)
 * CPU: >1GHz, preferably multicore
 * OS: Windows, Linux (theoretically any POSIX)
 * GPU: None

cmake/CompilerWarnings.cmake

@@ -3,9 +3,9 @@
 # https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
 # Courtesy of Jason Turner
 # License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE
-#
+# 
 # This version has been modified by the owners of the current respository.
-# Modifications have mostly been marked with "modified" or similar, though this is not
+# Modifications have mostly been marked with "modified" or similar, though this is not 
 # strictly required.
 
 function(set_project_warnings project_name)
@@ -73,6 +73,7 @@ function(set_project_warnings project_name)
             -Werror=missing-declarations
             -Werror=missing-field-initializers
             -Werror=ctor-dtor-privacy
+            -Werror=switch-enum
             -Wswitch-default
             -Werror=unused-result
             -Werror=implicit-fallthrough

cmake/Git.cmake

@@ -2,7 +2,7 @@ find_package(Git)
 if(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES)
     if(Git_FOUND)
         message(STATUS "Git found, submodule update and init")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
                         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                         RESULT_VARIABLE GIT_SUBMOD_RESULT)
         if(NOT GIT_SUBMOD_RESULT EQUAL "0")

include/ChronoWrapper.h

@@ -4,5 +4,5 @@
 #include <string>
 
 namespace ChronoWrapper {
-std::chrono::high_resolution_clock::duration TimeFromStringWithLiteral(const std::string& time_str);
+    std::chrono::high_resolution_clock::duration TimeFromStringWithLiteral(const std::string& time_str);
 }

include/Client.h

@@ -66,6 +66,7 @@ public:
     std::string GetCarData(int Ident);
     std::string GetCarPositionRaw(int Ident);
     void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
+    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
     void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
     void Disconnect(std::string_view Reason);
     bool IsDisconnected() const { return !mSocket.is_open(); }
@@ -74,6 +75,8 @@ public:
     [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
     [[nodiscard]] const ip::udp::endpoint& GetUDPAddr() const { return mUDPAddress; }
     [[nodiscard]] ip::udp::endpoint& GetUDPAddr() { return mUDPAddress; }
+    [[nodiscard]] ip::tcp::socket& GetDownSock() { return mDownSocket; }
+    [[nodiscard]] const ip::tcp::socket& GetDownSock() const { return mDownSocket; }
     [[nodiscard]] ip::tcp::socket& GetTCPSock() { return mSocket; }
     [[nodiscard]] const ip::tcp::socket& GetTCPSock() const { return mSocket; }
     [[nodiscard]] std::string GetRoles() const { return mRole; }
@@ -85,7 +88,7 @@ public:
     void ClearCars();
     [[nodiscard]] int GetID() const { return mID; }
     [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
-    [[nodiscard]] bool IsUDPConnected() const { return mIsUDPConnected; }
+    [[nodiscard]] bool IsConnected() const { return mIsConnected; }
     [[nodiscard]] bool IsSynced() const { return mIsSynced; }
     [[nodiscard]] bool IsSyncing() const { return mIsSyncing; }
     [[nodiscard]] bool IsGuest() const { return mIsGuest; }
@@ -97,7 +100,7 @@ public:
     [[nodiscard]] const std::queue<std::vector<uint8_t>>& MissedPacketQueue() const { return mPacketsSync; }
     [[nodiscard]] size_t MissedPacketQueueSize() const { return mPacketsSync.size(); }
     [[nodiscard]] std::mutex& MissedPacketQueueMutex() const { return mMissedPacketsMutex; }
-    void SetIsUDPConnected(bool NewIsConnected) { mIsUDPConnected = NewIsConnected; }
+    void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
     [[nodiscard]] TServer& Server() const;
     void UpdatePingTime();
     int SecondsSinceLastPing();
@@ -106,7 +109,7 @@ private:
     void InsertVehicle(int ID, const std::string& Data);
 
     TServer& mServer;
-    bool mIsUDPConnected = false;
+    bool mIsConnected = false;
     bool mIsSynced = false;
     bool mIsSyncing = false;
     mutable std::mutex mMissedPacketsMutex;
@@ -119,6 +122,7 @@ private:
     SparseArray<std::string> mVehiclePosition;
     std::string mName = "Unknown Client";
     ip::tcp::socket mSocket;
+    ip::tcp::socket mDownSocket;
     ip::udp::endpoint mUDPAddress {};
     int mUnicycleID = -1;
     std::string mRole;

include/Common.h

@@ -29,7 +29,6 @@
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
-#include <span>
 #include <sstream>
 #include <unordered_map>
 #include <zlib.h>
@@ -38,7 +37,6 @@
 #include <filesystem>
 namespace fs = std::filesystem;
 
-#include "Settings.h"
 #include "TConsole.h"
 
 struct Version {
@@ -61,6 +59,34 @@ using SparseArray = std::unordered_map<size_t, T>;
 class Application final {
 public:
     // types
+    struct TSettings {
+        std::string ServerName { "BeamMP Server" };
+        std::string ServerDesc { "BeamMP Default Description" };
+        std::string ServerTags { "Freeroam" };
+        std::string Resource { "Resources" };
+        std::string MapName { "/levels/gridmap_v2/info.json" };
+        std::string Key {};
+        std::string Password {};
+        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
+        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
+        bool HTTPServerEnabled { false };
+        int MaxPlayers { 8 };
+        bool Private { true };
+        int MaxCars { 1 };
+        bool DebugModeEnabled { false };
+        int Port { 30814 };
+        std::string CustomIP {};
+        bool LogChat { true };
+        bool AllowGuests { true };
+        bool SendErrors { true };
+        bool SendErrorsMessageEnabled { true };
+        int HTTPServerPort { 8080 };
+        std::string HTTPServerIP { "127.0.0.1" };
+        bool HTTPServerUseSSL { false };
+        bool HideUpdateMessages { false };
+        std::string UpdateReminderTime { "30s" };
+        [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
+    };
 
     using TShutdownHandler = std::function<void()>;
 
@@ -78,7 +104,7 @@ public:
     static std::string PPS() { return mPPS; }
     static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }
 
-    static inline struct Settings Settings { };
+    static TSettings Settings;
 
     static std::vector<std::string> GetBackendUrlsInOrder() {
         return {
@@ -127,7 +153,7 @@ private:
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
 
-    static inline Version mVersion { 3, 6, 0 };
+    static inline Version mVersion { 3, 5, 0 };
 };
 
 void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);
@@ -200,13 +226,13 @@ void RegisterThread(const std::string& str);
     #define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
     #define beammp_debug(x)                                                                   \
         do {                                                                                  \
-            if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
+            if (Application::Settings.DebugModeEnabled) {                                     \
                 Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
             }                                                                                 \
         } while (false)
     #define beammp_event(x)                                                                   \
         do {                                                                                  \
-            if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
+            if (Application::Settings.DebugModeEnabled) {                                     \
                 Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
             }                                                                                 \
         } while (false)
@@ -214,7 +240,7 @@ void RegisterThread(const std::string& str);
     #if defined(DEBUG)
         #define beammp_trace(x)                                                                   \
             do {                                                                                  \
-                if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
+                if (Application::Settings.DebugModeEnabled) {                                     \
                     Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
                 }                                                                                 \
             } while (false)
@@ -263,14 +289,57 @@ void RegisterThread(const std::string& str);
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg);
 
-std::vector<uint8_t> Comp(std::span<const uint8_t> input);
-std::vector<uint8_t> DeComp(std::span<const uint8_t> input);
+#define Biggest 30000
+
+template <typename T>
+inline T Comp(const T& Data) {
+    std::array<char, Biggest> C {};
+    // obsolete
+    C.fill(0);
+    z_stream defstream;
+    defstream.zalloc = nullptr;
+    defstream.zfree = nullptr;
+    defstream.opaque = nullptr;
+    defstream.avail_in = uInt(Data.size());
+    defstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Data[0]));
+    defstream.avail_out = Biggest;
+    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
+    deflateInit(&defstream, Z_BEST_COMPRESSION);
+    deflate(&defstream, Z_SYNC_FLUSH);
+    deflate(&defstream, Z_FINISH);
+    deflateEnd(&defstream);
+    size_t TotalOut = defstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}
+
+template <typename T>
+inline T DeComp(const T& Compressed) {
+    std::array<char, Biggest> C {};
+    // not needed
+    C.fill(0);
+    z_stream infstream;
+    infstream.zalloc = nullptr;
+    infstream.zfree = nullptr;
+    infstream.opaque = nullptr;
+    infstream.avail_in = Biggest;
+    infstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Compressed[0]));
+    infstream.avail_out = Biggest;
+    infstream.next_out = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(C.data()));
+    inflateInit(&infstream);
+    inflate(&infstream, Z_SYNC_FLUSH);
+    inflate(&infstream, Z_FINISH);
+    inflateEnd(&infstream);
+    size_t TotalOut = infstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}
 
 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW
-
-class InvalidDataError : std::runtime_error {
-public:
-    InvalidDataError() : std::runtime_error("Invalid data") {
-    }
-};

include/CustomAssert.h

@@ -32,7 +32,6 @@
 #include <thread>
 
 #include "Common.h"
-#include "Compat.h"
 
 static const char* const ANSI_RESET = "\u001b[0m";
 
@@ -57,7 +56,7 @@ static const char* const ANSI_WHITE_BOLD = "\u001b[37;1m";
 static const char* const ANSI_BOLD = "\u001b[1m";
 static const char* const ANSI_UNDERLINE = "\u001b[4m";
 
-#if defined(DEBUG) && !defined(BEAMMP_FREEBSD)
+#ifdef DEBUG
 #include <iostream>
 inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const char* function, [[maybe_unused]] unsigned line,
     [[maybe_unused]] const char* condition_string, [[maybe_unused]] bool result) {
@@ -82,8 +81,8 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
             beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
         }                                                                              \
     } while (false)
-#define beammp_assert_not_reachable()                                                                                                                           \
-    do {                                                                                                                                                        \
+#define beammp_assert_not_reachable()                                                      \
+    do {                                                                                   \
         beammp_errorf("Assertion failed in '{}:{}': Unreachable code reached. This may result in a crash or undefined state of the program.", __func__, _line); \
     } while (false)
 #endif // DEBUG

include/Json.h

@@ -17,7 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #pragma once
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
 #include "rapidjson/stringbuffer.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/document.h"
 #include "rapidjson/writer.h"

include/LuaAPI.h

@@ -35,10 +35,8 @@ namespace MP {
     inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
     std::pair<bool, std::string> DropPlayer(int ID, std::optional<std::string> MaybeReason);
     std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
-    std::pair<bool, std::string> SendNotification(int ID, const std::string& Message, const std::string& Icon, const std::string& Category);
     std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);
     void Set(int ConfigID, sol::object NewValue);
-    TLuaValue Get(int ConfigID);
     bool IsPlayerGuest(int ID);
     bool IsPlayerConnected(int ID);
     void Sleep(size_t Ms);

include/RWMutex.h

@@ -23,8 +23,8 @@
  * and write locks and read locks are mutually exclusive.
  */
 
-#include <mutex>
 #include <shared_mutex>
+#include <mutex>
 
 // Use ReadLock(m) and WriteLock(m) to lock it.
 using RWMutex = std::shared_mutex;

include/RateLimiter.h

@@ -0,0 +1,20 @@
+#include "Common.h"
+#include <chrono>
+#include <fstream>
+#include <iostream>
+#include <mutex>
+#include <unordered_map>
+#include <unordered_set>
+
+class RateLimiter {
+public:
+    RateLimiter();
+    bool isConnectionAllowed(const std::string& client_address);
+
+private:
+    std::unordered_map<std::string, std::vector<std::chrono::time_point<std::chrono::high_resolution_clock>>> m_connection;
+    std::mutex m_connection_mutex;
+
+    void blockIP(const std::string& client_address);
+    bool isIPBlocked(const std::string& client_address);
+};

include/Settings.h

@@ -1,144 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-#pragma once
-#include "Sync.h"
-#include <concepts>
-#include <cstdint>
-#include <doctest/doctest.h>
-#include <fmt/core.h>
-#include <fmt/format.h>
-#include <stdexcept>
-#include <string>
-#include <unordered_map>
-#include <variant>
-
-struct ComposedKey {
-    std::string Category;
-    std::string Key;
-
-    bool operator==(const ComposedKey& rhs) const {
-        return (this->Category == rhs.Category && this->Key == rhs.Key);
-    }
-};
-
-template <>
-struct fmt::formatter<ComposedKey> : formatter<std::string> {
-    auto format(ComposedKey key, format_context& ctx) const;
-};
-
-inline auto fmt::formatter<ComposedKey>::format(ComposedKey key, fmt::format_context& ctx) const {
-    std::string key_metadata = fmt::format("{}::{}", key.Category, key.Key);
-    return formatter<std::string>::format(key_metadata, ctx);
-}
-
-namespace std {
-template <>
-class hash<ComposedKey> {
-public:
-    std::uint64_t operator()(const ComposedKey& key) const {
-        std::hash<std::string> hash_fn;
-        return hash_fn(key.Category + key.Key);
-    }
-};
-}
-
-struct Settings {
-    using SettingsTypeVariant = std::variant<std::string, bool, int>;
-
-    Settings();
-
-    enum Key {
-        // Keys that correspond to the keys set in TOML
-        // Keys have their TOML section name as prefix
-
-        // [Misc]
-        Misc_SendErrorsShowMessage,
-        Misc_SendErrors,
-        Misc_ImScaredOfUpdates,
-        Misc_UpdateReminderTime,
-
-        // [General]
-        General_Description,
-        General_Tags,
-        General_MaxPlayers,
-        General_Name,
-        General_Map,
-        General_AuthKey,
-        General_Private,
-        General_Port,
-        General_MaxCars,
-        General_LogChat,
-        General_ResourceFolder,
-        General_Debug,
-        General_AllowGuests
-    };
-
-    Sync<std::unordered_map<Key, SettingsTypeVariant>> SettingsMap;
-    enum SettingsAccessMask {
-        READ_ONLY, // Value can be read from console
-        READ_WRITE, // Value can be read and written to from console
-        NO_ACCESS // Value is inaccessible from console (no read OR write)
-    };
-
-    using SettingsAccessControl = std::pair<
-        Key, // The Key's corresponding enum encoding
-        SettingsAccessMask // Console read/write permissions
-        >;
-
-    Sync<std::unordered_map<ComposedKey, SettingsAccessControl>> InputAccessMapping;
-    std::string getAsString(Key key);
-
-    int getAsInt(Key key);
-
-    bool getAsBool(Key key);
-
-    SettingsTypeVariant get(Key key);
-
-    void set(Key key, const std::string& value);
-
-    template <typename Integer, std::enable_if_t<std::is_same_v<Integer, int>, bool> = true>
-    void set(Key key, Integer value) {
-        auto map = SettingsMap.synchronize();
-        if (!map->contains(key)) {
-            throw std::logic_error { "Undefined setting key accessed in Settings::set(int)" };
-        }
-        if (!std::holds_alternative<int>(map->at(key))) {
-            throw std::logic_error { fmt::format("Wrong value type in Settings::set(int): index {}", map->at(key).index()) };
-        }
-        map->at(key) = value;
-    }
-    template <typename Boolean, std::enable_if_t<std::is_same_v<bool, Boolean>, bool> = true>
-    void set(Key key, Boolean value) {
-        auto map = SettingsMap.synchronize();
-        if (!map->contains(key)) {
-            throw std::logic_error { "Undefined setting key accessed in Settings::set(bool)" };
-        }
-        if (!std::holds_alternative<bool>(map->at(key))) {
-            throw std::logic_error { fmt::format("Wrong value type in Settings::set(bool): index {}", map->at(key).index()) };
-        }
-        map->at(key) = value;
-    }
-
-    const std::unordered_map<ComposedKey, SettingsAccessControl> getAccessControlMap() const;
-    SettingsAccessControl getConsoleInputAccessMapping(const ComposedKey& keyName);
-
-    void setConsoleInputAccessMapping(const ComposedKey& keyName, const std::string& value);
-    void setConsoleInputAccessMapping(const ComposedKey& keyName, int value);
-    void setConsoleInputAccessMapping(const ComposedKey& keyName, bool value);
-};

include/Sync.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <boost/thread/synchronized_value.hpp>
-#include <mutex>
-
-/// This header provides convenience aliases for synchronization primitives.
-
-template <typename T>
-using Sync = boost::synchronized_value<T, std::recursive_mutex>;

include/TConfig.h

@@ -19,7 +19,6 @@
 #pragma once
 
 #include "Common.h"
-#include "Settings.h"
 
 #include <atomic>
 #include <filesystem>
@@ -41,7 +40,9 @@ public:
 private:
     void CreateConfigFile();
     void ParseFromFile(std::string_view name);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, Settings::Key key);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue);
 
     void ParseOldFormat();
     std::string TagsAsPrettyArray() const;

include/TLuaEngine.h

@@ -167,7 +167,7 @@ public:
     void ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results);
     bool HasState(TLuaStateId StateId);
     [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName);
+    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args);
     void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);
     void RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName);
     /**
@@ -192,9 +192,7 @@ public:
         for (const auto& Event : mLuaEvents.at(EventName)) {
             for (const auto& Function : Event.second) {
                 if (Event.first != IgnoreId) {
-                    auto Result = EnqueueFunctionCall(Event.first, Function, Arguments, EventName);
-                    Results.push_back(Result);
-                    AddResultToCheck(Result);
+                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments));
                 }
             }
         }
@@ -211,7 +209,7 @@ public:
         std::vector<TLuaValue> Arguments { TLuaValue { std::forward<ArgsT>(Args) }... };
         const auto Handlers = GetEventHandlersForState(EventName, StateId);
         for (const auto& Handler : Handlers) {
-            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments, EventName));
+            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments));
         }
         return Results;
     }
@@ -245,7 +243,7 @@ private:
         StateThreadData(const StateThreadData&) = delete;
         virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName);
+        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args);
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy);
         void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
         void AddPath(const fs::path& Path); // to be added to path and cpath
@@ -263,7 +261,6 @@ private:
         sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
         sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
         sol::table Lua_GetPlayerIdentifiers(int ID);
-        std::variant<std::string, sol::nil_t> Lua_GetPlayerRole(int ID);
         sol::table Lua_GetPlayers();
         std::string Lua_GetPlayerName(int ID);
         sol::table Lua_GetPlayerVehicles(int ID);

include/TNetwork.h

@@ -48,7 +48,6 @@ public:
 private:
     void UDPServerMain();
     void TCPServerMain();
-
     TServer& mServer;
     TPPSMonitor& mPPSMonitor;
     ip::udp::socket mUDPSock;
@@ -58,6 +57,7 @@ private:
     std::mutex mOpenIDMutex;
 
     std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
+    void HandleDownload(TConnection&& TCPSock);
     void OnConnect(const std::weak_ptr<TClient>& c);
     void TCPClient(const std::weak_ptr<TClient>& c);
     void Looper(const std::weak_ptr<TClient>& c);
@@ -66,7 +66,7 @@ private:
     void Parse(TClient& c, const std::vector<uint8_t>& Packet);
     void SendFile(TClient& c, const std::string& Name);
     static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
-    static void SendFileToClient(TClient& c, size_t Size, const std::string& Name);
+    static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
     static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };
 

include/TPPSMonitor.h

@@ -27,7 +27,7 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
     explicit TPPSMonitor(TServer& Server);
-    virtual ~TPPSMonitor() { }
+    virtual ~TPPSMonitor() {}
 
     void operator()() override;
 

include/TResourceManager.h

@@ -19,7 +19,6 @@
 #pragma once
 
 #include "Common.h"
-#include <nlohmann/json.hpp>
 
 class TResourceManager {
 public:
@@ -31,17 +30,10 @@ public:
     [[nodiscard]] std::string FileSizes() const { return mFileSizes; }
     [[nodiscard]] int ModsLoaded() const { return mModsLoaded; }
 
-    [[nodiscard]] std::string NewFileList() const;
-
-    void RefreshFiles();
-
 private:
     size_t mMaxModSize = 0;
     std::string mFileSizes;
     std::string mFileList;
     std::string mTrimmedList;
     int mModsLoaded = 0;
-
-    std::mutex mModsMutex;
-    nlohmann::json mMods;
 };

src/ChronoWrapper.cpp

@@ -2,21 +2,25 @@
 #include "Common.h"
 #include <regex>
 
-std::chrono::high_resolution_clock::duration ChronoWrapper::TimeFromStringWithLiteral(const std::string& time_str) {
+std::chrono::high_resolution_clock::duration ChronoWrapper::TimeFromStringWithLiteral(const std::string& time_str)
+{
     // const std::regex time_regex(R"((\d+\.{0,1}\d*)(min|ms|us|ns|[dhs]))"); //i.e one of: "25ns, 6us, 256ms, 2s, 13min, 69h, 356d" will get matched (only available in newer C++ versions)
-    const std::regex time_regex(R"((\d+\.{0,1}\d*)(min|[dhs]))"); // i.e one of: "2.01s, 13min, 69h, 356.69d" will get matched
+    const std::regex time_regex(R"((\d+\.{0,1}\d*)(min|[dhs]))"); //i.e one of: "2.01s, 13min, 69h, 356.69d" will get matched
     std::smatch match;
     float time_value;
-    if (!std::regex_search(time_str, match, time_regex))
-        return std::chrono::nanoseconds(0);
+    if (!std::regex_search(time_str, match, time_regex)) return std::chrono::nanoseconds(0);
     time_value = stof(match.str(1));
+    beammp_debugf("Parsed time was: {}{}", time_value, match.str(2));
     if (match.str(2) == "d") {
-        return std::chrono::seconds((uint64_t)(time_value * 86400)); // 86400 seconds in a day
-    } else if (match.str(2) == "h") {
-        return std::chrono::seconds((uint64_t)(time_value * 3600)); // 3600 seconds in an hour
-    } else if (match.str(2) == "min") {
+        return std::chrono::seconds((uint64_t)(time_value * 86400)); //86400 seconds in a day
+    }
+    else if (match.str(2) == "h") {
+        return std::chrono::seconds((uint64_t)(time_value * 3600)); //3600 seconds in an hour
+    }
+    else if (match.str(2) == "min") {
         return std::chrono::seconds((uint64_t)(time_value * 60));
-    } else if (match.str(2) == "s") {
+    }
+    else if (match.str(2) == "s") {
         return std::chrono::seconds((uint64_t)time_value);
     }
     return std::chrono::nanoseconds(0);

src/Client.cpp

@@ -144,6 +144,7 @@ void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
 TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
     : mServer(Server)
     , mSocket(std::move(Socket))
+    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
     , mLastPingTime(std::chrono::high_resolution_clock::now()) {
 }
 

src/Common.cpp

@@ -22,19 +22,20 @@
 #include "TConsole.h"
 #include <array>
 #include <charconv>
-#include <chrono>
 #include <fmt/core.h>
-#include <fstream>
 #include <iostream>
 #include <map>
 #include <regex>
 #include <sstream>
 #include <thread>
+#include <chrono>
 
 #include "Compat.h"
 #include "CustomAssert.h"
 #include "Http.h"
 
+Application::TSettings Application::Settings = {};
+
 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
     std::unique_lock Lock(mShutdownHandlersMutex);
     if (Handler) {
@@ -256,7 +257,7 @@ static std::mutex ThreadNameMapMutex {};
 
 std::string ThreadName(bool DebugModeOverride) {
     auto Lock = std::unique_lock(ThreadNameMapMutex);
-    if (DebugModeOverride || Application::Settings.getAsBool(Settings::Key::General_Debug)) {
+    if (DebugModeOverride || Application::Settings.DebugModeEnabled) {
         auto id = std::this_thread::get_id();
         if (threadNameMap.find(id) != threadNameMap.end()) {
             // found
@@ -268,21 +269,21 @@ std::string ThreadName(bool DebugModeOverride) {
 
 TEST_CASE("ThreadName") {
     RegisterThread("MyThread");
-    auto OrigDebug = Application::Settings.getAsBool(Settings::Key::General_Debug);
+    auto OrigDebug = Application::Settings.DebugModeEnabled;
 
     // ThreadName adds a space at the end, legacy but we need it still
     SUBCASE("Debug mode enabled") {
-        Application::Settings.set(Settings::Key::General_Debug, true);
+        Application::Settings.DebugModeEnabled = true;
         CHECK(ThreadName(true) == "MyThread ");
         CHECK(ThreadName(false) == "MyThread ");
     }
     SUBCASE("Debug mode disabled") {
-        Application::Settings.set(Settings::Key::General_Debug, false);
+        Application::Settings.DebugModeEnabled = false;
         CHECK(ThreadName(true) == "MyThread ");
         CHECK(ThreadName(false) == "");
     }
     // cleanup
-    Application::Settings.set(Settings::Key::General_Debug, OrigDebug);
+    Application::Settings.DebugModeEnabled = OrigDebug;
 }
 
 void RegisterThread(const std::string& str) {
@@ -296,7 +297,7 @@ void RegisterThread(const std::string& str) {
 #elif defined(BEAMMP_FREEBSD)
     ThreadId = std::to_string(getpid());
 #endif
-    if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {
+    if (Application::Settings.DebugModeEnabled) {
         std::ofstream ThreadFile(".Threads.log", std::ios::app);
         ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
     }
@@ -329,7 +330,7 @@ TEST_CASE("Version::AsString") {
 }
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    if (Application::Settings.getAsBool(Settings::Key::General_LogChat)) {
+    if (Application::Settings.LogChat) {
         std::stringstream ss;
         ss << ThreadName();
         ss << "[CHAT] ";
@@ -384,67 +385,4 @@ void SplitString(const std::string& str, const char delim, std::vector<std::stri
         out.push_back(str.substr(start, end - start));
     }
 }
-static constexpr size_t STARTING_MAX_DECOMPRESSION_BUFFER_SIZE = 15 * 1024 * 1024;
-static constexpr size_t MAX_DECOMPRESSION_BUFFER_SIZE = 30 * 1024 * 1024;
 
-std::vector<uint8_t> DeComp(std::span<const uint8_t> input) {
-    beammp_debugf("got {} bytes of input data", input.size());
-
-    // start with a decompression buffer of 5x the input size, clamped to a maximum of 15 MB.
-    // this buffer can and will grow, but we don't want to start it too large. A 5x compression ratio
-    // is pretty optimistic.
-    std::vector<uint8_t> output_buffer(std::min<size_t>(input.size() * 5, STARTING_MAX_DECOMPRESSION_BUFFER_SIZE));
-
-    uLongf output_size = output_buffer.size();
-
-    while (true) {
-        int res = uncompress(
-            reinterpret_cast<Bytef*>(output_buffer.data()),
-            &output_size,
-            reinterpret_cast<const Bytef*>(input.data()),
-            static_cast<uLongf>(input.size()));
-        if (res == Z_BUF_ERROR) {
-            // We assume that a reasonable maximum size for decompressed packets exists. We want to avoid
-            // a client effectively "zip bombing" us by sending a lot of small packets which decompress
-            // into huge data.
-            // If this limit were to be an issue, this could be made configurable, however clients have a similar
-            // limit. For that reason, we just reject packets which decompress into too much data.
-            if (output_buffer.size() >= MAX_DECOMPRESSION_BUFFER_SIZE) {
-                throw std::runtime_error(fmt::format("decompressed packet size of {} bytes exceeded", MAX_DECOMPRESSION_BUFFER_SIZE));
-            }
-            // if decompression fails, we double the buffer size (up to the allowed limit) and try again
-            output_buffer.resize(std::max<size_t>(output_buffer.size() * 2, MAX_DECOMPRESSION_BUFFER_SIZE));
-            beammp_warnf("zlib uncompress() failed, trying with a larger buffer size of {}", output_buffer.size());
-            output_size = output_buffer.size();
-        } else if (res != Z_OK) {
-            beammp_error("zlib uncompress() failed: " + std::to_string(res));
-            if (res == Z_DATA_ERROR) {
-                throw InvalidDataError {};
-            } else {
-                throw std::runtime_error("zlib uncompress() failed");
-            }
-        } else if (res == Z_OK) {
-            break;
-        }
-    }
-    output_buffer.resize(output_size);
-    return output_buffer;
-}
-
-std::vector<uint8_t> Comp(std::span<const uint8_t> input) {
-    auto max_size = compressBound(input.size());
-    std::vector<uint8_t> output(max_size);
-    uLongf output_size = output.size();
-    int res = compress(
-        reinterpret_cast<Bytef*>(output.data()),
-        &output_size,
-        reinterpret_cast<const Bytef*>(input.data()),
-        static_cast<uLongf>(input.size()));
-    if (res != Z_OK) {
-        beammp_error("zlib compress() failed: " + std::to_string(res));
-        throw std::runtime_error("zlib compress() failed");
-    }
-    beammp_debug("zlib compressed " + std::to_string(input.size()) + " B to " + std::to_string(output_size) + " B");
-    output.resize(output_size);
-    return output;
-}

src/Compat.cpp

@@ -61,7 +61,7 @@ TEST_CASE("init and reset termios") {
         CHECK_EQ(current.c_lflag, original.c_lflag);
 #ifndef BEAMMP_FREEBSD // The 'c_line' attribute seems to only exist on Linux, so we need to omit it on other platforms
         CHECK_EQ(current.c_line, original.c_line);
-#endif
+#endif 
         CHECK_EQ(current.c_oflag, original.c_oflag);
         CHECK_EQ(current.c_ospeed, original.c_ospeed);
     }

src/Http.cpp

@@ -30,8 +30,8 @@
 
 using json = nlohmann::json;
 struct Connection {
-    std::string host {};
-    int port {};
+    std::string host{};
+    int port{};
     Connection() = default;
     Connection(std::string host, int port)
         : host(host)
@@ -54,13 +54,13 @@ static thread_local std::array<std::shared_ptr<httplib::SSLClient>, CONNECTION_A
     write_index++;
     write_index %= CONNECTION_AMOUNT;
     clients[i] = std::make_shared<httplib::SSLClient>(connectionInfo.host, connectionInfo.port);
-    connections[i] = { connectionInfo.host, connectionInfo.port };
+    connections[i] = {connectionInfo.host, connectionInfo.port};
     beammp_tracef("New client connected, with ip {} and port {}", connectionInfo.host, connectionInfo.port);
     return clients[i];
 }
 
 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
-    std::shared_ptr<httplib::SSLClient> client = getClient({ host, port });
+    std::shared_ptr<httplib::SSLClient> client = getClient({host, port});
     client->enable_server_certificate_verification(false);
     client->set_address_family(AF_INET);
     auto res = client->Get(target.c_str());
@@ -75,7 +75,7 @@ std::string Http::GET(const std::string& host, int port, const std::string& targ
 }
 
 std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
-    std::shared_ptr<httplib::SSLClient> client = getClient({ host, port });
+    std::shared_ptr<httplib::SSLClient> client = getClient({host, port});
     client->set_read_timeout(std::chrono::seconds(10));
     beammp_assert(client->is_valid());
     client->enable_server_certificate_verification(false);
@@ -199,6 +199,7 @@ Http::Server::THttpServerInstance::THttpServerInstance() {
 }
 
 void Http::Server::THttpServerInstance::operator()() try {
+    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
     std::unique_ptr<httplib::Server> HttpLibServerInstance;
     HttpLibServerInstance = std::make_unique<httplib::Server>();
     // todo: make this IP agnostic so people can set their own IP
@@ -240,6 +241,10 @@ void Http::Server::THttpServerInstance::operator()() try {
         beammp_debug("Http Server: " + Req.method + " " + Req.target + " -> " + std::to_string(Res.status));
     });
     Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
+    auto ret = HttpLibServerInstance->listen(Application::Settings.HTTPServerIP.c_str(), Application::Settings.HTTPServerPort);
+    if (!ret) {
+        beammp_error("Failed to start http server (failed to listen). Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it.");
+    }
 } catch (const std::exception& e) {
     beammp_error("Failed to start http server. Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it. Error: " + std::string(e.what()));
 }

src/LuaAPI.cpp

@@ -20,7 +20,6 @@
 #include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
-#include "Settings.h"
 #include "TLuaEngine.h"
 
 #include <nlohmann/json.hpp>
@@ -205,37 +204,6 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
     return Result;
 }
 
-std::pair<bool, std::string> LuaAPI::MP::SendNotification(int ID, const std::string& Message, const std::string& Icon, const std::string& Category) {
-    std::pair<bool, std::string> Result;
-    std::string Packet = "N" + Category + ":" + Icon + ":" + Message;
-    if (ID == -1) {
-        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
-        Result.first = true;
-    } else {
-        auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient) {
-            auto c = MaybeClient.value().lock();
-            if (!c->IsSynced()) {
-                Result.first = false;
-                Result.second = "Player is not synced yet";
-                return Result;
-            }
-            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
-                beammp_errorf("Failed to send notification to player (id {}) - did the player disconnect?", ID);
-                Result.first = false;
-                Result.second = "Failed to send packet";
-            }
-            Result.first = true;
-        } else {
-            beammp_lua_error("SendNotification invalid argument [1] invalid ID");
-            Result.first = false;
-            Result.second = "Invalid Player ID";
-        }
-        return Result;
-    }
-    return Result;
-}
-
 std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
     std::pair<bool, std::string> Result;
     auto MaybeClient = GetClient(Engine->Server(), PID);
@@ -248,7 +216,6 @@ std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
     auto c = MaybeClient.value().lock();
     if (!c->GetCarData(VID).empty()) {
         std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
-        LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", PID, VID));
         Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
         c->DeleteCar(VID);
         Result.first = true;
@@ -263,56 +230,56 @@ void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
     switch (ConfigID) {
     case 0: // debug
         if (NewValue.is<bool>()) {
-            Application::Settings.set(Settings::Key::General_Debug, NewValue.as<bool>());
-            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.getAsBool(Settings::Key::General_Debug) ? "true" : "false"));
+            Application::Settings.DebugModeEnabled = NewValue.as<bool>();
+            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
         } else {
             beammp_lua_error("set invalid argument [2] expected boolean");
         }
         break;
     case 1: // private
         if (NewValue.is<bool>()) {
-            Application::Settings.set(Settings::Key::General_Private, NewValue.as<bool>());
-            beammp_info(std::string("Set `Private` to ") + (Application::Settings.getAsBool(Settings::Key::General_Private) ? "true" : "false"));
+            Application::Settings.Private = NewValue.as<bool>();
+            beammp_info(std::string("Set `Private` to ") + (Application::Settings.Private ? "true" : "false"));
         } else {
             beammp_lua_error("set invalid argument [2] expected boolean");
         }
         break;
     case 2: // max cars
         if (NewValue.is<int>()) {
-            Application::Settings.set(Settings::Key::General_MaxCars, NewValue.as<int>());
-            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxCars)));
+            Application::Settings.MaxCars = NewValue.as<int>();
+            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.MaxCars));
         } else {
             beammp_lua_error("set invalid argument [2] expected integer");
         }
         break;
     case 3: // max players
         if (NewValue.is<int>()) {
-            Application::Settings.set(Settings::Key::General_MaxPlayers, NewValue.as<int>());
-            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)));
+            Application::Settings.MaxPlayers = NewValue.as<int>();
+            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.MaxPlayers));
         } else {
             beammp_lua_error("set invalid argument [2] expected integer");
         }
         break;
     case 4: // Map
         if (NewValue.is<std::string>()) {
-            Application::Settings.set(Settings::Key::General_Map, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Map` to ") + Application::Settings.getAsString(Settings::Key::General_Map));
+            Application::Settings.MapName = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Map` to ") + Application::Settings.MapName);
         } else {
             beammp_lua_error("set invalid argument [2] expected string");
         }
         break;
     case 5: // Name
         if (NewValue.is<std::string>()) {
-            Application::Settings.set(Settings::Key::General_Name, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Name` to ") + Application::Settings.getAsString(Settings::Key::General_Name));
+            Application::Settings.ServerName = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Name` to ") + Application::Settings.ServerName);
         } else {
             beammp_lua_error("set invalid argument [2] expected string");
         }
         break;
     case 6: // Desc
         if (NewValue.is<std::string>()) {
-            Application::Settings.set(Settings::Key::General_Description, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Description` to ") + Application::Settings.getAsString(Settings::Key::General_Description));
+            Application::Settings.ServerDesc = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Description` to ") + Application::Settings.ServerDesc);
         } else {
             beammp_lua_error("set invalid argument [2] expected string");
         }
@@ -323,28 +290,6 @@ void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
     }
 }
 
-TLuaValue LuaAPI::MP::Get(int ConfigID) {
-    switch (ConfigID) {
-    case 0: // debug
-        return Application::Settings.getAsBool(Settings::Key::General_Debug);
-    case 1: // private
-        return Application::Settings.getAsBool(Settings::Key::General_Private);
-    case 2: // max cars
-        return Application::Settings.getAsInt(Settings::Key::General_MaxCars);
-    case 3: // max players
-        return Application::Settings.getAsInt(Settings::Key::General_MaxPlayers);
-    case 4: // Map
-        return Application::Settings.getAsString(Settings::Key::General_Map);
-    case 5: // Name
-        return Application::Settings.getAsString(Settings::Key::General_Name);
-    case 6: // Desc
-        return Application::Settings.getAsString(Settings::Key::General_Description);
-    default:
-        beammp_warn("Invalid config ID \"" + std::to_string(ConfigID) + "\". Use `MP.Settings.*` enum for this.");
-        return 0;
-    }
-}
-
 void LuaAPI::MP::Sleep(size_t Ms) {
     std::this_thread::sleep_for(std::chrono::milliseconds(Ms));
 }
@@ -352,7 +297,7 @@ void LuaAPI::MP::Sleep(size_t Ms) {
 bool LuaAPI::MP::IsPlayerConnected(int ID) {
     auto MaybeClient = GetClient(Engine->Server(), ID);
     if (MaybeClient && !MaybeClient.value().expired()) {
-        return MaybeClient.value().lock()->IsUDPConnected();
+        return MaybeClient.value().lock()->IsConnected();
     } else {
         return false;
     }

src/Profiling.cpp

@@ -57,3 +57,4 @@ size_t prof::UnitExecutionTime::measurement_count() const {
     std::unique_lock lock(m_mtx);
     return m_total_calls;
 }
+

src/RateLimiter.cpp

@@ -0,0 +1,50 @@
+#include "RateLimiter.h"
+
+RateLimiter::RateLimiter() {};
+
+bool RateLimiter::isConnectionAllowed(const std::string& client_address) {
+    if (RateLimiter::isIPBlocked(client_address)) {
+        return false;
+    }
+    std::lock_guard<std::mutex> lock(m_connection_mutex);
+    auto current_time = std::chrono::high_resolution_clock::now();
+    auto& violations = m_connection[client_address];
+
+    // Deleting old violations (older than 5 seconds)
+    violations.erase(std::remove_if(violations.begin(), violations.end(),
+                         [&](const auto& timestamp) {
+                             return std::chrono::duration_cast<std::chrono::seconds>(current_time - timestamp).count() > 5;
+                         }),
+        violations.end());
+
+    violations.push_back(current_time);
+
+    if (violations.size() >= 4) {
+        RateLimiter::blockIP(client_address);
+        beammp_errorf("[DoS Protection] Client with the IP: {} surpassed the violation treshhold and is now on the blocked list", client_address);
+        return false;
+    }
+
+    return true; // We allow the connection
+}
+
+void RateLimiter::blockIP(const std::string& client_address) {
+    std::ofstream block_file("blocked_ips.txt", std::ios::app);
+    if (block_file.is_open()) {
+        block_file << client_address << std::endl;
+    }
+}
+
+bool RateLimiter::isIPBlocked(const std::string& client_address) {
+    std::ifstream block_file("blocked_ips.txt");
+    std::unordered_set<std::string> blockedIPs;
+
+    if (block_file.is_open()) {
+        std::string line;
+        while (std::getline(block_file, line)) {
+            blockedIPs.insert(line);
+        }
+    }
+
+    return blockedIPs.contains(client_address);
+};

src/Settings.cpp

@@ -1,191 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-#include "Settings.h"
-
-Settings::Settings() {
-    SettingsMap = std::unordered_map<Key, SettingsTypeVariant> {
-        // All entries which contain std::strings must be explicitly constructed, otherwise they become 'bool'
-        { General_Description, std::string("BeamMP Default Description") },
-        { General_Tags, std::string("Freeroam") },
-        { General_MaxPlayers, 8 },
-        { General_Name, std::string("BeamMP Server") },
-        { General_Map, std::string("/levels/gridmap_v2/info.json") },
-        { General_AuthKey, std::string("") },
-        { General_Private, true },
-        { General_Port, 30814 },
-        { General_MaxCars, 1 },
-        { General_LogChat, true },
-        { General_ResourceFolder, std::string("Resources") },
-        { General_Debug, false },
-        { General_AllowGuests, true },
-        { Misc_SendErrorsShowMessage, true },
-        { Misc_SendErrors, true },
-        { Misc_ImScaredOfUpdates, true },
-        { Misc_UpdateReminderTime, "30s" }
-    };
-
-    InputAccessMapping = std::unordered_map<ComposedKey, SettingsAccessControl> {
-        { { "General", "Description" }, { General_Description, READ_WRITE } },
-        { { "General", "Tags" }, { General_Tags, READ_WRITE } },
-        { { "General", "MaxPlayers" }, { General_MaxPlayers, READ_WRITE } },
-        { { "General", "Name" }, { General_Name, READ_WRITE } },
-        { { "General", "Map" }, { General_Map, READ_WRITE } },
-        { { "General", "AuthKey" }, { General_AuthKey, NO_ACCESS } },
-        { { "General", "Private" }, { General_Private, READ_ONLY } },
-        { { "General", "Port" }, { General_Port, READ_ONLY } },
-        { { "General", "MaxCars" }, { General_MaxCars, READ_WRITE } },
-        { { "General", "LogChat" }, { General_LogChat, READ_ONLY } },
-        { { "General", "ResourceFolder" }, { General_ResourceFolder, READ_ONLY } },
-        { { "General", "Debug" }, { General_Debug, READ_WRITE } },
-        { { "General", "AllowGuests" }, { General_AllowGuests, READ_WRITE } },
-        { { "Misc", "SendErrorsShowMessage" }, { Misc_SendErrorsShowMessage, READ_WRITE } },
-        { { "Misc", "SendErrors" }, { Misc_SendErrors, READ_WRITE } },
-        { { "Misc", "ImScaredOfUpdates" }, { Misc_ImScaredOfUpdates, READ_WRITE } },
-        { { "Misc", "UpdateReminderTime" }, { Misc_UpdateReminderTime, READ_WRITE } }
-    };
-}
-
-std::string Settings::getAsString(Key key) {
-    auto map = SettingsMap.synchronize();
-    if (!map->contains(key)) {
-        throw std::logic_error { "Undefined key accessed in Settings::getAsString" };
-    }
-    return std::get<std::string>(map->at(key));
-}
-int Settings::getAsInt(Key key) {
-    auto map = SettingsMap.synchronize();
-    if (!map->contains(key)) {
-        throw std::logic_error { "Undefined key accessed in Settings::getAsInt" };
-    }
-    return std::get<int>(map->at(key));
-}
-
-bool Settings::getAsBool(Key key) {
-    auto map = SettingsMap.synchronize();
-    if (!map->contains(key)) {
-        throw std::logic_error { "Undefined key accessed in Settings::getAsBool" };
-    }
-    return std::get<bool>(map->at(key));
-}
-
-Settings::SettingsTypeVariant Settings::get(Key key) {
-    auto map = SettingsMap.synchronize();
-    if (!map->contains(key)) {
-        throw std::logic_error { "Undefined setting key accessed in Settings::get" };
-    }
-    return map->at(key);
-}
-
-void Settings::set(Key key, const std::string& value) {
-    auto map = SettingsMap.synchronize();
-    if (!map->contains(key)) {
-        throw std::logic_error { "Undefined setting key accessed in Settings::set(std::string)" };
-    }
-    if (!std::holds_alternative<std::string>(map->at(key))) {
-        throw std::logic_error { fmt::format("Wrong value type in Settings::set(std::string): index {}", map->at(key).index()) };
-    }
-    map->at(key) = value;
-}
-
-const std::unordered_map<ComposedKey, Settings::SettingsAccessControl> Settings::getAccessControlMap() const {
-    return *InputAccessMapping;
-}
-
-Settings::SettingsAccessControl Settings::getConsoleInputAccessMapping(const ComposedKey& keyName) {
-    auto acl_map = InputAccessMapping.synchronize();
-    if (!acl_map->contains(keyName)) {
-        throw std::logic_error { "Unknown key name accessed in Settings::getConsoleInputAccessMapping" };
-    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
-        throw std::logic_error { "Setting '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
-    }
-    return acl_map->at(keyName);
-}
-
-void Settings::setConsoleInputAccessMapping(const ComposedKey& keyName, const std::string& value) {
-    auto [map, acl_map] = boost::synchronize(SettingsMap, InputAccessMapping);
-    if (!acl_map->contains(keyName)) {
-        throw std::logic_error { "Unknown key name accessed in Settings::setConsoleInputAccessMapping" };
-    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
-        throw std::logic_error { "Setting '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
-    } else if (acl_map->at(keyName).second == SettingsAccessMask::READ_ONLY) {
-        throw std::logic_error { "Setting '" + keyName.Category + "::" + keyName.Key + "' is not writeable from within the runtime!" };
-    }
-
-    Key key = acl_map->at(keyName).first;
-
-    if (!std::holds_alternative<std::string>(map->at(key))) {
-        throw std::logic_error { "Wrong value type in Settings::setConsoleInputAccessMapping: expected std::string" };
-    }
-
-    map->at(key) = value;
-}
-
-void Settings::setConsoleInputAccessMapping(const ComposedKey& keyName, int value) {
-    auto [map, acl_map] = boost::synchronize(SettingsMap, InputAccessMapping);
-    if (!acl_map->contains(keyName)) {
-        throw std::logic_error { "Unknown key name accessed in Settings::setConsoleInputAccessMapping" };
-    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
-        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
-    } else if (acl_map->at(keyName).second == SettingsAccessMask::READ_ONLY) {
-        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not writeable from within the runtime!" };
-    }
-
-    Key key = acl_map->at(keyName).first;
-
-    if (!std::holds_alternative<int>(map->at(key))) {
-        throw std::logic_error { "Wrong value type in Settings::setConsoleInputAccessMapping: expected int" };
-    }
-
-    map->at(key) = value;
-}
-
-void Settings::setConsoleInputAccessMapping(const ComposedKey& keyName, bool value) {
-    auto [map, acl_map] = boost::synchronize(SettingsMap, InputAccessMapping);
-    if (!acl_map->contains(keyName)) {
-        throw std::logic_error { "Unknown key name accessed in Settings::setConsoleInputAccessMapping" };
-    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
-        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
-    } else if (acl_map->at(keyName).second == SettingsAccessMask::READ_ONLY) {
-        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not writeable from within the runtime!" };
-    }
-
-    Key key = acl_map->at(keyName).first;
-
-    if (!std::holds_alternative<bool>(map->at(key))) {
-        throw std::logic_error { "Wrong value type in Settings::setConsoleInputAccessMapping: expected bool" };
-    }
-
-    map->at(key) = value;
-}
-
-TEST_CASE("settings get/set") {
-    Settings settings;
-    settings.set(Settings::General_Name, "hello, world");
-    CHECK_EQ(settings.getAsString(Settings::General_Name), "hello, world");
-    settings.set(Settings::General_Name, std::string("hello, world"));
-    CHECK_EQ(settings.getAsString(Settings::General_Name), "hello, world");
-    settings.set(Settings::General_MaxPlayers, 12);
-    CHECK_EQ(settings.getAsInt(Settings::General_MaxPlayers), 12);
-}
-
-TEST_CASE("settings check for exception on wrong input type") {
-    Settings settings;
-    CHECK_THROWS(settings.set(Settings::General_Debug, "hello, world"));
-    CHECK_NOTHROW(settings.set(Settings::General_Debug, false));
-}

src/TConfig.cpp

@@ -19,15 +19,12 @@
 #include "Common.h"
 
 #include "Env.h"
-#include "Settings.h"
 #include "TConfig.h"
 #include <cstdlib>
-#include <exception>
 #include <fstream>
 #include <iostream>
 #include <istream>
 #include <sstream>
-#include <type_traits>
 
 // General
 static constexpr std::string_view StrDebug = "Debug";
@@ -126,39 +123,39 @@ void SetComment(CommentsT& Comments, const std::string& Comment) {
 void TConfig::FlushToFile() {
     // auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
     auto data = toml::value {};
-    data["General"][StrAuthKey.data()] = Application::Settings.getAsString(Settings::Key::General_AuthKey);
+    data["General"][StrAuthKey.data()] = Application::Settings.Key;
     SetComment(data["General"][StrAuthKey.data()].comments(), " AuthKey has to be filled out in order to run the server");
-    data["General"][StrLogChat.data()] = Application::Settings.getAsBool(Settings::Key::General_LogChat);
+    data["General"][StrLogChat.data()] = Application::Settings.LogChat;
     SetComment(data["General"][StrLogChat.data()].comments(), " Whether to log chat messages in the console / log");
-    data["General"][StrDebug.data()] = Application::Settings.getAsBool(Settings::Key::General_Debug);
-    data["General"][StrPrivate.data()] = Application::Settings.getAsBool(Settings::Key::General_Private);
-    data["General"][StrAllowGuests.data()] = Application::Settings.getAsBool(Settings::Key::General_AllowGuests);
+    data["General"][StrAllowGuests.data()] = Application::Settings.AllowGuests;
     SetComment(data["General"][StrAllowGuests.data()].comments(), " Whether to allow guests");
-    data["General"][StrPort.data()] = Application::Settings.getAsInt(Settings::Key::General_Port);
-    data["General"][StrName.data()] = Application::Settings.getAsString(Settings::Key::General_Name);
+    data["General"][StrDebug.data()] = Application::Settings.DebugModeEnabled;
+    data["General"][StrPrivate.data()] = Application::Settings.Private;
+    data["General"][StrPort.data()] = Application::Settings.Port;
+    data["General"][StrName.data()] = Application::Settings.ServerName;
     SetComment(data["General"][StrTags.data()].comments(), " Add custom identifying tags to your server to make it easier to find. Format should be TagA,TagB,TagC. Note the comma seperation.");
-    data["General"][StrTags.data()] = Application::Settings.getAsString(Settings::Key::General_Tags);
-    data["General"][StrMaxCars.data()] = Application::Settings.getAsInt(Settings::Key::General_MaxCars);
-    data["General"][StrMaxPlayers.data()] = Application::Settings.getAsInt(Settings::Key::General_MaxPlayers);
-    data["General"][StrMap.data()] = Application::Settings.getAsString(Settings::Key::General_Map);
-    data["General"][StrDescription.data()] = Application::Settings.getAsString(Settings::Key::General_Description);
-    data["General"][StrResourceFolder.data()] = Application::Settings.getAsString(Settings::Key::General_ResourceFolder);
+    data["General"][StrTags.data()] = Application::Settings.ServerTags;
+    data["General"][StrMaxCars.data()] = Application::Settings.MaxCars;
+    data["General"][StrMaxPlayers.data()] = Application::Settings.MaxPlayers;
+    data["General"][StrMap.data()] = Application::Settings.MapName;
+    data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
+    data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
     // data["General"][StrPassword.data()] = Application::Settings.Password;
     // SetComment(data["General"][StrPassword.data()].comments(), " Sets a password on this server, which restricts people from joining. To join, a player must enter this exact password. Leave empty ("") to disable the password.");
     // Misc
-    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.getAsBool(Settings::Key::Misc_ImScaredOfUpdates);
+    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.");
-    data["Misc"][StrSendErrors.data()] = Application::Settings.getAsBool(Settings::Key::Misc_SendErrors);
-    data["Misc"][StrUpdateReminderTime.data()] = Application::Settings.getAsString(Settings::Key::Misc_UpdateReminderTime);
+    data["Misc"][StrUpdateReminderTime.data()] = Application::Settings.UpdateReminderTime;
     SetComment(data["Misc"][StrUpdateReminderTime.data()].comments(), " Specifies the time between update reminders. You can use any of \"s, min, h, d\" at the end to specify the units seconds, minutes, hours or days. So 30d or 0.5min will print the update message every 30 days or half a minute.");
+    data["Misc"][StrSendErrors.data()] = Application::Settings.SendErrors;
     SetComment(data["Misc"][StrSendErrors.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
-    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.getAsBool(Settings::Key::Misc_SendErrorsShowMessage);
+    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
     SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
     std::stringstream Ss;
     Ss << "# This is the BeamMP-Server config file.\n"
           "# Help & Documentation: `https://docs.beammp.com/server/server-maintenance/`\n"
           "# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
-       << toml::format(data);
+       << data;
     auto File = std::fopen(mConfigFileName.c_str(), "w+");
     if (!File) {
         beammp_error("Failed to create/write to config file: " + GetPlatformAgnosticErrorString());
@@ -177,94 +174,94 @@ void TConfig::CreateConfigFile() {
     if (mDisableConfig) {
         return;
     }
+    try {
+        if (fs::exists("Server.cfg")) {
+            // parse it (this is weird and bad and should be removed in some future version)
+            ParseOldFormat();
+        }
+    } catch (const std::exception& e) {
+        beammp_error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
+    }
+
     FlushToFile();
 }
 
-// This arcane template magic is needed for using lambdas as overloaded visitors
-// See https://en.cppreference.com/w/cpp/utility/variant/visit for reference
-template <class... Ts>
-struct overloaded : Ts... {
-    using Ts::operator()...;
-};
-template <class... Ts>
-overloaded(Ts...) -> overloaded<Ts...>;
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, Settings::Key key) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue) {
     if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data());
-            envp != nullptr && std::strcmp(envp, "") != 0) {
-
-            std::visit(
-                overloaded {
-                    [&envp, &key](std::string) {
-                        Application::Settings.set(key, std::string(envp));
-                    },
-                    [&envp, &key](int) {
-                        Application::Settings.set(key, int(std::strtol(envp, nullptr, 10)));
-                    },
-                    [&envp, &key](bool) {
-                        auto Str = std::string(envp);
-                        Application::Settings.set(key, bool(Str == "1" || Str == "true"));
-                    } },
-
-                Application::Settings.get(key));
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            OutValue = std::string(envp);
             return;
         }
     }
+    if (mDisableConfig) {
+        return;
+    }
+    if (Table[Category.c_str()][Key.data()].is_string()) {
+        OutValue = Table[Category.c_str()][Key.data()].as_string();
+    }
+}
 
-    std::visit([&Table, &Category, &Key, &key](auto&& arg) {
-        using T = std::decay_t<decltype(arg)>;
-        if constexpr (std::is_same_v<T, std::string>) {
-            if (Table[Category.c_str()][Key.data()].is_string())
-                Application::Settings.set(key, Table[Category.c_str()][Key.data()].as_string());
-            else
-                beammp_warnf("Value '{}.{}' has unexpected type, expected type 'string'", Category, Key);
-        } else if constexpr (std::is_same_v<T, int>) {
-            if (Table[Category.c_str()][Key.data()].is_integer())
-                Application::Settings.set(key, int(Table[Category.c_str()][Key.data()].as_integer()));
-            else
-                beammp_warnf("Value '{}.{}' has unexpected type, expected type 'integer'", Category, Key);
-        } else if constexpr (std::is_same_v<T, bool>) {
-            if (Table[Category.c_str()][Key.data()].is_boolean())
-                Application::Settings.set(key, Table[Category.c_str()][Key.data()].as_boolean());
-            else
-                beammp_warnf("Value '{}.{}' has unexpected type, expected type 'boolean'", Category, Key);
-        } else {
-            throw std::logic_error { "Invalid type for config value during read attempt" };
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            auto Str = std::string(envp);
+            OutValue = Str == "1" || Str == "true";
+            return;
         }
-    },
-        Application::Settings.get(key));
+    }
+    if (mDisableConfig) {
+        return;
+    }
+    if (Table[Category.c_str()][Key.data()].is_boolean()) {
+        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
+    }
+}
+
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            OutValue = int(std::strtol(envp, nullptr, 10));
+            return;
+        }
+    }
+    if (mDisableConfig) {
+        return;
+    }
+    if (Table[Category.c_str()][Key.data()].is_integer()) {
+        OutValue = int(Table[Category.c_str()][Key.data()].as_integer());
+    }
 }
 
 void TConfig::ParseFromFile(std::string_view name) {
     try {
         toml::value data {};
         if (!mDisableConfig) {
-            data = toml::parse(name.data());
+            data = toml::parse<toml::preserve_comments>(name.data());
         }
-
         // GENERAL
-
-        // Read into new Settings Singleton
-        TryReadValue(data, "General", StrDebug, EnvStrDebug, Settings::Key::General_Debug);
-        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Settings::Key::General_Private);
-        TryReadValue(data, "General", StrPort, EnvStrPort, Settings::Key::General_Port);
-        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Settings::Key::General_MaxCars);
-        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Settings::Key::General_MaxPlayers);
-        TryReadValue(data, "General", StrMap, EnvStrMap, Settings::Key::General_Map);
-        TryReadValue(data, "General", StrName, EnvStrName, Settings::Key::General_Name);
-        TryReadValue(data, "General", StrDescription, EnvStrDescription, Settings::Key::General_Description);
-        TryReadValue(data, "General", StrTags, EnvStrTags, Settings::Key::General_Tags);
-        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Settings::Key::General_ResourceFolder);
-        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Settings::Key::General_AuthKey);
-        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Settings::Key::General_LogChat);
-        TryReadValue(data, "General", StrAllowGuests, EnvStrAllowGuests, Settings::Key::General_AllowGuests);
+        TryReadValue(data, "General", StrDebug, EnvStrDebug, Application::Settings.DebugModeEnabled);
+        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Application::Settings.Private);
+        if (Env::Get(Env::Key::PROVIDER_PORT_ENV).has_value()) {
+            TryReadValue(data, "General", StrPort, Env::Get(Env::Key::PROVIDER_PORT_ENV).value(), Application::Settings.Port);
+        } else {
+            TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
+        }
+        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Application::Settings.MaxCars);
+        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Application::Settings.MaxPlayers);
+        TryReadValue(data, "General", StrMap, EnvStrMap, Application::Settings.MapName);
+        TryReadValue(data, "General", StrName, EnvStrName, Application::Settings.ServerName);
+        TryReadValue(data, "General", StrDescription, EnvStrDescription, Application::Settings.ServerDesc);
+        TryReadValue(data, "General", StrTags, EnvStrTags, Application::Settings.ServerTags);
+        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Application::Settings.Resource);
+        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Application::Settings.Key);
+        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Application::Settings.LogChat);
+        TryReadValue(data, "General", StrAllowGuests, EnvStrAllowGuests, Application::Settings.AllowGuests);
+        TryReadValue(data, "General", StrPassword, "", Application::Settings.Password);
         // Misc
-        TryReadValue(data, "Misc", StrSendErrors, "", Settings::Key::Misc_SendErrors);
-        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Settings::Key::Misc_ImScaredOfUpdates);
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Settings::Key::Misc_SendErrorsShowMessage);
-        TryReadValue(data, "Misc", StrUpdateReminderTime, "", Settings::Key::Misc_UpdateReminderTime);
-
+        TryReadValue(data, "Misc", StrSendErrors, "", Application::Settings.SendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Application::Settings.HideUpdateMessages);
+        TryReadValue(data, "Misc", StrUpdateReminderTime, "", Application::Settings.UpdateReminderTime);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Application::Settings.SendErrorsMessageEnabled);
     } catch (const std::exception& err) {
         beammp_error("Error parsing config file value: " + std::string(err.what()));
         mFailed = true;
@@ -277,7 +274,7 @@ void TConfig::ParseFromFile(std::string_view name) {
         FlushToFile();
     }
     // all good so far, let's check if there's a key
-    if (Application::Settings.getAsString(Settings::Key::General_AuthKey).empty()) {
+    if (Application::Settings.Key.empty()) {
         if (mDisableConfig) {
             beammp_error("No AuthKey specified in the environment.");
         } else {
@@ -288,7 +285,7 @@ void TConfig::ParseFromFile(std::string_view name) {
         return;
     }
     Application::SetSubsystemStatus("Config", Application::Status::Good);
-    if (Application::Settings.getAsString(Settings::Key::General_AuthKey).size() != 36) {
+    if (Application::Settings.Key.size() != 36) {
         beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
     }
 }
@@ -297,25 +294,78 @@ void TConfig::PrintDebug() {
     if (mDisableConfig) {
         beammp_debug("Provider turned off the generation and parsing of the ServerConfig.toml");
     }
-    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.getAsBool(Settings::Key::General_Debug) ? "true" : "false"));
-    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.getAsBool(Settings::Key::General_Private) ? "true" : "false"));
-    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.getAsInt(Settings::Key::General_Port)));
-    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxCars)));
-    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)));
-    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.getAsString(Settings::Key::General_Map) + "\"");
-    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.getAsString(Settings::Key::General_Name) + "\"");
-    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.getAsString(Settings::Key::General_Description) + "\"");
+    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(StrTags) + ": " + TagsAsPrettyArray());
-    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.getAsBool(Settings::Key::General_LogChat) ? "true" : "false") + "\"");
-    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "\"");
-    beammp_debug(std::string(StrAllowGuests) + ": \"" + (Application::Settings.getAsBool(Settings::Key::General_AllowGuests) ? "true" : "false") + "\"");
+    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
+    beammp_debug(std::string(StrAllowGuests) + ": \"" + (Application::Settings.AllowGuests ? "true" : "false") + "\"");
+    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
     // special!
-    beammp_debug("Key Length: " + std::to_string(Application::Settings.getAsString(Settings::Key::General_AuthKey).length()) + "");
+    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
+    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
 }
 
+void TConfig::ParseOldFormat() {
+    std::ifstream File("Server.cfg");
+    // read all, strip comments
+    std::string Content;
+    for (;;) {
+        std::string Line;
+        std::getline(File, Line);
+        if (!Line.empty() && Line.at(0) != '#') {
+            Line = Line.substr(0, Line.find_first_of('#'));
+            Content += Line + "\n";
+        }
+        if (!File.good()) {
+            break;
+        }
+    }
+    std::stringstream Str(Content);
+    std::string Key, Ignore, Value;
+    for (;;) {
+        Str >> Key >> std::ws >> Ignore >> std::ws;
+        std::getline(Str, Value);
+        if (Str.eof()) {
+            break;
+        }
+        std::stringstream ValueStream(Value);
+        ValueStream >> std::ws; // strip leading whitespace if any
+        Value = ValueStream.str();
+        if (Key == "Debug") {
+            Application::Settings.DebugModeEnabled = Value.find("true") != std::string::npos;
+        } else if (Key == "Private") {
+            Application::Settings.Private = Value.find("true") != std::string::npos;
+        } else if (Key == "Port") {
+            ValueStream >> Application::Settings.Port;
+        } else if (Key == "Cars") {
+            ValueStream >> Application::Settings.MaxCars;
+        } else if (Key == "MaxPlayers") {
+            ValueStream >> Application::Settings.MaxPlayers;
+        } else if (Key == "Map") {
+            Application::Settings.MapName = Value.substr(1, Value.size() - 3);
+        } else if (Key == "Name") {
+            Application::Settings.ServerName = Value.substr(1, Value.size() - 3);
+        } else if (Key == "Desc") {
+            Application::Settings.ServerDesc = Value.substr(1, Value.size() - 3);
+        } else if (Key == "use") {
+            Application::Settings.Resource = Value.substr(1, Value.size() - 3);
+        } else if (Key == "AuthKey") {
+            Application::Settings.Key = Value.substr(1, Value.size() - 3);
+        } else {
+            beammp_warn("unknown key in old auth file (ignored): " + Key);
+        }
+        Str >> std::ws;
+    }
+}
 std::string TConfig::TagsAsPrettyArray() const {
     std::vector<std::string> TagsArray = {};
-    SplitString(Application::Settings.getAsString(Settings::General_Tags), ',', TagsArray);
+    SplitString(Application::Settings.ServerTags, ',', TagsArray);
     std::string Pretty = {};
     for (size_t i = 0; i < TagsArray.size() - 1; ++i) {
         Pretty += '\"' + TagsArray[i] + "\", ";

src/TConsole.cpp

@@ -30,8 +30,6 @@
 #include <mutex>
 #include <openssl/opensslv.h>
 #include <sstream>
-#include <stdexcept>
-#include <unordered_map>
 
 static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
     return What.size() >= StartsWith.size() && What.substr(0, StartsWith.size()) == StartsWith;
@@ -80,7 +78,7 @@ static std::string GetDate() {
     auto local_tm = std::localtime(&tt);
     char buf[30];
     std::string date;
-    if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {
+    if (Application::Settings.DebugModeEnabled) {
         std::strftime(buf, sizeof(buf), "[%d/%m/%y %T.", local_tm);
         date += buf;
         auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
@@ -108,6 +106,41 @@ void TConsole::BackupOldLog() {
         } catch (const std::exception& e) {
             beammp_warn(e.what());
         }
+        /*
+        int err = 0;
+        zip* z = zip_open("ServerLogs.zip", ZIP_CREATE, &err);
+        if (!z) {
+            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
+            return;
+        }
+        FILE* File = std::fopen(Path.string().c_str(), "r");
+        if (!File) {
+            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
+            return;
+        }
+        std::vector<uint8_t> Buffer;
+        Buffer.resize(fs::file_size(Path));
+        std::fread(Buffer.data(), 1, Buffer.size(), File);
+        std::fclose(File);
+
+        auto s = zip_source_buffer(z, Buffer.data(), Buffer.size(), 0);
+
+        auto TimePoint = fs::last_write_time(Path);
+        auto Secs = TimePoint.time_since_epoch().count();
+        auto MyTimeT = std::time(&Secs);
+
+        std::string NewName = Path.stem().string();
+        NewName += "_";
+        std::string Time;
+        Time.resize(32);
+        size_t n = strftime(Time.data(), Time.size(), "%F_%H.%M.%S", localtime(&MyTimeT));
+        Time.resize(n);
+        NewName += Time;
+        NewName += ".log";
+
+        zip_file_add(z, NewName.c_str(), s, 0);
+        zip_close(z);
+    */
     }
 }
 
@@ -353,142 +386,8 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
     return { Command, Args };
 }
 
-template <class... Ts>
-struct overloaded : Ts... {
-    using Ts::operator()...;
-};
-template <class... Ts>
-overloaded(Ts...) -> overloaded<Ts...>;
-
 void TConsole::Command_Settings(const std::string&, const std::vector<std::string>& args) {
-
-    static constexpr const char* sHelpString = R"(
-    Settings:
-        settings help                               displays this help
-        settings list                               lists all settings
-        settings get <category> <setting>           prints current value of specified setting
-        settings set <category> <setting> <value>   sets specified setting to value
-        )";
-
-    if (args.size() == 0) {
-        beammp_errorf("No arguments specified for command 'settings'!");
-        Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
-        return;
-    }
-
-    if (args.front() == "help") {
-
-        Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
-        return;
-    } else if (args.front() == "get") {
-        if (args.size() < 3) {
-            beammp_errorf("'settings get' needs at least two arguments!");
-
-            Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
-            return;
-        }
-
-        try {
-            Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) });
-            Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
-
-            std::visit(
-                overloaded {
-                    [&args](std::string keyValue) {
-                        Application::Console().WriteRaw(fmt::format("'{}::{}' = {}", args.at(1), args.at(2), keyValue));
-                    },
-                    [&args](int keyValue) {
-                        Application::Console().WriteRaw(fmt::format("'{}::{}' = {}", args.at(1), args.at(2), keyValue));
-                    },
-                    [&args](bool keyValue) {
-                        Application::Console().WriteRaw(fmt::format("'{}::{}' = {}", args.at(1), args.at(2), keyValue));
-                    }
-
-                },
-                keyType);
-
-        } catch (std::logic_error& e) {
-            beammp_errorf("Error when getting key: {}", e.what());
-            return;
-        }
-    } else if (args.front() == "set") {
-        if (args.size() <= 3) {
-            beammp_errorf("'settings set' needs at least three arguments!");
-
-            Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
-            return;
-        }
-
-        try {
-
-            Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) });
-            Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
-
-            std::visit(
-                overloaded {
-                    [&args](std::string keyValue) {
-                        Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, std::string(args.at(3)));
-                        Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::string(args.at(3))));
-                    },
-                    [&args](int keyValue) {
-                        Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, std::stoi(args.at(3)));
-                        Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::stoi(args.at(3))));
-                    },
-                    [&args](bool keyValue) {
-                        if (args.at(3) == "true") {
-                            Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, true);
-                            Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "true"));
-                        } else if (args.at(3) == "false") {
-                            Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, false);
-                            Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "false"));
-                        } else {
-                            beammp_errorf("Error when setting key: {}::{} : Unknown literal, use either 'true', or 'false' to set boolean values.", args.at(1), args.at(2));
-                        }
-                    }
-
-                },
-                keyType);
-
-        } catch (std::logic_error& e) {
-            beammp_errorf("Exception when setting settings key via console: {}", e.what());
-            return;
-        }
-
-    } else if (args.front() == "list") {
-        for (const auto& [composedKey, keyACL] : Application::Settings.getAccessControlMap()) {
-            // even though we have the value, we want to ignore it in order to make use of access
-            // control checks
-
-            if (keyACL.second != Settings::SettingsAccessMask::NO_ACCESS) {
-
-                try {
-
-                    Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(composedKey);
-                    Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
-
-                    std::visit(
-                        overloaded {
-                            [&composedKey](std::string keyValue) {
-                                Application::Console().WriteRaw(fmt::format("{} = {}", composedKey, keyValue));
-                            },
-                            [&composedKey](int keyValue) {
-                                Application::Console().WriteRaw(fmt::format("{} = {}", composedKey, keyValue));
-                            },
-                            [&composedKey](bool keyValue) {
-                                Application::Console().WriteRaw(fmt::format("{} = {}", composedKey, keyValue));
-                            }
-
-                        },
-                        keyType);
-                } catch (std::logic_error& e) {
-                    beammp_errorf("Error when getting key: {}", e.what());
-                }
-            }
-        }
-    } else {
-        beammp_errorf("Unknown argument for command 'settings': {}", args.front());
-
-        Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
+    if (!EnsureArgsCount(args, 1, 2)) {
         return;
     }
 }
@@ -497,7 +396,7 @@ void TConsole::Command_Say(const std::string& FullCmd) {
     if (FullCmd.size() > 3) {
         auto Message = FullCmd.substr(4);
         LuaAPI::MP::SendChatMessage(-1, Message);
-        if (!Application::Settings.getAsBool(Settings::Key::General_LogChat)) {
+        if (!Application::Settings.LogChat) {
             Application::Console().WriteRaw("Chat message sent!");
         }
     }
@@ -543,7 +442,7 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
         if (!Client.expired()) {
             auto Locked = Client.lock();
             CarCount += Locked->GetCarCount();
-            ConnectedCount += Locked->IsUDPConnected() ? 1 : 0;
+            ConnectedCount += Locked->IsConnected() ? 1 : 0;
             GuestCount += Locked->IsGuest() ? 1 : 0;
             SyncedCount += Locked->IsSynced() ? 1 : 0;
             SyncingCount += Locked->IsSyncing() ? 1 : 0;

src/THeartbeatThread.cpp

@@ -18,10 +18,10 @@
 
 #include "THeartbeatThread.h"
 
-#include "ChronoWrapper.h"
 #include "Client.h"
 #include "Http.h"
-// #include "SocketIO.h"
+#include "ChronoWrapper.h"
+//#include "SocketIO.h"
 #include <rapidjson/document.h>
 #include <rapidjson/rapidjson.h>
 #include <sstream>
@@ -40,8 +40,8 @@ void THeartbeatThread::operator()() {
     static std::chrono::high_resolution_clock::time_point LastUpdateReminderTime = std::chrono::high_resolution_clock::now();
     bool isAuth = false;
     std::chrono::high_resolution_clock::duration UpdateReminderTimePassed;
+    auto UpdateReminderTimeout = ChronoWrapper::TimeFromStringWithLiteral(Application::Settings.UpdateReminderTime);
     while (!Application::IsShuttingDown()) {
-        auto UpdateReminderTimeout = ChronoWrapper::TimeFromStringWithLiteral(Application::Settings.getAsString(Settings::Key::Misc_UpdateReminderTime));
         Body = GenerateCall();
         // a hot-change occurs when a setting has changed, to update the backend of that change.
         auto Now = std::chrono::high_resolution_clock::now();
@@ -57,6 +57,9 @@ void THeartbeatThread::operator()() {
 
         Last = Body;
         LastNormalUpdateTime = Now;
+        if (!Application::Settings.CustomIP.empty()) {
+            Body += "&ip=" + Application::Settings.CustomIP;
+        }
 
         auto Target = "/heartbeat";
         unsigned int ResponseCode = 0;
@@ -67,7 +70,7 @@ void THeartbeatThread::operator()() {
             T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
             Doc.Parse(T.data(), T.size());
             if (Doc.HasParseError() || !Doc.IsObject()) {
-                if (!Application::Settings.getAsBool(Settings::Key::General_Private)) {
+                if (!Application::Settings.Private) {
                     beammp_trace("Backend response failed to parse as valid json");
                     beammp_trace("Response was: `" + T + "`");
                 }
@@ -107,12 +110,12 @@ void THeartbeatThread::operator()() {
                 beammp_error("Missing/invalid json members in backend response");
             }
         } else {
-            if (!Application::Settings.getAsBool(Settings::Key::General_Private)) {
+            if (!Application::Settings.Private) {
                 beammp_warn("Backend failed to respond to a heartbeat. Your server may temporarily disappear from the server list. This is not an error, and will likely resolve itself soon. Direct connect will still work.");
             }
         }
 
-        if (Ok && !isAuth && !Application::Settings.getAsBool(Settings::Key::General_Private)) {
+        if (Ok && !isAuth && !Application::Settings.Private) {
             if (Status == "2000") {
                 beammp_info(("Authenticated! " + Message));
                 isAuth = true;
@@ -126,10 +129,11 @@ void THeartbeatThread::operator()() {
                 beammp_error("Backend REFUSED the auth key. Reason: " + Message);
             }
         }
-        if (isAuth || Application::Settings.getAsBool(Settings::Key::General_Private)) {
+        if (isAuth || Application::Settings.Private) {
             Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
         }
-        if (!Application::Settings.getAsBool(Settings::Key::Misc_ImScaredOfUpdates) && UpdateReminderTimePassed.count() > UpdateReminderTimeout.count()) {
+        // beammp_debugf("Update reminder time passed: {}, Update reminder time: {}", UpdateReminderTimePassed.count(), UpdateReminderTimeout.count());
+        if (!Application::Settings.HideUpdateMessages && UpdateReminderTimePassed.count() > UpdateReminderTimeout.count()) {
             LastUpdateReminderTime = std::chrono::high_resolution_clock::now();
             Application::CheckForUpdates();
         }
@@ -139,22 +143,23 @@ void THeartbeatThread::operator()() {
 std::string THeartbeatThread::GenerateCall() {
     std::stringstream Ret;
 
-    Ret << "uuid=" << Application::Settings.getAsString(Settings::Key::General_AuthKey)
+    Ret << "uuid=" << Application::Settings.Key
         << "&players=" << mServer.ClientCount()
-        << "&maxplayers=" << Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)
-        << "&port=" << Application::Settings.getAsInt(Settings::Key::General_Port)
-        << "&map=" << Application::Settings.getAsString(Settings::Key::General_Map)
-        << "&private=" << (Application::Settings.getAsBool(Settings::Key::General_Private) ? "true" : "false")
+        << "&maxplayers=" << Application::Settings.MaxPlayers
+        << "&port=" << Application::Settings.Port
+        << "&map=" << Application::Settings.MapName
+        << "&private=" << (Application::Settings.Private ? "true" : "false")
         << "&version=" << Application::ServerVersionString()
         << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
-        << "&name=" << Application::Settings.getAsString(Settings::Key::General_Name)
-        << "&tags=" << Application::Settings.getAsString(Settings::Key::General_Tags)
-        << "&guests=" << (Application::Settings.getAsBool(Settings::Key::General_AllowGuests) ? "true" : "false")
+        << "&name=" << Application::Settings.ServerName
+        << "&tags=" << Application::Settings.ServerTags
+        << "&allowguests=" << (Application::Settings.AllowGuests ? "true" : "false")
         << "&modlist=" << mResourceManager.TrimmedList()
         << "&modstotalsize=" << mResourceManager.MaxModSize()
         << "&modstotal=" << mResourceManager.ModsLoaded()
         << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.getAsString(Settings::Key::General_Description);
+        << "&desc=" << Application::Settings.ServerDesc
+        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
     return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)

src/TLuaEngine.cpp

@@ -30,34 +30,18 @@
 #include <condition_variable>
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
-#include <optional>
 #include <random>
-#include <sol/stack_core.hpp>
 #include <thread>
 #include <tuple>
 
 TLuaEngine* LuaAPI::MP::Engine;
 
-static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn);
-
-static std::optional<sol::function> GetLuaHandler(sol::state_view StateView, const std::string Handler, const std::string EventName);
-
-static std::optional<sol::function> GetLuaHandler(sol::state_view StateView, const std::string Handler, const std::string EventName) {
-    auto Res = StateView.safe_script("return " + Handler, sol::script_pass_on_error);
-    if (!Res.valid()) {
-        beammp_errorf("invalid handler for event \"{}\". handler: \"{}\"", EventName, Handler);
-    } else if (Res.get_type() == sol::type::function) {
-        return Res.get<sol::function>();
-    }
-    return std::nullopt;
-}
-
 TLuaEngine::TLuaEngine()
-    : mResourceServerPath(fs::path(Application::Settings.getAsString(Settings::Key::General_ResourceFolder)) / "Server") {
+    : mResourceServerPath(fs::path(Application::Settings.Resource) / "Server") {
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
     LuaAPI::MP::Engine = this;
-    if (!fs::exists(Application::Settings.getAsString(Settings::Key::General_ResourceFolder))) {
-        fs::create_directory(Application::Settings.getAsString(Settings::Key::General_ResourceFolder));
+    if (!fs::exists(Application::Settings.Resource)) {
+        fs::create_directory(Application::Settings.Resource);
     }
     if (!fs::exists(mResourceServerPath)) {
         fs::create_directory(mResourceServerPath);
@@ -73,7 +57,7 @@ TLuaEngine::TLuaEngine()
 }
 
 TEST_CASE("TLuaEngine ctor & dtor") {
-    Application::Settings.set(Settings::Key::General_ResourceFolder, "beammp_server_test_resources");
+    Application::Settings.Resource = "beammp_server_test_resources";
     TLuaEngine engine;
     Application::GracefullyShutdown();
 }
@@ -370,9 +354,9 @@ std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const
     return mLuaStates.at(StateID)->EnqueueScript(Script);
 }
 
-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName) {
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
     std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args, EventName);
+    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
 }
 
 void TLuaEngine::CollectAndInitPlugins() {
@@ -445,7 +429,7 @@ void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name,
         mLuaStates[StateId] = std::move(DataPtr);
         RegisterEvent("onInit", StateId, "onInit");
         if (!DontCallOnInit) {
-            auto Res = EnqueueFunctionCall(StateId, "onInit", {}, "onInit");
+            auto Res = EnqueueFunctionCall(StateId, "onInit", {});
             Res->WaitUntilReady();
             if (Res->Error && Res->ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
                 beammp_lua_error("Calling \"onInit\" on \"" + StateId + "\" failed: " + Res->ErrorMessage);
@@ -506,11 +490,8 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
 
     sol::variadic_results LocalArgs = JsonStringToArray(Str);
     for (const auto& Handler : MyHandlers) {
-        auto Res = GetLuaHandler(mStateView, Handler, EventName);
-        if (Res.has_value()) {
-            sol::function Fn = Res.value();
-            Fn = AddTraceback(mStateView, Fn);
-
+        auto Fn = mStateView[Handler];
+        if (Fn.valid()) {
             auto LuaResult = Fn(LocalArgs);
             auto Result = std::make_shared<TLuaResult>();
             if (LuaResult.valid()) {
@@ -518,9 +499,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                 Result->Result = LuaResult;
             } else {
                 Result->Error = true;
-                sol::error Err = LuaResult;
-                Result->ErrorMessage = Err.what();
-                beammp_errorf("An error occured while executing local event handler \"{}\" for event \"{}\": {}", Handler, EventName, Result->ErrorMessage);
+                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
             }
             Result->MarkAsReady();
             Return.push_back(Result);
@@ -562,9 +541,8 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&
     sol::table Result = mStateView.create_table();
     int i = 1;
     for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) {
-        auto Res = GetLuaHandler(mStateView, Handler, EventName);
-        if (Res.has_value()) {
-            sol::function Fn = Res.value();
+        auto Fn = mStateView[Handler];
+        if (Fn.valid() && Fn.get_type() == sol::type::function) {
             auto FnRet = Fn(EventArgs);
             if (FnRet.valid()) {
                 Result.set(i, FnRet);
@@ -595,16 +573,6 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
     }
 }
 
-std::variant<std::string, sol::nil_t> TLuaEngine::StateThreadData::Lua_GetPlayerRole(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        return MaybeClient.value().lock()->GetRoles();
-    } else {
-        return sol::nil;
-    }
-}
-
-
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
     sol::table Result = mStateView.create_table();
     mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
@@ -879,15 +847,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
         return Lua_GetPositionRaw(PID, VID);
     });
     MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
-    MPTable.set_function("SendNotification", [&](sol::variadic_args Args) {
-        if (Args.size() == 3) {
-            LuaAPI::MP::SendNotification(Args.get<int>(0), Args.get<std::string>(1), Args.get<std::string>(2), Args.get<std::string>(1));
-        } else if (Args.size() == 4) {
-            LuaAPI::MP::SendNotification(Args.get<int>(0), Args.get<std::string>(1), Args.get<std::string>(2), Args.get<std::string>(3));
-        } else {
-            beammp_lua_error("SendNotification expects 2 or 3 arguments.");
-        }
-    });
     MPTable.set_function("GetPlayers", [&]() -> sol::table {
         return Lua_GetPlayers();
     });
@@ -902,9 +861,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     MPTable.set_function("GetPlayerIdentifiers", [&](int ID) -> sol::table {
         return Lua_GetPlayerIdentifiers(ID);
     });
-    MPTable.set_function("GetPlayerRole", [&](int ID) -> std::variant<std::string, sol::nil_t> {
-        return Lua_GetPlayerRole(ID);
-    });
     MPTable.set_function("Sleep", &LuaAPI::MP::Sleep);
     //  const std::string& EventName, size_t IntervalMS, int strategy
     MPTable.set_function("CreateEventTimer", [&](sol::variadic_args Args) {
@@ -932,7 +888,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
         mEngine->CancelEventTimers(EventName, mStateId);
     });
     MPTable.set_function("Set", &LuaAPI::MP::Set);
-    MPTable.set_function("Get", &LuaAPI::MP::Get);
 
     auto UtilTable = StateView.create_named_table("Util");
     UtilTable.set_function("LogDebug", [this](sol::variadic_args args) {
@@ -941,7 +896,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
             ToPrint += LuaAPI::LuaToString(static_cast<const sol::object>(arg));
             ToPrint += "\t";
         }
-        if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {
+        if (Application::Settings.DebugModeEnabled) {
             beammp_lua_log("DEBUG", mStateId, ToPrint);
         }
     });
@@ -1080,12 +1035,12 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFrom
     }
 }
 
-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
     auto Result = std::make_shared<TLuaResult>();
     Result->StateId = mStateId;
     Result->Function = FunctionName;
     std::unique_lock Lock(mStateFunctionQueueMutex);
-    mStateFunctionQueue.push_back({ FunctionName, Result, Args, EventName });
+    mStateFunctionQueue.push_back({ FunctionName, Result, Args, "" });
     mStateFunctionQueueCond.notify_all();
     return Result;
 }
@@ -1094,21 +1049,6 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co
     mEngine->RegisterEvent(EventName, mStateId, FunctionName);
 }
 
-static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn) {
-    StateView["INTERNAL_ERROR_HANDLER"] = [](lua_State *L) {
-        auto Error = sol::stack::get<std::optional<std::string>>(L);
-        std::string ErrorString = "<Unknown error>";
-        if (Error.has_value()) {
-            ErrorString = Error.value();
-        }
-        auto DebugTracebackFn = sol::state_view(L).globals().get<sol::table>("debug").get<sol::protected_function>("traceback");
-        // 2 = start collecting the trace one above the current function (1=current function)
-        std::string Traceback = DebugTracebackFn(ErrorString, 2);
-        return sol::stack::push(L, Traceback);
-    };
-    return sol::protected_function(RawFn, StateView["INTERNAL_ERROR_HANDLER"]);
-}
-
 void TLuaEngine::StateThreadData::operator()() {
     RegisterThread("Lua:" + mStateId);
     while (!Application::IsShuttingDown()) {
@@ -1173,10 +1113,8 @@ void TLuaEngine::StateThreadData::operator()() {
                 // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
                 Result->StateId = mStateId;
                 sol::state_view StateView(mState);
-
-                auto Res = GetLuaHandler(StateView, FnName, TheQueuedFunction.EventName);
-                if (Res.has_value()) {
-                    sol::function Fn = Res.value();
+                auto Fn = StateView[FnName];
+                if (Fn.valid() && Fn.get_type() == sol::type::function) {
                     std::vector<sol::object> LuaArgs;
                     for (const auto& Arg : Args) {
                         if (Arg.valueless_by_exception()) {
@@ -1197,7 +1135,7 @@ void TLuaEngine::StateThreadData::operator()() {
                         case TLuaType::Bool:
                             LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
                             break;
-                        case TLuaType::StringStringMap: {
+                         case TLuaType::StringStringMap: {
                             auto Map = std::get<std::unordered_map<std::string, std::string>>(Arg);
                             auto Table = StateView.create_table();
                             for (const auto& [k, v] : Map) {
@@ -1211,7 +1149,6 @@ void TLuaEngine::StateThreadData::operator()() {
                             break;
                         }
                     }
-                    Fn = AddTraceback(StateView, Fn);
                     auto Res = Fn(sol::as_args(LuaArgs));
                     if (Res.valid()) {
                         Result->Error = false;

src/TNetwork.cpp

@@ -20,18 +20,15 @@
 #include "Client.h"
 #include "Common.h"
 #include "LuaAPI.h"
+#include "RateLimiter.h"
 #include "TLuaEngine.h"
-#include "TScopedTimer.h"
 #include "nlohmann/json.hpp"
 #include <CustomAssert.h>
 #include <Http.h>
 #include <array>
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/address_v4.hpp>
-#include <boost/asio/ip/address_v6.hpp>
-#include <boost/asio/ip/v6_only.hpp>
 #include <cstring>
-#include <zlib.h>
 
 typedef boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO> rcv_timeout_option;
 
@@ -84,8 +81,7 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
 
 void TNetwork::UDPServerMain() {
     RegisterThread("UDPServer");
-    // listen on all ipv6 addresses
-    ip::udp::endpoint UdpListenEndpoint(ip::address::from_string("::"), Application::Settings.getAsInt(Settings::Key::General_Port));
+    ip::udp::endpoint UdpListenEndpoint(ip::address::from_string("0.0.0.0"), Application::Settings.Port);
     boost::system::error_code ec;
     mUDPSock.open(UdpListenEndpoint.protocol(), ec);
     if (ec) {
@@ -93,12 +89,6 @@ void TNetwork::UDPServerMain() {
         std::this_thread::sleep_for(std::chrono::seconds(5));
         Application::GracefullyShutdown();
     }
-    // set IP_V6ONLY to false to allow both v4 and v6
-    boost::asio::ip::v6_only option(false);
-    mUDPSock.set_option(option, ec);
-    if (ec) {
-        beammp_warnf("Failed to unset IP_V6ONLY on UDP, only IPv6 will work: {}", ec.message());
-    }
     mUDPSock.bind(UdpListenEndpoint, ec);
     if (ec) {
         beammp_error("bind() failed: " + ec.message());
@@ -106,12 +96,12 @@ void TNetwork::UDPServerMain() {
         Application::GracefullyShutdown();
     }
     Application::SetSubsystemStatus("UDPNetwork", Application::Status::Good);
-    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.getAsInt(Settings::Key::General_Port)) + (" with a Max of ")
-        + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) + (" Clients"));
+    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.Port) + (" with a Max of ")
+        + std::to_string(Application::Settings.MaxPlayers) + (" Clients"));
     while (!Application::IsShuttingDown()) {
         try {
-            ip::udp::endpoint remote_client_ep {};
-            std::vector<uint8_t> Data = UDPRcvFromClient(remote_client_ep);
+            ip::udp::endpoint client {};
+            std::vector<uint8_t> Data = UDPRcvFromClient(client); // Receives any data from Socket
             auto Pos = std::find(Data.begin(), Data.end(), ':');
             if (Data.empty() || Pos > Data.begin() + 2)
                 continue;
@@ -127,31 +117,16 @@ void TNetwork::UDPServerMain() {
                 }
 
                 if (Client->GetID() == ID) {
-                    // not initialized yet
-                    if (Client->GetUDPAddr() == ip::udp::endpoint {} || !Client->IsUDPConnected()) {
-                        // same IP (just a sanity check)
-                        if (remote_client_ep.address() == Client->GetTCPSock().remote_endpoint().address()) {
-                            Client->SetUDPAddr(remote_client_ep);
-                            Client->SetIsUDPConnected(true);
-                            beammp_debugf("UDP connected for client {}", ID);
-                        } else {
-                            beammp_debugf("Denied initial UDP packet due to IP mismatch");
-                            return false;
-                        }
-                    }
-                    if (Client->GetUDPAddr() == remote_client_ep) {
-                        Data.erase(Data.begin(), Data.begin() + 2);
-                        mServer.GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
-                    } else {
-                        beammp_debugf("Ignored UDP packet due to remote address mismatch");
-                        return false;
-                    }
+                    Client->SetUDPAddr(client);
+                    Client->SetIsConnected(true);
+                    Data.erase(Data.begin(), Data.begin() + 2);
+                    mServer.GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
                 }
 
                 return true;
             });
         } catch (const std::exception& e) {
-            beammp_warnf("Failed to receive/parse packet via UDP: {}", e.what());
+            beammp_error(("fatal: ") + std::string(e.what()));
         }
     }
 }
@@ -159,10 +134,7 @@ void TNetwork::UDPServerMain() {
 void TNetwork::TCPServerMain() {
     RegisterThread("TCPServer");
 
-    // listen on all ipv6 addresses
-    auto port = uint16_t(Application::Settings.getAsInt(Settings::Key::General_Port));
-    ip::tcp::endpoint ListenEp(ip::address::from_string("::"), port);
-    beammp_infof("Listening on 0.0.0.0:{0} and [::]:{0}", port);
+    ip::tcp::endpoint ListenEp(ip::address::from_string("0.0.0.0"), Application::Settings.Port);
     ip::tcp::socket Listener(mServer.IoCtx());
     boost::system::error_code ec;
     Listener.open(ListenEp.protocol(), ec);
@@ -170,16 +142,6 @@ void TNetwork::TCPServerMain() {
         beammp_errorf("Failed to open socket: {}", ec.message());
         return;
     }
-    // set IP_V6ONLY to false to allow both v4 and v6
-    boost::asio::ip::v6_only option(false);
-    Listener.set_option(option, ec);
-    if (ec) {
-        beammp_warnf("Failed to unset IP_V6ONLY on TCP, only IPv6 will work: {}", ec.message());
-    }
-#if defined(BEAMMP_FREEBSD)
-    beammp_warnf("WARNING: On FreeBSD, for IPv4 to work, you must run `sysctl net.inet6.ip6.v6only=0`!");
-    beammp_debugf("This is due to an annoying detail in the *BSDs: In the name of security, unsetting the IPV6_V6ONLY option does not work by default (but does not fail???), as it allows IPv4 mapped IPv6 like ::ffff:127.0.0.1, which they deem a security issue. For more information, see RFC 2553, section 3.7.");
-#endif
     socket_base::linger LingerOpt {};
     LingerOpt.enabled(false);
     Listener.set_option(LingerOpt, ec);
@@ -208,13 +170,13 @@ void TNetwork::TCPServerMain() {
             ip::tcp::endpoint ClientEp;
             ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
             if (ec) {
-                beammp_errorf("Failed to accept() new client: {}", ec.message());
+                beammp_errorf("failed to accept: {}", ec.message());
             }
             TConnection Conn { std::move(ClientSocket), ClientEp };
             std::thread ID(&TNetwork::Identify, this, std::move(Conn));
             ID.detach(); // TODO: Add to a queue and attempt to join periodically
         } catch (const std::exception& e) {
-            beammp_errorf("Exception in accept routine: {}", e.what());
+            beammp_error("fatal: " + std::string(e.what()));
         }
     } while (!Application::IsShuttingDown());
 }
@@ -235,13 +197,20 @@ void TNetwork::Identify(TConnection&& RawConnection) {
         RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
         return;
     }
-    std::shared_ptr<TClient> Client { nullptr };
+    std::string client_address = RawConnection.SockAddr.address().to_string();
+    std::shared_ptr<TClient> client { nullptr };
+    RateLimiter ddos_protection;
     try {
         if (Code == 'C') {
-            Client = Authentication(std::move(RawConnection));
+            if (ddos_protection.isConnectionAllowed(client_address)) {
+                beammp_infof("[DoS Protection] Client: [{}] is authorized to connect to the server", client_address);
+                client = Authentication(std::move(RawConnection));
+            } else {
+                beammp_infof("[DoS Protection] Client: [{}] has been denied access to the server", client_address);
+                RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
+            }
         } else if (Code == 'D') {
-            beammp_errorf("Old download packet detected - the client is wildly out of date, this will be ignored");
-            return;
+            HandleDownload(std::move(RawConnection));
         } else if (Code == 'P') {
             boost::system::error_code ec;
             write(RawConnection.Socket, buffer("P"), ec);
@@ -250,7 +219,7 @@ void TNetwork::Identify(TConnection&& RawConnection) {
             beammp_errorf("Invalid code got in Identify: '{}'", Code);
         }
     } catch (const std::exception& e) {
-        beammp_errorf("Error during handling of code {} - client left in invalid state, closing socket: {}", Code, e.what());
+        beammp_errorf("Error during handling of code {} - client left in invalid state, closing socket", Code);
         boost::system::error_code ec;
         RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
         if (ec) {
@@ -263,7 +232,27 @@ void TNetwork::Identify(TConnection&& RawConnection) {
     }
 }
 
-
+void TNetwork::HandleDownload(TConnection&& Conn) {
+    char D;
+    boost::system::error_code ec;
+    read(Conn.Socket, buffer(&D, 1), ec);
+    if (ec) {
+        Conn.Socket.shutdown(socket_base::shutdown_both, ec);
+        // ignore ec
+        return;
+    }
+    auto ID = uint8_t(D);
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            auto c = ClientPtr.lock();
+            if (c->GetID() == ID) {
+                c->SetDownSock(std::move(Conn.Socket));
+            }
+        }
+        return true;
+    });
+}
 
 std::string HashPassword(const std::string& str) {
     std::stringstream ret;
@@ -276,14 +265,8 @@ std::string HashPassword(const std::string& str) {
 
 std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     auto Client = CreateClient(std::move(RawConnection.Socket));
-    std::string ip = "";
-    if (RawConnection.SockAddr.address().to_v6().is_v4_mapped()) {
-        ip = boost::asio::ip::make_address_v4(ip::v4_mapped_t::v4_mapped, RawConnection.SockAddr.address().to_v6()).to_string();
-    } else {
-        ip = RawConnection.SockAddr.address().to_string();
-    }
-    Client->SetIdentifier("ip", ip);
-    beammp_tracef("This thread is ip {} ({})", ip, RawConnection.SockAddr.address().to_v6().is_v4_mapped() ? "IPv4 mapped IPv6" : "IPv6");
+    Client->SetIdentifier("ip", RawConnection.SockAddr.address().to_string());
+    beammp_tracef("This thread is ip {}", RawConnection.SockAddr.address().to_string());
 
     beammp_info("Identifying new ClientConnection...");
 
@@ -316,7 +299,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     }
 
     std::string Key(reinterpret_cast<const char*>(Data.data()), Data.size());
-    std::string AuthKey = Application::Settings.getAsString(Settings::Key::General_AuthKey);
+    std::string AuthKey = Application::Settings.Key;
     std::string ClientIp = Client->GetIdentifiers().at("ip");
 
     nlohmann::json AuthReq {};
@@ -365,6 +348,22 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
         return nullptr;
     }
 
+    if (!Application::Settings.Password.empty()) { // ask password
+        if (!TCPSend(*Client, StringToVector("S"))) {
+            // TODO: handle
+        }
+        beammp_info("Waiting for password");
+        Data = TCPRcv(*Client);
+        std::string Pass = std::string(reinterpret_cast<const char*>(Data.data()), Data.size());
+        if (Pass != HashPassword(Application::Settings.Password)) {
+            beammp_debug(Client->GetName() + " attempted to connect with a wrong password");
+            ClientKick(*Client, "Wrong password!");
+            return {};
+        } else {
+            beammp_debug(Client->GetName() + " used the correct password");
+        }
+    }
+
     beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
     mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
         std::shared_ptr<TClient> Cl;
@@ -385,21 +384,10 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
 
     auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest(), Client->GetIdentifiers());
     TLuaEngine::WaitForAll(Futures);
-    bool NotAllowed = false;
-    bool BypassLimit = false;
-
-    for (const auto& Result : Futures) {
-        if (!Result->Error && Result->Result.is<int>()) {
-            auto Res = Result->Result.as<int>();
-
-            if (Res == 1) {
-                NotAllowed = true;
-                break;
-            } else if (Res == 2) {
-                BypassLimit = true;
-            }
-        }
-    }
+    bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
+        [](const std::shared_ptr<TLuaResult>& Result) {
+            return !Result->Error && Result->Result.is<int>() && bool(Result->Result.as<int>());
+        });
     std::string Reason;
     bool NotAllowedWithReason = std::any_of(Futures.begin(), Futures.end(),
         [&Reason](const std::shared_ptr<TLuaResult>& Result) -> bool {
@@ -410,29 +398,20 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
             return false;
         });
 
-    if (!NotAllowedWithReason && !Application::Settings.getAsBool(Settings::Key::General_AllowGuests) && Client->IsGuest()) { //! NotAllowedWithReason because this message has the lowest priority
+    if (!NotAllowedWithReason && !Application::Settings.AllowGuests && Client->IsGuest()) { //! NotAllowedWithReason because this message has the lowest priority
         NotAllowedWithReason = true;
         Reason = "No guests are allowed on this server! To join, sign up at: forum.beammp.com.";
     }
 
-    bool Allowed = true;
-    if (NotAllowed) {
-        Allowed = false;
-    }
-    if (NotAllowedWithReason) {
-        Allowed = false;
-    }
-
     if (NotAllowed) {
         ClientKick(*Client, "you are not allowed on the server!");
+        return {};
     } else if (NotAllowedWithReason) {
         ClientKick(*Client, Reason);
+        return {};
     }
 
-
-    if (!Allowed) {
-        return {};
-    } else if (mServer.ClientCount() < size_t(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) || BypassLimit) {
+    if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) {
         beammp_info("Identification success");
         mServer.InsertClient(Client);
         TCPClient(Client);
@@ -440,10 +419,6 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
         ClientKick(*Client, "Server full!");
     }
 
-    auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postPlayerAuth", "", Allowed, Client->GetName(), Client->GetRoles(), Client->IsGuest(), Client->GetIdentifiers());
-    // the post event is not cancellable so we dont wait for it
-    LuaAPI::MP::Engine->ReportErrors(PostFutures);
-
     return Client;
 }
 
@@ -538,17 +513,7 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
     constexpr std::string_view ABG = "ABG:";
     if (Data.size() >= ABG.size() && std::equal(Data.begin(), Data.begin() + ABG.size(), ABG.begin(), ABG.end())) {
         Data.erase(Data.begin(), Data.begin() + ABG.size());
-        try {
-            return DeComp(Data);
-        } catch (const InvalidDataError& ) {
-            beammp_errorf("Failed to decompress packet from a client. The receive failed and the client may be disconnected as a result");
-            // return empty -> error
-            return std::vector<uint8_t>();
-        } catch (const std::runtime_error& e) {
-            beammp_errorf("Failed to decompress packet from a client: {}. The server may be out of RAM! The receive failed and the client may be disconnected as a result", e.what());
-            // return empty -> error
-            return std::vector<uint8_t>();
-        }
+        return DeComp(Data);
     } else {
         return Data;
     }
@@ -639,7 +604,7 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
 }
 
 void TNetwork::UpdatePlayer(TClient& Client) {
-    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) + ":";
+    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::Settings.MaxPlayers) + ":";
     mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
         ReadLock Lock(mServer.GetClientMutex());
         if (!ClientPtr.expired()) {
@@ -671,7 +636,6 @@ void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr) {
         VehicleData = *LockedData.VehicleData;
     } // End Vehicle Data Lock Scope
     for (auto& v : VehicleData) {
-        LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), v.ID()));
         Packet = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(v.ID());
         SendToAll(&c, StringToVector(Packet), false, true);
     }
@@ -715,7 +679,7 @@ void TNetwork::OnConnect(const std::weak_ptr<TClient>& c) {
     SyncResources(*LockedClient);
     if (LockedClient->IsDisconnected())
         return;
-    (void)Respond(*LockedClient, StringToVector("M" + Application::Settings.getAsString(Settings::Key::General_Map)), true); // Send the Map on connect
+    (void)Respond(*LockedClient, StringToVector("M" + Application::Settings.MapName), true); // Send the Map on connect
     beammp_info(LockedClient->GetName() + " : Connected");
     LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->GetID()));
 }
@@ -750,11 +714,11 @@ void TNetwork::Parse(TClient& c, const std::vector<uint8_t>& Packet) {
     case 'S':
         if (SubCode == 'R') {
             beammp_debug("Sending Mod Info");
-            std::string ToSend = mResourceManager.NewFileList();
-            beammp_debugf("Mod Info: {}", ToSend);
+            std::string ToSend = mResourceManager.FileList() + mResourceManager.FileSizes();
+            if (ToSend.empty())
+                ToSend = "-";
             if (!TCPSend(c, StringToVector(ToSend))) {
-                ClientKick(c, "TCP Send 'SY' failed");
-                return;
+                // TODO: error
             }
         }
         return;
@@ -764,6 +728,8 @@ void TNetwork::Parse(TClient& c, const std::vector<uint8_t>& Packet) {
 }
 
 void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
+    beammp_info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
+
     if (!fs::path(UnsafeName).has_filename()) {
         if (!TCPSend(c, StringToVector("CO"))) {
             // TODO: handle
@@ -772,7 +738,7 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
         return;
     }
     auto FileName = fs::path(UnsafeName).filename().string();
-    FileName = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client/" + FileName;
+    FileName = Application::Settings.Resource + "/Client/" + FileName;
 
     if (!std::filesystem::exists(FileName)) {
         if (!TCPSend(c, StringToVector("CO"))) {
@@ -786,44 +752,89 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
         // TODO: handle
     }
 
-    size_t Size = size_t(std::filesystem::file_size(FileName));
+    /// Wait for connections
+    int T = 0;
+    while (!c.GetDownSock().is_open() && T < 50) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        T++;
+    }
 
-    SendFileToClient(c, Size, FileName);
-}
-
-#if defined(BEAMMP_LINUX)
-#include <cerrno>
-#include <cstring>
-#include <sys/sendfile.h>
-#include <unistd.h>
-#include <signal.h>
-#endif
-void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name) {
-    TScopedTimer timer(fmt::format("Download of '{}' for client {}", Name, c.GetID()));
-#if defined(BEAMMP_LINUX)
-    signal(SIGPIPE, SIG_IGN);
-    // on linux, we can use sendfile(2)!
-    int fd = ::open(Name.c_str(), O_RDONLY);
-    if (fd < 0) {
-        beammp_errorf("Failed to open mod '{}' for sending, error: {}", Name, std::strerror(errno));
+    if (!c.GetDownSock().is_open()) {
+        beammp_error("Client doesn't have a download socket!");
+        if (!c.IsDisconnected())
+            c.Disconnect("Missing download socket");
         return;
     }
-    // native handle, needed in order to make native syscalls with it
-    int socket = c.GetTCPSock().native_handle();
 
-    ssize_t ret = 0;
-    auto ToSendTotal = Size;
-    auto Start = 0;
-    while (ret < ssize_t(ToSendTotal)) {
-        auto SysOffset = off_t(Start + size_t(ret));
-        ret = sendfile(socket, fd, &SysOffset, ToSendTotal - size_t(ret));
-        if (ret < 0) {
-            beammp_errorf("Failed to send mod '{}' to client {}: {}", Name, c.GetID(), std::strerror(errno));
-            return;
+    size_t Size = size_t(std::filesystem::file_size(FileName)), MSize = Size / 2;
+
+    std::thread SplitThreads[2] {
+        std::thread([&] {
+            RegisterThread("SplitLoad_0");
+            SplitLoad(c, 0, MSize, false, FileName);
+        }),
+        std::thread([&] {
+            RegisterThread("SplitLoad_1");
+            SplitLoad(c, MSize, Size, true, FileName);
+        })
+    };
+
+    for (auto& SplitThread : SplitThreads) {
+        if (SplitThread.joinable()) {
+            SplitThread.join();
         }
     }
+}
 
-#else
+static std::pair<size_t /* count */, size_t /* last chunk */> SplitIntoChunks(size_t FullSize, size_t ChunkSize) {
+    if (FullSize < ChunkSize) {
+        return { 0, FullSize };
+    }
+    size_t Count = FullSize / (FullSize / ChunkSize);
+    size_t LastChunkSize = FullSize - (Count * ChunkSize);
+    return { Count, LastChunkSize };
+}
+
+TEST_CASE("SplitIntoChunks") {
+    size_t FullSize;
+    size_t ChunkSize;
+    SUBCASE("Normal case") {
+        FullSize = 1234567;
+        ChunkSize = 1234;
+    }
+    SUBCASE("Zero original size") {
+        FullSize = 0;
+        ChunkSize = 100;
+    }
+    SUBCASE("Equal full size and chunk size") {
+        FullSize = 125;
+        ChunkSize = 125;
+    }
+    SUBCASE("Even split") {
+        FullSize = 10000;
+        ChunkSize = 100;
+    }
+    SUBCASE("Odd split") {
+        FullSize = 13;
+        ChunkSize = 2;
+    }
+    SUBCASE("Large sizes") {
+        FullSize = 10 * GB;
+        ChunkSize = 125 * MB;
+    }
+    auto [Count, LastSize] = SplitIntoChunks(FullSize, ChunkSize);
+    CHECK((Count * ChunkSize) + LastSize == FullSize);
+}
+
+const uint8_t* /* end ptr */ TNetwork::SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size) {
+    if (TCPSendRaw(c, Socket, DataPtr, Size)) {
+        return DataPtr + Size;
+    } else {
+        return nullptr;
+    }
+}
+
+void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name) {
     std::ifstream f(Name.c_str(), std::ios::binary);
     uint32_t Split = 125 * MB;
     std::vector<uint8_t> Data;
@@ -831,8 +842,11 @@ void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name
         Data.resize(Split);
     else
         Data.resize(Size);
-    ip::tcp::socket* TCPSock = &c.GetTCPSock();
-    std::streamsize Sent = 0;
+    ip::tcp::socket* TCPSock { nullptr };
+    if (D)
+        TCPSock = &c.GetDownSock();
+    else
+        TCPSock = &c.GetTCPSock();
     while (!c.IsDisconnected() && Sent < Size) {
         size_t Diff = Size - Sent;
         if (Diff > Split) {
@@ -855,7 +869,6 @@ void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name
             Sent += Diff;
         }
     }
-#endif
 }
 
 bool TNetwork::TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size) {
@@ -878,7 +891,7 @@ bool TNetwork::SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync) {
 
 bool TNetwork::Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync) {
     char C = MSG.at(0);
-    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || compressBound(MSG.size()) > 1024) {
+    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
         if (C == 'O' || C == 'T' || MSG.size() > 1000) {
             return SendLarge(c, MSG, isSync);
         } else {
@@ -961,7 +974,7 @@ void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self
         }
         if (Self || Client.get() != c) {
             if (Client->IsSynced() || Client->IsSyncing()) {
-                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || compressBound(Data.size()) > 1024) {
+                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
                     if (C == 'O' || C == 'T' || Data.size() > 1000) {
                         if (Data.size() > 400) {
                             auto CompressedData = Data;
@@ -989,7 +1002,7 @@ void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self
 }
 
 bool TNetwork::UDPSend(TClient& Client, std::vector<uint8_t> Data) {
-    if (!Client.IsUDPConnected() || Client.IsDisconnected()) {
+    if (!Client.IsConnected() || Client.IsDisconnected()) {
         // this can happen if we try to send a packet to a client that is either
         // 1. not yet fully connected, or
         // 2. disconnected and not yet fully removed

src/TPPSMonitor.cpp

@@ -65,13 +65,13 @@ void TPPSMonitor::operator()() {
                 V += c->GetCarCount();
             }
             // kick on "no ping"
-            if (c->SecondsSinceLastPing() > (20 * 60)) {
+            if (c->SecondsSinceLastPing() > (20 * 60) ){
                 beammp_debugf("client {} ({}) timing out: {}", c->GetID(), c->GetName(), c->SecondsSinceLastPing());
                 TimedOutClients.push_back(c);
             } else if (c->IsSynced() && c->SecondsSinceLastPing() > (1 * 60)) {
                 beammp_debugf("client {} ({}) timing out: {}", c->GetName(), c->GetID(), c->SecondsSinceLastPing());
                 TimedOutClients.push_back(c);
-            }
+            } 
 
             return true;
         });

src/TResourceManager.cpp

@@ -17,20 +17,15 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "TResourceManager.h"
-#include "Common.h"
 
 #include <algorithm>
 #include <filesystem>
-#include <fmt/core.h>
-#include <ios>
-#include <nlohmann/json.hpp>
-#include <openssl/evp.h>
 
 namespace fs = std::filesystem;
 
 TResourceManager::TResourceManager() {
     Application::SetSubsystemStatus("ResourceManager", Application::Status::Starting);
-    std::string Path = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client";
+    std::string Path = Application::Settings.Resource + "/Client";
     if (!fs::exists(Path))
         fs::create_directories(Path);
     for (const auto& entry : fs::directory_iterator(Path)) {
@@ -57,83 +52,3 @@ TResourceManager::TResourceManager() {
 
     Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
 }
-
-std::string TResourceManager::NewFileList() const {
-    return mMods.dump();
-}
-void TResourceManager::RefreshFiles() {
-    mMods.clear();
-    std::unique_lock Lock(mModsMutex);
-
-    std::string Path = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client";
-    for (const auto& entry : fs::directory_iterator(Path)) {
-        std::string File(entry.path().string());
-
-        if (entry.path().extension() != ".zip" || std::filesystem::is_directory(entry.path())) {
-            beammp_warnf("'{}' is not a ZIP file and will be ignored", File);
-            continue;
-        }
-
-        try {
-            EVP_MD_CTX* mdctx;
-            const EVP_MD* md;
-            uint8_t sha256_value[EVP_MAX_MD_SIZE];
-            md = EVP_sha256();
-            if (md == nullptr) {
-                throw std::runtime_error("EVP_sha256() failed");
-            }
-
-            mdctx = EVP_MD_CTX_new();
-            if (mdctx == nullptr) {
-                throw std::runtime_error("EVP_MD_CTX_new() failed");
-            }
-            if (!EVP_DigestInit_ex2(mdctx, md, NULL)) {
-                EVP_MD_CTX_free(mdctx);
-                throw std::runtime_error("EVP_DigestInit_ex2() failed");
-            }
-
-            std::ifstream stream(File, std::ios::binary);
-
-            const size_t FileSize = std::filesystem::file_size(File);
-            size_t Read = 0;
-            std::vector<char> Data;
-            while (Read < FileSize) {
-                Data.resize(size_t(std::min<size_t>(FileSize - Read, 4096)));
-                size_t RealDataSize = Data.size();
-                stream.read(Data.data(), std::streamsize(Data.size()));
-                if (stream.eof() || stream.fail()) {
-                    RealDataSize = size_t(stream.gcount());
-                }
-                Data.resize(RealDataSize);
-                if (RealDataSize == 0) {
-                    break;
-                }
-                if (RealDataSize > 0 && !EVP_DigestUpdate(mdctx, Data.data(), Data.size())) {
-                    EVP_MD_CTX_free(mdctx);
-                    throw std::runtime_error("EVP_DigestUpdate() failed");
-                }
-                Read += RealDataSize;
-            }
-            unsigned int sha256_len = 0;
-            if (!EVP_DigestFinal_ex(mdctx, sha256_value, &sha256_len)) {
-                EVP_MD_CTX_free(mdctx);
-                throw std::runtime_error("EVP_DigestFinal_ex() failed");
-            }
-            EVP_MD_CTX_free(mdctx);
-
-            std::string result;
-            for (size_t i = 0; i < sha256_len; i++) {
-                result += fmt::format("{:02x}", sha256_value[i]);
-            }
-            beammp_debugf("sha256('{}'): {}", File, result);
-            mMods.push_back(nlohmann::json {
-                { "file_name", std::filesystem::path(File).filename() },
-                { "file_size", std::filesystem::file_size(File) },
-                { "hash_algorithm", "sha256" },
-                { "hash", result },
-            });
-        } catch (const std::exception& e) {
-            beammp_errorf("Sha256 hashing of '{}' failed: {}", File, e.what());
-        }
-    }
-}

src/TServer.cpp

@@ -20,7 +20,6 @@
 #include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
-#include "TLuaEngine.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
 #include <TLuaPlugin.h>
@@ -124,6 +123,17 @@ TEST_CASE("GetPidVid") {
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
     beammp_info("BeamMP Server v" + Application::ServerVersionString());
     Application::SetSubsystemStatus("Server", Application::Status::Starting);
+    if (Arguments.size() > 1) {
+        Application::Settings.CustomIP = Arguments[0];
+        size_t n = std::count(Application::Settings.CustomIP.begin(), Application::Settings.CustomIP.end(), '.');
+        auto p = Application::Settings.CustomIP.find_first_not_of(".0123456789");
+        if (p != std::string::npos || n != 3 || Application::Settings.CustomIP.substr(0, 3) == "127") {
+            Application::Settings.CustomIP.clear();
+            beammp_warn("IP Specified is invalid! Ignoring");
+        } else {
+            beammp_info("server started with custom IP");
+        }
+    }
     Application::SetSubsystemStatus("Server", Application::Status::Good);
 }
 
@@ -138,6 +148,7 @@ void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
     beammp_assert(LockedClientPtr != nullptr);
     TClient& Client = *LockedClientPtr;
     beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
+    // TODO: Send delete packets for all cars
     Client.ClearCars();
     WriteLock Lock(mClientsMutex);
     mClients.erase(WeakClientPtr.lock());
@@ -165,19 +176,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
     constexpr std::string_view ABG = "ABG:";
     if (Packet.size() >= ABG.size() && std::equal(Packet.begin(), Packet.begin() + ABG.size(), ABG.begin(), ABG.end())) {
         Packet.erase(Packet.begin(), Packet.begin() + ABG.size());
-        try {
-            Packet = DeComp(Packet);
-        } catch (const InvalidDataError& ) {
-            auto LockedClient = Client.lock();
-            beammp_errorf("Failed to decompress packet from client {}. The client sent invalid data and will now be disconnected.", LockedClient->GetID());
-            Network.ClientKick(*LockedClient, "Sent invalid compressed packet (this is likely a bug on your end)");
-            return;
-        } catch (const std::runtime_error& e) {
-            auto LockedClient = Client.lock();
-            beammp_errorf("Failed to decompress packet from client {}: {}. The server might be out of RAM! The client will now be disconnected.", LockedClient->GetID(), e.what());
-            Network.ClientKick(*LockedClient, "Decompression failed (likely a server-side problem)");
-            return;
-        }
+        Packet = DeComp(Packet);
     }
     if (Packet.empty()) {
         return;
@@ -235,18 +234,16 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
         auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
         TLuaEngine::WaitForAll(Futures);
         LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
-        bool Rejected = std::any_of(Futures.begin(), Futures.end(),
-            [](const std::shared_ptr<TLuaResult>& Elem) {
-                return !Elem->Error
-                    && Elem->Result.is<int>()
-                    && bool(Elem->Result.as<int>());
-            });
-        if (!Rejected) {
-            std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
-            Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
+        if (std::any_of(Futures.begin(), Futures.end(),
+                [](const std::shared_ptr<TLuaResult>& Elem) {
+                    return !Elem->Error
+                        && Elem->Result.is<int>()
+                        && bool(Elem->Result.as<int>());
+                })) {
+            break;
         }
-        auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postChatMessage", "", !Rejected, LockedClient->GetID(), LockedClient->GetName(), Message);
-        LuaAPI::MP::Engine->ReportErrors(PostFutures);
+        std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
+        Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
         return;
     }
     case 'E':
@@ -300,7 +297,7 @@ bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
         c.SetUnicycleID(ID);
         return true;
     } else {
-        return c.GetCarCount() < Application::Settings.getAsInt(Settings::Key::General_MaxCars);
+        return c.GetCarCount() < Application::Settings.MaxCars;
     }
 }
 
@@ -328,26 +325,19 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
                     return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
                 });
 
-            bool SpawnConfirmed = false;
             if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn) {
                 c.AddNewCar(CarID, Packet);
                 Network.SendToAll(nullptr, StringToVector(Packet), true, true);
-                SpawnConfirmed = true;
             } else {
                 if (!Network.Respond(c, StringToVector(Packet), true)) {
                     // TODO: handle
                 }
                 std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
-                LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), CarID));
                 if (!Network.Respond(c, StringToVector(Destroy), true)) {
                     // TODO: handle
                 }
                 beammp_debugf("{} (force : car limit/lua) removed ID {}", c.GetName(), CarID);
-                SpawnConfirmed = false;
             }
-            auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postVehicleSpawn", "", SpawnConfirmed, c.GetID(), CarID, Packet.substr(3));
-            // the post event is not cancellable so we dont wait for it
-            LuaAPI::MP::Engine->ReportErrors(PostFutures);
         }
         return;
     case 'c': {
@@ -366,26 +356,18 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
 
             auto FoundPos = Packet.find('{');
             FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
-            bool Allowed = false;
             if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
                 && !ShouldntAllow) {
                 Network.SendToAll(&c, StringToVector(Packet), false, true);
                 Apply(c, VID, Packet);
-                Allowed = true;
             } else {
                 if (c.GetUnicycleID() == VID) {
                     c.SetUnicycleID(-1);
                 }
                 std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(VID);
                 Network.SendToAll(nullptr, StringToVector(Destroy), true, true);
-                LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
                 c.DeleteCar(VID);
-                Allowed = false;
             }
-
-            auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postVehicleEdited", "", Allowed, c.GetID(), VID, Packet.substr(3));
-            // the post event is not cancellable so we dont wait for it
-            LuaAPI::MP::Engine->ReportErrors(PostFutures);
         }
         return;
     }
@@ -421,21 +403,13 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         }
         return;
     }
-    case 't': {
+    case 't':
         beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
-        if (MaybePidVid) {
-            std::tie(PID, VID) = MaybePidVid.value();
-        }
-        if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            Network.SendToAll(&c, StringToVector(Packet), false, true);
-        }
-        return;
-    }
-    case 'm': {
         Network.SendToAll(&c, StringToVector(Packet), false, true);
         return;
-    }
+    case 'm':
+        Network.SendToAll(&c, StringToVector(Packet), true, true);
+        return;
     default:
         beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
         return;

src/main.cpp

@@ -20,7 +20,6 @@
 #include "Common.h"
 #include "Http.h"
 #include "LuaAPI.h"
-#include "Settings.h"
 #include "SignalHandling.h"
 #include "TConfig.h"
 #include "THeartbeatThread.h"
@@ -36,19 +35,19 @@
 #include <thread>
 
 static const std::string sCommandlineArguments = R"(
-USAGE:
+USAGE: 
     BeamMP-Server [arguments]
-
+    
 ARGUMENTS:
-    --help
+    --help              
                         Displays this help and exits.
     --port=1234
                         Sets the server's listening TCP and
                         UDP port. Overrides ENV and ServerConfig.
     --config=/path/to/ServerConfig.toml
-                        Absolute or relative path to the
+                        Absolute or relative path to the 
                         Server Config file, including the
-                        filename. For paths and filenames with
+                        filename. For paths and filenames with 
                         spaces, put quotes around the path.
     --working-directory=/path/to/folder
                         Sets the working directory of the Server.
@@ -59,7 +58,7 @@ ARGUMENTS:
 
 EXAMPLES:
     BeamMP-Server --config=../MyWestCoastServerConfig.toml
-        Runs the BeamMP-Server and uses the server config file
+        Runs the BeamMP-Server and uses the server config file 
         which is one directory above it and is named
         'MyWestCoastServerConfig.toml'.
 )";
@@ -151,7 +150,7 @@ int BeamMPServerMain(MainArguments Arguments) {
                 beammp_errorf("Custom port requested via --port is invalid: '{}'", Port.value());
                 return 1;
             } else {
-                Application::Settings.set(Settings::Key::General_Port, P);
+                Application::Settings.Port = P;
                 beammp_info("Custom port requested via commandline arguments: " + Port.value());
             }
         }
@@ -166,9 +165,6 @@ int BeamMPServerMain(MainArguments Arguments) {
 
     SetupSignalHandlers();
 
-    Settings settings {};
-    beammp_infof("Server name set in new impl: {}", settings.getAsString(Settings::Key::General_Name));
-
     bool Shutdown = false;
     Application::RegisterShutdownHandler([&Shutdown] {
         beammp_info("If this takes too long, you can press Ctrl+C repeatedly to force a shutdown.");
@@ -190,7 +186,6 @@ int BeamMPServerMain(MainArguments Arguments) {
 
     beammp_trace("Running in debug mode on a debug build");
     TResourceManager ResourceManager;
-    ResourceManager.RefreshFiles();
     TPPSMonitor PPSMonitor(Server);
     THeartbeatThread Heartbeat(ResourceManager, Server);
     TNetwork Network(Server, PPSMonitor, ResourceManager);
@@ -198,7 +193,11 @@ int BeamMPServerMain(MainArguments Arguments) {
     PPSMonitor.SetNetwork(Network);
     Application::CheckForUpdates();
 
-    TPluginMonitor PluginMonitor(fs::path(Application::Settings.getAsString(Settings::Key::General_ResourceFolder)) / "Server", LuaEngine);
+    TPluginMonitor PluginMonitor(fs::path(Application::Settings.Resource) / "Server", LuaEngine);
+
+    if (Application::Settings.HTTPServerEnabled) {
+        Http::Server::THttpServerInstance HttpServerInstance {};
+    }
 
     Application::SetSubsystemStatus("Main", Application::Status::Good);
     RegisterThread("Main(Waiting)");

vcpkg.json

@@ -13,6 +13,7 @@
     "nlohmann-json",
     "openssl",
     "rapidjson",
-    "sol2"
+    "sol2",
+    "toml11"
   ]
 }