add RateLimiter class

refactor dos protection
Merge branch 'simple-dos-protected' of github.com:Igor20264/BeamMP-Server into simple-dos-protected
2026-07-13 02:03:44 +00:00 · 2024-06-20 16:39:03 +02:00 · 2024-06-20 07:28:55 +02:00 · 2024-06-18 16:49:04 +02:00 · 2024-05-06 22:21:10 +03:00 · 2024-03-29 10:56:05 +03:00
82 changed files with 1341 additions and 3936 deletions
@@ -1,6 +0,0 @@
-Please replace this text <-> with your PR description and leave the below declarations intact.
-
---
-
-By creating this pull request, I understand that code that is AI generated or otherwise automatically generated may be rejected without further discussion.
-I declare that I fully understand all code I pushed into this PR, and wrote all this code myself and own the rights to this code.
@@ -3,11 +3,11 @@ name: Linux
 on:
  push:
    branches:
-      - "develop"
-      - "minor"
+      - 'develop'
+      - 'minor'
  pull_request:

-env:
+env: 
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
  VCPKG_FORCE_SYSTEM_BINARIES: 1
  CMAKE_BUILD_TYPE: "Release"
@@ -20,19 +20,19 @@ jobs:
      matrix:
        include:
          - distro: debian
-            version: 12
+            version: 11
          - distro: debian
-            version: 13
+            version: 12
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 24.04
+            version: 20.04
    container:
      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -47,8 +47,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: "recursive"
-          fetch-depth: 0
+          submodules: 'recursive'

      - name: Git config safe directory
        shell: bash
@@ -64,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
@@ -85,26 +84,26 @@ jobs:
        run: ./bin/BeamMP-Server-tests

  arm64-matrix:
-    runs-on: ubuntu-22.04-arm
+    runs-on: [Linux, ARM64]
    env:
      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
    strategy:
      matrix:
        include:
          - distro: debian
-            version: 12
+            version: 11
          - distro: debian
-            version: 13
+            version: 12
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 24.04
+            version: 20.04
    container:
      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -119,8 +118,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: "recursive"
-          fetch-depth: 0
+          submodules: 'recursive'

      - name: Git config safe directory
        shell: bash
@@ -136,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
@@ -155,3 +153,4 @@ jobs:

      - name: Test
        run: ./bin/BeamMP-Server-tests
+
@@ -3,7 +3,7 @@ on:
  push:
    # Sequence of patterns matched against refs/tags
    tags:
-      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10

 env:
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
@@ -14,8 +14,8 @@ jobs:
  create-release:
    runs-on: ubuntu-latest
    name: Create Release
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    outputs: 
+      upload_url: ${{ steps.create_release.outputs.upload_url }} 
    steps:
      - name: Create Release
        id: create_release
@@ -39,19 +39,19 @@ jobs:
      matrix:
        include:
          - distro: debian
-            version: 12
+            version: 11
          - distro: debian
-            version: 13
+            version: 12
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 24.04
+            version: 20.04
    container:
      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -66,8 +66,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: "recursive"
-          fetch-depth: 0
+          submodules: 'recursive'

      - name: Git config safe directory
        shell: bash
@@ -83,7 +82,7 @@ jobs:
        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Upload Release Asset
-        id: upload-release-asset
+        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -105,19 +104,19 @@ jobs:
          asset_content_type: application/x-elf

  arm64-matrix:
-    runs-on: ubuntu-22.04-arm
+    runs-on: [Linux, ARM64]
    needs: create-release
    strategy:
      matrix:
        include:
          - distro: debian
-            version: 12
+            version: 11
          - distro: debian
-            version: 13
+            version: 12
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 24.04
+            version: 20.04
    env:
      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
      VCPKG_FORCE_SYSTEM_BINARIES: 1
@@ -126,7 +125,7 @@ jobs:
    steps:
      - name: get-cmake
        uses: lukka/get-cmake@v3.28.1
-
+            
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
@@ -141,8 +140,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: "recursive"
-          fetch-depth: 0
+          submodules: 'recursive'

      - name: Git config safe directory
        shell: bash
@@ -158,7 +156,7 @@ jobs:
        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Upload Release Asset
-        id: upload-release-asset
+        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -195,8 +193,7 @@ jobs:

      - uses: actions/checkout@v2
        with:
-          submodules: "recursive"
-          fetch-depth: 0
+          submodules: 'recursive'

      - name: Create Build Environment
        shell: bash
@@ -207,7 +204,7 @@ jobs:
        run: bash ./scripts/windows/2-build.sh

      - name: Upload Release Asset
-        id: upload-release-asset
+        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -26,7 +26,6 @@ jobs:
      - uses: actions/checkout@v2
        with:
          submodules: 'recursive'
-          fetch-depth: 0

      - name: Setup vcpkg
        uses: lukka/run-vcpkg@v11
@@ -42,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
@@ -1,4 +1,5 @@
 .idea/
+.sentry-native/
 *.orig
 *.toml
 boost_*
@@ -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
@@ -8,7 +8,7 @@ include(cmake/Vcpkg.cmake) # needs to happen before project()

 project(
    "BeamMP-Server" # replace this
-    VERSION 3.9.3
+    VERSION 3.3.0
 )

 include(cmake/StandardSettings.cmake)
@@ -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,11 +35,11 @@ set(PRJ_HEADERS
    include/Json.h
    include/LuaAPI.h
    include/RWMutex.h
+    include/RateLimiter.h
    include/SignalHandling.h
    include/TConfig.h
    include/TConsole.h
    include/THeartbeatThread.h
-    include/TIoPollThread.h
    include/TLuaEngine.h
    include/TLuaPlugin.h
    include/TNetwork.h
@@ -50,12 +50,8 @@ set(PRJ_HEADERS
    include/TServer.h
    include/VehicleData.h
    include/Env.h
-    include/Settings.h
    include/Profiling.h
    include/ChronoWrapper.h
-    include/TConnectionLimiter.h
-    include/TLuaResult.h
-    include/RegionHandler.h
 )
 # add all source files (.cpp) to this, except the one with main()
 set(PRJ_SOURCES
@@ -69,7 +65,6 @@ set(PRJ_SOURCES
    src/TConfig.cpp
    src/TConsole.cpp
    src/THeartbeatThread.cpp
-    src/TIoPollThread.cpp
    src/TLuaEngine.cpp
    src/TLuaPlugin.cpp
    src/TNetwork.cpp
@@ -78,14 +73,11 @@ 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
-    src/TConnectionLimiter.cpp
-    src/TLuaResult.cpp
-    src/RegionHandler.cpp
 )

 find_package(Lua REQUIRED)
@@ -101,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
@@ -112,7 +104,6 @@ set(PRJ_LIBRARIES
    httplib::httplib
    libzip::zip
    OpenSSL::SSL OpenSSL::Crypto
-    CURL::libcurl
    ${LUA_LIBRARIES}
 )

@@ -125,8 +116,7 @@ find_package(httplib CONFIG REQUIRED)
 find_package(libzip CONFIG REQUIRED)
 find_package(RapidJSON CONFIG REQUIRED)
 find_package(sol2 CONFIG REQUIRED)
-find_package(CURL CONFIG REQUIRED)
-add_subdirectory("deps/toml11")
+find_package(toml11 CONFIG REQUIRED)

 include_directories(include)

@@ -135,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.

 ####################
@@ -156,8 +146,7 @@ if(UNIX)
 endif(UNIX)

 if (WIN32)
-    add_compile_definitions(_WIN32_WINNT=0x0A00)
-
+    add_compile_options("-D_WIN32_WINNT=0x0601")
    add_compile_options("/bigobj")
 endif(WIN32)

@@ -175,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
@@ -108,8 +108,8 @@ A BeamMP-Developer must review your code in detail, and leave a review. If this
 5. Run `git submodule update --init --recursive`.
 6. Make a new branch for your feature or fix from the branch you are on. You can do this via `git checkout -b <branch name>`. See [this section on branches](#branches) for more info on branch naming.
 7. Install all dependencies. Those are usually listed in the `README.md` in the branch you're in, or, more reliably, in one of the files in `.github/workflows` (if you can read `yaml`).
-8. Run CMake to configure the project. You can find tutorials on this online. You will want to tell CMake to build with `CMAKE_BUILD_TYPE=Debug`, for example by passing it to CMake via the commandline switch `-DCMAKE_BUILD_TYPE=Debug`. An example invocation on Linux with GNU make would be 
-`cmake . -DCMAKE_BUILD_TYPE=Debug` . 
+8. Run CMake to configure the project. You can find tutorials on this online. You will want to tell CMake to build with `CMAKE_BUILD_TYPE=Debug`, for example by passing it to CMake via the commandline switch `-DCMAKE_BUILD_TYPE=Debug`. You may also want to turn off sentry by setting `SENTRY_BACKEND=none` (for example via commandline switch `-DSENTRY_BACKEND=none`). An example invocation on Linux with GNU make would be 
+`cmake . -DCMAKE_BUILD_TYPE=Debug -DSENTRY_BACKEND=none` . 
 9. Build the `BeamMP-Server` target to build the BeamMP-Server, or the `BeamMP-Server-tests` target to build the unit-tests (does not include a working server). In the example from 8. (on Linux), you could build with  `make BeamMP-Server`, `make -j BeamMP-Server` or `cmake --build . --parallel --target BeamMP-Server` . Or, on Windows, (in Visual Studio), you would just press some big green "run" or "debug" button.
 10. When making changes, refer to [this section on how to commit properly](#how-to-commit). Not following those guidelines will result in your changes being rejected, so please take a look.
 11. Make sure to add Unit-tests with `doctest` if you build new stuff. You can find examples all over the latest version of the codebase (search for `TEST_CASE`).
@@ -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
@@ -38,7 +38,7 @@ If you need support with understanding the codebase, please write us in the Disc

 ## About Building from Source

-We only allow building unmodified (original) source code for public use. `master` is considered **unstable** and we will not provide technical support if such a build doesn't work, so always build from a tag. You can checkout a tag with `git checkout tags/TAGNAME`, where `TAGNAME` is the tag, for example `v3.4.1`. See [the tags](https://github.com/BeamMP/BeamMP-Server/tags) for possible versions/tags, as well as [the releases](https://github.com/BeamMP/BeamMP-Server/releases) to check which version is marked as a release/prerelease. We recommend using the [latest release](https://github.com/BeamMP/BeamMP-Server/releases/latest).
+We only allow building unmodified (original) source code for public use. `master` is considered **unstable** and we will not provide technical support if such a build doesn't work, so always build from a tag. You can checkout a tag with `git checkout tags/TAGNAME`, where `TAGNAME` is the tag, for example `v3.1.0`. 

 ## Supported Operating Systems

@@ -66,10 +66,9 @@ You can build on **Windows, Linux** or other platforms by following these steps:

 1. Check out the repository with git: `git clone --recursive https://github.com/BeamMP/BeamMP-Server`.
 2. Go into the directory `cd BeamMP-Server`.
-3. Specify the server version to build by checking out a tag: `git checkout tags/v3.4.1` - [Possible versions/tags](https://github.com/BeamMP/BeamMP-Server/tags)
-4. Run CMake `cmake -S . -B bin -DCMAKE_BUILD_TYPE=Release` - this can take a few minutes and may take a lot of disk space and bandwidth.
-5. Build via `cmake --build bin --parallel --config Release -t BeamMP-Server`.
-6. Your executable can be found in `bin/`.
+3. Run CMake `cmake -S . -B bin -DCMAKE_BUILD_TYPE=Release` - this can take a few minutes and may take a lot of disk space and bandwidth.
+4. Build via `cmake --build bin --parallel --config Release -t BeamMP-Server`.
+5. Your executable can be found in `bin/`.

 When you make changes to the code, you only have to run step 4 again.
 ### Building for FreeBSD
@@ -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
@@ -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")
@@ -15,5 +15,3 @@ if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
    set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
 endif()

-# ensure SOL2 safeties are all ON
-add_compile_definitions(SOL_ALL_SAFETIES_ON=1)
@@ -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);
 }
@@ -18,14 +18,12 @@

 #pragma once

-#include <atomic>
 #include <chrono>
 #include <memory>
 #include <optional>
 #include <queue>
 #include <string>
 #include <unordered_set>
-#include <utility>

 #include "BoostAliases.h"
 #include "Common.h"
@@ -58,27 +56,27 @@ public:
    ~TClient();
    TClient& operator=(const TClient&) = delete;

-    void AddNewCar(int Ident, const nlohmann::json& Data);
-    void SetCarData(int Ident, const nlohmann::json& Data);
+    void AddNewCar(int Ident, const std::string& Data);
+    void SetCarData(int Ident, const std::string& Data);
    void SetCarPosition(int Ident, const std::string& Data);
    TVehicleDataLockPair GetAllCars();
    void SetName(const std::string& Name) { mName = Name; }
    void SetRoles(const std::string& Role) { mRole = Role; }
    void SetIdentifier(const std::string& key, const std::string& value) { mIdentifiers[key] = value; }
-    nlohmann::json GetCarData(int Ident);
+    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); }
-    // Returns true only for the thread that actually performs socket shutdown/close.
-    [[nodiscard]] bool Disconnect(std::string_view Reason);
-    bool IsDisconnected() const {
-        return mDisconnectState.load(std::memory_order_acquire) != EDisconnectState::Connected;
-    }
+    void Disconnect(std::string_view Reason);
+    bool IsDisconnected() const { return !mSocket.is_open(); }
    // locks
    void DeleteCar(int Ident);
    [[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; }
@@ -90,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; }
@@ -102,24 +100,16 @@ 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();
-    void SetMagic(std::vector<uint8_t> magic) { mMagic = std::move(magic); }
-    [[nodiscard]] const std::vector<uint8_t>& GetMagic() const { return mMagic; }

 private:
-    enum class EDisconnectState {
-        Connected,
-        Disconnecting,
-        Disconnected
-    };
-
    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;
@@ -131,16 +121,14 @@ private:
    TSetOfVehicleData mVehicleData;
    SparseArray<std::string> mVehiclePosition;
    std::string mName = "Unknown Client";
-    // Once disconnect starts, this client is terminal and its socket must be treated as dead.
-    std::atomic<EDisconnectState> mDisconnectState { EDisconnectState::Connected };
    ip::tcp::socket mSocket;
+    ip::tcp::socket mDownSocket;
    ip::udp::endpoint mUDPAddress {};
    int mUnicycleID = -1;
    std::string mRole;
    std::string mDID;
    int mID = -1;
    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime = std::chrono::high_resolution_clock::now();
-    std::vector<uint8_t> mMagic;
 };

 std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);
@@ -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()>;

@@ -74,18 +100,20 @@ public:
    static TConsole& Console() { return mConsole; }
    static std::string ServerVersionString();
    static const Version& ServerVersion() { return mVersion; }
-    static Version ClientMinimumVersion() { return Version { 2, 7, 0 }; }
+    static uint8_t ClientMajorVersion() { return 2; }
    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();
+    static std::vector<std::string> GetBackendUrlsInOrder() {
+        return {
+            "backend.beammp.com",
+        };
+    }

-    static std::string GetServerCheckUrl();
-
-    static std::string GetBackendUrlForAuth();
-    static std::string GetBackendUrlForSocketIO();
+    static std::string GetBackendUrlForAuth() { return "auth.beammp.com"; }
+    static std::string GetBackendUrlForSocketIO() { return "https://backend.beammp.com"; }
    static void CheckForUpdates();
    static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
    static bool IsOutdated(const Version& Current, const Version& Newest);
@@ -124,18 +152,11 @@ private:
    static inline bool mShutdown { false };
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};
-    static inline int mTLDIndex { 0 };
-    static inline std::vector<std::string> mValidTLDs {"beammp.com", "beammp.ru"};

-    static inline Version mVersion { 3, 9, 3 };
+    static inline Version mVersion { 3, 5, 0 };
 };

-/// Used to static_assert in std::visit
-template<class>
-inline constexpr bool AlwaysFalseV = false;
-
 void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);
-std::string LowerString(std::string str);

 std::string ThreadName(bool DebugModeOverride = false);
 void RegisterThread(const std::string& str);
@@ -144,6 +165,7 @@ void RegisterThread(const std::string& str);
 #define KB 1024llu
 #define MB (KB * 1024llu)
 #define GB (MB * 1024llu)
+#define SSU_UNRAW SECRET_SENTRY_URL

 #define _file_basename std::filesystem::path(__FILE__).filename().string()
 #define _line std::to_string(__LINE__)
@@ -166,13 +188,13 @@ void RegisterThread(const std::string& str);
    #else
        #define _function_name std::string(__func__)
    #endif
-
+    
    #ifndef NDEBUG
        #define DEBUG
    #endif
-
+    
    #if defined(DEBUG)
-
+        
        // if this is defined, we will show the full function signature infront of
        // each info/debug/warn... call instead of the 'filename:line' format.
        #if defined(BMP_FULL_FUNCTION_NAMES)
@@ -182,7 +204,7 @@ void RegisterThread(const std::string& str);
        #endif

    #endif // defined(DEBUG)
-
+    
    #define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
    #define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
    #define beammp_error(x)                                                               \
@@ -204,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)
@@ -218,14 +240,14 @@ 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)
    #else
        #define beammp_trace(x)
    #endif // defined(DEBUG)
-
+    
    #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
    #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
    #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
@@ -267,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") {
-    }
-};
@@ -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
@@ -26,9 +26,7 @@ enum class Key {
    // provider settings
    PROVIDER_UPDATE_MESSAGE,
    PROVIDER_DISABLE_CONFIG,
-    PROVIDER_DISABLE_MP_SET,
    PROVIDER_PORT_ENV,
-    PROVIDER_IP_ENV
 };

 std::optional<std::string> Get(Key key);
@@ -23,7 +23,6 @@
 #include <filesystem>
 #include <string>
 #include <unordered_map>
-#include <curl/curl.h>

 #if defined(BEAMMP_LINUX)
 #pragma GCC diagnostic push
@@ -39,8 +38,8 @@
 namespace fs = std::filesystem;

 namespace Http {
-std::string GET(const std::string& url, unsigned int* status = nullptr);
-std::string POST(const std::string& url, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr, const std::map<std::string, std::string>& headers = {});
+std::string GET(const std::string& host, int port, const std::string& target, unsigned int* status = nullptr);
+std::string POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr, const httplib::Headers& headers = {});
 namespace Status {
    std::string ToString(int code);
 }
@@ -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"
@@ -34,12 +34,9 @@ namespace MP {
    std::pair<bool, std::string> TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
    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, const bool& LogChat = true);
-    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> ConfirmationDialog(int ID, const std::string& Title, const std::string& Body, const sol::table& buttons, const std::string& InteractionID, const bool& warning = false, const bool& reportToServer = true, const bool& reportToExtensions = true);
+    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
    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);
@@ -6,9 +6,6 @@
 #include <limits>
 #include <unordered_map>

-#undef max
-#undef min
-
 namespace prof {

 using Duration = std::chrono::duration<double, std::milli>;
@@ -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;
@@ -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);
+};
@@ -1,33 +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 <vector>
-#include <string>
-#include <array>
-
-class RegionHandler final {
-public:
-    RegionHandler() = delete;
-    static void TopLevelDomainFailed();
-    static std::string RegionToTopLevelDomain();
-private:
-    static inline unsigned int mRegionIndex { 0 };
-    const static inline std::array<std::string, 2> mValidTLDs {"beammp.com", "beammp.ru"};
-};
@@ -1,145 +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_ImScaredOfUpdates,
-        Misc_UpdateReminderTime,
-
-        // [General]
-        General_Description,
-        General_Tags,
-        General_MaxPlayers,
-        General_Name,
-        General_Map,
-        General_AuthKey,
-        General_Private,
-        General_IP,
-        General_Port,
-        General_MaxCars,
-        General_LogChat,
-        General_ResourceFolder,
-        General_Debug,
-        General_AllowGuests,
-        General_InformationPacket,
-        General_Region,
-    };
-
-    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);
-};
@@ -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>;
@@ -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;
@@ -1,90 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2026 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 <mutex>
-#include <optional>
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-class TConnectionLimiter {
-public:
-    struct TStats {
-        size_t CurrentGlobal = 0;
-        size_t MaxGlobal = 0;
-        size_t ActiveIpBuckets = 0;
-        size_t CurrentMaxPerIp = 0;
-        size_t MaxPerIp = 0;
-        size_t SaturatedIpBuckets = 0;
-    };
-
-    class TGuard {
-    public:
-        TGuard() = default;
-        TGuard(TConnectionLimiter* owner, std::string ip);
-
-        TGuard(const TGuard&) = delete;
-        TGuard& operator=(const TGuard&) = delete;
-
-        ~TGuard() { Release(); }
-
-        // not threadsafe
-        TGuard(TGuard&& other) noexcept { *this = std::move(other); }
-        // not threadsafe
-        TGuard& operator=(TGuard&& other) noexcept;
-
-    private:
-        friend class TConnectionLimiter;
-
-        // not threadsafe
-        void Release();
-
-        TConnectionLimiter* mOwner { nullptr };
-        std::string mIp;
-    };
-
-    TConnectionLimiter(size_t maxPerIp, size_t maxGlobal);
-
-    [[nodiscard]] std::optional<TGuard> TryAcquire(const std::string& ip);
-    [[nodiscard]] TStats GetStats();
-
-private:
-    void Release(const std::string& ip) {
-        std::unique_lock Lock { mMutex };
-        auto It = mPerIp.find(ip);
-        if (It != mPerIp.end()) {
-            // this guard exists to avoid underflow in case something goes wrong and this gets called too many times
-            if (It->second > 0)
-                --It->second;
-            if (It->second == 0)
-                mPerIp.erase(It);
-        }
-        // this guard exists to avoid underflow in case something goes wrong and this gets called too many times
-        if (mGlobal > 0)
-            --mGlobal;
-    }
-
-    const size_t mMaxPerIp;
-    const size_t mMaxGlobal;
-
-    std::mutex mMutex { };
-    std::unordered_map<std::string, size_t> mPerIp { };
-    size_t mGlobal = 0;
-};
@@ -59,9 +59,6 @@ private:
    void Command_Settings(const std::string& cmd, const std::vector<std::string>& args);
    void Command_Clear(const std::string&, const std::vector<std::string>& args);
    void Command_Version(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_ProtectMod(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_ReloadMods(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_NetTest(const std::string& cmd, const std::vector<std::string>& args);

    void Command_Say(const std::string& FullCommand);
    bool EnsureArgsCount(const std::vector<std::string>& args, size_t n);
@@ -80,9 +77,6 @@ private:
        { "clear", [this](const auto& a, const auto& b) { Command_Clear(a, b); } },
        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
        { "version", [this](const auto& a, const auto& b) { Command_Version(a, b); } },
-        { "protectmod", [this](const auto& a, const auto& b) { Command_ProtectMod(a, b); } },
-        { "reloadmods", [this](const auto& a, const auto& b) { Command_ReloadMods(a, b); } },
-        { "nettest", [this](const auto& a, const auto& b) { Command_NetTest(a, b); } },
    };

    std::unique_ptr<Commandline> mCommandline { nullptr };
@@ -29,7 +29,6 @@ public:
    //~THeartbeatThread();
    void operator()() override;

-    static inline std::string lastCall = "";
 private:
    std::string GenerateCall();
    std::string GetPlayers();
@@ -1,36 +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 <boost/asio/io_context.hpp>
-#include <boost/asio/executor_work_guard.hpp>
-#include <thread>
-
-class TIoPollThread {
-public:
-    TIoPollThread();
-    ~TIoPollThread();
-
-    boost::asio::io_context& IoCtx() noexcept { return mIoCtx; }
-
-private:
-    boost::asio::io_context mIoCtx;
-    boost::asio::executor_work_guard<boost::asio::io_context::executor_type> mWorkGuard;
-    std::jthread mThread;
-};
@@ -19,12 +19,13 @@
 #pragma once

 #include "Profiling.h"
-#include "TLuaResult.h"
 #include "TNetwork.h"
 #include "TServer.h"
+#include <any>
 #include <chrono>
 #include <condition_variable>
 #include <filesystem>
+#include <initializer_list>
 #include <list>
 #include <lua.hpp>
 #include <memory>
@@ -33,8 +34,6 @@
 #include <queue>
 #include <random>
 #include <set>
-#include <sol/forward.hpp>
-#include <sol/protected_function_result.hpp>
 #include <toml.hpp>
 #include <unordered_map>
 #include <vector>
@@ -59,10 +58,36 @@ namespace fs = std::filesystem;
 /**
 * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
 */
-using TLuaValue = std::variant<std::monostate, std::string, int, JsonString, bool, std::unordered_map<std::string, std::string>, float>;
+using TLuaValue = std::variant<std::string, int, JsonString, bool, std::unordered_map<std::string, std::string>, float>;
+enum TLuaType {
+    String = 0,
+    Int = 1,
+    Json = 2,
+    Bool = 3,
+    StringStringMap = 4,
+    Float = 5,
+};

 class TLuaPlugin;

+struct TLuaResult {
+    bool Ready;
+    bool Error;
+    std::string ErrorMessage;
+    sol::object Result { sol::lua_nil };
+    TLuaStateId StateId;
+    std::string Function;
+    std::shared_ptr<std::mutex> ReadyMutex {
+        std::make_shared<std::mutex>()
+    };
+    std::shared_ptr<std::condition_variable> ReadyCondition {
+        std::make_shared<std::condition_variable>()
+    };
+
+    void MarkAsReady();
+    void WaitUntilReady();
+};
+
 struct TLuaPluginConfig {
    static inline const std::string FileName = "PluginConfig.toml";
    TLuaStateId StateId;
@@ -141,8 +166,8 @@ public:
        const std::optional<std::chrono::high_resolution_clock::duration>& Max = std::nullopt);
    void ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results);
    bool HasState(TLuaStateId StateId);
-    [[nodiscard]] std::shared_ptr<TLuaVoidResult> 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> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
+    [[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);
    /**
@@ -167,7 +192,7 @@ public:
        for (const auto& Event : mLuaEvents.at(EventName)) {
            for (const auto& Function : Event.second) {
                if (Event.first != IgnoreId) {
-                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments, EventName));
+                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments));
                }
            }
        }
@@ -184,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;
    }
@@ -202,9 +227,9 @@ public:

    // Debugging functions (slow)
    std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> Debug_GetEventsForState(TLuaStateId StateId);
-    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaVoidResult>>> Debug_GetStateExecuteQueueForState(TLuaStateId StateId);
+    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueueForState(TLuaStateId StateId);
    std::vector<QueuedFunction> Debug_GetStateFunctionQueueForState(TLuaStateId StateId);
-    std::vector<TLuaResult::DetachedSnapshot> Debug_GetResultsToCheckForState(TLuaStateId StateId);
+    std::vector<TLuaResult> Debug_GetResultsToCheckForState(TLuaStateId StateId);

 private:
    void CollectAndInitPlugins();
@@ -217,8 +242,8 @@ private:
        StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
        StateThreadData(const StateThreadData&) = delete;
        virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
-        [[nodiscard]] std::shared_ptr<TLuaVoidResult> 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> EnqueueScript(const TLuaChunk& Script);
+        [[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
@@ -229,14 +254,13 @@ private:
        std::vector<std::string> GetStateTableKeys(const std::vector<std::string>& keys);

        // Debug functions, slow
-        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaVoidResult>>> Debug_GetStateExecuteQueue();
+        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
        std::vector<TLuaEngine::QueuedFunction> Debug_GetStateFunctionQueue();

    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);
@@ -254,7 +278,7 @@ private:
        TLuaStateId mStateId;
        lua_State* mState;
        std::thread mThread;
-        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaVoidResult>>> mStateExecuteQueue;
+        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> mStateExecuteQueue;
        std::recursive_mutex mStateExecuteQueueMutex;
        std::vector<QueuedFunction> mStateFunctionQueue;
        std::mutex mStateFunctionQueueMutex;
@@ -1,146 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2026 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 "Common.h"
-#include <condition_variable>
-#include <string>
-#include <memory>
-#include <sol/sol.hpp>
-
-using TLuaStateId = std::string;
-
-struct TDetachedLuaValue {
-    using Ptr = std::shared_ptr<TDetachedLuaValue>;
-    using Array = std::vector<TDetachedLuaValue>;
-    // This weird Ptr indirection is needed because some implementations of libstc++,
-    // like the GCC 11 one shipped with ubuntu 22.04, need to know the size of the second
-    // member of the pairs that make up the elements of such a map. It's fine in vector.
-    using Object = std::unordered_map<std::string, TDetachedLuaValue::Ptr>;
-    std::variant<std::monostate, bool, double, int, std::string, Array, Object> V;
-};
-std::ostream& operator<<(std::ostream& os, const TDetachedLuaValue& value);
-
-/// Result for operations that stay within one Lua state (e.g. script loads).
-/// This type intentionally does not store any Lua references or serialized Lua values.
-struct TLuaVoidResult {
-    struct Snapshot {
-        bool Error;
-        bool Ready;
-        std::string ErrorMessage;
-        TLuaStateId StateId;
-    };
-
-    explicit TLuaVoidResult(TLuaStateId StateId)
-        : mStateId(std::move(StateId)) {}
-
-    /// Marks this result as success & sets it as ready, waking all waiting threads.
-    void MarkReadySuccess();
-    /// Marks this result as erroneous & sets it as ready, waking all waiting threads.
-    void MarkReadyError(sol::protected_function_result Res);
-    /// Marks this result as erroneous & sets it as ready, waking all waiting threads.
-    void MarkReadyError(std::string Res);
-    /// Wait (suspend) until this result is ready.
-    void WaitUntilReady();
-    bool IsReady() const;
-    bool IsError() const;
-    Snapshot GetSnapshot() const;
-
-private:
-    mutable std::mutex mMutex {};
-    bool mReady { false };
-    bool mError { false };
-    std::string mErrorMessage;
-    TLuaStateId mStateId;
-    std::condition_variable mReadyCondition {};
-
-    void SetErrorMessageFromResult(sol::protected_function_result& Res) {
-        if (Res.valid()) {
-            beammp_lua_errorf("Error was not an error");
-        }
-        if (Res.get_type() == sol::type::string) {
-            mErrorMessage = Res.get<sol::error>().what();
-        } else {
-            mErrorMessage = "(unknown error; error object is not inspectable)";
-        }
-    }
-
-    void MarkAsReady();
-};
-
-struct TLuaResult {
-    struct DetachedSnapshot {
-        bool Error;
-        bool Ready;
-        std::string ErrorMessage;
-        /// Serialized Lua result. Has no reference to the Lua state, and is safe to use
-        /// from any thread that acquires it.
-        TDetachedLuaValue Result;
-        TLuaStateId StateId;
-        std::string Function;
-    };
-
-
-    TLuaResult(TLuaStateId StateId, std::string FunctionName) : mStateId(StateId), mFunction(std::move(FunctionName)) {}
-
-    /// Marks this result as success & sets it as ready, waking all threads waiting on it.
-    void MarkReadySuccess(sol::object Res);
-    /// Marks this result as successful and ready without serializing a Lua value.
-    void MarkReadySuccessNoResult();
-    /// Marks this result as erroneous & sets it as ready, waking all threads waiting on it.
-    void MarkReadyError(sol::protected_function_result Res);
-    /// Marks this result as erroneous & sets it as ready, waking all threads waiting on it.
-    void MarkReadyError(std::string Res);
-    /// Wait (suspend) until this result is ready. Use `GetDetachedSnapshot` to get the result.
-    void WaitUntilReady();
-    bool IsReady() const;
-    bool IsError() const;
-    TLuaStateId OwnerState() const;
-    void SetOwnerState(TLuaStateId StateId);
-
-    /// Returns a snapshot with, if not an error, a serialized version of the result
-    /// object. This never stores or returns raw Lua references and is safe to use
-    /// across threads.
-    DetachedSnapshot GetDetachedSnapshot() const;
-
-private:
-    mutable std::mutex mMutex {};
-    bool mReady { false };
-    bool mError { false };
-    std::string mErrorMessage;
-    TDetachedLuaValue mDetachedResult;
-    TLuaStateId mStateId;
-    std::string mFunction;
-    std::condition_variable mReadyCondition {};
-
-    TDetachedLuaValue Freeze(const sol::object& o, int depth = 0);
-
-    void SetErrorMessageFromResult(sol::protected_function_result& Res) {
-        if (Res.valid()) {
-            beammp_lua_errorf("Error was not an error");
-        }
-        if (Res.get_type() == sol::type::string) {
-            mErrorMessage = Res.get<sol::error>().what();
-        } else {
-            mErrorMessage = "(unknown error; error object is not inspectable)";
-        }
-    }
-
-    void MarkAsReady();
-};
@@ -20,9 +20,9 @@

 #include "BoostAliases.h"
 #include "Compat.h"
-#include "TConnectionLimiter.h"
 #include "TResourceManager.h"
 #include "TServer.h"
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/udp.hpp>

 struct TConnection;
@@ -34,38 +34,30 @@ public:
    [[nodiscard]] bool TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync = false);
    [[nodiscard]] bool SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync = false);
    [[nodiscard]] bool Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync = false);
-    std::shared_ptr<TClient> CreateClient(boost::asio::ip::tcp::socket&& TCPSock);
-    std::vector<uint8_t> TCPRcv(TClient& c, bool WithTimeout = false);
+    std::shared_ptr<TClient> CreateClient(ip::tcp::socket&& TCPSock);
+    std::vector<uint8_t> TCPRcv(TClient& c);
    void ClientKick(TClient& c, const std::string& R);
-    void DisconnectClient(const std::weak_ptr<TClient>& c, const std::string& R);
-    void DisconnectClient(TClient& c, const std::string& R);
    [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
-    void Identify(TConnection&& client, TConnectionLimiter::TGuard&&);
+    void Identify(TConnection&& client);
    std::shared_ptr<TClient> Authentication(TConnection&& ClientConnection);
    void SyncResources(TClient& c);
    [[nodiscard]] bool UDPSend(TClient& Client, std::vector<uint8_t> Data);
    void SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self, bool Rel);
    void UpdatePlayer(TClient& Client);
-    boost::system::error_code ReadWithTimeout(boost::asio::ip::tcp::socket& Socket, void* Buf, size_t Len, std::chrono::steady_clock::duration Timeout);
-    boost::system::error_code ReadWithTimeout(TConnection& Connection, void* Buf, size_t Len, std::chrono::steady_clock::duration Timeout);
-    [[nodiscard]] TConnectionLimiter::TStats GetConnectionLimiterStats() { return mConnectionLimiter.GetStats(); }
-
-    TResourceManager& ResourceManager() const { return mResourceManager; }

 private:
    void UDPServerMain();
    void TCPServerMain();
-
    TServer& mServer;
    TPPSMonitor& mPPSMonitor;
-    boost::asio::ip::udp::socket mUDPSock;
+    ip::udp::socket mUDPSock;
    TResourceManager& mResourceManager;
    std::thread mUDPThread;
    std::thread mTCPThread;
    std::mutex mOpenIDMutex;
-    TConnectionLimiter mConnectionLimiter;

-    std::vector<uint8_t> UDPRcvFromClient(boost::asio::ip::udp::endpoint& ClientEndpoint);
+    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);
@@ -73,9 +65,9 @@ private:
    void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr);
    void Parse(TClient& c, const std::vector<uint8_t>& Packet);
    void SendFile(TClient& c, const std::string& Name);
-    static bool TCPSendRaw(TClient& C, boost::asio::ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
-    void SendFileToClient(TClient& c, size_t Size, const std::string& Name);
-    static const uint8_t* SendSplit(TClient& c, boost::asio::ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
+    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
+    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);
 };

 std::string HashPassword(const std::string& str);
@@ -27,7 +27,7 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
    explicit TPPSMonitor(TServer& Server);
-    virtual ~TPPSMonitor() { }
+    virtual ~TPPSMonitor() {}

    void operator()() override;

@@ -19,7 +19,6 @@
 #pragma once

 #include "Common.h"
-#include <nlohmann/json.hpp>

 class TResourceManager {
 public:
@@ -30,10 +29,6 @@ public:
    [[nodiscard]] std::string TrimmedList() const { return mTrimmedList; }
    [[nodiscard]] std::string FileSizes() const { return mFileSizes; }
    [[nodiscard]] int ModsLoaded() const { return mModsLoaded; }
-    [[nodiscard]] nlohmann::json GetMods() const { return mMods; }
-
-    void RefreshFiles();
-    void SetProtected(const std::string& ModName, bool Protected);

 private:
    size_t mMaxModSize = 0;
@@ -41,7 +36,4 @@ private:
    std::string mFileList;
    std::string mTrimmedList;
    int mModsLoaded = 0;
-
-    std::mutex mModsMutex;
-    nlohmann::json mMods = nlohmann::json::array();
 };
@@ -20,7 +20,6 @@

 #include "IThreaded.h"
 #include "RWMutex.h"
-#include "TIoPollThread.h"
 #include "TScopedTimer.h"
 #include <functional>
 #include <memory>
@@ -45,16 +44,17 @@ public:
    void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
    size_t ClientCount() const;

-    void GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network, bool udp);
+    void GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
    static void HandleEvent(TClient& c, const std::string& Data);
    RWMutex& GetClientMutex() const { return mClientsMutex; }

    const TScopedTimer UptimeTimer;

-    io_context& IoCtx() { return mIoCtxPoller.IoCtx(); }
+    // asio io context
+    io_context& IoCtx() { return mIoCtx; }

 private:
-    TIoPollThread mIoCtxPoller;
+    io_context mIoCtx {};
    TClientSet mClients;
    mutable RWMutex mClientsMutex;
    static void ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network);
@@ -18,12 +18,11 @@

 #pragma once

-#include <nlohmann/json.hpp>
 #include <string>

 class TVehicleData final {
 public:
-    TVehicleData(int ID, nlohmann::json Data);
+    TVehicleData(int ID, std::string Data);
    ~TVehicleData();
    // We cannot delete this, since vector needs to be able to copy when it resizes.
    // Deleting this causes some wacky template errors which are hard to decipher,
@@ -33,16 +32,14 @@ public:
    [[nodiscard]] bool IsInvalid() const { return mID == -1; }
    [[nodiscard]] int ID() const { return mID; }

-    [[nodiscard]] nlohmann::json Data() const { return mData; }
-    [[nodiscard]] std::string DataAsPacket(const std::string& Role, const std::string& Name, int ID) const;
-
-    void SetData(const nlohmann::json& Data) { mData = Data; }
+    [[nodiscard]] std::string Data() const { return mData; }
+    void SetData(const std::string& Data) { mData = Data; }

    bool operator==(const TVehicleData& v) const { return mID == v.mID; }

 private:
    int mID { -1 };
-    nlohmann::json mData;
+    std::string mData;
 };

 // TODO: unused now, remove?
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -4,4 +4,4 @@ set -ex

 ./vcpkg/bootstrap-vcpkg.sh

-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--export-dynamic" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server
-
-objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
-objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
-
-strip -s bin/BeamMP-Server
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-
@@ -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);
@@ -57,7 +57,7 @@ int TClient::GetOpenCarID() const {
    return OpenID;
 }

-void TClient::AddNewCar(int Ident, const nlohmann::json& Data) {
+void TClient::AddNewCar(int Ident, const std::string& Data) {
    std::unique_lock lock(mVehicleDataMutex);
    mVehicleData.emplace_back(Ident, Data);
 }
@@ -76,30 +76,17 @@ std::string TClient::GetCarPositionRaw(int Ident) {
    }
 }

-bool TClient::Disconnect(std::string_view Reason) {
-    // Do not remove this guard: concurrent close() on the same socket can crash in Asio internals.
-    EDisconnectState Expected = EDisconnectState::Connected;
-    if (!mDisconnectState.compare_exchange_strong(Expected, EDisconnectState::Disconnecting, std::memory_order_acq_rel, std::memory_order_acquire)) {
-        return false;
-    }
-
+void TClient::Disconnect(std::string_view Reason) {
    beammp_debugf("Disconnecting client {} for reason: {}", GetID(), Reason);
    boost::system::error_code ec;
-    if (mSocket.is_open()) {
-        mSocket.shutdown(socket_base::shutdown_both, ec);
-        if (ec) {
-            beammp_debugf("Failed to shutdown client socket: {}", ec.message());
-        }
-        mSocket.close(ec);
-        if (ec) {
-            beammp_debugf("Failed to close client socket: {}", ec.message());
-        }
-    } else {
-        beammp_debug("Socket is already closed.");
+    mSocket.shutdown(socket_base::shutdown_both, ec);
+    if (ec) {
+        beammp_debugf("Failed to shutdown client socket: {}", ec.message());
+    }
+    mSocket.close(ec);
+    if (ec) {
+        beammp_debugf("Failed to close client socket: {}", ec.message());
    }
-    // Terminal state: this client must not perform TCP IO after this point.
-    mDisconnectState.store(EDisconnectState::Disconnected, std::memory_order_release);
-    return true;
 }

 void TClient::SetCarPosition(int Ident, const std::string& Data) {
@@ -107,7 +94,7 @@ void TClient::SetCarPosition(int Ident, const std::string& Data) {
    mVehiclePosition[size_t(Ident)] = Data;
 }

-nlohmann::json TClient::GetCarData(int Ident) {
+std::string TClient::GetCarData(int Ident) {
    { // lock
        std::unique_lock lock(mVehicleDataMutex);
        for (auto& v : mVehicleData) {
@@ -117,10 +104,10 @@ nlohmann::json TClient::GetCarData(int Ident) {
        }
    } // unlock
    DeleteCar(Ident);
-    return nlohmann::detail::value_t::null;
+    return "";
 }

-void TClient::SetCarData(int Ident, const nlohmann::json& Data) {
+void TClient::SetCarData(int Ident, const std::string& Data) {
    { // lock
        std::unique_lock lock(mVehicleDataMutex);
        for (auto& v : mVehicleData) {
@@ -157,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()) {
 }

@@ -178,7 +166,8 @@ std::optional<std::weak_ptr<TClient>> GetClient(TServer& Server, int ID) {
    std::optional<std::weak_ptr<TClient>> MaybeClient { std::nullopt };
    Server.ForEachClient([&](std::weak_ptr<TClient> CPtr) -> bool {
        ReadLock Lock(Server.GetClientMutex());
-        if (auto C = CPtr.lock()) {
+        if (!CPtr.expired()) {
+            auto C = CPtr.lock();
            if (C->GetID() == ID) {
                MaybeClient = CPtr;
                return false;
@@ -22,20 +22,19 @@
 #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 "TLuaResult.h"
 #include "Compat.h"
 #include "CustomAssert.h"
 #include "Http.h"
-#include "RegionHandler.h"
+
+Application::TSettings Application::Settings = {};

 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
    std::unique_lock Lock(mShutdownHandlersMutex);
@@ -74,27 +73,6 @@ std::string Application::ServerVersionString() {
    return mVersion.AsString();
 }

-std::vector<std::string> Application::GetBackendUrlsInOrder() {
-    return {
-        "https://backend." + RegionHandler::RegionToTopLevelDomain(),
-    };
-}
-
-std::string Application::GetServerCheckUrl()
-{
-    return "https://check." + RegionHandler::RegionToTopLevelDomain();
-}
-
-std::string Application::GetBackendUrlForAuth()
-{
-    return "https://auth." + RegionHandler::RegionToTopLevelDomain();
-}
-
-std::string Application::GetBackendUrlForSocketIO()
-{
-    return "https://backend." + RegionHandler::RegionToTopLevelDomain();
-}
-
 std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
    std::array<uint8_t, 3> Version;
    std::stringstream ss(str);
@@ -238,7 +216,7 @@ void Application::CheckForUpdates() {
    // checks current version against latest version
    std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
    for (const auto& url : GetBackendUrlsInOrder()) {
-        auto Response = Http::GET(url + "/v/s");
+        auto Response = Http::GET(url, 443, "/v/s");
        bool Matches = std::regex_match(Response, VersionRegex);
        if (Matches) {
            auto MyVersion = ServerVersion();
@@ -279,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
@@ -291,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) {
@@ -319,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;
    }
@@ -352,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] ";
@@ -408,73 +386,3 @@ void SplitString(const std::string& str, const char delim, std::vector<std::stri
    }
 }

-std::string LowerString(std::string str) {
-    std::ranges::transform(str, str.begin(), ::tolower);
-    return str;
-}
-
-
-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;
-}
@@ -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);
    }
@@ -36,15 +36,9 @@ std::string_view Env::ToString(Env::Key key) {
    case Key::PROVIDER_DISABLE_CONFIG:
        return "BEAMMP_PROVIDER_DISABLE_CONFIG";
        break;
-    case Key::PROVIDER_DISABLE_MP_SET:
-        return "BEAMMP_PROVIDER_DISABLE_MP_SET";
-        break;
    case Key::PROVIDER_PORT_ENV:
        return "BEAMMP_PROVIDER_PORT_ENV";
        break;
-    case Key::PROVIDER_IP_ENV:
-        return "BEAMMP_PROVIDER_IP_ENV";
-        break;
    }
    return "";
 }
@@ -18,195 +18,78 @@

 #include "Http.h"

+#include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
+#include "LuaAPI.h"

-#include <curl/easy.h>
 #include <map>
 #include <nlohmann/json.hpp>
+#include <random>
+#include <stdexcept>

 using json = nlohmann::json;
-
-static size_t CurlWriteCallback(void* contents, size_t size, size_t nmemb, void* userp) {
-    std::string* Result = reinterpret_cast<std::string*>(userp);
-    std::string NewContents(reinterpret_cast<char*>(contents), size * nmemb);
-    *Result += NewContents;
-    return size * nmemb;
-}
-
-struct CurlDeleter {
-    void operator()(CURL* c) const noexcept {
-        if (c)
-            curl_easy_cleanup(c);
-    }
+struct Connection {
+    std::string host{};
+    int port{};
+    Connection() = default;
+    Connection(std::string host, int port)
+        : host(host)
+        , port(port) {};
 };
+constexpr uint8_t CONNECTION_AMOUNT = 10;
+static thread_local uint8_t write_index = 0;
+static thread_local std::array<Connection, CONNECTION_AMOUNT> connections;
+static thread_local std::array<std::shared_ptr<httplib::SSLClient>, CONNECTION_AMOUNT> clients;

-static std::mutex gCurlPoolMutex;
-static std::map<CURL*, bool> gCurlPool; // false = free, true = in use
-constexpr size_t MAX_CURL_POOL_SIZE = 128;
-
-static CURL* AcquireCurl() {
-    std::unique_lock Lock(gCurlPoolMutex);
-    for (auto& [Curl, InUse] : gCurlPool) {
-        if (!InUse) {
-            InUse = true;
-            curl_easy_reset(Curl);
-            return Curl;
+[[nodiscard]] static std::shared_ptr<httplib::SSLClient> getClient(Connection connectionInfo) {
+    for (uint8_t i = 0; i < CONNECTION_AMOUNT; i++) {
+        if (connectionInfo.host == connections[i].host
+            && connectionInfo.port == connections[i].port) {
+            beammp_tracef("Old client reconnected, with ip {} and port {}", connectionInfo.host, connectionInfo.port);
+            return clients[i];
        }
    }
-
-    // none found, if we're under the limit add one!
-    if (gCurlPool.size() >= MAX_CURL_POOL_SIZE) {
-        beammp_debugf("Ran out of curl handles for network requests, skipping this request");
-        return nullptr;
-    }
-    
-    CURL* Curl = curl_easy_init();
-    if (!Curl) {
-        // failed, ignore
-        return nullptr;
-    }
-    
-    gCurlPool[Curl] = true;
-    return Curl;
+    uint8_t i = write_index;
+    write_index++;
+    write_index %= CONNECTION_AMOUNT;
+    clients[i] = std::make_shared<httplib::SSLClient>(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];
 }

-static void ReleaseCurl(CURL* curl) {
-    if (!curl) {
-        return;
-    }
-
-    std::unique_lock Lock(gCurlPoolMutex);
-    auto It = gCurlPool.find(curl);
-    if (It != gCurlPool.end()) {
-        It->second = false;
-    }
-}
-
-/// RAII container for curl handles to ensure correct release
-class CurlLease {
-private:
-    CURL* mHandle = nullptr;
-public:
-
-    CurlLease() : mHandle(AcquireCurl()) {}
-    ~CurlLease() {
-        ReleaseCurl(mHandle);
-    }
-    CurlLease(const CurlLease&) = delete;
-    CurlLease& operator=(const CurlLease&) = delete;
-
-    CurlLease(CurlLease&& other) noexcept
-        : mHandle(other.mHandle) {
-        other.mHandle = nullptr;
-    }
-
-    CurlLease& operator=(CurlLease&& other) noexcept {
-        if (this != &other) {
-            ReleaseCurl(mHandle);
-            mHandle = other.mHandle;
-            other.mHandle = nullptr;
-        }
-        return *this;
-    }
-
-    CURL* GetHandle() const noexcept {
-        return mHandle;
-    }
-};
-
-std::string Http::GET(const std::string& url, unsigned int* status) {
-    std::string Ret;
-    CurlLease Lease{};
-    CURL* curl = Lease.GetHandle();
-    if (curl) {
-        CURLcode res;
-        char errbuf[CURL_ERROR_SIZE];
-        curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-        curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, reinterpret_cast<void*>(&Ret));
-
-        // ensure we dont keep connections open for long
-        curl_easy_setopt(curl, CURLOPT_MAXCONNECTS, 8L);
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
-        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30L);
-        curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
-        curl_easy_setopt(curl, CURLOPT_MAXAGE_CONN, 60L);
-        curl_easy_setopt(curl, CURLOPT_MAXLIFETIME_CONN, 300L);
-
-        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
-        errbuf[0] = 0;
-        res = curl_easy_perform(curl);
-        if (res != CURLE_OK) {
-            beammp_error("GET to " + url + " failed: " + std::string(curl_easy_strerror(res)));
-            beammp_error("Curl error: " + std::string(errbuf));
-            return Http::ErrorString;
-        }
-
+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});
+    client->enable_server_certificate_verification(false);
+    client->set_address_family(AF_INET);
+    auto res = client->Get(target.c_str());
+    if (res) {
        if (status) {
-            curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, status);
+            *status = res->status;
        }
-
+        return res->body;
    } else {
-        beammp_error("Curl easy init failed");
        return Http::ErrorString;
    }
-    return Ret;
 }

-std::string Http::POST(const std::string& url, const std::string& body, const std::string& ContentType, unsigned int* status, const std::map<std::string, std::string>& headers) {
-    std::string Ret;
-    CurlLease Lease{};
-    CURL* curl = Lease.GetHandle();
-    if (curl) {
-        CURLcode res;
-        char errbuf[CURL_ERROR_SIZE];
-        curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-        curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlWriteCallback);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, reinterpret_cast<void*>(&Ret));
-        curl_easy_setopt(curl, CURLOPT_POST, 1L);
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body.c_str());
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, body.size());
-        struct curl_slist* list = nullptr;
-        list = curl_slist_append(list, ("Content-Type: " + ContentType).c_str());
-
-        for (auto [header, value] : headers) {
-            list = curl_slist_append(list, (header + ": " + value).c_str());
-        }
-
-        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
-
-        // ensure we dont keep connections open for long
-        curl_easy_setopt(curl, CURLOPT_MAXCONNECTS, 8L);
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
-        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30L);
-        curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
-        curl_easy_setopt(curl, CURLOPT_MAXAGE_CONN, 60L);
-        curl_easy_setopt(curl, CURLOPT_MAXLIFETIME_CONN, 300L);
-
-        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
-        errbuf[0] = 0;
-        res = curl_easy_perform(curl);
-        curl_slist_free_all(list);
-        if (res != CURLE_OK) {
-            beammp_error("POST to " + url + " failed: " + std::string(curl_easy_strerror(res)));
-            beammp_error("Curl error: " + std::string(errbuf));
-            return Http::ErrorString;
-        }
-
+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});
+    client->set_read_timeout(std::chrono::seconds(10));
+    beammp_assert(client->is_valid());
+    client->enable_server_certificate_verification(false);
+    client->set_address_family(AF_INET);
+    auto res = client->Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
+    if (res) {
        if (status) {
-            curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, status);
+            *status = res->status;
        }
-
+        return res->body;
    } else {
-        beammp_error("Curl easy init failed");
+        beammp_debug("POST failed: " + httplib::to_string(res.error()));
        return Http::ErrorString;
    }
-    return Ret;
 }

 // RFC 2616, RFC 7231
@@ -316,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
@@ -357,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()));
 }
@@ -20,7 +20,6 @@
 #include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
-#include "Settings.h"
 #include "TLuaEngine.h"

 #include <nlohmann/json.hpp>
@@ -143,23 +142,17 @@ static inline std::pair<bool, std::string> InternalTriggerClientEvent(int Player
        return { true, "" };
    } else {
        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
-        if (MaybeClient) {
-            if (auto c = MaybeClient.value().lock()) {
-                if (!c->IsSyncing() && !c->IsSynced()) {
-                    return { false, "Player hasn't joined yet" };
-                }
-
-                if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
-                    beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
-                    LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
-                    return { false, "Respond failed, dropping client" };
-                }
-                return { true, "" };
-            }
+        if (!MaybeClient || MaybeClient.value().expired()) {
+            beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
+            return { false, "Invalid Player ID" };
        }
-
-        beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
-        return { false, "Invalid Player ID" };
+        auto c = MaybeClient.value().lock();
+        if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+            beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
+            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
+            return { false, "Respond failed, dropping client" };
+        }
+        return { true, "" };
    }
 }

@@ -170,48 +163,37 @@ std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const

 std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
-        if (auto c = MaybeClient.value().lock()) {
-            LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
-            return { true, "" };
-        }
+    if (!MaybeClient || MaybeClient.value().expired()) {
+        beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
+        return { false, "Player does not exist" };
    }
-
-    beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
-    return { false, "Player does not exist" };
+    auto c = MaybeClient.value().lock();
+    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
+    return { true, "" };
 }

-std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message, const bool& LogChat) {
+std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
    std::pair<bool, std::string> Result;
    std::string Packet = "C:Server: " + Message;
    if (ID == -1) {
-        if (LogChat) {
-            LogChatMessage("<Server> (to everyone) ", -1, Message);
-        }
+        LogChatMessage("<Server> (to everyone) ", -1, Message);
        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
        Result.first = true;
    } else {
        auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient) {
-            if (auto c = MaybeClient.value().lock()) {
-                if (!c->IsSynced()) {
-                    Result.first = false;
-                    Result.second = "Player still syncing data";
-                    return Result;
-                }
-                if (LogChat) {
-                    LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
-                }
-                if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
-                    beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
-                    // TODO: should we return an error here?
-                }
-                Result.first = true;
-            } else {
-                beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
+        if (MaybeClient && !MaybeClient.value().expired()) {
+            auto c = MaybeClient.value().lock();
+            if (!c->IsSynced()) {
                Result.first = false;
-                Result.second = "Invalid Player ID";
+                Result.second = "Player still syncing data";
+                return Result;
            }
+            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
+            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+                beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
+                // TODO: should we return an error here?
+            }
+            Result.first = true;
        } else {
            beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
            Result.first = false;
@@ -222,113 +204,24 @@ 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) {
-            if (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";
-            }
-        } 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::ConfirmationDialog(int ID, const std::string& Title, const std::string& Body, const sol::table& buttons, const std::string& InteractionID, const bool& warning, const bool& reportToServer, const bool& reportToExtensions) {
-    std::pair<bool, std::string> Result;
-
-    const nlohmann::json PacketBody = {
-        { "title", Title },
-        { "body", Body },
-        { "buttons", nlohmann::json::parse(JsonEncode(buttons), nullptr, false) },
-        { "interactionID", InteractionID },
-        { "class", warning ? "experimental" : "" },
-        { "reportToServer", reportToServer },
-        { "reportToExtensions", reportToExtensions }
-    };
-
-    std::string Packet = "D" + PacketBody.dump();
-    if (ID == -1) {
-        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
-        Result.first = true;
-    } else {
-        auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient) {
-            if (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 confirmation dialog to player (id {}) - did the player disconnect?", ID);
-                    Result.first = false;
-                    Result.second = "Failed to send packet";
-                }
-                Result.first = true;
-            } else {
-                beammp_lua_error("ConfirmationDialog invalid argument [1] invalid ID");
-                Result.first = false;
-                Result.second = "Invalid Player ID";
-            }
-        } else {
-            beammp_lua_error("ConfirmationDialog 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);
-    if (MaybeClient) {
-        if (auto c = MaybeClient.value().lock()) {
-            if (c->GetCarData(VID) != nlohmann::detail::value_t::null) {
-                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;
-            } else {
-                Result.first = false;
-                Result.second = "Vehicle does not exist";
-            }
-        } else {
-            beammp_lua_error("RemoveVehicle invalid Player ID");
-            Result.first = false;
-            Result.second = "Invalid Player ID";
-        }
-    } else {
+    if (!MaybeClient || MaybeClient.value().expired()) {
        beammp_lua_error("RemoveVehicle invalid Player ID");
        Result.first = false;
        Result.second = "Invalid Player ID";
+        return Result;
+    }
+    auto c = MaybeClient.value().lock();
+    if (!c->GetCarData(VID).empty()) {
+        std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
+        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
+        c->DeleteCar(VID);
+        Result.first = true;
+    } else {
+        Result.first = false;
+        Result.second = "Vehicle does not exist";
    }
    return Result;
 }
@@ -337,120 +230,86 @@ 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");
        }
        break;
-    case 7: // Information packet
-        if (NewValue.is<bool>()) {
-            Application::Settings.set(Settings::Key::General_InformationPacket, NewValue.as<bool>());
-            beammp_info(std::string("Set `InformationPacket` to ") + (Application::Settings.getAsBool(Settings::Key::General_InformationPacket) ? "true" : "false"));
-        } else {
-            beammp_lua_error("set invalid argument [2] expected boolean");
-        }
-         break;
    default:
        beammp_warn("Invalid config ID \"" + std::to_string(ConfigID) + "\". Use `MP.Settings.*` enum for this.");
        break;
    }
 }

-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);
-    case 7: // Information packet
-        return Application::Settings.getAsBool(Settings::Key::General_InformationPacket);
-    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));
 }

 bool LuaAPI::MP::IsPlayerConnected(int ID) {
    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
-        if (auto c = MaybeClient.value().lock()) {
-            return c->IsUDPConnected();
-        }
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsConnected();
+    } else {
+        return false;
    }
-    return false;
 }

 bool LuaAPI::MP::IsPlayerGuest(int ID) {
    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
-        if (auto c = MaybeClient.value().lock()) {
-            return c->IsGuest();
-        }
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsGuest();
+    } else {
+        return false;
    }
-    return false;
 }

 void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
@@ -465,16 +324,7 @@ void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
 }

 int LuaAPI::PanicHandler(lua_State* State) {
-    // panic path: use raw lua c api only; sol2 conversions can raise lua_error
-    // and re-enter panic recursively.
-    const int ErrorType = lua_type(State, -1);
-    if (ErrorType == LUA_TSTRING) {
-        const char* Message = lua_tostring(State, -1);
-        beammp_lua_error(std::string("PANIC: ") + (Message ? Message : "(null)"));
-    } else {
-        const char* ErrorTypeName = lua_typename(State, ErrorType);
-        beammp_lua_error(std::string("PANIC: non-string error object (") + (ErrorTypeName ? ErrorTypeName : "unknown") + ")");
-    }
+    beammp_lua_error("PANIC: " + sol::stack::get<std::string>(State, 1));
    return 0;
 }

@@ -57,3 +57,4 @@ size_t prof::UnitExecutionTime::measurement_count() const {
    std::unique_lock lock(m_mtx);
    return m_total_calls;
 }
+
@@ -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);
+};
@@ -1,35 +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 "RegionHandler.h"
-#include "Common.h"
-
-void RegionHandler::TopLevelDomainFailed()
-{
-    beammp_info("Top level domain of " + mValidTLDs[mRegionIndex % mValidTLDs.size()] + " didn't respond correctly , changing domain to " + mValidTLDs[(mRegionIndex + 1) % mValidTLDs.size()]);
-    mRegionIndex++;
-}
-
-std::string RegionHandler::RegionToTopLevelDomain()
-{
-    static bool isDeveloperRegion = Application::Settings.getAsString(Settings::Key::General_Region) == "Developer";
-    if (isDeveloperRegion) {
-        return "beammp.dev";
-    }
-    return mValidTLDs[mRegionIndex % mValidTLDs.size()]; // Global
-}
@@ -1,193 +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_IP, "::"},
-        { General_Port, 30814 },
-        { General_MaxCars, 1 },
-        { General_LogChat, true },
-        { General_ResourceFolder, std::string("Resources") },
-        { General_Debug, false },
-        { General_AllowGuests, true },
-        { General_InformationPacket, true },
-        { General_Region, std::string("")},
-        { 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", "IP" }, { General_IP, 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 } },
-        { { "General", "InformationPacket" }, { General_InformationPacket, READ_WRITE } },
-        { { "General", "Region" }, { General_Region, 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));
-}
@@ -19,23 +19,18 @@
 #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";
 static constexpr std::string_view EnvStrDebug = "BEAMMP_DEBUG";
 static constexpr std::string_view StrPrivate = "Private";
 static constexpr std::string_view EnvStrPrivate = "BEAMMP_PRIVATE";
-static constexpr std::string_view StrIP = "IP";
-static constexpr std::string_view EnvStrIP = "BEAMMP_IP";
 static constexpr std::string_view StrPort = "Port";
 static constexpr std::string_view EnvStrPort = "BEAMMP_PORT";
 static constexpr std::string_view StrMaxCars = "MaxCars";
@@ -52,23 +47,19 @@ static constexpr std::string_view StrTags = "Tags";
 static constexpr std::string_view EnvStrTags = "BEAMMP_TAGS";
 static constexpr std::string_view StrResourceFolder = "ResourceFolder";
 static constexpr std::string_view EnvStrResourceFolder = "BEAMMP_RESOURCE_FOLDER";
-static constexpr std::string_view StrRegion = "BackendRegion";
-static constexpr std::string_view EnvStrRegion = "BEAMMP_BACKEND_REGION";
 static constexpr std::string_view StrAuthKey = "AuthKey";
 static constexpr std::string_view EnvStrAuthKey = "BEAMMP_AUTH_KEY";
 static constexpr std::string_view StrLogChat = "LogChat";
 static constexpr std::string_view EnvStrLogChat = "BEAMMP_LOG_CHAT";
 static constexpr std::string_view StrAllowGuests = "AllowGuests";
 static constexpr std::string_view EnvStrAllowGuests = "BEAMMP_ALLOW_GUESTS";
-static constexpr std::string_view StrInformationPacket = "InformationPacket";
-static constexpr std::string_view EnvStrInformationPacket = "BEAMMP_INFORMATION_PACKET";
 static constexpr std::string_view StrPassword = "Password";

 // Misc
+static constexpr std::string_view StrSendErrors = "SendErrors";
+static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
 static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
-static constexpr std::string_view EnvStrHideUpdateMessages = "BEAMMP_IM_SCARED_OF_UPDATES";
 static constexpr std::string_view StrUpdateReminderTime = "UpdateReminderTime";
-static constexpr std::string_view EnvStrUpdateReminderTime = "BEAMMP_UPDATE_REMINDER_TIME";

 TEST_CASE("TConfig::TConfig") {
    const std::string CfgFile = "beammp_server_testconfig.toml";
@@ -132,42 +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);
-    SetComment(data["General"][StrInformationPacket.data()].comments(), " Whether to allow unconnected clients to get the public server information without joining");
-    data["General"][StrInformationPacket.data()] = Application::Settings.getAsBool(Settings::Key::General_InformationPacket);
-    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"][StrIP.data()] = Application::Settings.getAsString(Settings::Key::General_IP);
-    SetComment(data["General"][StrIP.data()].comments(), " The IP address to bind the server to, this is NOT related to your public IP. Can be used if your machine has multiple network interfaces");
-    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);
-    if (Application::Settings.getAsString(Settings::Key::General_Region) != "") {
-        data["General"][StrRegion.data()] = Application::Settings.getAsString(Settings::Key::General_Region);
-    }
+    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"][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.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());
@@ -186,109 +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 if (Table[Category.c_str()][Key.data()].is_empty())
-                beammp_debugf("Value '{}.{}' is empty", Category, Key);
-            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 if (Table[Category.c_str()][Key.data()].is_empty())
-                beammp_debugf("Value '{}.{}' is empty", Category, Key);
-            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 if (Table[Category.c_str()][Key.data()].is_empty())
-                beammp_debugf("Value '{}.{}' is empty", Category, Key);
-            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", StrInformationPacket, EnvStrInformationPacket, Settings::Key::General_InformationPacket);
+        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(), Settings::Key::General_Port);
+            TryReadValue(data, "General", StrPort, Env::Get(Env::Key::PROVIDER_PORT_ENV).value(), Application::Settings.Port);
        } else {
-            TryReadValue(data, "General", StrPort, EnvStrPort, Settings::Key::General_Port);
+            TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
        }
-        if (Env::Get(Env::Key::PROVIDER_IP_ENV).has_value()) {
-            TryReadValue(data, "General", StrIP, Env::Get(Env::Key::PROVIDER_IP_ENV).value(), Settings::Key::General_IP);
-        } else {
-            TryReadValue(data, "General", StrIP, EnvStrIP, Settings::Key::General_IP);
-        }
-        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", StrRegion, EnvStrRegion, Settings::Key::General_Region);
-        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", 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", StrHideUpdateMessages, EnvStrHideUpdateMessages, Settings::Key::Misc_ImScaredOfUpdates);
-        TryReadValue(data, "Misc", StrUpdateReminderTime, EnvStrUpdateReminderTime, 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;
@@ -301,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 {
@@ -312,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.");
    }
 }
@@ -321,28 +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(StrInformationPacket) + ": " + std::string(Application::Settings.getAsBool(Settings::Key::General_InformationPacket) ? "true" : "false"));
-    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.getAsInt(Settings::Key::General_Port)));
-    beammp_debug(std::string(StrIP) + ": \"" + Application::Settings.getAsString(Settings::Key::General_IP) + "\"");
-    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(StrRegion) + ": \"" + Application::Settings.getAsString(Settings::Key::General_Region) + "\"");
-    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] + "\", ";
@@ -1,96 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2026 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 "TConnectionLimiter.h"
-#include <mutex>
-#include <optional>
-#include "Common.h"
-
-TConnectionLimiter::TConnectionLimiter(size_t maxPerIp, size_t maxGlobal)
-    : mMaxPerIp(maxPerIp)
-    , mMaxGlobal(maxGlobal) {
-    if (maxPerIp == 0) {
-        beammp_errorf("Max connections count per IP is set to zero; the server would reject ALL connections");
-        throw std::runtime_error("Invalid maximum connections per IP setting");
-    }
-    if (maxGlobal == 0) {
-        beammp_errorf("Max connection count is set to zero; the server would reject ALL connections");
-        throw std::runtime_error("Invalid maximum connections setting");
-    }
-}
-
-std::optional<TConnectionLimiter::TGuard> TConnectionLimiter::TryAcquire(const std::string& ip) {
-    std::unique_lock Lock { mMutex };
-    if (mGlobal >= mMaxGlobal) return std::nullopt;
-    // `It` is the inserted element (so if insertion worked, its 0), or its the element that
-    // was already there, in which case we must check the ip connection limit
-    auto [It, _] = mPerIp.try_emplace(ip, 0);
-    if (It->second >= mMaxPerIp) {
-        return std::nullopt;
-    }
-    // now increment the counter finally
-    ++It->second;
-    ++mGlobal;
-    // RAII guard will drop the count once destructed
-    return TGuard(this, ip);
-}
-
-TConnectionLimiter::TStats TConnectionLimiter::GetStats() {
-    std::unique_lock Lock { mMutex };
-    TStats Stats;
-    Stats.CurrentGlobal = mGlobal;
-    Stats.MaxGlobal = mMaxGlobal;
-    Stats.ActiveIpBuckets = mPerIp.size();
-    Stats.MaxPerIp = mMaxPerIp;
-    for (const auto& [_, Count] : mPerIp) {
-        if (Count > Stats.CurrentMaxPerIp) {
-            Stats.CurrentMaxPerIp = Count;
-        }
-        if (Count >= mMaxPerIp) {
-            ++Stats.SaturatedIpBuckets;
-        }
-    }
-    return Stats;
-}
-
-TConnectionLimiter::TGuard::TGuard(TConnectionLimiter* owner, std::string ip)
-    : mOwner(owner)
-    , mIp(std::move(ip)) {
-    beammp_debugf("Acquired connection guard for {}", mIp);
-}
-
-TConnectionLimiter::TGuard& TConnectionLimiter::TGuard::operator=(TGuard&& other) noexcept {
-    // identity check
-    if (this != &other) {
-        Release();
-        mOwner = other.mOwner;
-        mIp = std::move(other.mIp);
-        other.mOwner = nullptr;
-        // setting this so its obvious when this happens, instead of being UB or empty string
-        other.mIp = "<moved-from>";
-    }
-    return *this;
-}
-
-void TConnectionLimiter::TGuard::Release() {
-    if (mOwner) {
-        mOwner->Release(mIp);
-        mOwner = nullptr;
-        beammp_debugf("Released connection guard for {}", mIp);
-    }
-}
@@ -22,18 +22,14 @@

 #include "Client.h"
 #include "CustomAssert.h"
-#include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaEngine.h"
-#include "RegionHandler.h"

 #include <ctime>
 #include <lua.hpp>
 #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;
@@ -82,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);
@@ -110,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);
+    */
    }
 }

@@ -161,7 +192,7 @@ void TConsole::ChangeToRegularConsole() {
 }

 bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
-    if (n == 0 && !args.empty()) {
+    if (n == 0 && args.size() != 0) {
        Application::Console().WriteRaw("This command expects no arguments.");
        return false;
    } else if (args.size() != n) {
@@ -199,7 +230,7 @@ void TConsole::Command_Lua(const std::string&, const std::vector<std::string>& a
        } else {
            Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
        }
-    } else if (args.empty()) {
+    } else if (args.size() == 0) {
        ChangeToLuaConsole(mDefaultStateId);
    }
 }
@@ -210,18 +241,16 @@ void TConsole::Command_Help(const std::string&, const std::vector<std::string>&
    }
    static constexpr const char* sHelpString = R"(
    Commands:
-        help                       displays this help
-        exit                       shuts down the server
-        kick <name> [reason]       kicks specified player with an optional reason
-        list                       lists all players and info about them
-        say <message>              sends the message to all players in chat
-        lua [state id]             switches to lua, optionally into a specific state id's lua
-        settings [command]         sets or gets settings for the server, run `settings help` for more info
-        status                     how the server is doing and what it's up to
-        clear                      clears the console window
-        version                    displays the server version
-        protectmod <name> <value>  sets whether a mod is protected, value can be true or false
-        reloadmods                 reloads all mods from the Resources Client folder)";
+        help                    displays this help
+        exit                    shuts down the server
+        kick <name> [reason]    kicks specified player with an optional reason
+        list                    lists all players and info about them
+        say <message>           sends the message to all players in chat
+        lua [state id]          switches to lua, optionally into a specific state id's lua
+        settings [command]      sets or gets settings for the server, run `settings help` for more info
+        status                  how the server is doing and what it's up to
+        clear                   clears the console window
+        version                 displays the server version)";
    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
 }

@@ -266,59 +295,6 @@ void TConsole::Command_Version(const std::string& cmd, const std::vector<std::st
    std::string openssl_version = fmt::format("OpenSSL:  v{}.{}.{}", OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH);
    Application::Console().WriteRaw(openssl_version);
 }
-void TConsole::Command_ProtectMod(const std::string& cmd, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 2)) {
-        return;
-    }
-
-    const auto& ModName = args.at(0);
-    const auto& Protect = args.at(1);
-
-    for (auto mod : mLuaEngine->Network().ResourceManager().GetMods()) {
-        if (mod["file_name"].get<std::string>() == ModName) {
-            mLuaEngine->Network().ResourceManager().SetProtected(ModName, Protect == "true");
-            Application::Console().WriteRaw("Mod " + ModName + " is now " + (Protect == "true" ? "protected" : "unprotected"));
-            return;
-        }
-    }
-
-    Application::Console().WriteRaw("Mod " + ModName + " not found.");
-}
-void TConsole::Command_ReloadMods(const std::string& cmd, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
-
-    mLuaEngine->Network().ResourceManager().RefreshFiles();
-    Application::Console().WriteRaw("Mods reloaded.");
-}
-
-void TConsole::Command_NetTest(const std::string& cmd, const std::vector<std::string>& args) {
-    unsigned int status = 0;
-
-    std::string T = Http::GET(
-        Application::GetServerCheckUrl() + "/api/v2/beammp/" + std::to_string(Application::Settings.getAsInt(Settings::Key::General_Port)), &status);
-    if (T == Http::ErrorString || status != 200) {
-        RegionHandler::TopLevelDomainFailed();
-        T = Http::GET(Application::GetServerCheckUrl() + "/api/v2/beammp/" + std::to_string(Application::Settings.getAsInt(Settings::Key::General_Port)), &status);
-    }
-
-    beammp_debugf("Status and response from Server Check API: {0}, {1}", status, T);
-
-    auto Doc = nlohmann::json::parse(T, nullptr, false);
-
-    if (Doc.is_discarded() || !Doc.is_object()) {
-        beammp_warn("Failed to parse Server Check API response, however the server will most likely still work correctly.");
-    } else {
-        std::string status = Doc["status"];
-        std::string details = "Response from Server Check API: " + std::string(Doc["details"]);
-        if (status == "ok") {
-            beammp_info(details);
-        } else {
-            beammp_warn(details);
-        }
-    }
-}

 void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
    if (!EnsureArgsCount(args, 1, size_t(-1))) {
@@ -338,9 +314,10 @@ void TConsole::Command_Kick(const std::string&, const std::vector<std::string>&
        return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
    };
    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-        if (auto Locked = Client.lock()) {
-            if (NameCompare(Locked->GetName(), Name)) {
-                mLuaEngine->Network().ClientKick(*Locked, Reason);
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (NameCompare(locked->GetName(), Name)) {
+                mLuaEngine->Network().ClientKick(*locked, Reason);
                Kicked = true;
                return false;
            }
@@ -359,7 +336,7 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
    // It correctly splits arguments, including respecting single and double quotes, as well as backticks
    auto End_i = CommandWithArgs.find_first_of(' ');
    std::string Command = CommandWithArgs.substr(0, End_i);
-    std::string ArgsStr { };
+    std::string ArgsStr {};
    if (End_i != std::string::npos) {
        ArgsStr = CommandWithArgs.substr(End_i);
    }
@@ -409,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.empty()) {
-        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;
    }
 }
@@ -553,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!");
        }
    }
@@ -569,10 +412,11 @@ void TConsole::Command_List(const std::string&, const std::vector<std::string>&
        std::stringstream ss;
        ss << std::left << std::setw(25) << "Name" << std::setw(6) << "ID" << std::setw(6) << "Cars" << std::endl;
        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-            if (auto Locked = Client.lock()) {
-                ss << std::left << std::setw(25) << Locked->GetName()
-                   << std::setw(6) << Locked->GetID()
-                   << std::setw(6) << Locked->GetCarCount() << "\n";
+            if (!Client.expired()) {
+                auto locked = Client.lock();
+                ss << std::left << std::setw(25) << locked->GetName()
+                   << std::setw(6) << locked->GetID()
+                   << std::setw(6) << locked->GetCarCount() << "\n";
            }
            return true;
        });
@@ -595,9 +439,10 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    size_t MissedPacketQueueSum = 0;
    int LargestSecondsSinceLastPing = 0;
    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-        if (auto Locked = Client.lock()) {
+        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;
@@ -614,11 +459,11 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    size_t SystemsBad = 0;
    size_t SystemsShuttingDown = 0;
    size_t SystemsShutdown = 0;
-    std::string SystemsBadList { };
-    std::string SystemsGoodList { };
-    std::string SystemsStartingList { };
-    std::string SystemsShuttingDownList { };
-    std::string SystemsShutdownList { };
+    std::string SystemsBadList {};
+    std::string SystemsGoodList {};
+    std::string SystemsStartingList {};
+    std::string SystemsShuttingDownList {};
+    std::string SystemsShutdownList {};
    auto Statuses = Application::GetSubsystemStatuses();
    for (const auto& NameStatusPair : Statuses) {
        switch (NameStatusPair.second) {
@@ -654,7 +499,6 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    SystemsShutdownList = SystemsShutdownList.substr(0, SystemsShutdownList.size() - 2);

    auto ElapsedTime = mLuaEngine->Server().UptimeTimer.GetElapsedTime();
-    auto ConnectionLimiterStats = mLuaEngine->Network().GetConnectionLimiterStats();

    Status << "BeamMP-Server Status:\n"
           << "\tTotal Players:             " << mLuaEngine->Server().ClientCount() << "\n"
@@ -669,11 +513,6 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
           << "\t\tStates:                      " << mLuaEngine->GetLuaStateCount() << "\n"
           << "\t\tEvent timers:                " << mLuaEngine->GetTimedEventsCount() << "\n"
           << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
-           << "\tConnection limiter:\n"
-           << "\t\tActive/Max global:           " << ConnectionLimiterStats.CurrentGlobal << "/" << ConnectionLimiterStats.MaxGlobal << "\n"
-           << "\t\tActive IP buckets:           " << ConnectionLimiterStats.ActiveIpBuckets << "\n"
-           << "\t\tHighest single IP load:      " << ConnectionLimiterStats.CurrentMaxPerIp << "/" << ConnectionLimiterStats.MaxPerIp << "\n"
-           << "\t\tSaturated IP buckets:        " << ConnectionLimiterStats.SaturatedIpBuckets << "\n"
           << "\tSubsystems:\n"
           << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
           << "\t\tShutting down/Shut down:     " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
@@ -690,13 +529,9 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
 void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
    auto FutureIsNonNil =
        [](const std::shared_ptr<TLuaResult>& Future) {
-            if (!Future->IsError()) {
-                auto Snapshot = Future->GetDetachedSnapshot();
-                if (Snapshot.Result.V.valueless_by_exception() || std::get_if<std::monostate>(&Snapshot.Result.V) != nullptr) {
-                    // no value contained
-                    return false;
-                }
-                return true;
+            if (!Future->Error && Future->Result.valid()) {
+                auto Type = Future->Result.get_type();
+                return Type != sol::type::lua_nil && Type != sol::type::none;
            }
            return false;
        };
@@ -706,7 +541,7 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
        size_t Count = 0;
        for (auto& Future : Futures) {
-            if (!Future->IsError()) {
+            if (!Future->Error) {
                ++Count;
            }
        }
@@ -716,7 +551,7 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
            }
        }
    }
-    if (NonNilFutures.empty()) {
+    if (NonNilFutures.size() == 0) {
        if (!IgnoreNotACommand) {
            Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");
        }
@@ -724,16 +559,14 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
        std::stringstream Reply;
        if (NonNilFutures.size() > 1) {
            for (size_t i = 0; i < NonNilFutures.size(); ++i) {
-                auto Snapshot = NonNilFutures[i]->GetDetachedSnapshot();
-                Reply << Snapshot.StateId << ": \n"
-                      << Snapshot.Result;
+                Reply << NonNilFutures[i]->StateId << ": \n"
+                      << LuaAPI::LuaToString(NonNilFutures[i]->Result);
                if (i < NonNilFutures.size() - 1) {
                    Reply << "\n";
                }
            }
        } else {
-            auto Snapshot = NonNilFutures[0]->GetDetachedSnapshot();
-            Reply << Snapshot.Result;
+            Reply << LuaAPI::LuaToString(NonNilFutures[0]->Result);
        }
        Application::Console().WriteRaw(Reply.str());
    }
@@ -814,9 +647,8 @@ void TConsole::InitializeCommandline() {
                } else {
                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
                    Future->WaitUntilReady();
-                    if (Future->IsError()) {
-                        auto Snapshot = Future->GetSnapshot();
-                        beammp_lua_error("error in " + mStateId + ": " + Snapshot.ErrorMessage);
+                    if (Future->Error) {
+                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                    }
                }
            } else {
@@ -848,7 +680,7 @@ void TConsole::InitializeCommandline() {
                if (!mLuaEngine) {
                    beammp_info("Lua not started yet, please try again in a second");
                } else {
-                    std::string prefix { }; // stores non-table part of input
+                    std::string prefix {}; // stores non-table part of input
                    for (size_t i = stub.length(); i > 0; i--) { // separate table from input
                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_' && stub[i - 1] != '.') {
                            prefix = stub.substr(0, i);
@@ -18,13 +18,15 @@

 #include "THeartbeatThread.h"

-#include "ChronoWrapper.h"
 #include "Client.h"
-#include "Common.h"
 #include "Http.h"
-#include "RegionHandler.h"
-// #include "SocketIO.h"
-#include <nlohmann/json.hpp>
+#include "ChronoWrapper.h"
+//#include "SocketIO.h"
+#include <rapidjson/document.h>
+#include <rapidjson/rapidjson.h>
+#include <sstream>
+
+namespace json = rapidjson;

 void THeartbeatThread::operator()() {
    RegisterThread("Heartbeat");
@@ -38,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();
@@ -55,27 +57,22 @@ void THeartbeatThread::operator()() {

        Last = Body;
        LastNormalUpdateTime = Now;
+        if (!Application::Settings.CustomIP.empty()) {
+            Body += "&ip=" + Application::Settings.CustomIP;
+        }

        auto Target = "/heartbeat";
        unsigned int ResponseCode = 0;

-        nlohmann::json Doc;
+        json::Document Doc;
        bool Ok = false;
        for (const auto& Url : Application::GetBackendUrlsInOrder()) {
-            T = Http::POST(Url + Target, Body, "application/json", &ResponseCode, { { "api-v", "2" } });
-            if (T == Http::ErrorString || ResponseCode != 200) {
-                RegionHandler::TopLevelDomainFailed();
-                T = Http::POST(Url + Target, Body, "application/json", &ResponseCode, { { "api-v", "2" } });
-            }
-
-            if (!Application::Settings.getAsBool(Settings::Key::General_Private)) {
-                beammp_debug("Backend response was: `" + T + "`");
-            }
-
-            Doc = nlohmann::json::parse(T, nullptr, false);
-            if (Doc.is_discarded() || !Doc.is_object()) {
-                if (!Application::Settings.getAsBool(Settings::Key::General_Private)) {
+            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.Private) {
                    beammp_trace("Backend response failed to parse as valid json");
+                    beammp_trace("Response was: `" + T + "`");
                }
            } else if (ResponseCode != 200) {
                beammp_errorf("Response code from the heartbeat: {}", ResponseCode);
@@ -94,18 +91,18 @@ void THeartbeatThread::operator()() {
        const auto MessageKey = "msg";

        if (Ok) {
-            if (Doc.contains(StatusKey) && Doc[StatusKey].is_string()) {
-                Status = Doc[StatusKey];
+            if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) {
+                Status = Doc[StatusKey].GetString();
            } else {
                Ok = false;
            }
-            if (Doc.contains(CodeKey) && Doc[CodeKey].is_string()) {
-                Code = Doc[CodeKey];
+            if (Doc.HasMember(CodeKey) && Doc[CodeKey].IsString()) {
+                Code = Doc[CodeKey].GetString();
            } else {
                Ok = false;
            }
-            if (Doc.contains(MessageKey) && Doc[MessageKey].is_string()) {
-                Message = Doc[MessageKey];
+            if (Doc.HasMember(MessageKey) && Doc[MessageKey].IsString()) {
+                Message = Doc[MessageKey].GetString();
            } else {
                Ok = false;
            }
@@ -113,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;
@@ -132,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();
        }
@@ -143,30 +141,26 @@ void THeartbeatThread::operator()() {
 }

 std::string THeartbeatThread::GenerateCall() {
-    nlohmann::json Ret = {
-        { "players", std::to_string(mServer.ClientCount()) },
-        { "maxplayers", std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) },
-        { "port", std::to_string(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" },
-        { "version", Application::ServerVersionString() },
-        { "clientversion", Application::ClientMinimumVersion().AsString() },
-        { "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" },
-        { "modlist", mResourceManager.TrimmedList() },
-        { "modstotalsize", std::to_string(mResourceManager.MaxModSize()) },
-        { "modstotal", std::to_string(mResourceManager.ModsLoaded()) },
-        { "playerslist", GetPlayers() },
-        { "desc", Application::Settings.getAsString(Settings::Key::General_Description) }
-    };
+    std::stringstream Ret;

-    lastCall = Ret.dump();
-
-    // Add sensitive information here because value of lastCall is used for the information packet.
-    Ret["uuid"] = Application::Settings.getAsString(Settings::Key::General_AuthKey);
-
-    return Ret.dump();
+    Ret << "uuid=" << Application::Settings.Key
+        << "&players=" << mServer.ClientCount()
+        << "&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.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.ServerDesc
+        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
+    return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
    : mResourceManager(ResourceManager)
@@ -185,8 +179,8 @@ std::string THeartbeatThread::GetPlayers() {
    std::string Return;
    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
        ReadLock Lock(mServer.GetClientMutex());
-        if (auto Client = ClientPtr.lock()) {
-            Return += Client->GetName() + ";";
+        if (!ClientPtr.expired()) {
+            Return += ClientPtr.lock()->GetName() + ";";
        }
        return true;
    });
@@ -1,37 +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 "TIoPollThread.h"
-
-TIoPollThread::TIoPollThread()
-    : mWorkGuard(boost::asio::make_work_guard(mIoCtx))
-    , mThread([this](std::stop_token StopToken) {
-        while (!StopToken.stop_requested()) {
-            try {
-                mIoCtx.run();
-                break;
-            } catch (...) {
-                mIoCtx.restart();
-            }
-        }
-    }) { }
-
-TIoPollThread::~TIoPollThread() {
-    mWorkGuard.reset();
-    mIoCtx.stop();
-}
@@ -20,35 +20,28 @@
 #include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
-#include "Env.h"
 #include "Http.h"
 #include "LuaAPI.h"
 #include "Profiling.h"
 #include "TLuaPlugin.h"
-#include "TLuaResult.h"
 #include "sol/object.hpp"

 #include <chrono>
 #include <condition_variable>
 #include <fmt/core.h>
-#include <mutex>
 #include <nlohmann/json.hpp>
 #include <random>
-#include <sol/types.hpp>
 #include <thread>
 #include <tuple>
-#include <type_traits>
-#include <unordered_map>
-#include <variant>

 TLuaEngine* LuaAPI::MP::Engine;

 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);
@@ -63,20 +56,24 @@ TLuaEngine::TLuaEngine()
    IThreaded::Start();
 }

+TEST_CASE("TLuaEngine ctor & dtor") {
+    Application::Settings.Resource = "beammp_server_test_resources";
+    TLuaEngine engine;
+    Application::GracefullyShutdown();
+}
+
 void TLuaEngine::operator()() {
    RegisterThread("LuaEngine");
+    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
    // lua engine main thread
    beammp_infof("Lua v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
    CollectAndInitPlugins();
-
-    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
    // now call all onInit's
    auto Futures = TriggerEvent("onInit", "");
    WaitForAll(Futures, std::chrono::seconds(5));
    for (const auto& Future : Futures) {
-        auto Snapshot = Future->GetDetachedSnapshot();
-        if (Snapshot.Error && Snapshot.ErrorMessage != BeamMPFnNotFoundError) {
-            beammp_lua_error("Calling \"onInit\" on \"" + Snapshot.StateId + "\" failed: " + Snapshot.ErrorMessage);
+        if (Future->Error && Future->ErrorMessage != BeamMPFnNotFoundError) {
+            beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage);
        }
    }

@@ -86,11 +83,10 @@ void TLuaEngine::operator()() {
            std::unique_lock Lock(mResultsToCheckMutex);
            if (!mResultsToCheck.empty()) {
                mResultsToCheck.remove_if([](const std::shared_ptr<TLuaResult>& Ptr) -> bool {
-                    if (Ptr->IsReady()) {
-                        auto Snapshot = Ptr->GetDetachedSnapshot();
-                        if (Snapshot.Error) {
-                            if (Snapshot.ErrorMessage != BeamMPFnNotFoundError) {
-                                beammp_lua_error(Snapshot.Function + ": " + Snapshot.ErrorMessage);
+                    if (Ptr->Ready) {
+                        if (Ptr->Error) {
+                            if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
+                                beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
                            }
                        }
                        return true;
@@ -115,7 +111,7 @@ void TLuaEngine::operator()() {
                    std::unique_lock StateLock(mLuaStatesMutex);
                    std::unique_lock Lock2(mResultsToCheckMutex);
                    for (auto& Handler : Handlers) {
-                        auto Res = mLuaStates[Timer.StateId]->EnqueueFunctionCallFromCustomEvent(Handler, { }, Timer.EventName, Timer.Strategy);
+                        auto Res = mLuaStates[Timer.StateId]->EnqueueFunctionCallFromCustomEvent(Handler, {}, Timer.EventName, Timer.Strategy);
                        if (Res) {
                            mResultsToCheck.push_back(Res);
                            mResultsToCheckCond.notify_one();
@@ -130,13 +126,7 @@ void TLuaEngine::operator()() {
                }
            }
        }
-        bool StatesEmpty = false;
-        {
-            std::unique_lock Lock(mLuaStatesMutex);
-            StatesEmpty = mLuaStates.empty();
-        }
-
-        if (StatesEmpty) {
+        if (mLuaStates.size() == 0) {
            beammp_trace("No Lua states, event loop running extremely sparsely");
            Application::SleepSafeSeconds(10);
        } else {
@@ -209,8 +199,8 @@ std::unordered_map<std::string /* event name */, std::vector<std::string> /* han
    return Result;
 }

-std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaVoidResult>>> TLuaEngine::Debug_GetStateExecuteQueueForState(TLuaStateId StateId) {
-    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaVoidResult>>> Result;
+std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::Debug_GetStateExecuteQueueForState(TLuaStateId StateId) {
+    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Result;
    std::unique_lock Lock(mLuaStatesMutex);
    Result = mLuaStates.at(StateId)->Debug_GetStateExecuteQueue();
    return Result;
@@ -223,16 +213,16 @@ std::vector<TLuaEngine::QueuedFunction> TLuaEngine::Debug_GetStateFunctionQueueF
    return Result;
 }

-std::vector<TLuaResult::DetachedSnapshot> TLuaEngine::Debug_GetResultsToCheckForState(TLuaStateId StateId) {
+std::vector<TLuaResult> TLuaEngine::Debug_GetResultsToCheckForState(TLuaStateId StateId) {
    std::unique_lock Lock(mResultsToCheckMutex);
    auto ResultsToCheckCopy = mResultsToCheck;
    Lock.unlock();
-    std::vector<TLuaResult::DetachedSnapshot> Result;
+    std::vector<TLuaResult> Result;
    while (!ResultsToCheckCopy.empty()) {
        auto ResultToCheck = std::move(ResultsToCheckCopy.front());
        ResultsToCheckCopy.pop_front();
-        if (ResultToCheck->OwnerState() == StateId) {
-            Result.push_back(ResultToCheck->GetDetachedSnapshot());
+        if (ResultToCheck->StateId == StateId) {
+            Result.push_back(*ResultToCheck);
        }
    }
    return Result;
@@ -263,7 +253,7 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const st
    auto globals = mStateView.globals();

    sol::table current = globals;
-    std::vector<std::string> Result { };
+    std::vector<std::string> Result {};

    for (const auto& [key, value] : current) {
        std::string s = key.as<std::string>();
@@ -319,30 +309,27 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
        size_t ms = 0;
        std::set<std::string> WarnedResults;

-        while (!Result->IsReady() && !Cancelled) {
+        while (!Result->Ready && !Cancelled) {
            std::this_thread::sleep_for(std::chrono::milliseconds(10));
            ms += 10;
            if (Max.has_value() && std::chrono::milliseconds(ms) > Max.value()) {
-                auto Snapshot = Result->GetDetachedSnapshot();
-                beammp_trace("'" + Snapshot.Function + "' in '" + Snapshot.StateId + "' did not finish executing in time (took: " + std::to_string(ms) + "ms).");
+                beammp_trace("'" + Result->Function + "' in '" + Result->StateId + "' did not finish executing in time (took: " + std::to_string(ms) + "ms).");
                Cancelled = true;
            } else if (ms > 1000 * 60) {
-                auto Snapshot = Result->GetDetachedSnapshot();
-                auto ResultId = Snapshot.StateId + "_" + Snapshot.Function;
+                auto ResultId = Result->StateId + "_" + Result->Function;
                if (WarnedResults.count(ResultId) == 0) {
                    WarnedResults.insert(ResultId);
-                    beammp_lua_warn("'" + Snapshot.Function + "' in '" + Snapshot.StateId + "' is taking very long. The event it's handling is too important to discard the result of this handler, but may block this event and possibly the whole lua state.");
+                    beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' is taking very long. The event it's handling is too important to discard the result of this handler, but may block this event and possibly the whole lua state.");
                }
            }
        }

-        auto Snapshot = Result->GetDetachedSnapshot();
        if (Cancelled) {
-            beammp_lua_warn("'" + Snapshot.Function + "' in '" + Snapshot.StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
+            beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
            LuaAPI::MP::Engine->ReportErrors({ Result });
-        } else if (Snapshot.Error) {
-            if (Snapshot.ErrorMessage != BeamMPFnNotFoundError) {
-                beammp_lua_error(Snapshot.Function + ": " + Snapshot.ErrorMessage);
+        } else if (Result->Error) {
+            if (Result->ErrorMessage != BeamMPFnNotFoundError) {
+                beammp_lua_error(Result->Function + ": " + Result->ErrorMessage);
            }
        }
    }
@@ -362,14 +349,14 @@ bool TLuaEngine::HasState(TLuaStateId StateId) {
    return mLuaStates.find(StateId) != mLuaStates.end();
 }

-std::shared_ptr<TLuaVoidResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script) {
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script) {
    std::unique_lock Lock(mLuaStatesMutex);
    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() {
@@ -442,11 +429,10 @@ 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();
-            auto Snapshot = Res->GetDetachedSnapshot();
-            if (Snapshot.Error && Snapshot.ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
-                beammp_lua_error("Calling \"onInit\" on \"" + StateId + "\" failed: " + Snapshot.ErrorMessage);
+            if (Res->Error && Res->ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
+                beammp_lua_error("Calling \"onInit\" on \"" + StateId + "\" failed: " + Res->ErrorMessage);
            }
        }
    }
@@ -458,7 +444,6 @@ void TLuaEngine::RegisterEvent(const std::string& EventName, TLuaStateId StateId
 }

 std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId) {
-    std::unique_lock Lock(mLuaEventsMutex);
    return mLuaEvents[EventName][StateId];
 }

@@ -466,7 +451,7 @@ std::vector<sol::object> TLuaEngine::StateThreadData::JsonStringToArray(JsonStri
    auto LocalTable = Lua_JsonDecode(Str.value).as<std::vector<sol::object>>();
    for (auto& value : LocalTable) {
        if (value.is<std::string>() && value.as<std::string>() == BEAMMP_INTERNAL_NIL) {
-            value = sol::object { };
+            value = sol::object {};
        }
    }
    return LocalTable;
@@ -508,16 +493,15 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
        auto Fn = mStateView[Handler];
        if (Fn.valid()) {
            auto LuaResult = Fn(LocalArgs);
-            auto Result = std::make_shared<TLuaResult>(mStateId, Handler);
+            auto Result = std::make_shared<TLuaResult>();
            if (LuaResult.valid()) {
-                try {
-                    Result->MarkReadySuccess(LuaResult);
-                } catch (const std::exception& e) {
-                    Result->MarkReadyError(fmt::format("Call was successful, but result could not be serialized"));
-                }
+                Result->Error = false;
+                Result->Result = LuaResult;
            } else {
-                Result->MarkReadyError("Function result in TriggerGlobalEvent was invalid");
+                Result->Error = true;
+                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
            }
+            Result->MarkAsReady();
            Return.push_back(Result);
        }
    }
@@ -525,60 +509,26 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
    sol::table AsyncEventReturn = StateView.create_table();
    AsyncEventReturn["ReturnValueImpl"] = Return;
    AsyncEventReturn.set_function("IsDone",
-        [](const sol::table& Self) -> bool {
+        [&](const sol::table& Self) -> bool {
            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
            for (const auto& Value : Vector) {
-                if (!Value->IsReady()) {
+                if (!Value->Ready) {
                    return false;
                }
            }
            return true;
        });
    AsyncEventReturn.set_function("GetResults",
-        [](const sol::table& Self, sol::this_state State) -> sol::table {
-            sol::state_view StateView(State);
+        [&](const sol::table& Self) -> sol::table {
+            sol::state_view StateView(mState);
            sol::table Result = StateView.create_table();
            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
-            auto DetachedToLuaObject = [&StateView](const auto& SelfConvert, const TDetachedLuaValue& value) -> sol::object {
-                return std::visit([&StateView, &SelfConvert](auto&& arg) -> sol::object {
-                    using T = std::decay_t<decltype(arg)>;
-                    if constexpr (std::is_same_v<T, TDetachedLuaValue::Array>) {
-                        sol::table Table = StateView.create_table(static_cast<int>(arg.size()), 0);
-                        size_t i = 1;
-                        for (const auto& Elem : arg) {
-                            Table.set(i, SelfConvert(SelfConvert, Elem));
-                            ++i;
-                        }
-                        return sol::make_object(StateView, Table);
-                    } else if constexpr (std::is_same_v<T, TDetachedLuaValue::Object>) {
-                        sol::table Table = StateView.create_table();
-                        for (const auto& [Key, Elem] : arg) {
-                            Table.set(Key, SelfConvert(SelfConvert, *Elem));
-                        }
-                        return sol::make_object(StateView, Table);
-                    }
-                    else if constexpr (std::is_same_v<T, bool>)
-                        return sol::make_object(StateView, arg);
-                    else if constexpr (std::is_same_v<T, double>)
-                        return sol::make_object(StateView, arg);
-                    else if constexpr (std::is_same_v<T, int>)
-                        return sol::make_object(StateView, arg);
-                    else if constexpr (std::is_same_v<T, std::string>)
-                        return sol::make_object(StateView, arg);
-                    else if constexpr (std::is_same_v<T, std::monostate>)
-                        return sol::make_object(StateView, sol::lua_nil_t());
-                    else
-                        static_assert(AlwaysFalseV<T>, "non-exhaustive visitor!");
-                }, value.V);
-            };
            int i = 1;
            for (const auto& Value : Vector) {
-                if (!Value->IsReady()) {
+                if (!Value->Ready) {
                    return sol::lua_nil;
                }
-                auto Snapshot = Value->GetDetachedSnapshot();
-                Result.set(i, DetachedToLuaObject(DetachedToLuaObject, Snapshot.Result));
-
+                Result.set(i, Value->Result);
                ++i;
            }
            return Result;
@@ -598,13 +548,8 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&
                Result.set(i, FnRet);
                ++i;
            } else {
-                std::string ErrStr;
-                if (FnRet.get_type() == sol::type::string) {
-                    ErrStr = FnRet.get<sol::error>().what();
-                } else {
-                    ErrStr = "(unknown error; error object is not inspectable)";
-                }
-                beammp_lua_errorf("TriggerLocalEvent: {}", ErrStr);
+                sol::error Err = FnRet;
+                beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
            }
        }
    }
@@ -613,37 +558,27 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        if (std::shared_ptr<TClient> Locked = MaybeClient.value().lock()) {
-            auto IDs = Locked->GetIdentifiers();
-            if (IDs.empty()) {
-                return sol::lua_nil;
-            }
-            sol::table Result = mStateView.create_table();
-            for (const auto& Pair : IDs) {
-                Result.set(Pair.first, Pair.second);
-            }
-            return Result;
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
+        if (IDs.empty()) {
+            return sol::lua_nil;
        }
-    }
-    return sol::lua_nil;
-}
-
-std::variant<std::string, sol::nil_t> TLuaEngine::StateThreadData::Lua_GetPlayerRole(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        if (auto Locked = MaybeClient.value().lock()) {
-            return Locked->GetRoles();
+        sol::table Result = mStateView.create_table();
+        for (const auto& Pair : IDs) {
+            Result[Pair.first] = Pair.second;
        }
+        return Result;
+    } else {
+        return sol::lua_nil;
    }
-    return sol::nil;
 }

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
    sol::table Result = mStateView.create_table();
    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-        if (auto Locked = Client.lock()) {
-            Result[Locked->GetID()] = Locked->GetName();
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            Result[locked->GetID()] = locked->GetName();
        }
        return true;
    });
@@ -653,9 +588,10 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
 int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
    int Id = -1;
    mEngine->mServer->ForEachClient([&Id, &Name](std::weak_ptr<TClient> Client) -> bool {
-        if (auto Locked = Client.lock()) {
-            if (Locked->GetName() == Name) {
-                Id = Locked->GetID();
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (locked->GetName() == Name) {
+                Id = locked->GetID();
                return false;
            }
        }
@@ -692,59 +628,60 @@ sol::table TLuaEngine::StateThreadData::Lua_FS_ListDirectories(const std::string

 std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        if (auto Locked = MaybeClient.value().lock()) {
-            return Locked->GetName();
-        }
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->GetName();
+    } else {
+        return "";
    }
-    return "";
 }

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        if (auto Client = MaybeClient.value().lock()) {
-            TClient::TSetOfVehicleData VehicleData;
-            { // Vehicle Data Lock Scope
-                auto LockedData = Client->GetAllCars();
-                VehicleData = *LockedData.VehicleData;
-            } // End Vehicle Data Lock Scope
-            if (VehicleData.empty()) {
-                return sol::lua_nil;
-            }
-            sol::state_view StateView(mState);
-            sol::table Result = StateView.create_table();
-            for (const auto& v : VehicleData) {
-                Result[v.ID()] = v.DataAsPacket(Client->GetRoles(), Client->GetName(), Client->GetID()).substr(3);
-            }
-            return Result;
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
+        TClient::TSetOfVehicleData VehicleData;
+        { // Vehicle Data Lock Scope
+            auto LockedData = Client->GetAllCars();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (VehicleData.empty()) {
+            return sol::lua_nil;
        }
-    }
-    return sol::lua_nil;
+        sol::state_view StateView(mState);
+        sol::table Result = StateView.create_table();
+        for (const auto& v : VehicleData) {
+            Result[v.ID()] = v.Data().substr(3);
+        }
+        return Result;
+    } else
+        return sol::lua_nil;
 }

 std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetPositionRaw(int PID, int VID) {
    std::pair<sol::table, std::string> Result;
    auto MaybeClient = GetClient(mEngine->Server(), PID);
-    if (MaybeClient) {
-        if (auto Client = MaybeClient.value().lock()) {
-            std::string VehiclePos = Client->GetCarPositionRaw(VID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
+        std::string VehiclePos = Client->GetCarPositionRaw(VID);

-            if (VehiclePos.empty()) {
-                Result.second = "Vehicle not found";
-                return Result;
-            }
-
-            sol::table t = Lua_JsonDecode(VehiclePos);
-            if (t == sol::lua_nil) {
-                Result.second = "Packet decode failed";
-            }
-            Result.first = t;
+        if (VehiclePos.empty()) {
+            // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Vehicle not found"));
+            Result.second = "Vehicle not found";
            return Result;
        }
+
+        sol::table t = Lua_JsonDecode(VehiclePos);
+        if (t == sol::lua_nil) {
+            Result.second = "Packet decode failed";
+        }
+        // return std::make_tuple(Result, sol::make_object(StateView, sol::lua_nil));
+        Result.first = t;
+        return Result;
+    } else {
+        // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Client expired"));
+        Result.second = "No such player";
+        return Result;
    }
-    Result.second = "No such player";
-    return Result;
 }

 sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::string& host, uint16_t port) {
@@ -778,38 +715,10 @@ static void AddToTable(sol::table& table, const std::string& left, const T& valu
    }
 }

-static bool mDisableMPSet = [] {
-    auto DisableMPSet = Env::Get(Env::Key::PROVIDER_DISABLE_MP_SET).value_or("false");
-    return DisableMPSet == "true" || DisableMPSet == "1";
-}();
-
-static auto GetSettingName = [](int id) -> const char* {
-    switch (id) {
-    case 0:
-        return "Debug";
-    case 1:
-        return "Private";
-    case 2:
-        return "MaxCars";
-    case 3:
-        return "MaxPlayers";
-    case 4:
-        return "Map";
-    case 5:
-        return "Name";
-    case 6:
-        return "Description";
-    case 7:
-        return "InformationPacket";
-    default:
-        return "Unknown";
-    }
-};
-
 static void JsonDecodeRecursive(sol::state_view& StateView, sol::table& table, const std::string& left, const nlohmann::json& right) {
    switch (right.type()) {
    case nlohmann::detail::value_t::null:
-        AddToTable(table, left, sol::lua_nil_t { });
+        AddToTable(table, left, sol::lua_nil_t {});
        return;
    case nlohmann::detail::value_t::object: {
        auto value = table.create();
@@ -937,29 +846,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("GetPositionRaw", [&](int PID, int VID) -> std::pair<sol::table, std::string> {
        return Lua_GetPositionRaw(PID, VID);
    });
-    MPTable.set_function("SendChatMessage", [&](sol::variadic_args Args) {
-        if (Args.size() == 2) {
-            LuaAPI::MP::SendChatMessage(Args.get<int>(0), Args.get<std::string>(1));
-        } else if (Args.size() == 3) {
-            LuaAPI::MP::SendChatMessage(Args.get<int>(0), Args.get<std::string>(1), Args.get<bool>(2));
-        } else {
-            beammp_lua_error("SendChatMessage expects 2 or 3 arguments.");
-        }
-    });
-    MPTable.set_function("SendNotification", [&](sol::variadic_args Args) {
-        if (Args.size() == 2) {
-            LuaAPI::MP::SendNotification(Args.get<int>(0), Args.get<std::string>(1), "", Args.get<std::string>(1));
-        } else 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, 3 or 4 arguments.");
-        }
-    });
-    MPTable.set_function("ConfirmationDialog", sol::overload(&LuaAPI::MP::ConfirmationDialog, [&](const int& ID, const std::string& Title, const std::string& Body, const sol::table& Buttons, const std::string& InteractionID) {
-        LuaAPI::MP::ConfirmationDialog(ID, Title, Body, Buttons, InteractionID);
-    }));
+    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
    MPTable.set_function("GetPlayers", [&]() -> sol::table {
        return Lua_GetPlayers();
    });
@@ -974,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) {
@@ -1003,14 +887,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("CancelEventTimer", [&](const std::string& EventName) {
        mEngine->CancelEventTimers(EventName, mStateId);
    });
-    if (mDisableMPSet) {
-        MPTable.set_function("Set", [this](int ConfigID, sol::object NewValue) {
-            beammp_lua_errorf("A script ({}) tried to call MP.Set to change setting '{}' but this was blocked by your server provider.", mStateId, GetSettingName(ConfigID));
-        });
-    } else {
-        MPTable.set_function("Set", &LuaAPI::MP::Set);
-    }
-    MPTable.set_function("Get", &LuaAPI::MP::Get);
+    MPTable.set_function("Set", &LuaAPI::MP::Set);

    auto UtilTable = StateView.create_named_table("Util");
    UtilTable.set_function("LogDebug", [this](sol::variadic_args args) {
@@ -1019,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);
        }
    });
@@ -1102,8 +979,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
        "MaxPlayers", 3,
        "Map", 4,
        "Name", 5,
-        "Description", 6,
-        "InformationPacket", 7);
+        "Description", 6);

    MPTable.create_named("CallStrategy",
        "BestEffort", CallStrategy::BestEffort,
@@ -1130,16 +1006,15 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    Start();
 }

-std::shared_ptr<TLuaVoidResult> TLuaEngine::StateThreadData::EnqueueScript(const TLuaChunk& Script) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLuaChunk& Script) {
    std::unique_lock Lock(mStateExecuteQueueMutex);
-    auto Result = std::make_shared<TLuaVoidResult>(mStateId);
+    auto Result = std::make_shared<TLuaResult>();
    mStateExecuteQueue.push({ Script, Result });
    return Result;
 }

 std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy) {
    // TODO: Document all this
-    std::unique_lock Lock(mStateFunctionQueueMutex);
    decltype(mStateFunctionQueue)::iterator Iter = mStateFunctionQueue.end();
    if (Strategy == CallStrategy::BestEffort) {
        Iter = std::find_if(mStateFunctionQueue.begin(), mStateFunctionQueue.end(),
@@ -1148,7 +1023,10 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFrom
            });
    }
    if (Iter == mStateFunctionQueue.end()) {
-        auto Result = std::make_shared<TLuaResult>(mStateId, FunctionName);
+        auto Result = std::make_shared<TLuaResult>();
+        Result->StateId = mStateId;
+        Result->Function = FunctionName;
+        std::unique_lock Lock(mStateFunctionQueueMutex);
        mStateFunctionQueue.push_back({ FunctionName, Result, Args, EventName });
        mStateFunctionQueueCond.notify_all();
        return Result;
@@ -1157,10 +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) {
-    auto Result = std::make_shared<TLuaResult>(mStateId, FunctionName);
+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;
 }
@@ -1207,14 +1087,14 @@ void TLuaEngine::StateThreadData::operator()() {
                sol::state_view StateView(mState);
                auto Res = StateView.safe_script(*S.first.Content, sol::script_pass_on_error, S.first.FileName);
                if (Res.valid()) {
-                    // Script-load completion should not serialize the script's return value.
-                    // A loaded chunk may legally return non-serializable Lua values such as
-                    // functions or function tables. For this reason, we don't pass anything
-                    // to the result here.
-                    S.second->MarkReadySuccess();
+                    S.second->Error = false;
+                    S.second->Result = std::move(Res);
                } else {
-                    S.second->MarkReadyError(std::move(Res));
+                    S.second->Error = true;
+                    sol::error Err = Res;
+                    S.second->ErrorMessage = Err.what();
                }
+                S.second->MarkAsReady();
            }
        }
        { // StateFunctionQueue Scope
@@ -1231,7 +1111,7 @@ void TLuaEngine::StateThreadData::operator()() {
                auto& Result = TheQueuedFunction.Result;
                auto Args = TheQueuedFunction.Args;
                // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
-                Result->SetOwnerState(mStateId);
+                Result->StateId = mStateId;
                sol::state_view StateView(mState);
                auto Fn = StateView[FnName];
                if (Fn.valid() && Fn.get_type() == sol::type::function) {
@@ -1240,45 +1120,49 @@ void TLuaEngine::StateThreadData::operator()() {
                        if (Arg.valueless_by_exception()) {
                            continue;
                        }
-                        std::visit([&LuaArgs, &StateView, this](const auto& arg) {
-                            using T = std::decay_t<decltype(arg)>;
-                            if constexpr (std::is_same_v<T, std::string>) {
-                                LuaArgs.push_back(sol::make_object(StateView, arg));
-                            } else if constexpr (std::is_same_v<T, int>) {
-                                LuaArgs.push_back(sol::make_object(StateView, arg));
-                            } else if constexpr (std::is_same_v<T, bool>) {
-                                LuaArgs.push_back(sol::make_object(StateView, arg));
-                            } else if constexpr (std::is_same_v<T, JsonString>) {
-                                auto LocalArgs = JsonStringToArray(arg);
-                                LuaArgs.insert(LuaArgs.end(), LocalArgs.begin(), LocalArgs.end());
-                            } else if constexpr (std::is_same_v<T, std::monostate>) {
-                                beammp_lua_error("Unknown argument type, passed as nil");
-                                LuaArgs.push_back(sol::lua_nil_t());
-                            } else if constexpr (std::is_same_v<T, std::unordered_map<std::string, std::string>>) {
-                                auto Table = StateView.create_table();
-                                for (const auto& [k, v] : arg) {
-                                    Table[k] = v;
-                                }
-                                LuaArgs.push_back(Table);
-                            } else if constexpr (std::is_same_v<T, float>) {
-                                LuaArgs.push_back(sol::make_object(StateView, arg));
-                            } else {
-                                static_assert(AlwaysFalseV<T>, "unhandled variant");
+                        switch (Arg.index()) {
+                        case TLuaType::String:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<std::string>(Arg)));
+                            break;
+                        case TLuaType::Int:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<int>(Arg)));
+                            break;
+                        case TLuaType::Json: {
+                            auto LocalArgs = JsonStringToArray(std::get<JsonString>(Arg));
+                            LuaArgs.insert(LuaArgs.end(), LocalArgs.begin(), LocalArgs.end());
+                            break;
+                        }
+                        case TLuaType::Bool:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
+                            break;
+                         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) {
+                                Table[k] = v;
                            }
-                        }, Arg);
+                            LuaArgs.push_back(sol::make_object(StateView, Table));
+                            break;
+                        }
+                        default:
+                            beammp_error("Unknown argument type, passed as nil");
+                            break;
+                        }
                    }
                    auto Res = Fn(sol::as_args(LuaArgs));
                    if (Res.valid()) {
-                        try {
-                            Result->MarkReadySuccess(std::move(Res));
-                        } catch (const std::exception& e) {
-                            Result->MarkReadyError(fmt::format("Call was successful, but result could not be serialized"));
-                        }
+                        Result->Error = false;
+                        Result->Result = std::move(Res);
                    } else {
-                        Result->MarkReadyError(std::move(Res));
+                        Result->Error = true;
+                        sol::error Err = Res;
+                        Result->ErrorMessage = Err.what();
                    }
+                    Result->MarkAsReady();
                } else {
-                    Result->MarkReadyError(BeamMPFnNotFoundError);
+                    Result->Error = true;
+                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
+                    Result->MarkAsReady();
                }
                auto ProfEnd = prof::now();
                auto ProfDuration = prof::duration(ProfStart, ProfEnd);
@@ -1288,7 +1172,7 @@ void TLuaEngine::StateThreadData::operator()() {
    }
 }

-std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaVoidResult>>> TLuaEngine::StateThreadData::Debug_GetStateExecuteQueue() {
+std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::StateThreadData::Debug_GetStateExecuteQueue() {
    std::unique_lock Lock(mStateExecuteQueueMutex);
    return mStateExecuteQueue;
 }
@@ -1331,6 +1215,21 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
    mPaths.push(Path);
 }

+void TLuaResult::MarkAsReady() {
+    {
+        std::lock_guard<std::mutex> readyLock(*this->ReadyMutex);
+        this->Ready = true;
+    }
+    this->ReadyCondition->notify_all();
+}
+
+void TLuaResult::WaitUntilReady() {
+    std::unique_lock readyLock(*this->ReadyMutex);
+    // wait if not ready yet
+    if (!this->Ready)
+        this->ReadyCondition->wait(readyLock);
+}
+
 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
    : Content(Content)
    , FileName(FileName)
@@ -1345,110 +1244,3 @@ bool TLuaEngine::TimedEvent::Expired() {
 void TLuaEngine::TimedEvent::Reset() {
    LastCompletion = std::chrono::high_resolution_clock::now();
 }
-
-TEST_CASE("TLuaEngine ctor & dtor") {
-    Application::Settings.set(Settings::Key::General_ResourceFolder, "beammp_server_test_resources");
-    TLuaEngine engine;
-
-    const TLuaStateId StateId = "lua_event_contract_test";
-    engine.EnsureStateExists(StateId, "LuaEventContractTest", true);
-
-    // LLM generated test code
-    auto Script = std::make_shared<std::string>(R"(
-function onPlayerAuth(playerName, playerRole, isGuest, identifiers)
-    if type(playerName) ~= "string" then return "on:bad-playerName-type:" .. type(playerName) end
-    if type(playerRole) ~= "string" then return "on:bad-playerRole-type:" .. type(playerRole) end
-    if type(isGuest) ~= "boolean" then return "on:bad-isGuest-type:" .. type(isGuest) end
-    if type(identifiers) ~= "table" then return "on:bad-identifiers-type:" .. type(identifiers) end
-    return "on:" .. playerName .. ":" .. playerRole .. ":" .. tostring(isGuest) .. ":" .. tostring(identifiers.ip) .. ":" .. tostring(identifiers.beammp)
-end
-
-function postPlayerAuth(isDenied, reason, playerName, playerRole, isGuest, identifiers)
-    if type(isDenied) ~= "boolean" then return "post:bad-isDenied-type:" .. type(isDenied) end
-    if type(reason) ~= "string" then return "post:bad-reason-type:" .. type(reason) end
-    if type(playerName) ~= "string" then return "post:bad-playerName-type:" .. type(playerName) end
-    if type(playerRole) ~= "string" then return "post:bad-playerRole-type:" .. type(playerRole) end
-    if type(isGuest) ~= "boolean" then return "post:bad-isGuest-type:" .. type(isGuest) end
-    if type(identifiers) ~= "table" then return "post:bad-identifiers-type:" .. type(identifiers) end
-    return "post:" .. tostring(isDenied) .. ":" .. reason .. ":" .. playerName .. ":" .. playerRole .. ":" .. tostring(isGuest) .. ":" .. tostring(identifiers.ip) .. ":" .. tostring(identifiers.beammp)
-end
-
-function arrayBoundaryHandler()
-    return { "first", "second", [4] = true }
-end
-
-function verifyArrayBoundaryRoundtrip()
-    local pending = MP.TriggerGlobalEvent("arrayBoundaryEvent")
-    if not pending:IsDone() then
-        return "not_done"
-    end
-
-    local results = pending:GetResults()
-    if type(results) ~= "table" then
-        return "bad_results_type:" .. type(results)
-    end
-    if type(results[1]) ~= "table" then
-        return "bad_item_type:" .. type(results[1])
-    end
-
-    local arr = results[1]
-    return tostring(arr[1]) .. "|" .. tostring(arr[2]) .. "|" .. tostring(arr[4]) .. "|" .. tostring(arr[3] == nil)
-end
-
-MP.RegisterEvent("onPlayerAuth", "onPlayerAuth")
-MP.RegisterEvent("postPlayerAuth", "postPlayerAuth")
-MP.RegisterEvent("arrayBoundaryEvent", "arrayBoundaryHandler")
-)");
-
-    auto LoadResult = engine.EnqueueScript(StateId, TLuaChunk(Script, "event_contract.lua", "beammp_server_test_resources/Server/LuaEventContractTest"));
-    LoadResult->WaitUntilReady();
-    auto LoadSnapshot = LoadResult->GetSnapshot();
-    CHECK(!LoadSnapshot.Error);
-
-    const std::unordered_map<std::string, std::string> Identifiers {
-        {"ip", "410.0.24.1"},
-        {"beammp", "123456"},
-    };
-
-    auto OnPlayerAuthResults = engine.TriggerEvent(
-        "onPlayerAuth", "",
-        std::string("guest8133569"),
-        std::string("USER"),
-        true,
-        Identifiers);
-    REQUIRE(OnPlayerAuthResults.size() == 1);
-    TLuaEngine::WaitForAll(OnPlayerAuthResults);
-
-    auto OnPlayerAuthSnapshot = OnPlayerAuthResults.front()->GetDetachedSnapshot();
-    CHECK(!OnPlayerAuthSnapshot.Error);
-    const auto* OnPlayerAuthValue = std::get_if<std::string>(&OnPlayerAuthSnapshot.Result.V);
-    REQUIRE(OnPlayerAuthValue != nullptr);
-    CHECK(*OnPlayerAuthValue == "on:guest8133569:USER:true:410.0.24.1:123456");
-
-    auto PostPlayerAuthResults = engine.TriggerEvent(
-        "postPlayerAuth", "",
-        false,
-        std::string(""),
-        std::string("guest8133569"),
-        std::string("USER"),
-        true,
-        Identifiers);
-    REQUIRE(PostPlayerAuthResults.size() == 1);
-    TLuaEngine::WaitForAll(PostPlayerAuthResults);
-
-    auto PostPlayerAuthSnapshot = PostPlayerAuthResults.front()->GetDetachedSnapshot();
-    CHECK(!PostPlayerAuthSnapshot.Error);
-    const auto* PostPlayerAuthValue = std::get_if<std::string>(&PostPlayerAuthSnapshot.Result.V);
-    REQUIRE(PostPlayerAuthValue != nullptr);
-    CHECK(*PostPlayerAuthValue == "post:false::guest8133569:USER:true:410.0.24.1:123456");
-
-    auto ArrayRoundtrip = engine.EnqueueFunctionCall(StateId, "verifyArrayBoundaryRoundtrip", {}, "verifyArrayBoundaryRoundtrip");
-    ArrayRoundtrip->WaitUntilReady();
-    auto ArrayRoundtripSnapshot = ArrayRoundtrip->GetDetachedSnapshot();
-    CHECK(!ArrayRoundtripSnapshot.Error);
-    const auto* ArrayRoundtripValue = std::get_if<std::string>(&ArrayRoundtripSnapshot.Result.V);
-    REQUIRE(ArrayRoundtripValue != nullptr);
-    CHECK(*ArrayRoundtripValue == "first|second|true|true");
-
-    Application::GracefullyShutdown();
-}
@@ -44,7 +44,7 @@ TLuaPlugin::TLuaPlugin(TLuaEngine& Engine, const TLuaPluginConfig& Config, const
        std::transform(secondStr.begin(), secondStr.end(), secondStr.begin(), ::tolower);
        return firstStr < secondStr;
    });
-    std::vector<std::pair<fs::path, std::shared_ptr<TLuaVoidResult>>> ResultsToCheck;
+    std::vector<std::pair<fs::path, std::shared_ptr<TLuaResult>>> ResultsToCheck;
    for (const auto& Entry : Entries) {
        // read in entire file
        try {
@@ -63,9 +63,8 @@ TLuaPlugin::TLuaPlugin(TLuaEngine& Engine, const TLuaPluginConfig& Config, const
    }
    for (auto& Result : ResultsToCheck) {
        Result.second->WaitUntilReady();
-        auto Snapshot = Result.second->GetSnapshot();
-        if (Snapshot.Error) {
-            beammp_lua_error("Failed: \"" + Result.first.string() + "\": " + Snapshot.ErrorMessage);
+        if (Result.second->Error) {
+            beammp_lua_error("Failed: \"" + Result.first.string() + "\": " + Result.second->ErrorMessage);
        }
    }
 }
@@ -1,425 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2026 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 "TLuaResult.h"
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <cmath>
-#include <limits>
-#include <sol/unsafe_function_result.hpp>
-#include <stdexcept>
-#include <thread>
-
-
-std::ostream& operator<<(std::ostream& os, const TDetachedLuaValue& value) {
-    std::visit([&os](auto&& arg) {
-        using T = std::decay_t<decltype(arg)>;
-        if constexpr (std::is_same_v<T, TDetachedLuaValue::Array>) {
-            size_t i = 0;
-            for (const auto& val : arg) {
-                if (i > 0) {
-                    os << ", ";
-                }
-                os << val;
-                ++i;
-            }
-        } else if constexpr (std::is_same_v<T, TDetachedLuaValue::Object>) {
-            size_t i = 0;
-            for (const auto& [key, val] : arg) {
-                if (i > 0) {
-                    os << ", ";
-                }
-                os << key << "=" << val;
-                ++i;
-            }
-        } else if constexpr (std::is_same_v<T, bool>)
-            os << (arg ? "true" : "false");
-        else if constexpr (std::is_same_v<T, double>)
-            os << arg;
-        else if constexpr (std::is_same_v<T, int>)
-            os << arg;
-        else if constexpr (std::is_same_v<T, std::string>)
-            os << arg;
-        else if constexpr (std::is_same_v<T, std::monostate>)
-            // monostate means no result value
-            os << "";
-        else
-            static_assert(AlwaysFalseV<T>, "non-exhaustive visitor!");
-    },
-        value.V);
-
-    return os;
-}
-
-void TLuaVoidResult::MarkReadySuccess() {
-    std::unique_lock Lock(mMutex);
-    mError = false;
-    mErrorMessage.clear();
-    MarkAsReady();
-}
-
-void TLuaVoidResult::MarkReadyError(sol::protected_function_result Res) {
-    std::unique_lock Lock(mMutex);
-    mError = true;
-    SetErrorMessageFromResult(Res);
-    MarkAsReady();
-}
-
-void TLuaVoidResult::MarkReadyError(std::string Res) {
-    std::unique_lock Lock(mMutex);
-    mError = true;
-    mErrorMessage = std::move(Res);
-    MarkAsReady();
-}
-
-bool TLuaVoidResult::IsReady() const {
-    std::unique_lock Lock(mMutex);
-    return mReady;
-}
-
-bool TLuaVoidResult::IsError() const {
-    std::unique_lock Lock(mMutex);
-    return mError;
-}
-
-TLuaVoidResult::Snapshot TLuaVoidResult::GetSnapshot() const {
-    std::unique_lock Lock(mMutex);
-    Snapshot snapshot {
-        .Error = mError,
-        .Ready = mReady,
-        .ErrorMessage = mErrorMessage,
-        .StateId = mStateId,
-    };
-    return snapshot;
-}
-
-void TLuaVoidResult::MarkAsReady() {
-    mReady = true;
-    mReadyCondition.notify_all();
-}
-
-void TLuaVoidResult::WaitUntilReady() {
-    std::unique_lock Lock(mMutex);
-    while (!mReady)
-        mReadyCondition.wait_for(Lock, std::chrono::milliseconds(50),
-            [this] {
-                return mReady;
-            });
-}
-
-
-void TLuaResult::MarkReadySuccess(sol::object Res) {
-    std::unique_lock Lock(mMutex);
-    mError = false;
-    mDetachedResult = Freeze(Res);
-
-    MarkAsReady();
-}
-
-void TLuaResult::MarkReadySuccessNoResult() {
-    std::unique_lock Lock(mMutex);
-    mError = false;
-    mDetachedResult = { { std::monostate { } } };
-
-    MarkAsReady();
-}
-
-void TLuaResult::MarkReadyError(sol::protected_function_result Res) {
-    std::unique_lock Lock(mMutex);
-    mError = true;
-    SetErrorMessageFromResult(Res);
-
-    MarkAsReady();
-}
-
-void TLuaResult::MarkReadyError(std::string Res) {
-    std::unique_lock Lock(mMutex);
-    mError = true;
-    mErrorMessage = std::move(Res);
-
-    MarkAsReady();
-}
-
-bool TLuaResult::IsReady() const {
-    std::unique_lock Lock(mMutex);
-    return mReady;
-}
-bool TLuaResult::IsError() const {
-    std::unique_lock Lock(mMutex);
-    return mError;
-}
-
-TLuaStateId TLuaResult::OwnerState() const {
-    std::unique_lock Lock(mMutex);
-    // copy
-    return mStateId;
-}
-void TLuaResult::SetOwnerState(TLuaStateId StateId) {
-    std::unique_lock Lock(mMutex);
-    mStateId = std::move(StateId);
-}
-
-TLuaResult::DetachedSnapshot TLuaResult::GetDetachedSnapshot() const {
-    std::unique_lock Lock(mMutex);
-    DetachedSnapshot snapshot {
-        .Error = mError,
-        .Ready = mReady,
-        .ErrorMessage = mErrorMessage,
-        .Result = mDetachedResult,
-        .StateId = mStateId,
-        .Function = mFunction,
-    };
-    return snapshot;
-}
-
-TDetachedLuaValue TLuaResult::Freeze(const sol::object& o, int depth) {
-    if (depth > 64)
-        throw std::runtime_error("max depth (64) reached");
-    switch (o.get_type()) {
-    case sol::type::lua_nil:
-        return { { std::monostate { } } };
-    case sol::type::boolean:
-        return { { o.as<bool>() } };
-    case sol::type::number: {
-        if (o.is<int>()) {
-            return { { o.as<int>() } };
-        } else {
-            return { { o.as<double>() } };
-        }
-    }
-    case sol::type::string:
-        return { { o.as<std::string>() } };
-    case sol::type::table: {
-        TDetachedLuaValue::Object ObjectOut;
-        // numeric stuff is for arrays
-        std::vector<std::pair<size_t, TDetachedLuaValue>> NumericEntries;
-        bool HasNonStringOrNumericKey = false;
-        size_t MaxNumericIndex = 0;
-        for (auto&& [k, v] : o.as<sol::table>()) {
-            if (k.is<std::string>()) {
-                ObjectOut.emplace(k.as<std::string>(), std::make_shared<TDetachedLuaValue>(std::move(Freeze(v, depth + 1))));
-                continue;
-            }
-            // Thanks to lua handling arrays in a weird way, and because they can also be sparse, this weird code is needed.
-            if (k.get_type() == sol::type::number) {
-                const double NumericKey = k.as<double>();
-                const size_t CandidateIndex = static_cast<size_t>(NumericKey);
-                // unsure if we need to do this, or if we can do the same int check we do in other places, but this works well
-                const bool IsPositiveInteger = std::isfinite(NumericKey)
-                    && NumericKey >= 1.0
-                    && std::fabs(NumericKey - static_cast<double>(CandidateIndex)) <= std::numeric_limits<double>::epsilon();
-                if (IsPositiveInteger) {
-                    const auto Index = CandidateIndex;
-                    MaxNumericIndex = std::max(MaxNumericIndex, Index);
-                    NumericEntries.emplace_back(Index, Freeze(v, depth + 1));
-                    continue;
-                }
-            }
-            HasNonStringOrNumericKey = true;
-        }
-        // Pure numeric-keyed tables are reconstructed as Lua arrays (1-based indexes).
-        // This preserves array semantics across this serialization boundary :^)
-        if (!NumericEntries.empty() && ObjectOut.empty() && !HasNonStringOrNumericKey) {
-            TDetachedLuaValue::Array ArrayOut(MaxNumericIndex);
-            for (const auto& [Index, Value] : NumericEntries) {
-                if (Index > 0 && Index <= ArrayOut.size()) {
-                    ArrayOut[Index - 1] = Value;
-                }
-            }
-            return { { std::move(ArrayOut) } };
-        }
-        return { { std::move(ObjectOut) } };
-    }
-    default:
-        throw std::runtime_error("unsupported Lua type for cross-thread snapshot");
-    }
-}
-void TLuaResult::MarkAsReady() {
-    mReady = true;
-    mReadyCondition.notify_all();
-}
-
-void TLuaResult::WaitUntilReady() {
-    std::unique_lock Lock(mMutex);
-    while (!mReady)
-        mReadyCondition.wait_for(Lock, std::chrono::milliseconds(50),
-            [this] {
-                return mReady;
-            });
-}
-
-TEST_CASE("TLuaInStateResult MarkReadyError(string) marks ready and wakes waiters") {
-    TLuaVoidResult result("state_local");
-    std::atomic<bool> waiterDone { false };
-
-    auto waiter = std::thread([&] {
-        result.WaitUntilReady();
-        waiterDone.store(true, std::memory_order_release);
-    });
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(20));
-    CHECK_FALSE(waiterDone.load(std::memory_order_acquire));
-
-    result.MarkReadyError(std::string("boom"));
-    waiter.join();
-
-    CHECK(result.IsReady());
-    const auto snapshot = result.GetSnapshot();
-    CHECK(snapshot.Ready);
-    CHECK(snapshot.Error);
-    CHECK(snapshot.ErrorMessage == "boom");
-    CHECK(snapshot.StateId == "state_local");
-}
-
-TEST_CASE("TLuaInStateResult MarkReadySuccess clears error state") {
-    TLuaVoidResult result("state_local_success");
-    result.MarkReadySuccess();
-
-    CHECK(result.IsReady());
-    CHECK_FALSE(result.IsError());
-    const auto snapshot = result.GetSnapshot();
-    CHECK(snapshot.Ready);
-    CHECK_FALSE(snapshot.Error);
-    CHECK(snapshot.ErrorMessage.empty());
-}
-
-TEST_CASE("TLuaResult MarkReadyError(string) marks ready and wakes waiters") {
-    TLuaResult result("state_a", "fn_a");
-    std::atomic<bool> waiterDone { false };
-
-    auto waiter = std::thread([&] {
-        result.WaitUntilReady();
-        waiterDone.store(true, std::memory_order_release);
-    });
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(20));
-    CHECK_FALSE(waiterDone.load(std::memory_order_acquire));
-
-    result.MarkReadyError(std::string("boom"));
-    waiter.join();
-
-    CHECK(result.IsReady());
-    const auto snapshot = result.GetDetachedSnapshot();
-    CHECK(snapshot.Ready);
-    CHECK(snapshot.Error);
-    CHECK(snapshot.ErrorMessage == "boom");
-    CHECK(snapshot.StateId == "state_a");
-    CHECK(snapshot.Function == "fn_a");
-}
-
-TEST_CASE("TLuaResult detached snapshot freezes nested string-keyed tables") {
-    sol::state lua;
-    TLuaResult result("state_table", "fn_table");
-    lua.open_libraries(sol::lib::base);
-
-    auto outer = lua.create_table();
-    auto inner = lua.create_table();
-    inner["k"] = std::string("v");
-
-    outer["flag"] = true;
-    outer["msg"] = std::string("hello");
-    outer["inner"] = inner;
-    outer[1] = std::string("ignored_numeric_key");
-
-    result.MarkReadySuccess(sol::make_object(lua.lua_state(), outer));
-    const auto detached = result.GetDetachedSnapshot();
-
-    CHECK(detached.Ready);
-    CHECK_FALSE(detached.Error);
-    const auto* object = std::get_if<TDetachedLuaValue::Object>(&detached.Result.V);
-    REQUIRE(object != nullptr);
-
-    CHECK(object->contains("flag"));
-    CHECK(object->contains("msg"));
-    CHECK(object->contains("inner"));
-    CHECK_FALSE(object->contains("1"));
-
-    const auto* flag = std::get_if<bool>(&object->at("flag")->V);
-    REQUIRE(flag != nullptr);
-    CHECK(*flag);
-
-    const auto* msg = std::get_if<std::string>(&object->at("msg")->V);
-    REQUIRE(msg != nullptr);
-    CHECK(*msg == "hello");
-
-    const auto* innerObj = std::get_if<TDetachedLuaValue::Object>(&object->at("inner")->V);
-    REQUIRE(innerObj != nullptr);
-    REQUIRE(innerObj->contains("k"));
-    const auto* innerValue = std::get_if<std::string>(&innerObj->at("k")->V);
-    REQUIRE(innerValue != nullptr);
-    CHECK(*innerValue == "v");
-}
-
-TEST_CASE("TLuaResult detached snapshot preserves numeric array tables") {
-    sol::state lua;
-    TLuaResult result("state_array", "fn_array");
-    lua.open_libraries(sol::lib::base);
-
-    auto arr = lua.create_table();
-    arr[1] = std::string("a");
-    arr[2] = 42;
-    arr[4] = true; // keep sparse indexes
-
-    result.MarkReadySuccess(sol::make_object(lua.lua_state(), arr));
-    const auto detached = result.GetDetachedSnapshot();
-
-    CHECK(detached.Ready);
-    CHECK_FALSE(detached.Error);
-
-    const auto* array = std::get_if<TDetachedLuaValue::Array>(&detached.Result.V);
-    REQUIRE(array != nullptr);
-    REQUIRE(array->size() == 4);
-
-    const auto* v1 = std::get_if<std::string>(&(*array)[0].V);
-    REQUIRE(v1 != nullptr);
-    CHECK(*v1 == "a");
-
-    const auto* v2 = std::get_if<int>(&(*array)[1].V);
-    REQUIRE(v2 != nullptr);
-    CHECK(*v2 == 42);
-
-    CHECK(std::holds_alternative<std::monostate>((*array)[2].V));
-
-    const auto* v4 = std::get_if<bool>(&(*array)[3].V);
-    REQUIRE(v4 != nullptr);
-    CHECK(*v4);
-}
-
-TEST_CASE("TLuaResult MarkReadySuccess throws on unsupported Lua function value") {
-    sol::state lua;
-    TLuaResult result("state_fn", "fn_fn");
-    lua.open_libraries(sol::lib::base);
-    lua["f"] = [] { return 1; };
-    const sol::table globals = lua.globals();
-    const sol::protected_function fn = globals.get<sol::protected_function>("f");
-    const sol::object fnObj = sol::make_object(lua.lua_state(), fn);
-
-    CHECK_THROWS_AS(result.MarkReadySuccess(fnObj), std::runtime_error);
-    CHECK_FALSE(result.IsReady());
-}
-
-TEST_CASE("TLuaResult MarkReadySuccessNoResult stores monostate") {
-    TLuaResult result("state_empty", "fn_empty");
-    result.MarkReadySuccessNoResult();
-
-    CHECK(result.IsReady());
-    const auto snapshot = result.GetDetachedSnapshot();
-    CHECK_FALSE(snapshot.Error);
-    CHECK(std::holds_alternative<std::monostate>(snapshot.Result.V));
-}
@@ -55,8 +55,8 @@ void TPPSMonitor::operator()() {
            std::shared_ptr<TClient> c;
            {
                ReadLock Lock(mServer.GetClientMutex());
-                if (auto Locked = ClientPtr.lock()) {
-                    c = std::move(Locked);
+                if (!ClientPtr.expired()) {
+                    c = ClientPtr.lock();
                } else
                    return true;
            }
@@ -65,18 +65,18 @@ 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;
        });
        for (auto& ClientToKick : TimedOutClients) {
-            Network().DisconnectClient(*ClientToKick, "Timeout");
+            ClientToKick->Disconnect("Timeout");
        }
        TimedOutClients.clear();
        if (C == 0 || mInternalPPS == 0) {
@@ -57,27 +57,21 @@ void TPluginMonitor::operator()() {
                    mFileTimes[Pair.first] = CurrentTime;
                    // grandparent of the path should be Resources/Server
                    if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
-                        if (LowerString(fs::path(Pair.first).extension().string()) == ".lua") {
-                            beammp_infof("File \"{}\" changed, reloading", Pair.first);
-                            // is in root folder, so reload
-                            std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
-                            auto Size = std::filesystem::file_size(Pair.first);
-                            auto Contents = std::make_shared<std::string>();
-                            Contents->resize(Size);
-                            FileStream.read(Contents->data(), Contents->size());
-                            TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
-                            auto StateID = mEngine->GetStateIDForPlugin(fs::path(Pair.first).parent_path());
-                            auto Res = mEngine->EnqueueScript(StateID, Chunk);
-                            Res->WaitUntilReady();
-                            if (Res->IsError()) {
-                                auto Snapshot = Res->GetSnapshot();
-                                beammp_lua_errorf("Error while hot-reloading \"{}\": {}", Pair.first, Snapshot.ErrorMessage);
-                            } else {
-                                mEngine->ReportErrors(mEngine->TriggerLocalEvent(StateID, "onInit"));
-                                mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
-                            }
+                        beammp_infof("File \"{}\" changed, reloading", Pair.first);
+                        // is in root folder, so reload
+                        std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
+                        auto Size = std::filesystem::file_size(Pair.first);
+                        auto Contents = std::make_shared<std::string>();
+                        Contents->resize(Size);
+                        FileStream.read(Contents->data(), Contents->size());
+                        TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
+                        auto StateID = mEngine->GetStateIDForPlugin(fs::path(Pair.first).parent_path());
+                        auto Res = mEngine->EnqueueScript(StateID, Chunk);
+                        Res->WaitUntilReady();
+                        if (Res->Error) {
+                            beammp_lua_errorf("Error while hot-reloading \"{}\": {}", Pair.first, Res->ErrorMessage);
                        } else {
-                            beammp_debugf("File \"{}\" changed, not reloading because it's not a lua file. Triggering 'onFileChanged' event instead", Pair.first);
+                            mEngine->ReportErrors(mEngine->TriggerLocalEvent(StateID, "onInit"));
                            mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
                        }
                    } else {
@@ -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,185 +52,3 @@ TResourceManager::TResourceManager() {

    Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
 }
-
-void TResourceManager::RefreshFiles() {
-    mMods.clear();
-    std::unique_lock Lock(mModsMutex);
-
-    std::string Path = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client";
-
-    nlohmann::json modsDB;
-
-    if (std::filesystem::exists(Path + "/mods.json")) {
-        try {
-            std::ifstream stream(Path + "/mods.json");
-
-            stream >> modsDB;
-
-            stream.close();
-        } catch (const std::exception& e) {
-            beammp_errorf("Failed to load mods.json: {}", e.what());
-        }
-    }
-
-    for (const auto& entry : fs::directory_iterator(Path)) {
-        std::string File(entry.path().string());
-
-        if (entry.path().filename().string() == "mods.json") {
-            continue;
-        }
-
-        if (entry.path().extension() != ".zip" || std::filesystem::is_directory(entry.path())) {
-            beammp_warnf("'{}' is not a ZIP file and will be ignored", File);
-            continue;
-        }
-
-        if (modsDB.contains(entry.path().filename().string())) {
-            auto& dbEntry = modsDB[entry.path().filename().string()];
-            if (entry.last_write_time().time_since_epoch().count() > dbEntry["lastwrite"] || std::filesystem::file_size(File) != dbEntry["filesize"].get<size_t>()) {
-                beammp_infof("File '{}' has been modified, rehashing", File);
-            } else {
-                dbEntry["exists"] = true;
-
-                mMods.push_back(nlohmann::json {
-                    { "file_name", std::filesystem::path(File).filename() },
-                    { "file_size", std::filesystem::file_size(File) },
-                    { "hash_algorithm", "sha256" },
-                    { "hash", dbEntry["hash"] },
-                    { "protected", dbEntry["protected"] } });
-
-                beammp_debugf("Mod '{}' loaded from cache", 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);
-
-            stream.close();
-
-            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 },
-                { "protected", false } });
-
-            modsDB[std::filesystem::path(File).filename().string()] = {
-                { "lastwrite", entry.last_write_time().time_since_epoch().count() },
-                { "hash", result },
-                { "filesize", std::filesystem::file_size(File) },
-                { "protected", false },
-                { "exists", true }
-            };
-
-        } catch (const std::exception& e) {
-            beammp_errorf("Sha256 hashing of '{}' failed: {}", File, e.what());
-        }
-    }
-
-    for (auto it = modsDB.begin(); it != modsDB.end();) {
-        if (!it.value().contains("exists")) {
-            it = modsDB.erase(it);
-        } else {
-            it.value().erase("exists");
-            ++it;
-        }
-    }
-
-    try {
-        std::ofstream stream(Path + "/mods.json");
-
-        stream << modsDB.dump(4);
-
-        stream.close();
-    } catch (std::exception& e) {
-        beammp_error("Failed to update mod DB: " + std::string(e.what()));
-    }
-}
-
-void TResourceManager::SetProtected(const std::string& ModName, bool Protected) {
-    std::unique_lock Lock(mModsMutex);
-
-    for (auto& mod : mMods) {
-        if (mod["file_name"].get<std::string>() == ModName) {
-            mod["protected"] = Protected;
-            break;
-        }
-    }
-
-    auto modsDBPath = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client/mods.json";
-
-    if (std::filesystem::exists(modsDBPath)) {
-        try {
-            nlohmann::json modsDB;
-
-            std::fstream stream(modsDBPath);
-
-            stream >> modsDB;
-
-            if (modsDB.contains(ModName)) {
-                modsDB[ModName]["protected"] = Protected;
-            }
-
-            stream.clear();
-            stream.seekp(0, std::ios::beg);
-
-            stream << modsDB.dump(4);
-
-            stream.close();
-        } catch (const std::exception& e) {
-            beammp_errorf("Failed to update mods.json: {}", e.what());
-        }
-    }
-}
@@ -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>
@@ -28,7 +27,6 @@
 #include <any>
 #include <optional>
 #include <sstream>
-#include <utility>

 #include <nlohmann/json.hpp>

@@ -54,6 +52,7 @@ static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {
    }
    return std::nullopt;
 }
+
 TEST_CASE("GetPidVid") {
    SUBCASE("Valid singledigit") {
        const auto MaybePidVid = GetPidVid("0-1");
@@ -120,22 +119,39 @@ TEST_CASE("GetPidVid") {
        CHECK(!MaybePidVid);
    }
 }
+
 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);
 }

 void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
-    auto LockedClientPtr = WeakClientPtr.lock();
-    if (!LockedClientPtr) {
+    std::shared_ptr<TClient> LockedClientPtr { nullptr };
+    try {
+        LockedClientPtr = WeakClientPtr.lock();
+    } catch (const std::exception&) {
+        // silently fail, as there's nothing to do
        return;
    }
+    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(LockedClientPtr);
+    mClients.erase(WeakClientPtr.lock());
 }

 void TServer::ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
@@ -156,34 +172,20 @@ size_t TServer::ClientCount() const {
    return mClients.size();
 }

-void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network, bool udp) {
+void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
    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& ) {
-            if (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) {
-            if (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;
    }

-    auto LockedClient = Client.lock();
-    if (!LockedClient) {
+    if (Client.expired()) {
        return;
    }
+    auto LockedClient = Client.lock();

    std::any Res;
    char Code = Packet.at(0);
@@ -192,29 +194,12 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin

    // V to Y
    if (Code <= 89 && Code >= 86) {
-        int PID = -1;
-        int VID = -1;
-
-        auto pidVidPart = StringPacket.substr(3);
-        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
-        if (MaybePidVid) {
-            std::tie(PID, VID) = MaybePidVid.value();
-        }
-
-        if (PID == -1 || VID == -1 || PID != LockedClient->GetID()) {
-            return;
-        }
-
        PPSMonitor.IncrementInternalPPS();
        Network.SendToAll(LockedClient.get(), Packet, false, false);
        return;
    }
    switch (Code) {
    case 'H': // initial connection
-        if (udp) {
-            beammp_debugf("Received 'H' packet over UDP from client '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-            return;
-        }
        if (!Network.SyncClient(Client)) {
            // TODO handle
        }
@@ -222,26 +207,18 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
    case 'p':
        if (!Network.Respond(*LockedClient, StringToVector("p"), false)) {
            // failed to send
-            Network.DisconnectClient(*LockedClient, "Failed to send ping");
+            LockedClient->Disconnect("Failed to send ping");
        } else {
            Network.UpdatePlayer(*LockedClient);
        }
        return;
    case 'O':
-        if (udp) {
-            beammp_debugf("Received 'O' packet over UDP from client '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-            return;
-        }
        if (Packet.size() > 1000) {
            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.size()));
        }
        ParseVehicle(*LockedClient, StringPacket, Network);
        return;
    case 'C': {
-        if (udp) {
-            beammp_debugf("Received 'C' packet over UDP from client '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-            return;
-        }
        if (Packet.size() < 4 || std::find(Packet.begin() + 3, Packet.end(), ':') == Packet.end())
            break;
        const auto PacketAsString = std::string(reinterpret_cast<const char*>(Packet.data()), Packet.size());
@@ -254,63 +231,33 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
            beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
            return;
        }
-        if (Message.size() > 500) {
-           beammp_debugf("Chat message too long from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-           return;
-        }
        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) {
-                auto Snapshot = Elem->GetDetachedSnapshot();
-                if (Snapshot.Error) {
-                    return false;
-                }
-                const int* MaybeInt = std::get_if<int>(&Snapshot.Result.V);
-                if (MaybeInt == nullptr) {
-                    return false;
-                }
-                return bool(*MaybeInt);
-            });
-        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':
-        if (udp) {
-            beammp_debugf("Received 'E' packet over UDP from client '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-            return;
-        }
        HandleEvent(*LockedClient, StringPacket);
        return;
    case 'N':
+        beammp_trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
        Network.SendToAll(LockedClient.get(), Packet, false, true);
        return;
-    case 'Z': { // position packet
+    case 'Z': // position packet
        PPSMonitor.IncrementInternalPPS();
-
-        int PID = -1;
-        int VID = -1;
-
-        auto pidVidPart = StringPacket.substr(3);
-        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
-        if (MaybePidVid) {
-            std::tie(PID, VID) = MaybePidVid.value();
-        }
-
-        if (PID == -1 || VID == -1 || PID != LockedClient->GetID()) {
-            return;
-        }
-
        Network.SendToAll(LockedClient.get(), Packet, false, false);
        HandlePosition(*LockedClient, StringPacket);
        return;
-    }
    default:
        return;
    }
@@ -329,15 +276,6 @@ void TServer::HandleEvent(TClient& c, const std::string& RawData) {
    }
    std::string Name = RawData.substr(2, NameDataSep - 2);
    std::string Data = RawData.substr(NameDataSep + 1);
-
-    std::vector<std::string> exclude = {"onInit", "onFileChanged","onVehicleDeleted","onConsoleInput","onPlayerAuth","postPlayerAuth", "onPlayerDisconnect",
-    "onPlayerConnecting","onPlayerJoining","onPlayerJoin","onChatMessage","postChatMessage","onVehicleSpawn","postVehicleSpawn","onVehicleEdited", "postVehicleEdited",
-    "onVehicleReset","onVehiclePaintChanged","onShutdown"};
-
-    if (std::ranges::find(exclude, Name) != exclude.end()) {
-        beammp_debugf("Excluded event triggered by client '{}' ({}): '{}', ignoring.", c.GetName(), c.GetID(), Name);
-        return;
-    }
    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.GetID(), Data));
 }

@@ -359,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;
    }
 }

@@ -384,38 +322,22 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
            TLuaEngine::WaitForAll(Futures);
            bool ShouldntSpawn = std::any_of(Futures.begin(), Futures.end(),
                [](const std::shared_ptr<TLuaResult>& Result) {
-                    auto Snapshot = Result->GetDetachedSnapshot();
-                    if (Snapshot.Error) {
-                        return false;
-                    }
-                    const int* MaybeInt = std::get_if<int>(&Snapshot.Result.V);
-                    if (MaybeInt == nullptr) {
-                        return false;
-                    }
-                    return *MaybeInt != 0;
+                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
                });

-            bool SpawnConfirmed = false;
-            auto CarJsonDoc = nlohmann::json::parse(CarJson, nullptr, false);
-            if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn && !CarJsonDoc.is_discarded()) {
-                c.AddNewCar(CarID, CarJsonDoc);
+            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': {
@@ -429,39 +351,23 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
            TLuaEngine::WaitForAll(Futures);
            bool ShouldntAllow = std::any_of(Futures.begin(), Futures.end(),
                [](const std::shared_ptr<TLuaResult>& Result) {
-                    auto Snapshot = Result->GetDetachedSnapshot();
-                    if (Snapshot.Error) {
-                        return false;
-                    }
-                    const int* MaybeInt = std::get_if<int>(&Snapshot.Result.V);
-                    if (MaybeInt == nullptr) {
-                        return false;
-                    }
-                    return *MaybeInt != 0;
+                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
                });

            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;
    }
@@ -491,65 +397,19 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
        }

        if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            auto BracketPos = Data.find('{');
-            if (BracketPos == std::string::npos) {
-                beammp_debugf("Invalid 'Or' packet body from client {}", c.GetID());
-                return;
-            }
-
-            Data = Data.substr(BracketPos);
+            Data = Data.substr(Data.find('{'));
            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
            Network.SendToAll(&c, StringToVector(Packet), false, true);
        }
        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 'p': {
-        beammp_trace(std::string(("got 'Op' 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()) {
-            auto BracketPos = Data.find('[');
-            if (BracketPos == std::string::npos) {
-                beammp_debugf("Invalid 'Op' packet body from client {}", c.GetID());
-                return;
-            }
-
-            Data = Data.substr(BracketPos);
-
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehiclePaintChanged", "", c.GetID(), VID, Data));
-            Network.SendToAll(&c, StringToVector(Packet), false, true);
-
-            auto CarData = c.GetCarData(VID);
-            if (CarData == nlohmann::detail::value_t::null)
-                return;
-
-            if (CarData.contains("vcf") && CarData.at("vcf").is_object())
-                if (CarData.at("vcf").contains("paints") && CarData.at("vcf").at("paints").is_array()) {
-                    CarData.at("vcf")["paints"] = nlohmann::json::parse(Data);
-                    c.SetCarData(VID, CarData);
-                }
-
-        }
+    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;
@@ -562,22 +422,42 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
        beammp_error("Malformed packet received, no '{' found");
        return;
    }
-
    std::string Packet = pckt.substr(FoundPos);
-    nlohmann::json VD = c.GetCarData(VID);
-    if (VD == nlohmann::detail::value_t::null) {
+    std::string VD = c.GetCarData(VID);
+    if (VD.empty()) {
        beammp_error("Tried to apply change to vehicle that does not exist");
        return;
    }
+    std::string Header = VD.substr(0, VD.find('{'));

-    nlohmann::json Pack = nlohmann::json::parse(Packet, nullptr, false);
-
-    if (Pack.is_discarded()) {
+    FoundPos = VD.find('{');
+    if (FoundPos == std::string::npos) {
+        return;
+    }
+    VD = VD.substr(FoundPos);
+    rapidjson::Document Veh, Pack;
+    Veh.Parse(VD.c_str());
+    if (Veh.HasParseError()) {
+        beammp_error("Could not get vehicle config!");
+        return;
+    }
+    Pack.Parse(Packet.c_str());
+    if (Pack.HasParseError() || Pack.IsNull()) {
        beammp_error("Could not get active vehicle config!");
        return;
    }

-    c.SetCarData(VID, Pack);
+    for (auto& M : Pack.GetObject()) {
+        if (Veh[M.name].IsNull()) {
+            Veh.AddMember(M.name, M.value, Veh.GetAllocator());
+        } else {
+            Veh[M.name] = Pack[M.name];
+        }
+    }
+    rapidjson::StringBuffer Buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(Buffer);
+    Veh.Accept(writer);
+    c.SetCarData(VID, Header + Buffer.GetString());
 }

 void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
@@ -21,7 +21,7 @@
 #include "Common.h"
 #include <utility>

-TVehicleData::TVehicleData(int ID, nlohmann::json Data)
+TVehicleData::TVehicleData(int ID, std::string Data)
    : mID(ID)
    , mData(std::move(Data)) {
    beammp_trace("vehicle " + std::to_string(mID) + " constructed");
@@ -30,7 +30,3 @@ TVehicleData::TVehicleData(int ID, nlohmann::json Data)
 TVehicleData::~TVehicleData() {
    beammp_trace("vehicle " + std::to_string(mID) + " destroyed");
 }
-
-std::string TVehicleData::DataAsPacket(const std::string& Role, const std::string& Name, const int ID) const {
-    return "Os:" + Role + ":" + Name + ":" + std::to_string(ID) + "-" + std::to_string(this->mID) + ":" + this->mData.dump();
-}
@@ -17,11 +17,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 #include "ArgsParser.h"
-#include "Client.h"
 #include "Common.h"
 #include "Http.h"
 #include "LuaAPI.h"
-#include "Settings.h"
 #include "SignalHandling.h"
 #include "TConfig.h"
 #include "THeartbeatThread.h"
@@ -37,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.
@@ -60,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'.
 )";
@@ -152,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());
            }
        }
@@ -167,50 +165,41 @@ 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.");
        Application::SetSubsystemStatus("Main", Application::Status::ShuttingDown);
        Shutdown = true;
    });
+    Application::RegisterShutdownHandler([] {
+        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", "");
+        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
+    });

    TServer Server(Arguments.List);

+    auto LuaEngine = std::make_shared<TLuaEngine>();
+    LuaEngine->SetServer(&Server);
+    Application::Console().InitializeLuaConsole(*LuaEngine);
+
    RegisterThread("Main");

    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);
-
-    auto LuaEngine = std::make_shared<TLuaEngine>();
-    LuaEngine->SetServer(&Server);
-    Application::Console().InitializeLuaConsole(*LuaEngine);
    LuaEngine->SetNetwork(&Network);
    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);

-    Application::RegisterShutdownHandler([] {
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", "");
-        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
-    });
-    Application::RegisterShutdownHandler([&Server, &Network] {
-        beammp_debug("Kicking all players due to shutdown");
-        Server.ForEachClient([&Network](std::weak_ptr<TClient> client) -> bool {
-            if (!client.expired()) {
-                Network.ClientKick(*client.lock(), "Server shutdown");
-            }
-            return true;
-        });
-    });
+    if (Application::Settings.HTTPServerEnabled) {
+        Http::Server::THttpServerInstance HttpServerInstance {};
+    }

+    Application::SetSubsystemStatus("Main", Application::Status::Good);
    RegisterThread("Main(Waiting)");

    std::set<std::string> IgnoreSubsystems {
@@ -225,10 +214,6 @@ int BeamMPServerMain(MainArguments Arguments) {
            std::string SystemsBadList {};
            auto Statuses = Application::GetSubsystemStatuses();
            for (const auto& NameStatusPair : Statuses) {
-                if (NameStatusPair.first == "Main") {
-                    continue;
-                }
-
                if (IgnoreSubsystems.count(NameStatusPair.first) > 0) {
                    continue; // ignore
                }
@@ -242,8 +227,6 @@ int BeamMPServerMain(MainArguments Arguments) {
            // remove ", "
            SystemsBadList = SystemsBadList.substr(0, SystemsBadList.size() - 2);
            if (FullyStarted) {
-                Application::SetSubsystemStatus("Main", Application::Status::Good);
-
                if (!WithErrors) {
                    beammp_info("ALL SYSTEMS STARTED SUCCESSFULLY, EVERYTHING IS OKAY");
                } else {
@@ -14,18 +14,6 @@
    "openssl",
    "rapidjson",
    "sol2",
-    "curl",
-    "lua"
-  ],
-  "overrides": [
-    {
-      "name": "sol2",
-      "version": "3.3.1"
-    },
-    {
-      "name": "lua",
-      "version": "5.3.5#6"
-    }
-  ],
-  "builtin-baseline": "5bf0c55239da398b8c6f450818c9e28d36bf9966"
+    "toml11"
+  ]
 }
Author	SHA1	Message	Date
sla-ppy	5afc07b0b3	add RateLimiter class	2024-06-20 16:39:03 +02:00
sla-ppy	bc5e407d60	refactor dos protection	2024-06-20 07:28:55 +02:00
sla-ppy	df308c1dc5	Merge branch 'simple-dos-protected' of github.com:Igor20264/BeamMP-Server into simple-dos-protected	2024-06-18 16:49:04 +02:00
Igor	f26b091042	Merge branch 'minor' into simple-dos-protected	2024-05-06 22:21:10 +03:00
Igor	a008015d78	add a simple DOS protection system	2024-03-29 10:56:05 +03:00