rename HttpLibServerInstance to Server

http: add /player/{name}/vehicles
add /player/{name}/ draft
2026-07-13 18:24:16 +00:00 · 2022-05-24 21:13:55 +02:00 · 2022-05-24 21:05:10 +02:00 · 2022-05-23 23:17:17 +02:00 · 2022-05-23 23:16:53 +02:00 · 2022-05-23 19:03:51 +02:00
73 changed files with 1987 additions and 3570 deletions
@@ -7,72 +7,38 @@ env:

 jobs:
  linux-build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: "recursive"
+    - uses: actions/checkout@v2
+      with:
+          submodules: 'recursive'

-      - name: Install Dependencies
-        env:
-          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
-        run: |
+    - name: Install Dependencies
+      env:
+        beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+      run: |
          echo ${#beammp_sentry_url}
          sudo apt-get update
-          sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10 libboost1.74-all-dev
+          sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev

-      - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build-linux
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{github.workspace}}/build-linux

-      - name: Configure CMake
-        shell: bash
-        working-directory: ${{github.workspace}}/build-linux
-        env:
-          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{github.workspace}}/build-linux
+      env:
+        beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"

-      - name: Build Server
-        working-directory: ${{github.workspace}}/build-linux
-        shell: bash
-        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel
+    - name: Build
+      working-directory: ${{github.workspace}}/build-linux
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel

-      - name: Build Tests
-        working-directory: ${{github.workspace}}/build-linux
-        shell: bash
-        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server-tests --parallel
-
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-linux
-          path: ${{github.workspace}}/build-linux/BeamMP-Server
-
-      - name: Archive test artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-linux-tests
-          path: ${{github.workspace}}/build-linux/BeamMP-Server-tests
-
-  run-tests:
-    needs: linux-build
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/download-artifact@master
-        with:
-          name: BeamMP-Server-linux-tests
-          path: ${{github.workspace}}
-    
-      - name: Install Runtime Dependencies
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y liblua5.3-0 libssl3 curl
-
-      - name: Test
-        working-directory: ${{github.workspace}}
-        shell: bash
-        run: |
-            chmod +x ./BeamMP-Server-tests
-            ./BeamMP-Server-tests
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: BeamMP-Server-linux
+        path: ${{github.workspace}}/build-linux/BeamMP-Server
@@ -18,9 +18,9 @@ jobs:
        uses: lukka/run-vcpkg@v7
        id: runvcpkg
        with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl boost-variant boost-spirit boost-phoenix boost-core boost-system boost-asio boost-uuid'
+            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: "06b5f4a769d848d1a20fa0acd556019728b56273"
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
            vcpkgTriplet: 'x64-windows-static'

      - name: Create Build Environment
@@ -48,7 +48,7 @@ jobs:
        working-directory: ${{github.workspace}}/build-windows
        shell: bash
        run: |
-          cmake --build . --config Debug
+          cmake --build . --config Debug -t BeamMP-Server --parallel
      
      - name: Archive debug artifacts
        uses: actions/upload-artifact@v2
@@ -32,7 +32,7 @@ jobs:

  upload-release-files-linux:
    name: Upload Linux Release Files
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    needs: create-release
    steps:
      - uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
      - name: Install Dependencies
        run: |
            sudo apt-get update
-            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev libboost-dev libboost1.74-all-dev libboost1.74-dev
+            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev

      - name: Create Build Environment
        run: cmake -E make_directory ${{github.workspace}}/build-linux
@@ -57,7 +57,7 @@ jobs:
      - name: Build
        working-directory: ${{github.workspace}}/build-linux
        shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel

      - name: Upload Release Asset
        id: upload-release-asset 
@@ -83,9 +83,9 @@ jobs:
        uses: lukka/run-vcpkg@v7
        id: runvcpkg
        with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl boost-variant boost-spirit boost-phoenix boost-core boost-system boost-asio'
+            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
            vcpkgTriplet: 'x64-windows-static'

      - name: Create Build Environment
@@ -101,7 +101,7 @@ jobs:
      - name: Build
        working-directory: ${{github.workspace}}/build-windows
        shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel

      - name: Upload Release Asset
        id: upload-release-asset 
@@ -1,6 +1,9 @@
 [submodule "deps/commandline"]
 	path = deps/commandline
 	url = https://github.com/lionkor/commandline
+[submodule "deps/fmt"]
+	path = deps/fmt
+	url = https://github.com/fmtlib/fmt
 [submodule "deps/asio"]
 	path = deps/asio
 	url = https://github.com/chriskohlhoff/asio
@@ -25,12 +28,3 @@
 [submodule "deps/json"]
 	path = deps/json
 	url = https://github.com/nlohmann/json
-[submodule "deps/fmt"]
-	path = deps/fmt
-	url = https://github.com/fmtlib/fmt
-[submodule "deps/doctest"]
-	path = deps/doctest
-	url = https://github.com/doctest/doctest
-[submodule "deps/lk-result"]
-	path = deps/lk-result
-	url = https://gitlab.com/lionkor/lk-result.git
@@ -4,32 +4,11 @@ cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
 message(STATUS "You can find build instructions and a list of dependencies in the README at \
 https://github.com/BeamMP/BeamMP-Server")

-include(FetchContent)
-FetchContent_Declare(
-  cmake-tools
-  GIT_REPOSITORY https://github.com/brobeson/cmake-tools.git
-  GIT_TAG main
-)
-FetchContent_MakeAvailable(cmake-tools)
-list(APPEND CMAKE_MODULE_PATH "${cmake-tools_SOURCE_DIR}")
-
-include(CMakeToolsVersionFromGit)
-
-execute_process(
-    COMMAND git log -1 --format=%h
-    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-    OUTPUT_VARIABLE GIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-
 project(BeamMP-Server
    DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
    HOMEPAGE_URL https://beammp.com
    LANGUAGES CXX C)

-# quality of life stuff
-set(CMAKE_COLOR_DIAGNOSTICS ON)
-
 find_package(Git REQUIRED)
 # Update submodules as needed
 option(GIT_SUBMODULE "Check submodules during build" ON)
@@ -43,47 +22,55 @@ if(GIT_SUBMODULE)
    endif()
 endif()

+
 set(HTTPLIB_REQUIRE_OPENSSL ON)
 set(SENTRY_BUILD_SHARED_LIBS OFF)

-add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
+include_directories("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
+include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
+include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/cpp-httplib")
+include_directories("${PROJECT_SOURCE_DIR}/deps/toml11")
+include_directories("${PROJECT_SOURCE_DIR}/deps/json/single_include")
+include_directories("${PROJECT_SOURCE_DIR}/deps")

-option(WIN32_STATIC_RUNTIME "Build statically-linked runtime on windows (don't touch unless you know what you're doing)" ON)
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT)

 # ------------------------ APPLE ---------------------------------
 if(APPLE)
-    if(IS_DIRECTORY /opt/homebrew/Cellar/lua@5.3/5.3.6)
-        set(LUA_INCLUDE_DIR /opt/homebrew/Cellar/lua@5.3/5.3.6/include/lua5.3)
-        link_directories(/opt/homebrew/Cellar/lua@5.3/5.3.6/lib)
-    else()
-        set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
-        link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
-    endif()
+    set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
    set(LUA_LIBRARIES lua)
-    if(IS_DIRECTORY /opt/homebrew/opt/openssl@1.1)
-        include_directories(/opt/homebrew/opt/openssl@1.1/include)
-        link_directories(/opt/homebrew/opt/openssl@1.1/lib)
-    else()
-        include_directories(/usr/local/opt/openssl@1.1/include)
-        link_directories(/usr/local/opt/openssl@1.1/lib)
-    endif()
+    include_directories(/usr/local/opt/openssl@1.1/include)
+    link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
+    link_directories(/usr/local/opt/openssl@1.1/lib)
 # ------------------------ WINDOWS ---------------------------------
 elseif (WIN32)
-    if (WIN32_STATIC_RUNTIME)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-    endif()
-# ------------------------ UNIX ------------------------------------
+    # this has to happen before sentry, so that crashpad on windows links with these settings.
+    message(STATUS "MSVC -> forcing use of statically-linked runtime.")
+    STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+    if (MSVC)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+        set(SENTRY_BUILD_RUNTIMESTATIC ON)
+    endif ()
+    set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
+    include_directories(${VcpkgRoot}/include)
+    link_directories(${VcpkgRoot}/lib)
+# ------------------------ LINUX ---------------------------------
 elseif (UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++ -static-libgcc")
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
-    option(SANITIZE "Turns on thread and UB sanitizers" OFF)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
    if (SANITIZE)
        message(STATUS "sanitize is ON")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize={address,thread,undefined}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,thread")
    endif (SANITIZE)
 endif ()

-set(BUILD_SHARED_LIBS OFF)
+include_directories("include/sentry-native/include")
+
 # ------------------------ SENTRY ---------------------------------
 message(STATUS "Checking for Sentry URL")
 # this is set by the build system.
@@ -99,188 +86,68 @@ endif()
 add_subdirectory("deps/sentry-native")

 # ------------------------ C++ SETUP ---------------------------------
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)

 # ------------------------ DEPENDENCIES ------------------------------
 message(STATUS "Adding local source dependencies")
 # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
 add_subdirectory(deps)

-# ------------------------ VARIABLES ---------------------------------
+# ------------------------ BEAMMP SERVER -----------------------------
+
+add_executable(BeamMP-Server
+        src/main.cpp
+        include/TConsole.h src/TConsole.cpp
+        include/TServer.h src/TServer.cpp
+        include/Compat.h src/Compat.cpp
+        include/Common.h src/Common.cpp
+        include/Client.h src/Client.cpp
+        include/VehicleData.h src/VehicleData.cpp
+        include/TConfig.h src/TConfig.cpp
+        include/TLuaEngine.h src/TLuaEngine.cpp
+        include/TLuaPlugin.h src/TLuaPlugin.cpp
+        include/TResourceManager.h src/TResourceManager.cpp
+        include/THeartbeatThread.h src/THeartbeatThread.cpp
+        include/Http.h src/Http.cpp
+        include/TSentry.h src/TSentry.cpp
+        include/TPPSMonitor.h src/TPPSMonitor.cpp
+        include/TNetwork.h src/TNetwork.cpp
+        include/LuaAPI.h src/LuaAPI.cpp
+        include/TScopedTimer.h src/TScopedTimer.cpp
+        include/SignalHandling.h src/SignalHandling.cpp
+        include/ArgsParser.h src/ArgsParser.cpp
+        include/Environment.h)
+
+target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}")
+include_directories(BeamMP-Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+target_include_directories(BeamMP-Server PUBLIC 
+    "${CMAKE_CURRENT_SOURCE_DIR}/include" 
+    "${CMAKE_CURRENT_SOURCE_DIR}/commandline")

 include(FindLua)
 include(FindOpenSSL)
 include(FindThreads)
 include(FindZLIB)

-find_package(Boost 1.70 REQUIRED COMPONENTS system)
-
-set(BeamMP_Sources
-    include/TConsole.h src/TConsole.cpp
-    include/TServer.h src/TServer.cpp
-    include/Compat.h src/Compat.cpp
-    include/Common.h src/Common.cpp
-    include/Client.h src/Client.cpp
-    include/VehicleData.h src/VehicleData.cpp
-    include/TConfig.h src/TConfig.cpp
-    include/TLuaEngine.h src/TLuaEngine.cpp
-    include/TLuaPlugin.h src/TLuaPlugin.cpp
-    include/TResourceManager.h src/TResourceManager.cpp
-    include/THeartbeatThread.h src/THeartbeatThread.cpp
-    include/Http.h src/Http.cpp
-    include/TSentry.h src/TSentry.cpp
-    include/TPPSMonitor.h src/TPPSMonitor.cpp
-    include/TNetwork.h src/TNetwork.cpp
-    include/LuaAPI.h src/LuaAPI.cpp
-    include/TScopedTimer.h src/TScopedTimer.cpp
-    include/SignalHandling.h src/SignalHandling.cpp
-    include/ArgsParser.h src/ArgsParser.cpp
-    include/TPluginMonitor.h src/TPluginMonitor.cpp
-    include/Environment.h
-    include/BoostAliases.h
-    include/Uuid.h src/Uuid.cpp
-)
-
-set(BeamMP_Includes
-    ${LUA_INCLUDE_DIR}
+target_include_directories(BeamMP-Server PUBLIC 
+    ${LUA_INCLUDE_DIR} 
    ${CURL_INCLUDE_DIRS}
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/lk-result/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/fmt/include"
-)
+    "include/tomlplusplus" 
+    "include/sentry-native/include"
+    "include/curl/include")

-set(BeamMP_Definitions
-    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
-    BEAMMP_GIT_HASH="${GIT_HASH}"
-    LK_RESULT_USE_FMT
-)
-
-if (WIN32)
-    list(APPEND BeamMP_Definitions _WIN32_WINNT=0x0601)
-    list(APPEND BeamMP_Definitions _CRT_SECURE_NO_WARNINGS)
-endif()
-if (UNIX)
-    set(BeamMP_CompileOptions
-        -Wall
-        -Wextra
-        -Wpedantic
-    
-        -Werror=uninitialized
-        -Werror=float-equal
-        -Werror=pointer-arith
-        -Werror=double-promotion
-        -Werror=write-strings
-        -Werror=cast-qual
-        -Werror=init-self
-        -Werror=cast-align
-        -Werror=unreachable-code
-        -Werror=strict-aliasing -fstrict-aliasing
-        -Werror=redundant-decls
-        -Werror=missing-declarations
-        -Werror=missing-field-initializers
-        -Werror=write-strings
-        -Werror=ctor-dtor-privacy
-        -Wswitch-enum
-        -Wswitch-default
-        -Werror=old-style-cast
-        -Werror=overloaded-virtual
-        -Werror=overloaded-virtual
-        -Werror=missing-include-dirs
-        -Werror=unused-result
-
-        -fstack-protector
-        -Wzero-as-null-pointer-constant
-    )
-else()
-    set(BeamMP_CompileOptions
-        /bigobj
-        /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMT
-    )
-endif()
-
-set(BeamMP_Libraries
-    Boost::boost
-    Boost::system
-    doctest::doctest
+target_link_libraries(BeamMP-Server 
    OpenSSL::SSL
    OpenSSL::Crypto
    sol2::sol2
+    fmt::fmt
    Threads::Threads
    ZLIB::ZLIB
    ${LUA_LIBRARIES}
    commandline
-    sentry
-    fmt::fmt
-)
+    sentry)

 if (WIN32)
-    set(BeamMP_PlatformLibs wsock32 ws2_32)
+    target_link_libraries(BeamMP-Server wsock32 ws2_32)
 endif ()
-
-# ------------------------ BEAMMP SERVER -----------------------------
-
-add_executable(BeamMP-Server
-        src/main.cpp
-        ${BeamMP_Sources}
-)
-
-target_compile_definitions(BeamMP-Server PRIVATE
-    ${BeamMP_Definitions}
-    DOCTEST_CONFIG_DISABLE
-)
-
-target_compile_options(BeamMP-Server PRIVATE 
-    ${BeamMP_CompileOptions}
-)
-
-target_include_directories(BeamMP-Server PRIVATE
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-)
-
-target_include_directories(BeamMP-Server SYSTEM PRIVATE
-    ${BeamMP_Includes}
-)
-
-target_link_libraries(BeamMP-Server 
-    ${BeamMP_Libraries}
-    ${BeamMP_PlatformLibs}
-)
-
-# ------------------------ BEAMMP SERVER TESTS -----------------------
-
-option(BUILD_TESTS "Build BeamMP-Server tests" ON)
-
-if(BUILD_TESTS)
-    add_executable(BeamMP-Server-tests
-            test/test_main.cpp
-            ${BeamMP_Sources}
-    )
-
-    target_compile_definitions(BeamMP-Server-tests PRIVATE
-        ${BeamMP_Definitions}
-    )
-    
-    target_compile_options(BeamMP-Server-tests PRIVATE 
-       ${BeamMP_CompileOptions}
-    )
-
-    target_include_directories(BeamMP-Server-tests PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    )
-
-    target_include_directories(BeamMP-Server-tests SYSTEM PRIVATE
-        ${BeamMP_Includes}
-    )
-    
-    target_link_libraries(BeamMP-Server-tests
-        ${BeamMP_Libraries}
-        ${BeamMP_PlatformLibs}
-    )
-endif()
-
@@ -1,111 +0,0 @@
-# Contributing to BeamMP-Server
-
-Unlike other parts of BeamMP, the BeamMP-Server does not have any dependency to the BeamNG.drive game. 
-
-To contribute *C++ code*, you'll need a MacOS, Linux or Windows PC, and intermediate to advanced knowledge of C++.
-For reference, you should know be reasonably comfortable with the STL, the concept of RAII, templates, and generally know how to read & write post-C++17 code. To contribute anything else, you won't need most of this (though it'd be helpful to have some vocabulary about computers).
-
-# Ways to Contribute
-
-## Bug Reports
-
-If you work with BeamMP-Server, either by simply using it, or even writing plugins for it, and you run into any issues, we definitely want to know about it. Please use [GitHub issues](https://github.com/BeamMP/BeamMP-Server/issues) and select the "Bug" template, read it, and fill it out accordingly.
-
-## Bug Fixes
-
-If you are interested in fixing bugs, check out the [GitHub issues](https://github.com/BeamMP/BeamMP-Server/issues). There, you can pick any issue that has nobody assigned to it. For example, some bugs which we definitely need some help with are marked with the "help wanted" tag.
-
-Once you picked a bug, you need to reproduce it. Start by following the instructions in the bug report, and don't be afraid to ask for more information or clarification on the issue itself.
-
-Refer to [getting started with the codebase](#getting-started-with-the-codebase) for more information on how to build the server. You can also ask on our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`).
-
-## Features
-
-If you want to add new features, please make an issue for it first or ask on our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`).
-
-You need to make sure the feature isn't being worked on by someone else, and aligns with the vision we have for the server.
-
-# Git Guidelines
-
-**Read this carefully. Failing to follow these rules results in your changes not being accepted**. This applies for outside contributors, members of the BeamMP development team ("BeamMP Developers"), project owners, maintainers, frequent contributors, and literally everyone else. **It applies to everyone**.
-
-## How to Commit
-
-Commit messages **MUST** (mandatory):
-
- start with a **lower case action verb in present tense**, for example `add`, `fix`, `implement`, `refactor`, `remove`, `rename`. *Counter examples (these are bad): ~~`Fixed`, `fixing`, `added`, `removing`~~*.
- not have a first line much longer than 70 characters.
- explain briefly the changes made.
- reference the issue by number, if there is an issue the commit addresses, like so: `#<number>`. Example: `#123`.
-
-If any of these are not followed, **your changes will not be accepted.**
-
-Commit messages **SHOULD** (optional, "nice to have"):
-
- only address one "atomic" change.
- have an empty second line, and the subsequent lines explaining the changes in more detail (if more detail is available).
-
-Commits may be squashed (via a Git "interactive rebase") in order to satisfy these rules, but history that is >1h old should not be rewritten if possible. Force pushes are ugly ;)
-
-## Pulling, Merging
-
-Do **NOT** pull with merge. This is the default git behavior for `git pull`, but creates ugly and unnecessary commit messages like `"merge origin/master into master"`. Instead, pull with rebase, for example via `git pull -r`. If you get conflicts, resolve them properly.
-
-The only acceptable merge commits are those which actually merge functionally different branches into each other, for example for merging one feature branch into another.
-
-## Branches
-
-### Which branch should I base my work on?
-
-Each *feature* or *bug-fix* is implemented on a new Git branch, branched off of the branch it should be based on. The `master` branch is usually stable, so we don't do development on it. It is always a safe bet to branch off of `master`, but it may be more work to merge later. Branches to base your work on are usually branches like `rc-v3.3.0`, when the latest public version is `3.2.0`, for example. These can often be found in Pull-Requests on GitHub which are tagged `Release Candidate`.
-
-## Unit tests & CI/CD
-
-We use GitHub Actions, which runs our unit-tests. PR's which fail these tests, or even fail any of our actions (which run automatically), will not be merged and require further changes until they compile, link, and all tests pass properly. If you have issues with this, feel free to ask in our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`)
-
-### What should I call by branch?
-
-Keep branch names **unique**, **descriptive**, and **shorter than 30 characters**. Names must be in present-tense, such as `fix-xyz`, **not** ~~`fixing-xyz`~~.
-
-We generally use *feature branches*, so we keep one branch per feature or fix.
-
-For example:
- You want to fix issue number #123? You could call the branch `fix-123`.
- You want to add a feature described in issue #456? You could call the branch `implement-456`.
- You want to add a feature or fix a bug that has no issue? You should probably make an issue for it first! Or, if you're not ready for that yet, you could call it by the feature name or bug description, for example for a bug that makes cars disappear: `fix-disappearing-cars`.
-
-## Pull Requests, Code Review
-
-Once you are ready to show what you did, and get feedback on it, you open a Pull-Request on GitHub. Please make sure to pick the right branches, and a descriptive title. Mention any related issues with `#<issue number>`, for example `#123`.
-
-Make sure to explain what the PR does, what it fixes, and what needs to still be done (if anything).
-
-A BeamMP-Developer must review your code in detail, and leave a review. If this takes too long, feel free to @ a maintainer/developer, or leave another comment on the PR. It helps to say something like "Ready for review", for example.
-
-# Getting Started with the Codebase
-
-1. Look at current Pull-Requests, look at the git branches, or ask in our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`), in order to find out which branch you should work on to minimize conflict. See [this section on branches](#branches) for more info.
-2. Fork the repository (with that branch) on GitHub. GitHub, by default, gives you only the `master` branch when forking, so make sure you fork with other branches enabled when you want to work on a branch that isn't master (it's a checkbox when you fork).
-3. Clone the fork to your local machine.
-4. Check out the branch you want to work on (see 1.).
-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`. 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`).
-
-# Code Guidelines
-
-## Formatting
-
-1. Use `clang-format` to format your code before committig. A `.clang-format` file is provided in the root of the repository.
-2. All identifiers, type names, function names, etc. should be `PascalCase`. Type names may also have the `T` prefix, although this is not enforced (for example `TNetwork`).
-
-## Modular code
-
-Write code that is modular and testable. Generally, if you can write a good unit-test for it, it's modular. If you can't, it's not.
-
-Don't overdo it though - sometimes its okay to just write code, do the job, be done with it. You'll get feedback on this in the code review for your PR.
@@ -1,44 +1,10 @@
-# v3.2.0
-
- ADDED `settings` command, which lets you `get`, `list`, and `set` config options from the console
- ADDED `debug` command, which shows info about connected clients & networking (for developers)
- ADDED `Util.GenerateUUID()`, which generates an RFC4122 UUID (universally unique identifier)
- ADDED `version` command, which shows version information
- ADDED `onPlayerRequestMods` event, letting Lua disallow individual mods from being sent to clients
- CHANGED `onShutdown` to be called before all players are kicked
-
-# v3.1.1
-
- FIXED bug which caused GetPlayerIdentifiers, GetPlayerName, etc not to work in `onPlayerDisconnect`
- FIXED some issues which could cause the server to crash when receiving malformed data
- FIXED a bug which caused a server to crash during authentication when receiving malformed data
- FIXED minor vulnerability in chat message handling
- FIXED a minor formatting bug in the `status` command
-
 # v3.1.0

 - ADDED Tab autocomplete in console, smart tab autocomplete (understands lua tables and types) in the lua console
 - ADDED lua debug facilities (type `:help` when attached to lua via `lua`)
- ADDED Util.JsonEncode() and Util.JsonDecode(), which turn lua tables into json and vice-versa
+- ADDED MP.JsonEncode() and MP.JsonDecode(), which turn lua tables into json and vice-versa
 - ADDED FS.ListFiles and FS.ListDirectories
- ADDED onFileChanged event, triggered when a server plugin file changes
- ADDED MP.GetPositionRaw(), which can be used to retrieve the latest position packet per player, per vehicle
- ADDED error messages to some lua functions
- ADDED HOME and END button working in console
- ADDED `MP.TriggerClientEventJson()` which takes a table as the data argument and sends it as JSON
- ADDED identifiers (beammp id, ip) to onPlayerAuth (4th argument)
- ADDED more network debug logging
- CHANGED all networking to be more stable, performant, and safe
- FIXED `ip` in MP.GetPlayerIdentifiers
- FIXED issue with client->server events which contain `:`
- FIXED a fatal exception on LuaEngine startup if Resources/Server is a symlink
- FIXED onInit not being called on hot-reload
- FIXED incorrect timing calculation of Lua EventTimer loop
- FIXED bug which caused hot-reload not to report syntax errors
- FIXED missing error messages on some event handler calls
- FIXED vehicles not deleting for all players if an edit was cancelled by Lua
- FIXED server not handling binary UDP packets properly
- REMOVED "Backend response failed to parse as valid json" message
+- FIXED issue with client->server events which contain ':'

 # v3.0.2

@@ -49,7 +15,6 @@
 - FIXED `MP.CreateEventTimer` filling up the queue (see <https://wiki.beammp.com/en/Scripting/new-lua-scripting#mpcreateeventtimerevent_name-string-interval_ms-number-strategy-number-since-v302>)
 - FIXED `MP.TriggerClientEvent` not kicking the client if it failed
 - FIXED Lua result queue handling not checking all results
- FIXED bug which caused ServerConfig.toml to generate incorrectly

 # v3.0.1

@@ -4,9 +4,9 @@
 [![CMake Linux Build](https://github.com/BeamMP/BeamMP-Server/workflows/CMake%20Linux%20Build/badge.svg?branch=master)](https://github.com/BeamMP/BeamMP-Server/actions?query=workflow%3A%22CMake+Linux+Build%22)

 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
-The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
+The server is the point throug which all clients communicate. You can write lua mods for the server, detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).

-**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**
+**For Linux, you __need__ the runtime dependencies, listed below under "prerequisites".**

 ## Support + Contact

@@ -14,7 +14,6 @@ Feel free to ask any questions via the following channels:

 - **IRC**: `#beammp` on [irc.libera.chat](https://web.libera.chat/)
 - **Discord**: [click for invite](https://discord.gg/beammp)
- **BeamMP Forum**: [BeamMP Forum Support](https://forum.beammp.com/c/support/33)

 ## Minimum Requirements

@@ -29,21 +28,21 @@ These values are guesstimated and are subject to change with each release.

 ## Contributing

-TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" or "good first issue" label or with nobody assigned.
+TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" label or with nobody assigned, any [trello](https://trello.com/b/Kw75j3zZ/beamngdrive-multiplayer) cards in the "To-Do" column.

-To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues). Any issues that have the "help wanted" label or don't have anyone assigned are good tasks to take on. You can either contribute by programming or by testing and adding more info and ideas.
+To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues) and at the [trello](https://trello.com/b/Kw75j3zZ/beamngdrive-multiplayer). Any issues that have the "help wanted" label or don't have anyone assigned and any trello cards that aren't assigned or in the "In-Progress" section are good tasks to take on. You can either contribute by programming or by testing and adding more info and ideas.

 Fork this repository, make a new branch for your feature, implement your feature or fix, and then create a pull-request here. Even incomplete features and fixes can be pull-requested.

-If you need support with understanding the codebase, please write us in the Discord. You'll need to be proficient in modern C++.
+If you need support with understanding the codebase, please write us in the discord. You'll need to be proficient in modern C++.

 ## 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.1.0`. 
+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 `v1.20`. 

 ## Supported Operating Systems

-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and sometimes Linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.
+The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute windows binaries and sometimes linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.

 Recommended compilers: MSVC, GCC, CLANG. 

@@ -51,132 +50,72 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea

 ## Build Instructions

-**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v3.1.0`!__**
+**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.3.3`!__**

-Currently only Linux and Windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
+Currently only linux and windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).

 ### Prerequisites

 #### Windows

-There are **no runtime libraries** needed for Windows.
-
 Please use the prepackaged binaries in [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).

-Dependencies for **Windows** can be installed with `vcpkg`.
+Dependencies for **windows** can be installed with `vcpkg`.
 These are:
 ```
-lua zlib rapidjson openssl websocketpp curl boost
+lua
+zlib
+rapidjson
+openssl
+websocketpp
+curl
 ```
-The triplet we use for releases is `x64-windows-static`.

 #### Linux

-We recommend Ubuntu 22.04 or Arch Linux. Any Linux distribution will work, but you have to figure out the package names yourself (please feel free to PR in a change to this README with that info).
+These package names are in the debian / ubuntu style. Feel free to PR your own guide for a different distro.

-##### Runtime Dependencies
-
-These are needed to *run* the server.
-
-<details>
-<summary>
-Ubuntu 22.04
-</summary>
-
-`apt-get install` the following libraries:
+Runtime dependencies for **linux** are (debian/ubuntu):
 ```
-liblua5.3-0
-libssl3
-curl
-```
-</details>
-
-<details>
-<summary>
-Arch Linux
-</summary>
-
-`pacman -Syu` the following libraries:
-```
-lua53
-openssl
-curl
-```
-</details>
-
-##### Build Dependencies
-These are needed for you to *build* the server, in addition to the [runtime dependencies](#runtime-dependencies).
-
-<details>
-<summary>
-Ubuntu 22.04
-</summary>
-
-`apt-get install` the following libraries and programs:
-```
-git
 libz-dev
 rapidjson-dev
 liblua5.3
 libssl-dev
 libwebsocketpp-dev
 libcurl4-openssl-dev
-cmake
-g++-10
-libboost1.74-all-dev
-libssl3
-curl
 ```
-</details>

-<details>
-<summary>
-Arch Linux
-</summary>
-
-`pacman -Syu` the following libraries and programs:
+Build-time dependencies for **linux** are:
 ```
-lua53
-openssl
-curl
 git
+make
 cmake
 g++
-cmake
-zlib
-boost
-websocketpp
 ```
-</details>

-#### macOS
-
-Dependencies for **macOS** can be installed with homebrew.
-```
-brew install lua@5.3 rapidjson websocketpp cmake openssl@1.1
-```
-Some packages are included in **macOS** but you might want to install homebrew versions.
-```
-brew install curl zlib git make
-```
+For other distributions (e.g. Arch) you want to find packages for:
+- libz
+- rapidjson
+- lua5.3
+- ssl / openssl
+- websocketpp
+- curl (with ssl support)
+- \+ the build time dependencies from above

 ### How to build

-On Windows, use git-bash for these commands. On Linux, these should work in your shell.
+On windows, use git-bash for these commands. On Linux, these should work in your shell.

 1. Make sure you have all [prerequisites](#prerequisites) installed
-2. Clone the repository in a location of your choice with `git clone https://github.com/BeamMP/BeamMP-Server` . 
-3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`. 
-4. Checkout the branch or tag of the release you want to compile, for example `git checkout tags/v3.0.2` for version 3.0.2. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
-6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`). This may take some time, and will update all submodules and prepare the build.
-7. Run `make -j` . This step will take some time and will use a lot of CPU and RAM. Remove the `-j` if you run out of memory. *If you change something in the source code, you only have to re-run this step.*
-8. You now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (Windows or Linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/server-installation) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
+2. Clone the repository in a location of your choice with `git clone --recurse-submodules https://github.com/BeamMP/BeamMP-Server`. 
+3. Ensure that all submodules are initialized by running `git submodule update --init --recursive`. Then change into the cloned directory by running `cd BeamMP-Server`.
+4. Checkout the branch of the release you want to compile (`master` is often unstable), for example `git checkout tags/v2.3.3` for version 2.3.3. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
+5. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
+6. Run `make`
+7. You will now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (windows or linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/Server_Mod) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.

 *tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*

-## Support
-The BeamMP project is supported by community donations via our [Patreon](https://www.patreon.com/BeamMP). This brings perks such as Patreon-only channels on our Discord, early access to new updates, and more server keys. 
-
 ## Copyright

 Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor).
@@ -1,6 +1,7 @@
+
 include_directories("${PROJECT_SOURCE_DIR}/deps")
+include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")

 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest")
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <boost/asio.hpp>
-#include <boost/system/error_code.hpp>
-
-using namespace boost::asio;
@@ -7,10 +7,8 @@
 #include <string>
 #include <unordered_set>

-#include "BoostAliases.h"
 #include "Common.h"
 #include "Compat.h"
-#include "TResourceManager.h"
 #include "VehicleData.h"

 class TServer;
@@ -21,8 +19,9 @@ class TServer;
 #endif // WINDOWS

 struct TConnection final {
-    ip::tcp::socket Socket;
-    ip::tcp::endpoint SockAddr;
+    SOCKET Socket;
+    struct sockaddr SockAddr;
+    socklen_t SockAddrLen;
 };

 class TClient final {
@@ -34,34 +33,27 @@ public:
        std::unique_lock<std::mutex> Lock;
    };

-    TClient(TServer& Server, ip::tcp::socket&& Socket);
+    explicit TClient(TServer& Server);
    TClient(const TClient&) = delete;
-    ~TClient();
    TClient& operator=(const TClient&) = delete;

    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; }
    std::string GetCarData(int Ident);
-    std::string GetCarPositionRaw(int Ident);
-    void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
-    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
-    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
-    void Disconnect(std::string_view Reason);
-    bool IsDisconnected() const { return !mSocket.is_open(); }
+    void SetUDPAddr(sockaddr_in Addr) { mUDPAddress = Addr; }
+    void SetDownSock(SOCKET CSock) { mSocket[1] = CSock; }
+    void SetTCPSock(SOCKET CSock) { mSocket[0] = CSock; }
+    void SetStatus(int Status) { mStatus = Status; }
    // 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]] sockaddr_in GetUDPAddr() const { return mUDPAddress; }
+    [[nodiscard]] SOCKET GetDownSock() const { return mSocket[1]; }
+    [[nodiscard]] SOCKET GetTCPSock() const { return mSocket[0]; }
    [[nodiscard]] std::string GetRoles() const { return mRole; }
    [[nodiscard]] std::string GetName() const { return mName; }
    void SetUnicycleID(int ID) { mUnicycleID = ID; }
@@ -69,9 +61,9 @@ public:
    [[nodiscard]] int GetOpenCarID() const;
    [[nodiscard]] int GetCarCount() const;
    void ClearCars();
+    [[nodiscard]] int GetStatus() const { return mStatus; }
    [[nodiscard]] int GetID() const { return mID; }
    [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
-    bool mUDPCONNECTED = false;
    [[nodiscard]] bool IsConnected() const { return mIsConnected; }
    [[nodiscard]] bool IsSynced() const { return mIsSynced; }
    [[nodiscard]] bool IsSyncing() const { return mIsSyncing; }
@@ -79,9 +71,9 @@ public:
    void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
    void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
    void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
-    void EnqueuePacket(const std::vector<uint8_t>& Packet);
-    [[nodiscard]] std::queue<std::vector<uint8_t>>& MissedPacketQueue() { return mPacketsSync; }
-    [[nodiscard]] const std::queue<std::vector<uint8_t>>& MissedPacketQueue() const { return mPacketsSync; }
+    void EnqueuePacket(const std::string& Packet);
+    [[nodiscard]] std::queue<std::string>& MissedPacketQueue() { return mPacketsSync; }
+    [[nodiscard]] const std::queue<std::string>& MissedPacketQueue() const { return mPacketsSync; }
    [[nodiscard]] size_t MissedPacketQueueSize() const { return mPacketsSync.size(); }
    [[nodiscard]] std::mutex& MissedPacketQueueMutex() const { return mMissedPacketsMutex; }
    void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
@@ -89,24 +81,6 @@ public:
    void UpdatePingTime();
    int SecondsSinceLastPing();

-    // bytes received on UDP
-    std::atomic_size_t UdpReceived = 0;
-    // number of packets received on UDP
-    std::atomic_size_t UdpPacketsReceived = 0;
-    // bytes sent on UDP
-    std::atomic_size_t UdpSent = 0;
-    // number of packets sent on UDP
-    std::atomic_size_t UdpPacketsSent = 0;
-
-    // bytes received on TCP
-    std::atomic_size_t TcpReceived = 0;
-    // bytes sent on TCP
-    std::atomic_size_t TcpSent = 0;
-
-    TimeType::time_point ConnectionTime {};
-
-    ModMap AllowedMods;
-
 private:
    void InsertVehicle(int ID, const std::string& Data);

@@ -115,24 +89,20 @@ private:
    bool mIsSynced = false;
    bool mIsSyncing = false;
    mutable std::mutex mMissedPacketsMutex;
-    std::queue<std::vector<uint8_t>> mPacketsSync;
+    std::queue<std::string> mPacketsSync;
    std::unordered_map<std::string, std::string> mIdentifiers;
    bool mIsGuest = false;
    mutable std::mutex mVehicleDataMutex;
-    mutable std::mutex mVehiclePositionMutex;
    TSetOfVehicleData mVehicleData;
-    SparseArray<std::string> mVehiclePosition;
    std::string mName = "Unknown Client";
-    ip::tcp::socket mSocket;
-    ip::tcp::socket mDownSocket;
-    ip::udp::endpoint mUDPAddress {};
+    SOCKET mSocket[2] { SOCKET(0), SOCKET(0) };
+    sockaddr_in mUDPAddress {}; // is this initialization OK? yes it is
    int mUnicycleID = -1;
    std::string mRole;
    std::string mDID;
+    int mStatus = 0;
    int mID = -1;
-    std::chrono::time_point<TimeType> mLastPingTime;
-    std::mutex mDisconnectMtx;
+    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime;
 };

-// Returns a valid client, or nullptr if no such client exists
-std::shared_ptr<TClient> GetClient(class TServer& Server, int ID);
+std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);
@@ -1,6 +1,5 @@
 #pragma once

-#include "CustomAssert.h"
 #include "TSentry.h"
 extern TSentry Sentry;

@@ -13,61 +12,13 @@ extern TSentry Sentry;
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <shared_mutex>
 #include <sstream>
-#include <unordered_map>
 #include <zlib.h>

-#include <doctest/doctest.h>
-#include <filesystem>
-namespace fs = std::filesystem;
+#include "Compat.h"

 #include "TConsole.h"

-#include <boost/container/flat_map.hpp>
-#include <boost/variant.hpp>
-
-#include <chrono>
-#include <variant>
-
-using TimeType = std::chrono::system_clock;
-
-#include <lk/Result.h>
-
-template <typename T>
-using Result = lk::Result<T>;
-using Error = lk::Error;
-
-// General
-constexpr std::string_view StrDebug = "Debug";
-constexpr std::string_view StrPrivate = "Private";
-constexpr std::string_view StrPort = "Port";
-constexpr std::string_view StrMaxCars = "MaxCars";
-constexpr std::string_view StrMaxPlayers = "MaxPlayers";
-constexpr std::string_view StrMap = "Map";
-constexpr std::string_view StrName = "Name";
-constexpr std::string_view StrDescription = "Description";
-constexpr std::string_view StrResourceFolder = "ResourceFolder";
-constexpr std::string_view StrAuthKey = "AuthKey";
-constexpr std::string_view StrLogChat = "LogChat";
-
-// Misc
-constexpr std::string_view StrSendErrors = "SendErrors";
-constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
-constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
-constexpr std::string_view StrIncludeSubdirectories = "IncludeSubdirectories";
-
-// HTTP
-constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
-constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
-constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
-constexpr std::string_view StrSSLCertPath = "SSLCertPath";
-constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
-constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";
-
-// Unused
-constexpr std::string_view StrCustomIP = "Unused.CustomIP";
-
 struct Version {
    uint8_t major;
    uint8_t minor;
@@ -77,15 +28,6 @@ struct Version {
    std::string AsString();
 };

-template <typename T>
-using SparseArray = std::unordered_map<size_t, T>;
-
-template <typename K, typename V>
-using HashMap = std::unordered_map<K, V>;
-
-using boost::variant;
-using boost::container::flat_map;
-
 // static class handling application start, shutdown, etc.
 // yes, static classes, singletons, globals are all pretty
 // bad idioms. In this case we need a central way to access
@@ -94,17 +36,28 @@ using boost::container::flat_map;
 class Application final {
 public:
    // types
-
-    using SettingValue = std::variant<std::string, bool, int>;
-    using SettingsMap = flat_map<std::string_view, SettingValue>;
-
-    static SettingsMap mSettings;
-
-    static std::string GetSettingString(std::string_view Name);
-    static int GetSettingInt(std::string_view Name);
-    static bool GetSettingBool(std::string_view Name);
-
-    static void SetSetting(std::string_view Name, const SettingValue& value);
+    struct TSettings {
+        std::string ServerName { "BeamMP Server" };
+        std::string ServerDesc { "BeamMP Default Description" };
+        std::string Resource { "Resources" };
+        std::string MapName { "/levels/gridmap_v2/info.json" };
+        std::string Key {};
+        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 SendErrors { true };
+        bool SendErrorsMessageEnabled { true };
+        int HTTPServerPort { 8080 };
+        std::string HTTPServerIP { "127.0.0.1" };
+        bool HTTPServerUseSSL { false };
+        bool HideUpdateMessages { false };
+        [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
+    };

    using TShutdownHandler = std::function<void()>;

@@ -118,10 +71,12 @@ public:
    static TConsole& Console() { return *mConsole; }
    static std::string ServerVersionString();
    static const Version& ServerVersion() { return mVersion; }
-    static uint8_t ClientMajorVersion() { return 2; }
+    static std::string ClientVersionString() { return "2.0"; }
    static std::string PPS() { return mPPS; }
    static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }

+    static TSettings Settings;
+
    static std::vector<std::string> GetBackendUrlsInOrder() {
        return {
            "backend.beammp.com",
@@ -135,8 +90,6 @@ public:
    static void CheckForUpdates();
    static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
    static bool IsOutdated(const Version& Current, const Version& Newest);
-    static bool IsShuttingDown();
-    static void SleepSafeSeconds(size_t Seconds);

    static void InitializeConsole() {
        if (!mConsole) {
@@ -161,203 +114,112 @@ public:

    static void SetSubsystemStatus(const std::string& Subsystem, Status status);

-    static std::string SettingToString(const SettingValue& Value);
-
-    // Keeps track of how many packets we dropped on UDP due to fundamentally being malformed
-    static inline std::atomic_size_t MalformedUdpPackets { 0 };
-    // Keeps track of how many packets we dropped on UDP due to
-    // 1) not having a valid (known) player id
-    // 2) player disconnecting
-    // 3) packet failing to parse
-    static inline std::atomic_size_t InvalidUdpPackets { 0 };
-
 private:
-    static void SetShutdown(bool Val);
-
    static inline SystemStatusMap mSystemStatusMap {};
    static inline std::mutex mSystemStatusMapMutex {};
    static inline std::string mPPS;
    static inline std::unique_ptr<TConsole> mConsole;
-    static inline std::shared_mutex mShutdownMtx {};
-    static inline bool mShutdown { false };
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};

-    static inline Version mVersion { 3, 2, 0 };
+    static inline Version mVersion { 3, 1, 0 };
 };

 std::string ThreadName(bool DebugModeOverride = false);
 void RegisterThread(const std::string& str);
 #define RegisterThreadAuto() RegisterThread(__func__)

-#define KB 1024llu
-#define MB (KB * 1024llu)
-#define GB (MB * 1024llu)
-#define TB (GB * 1024llu)
+#define KB 1024
+#define MB (KB * 1024)
 #define SSU_UNRAW SECRET_SENTRY_URL

 #define _file_basename std::filesystem::path(__FILE__).filename().string()
 #define _line std::to_string(__LINE__)
 #define _in_lambda (std::string(__func__) == "operator()")

+// we would like the full function signature 'void a::foo() const'
+// on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
+// feel free to add more
+#if defined(WIN32)
+#define _function_name std::string(__FUNCSIG__)
+#elif defined(__unix) || defined(__unix__)
+#define _function_name std::string(__PRETTY_FUNCTION__)
+#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)
+#define _this_location (ThreadName() + _function_name + " ")
+#else
+#define _this_location (ThreadName() + _file_basename + ":" + _line + " ")
+#endif
+#define SU_RAW SSU_UNRAW
+
+#else // !defined(DEBUG)
+
+#define SU_RAW RAWIFY(SSU_UNRAW)
+#define _this_location (ThreadName())
+
+#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)                                                               \
+    do {                                                                              \
+        Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
+        Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                        \
+    } while (false)
+#define beammp_lua_error(x)                                                               \
+    do {                                                                                  \
+        Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x)); \
+    } while (false)
+#define beammp_lua_warn(x)                                                               \
+    do {                                                                                 \
+        Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x)); \
+    } while (false)
+#define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
+#define beammp_debug(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
+        }                                                                                 \
+    } while (false)
+#define beammp_event(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
+        }                                                                                 \
+    } while (false)
 // for those times when you just need to ignore something :^)
 // explicity disables a [[nodiscard]] warning
 #define beammp_ignore(x) (void)x
-
-// clang-format off
-#ifdef DOCTEST_CONFIG_DISABLE
-
-    // we would like the full function signature 'void a::foo() const'
-    // on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
-    // feel free to add more
-    #if defined(WIN32)
-        #define _function_name std::string(__FUNCSIG__)
-    #elif defined(__unix) || defined(__unix__)
-        #define _function_name std::string(__PRETTY_FUNCTION__)
-    #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)
-            #define _this_location (ThreadName() + _function_name + " ")
-        #else
-            #define _this_location (ThreadName() + _file_basename + ":" + _line + " ")
-        #endif
-
-    #endif // defined(DEBUG)
-    
-    #define beammp_internal_error(x) Application::Console().Write(_this_location + std::string("[INTERNAL ERROR] ") + (x))
-    
-    #define beammp_warn(x)                                                                          \
-        do {                                                                                        \
-            try{                                                                                    \
-                Application::Console().Write(_this_location + std::string("[WARN] ") + (x));        \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    #define beammp_info(x)                                                                          \
-        do {                                                                                        \
-            try{                                                                                    \
-                Application::Console().Write(_this_location + std::string("[INFO] ") + (x));        \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    #define beammp_error(x)                                                                         \
-        do {                                                                                        \
-            try{                                                                                    \
-                Application::Console().Write(_this_location + std::string("[ERROR] ") + (x));       \
-                Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                              \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    #define beammp_lua_error(x)                                                                     \
-        do {                                                                                        \
-            try{                                                                                    \
-                Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x));   \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    #define beammp_lua_warn(x)                                                                      \
-        do {                                                                                        \
-            try{                                                                                    \
-                Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x));    \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    #define luaprint(x)                                                                             \
-        do {                                                                                        \
-            try{                                                                                    \
-                Application::Console().Write(_this_location + std::string("[LUA] ") + (x));         \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    #define beammp_debug(x)                                                                         \
-        do {                                                                                        \
-            try{                                                                                    \
-                if (Application::GetSettingBool("Debug")) {                                         \
-                    Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x));   \
-                }                                                                                   \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    #define beammp_event(x)                                                                         \
-        do {                                                                                        \
-            try{                                                                                    \
-                if (Application::GetSettingBool("Debug")) {                                         \
-                    Application::Console().Write(_this_location + std::string("[EVENT] ") + (x));   \
-                }                                                                                   \
-            } catch (const std::exception& e) {                                                     \
-                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
-            }                                                                                       \
-        } while (false)
-    // trace() is a debug-build debug()
-    #if defined(DEBUG)
-        #define beammp_trace(x)                                                                         \
-            do {                                                                                        \
-                try{                                                                                    \
-                    if (Application::GetSettingBool("Debug")) {                                         \
-                        Application::Console().Write(_this_location + std::string("[TRACE] ") + (x));   \
-                    }                                                                                   \
-                } catch (const std::exception& e) {                                                     \
-                    beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}'", #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__))
-    #define beammp_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
-    #define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
-    #define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
-    #define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
-
-#else // DOCTEST_CONFIG_DISABLE
-
-    #define beammp_error(x) /* x */
-    #define beammp_lua_error(x) /* x */
-    #define beammp_warn(x) /* x */
-    #define beammp_lua_warn(x) /* x */
-    #define beammp_info(x) /* x */
-    #define beammp_event(x) /* x */
-    #define beammp_debug(x) /* x */
-    #define beammp_trace(x) /* x */
-    #define luaprint(x) /* x */
-    #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
-    #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
-    #define beammp_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
-    #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
-    #define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
-    #define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
-    #define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
-
-#endif // DOCTEST_CONFIG_DISABLE
-
+// trace() is a debug-build debug()
 #if defined(DEBUG)
-    #define SU_RAW SSU_UNRAW
+#define beammp_trace(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
+        }                                                                                 \
+    } while (false)
 #else
-    #define SU_RAW RAWIFY(SSU_UNRAW)
-    #define _this_location (ThreadName())
-#endif
+#define beammp_trace(x)
+#endif // defined(DEBUG)

-// clang-format on
+#define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
+#define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
+#define beammp_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
+#define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
+#define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
+#define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
+#define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))

 void LogChatMessage(const std::string& name, int id, const std::string& msg);

@@ -369,11 +231,11 @@ inline T Comp(const T& Data) {
    // 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.zalloc = Z_NULL;
+    defstream.zfree = Z_NULL;
+    defstream.opaque = Z_NULL;
+    defstream.avail_in = (uInt)Data.size();
+    defstream.next_in = (Bytef*)&Data[0];
    defstream.avail_out = Biggest;
    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
    deflateInit(&defstream, Z_BEST_COMPRESSION);
@@ -394,13 +256,13 @@ inline T DeComp(const T& Compressed) {
    // not needed
    C.fill(0);
    z_stream infstream;
-    infstream.zalloc = nullptr;
-    infstream.zfree = nullptr;
-    infstream.opaque = nullptr;
+    infstream.zalloc = Z_NULL;
+    infstream.zfree = Z_NULL;
+    infstream.opaque = Z_NULL;
    infstream.avail_in = Biggest;
-    infstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Compressed[0]));
+    infstream.next_in = (Bytef*)(&Compressed[0]);
    infstream.avail_out = Biggest;
-    infstream.next_out = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(C.data()));
+    infstream.next_out = (Bytef*)(C.data());
    inflateInit(&infstream);
    inflate(&infstream, Z_SYNC_FLUSH);
    inflate(&infstream, Z_FINISH);
@@ -416,4 +278,4 @@ inline T DeComp(const T& Compressed) {
 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW

-std::string ToHumanReadableSize(size_t Size);
+void LogChatMessage(const std::string& name, int id, const std::string& msg);
@@ -5,23 +5,54 @@
 // ======================= UNIX ========================

 #ifdef BEAMMP_LINUX
+#include <arpa/inet.h>
 #include <errno.h>
+#include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+using SOCKET = int;
+using DWORD = unsigned long;
+using PDWORD = unsigned long*;
+using LPDWORD = unsigned long*;
 char _getch();
+inline void CloseSocketProper(int TheSocket) {
+    shutdown(TheSocket, SHUT_RDWR);
+    close(TheSocket);
+}
 #endif // unix

 // ======================= APPLE ========================

 #ifdef BEAMMP_APPLE
+#include <arpa/inet.h>
 #include <errno.h>
+#include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+using SOCKET = int;
+using DWORD = unsigned long;
+using PDWORD = unsigned long*;
+using LPDWORD = unsigned long*;
 char _getch();
+inline void CloseSocketProper(int TheSocket) {
+    shutdown(TheSocket, SHUT_RDWR);
+    close(TheSocket);
+}
 #endif // unix

 // ======================= WINDOWS =======================

 #ifdef BEAMMP_WINDOWS
 #include <conio.h>
+#include <winsock2.h>
+inline void CloseSocketProper(SOCKET TheSocket) {
+    shutdown(TheSocket, 2); // 2 == SD_BOTH
+    closesocket(TheSocket);
+}
 #endif // WIN32
+
+#ifdef INVALID_SOCKET
+static inline constexpr int BEAMMP_INVALID_SOCKET = INVALID_SOCKET;
+#else
+static inline constexpr int BEAMMP_INVALID_SOCKET = -1;
+#endif
@@ -58,17 +58,16 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
 #define beammp_assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
 #define beammp_assert_not_reachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
 #else
-#define beammp_assert(cond)                                                            \
-    do {                                                                               \
-        bool result = (cond);                                                          \
-        if (!result) {                                                                 \
-            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
-            Sentry.LogAssert(#cond, _file_basename, _line, __func__);                  \
-        }                                                                              \
+// In release build, these macros turn into NOPs. The compiler will optimize these out.
+#define beammp_assert(cond)                                           \
+    do {                                                              \
+        bool result = (cond);                                         \
+        if (!result) {                                                \
+            Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
+        }                                                             \
    } while (false)
-#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); \
-        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__);                                                                               \
+#define beammp_assert_not_reachable()                                             \
+    do {                                                                          \
+        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__); \
    } while (false)
 #endif // DEBUG
@@ -9,8 +9,6 @@
 #if defined(BEAMMP_LINUX)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 #include <httplib.h>
 #if defined(BEAMMP_LINUX)
@@ -19,6 +17,10 @@

 namespace fs = std::filesystem;

+class TServer;
+class TNetwork;
+class TResourceManager;
+
 namespace Http {
 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 = {});
@@ -30,13 +32,19 @@ const std::string ErrorString = "-1";
 namespace Server {
    class THttpServerInstance {
    public:
-        THttpServerInstance();
+        THttpServerInstance(TServer&, TNetwork&, TResourceManager&);
+        ~THttpServerInstance();
+        static fs::path KeyFilePath;
+        static fs::path CertFilePath;

    protected:
        void operator()();

    private:
        std::thread mThread;
+        TServer& mServer;
+        TNetwork& mNetwork;
+        TResourceManager& mResourceManager;
    };
 }
 }
@@ -1,6 +0,0 @@
-#pragma once
-
-enum IterationDecision {
-    Continue,
-    Break,
-};
@@ -3,7 +3,7 @@
 //

 #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"
@@ -12,12 +12,12 @@ namespace MP {

    std::string GetOSName();
    std::tuple<int, int, int> GetServerVersion();
-    std::pair<bool, std::string> TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
-    std::pair<bool, std::string> TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
+    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
+    bool 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);
-    std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);
+    void DropPlayer(int ID, std::optional<std::string> MaybeReason);
+    void SendChatMessage(int ID, const std::string& Message);
+    void RemoveVehicle(int PlayerID, int VehicleID);
    void Set(int ConfigID, sol::object NewValue);
    bool IsPlayerGuest(int ID);
    bool IsPlayerConnected(int ID);
@@ -6,8 +6,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;
@@ -6,7 +6,7 @@
 #include <filesystem>

 #define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
-#include <toml11/toml.hpp> // header-only version of TOML++
+#include <toml.hpp> // header-only version of TOML++

 namespace fs = std::filesystem;

@@ -19,10 +19,12 @@ public:
    void FlushToFile();

 private:
-    void CreateConfigFile();
+    void CreateConfigFile(std::string_view name);
    void ParseFromFile(std::string_view name);
    void PrintDebug();
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue);

    void ParseOldFormat();
    bool IsDefault();
@@ -35,13 +35,6 @@ private:
    void Command_List(const std::string& cmd, const std::vector<std::string>& args);
    void Command_Status(const std::string& cmd, const std::vector<std::string>& args);
    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_Debug(const std::string&, const std::vector<std::string>& args);
-    void Command_Version(const std::string&, const std::vector<std::string>& args);
-
-    void Autocomplete_Lua(const std::string&, std::vector<std::string>& suggestions);
-    void Autocomplete_Kick(const std::string&, std::vector<std::string>& suggestions);
-    void Autocomplete_Settings(const std::string&, std::vector<std::string>& suggestions);

    void Command_Say(const std::string& FullCommand);
    bool EnsureArgsCount(const std::vector<std::string>& args, size_t n);
@@ -57,18 +50,9 @@ private:
        { "list", [this](const auto& a, const auto& b) { Command_List(a, b); } },
        { "status", [this](const auto& a, const auto& b) { Command_Status(a, b); } },
        { "settings", [this](const auto& a, const auto& b) { Command_Settings(a, b); } },
-        { "clear", [this](const auto& a, const auto& b) { Command_Clear(a, b); } },
-        { "debug", [this](const auto& a, const auto& b) { Command_Debug(a, b); } },
-        { "version", [this](const auto& a, const auto& b) { Command_Version(a, b); } },
        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
    };

-    std::unordered_map<std::string, std::function<void(const std::string&, std::vector<std::string>&)>> mCommandAutocompleteMap = {
-        { "lua", [this](const auto& a, auto& b) { Autocomplete_Lua(a, b); } },
-        { "kick", [this](const auto& a, auto& b) { Autocomplete_Kick(a, b); } },
-        { "settings", [this](const auto& a, auto& b) { Autocomplete_Settings(a, b); } },
-    };
-
    Commandline mCommandline;
    std::vector<std::string> mCachedLuaHistory;
    std::vector<std::string> mCachedRegularHistory;
@@ -15,6 +15,7 @@ private:
    std::string GenerateCall();
    std::string GetPlayers();

+    bool mShutdown = false;
    TResourceManager& mResourceManager;
    TServer& mServer;
 };
@@ -10,49 +10,26 @@
 #include <lua.hpp>
 #include <memory>
 #include <mutex>
-#include <nlohmann/json.hpp>
 #include <queue>
 #include <random>
 #include <set>
-#include <toml11/toml.hpp>
+#include <toml.hpp>
 #include <unordered_map>
 #include <vector>

 #define SOL_ALL_SAFETIES_ON 1
-#define SOL_USER_C_ASSERT SOL_ON
-#define SOL_C_ASSERT(...)                                                                                                                                                                                                                                                  \
-    do {                                                                                                                                                                                                                                                                   \
-        if (!(__VA_ARGS__)) {                                                                                                                                                                                                                                              \
-            beammp_lua_errorf("SOL2 assertion failure: Assertion `{}` failed in {}:{}. This *should* be a fatal error, but BeamMP Server overrides it to not be fatal. This may cause the Lua Engine to crash, or cause other issues.", #__VA_ARGS__, __FILE__, __LINE__); \
-            std::abort();                                                                                                                                                                                                                                                  \
-        }                                                                                                                                                                                                                                                                  \
-    } while (0)
 #include <sol/sol.hpp>

-struct JsonString {
-    std::string value;
-};
-
-// value used to keep nils in a table or array, across serialization boundaries like
-// JsonEncode, so that the nil stays at the same index and isn't treated like a special
-// value (e.g. one that can be ignored or discarded).
-const inline std::string BEAMMP_INTERNAL_NIL = "BEAMMP_SERVER_INTERNAL_NIL_VALUE";
-
 using TLuaStateId = std::string;
 namespace fs = std::filesystem;
 /**
 * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
 */
-using TLuaValue = std::variant<std::string, int, JsonString, bool, std::unordered_map<std::string, std::string>, std::unordered_map<std::string, size_t>, float>;
-enum TLuaType {
-    String = 0,
-    Int = 1,
-    Json = 2,
-    Bool = 3,
-    StringStringMap = 4,
-    StringSizeTMap = 5,
-    Float = 6,
-};
+using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool>;
+static constexpr size_t TLuaArgTypes_String = 0;
+static constexpr size_t TLuaArgTypes_Int = 1;
+static constexpr size_t TLuaArgTypes_VariadicArgs = 2;
+static constexpr size_t TLuaArgTypes_Bool = 3;

 class TLuaPlugin;

@@ -71,7 +48,6 @@ struct TLuaPluginConfig {
    static inline const std::string FileName = "PluginConfig.toml";
    TLuaStateId StateId;
    // TODO: Add execute list
-    // TODO: Build a better toml serializer, or some way to do this in an easier way
 };

 struct TLuaChunk {
@@ -83,7 +59,20 @@ struct TLuaChunk {
    std::string PluginPath;
 };

-class TLuaEngine : public std::enable_shared_from_this<TLuaEngine>, IThreaded {
+class TPluginMonitor : IThreaded {
+public:
+    TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown);
+
+    void operator()();
+
+private:
+    TLuaEngine& mEngine;
+    fs::path mPath;
+    std::atomic_bool& mShutdown;
+    std::unordered_map<std::string, fs::file_time_type> mFileTimes;
+};
+
+class TLuaEngine : IThreaded {
 public:
    enum CallStrategy : int {
        BestEffort,
@@ -93,12 +82,12 @@ public:
    struct QueuedFunction {
        std::string FunctionName;
        std::shared_ptr<TLuaResult> Result;
-        std::vector<TLuaValue> Args;
+        std::vector<TLuaArgTypes> Args;
        std::string EventName; // optional, may be empty
    };

    TLuaEngine();
-    virtual ~TLuaEngine() noexcept {
+    ~TLuaEngine() noexcept {
        beammp_debug("Lua Engine terminated");
    }

@@ -119,13 +108,6 @@ public:
        std::unique_lock Lock(mLuaStatesMutex);
        return mLuaStates.size();
    }
-    std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names {};
-        for (auto const& [stateId, _] : mLuaStates) {
-            names.push_back(stateId);
-        }
-        return names;
-    }
    size_t GetTimedEventsCount() {
        std::unique_lock Lock(mTimedEventsMutex);
        return mTimedEvents.size();
@@ -142,13 +124,14 @@ public:
    }

    static void WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results,
-        const std::optional<TimeType::duration>& Max = std::nullopt);
+        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<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args);
+    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
    void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);
    void RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName);
+    template <typename... ArgsT>
    /**
     *
     * @tparam ArgsT Template Arguments for the event (Metadata) todo: figure out what this means
@@ -157,7 +140,6 @@ public:
     * @param Args
     * @return
     */
-    template <typename... ArgsT>
    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerEvent(const std::string& EventName, TLuaStateId IgnoreId, ArgsT&&... Args) {
        std::unique_lock Lock(mLuaEventsMutex);
        beammp_event(EventName);
@@ -166,7 +148,7 @@ public:
        }

        std::vector<std::shared_ptr<TLuaResult>> Results;
-        std::vector<TLuaValue> Arguments { TLuaValue { std::forward<ArgsT>(Args) }... };
+        std::vector<TLuaArgTypes> Arguments { TLuaArgTypes { std::forward<ArgsT>(Args) }... };

        for (const auto& Event : mLuaEvents.at(EventName)) {
            for (const auto& Function : Event.second) {
@@ -177,21 +159,6 @@ public:
        }
        return Results; //
    }
-    template <typename... ArgsT>
-    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerLocalEvent(const TLuaStateId& StateId, const std::string& EventName, ArgsT&&... Args) {
-        std::unique_lock Lock(mLuaEventsMutex);
-        beammp_event(EventName + " in '" + StateId + "'");
-        if (mLuaEvents.find(EventName) == mLuaEvents.end()) { // if no event handler is defined for 'EventName', return immediately
-            return {};
-        }
-        std::vector<std::shared_ptr<TLuaResult>> Results;
-        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));
-        }
-        return Results;
-    }
    std::set<std::string> GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId);
    void CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy);
    void CancelEventTimers(const std::string& EventName, TLuaStateId StateId);
@@ -202,7 +169,6 @@ public:
    static constexpr const char* BeamMPFnNotFoundError = "BEAMMP_FN_NOT_FOUND";

    std::vector<std::string> GetStateGlobalKeysForState(TLuaStateId StateId);
-    std::vector<std::string> GetStateTableKeysForState(TLuaStateId StateId, std::vector<std::string> keys);

    // Debugging functions (slow)
    std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> Debug_GetEventsForState(TLuaStateId StateId);
@@ -218,19 +184,18 @@ private:

    class StateThreadData : IThreaded {
    public:
-        StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
+        StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine);
        StateThreadData(const StateThreadData&) = delete;
-        virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
+        ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy);
+        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
+        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& 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
        void operator()() override;
        sol::state_view State() { return sol::state_view(mState); }

        std::vector<std::string> GetStateGlobalKeys();
-        std::vector<std::string> GetStateTableKeys(const std::vector<std::string>& keys);

        // Debug functions, slow
        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
@@ -243,7 +208,6 @@ private:
        sol::table Lua_GetPlayers();
        std::string Lua_GetPlayerName(int ID);
        sol::table Lua_GetPlayerVehicles(int ID);
-        std::pair<sol::table, std::string> Lua_GetPositionRaw(int PID, int VID);
        sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
        sol::table Lua_JsonDecode(const std::string& str);
        int Lua_GetPlayerIDByName(const std::string& Name);
@@ -251,6 +215,7 @@ private:
        sol::table Lua_FS_ListDirectories(const std::string& Path);

        std::string mName;
+        std::atomic_bool& mShutdown;
        TLuaStateId mStateId;
        lua_State* mState;
        std::thread mThread;
@@ -265,12 +230,11 @@ private:
        std::recursive_mutex mPathsMutex;
        std::mt19937 mMersenneTwister;
        std::uniform_real_distribution<double> mUniformRealDistribution01;
-        std::vector<sol::object> JsonStringToArray(JsonString Str);
    };

    struct TimedEvent {
-        TimeType::duration Duration {};
-        TimeType::time_point LastCompletion {};
+        std::chrono::high_resolution_clock::duration Duration {};
+        std::chrono::high_resolution_clock::time_point LastCompletion {};
        std::string EventName;
        TLuaStateId StateId;
        CallStrategy Strategy;
@@ -280,7 +244,9 @@ private:

    TNetwork* mNetwork;
    TServer* mServer;
-    const fs::path mResourceServerPath;
+    TPluginMonitor mPluginMonitor;
+    std::atomic_bool mShutdown { false };
+    fs::path mResourceServerPath;
    std::vector<std::shared_ptr<TLuaPlugin>> mLuaPlugins;
    std::unordered_map<TLuaStateId, std::unique_ptr<StateThreadData>> mLuaStates;
    std::recursive_mutex mLuaStatesMutex;
@@ -1,11 +1,8 @@
 #pragma once

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

 struct TConnection;

@@ -13,18 +10,19 @@ class TNetwork {
 public:
    TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager);

-    [[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(ip::tcp::socket&& TCPSock);
-    std::vector<uint8_t> TCPRcv(TClient& c);
+    [[nodiscard]] bool TCPSend(TClient& c, const std::string& Data, bool IsSync = false);
+    [[nodiscard]] bool SendLarge(TClient& c, std::string Data, bool isSync = false);
+    [[nodiscard]] bool Respond(TClient& c, const std::string& MSG, bool Rel, bool isSync = false);
+    std::shared_ptr<TClient> CreateClient(SOCKET TCPSock);
+    std::string TCPRcv(TClient& c);
    void ClientKick(TClient& c, const std::string& R);
    [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
-    void Identify(TConnection&& client);
-    std::shared_ptr<TClient> Authentication(TConnection&& ClientConnection);
+    void Identify(const TConnection& client);
+    void Authentication(const TConnection& ClientConnection);
+    [[nodiscard]] bool CheckBytes(TClient& c, int32_t BytesRcv);
    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);
+    [[nodiscard]] bool UDPSend(TClient& Client, std::string Data) const;
+    void SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel);
    void UpdatePlayer(TClient& Client);

 private:
@@ -33,25 +31,21 @@ private:

    TServer& mServer;
    TPPSMonitor& mPPSMonitor;
-    ip::udp::socket mUDPSock;
+    SOCKET mUDPSock {};
+    bool mShutdown { false };
    TResourceManager& mResourceManager;
    std::thread mUDPThread;
    std::thread mTCPThread;
-    std::mutex mOpenIDMutex;

-    std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
-    void HandleDownload(TConnection&& TCPSock);
+    std::string UDPRcvFromClient(sockaddr_in& client) const;
+    void HandleDownload(SOCKET 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);
    int OpenID();
-    void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr);
-    ModMap GetClientMods(TClient& Client);
-    void HandleResourcePackets(TClient& c, const std::vector<uint8_t>& Packet);
+    void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr, bool kicked);
+    void Parse(TClient& c, const std::string& Packet);
    void SendFile(TClient& c, const std::string& Name);
-    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
+    static bool TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_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::vector<uint8_t> StringToVector(const std::string& Str);
@@ -22,5 +22,6 @@ private:

    TServer& mServer;
    std::optional<std::reference_wrapper<TNetwork>> mNetwork { std::nullopt };
+    bool mShutdown { false };
    int mInternalPPS { 0 };
-};
+};
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "Common.h"
-#include "IThreaded.h"
-
-#include <atomic>
-#include <memory>
-#include <unordered_map>
-
-class TLuaEngine;
-
-class TPluginMonitor : IThreaded, public std::enable_shared_from_this<TPluginMonitor> {
-public:
-    TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine);
-
-    void operator()();
-
-private:
-    std::shared_ptr<TLuaEngine> mEngine;
-    fs::path mPath;
-    std::unordered_map<std::string, fs::file_time_type> mFileTimes;
-};
@@ -1,22 +1,21 @@
 #pragma once

 #include "Common.h"
-#include <optional>
-
-using ModMap = HashMap<std::string, size_t>;

 class TResourceManager {
 public:
    TResourceManager();

-    [[nodiscard]] size_t TotalModsSize() const { return mTotalModSize; }
-    [[nodiscard]] ModMap FileMap() const { return mMods; }
-    [[nodiscard]] static std::string FormatForBackend(const ModMap& mods);
-    [[nodiscard]] static std::string FormatForClient(const ModMap& mods);
-    [[nodiscard]] static std::optional<std::string> IsModValid(std::string& pathString, const ModMap& mods);
-    [[nodiscard]] int LoadedModCount() const { return mMods.size(); }
+    [[nodiscard]] size_t MaxModSize() const { return mMaxModSize; }
+    [[nodiscard]] std::string FileList() const { return mFileList; }
+    [[nodiscard]] std::string TrimmedList() const { return mTrimmedList; }
+    [[nodiscard]] std::string FileSizes() const { return mFileSizes; }
+    [[nodiscard]] int ModsLoaded() const { return mModsLoaded; }

 private:
-    size_t mTotalModSize = 0; // size of all mods
-    ModMap mMods; // map of mod names
+    size_t mMaxModSize = 0;
+    std::string mFileSizes;
+    std::string mFileList;
+    std::string mTrimmedList;
+    int mModsLoaded = 0;
 };
@@ -4,8 +4,6 @@
 #include <functional>
 #include <string>

-#include "Common.h"
-
 class TScopedTimer {
 public:
    TScopedTimer();
@@ -13,7 +11,7 @@ public:
    TScopedTimer(std::function<void(size_t)> OnDestroy);
    ~TScopedTimer();
    auto GetElapsedTime() const {
-        auto EndTime = TimeType::now();
+        auto EndTime = std::chrono::high_resolution_clock::now();
        auto Delta = EndTime - mStartTime;
        size_t TimeDelta = Delta / std::chrono::milliseconds(1);
        return TimeDelta;
@@ -22,6 +20,6 @@ public:
    std::function<void(size_t /* time_ms */)> OnDestroy { nullptr };

 private:
-    TimeType::time_point mStartTime;
+    std::chrono::high_resolution_clock::time_point mStartTime;
    std::string Name;
 };
@@ -1,37 +1,17 @@
 #pragma once

 #include "IThreaded.h"
-#include "IterationDecision.h"
 #include "RWMutex.h"
 #include "TScopedTimer.h"
-#include <concepts>
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <type_traits>
 #include <unordered_set>

-#include "BoostAliases.h"
-
 class TClient;
 class TNetwork;
 class TPPSMonitor;

-// clang-format doesn't know how to deal with concepts
-// clang-format off
-template <typename FnT>
-concept ForEachHandlerWithDecision = requires(FnT Fn, const std::shared_ptr<TClient>& Ptr) {
-    requires std::invocable<FnT, const std::shared_ptr<TClient>&> ;
-    { std::invoke(Fn, Ptr) } -> std::convertible_to<IterationDecision>;
-};
-
-template <typename FnT>
-concept ForEachHandler = requires(FnT Fn, const std::shared_ptr<TClient>& Ptr) {
-    requires std::invocable <FnT, const std::shared_ptr<TClient>&> ;
-    { std::invoke(Fn, Ptr) } -> std::same_as<void>;
-};
-// clang-format on
-
 class TServer final {
 public:
    using TClientSet = std::unordered_set<std::shared_ptr<TClient>>;
@@ -39,71 +19,23 @@ public:
    TServer(const std::vector<std::string_view>& Arguments);

    void InsertClient(const std::shared_ptr<TClient>& Ptr);
+    std::weak_ptr<TClient> InsertNewClient();
    void RemoveClient(const std::weak_ptr<TClient>&);
-    void RemoveClientById(int Id);
    // in Fn, return true to continue, return false to break
-    [[deprecated("use ForEachClient instead")]] void ForEachClientWeak(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
-    // in Fn, return Break or Continue
-    template <ForEachHandlerWithDecision FnT>
-    void ForEachClient(FnT Fn) {
-        decltype(mClients) Clients;
-        {
-            ReadLock lock(mClientsMutex);
-            Clients = mClients;
-        }
-        for (auto& Client : Clients) {
-            if (Client) [[likely]] {
-                IterationDecision Decision = std::invoke(Fn, Client);
-                if (Decision == IterationDecision::Break) {
-                    break;
-                }
-            } else {
-                beammp_assert_not_reachable();
-            }
-        }
-    }
-    template <ForEachHandler FnT>
-    void ForEachClient(FnT Fn) {
-        decltype(mClients) Clients;
-        {
-            ReadLock lock(mClientsMutex);
-            Clients = mClients;
-        }
-        for (auto& Client : Clients) {
-            if (Client) [[likely]] {
-                std::invoke(Fn, Client);
-            } else {
-                beammp_assert_not_reachable();
-            }
-        }
-    }
+    void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
    size_t ClientCount() const;

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

+    
    const TScopedTimer UptimeTimer;
-
-    // asio io context
-    io_context& IoCtx() { return mIoCtx; }
-
 private:
-    io_context mIoCtx {};
    TClientSet mClients;
    mutable RWMutex mClientsMutex;
    static void ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network);
    static bool ShouldSpawn(TClient& c, const std::string& CarJson, int ID);
    static bool IsUnicycle(TClient& c, const std::string& CarJson);
    static void Apply(TClient& c, int VID, const std::string& pckt);
-    static bool HandlePosition(TClient& c, const std::string& PacketStr);
-    static bool HandleVehicleUpdate(const std::string& PacketStr, const int playerID);
-};
-
-struct BufferView {
-    uint8_t* Data { nullptr };
-    size_t Size { 0 };
-    const uint8_t* data() const { return Data; }
-    uint8_t* data() { return Data; }
-    size_t size() const { return Size; }
 };
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace uuid {
-
-std::string GenerateUuid();
-
-}
@@ -1,10 +1,13 @@
 #pragma once

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

+using json = nlohmann::json;
+
 class TVehicleData final {
 public:
-    TVehicleData(int ID, std::string Data);
+    TVehicleData(int ID, const 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,
@@ -19,9 +22,12 @@ public:

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

+    const json& Json() const;
+
 private:
    int mID { -1 };
    std::string mData;
+    json mJson;
 };

 // TODO: unused now, remove?
@@ -0,0 +1,135 @@
+openapi: "3.0.2"
+info:
+  title: BeamMP-Server
+  version: "api-v1"
+  description: |
+    The BeamMP-Server optionally runs an HTTP server
+    which can be used to query information about the server's 
+    status, health, players, etc.
+servers:
+  - url: http://localhost:{port}/api/v1
+    description: BeamMP-Server API v1
+    variables:
+      port:
+        default: "8000"
+
+paths:
+  /player/{name}/vehicles:
+    parameters:
+      - name: "name"
+        in: path
+        required: true
+        schema:
+          type: string
+          example: "LionKor"
+    get:
+      summary: vehicles this player has spawend
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    jbm:
+                      type: string
+                      example: "bolide"
+  /version:
+    get:
+      summary: server version
+      description: |
+        Server version in 'major.minor.patch' semver format
+      responses:
+        "200":
+          description: OK
+          content:
+            "text/plain":
+              schema:
+                type: string
+                example: "3.1.0"
+  /players:
+    get:
+      summary: list of players on this server
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: array
+                example:
+                  - "LionKor"
+                  - "Titch"
+                items:
+                  type: string
+  /config:
+    get:
+      summary: describes server configuration
+      description: |
+        An overview over the configuration currently
+        used by this server.
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: object
+                properties:
+                  name:
+                    type: string
+                    example: "my awesome beammp server"
+                  description:
+                    type: string
+                    example: "join!"
+                  max_players:
+                    type: integer
+                    example: 7
+                  max_cars:
+                    type: integer
+                    example: 2
+                  map:
+                    type: string
+                    example: "/levels/gridmap_v2/info.json"
+                  private:
+                    type: boolean
+  /ready:
+    get:
+      summary: whether the server has started fully
+      description: |
+        True once all subsystems have started up.
+        This doesn't tell you whether they're healthy, 
+        check /health for that information.
+      responses:
+        "200":
+          description: OK
+          content:
+            "text/plain":
+              schema:
+                type: boolean
+  /health:
+    get:
+      summary: health of the server's systems
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: object
+                properties:
+                  healthy:
+                    type: boolean
+                  good:
+                    type: array
+                    items:
+                      type: string
+                      example: "Heartbeat"
+                  bad:
+                    type: array
+                    items:
+                      type: string
+                      example: "ResourceManager"
@@ -1,3 +0,0 @@
-FROM archlinux
-
-RUN pacman -Syu --noconfirm lua53 openssl curl git cmake gcc make zlib boost websocketpp
@@ -1,9 +0,0 @@
-FROM debian:11
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -y
-
-RUN apt-get install -y git cmake g++-10 curl libboost1.74-all-dev libssl-dev libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev 
-
-ENV CXX=g++-10
@@ -1,9 +0,0 @@
-FROM ubuntu:20.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -y
-
-RUN apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev git make cmake g++
-
-RUN apt-get install -y libboost1.71-all-dev
@@ -1,9 +0,0 @@
-FROM ubuntu:22.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -y
-
-RUN apt-get install -y git libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10 libboost1.74-all-dev libssl3 curl
-
-ENV CXX=g++-10
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-printf "enter DSN (optional): "
-read DSN
-
-docker build -f Ubuntu-20.04-Dockerfile . -t beammp-server-build:Ubuntu-20.04
-docker build -f Ubuntu-22.04-Dockerfile . -t beammp-server-build:Ubuntu-22.04
-docker build -f ArchLinux-Dockerfile . -t beammp-server-build:ArchLinux
-docker build -f Debian-11-Dockerfile . -t beammp-server-build:Debian-11
-
-CMD="cd /beammp; cmake . -DGIT_SUBMODULE=OFF -DCMAKE_BUILD_TYPE=Release -DBEAMMP_SECRET_SENTRY_URL=\"${DSN}\" -B /build && make -j -C /build BeamMP-Server"
-
-docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-ubuntu-20.04:/build -it --rm beammp-server-build:Ubuntu-20.04 bash -c "${CMD}"
-docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-ubuntu-22.04:/build -it --rm beammp-server-build:Ubuntu-22.04 bash -c "${CMD}"
-docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-archlinux:/build -it --rm beammp-server-build:ArchLinux bash -c "${CMD}"
-docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-debian-11:/build -it --rm beammp-server-build:Debian-11 bash -c "${CMD}"
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cmake . -B build -DCMAKE_BUILD_TYPE=Release -DGIT_SUBMODULE=OFF
-
-make -j -C build BeamMP-Server
@@ -1,7 +1,6 @@
 #include "ArgsParser.h"
 #include "Common.h"
 #include <algorithm>
-#include <doctest/doctest.h>

 void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
    for (const auto& Arg : ArgList) {
@@ -13,7 +12,7 @@ void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
                ConsumeLongFlag(std::string(Arg));
            }
        } else {
-            fmt::print(stderr, "Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
+            beammp_errorf("Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
        }
    }
 }
@@ -22,17 +21,17 @@ bool ArgsParser::Verify() {
    bool Ok = true;
    for (const auto& RegisteredArg : mRegisteredArguments) {
        if (RegisteredArg.Flags & Flags::REQUIRED && !FoundArgument(RegisteredArg.Names)) {
-            fmt::print(stderr, "Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
+            beammp_errorf("Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
            Ok = false;
            continue;
        } else if (FoundArgument(RegisteredArg.Names)) {
            if (RegisteredArg.Flags & Flags::HAS_VALUE) {
                if (!GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                    fmt::print(stderr, "Error in commandline arguments: Argument '{}' expects a value, but no value was given.", RegisteredArg.Names.at(0));
+                    beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' expects a value, but no value was given.");
                    Ok = false;
                }
            } else if (GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                fmt::print(stderr, "Error in commandline arguments: Argument '{}' does not expect a value, but one was given.", RegisteredArg.Names.at(0));
+                beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' does not expect a value, but one was given.");
                Ok = false;
            }
        }
@@ -81,7 +80,7 @@ void ArgsParser::ConsumeLongAssignment(const std::string& Arg) {
    auto Value = Arg.substr(Arg.rfind("=") + 1);
    auto Name = Arg.substr(2, Arg.rfind("=") - 2);
    if (!IsRegistered(Name)) {
-        fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
+        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
    }
    mFoundArgs.push_back({ Name, Value });
 }
@@ -90,81 +89,6 @@ void ArgsParser::ConsumeLongFlag(const std::string& Arg) {
    auto Name = Arg.substr(2, Arg.rfind("=") - 2);
    mFoundArgs.push_back({ Name, std::nullopt });
    if (!IsRegistered(Name)) {
-        fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
-    }
-}
-
-TEST_CASE("ArgsParser") {
-    ArgsParser parser;
-
-    SUBCASE("Simple args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::NONE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({ "--a", "--hello" });
-        CHECK(parser.Verify());
-        CHECK(parser.FoundArgument({ "a" }));
-        CHECK(parser.FoundArgument({ "hello" }));
-        CHECK(parser.FoundArgument({ "a", "hello" }));
-        CHECK(!parser.FoundArgument({ "b" }));
-        CHECK(!parser.FoundArgument({ "goodbye" }));
-    }
-
-    SUBCASE("No args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::NONE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({});
-        CHECK(parser.Verify());
-        CHECK(!parser.FoundArgument({ "a" }));
-        CHECK(!parser.FoundArgument({ "hello" }));
-        CHECK(!parser.FoundArgument({ "a", "hello" }));
-        CHECK(!parser.FoundArgument({ "b" }));
-        CHECK(!parser.FoundArgument({ "goodbye" }));
-        CHECK(!parser.FoundArgument({ "" }));
-    }
-
-    SUBCASE("Value args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::HAS_VALUE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::HAS_VALUE);
-        parser.Parse({ "--a=5", "--hello=world" });
-        CHECK(parser.Verify());
-        REQUIRE(parser.FoundArgument({ "a" }));
-        REQUIRE(parser.FoundArgument({ "hello" }));
-        CHECK(parser.GetValueOfArgument({ "a" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "a" }).value() == "5");
-        CHECK(parser.GetValueOfArgument({ "hello" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "hello" }).value() == "world");
-    }
-
-    SUBCASE("Mixed value & no-value args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::HAS_VALUE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({ "--a=5", "--hello" });
-        CHECK(parser.Verify());
-        REQUIRE(parser.FoundArgument({ "a" }));
-        REQUIRE(parser.FoundArgument({ "hello" }));
-        CHECK(parser.GetValueOfArgument({ "a" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "a" }).value() == "5");
-        CHECK(!parser.GetValueOfArgument({ "hello" }).has_value());
-    }
-
-    SUBCASE("Required args") {
-        SUBCASE("Two required, two present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--a", "--hello" });
-            CHECK(parser.Verify());
-        }
-        SUBCASE("Two required, one present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--a" });
-            CHECK(!parser.Verify());
-        }
-        SUBCASE("Two required, none present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--b" });
-            CHECK(!parser.Verify());
-        }
+        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
    }
 }
@@ -1,20 +1,16 @@
 #include "Client.h"

 #include "CustomAssert.h"
-#include "LuaAPI.h"
 #include "TServer.h"
 #include <memory>
 #include <optional>

 void TClient::DeleteCar(int Ident) {
-    // TODO: Send delete packets
    std::unique_lock lock(mVehicleDataMutex);
    auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {
        return Ident == elem.ID();
    });
    if (iter != mVehicleData.end()) {
-        std::string Destroy = "Od:" + std::to_string(GetID()) + "-" + std::to_string(iter->ID());
-        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
        mVehicleData.erase(iter);
    } else {
        beammp_debug("tried to erase a vehicle that doesn't exist (not an error)");
@@ -23,10 +19,6 @@ void TClient::DeleteCar(int Ident) {

 void TClient::ClearCars() {
    std::unique_lock lock(mVehicleDataMutex);
-    for (const auto& Car : mVehicleData) {
-        std::string Destroy = "Od:" + std::to_string(GetID()) + "-" + std::to_string(Car.ID());
-        LuaAPI::MP::Engine->Network().SendToAll(this, StringToVector(Destroy), false, true);
-    }
    mVehicleData.clear();
 }

@@ -55,40 +47,6 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {
    return { &mVehicleData, std::unique_lock(mVehicleDataMutex) };
 }

-std::string TClient::GetCarPositionRaw(int Ident) {
-    std::unique_lock lock(mVehiclePositionMutex);
-    try {
-        return mVehiclePosition.at(Ident);
-    } catch (const std::out_of_range& oor) {
-        return "";
-    }
-    return "";
-}
-
-void TClient::Disconnect(std::string_view Reason) {
-    // we need exclusivity here in case we can't
-    std::unique_lock Lock(mDisconnectMtx);
-    beammp_debugf("Disconnecting client {} for reason: {}", GetID(), Reason);
-    if (mSocket.is_open()) {
-        beammp_debugf("Socket for client {} already closed", GetID());
-    }
-    boost::system::error_code ec;
-    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());
-    }
-    mServer.RemoveClientById(GetID());
-}
-
-void TClient::SetCarPosition(int Ident, const std::string& Data) {
-    std::unique_lock lock(mVehiclePositionMutex);
-    mVehiclePosition[Ident] = Data;
-}
-
 std::string TClient::GetCarData(int Ident) {
    { // lock
        std::unique_lock lock(mVehicleDataMutex);
@@ -123,40 +81,38 @@ TServer& TClient::Server() const {
    return mServer;
 }

-void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
+void TClient::EnqueuePacket(const std::string& Packet) {
    std::unique_lock Lock(mMissedPacketsMutex);
    mPacketsSync.push(Packet);
 }

-TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
+TClient::TClient(TServer& Server)
    : mServer(Server)
-    , mSocket(std::move(Socket))
-    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
-    , mLastPingTime(TimeType::now()) {
-}
-
-TClient::~TClient() {
-    beammp_debugf("client destroyed: {} ('{}')", this->GetID(), this->GetName());
+    , mLastPingTime(std::chrono::high_resolution_clock::now()) {
 }

 void TClient::UpdatePingTime() {
-    mLastPingTime = TimeType::now();
+    mLastPingTime = std::chrono::high_resolution_clock::now();
 }
 int TClient::SecondsSinceLastPing() {
    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(
-        TimeType::now() - mLastPingTime)
+        std::chrono::high_resolution_clock::now() - mLastPingTime)
                       .count();
    return int(seconds);
 }

-std::shared_ptr<TClient> GetClient(TServer& Server, int ID) {
-    std::shared_ptr<TClient> Result {};
-    Server.ForEachClient([&](const auto& Client) {
-        if (Client->GetID() == ID) {
-            Result = Client;
-            return Break;
+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 (!CPtr.expired()) {
+            auto C = CPtr.lock();
+            if (C->GetID() == ID) {
+                MaybeClient = CPtr;
+                return false;
+            }
        }
-        return Continue;
+        return true;
    });
-    return Result;
+    return MaybeClient;
 }
@@ -9,89 +9,10 @@
 #include <sstream>
 #include <thread>

-#include "Compat.h"
 #include "CustomAssert.h"
 #include "Http.h"

-Application::SettingsMap Application::mSettings = {
-    { StrName, std::string("BeamMP Server") },
-    { StrDescription, std::string("No description") },
-    { StrResourceFolder, std::string("Resources") },
-    { StrMap, std::string("/levels/gridmap_v2/info.json") },
-    { StrSSLKeyPath, std::string("./.ssl/HttpServer/key.pem") },
-    { StrSSLCertPath, std::string("./.ssl/HttpServer/cert.pem") },
-    { StrHTTPServerEnabled, false },
-    { StrMaxPlayers, int(8) },
-    { StrPrivate, true },
-    { StrMaxCars, int(1) },
-    { StrDebug, false },
-    { StrPort, int(30814) },
-    { StrCustomIP, std::string("") },
-    { StrLogChat, true },
-    { StrSendErrors, true },
-    { StrSendErrorsMessageEnabled, true },
-    { StrHTTPServerPort, int(8080) },
-    { StrHTTPServerIP, std::string("127.0.0.1") },
-    { StrHTTPServerUseSSL, false },
-    { StrHideUpdateMessages, false },
-    { StrAuthKey, std::string("") },
-    { StrIncludeSubdirectories, false },
-};
-
-// global, yes, this is ugly, no, it cant be done another way
-TSentry Sentry {};
-
-std::string Application::SettingToString(const Application::SettingValue& Value) {
-    switch (Value.index()) {
-    case 0:
-        return fmt::format("{}", std::get<std::string>(Value));
-    case 1:
-        return fmt::format("{}", std::get<bool>(Value));
-    case 2:
-        return fmt::format("{}", std::get<int>(Value));
-    default:
-        return "<unknown type>";
-    }
-}
-
-std::string Application::GetSettingString(std::string_view Name) {
-    try {
-        return std::get<std::string>(Application::mSettings.at(Name));
-    } catch (const std::exception& e) {
-        beammp_errorf("Failed to get string setting '{}': {}", Name, e.what());
-        return "";
-    }
-}
-
-int Application::GetSettingInt(std::string_view Name) {
-    try {
-        return std::get<int>(Application::mSettings.at(Name));
-    } catch (const std::exception& e) {
-        beammp_errorf("Failed to get int setting '{}': {}", Name, e.what());
-        return 0;
-    }
-}
-
-bool Application::GetSettingBool(std::string_view Name) {
-    try {
-        return std::get<bool>(Application::mSettings.at(Name));
-    } catch (const std::exception& e) {
-        beammp_errorf("Failed to get bool setting '{}': {}", Name, e.what());
-        return false;
-    }
-}
-
-void Application::SetSetting(std::string_view Name, const Application::SettingValue& Value) {
-    if (mSettings.contains(Name)) {
-        if (mSettings[Name].index() == Value.index()) {
-            mSettings[Name] = Value;
-        } else {
-            beammp_errorf("Could not change value of setting '{}', because it has a different type.", Name);
-        }
-    } else {
-        mSettings[Name] = Value;
-    }
-}
+Application::TSettings Application::Settings = {};

 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
    std::unique_lock Lock(mShutdownHandlersMutex);
@@ -101,7 +22,6 @@ void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
 }

 void Application::GracefullyShutdown() {
-    SetShutdown(true);
    static bool AlreadyShuttingDown = false;
    static uint8_t ShutdownAttempts = 0;
    if (AlreadyShuttingDown) {
@@ -141,23 +61,6 @@ std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
    return Version;
 }

-TEST_CASE("Application::VersionStrToInts") {
-    auto v = Application::VersionStrToInts("1.2.3");
-    CHECK(v[0] == 1);
-    CHECK(v[1] == 2);
-    CHECK(v[2] == 3);
-
-    v = Application::VersionStrToInts("10.20.30");
-    CHECK(v[0] == 10);
-    CHECK(v[1] == 20);
-    CHECK(v[2] == 30);
-
-    v = Application::VersionStrToInts("100.200.255");
-    CHECK(v[0] == 100);
-    CHECK(v[1] == 200);
-    CHECK(v[2] == 255);
-}
-
 bool Application::IsOutdated(const Version& Current, const Version& Newest) {
    if (Newest.major > Current.major) {
        return true;
@@ -170,65 +73,6 @@ bool Application::IsOutdated(const Version& Current, const Version& Newest) {
    }
 }

-bool Application::IsShuttingDown() {
-    std::shared_lock Lock(mShutdownMtx);
-    return mShutdown;
-}
-
-void Application::SleepSafeSeconds(size_t Seconds) {
-    // Sleeps for 500 ms, checks if a shutdown occurred, and so forth
-    for (size_t i = 0; i < Seconds * 2; ++i) {
-        if (Application::IsShuttingDown()) {
-            return;
-        } else {
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        }
-    }
-}
-
-TEST_CASE("Application::IsOutdated (version check)") {
-    SUBCASE("Same version") {
-        CHECK(!Application::IsOutdated({ 1, 2, 3 }, { 1, 2, 3 }));
-    }
-    // we need to use over 1-2 digits to test against lexical comparisons
-    SUBCASE("Patch outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Minor outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor + 1), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Major outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("All outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor + 1), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-}
-
 void Application::SetSubsystemStatus(const std::string& Subsystem, Status status) {
    switch (status) {
    case Status::Good:
@@ -246,34 +90,18 @@ void Application::SetSubsystemStatus(const std::string& Subsystem, Status status
    case Status::Shutdown:
        beammp_trace("Subsystem '" + Subsystem + "': Shutdown");
        break;
-    default:
-        beammp_assert_not_reachable();
    }
    std::unique_lock Lock(mSystemStatusMapMutex);
    mSystemStatusMap[Subsystem] = status;
 }

-void Application::SetShutdown(bool Val) {
-    std::unique_lock Lock(mShutdownMtx);
-    mShutdown = Val;
-}
-
-TEST_CASE("Application::SetSubsystemStatus") {
-    Application::SetSubsystemStatus("Test", Application::Status::Good);
-    auto Map = Application::GetSubsystemStatuses();
-    CHECK(Map.at("Test") == Application::Status::Good);
-    Application::SetSubsystemStatus("Test", Application::Status::Bad);
-    Map = Application::GetSubsystemStatuses();
-    CHECK(Map.at("Test") == Application::Status::Bad);
-}
-
 void Application::CheckForUpdates() {
    Application::SetSubsystemStatus("UpdateCheck", Application::Status::Starting);
    static bool FirstTime = true;
    // checks current version against latest version
    std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
    for (const auto& url : GetBackendUrlsInOrder()) {
-        auto Response = Http::GET(url, 443, "/v/s");
+        auto Response = Http::GET(GetBackendUrlsInOrder().at(0), 443, "/v/s");
        bool Matches = std::regex_match(Response, VersionRegex);
        if (Matches) {
            auto MyVersion = ServerVersion();
@@ -314,7 +142,7 @@ static std::mutex ThreadNameMapMutex {};

 std::string ThreadName(bool DebugModeOverride) {
    auto Lock = std::unique_lock(ThreadNameMapMutex);
-    if (DebugModeOverride || Application::GetSettingBool(StrDebug)) {
+    if (DebugModeOverride || Application::Settings.DebugModeEnabled) {
        auto id = std::this_thread::get_id();
        if (threadNameMap.find(id) != threadNameMap.end()) {
            // found
@@ -324,25 +152,6 @@ std::string ThreadName(bool DebugModeOverride) {
    return "";
 }

-TEST_CASE("ThreadName") {
-    RegisterThread("MyThread");
-    auto OrigDebug = Application::GetSettingBool(StrDebug);
-
-    // ThreadName adds a space at the end, legacy but we need it still
-    SUBCASE("Debug mode enabled") {
-        Application::SetSetting(StrDebug, true);
-        CHECK(ThreadName(true) == "MyThread ");
-        CHECK(ThreadName(false) == "MyThread ");
-    }
-    SUBCASE("Debug mode disabled") {
-        Application::SetSetting(StrDebug, false);
-        CHECK(ThreadName(true) == "MyThread ");
-        CHECK(ThreadName(false) == "");
-    }
-    // cleanup
-    Application::SetSetting(StrDebug, OrigDebug);
-}
-
 void RegisterThread(const std::string& str) {
    std::string ThreadId;
 #ifdef BEAMMP_WINDOWS
@@ -352,7 +161,7 @@ void RegisterThread(const std::string& str) {
 #elif defined(BEAMMP_LINUX)
    ThreadId = std::to_string(gettid());
 #endif
-    if (Application::GetSettingBool(StrDebug)) {
+    if (Application::Settings.DebugModeEnabled) {
        std::ofstream ThreadFile(".Threads.log", std::ios::app);
        ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
    }
@@ -360,11 +169,6 @@ void RegisterThread(const std::string& str) {
    threadNameMap[std::this_thread::get_id()] = str;
 }

-TEST_CASE("RegisterThread") {
-    RegisterThread("MyThread");
-    CHECK(threadNameMap.at(std::this_thread::get_id()) == "MyThread");
-}
-
 Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
    : major(major)
    , minor(minor)
@@ -378,14 +182,8 @@ std::string Version::AsString() {
    return fmt::format("{:d}.{:d}.{:d}", major, minor, patch);
 }

-TEST_CASE("Version::AsString") {
-    CHECK(Version { 0, 0, 0 }.AsString() == "0.0.0");
-    CHECK(Version { 1, 2, 3 }.AsString() == "1.2.3");
-    CHECK(Version { 255, 255, 255 }.AsString() == "255.255.255");
-}
-
 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    if (Application::GetSettingBool(StrLogChat)) {
+    if (Application::Settings.LogChat) {
        std::stringstream ss;
        ss << ThreadName();
        ss << "[CHAT] ";
@@ -395,9 +193,7 @@ void LogChatMessage(const std::string& name, int id, const std::string& msg) {
            ss << name << "";
        }
        ss << msg;
-#ifdef DOCTEST_CONFIG_DISABLE
        Application::Console().Write(ss.str());
-#endif
    }
 }

@@ -425,21 +221,5 @@ std::string GetPlatformAgnosticErrorString() {
    }
 #elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
    return std::strerror(errno);
-#else
-    return "(no human-readable errors on this platform)";
 #endif
 }
-
-std::string ToHumanReadableSize(size_t Size) {
-    if (Size > TB) {
-        return fmt::format("{:.2f} TiB", double(Size) / TB);
-    } else if (Size > GB) {
-        return fmt::format("{:.2f} GiB", double(Size) / GB);
-    } else if (Size > MB) {
-        return fmt::format("{:.2f} MiB", double(Size) / MB);
-    } else if (Size > KB) {
-        return fmt::format("{:.2f} KiB", double(Size) / KB);
-    } else {
-        return fmt::format("{} B", Size);
-    }
-}
@@ -1,13 +1,10 @@
 #include "Compat.h"

-#include <cstring>
-#include <doctest/doctest.h>
-
 #ifndef WIN32

 static struct termios old, current;

-static void initTermios(int echo) {
+void initTermios(int echo) {
    tcgetattr(0, &old); /* grab old terminal i/o settings */
    current = old; /* make new settings same as old settings */
    current.c_lflag &= ~ICANON; /* disable buffered i/o */
@@ -19,40 +16,14 @@ static void initTermios(int echo) {
    tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
 }

-static void resetTermios(void) {
+void resetTermios(void) {
    tcsetattr(0, TCSANOW, &old);
 }

-TEST_CASE("init and reset termios") {
-    if (isatty(STDIN_FILENO)) {
-        struct termios original;
-        tcgetattr(0, &original);
-        SUBCASE("no echo") {
-            initTermios(false);
-        }
-        SUBCASE("yes echo") {
-            initTermios(true);
-        }
-        resetTermios();
-        struct termios current;
-        tcgetattr(0, &current);
-        CHECK_EQ(std::memcmp(&current.c_cc, &original.c_cc, sizeof(current.c_cc)), 0);
-        CHECK_EQ(current.c_cflag, original.c_cflag);
-        CHECK_EQ(current.c_iflag, original.c_iflag);
-        CHECK_EQ(current.c_ispeed, original.c_ispeed);
-        CHECK_EQ(current.c_lflag, original.c_lflag);
-        CHECK_EQ(current.c_line, original.c_line);
-        CHECK_EQ(current.c_oflag, original.c_oflag);
-        CHECK_EQ(current.c_ospeed, original.c_ospeed);
-    }
-}
-
-static char getch_(int echo) {
+char getch_(int echo) {
    char ch;
    initTermios(echo);
-    if (read(STDIN_FILENO, &ch, 1) < 0) {
-        // ignore, not much we can do
-    }
+    read(STDIN_FILENO, &ch, 1);
    resetTermios();
    return ch;
 }
@@ -4,6 +4,10 @@
 #include "Common.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
+#include "TNetwork.h"
+#include "TResourceManager.h"
+#include "TServer.h"
+#include "httplib.h"

 #include <map>
 #include <nlohmann/json.hpp>
@@ -141,29 +145,115 @@ std::string Http::Status::ToString(int Code) {
    }
 }

-TEST_CASE("Http::Status::ToString") {
-    CHECK(Http::Status::ToString(200) == "OK");
-    CHECK(Http::Status::ToString(696969) == "696969");
-    CHECK(Http::Status::ToString(-1) == "Invalid Response Code");
-}
+#define API_V1 "/api/v1"

-Http::Server::THttpServerInstance::THttpServerInstance() {
+Http::Server::THttpServerInstance::THttpServerInstance(TServer& Server, TNetwork& Network, TResourceManager& ResMan)
+    : mServer(Server)
+    , mNetwork(Network)
+    , mResourceManager(ResMan) {
    Application::SetSubsystemStatus("HTTPServer", Application::Status::Starting);
    mThread = std::thread(&Http::Server::THttpServerInstance::operator(), this);
+}
+
+Http::Server::THttpServerInstance::~THttpServerInstance() {
    mThread.detach();
 }

 void Http::Server::THttpServerInstance::operator()() try {
-    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::GetSettingInt(StrHTTPServerPort)));
-    std::unique_ptr<httplib::Server> HttpLibServerInstance;
-    HttpLibServerInstance = std::make_unique<httplib::Server>();
-    // todo: make this IP agnostic so people can set their own IP
-    HttpLibServerInstance->Get("/", [](const httplib::Request&, httplib::Response& res) {
-        res.set_content("<!DOCTYPE html><article><h1>Hello World!</h1><section><p>BeamMP Server can now serve HTTP requests!</p></section></article></html>", "text/html");
+    beammp_infof("HTTP Server starting on [{}]:{}", Application::Settings.HTTPServerIP, Application::Settings.HTTPServerPort);
+    if (Application::Settings.Private
+        && Application::Settings.HTTPServerIP != "::"
+        && Application::Settings.HTTPServerIP != "localhost"
+        && Application::Settings.HTTPServerIP != "127.0.0.1") {
+        beammp_warnf("HTTP Server is running on a possibly public IP ({}), but the server is private. The server's HTTP API supports viewing config, players, and other information, even though the server is private. (this is not an error)", Application::Settings.HTTPServerIP);
+    }
+    std::unique_ptr<httplib::Server> Server = std::make_unique<httplib::Server>();
+
+    Server->Get(API_V1 R"(/player/(.+)/vehicles)", [this](const httplib::Request& Req, httplib::Response& Res) {
+        if (Req.matches.empty()) {
+            Res.status = 404;
+        } else {
+            const std::string PlayerName = Req.matches[1];
+            bool Found = false;
+            json Result = json::array();
+            mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) {
+                if (!ClientPtr.expired()) {
+                    const auto Client = ClientPtr.lock();
+                    if (Client->GetName() == PlayerName) {
+                        const auto [Cars, Lock] = Client->GetAllCars();
+                        for (const auto& Car : *Cars) {
+                            Result.emplace_back().at("jbm") = Car.Json().at("jbm");
+                        }
+                        Found = true;
+                    }
+                }
+                return true;
+            });
+            if (!Found) {
+                Res.status = 404;
+            } else {
+                Res.status = 200;
+                Res.set_content(Result.dump(), "application/json");
+            }
+        }
    });
-    HttpLibServerInstance->Get("/health", [](const httplib::Request&, httplib::Response& res) {
+
+    Server->Get(API_V1 "/players", [this](const httplib::Request&, httplib::Response& res) {
+        res.status = 200;
+        json Players = json::array();
+        mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) {
+            if (!ClientPtr.expired()) {
+                Players.push_back(ClientPtr.lock()->GetName());
+            }
+            return true;
+        });
+        res.set_content(Players.dump(),
+            "application/json");
+    });
+
+    Server->Get(API_V1 "/version", [](const httplib::Request&, httplib::Response& res) {
+        res.status = 200;
+        res.set_content(Application::ServerVersionString(), "text/plain");
+    });
+
+    Server->Get(API_V1 "/config", [](const httplib::Request&, httplib::Response& res) {
+        res.status = 200;
+        res.set_content(json {
+                            { "name", Application::Settings.ServerName },
+                            { "description", Application::Settings.ServerDesc },
+                            { "max_players", Application::Settings.MaxPlayers },
+                            { "max_cars", Application::Settings.MaxCars },
+                            { "map", Application::Settings.MapName },
+                            { "private", Application::Settings.Private },
+                        }
+                            .dump(),
+            "application/json");
+    });
+
+    Server->Get(API_V1 "/ready", [](const httplib::Request&, httplib::Response& res) {
+        auto Statuses = Application::GetSubsystemStatuses();
+        bool Started = true;
+        for (const auto& NameStatusPair : Statuses) {
+            switch (NameStatusPair.second) {
+            case Application::Status::Starting:
+            case Application::Status::ShuttingDown:
+            case Application::Status::Shutdown:
+                Started = false;
+                break;
+            case Application::Status::Good:
+            case Application::Status::Bad:
+                break;
+            }
+        }
+        res.status = 200;
+        res.set_content(Started ? "true" : "false", "text/plain");
+    });
+
+    Server->Get(API_V1 "/health", [](const httplib::Request&, httplib::Response& res) {
        size_t SystemsGood = 0;
        size_t SystemsBad = 0;
+        json Good = json::array();
+        json Bad = json::array();
        auto Statuses = Application::GetSubsystemStatuses();
        for (const auto& NameStatusPair : Statuses) {
            switch (NameStatusPair.second) {
@@ -171,32 +261,44 @@ void Http::Server::THttpServerInstance::operator()() try {
            case Application::Status::ShuttingDown:
            case Application::Status::Shutdown:
            case Application::Status::Good:
+                Good.push_back(NameStatusPair.first);
                SystemsGood++;
                break;
            case Application::Status::Bad:
+                Bad.push_back(NameStatusPair.first);
                SystemsBad++;
                break;
-            default:
-                beammp_assert_not_reachable();
            }
        }
        res.set_content(
            json {
-                { "ok", SystemsBad == 0 },
+                { "healthy", SystemsBad == 0 },
+                { "good", Good },
+                { "bad", Bad },
            }
                .dump(),
            "application/json");
        res.status = 200;
    });
    // magic endpoint
-    HttpLibServerInstance->Get({ 0x2f, 0x6b, 0x69, 0x74, 0x74, 0x79 }, [](const httplib::Request&, httplib::Response& res) {
+    Server->Get({ 0x2f, 0x6b, 0x69, 0x74, 0x74, 0x79 }, [](const httplib::Request&, httplib::Response& res) {
        res.set_content(std::string(Magic), "text/plain");
    });
-    HttpLibServerInstance->set_logger([](const httplib::Request& Req, const httplib::Response& Res) {
+    Server->set_logger([](const httplib::Request& Req, const httplib::Response& Res) {
        beammp_debug("Http Server: " + Req.method + " " + Req.target + " -> " + std::to_string(Res.status));
    });
+    Server->set_error_handler([](const httplib::Request&, httplib::Response& Res) {
+        if (Res.status >= 400 && Res.body.empty()) {
+            Res.set_content("Error: " + std::to_string(Res.status) + " " + Map.at(Res.status), "text/plain");
+        }
+    });
+    Server->set_exception_handler([](const httplib::Request& Req, httplib::Response& Res, std::exception& e) {
+        Res.status = 500;
+        Res.set_content("Internal Server Error", "text/plain");
+        beammp_errorf("Exception in http server serving '{}': {}", Req.target, e.what());
+    });
    Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
-    auto ret = HttpLibServerInstance->listen(Application::GetSettingString(StrHTTPServerIP).c_str(), Application::GetSettingInt(StrHTTPServerPort));
+    auto ret = Server->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.");
    }
@@ -1,7 +1,6 @@
 #include "LuaAPI.h"
 #include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
 #include "TLuaEngine.h"

 #include <nlohmann/json.hpp>
@@ -75,10 +74,8 @@ std::string LuaAPI::LuaToString(const sol::object Value, size_t Indent, bool Quo
        ss << "[[function: " << Value.as<sol::function>().pointer() << "]]";
        return ss.str();
    }
-    case sol::type::poly:
-        return "<poly>";
    default:
-        return "<unprintable type>";
+        return "((unprintable type))";
    }
 }

@@ -105,158 +102,124 @@ void LuaAPI::Print(sol::variadic_args Args) {
    luaprint(ToPrint);
 }

-TEST_CASE("LuaAPI::MP::GetServerVersion") {
-    const auto [ma, mi, pa] = LuaAPI::MP::GetServerVersion();
-    const auto real = Application::ServerVersion();
-    CHECK(ma == real.major);
-    CHECK(mi == real.minor);
-    CHECK(pa == real.patch);
-}
-
-static inline std::pair<bool, std::string> InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
+static inline bool InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
    std::string Packet = "E:" + EventName + ":" + Data;
-    if (PlayerID == -1) {
-        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
-        return { true, "" };
-    } else {
-        auto Client = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
-        if (!Client) {
-            beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
-            return { false, "Invalid Player ID" };
+    if (PlayerID == -1)
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, Packet, true, true);
+    else {
+        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
+        if (!MaybeClient || MaybeClient.value().expired()) {
+            beammp_lua_error("TriggerClientEvent invalid Player ID");
+            return false;
        }
-        if (!LuaAPI::MP::Engine->Network().Respond(*Client, StringToVector(Packet), true)) {
-            beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
-            LuaAPI::MP::Engine->Network().ClientKick(*Client, "Disconnected after failing to receive packets");
-            return { false, "Respond failed, dropping client" };
+        auto c = MaybeClient.value().lock();
+        if (!LuaAPI::MP::Engine->Network().Respond(*c, Packet, true)) {
+            beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
+            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
+            return false;
        }
-        return { true, "" };
    }
+    return true;
 }

-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
+bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
    std::string Data = DataObj.as<std::string>();
    return InternalTriggerClientEvent(PlayerID, EventName, Data);
 }

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

-std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
-    std::pair<bool, std::string> Result;
+void LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
    std::string Packet = "C:Server: " + Message;
    if (ID == -1) {
        LogChatMessage("<Server> (to everyone) ", -1, Message);
-        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
-        Result.first = true;
+        Engine->Network().SendToAll(nullptr, Packet, true, true);
    } else {
-        auto Client = GetClient(Engine->Server(), ID);
-        if (Client) {
-            if (!Client->IsSynced()) {
-                Result.first = false;
-                Result.second = "Player still syncing data";
-                return Result;
-            }
-            LogChatMessage("<Server> (to \"" + Client->GetName() + "\")", -1, Message);
-            if (!Engine->Network().Respond(*Client, 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;
+        auto MaybeClient = GetClient(Engine->Server(), ID);
+        if (MaybeClient && !MaybeClient.value().expired()) {
+            auto c = MaybeClient.value().lock();
+            if (!c->IsSynced())
+                return;
+            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
+            Engine->Network().Respond(*c, Packet, true);
        } else {
            beammp_lua_error("SendChatMessage 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 Client = GetClient(Engine->Server(), PID);
-    if (!Client) {
+void LuaAPI::MP::RemoveVehicle(int PID, int VID) {
+    auto MaybeClient = GetClient(Engine->Server(), PID);
+    if (!MaybeClient || MaybeClient.value().expired()) {
        beammp_lua_error("RemoveVehicle invalid Player ID");
-        Result.first = false;
-        Result.second = "Invalid Player ID";
-        return Result;
+        return;
    }
-    if (!Client->GetCarData(VID).empty()) {
+    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);
-        Client->DeleteCar(VID);
-        Result.first = true;
-    } else {
-        Result.first = false;
-        Result.second = "Vehicle does not exist";
+        Engine->Network().SendToAll(nullptr, Destroy, true, true);
+        c->DeleteCar(VID);
    }
-    return Result;
 }

 void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
    switch (ConfigID) {
    case 0: // debug
        if (NewValue.is<bool>()) {
-            Application::SetSetting(StrDebug, NewValue.as<bool>());
-            beammp_info(std::string("Set `Debug` to ") + (Application::GetSettingBool(StrDebug) ? "true" : "false"));
-        } else {
+            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::SetSetting(StrPrivate, NewValue.as<bool>());
-            beammp_info(std::string("Set `Private` to ") + (Application::GetSettingBool(StrPrivate) ? "true" : "false"));
-        } else {
+            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::SetSetting(StrMaxCars, NewValue.as<int>());
-            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::GetSettingInt(StrMaxCars)));
-        } else {
+            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::SetSetting(StrMaxPlayers, NewValue.as<int>());
-            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::GetSettingInt(StrMaxPlayers)));
-        } else {
+            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::SetSetting(StrMap, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Map` to ") + Application::GetSettingString(StrMap));
-        } else {
+            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::SetSetting(StrName, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Name` to ") + Application::GetSettingString(StrName));
-        } else {
+            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::SetSetting(StrDescription, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Description` to ") + Application::GetSettingString(StrDescription));
-        } else {
+            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;
    default:
        beammp_warn("Invalid config ID \"" + std::to_string(ConfigID) + "\". Use `MP.Settings.*` enum for this.");
@@ -269,18 +232,18 @@ void LuaAPI::MP::Sleep(size_t Ms) {
 }

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

 bool LuaAPI::MP::IsPlayerGuest(int ID) {
-    auto Client = GetClient(Engine->Server(), ID);
-    if (Client) {
-        return Client->IsGuest();
+    auto MaybeClient = GetClient(Engine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsGuest();
    } else {
        return false;
    }
@@ -292,13 +255,10 @@ void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
        ToPrint += LuaToString(static_cast<const sol::object>(Arg));
        ToPrint += "\t";
    }
-#ifdef DOCTEST_CONFIG_DISABLE
    Application::Console().WriteRaw(ToPrint);
-#endif
 }

 int LuaAPI::PanicHandler(lua_State* State) {
-    // FIXME: unsafe operation, can cause stack overflow
    beammp_lua_error("PANIC: " + sol::stack::get<std::string>(State, 1));
    return 0;
 }
@@ -318,7 +278,7 @@ static std::pair<bool, std::string> FSWrapper(FnT Fn, ArgsT&&... Args) {
 std::pair<bool, std::string> LuaAPI::FS::CreateDirectory(const std::string& Path) {
    std::error_code errc;
    std::pair<bool, std::string> Result;
-    fs::create_directories(Path, errc);
+    fs::create_directories(fs::relative(Path), errc);
    Result.first = errc == std::error_code {};
    if (!Result.first) {
        Result.second = errc.message();
@@ -326,33 +286,6 @@ std::pair<bool, std::string> LuaAPI::FS::CreateDirectory(const std::string& Path
    return Result;
 }

-TEST_CASE("LuaAPI::FS::CreateDirectory") {
-    std::string TestDir = "beammp_test_dir";
-    fs::remove_all(TestDir);
-    SUBCASE("Single level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-    }
-    SUBCASE("Multi level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir + "/a/b/c");
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir + "/a/b/c"));
-    }
-    SUBCASE("Already exists") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-        const auto [Ok2, Err2] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok2);
-        CHECK(Err2 == "");
-    }
-    fs::remove_all(TestDir);
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
    std::error_code errc;
    std::pair<bool, std::string> Result;
@@ -364,30 +297,10 @@ std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
    return Result;
 }

-TEST_CASE("LuaAPI::FS::Remove") {
-    const std::string TestFileOrDir = "beammp_test_thing";
-    SUBCASE("Remove existing directory") {
-        fs::create_directory(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    SUBCASE("Remove non-existing directory") {
-        fs::remove_all(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    // TODO: add tests for files
-    // TODO: add tests for files and folders without access permissions (failure)
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Rename(const std::string& Path, const std::string& NewPath) {
    std::error_code errc;
    std::pair<bool, std::string> Result;
-    fs::rename(Path, NewPath, errc);
+    fs::rename(fs::relative(Path), fs::relative(NewPath), errc);
    Result.first = errc == std::error_code {};
    if (!Result.first) {
        Result.second = errc.message();
@@ -395,25 +308,10 @@ std::pair<bool, std::string> LuaAPI::FS::Rename(const std::string& Path, const s
    return Result;
 }

-TEST_CASE("LuaAPI::FS::Rename") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Rename(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(!fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Copy(const std::string& Path, const std::string& NewPath) {
    std::error_code errc;
    std::pair<bool, std::string> Result;
-    fs::copy(Path, NewPath, fs::copy_options::recursive, errc);
+    fs::copy(fs::relative(Path), fs::relative(NewPath), fs::copy_options::recursive, errc);
    Result.first = errc == std::error_code {};
    if (!Result.first) {
        Result.second = errc.message();
@@ -421,86 +319,30 @@ std::pair<bool, std::string> LuaAPI::FS::Copy(const std::string& Path, const std
    return Result;
 }

-TEST_CASE("LuaAPI::FS::Copy") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Copy(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
 bool LuaAPI::FS::Exists(const std::string& Path) {
-    return fs::exists(Path);
-}
-
-TEST_CASE("LuaAPI::FS::Exists") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-
-    CHECK(LuaAPI::FS::Exists(TestDir));
-    CHECK(!LuaAPI::FS::Exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
+    return fs::exists(fs::relative(Path));
 }

 std::string LuaAPI::FS::GetFilename(const std::string& Path) {
    return fs::path(Path).filename().string();
 }

-TEST_CASE("LuaAPI::FS::GetFilename") {
-    CHECK(LuaAPI::FS::GetFilename("test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("/test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("place/test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("/some/../place/test.txt") == "test.txt");
-}
-
 std::string LuaAPI::FS::GetExtension(const std::string& Path) {
    return fs::path(Path).extension().string();
 }

-TEST_CASE("LuaAPI::FS::GetExtension") {
-    CHECK(LuaAPI::FS::GetExtension("test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("place/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test") == "");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.a.b.c") == ".c");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.") == ".");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.a.b.") == ".");
-}
-
 std::string LuaAPI::FS::GetParentFolder(const std::string& Path) {
    return fs::path(Path).parent_path().string();
 }

-TEST_CASE("LuaAPI::FS::GetParentFolder") {
-    CHECK(LuaAPI::FS::GetParentFolder("test.txt") == "");
-    CHECK(LuaAPI::FS::GetParentFolder("/test.txt") == "/");
-    CHECK(LuaAPI::FS::GetParentFolder("place/test.txt") == "place");
-    CHECK(LuaAPI::FS::GetParentFolder("/some/../place/test.txt") == "/some/../place");
-}
-
-// TODO: add tests
 bool LuaAPI::FS::IsDirectory(const std::string& Path) {
    return fs::is_directory(Path);
 }

-// TODO: add tests
 bool LuaAPI::FS::IsFile(const std::string& Path) {
    return fs::is_regular_file(Path);
 }

-// TODO: add tests
 std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
    fs::path Path;
    for (size_t i = 0; i < Args.size(); ++i) {
@@ -523,7 +365,7 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        beammp_lua_error("json serialize will not go deeper than 100 nested tables, internal references assumed, aborted this path");
        return;
    }
-    std::string key {};
+    std::string key;
    switch (left.get_type()) {
    case sol::type::lua_nil:
    case sol::type::none:
@@ -542,8 +384,6 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
    case sol::type::number:
        key = std::to_string(left.as<double>());
        break;
-    default:
-        beammp_assert_not_reachable();
    }
    nlohmann::json value;
    switch (right.get_type()) {
@@ -569,11 +409,7 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        value = right.as<std::string>();
        break;
    case sol::type::number:
-        if (right.is<int>()) {
-            value = right.as<int>();
-        } else {
-            value = right.as<float>();
-        }
+        value = right.as<double>();
        break;
    case sol::type::function:
        beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring");
@@ -583,7 +419,6 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        for (const auto& pair : right.as<sol::table>()) {
            if (pair.first.get_type() != sol::type::number) {
                local_is_array = false;
-                break;
            }
        }
        for (const auto& pair : right.as<sol::table>()) {
@@ -591,8 +426,6 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        }
        break;
    }
-    default:
-        beammp_assert_not_reachable();
    }
    if (is_array) {
        json.push_back(value);
@@ -608,11 +441,10 @@ std::string LuaAPI::MP::JsonEncode(const sol::table& object) {
    for (const auto& pair : object.as<sol::table>()) {
        if (pair.first.get_type() != sol::type::number) {
            is_array = false;
-            break;
        }
    }
-    for (const auto& [key, value] : object) {
-        JsonEncodeRecursive(json, key, value, is_array);
+    for (const auto& entry : object) {
+        JsonEncodeRecursive(json, entry.first, entry.second, is_array);
    }
    return json.dump();
 }
@@ -678,6 +510,6 @@ std::string LuaAPI::MP::JsonUnflatten(const std::string& json) {
    return nlohmann::json::parse(json).unflatten().dump(-1);
 }

-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data) {
+bool LuaAPI::MP::TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data) {
    return InternalTriggerClientEvent(PlayerID, EventName, JsonEncode(Data));
 }
@@ -1,8 +1,6 @@
 #include "SignalHandling.h"
 #include "Common.h"

-#include "Compat.h"
-
 #if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
 #include <csignal>
 static void UnixSignalHandler(int sig) {
@@ -6,40 +6,36 @@
 #include <istream>
 #include <sstream>

-TEST_CASE("TConfig::TConfig") {
-    const std::string CfgFile = "beammp_server_testconfig.toml";
-    fs::remove(CfgFile);
+// General
+static constexpr std::string_view StrDebug = "Debug";
+static constexpr std::string_view StrPrivate = "Private";
+static constexpr std::string_view StrPort = "Port";
+static constexpr std::string_view StrMaxCars = "MaxCars";
+static constexpr std::string_view StrMaxPlayers = "MaxPlayers";
+static constexpr std::string_view StrMap = "Map";
+static constexpr std::string_view StrName = "Name";
+static constexpr std::string_view StrDescription = "Description";
+static constexpr std::string_view StrResourceFolder = "ResourceFolder";
+static constexpr std::string_view StrAuthKey = "AuthKey";
+static constexpr std::string_view StrLogChat = "LogChat";

-    TConfig Cfg(CfgFile);
+// Misc
+static constexpr std::string_view StrSendErrors = "SendErrors";
+static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
+static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";

-    CHECK(fs::file_size(CfgFile) != 0);
-
-    std::string buf;
-    {
-        buf.resize(fs::file_size(CfgFile));
-        auto fp = std::fopen(CfgFile.c_str(), "r");
-        auto res = std::fread(buf.data(), 1, buf.size(), fp);
-        if (res != buf.size()) {
-            // IGNORE?
-        }
-        std::fclose(fp);
-    }
-    INFO("file contents are:", buf);
-
-    const auto table = toml::parse(CfgFile);
-    CHECK(table.at("General").is_table());
-    CHECK(table.at("Misc").is_table());
-    CHECK(table.at("HTTP").is_table());
-
-    fs::remove(CfgFile);
-}
+// HTTP
+static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
+static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
+static constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
+static constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";

 TConfig::TConfig(const std::string& ConfigFileName)
    : mConfigFileName(ConfigFileName) {
    Application::SetSubsystemStatus("Config", Application::Status::Starting);
    if (!fs::exists(mConfigFileName) || !fs::is_regular_file(mConfigFileName)) {
        beammp_info("No config file found! Generating one...");
-        CreateConfigFile();
+        CreateConfigFile(mConfigFileName);
    }
    if (!mFailed) {
        if (fs::exists("Server.cfg")) {
@@ -65,59 +61,38 @@ void SetComment(CommentsT& Comments, const std::string& Comment) {
 * whether it is in TConfig.cpp or the configuration file.
 */
 void TConfig::FlushToFile() {
-    // auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
-    auto data = toml::value {};
-    data["General"][StrAuthKey.data()] = Application::GetSettingString(StrAuthKey.data());
+    auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
+    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::GetSettingBool(StrLogChat.data());
+    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::GetSettingBool(StrDebug.data());
-    data["General"][StrPrivate.data()] = Application::GetSettingBool(StrPrivate.data());
-    data["General"][StrPort.data()] = Application::GetSettingInt(StrPort.data());
-    data["General"][StrName.data()] = Application::GetSettingString(StrName.data());
-    data["General"][StrMaxCars.data()] = Application::GetSettingInt(StrMaxCars.data());
-    data["General"][StrMaxPlayers.data()] = Application::GetSettingInt(StrMaxPlayers.data());
-    data["General"][StrMap.data()] = Application::GetSettingString(StrMap.data());
-    data["General"][StrDescription.data()] = Application::GetSettingString(StrDescription.data());
-    data["General"][StrResourceFolder.data()] = Application::GetSettingString(StrResourceFolder.data());
+    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;
+    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;
    // Misc
-    data["Misc"][StrHideUpdateMessages.data()] = Application::GetSettingBool(StrHideUpdateMessages.data());
+    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
    SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
-    data["Misc"][StrSendErrors.data()] = Application::GetSettingBool(StrSendErrors.data());
+    data["Misc"][StrSendErrors.data()] = Application::Settings.SendErrors;
    SetComment(data["Misc"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
-    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::GetSettingBool(StrSendErrorsMessageEnabled.data());
+    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
    SetComment(data["Misc"][StrSendErrorsMessageEnabled.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"][StrIncludeSubdirectories.data()] = Application::GetSettingBool(StrIncludeSubdirectories.data());
-    SetComment(data["Misc"][StrIncludeSubdirectories.data()].comments(), " Whether or not to include subdirectories in General.ResourceFolder/Client when searching for `.zip`s");
    // HTTP
-    data["HTTP"][StrSSLKeyPath.data()] = Application::GetSettingString(StrSSLKeyPath.data());
-    data["HTTP"][StrSSLCertPath.data()] = Application::GetSettingString(StrSSLCertPath.data());
-    data["HTTP"][StrHTTPServerPort.data()] = Application::GetSettingInt(StrHTTPServerPort.data());
+    data["HTTP"][StrHTTPServerPort.data()] = Application::Settings.HTTPServerPort;
    SetComment(data["HTTP"][StrHTTPServerIP.data()].comments(), " Which IP to listen on. Pick 0.0.0.0 for a public-facing server with no specific IP, and 127.0.0.1 or 'localhost' for a local server.");
-    data["HTTP"][StrHTTPServerIP.data()] = Application::GetSettingString(StrHTTPServerIP.data());
-    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::GetSettingBool(StrHTTPServerUseSSL.data());
-    SetComment(data["HTTP"][StrHTTPServerUseSSL.data()].comments(), " Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files");
-    data["HTTP"][StrHTTPServerEnabled.data()] = Application::GetSettingBool(StrHTTPServerEnabled.data());
+    data["HTTP"][StrHTTPServerIP.data()] = Application::Settings.HTTPServerIP;
+    data["HTTP"][StrHTTPServerEnabled.data()] = Application::Settings.HTTPServerEnabled;
    SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
-    std::stringstream Ss;
-    Ss << "# This is the BeamMP-Server config file.\n"
-          "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
-       << data;
-    auto File = std::fopen(mConfigFileName.c_str(), "w+");
-    if (!File) {
-        beammp_error("Failed to create/write to config file: " + GetPlatformAgnosticErrorString());
-        throw std::runtime_error("Failed to create/write to config file");
-    }
-    auto Str = Ss.str();
-    auto N = std::fwrite(Str.data(), sizeof(char), Str.size(), File);
-    if (N != Str.size()) {
-        beammp_error("Failed to write to config file properly, config file might be misshapen");
-    }
-    std::fclose(File);
+    std::ofstream Stream(mConfigFileName, std::ios::trunc | std::ios::out);
+    Stream << data << std::flush;
 }

-void TConfig::CreateConfigFile() {
+void TConfig::CreateConfigFile(std::string_view name) {
    // build from old config Server.cfg

    try {
@@ -129,45 +104,75 @@ void TConfig::CreateConfigFile() {
        beammp_error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
    }

-    FlushToFile();
-}
+    { // create file context
+        std::ofstream ofs(name.data());
+    }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key) {
-    if (Table[Category.c_str()][Key.data()].is_string()) {
-        Application::SetSetting(Key, std::string(Table[Category.c_str()][Key.data()].as_string()));
-    } else if (Table[Category.c_str()][Key.data()].is_boolean()) {
-        Application::SetSetting(Key, bool(Table[Category.c_str()][Key.data()].as_boolean()));
-    } else if (Table[Category.c_str()][Key.data()].is_integer()) {
-        Application::SetSetting(Key, int(Table[Category.c_str()][Key.data()].as_integer()));
+    FlushToFile();
+
+    size_t FileSize = fs::file_size(name);
+    std::fstream ofs { std::string(name), std::ios::in | std::ios::out };
+    if (ofs.good()) {
+        std::string Contents {};
+        Contents.resize(FileSize);
+        ofs.readsome(Contents.data(), FileSize);
+        ofs.seekp(0);
+        ofs << "# This is the BeamMP-Server config file.\n"
+               "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
+               "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
+            << '\n'
+            << Contents;
+        beammp_error("There was no \"" + std::string(mConfigFileName) + "\" file (this is normal for the first time running the server), so one was generated for you. It was automatically filled with the settings from your Server.cfg, if you have one. Please open ServerConfig.toml and ensure your AuthKey and other settings are filled in and correct, then restart the server. The old Server.cfg file will no longer be used and causes a warning if it exists from now on.");
+        mFailed = true;
+        ofs.close();
+    } else {
+        beammp_error("Couldn't create " + std::string(name) + ". Check permissions, try again, and contact support if it continues not to work.");
+        Application::SetSubsystemStatus("Config", Application::Status::Bad);
+        mFailed = true;
    }
 }
+
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue) {
+    if (Table[Category.c_str()][Key.data()].is_string()) {
+        OutValue = Table[Category.c_str()][Key.data()].as_string();
+    }
+}
+
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue) {
+    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, int& OutValue) {
+    if (Table[Category.c_str()][Key.data()].is_integer()) {
+        OutValue = Table[Category.c_str()][Key.data()].as_integer();
+    }
+}
+
 void TConfig::ParseFromFile(std::string_view name) {
    try {
        toml::value data = toml::parse<toml::preserve_comments>(name.data());
        // GENERAL
-        TryReadValue(data, "General", StrDebug);
-        TryReadValue(data, "General", StrPrivate);
-        TryReadValue(data, "General", StrPort);
-        TryReadValue(data, "General", StrMaxCars);
-        TryReadValue(data, "General", StrMaxPlayers);
-        TryReadValue(data, "General", StrMap);
-        TryReadValue(data, "General", StrName);
-        TryReadValue(data, "General", StrDescription);
-        TryReadValue(data, "General", StrResourceFolder);
-        TryReadValue(data, "General", StrAuthKey);
-        TryReadValue(data, "General", StrLogChat);
+        TryReadValue(data, "General", StrDebug, Application::Settings.DebugModeEnabled);
+        TryReadValue(data, "General", StrPrivate, Application::Settings.Private);
+        TryReadValue(data, "General", StrPort, Application::Settings.Port);
+        TryReadValue(data, "General", StrMaxCars, Application::Settings.MaxCars);
+        TryReadValue(data, "General", StrMaxPlayers, Application::Settings.MaxPlayers);
+        TryReadValue(data, "General", StrMap, Application::Settings.MapName);
+        TryReadValue(data, "General", StrName, Application::Settings.ServerName);
+        TryReadValue(data, "General", StrDescription, Application::Settings.ServerDesc);
+        TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
+        TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
+        TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
        // Misc
-        TryReadValue(data, "Misc", StrSendErrors);
-        TryReadValue(data, "Misc", StrHideUpdateMessages);
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled);
-        TryReadValue(data, "Misc", StrIncludeSubdirectories);
+        TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, Application::Settings.SendErrorsMessageEnabled);
        // HTTP
-        TryReadValue(data, "HTTP", StrSSLKeyPath);
-        TryReadValue(data, "HTTP", StrSSLCertPath);
-        TryReadValue(data, "HTTP", StrHTTPServerPort);
-        TryReadValue(data, "HTTP", StrHTTPServerIP);
-        TryReadValue(data, "HTTP", StrHTTPServerEnabled);
-        TryReadValue(data, "HTTP", StrHTTPServerUseSSL);
+        TryReadValue(data, "HTTP", StrHTTPServerPort, Application::Settings.HTTPServerPort);
+        TryReadValue(data, "HTTP", StrHTTPServerIP, Application::Settings.HTTPServerIP);
+        TryReadValue(data, "HTTP", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
    } catch (const std::exception& err) {
        beammp_error("Error parsing config file value: " + std::string(err.what()));
        mFailed = true;
@@ -179,28 +184,84 @@ void TConfig::ParseFromFile(std::string_view name) {
    // Update in any case
    FlushToFile();
    // all good so far, let's check if there's a key
-    if (Application::GetSettingString(StrAuthKey).empty()) {
-        beammp_error("No AuthKey specified in the \"" + std::string(mConfigFileName) + "\" file. Please get an AuthKey, enter it into the config file, and restart this server. Alternatively, if you only want a private server (one that doesn't show up in the server list), you may put anything as your AuthKey, like \"hello\".");
+    if (Application::Settings.Key.empty()) {
+        beammp_error("No AuthKey specified in the \"" + std::string(mConfigFileName) + "\" file. Please get an AuthKey, enter it into the config file, and restart this server.");
        Application::SetSubsystemStatus("Config", Application::Status::Bad);
        mFailed = true;
        return;
    }
    Application::SetSubsystemStatus("Config", Application::Status::Good);
-    if (Application::GetSettingString(StrAuthKey).size() != 36) {
+    if (Application::Settings.Key.size() != 36) {
        beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
    }
 }

 void TConfig::PrintDebug() {
-    for (const auto& [k, v] : Application::mSettings) {
-        if (k == StrAuthKey) {
-            beammp_debugf("AuthKey: length {}", std::get<std::string>(v).size());
-            continue;
-        }
-        beammp_debugf("{}: {}", k, Application::SettingToString(v));
-    }
+    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
+    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
+    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
+    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
+    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
+    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
+    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
+    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
+    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
+    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
+    beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
+    beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
+    // special!
+    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
 }

 void TConfig::ParseOldFormat() {
-    beammp_warnf("You still have a 'Server.cfg' - this will not be used (this server uses 'ServerConfig.toml'. Since v3.0.2 we no longer parse and import these old settings. Remove the file to avoid confusion and disable this message.");
+    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;
+    }
 }
@@ -7,45 +7,13 @@
 #include "LuaAPI.h"
 #include "TLuaEngine.h"

-#include <boost/asio/ip/address.hpp>
-#include <boost/spirit/home/qi/directive/lexeme.hpp>
-#include <boost/spirit/home/qi/parse.hpp>
-#include <chrono>
 #include <ctime>
-#include <fmt/chrono.h>
 #include <sstream>

-#include <boost/phoenix.hpp>
-#include <boost/spirit/include/qi.hpp>
-
-#include <boost/algorithm/string.hpp>
-
 static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
    return What.size() >= StartsWith.size() && What.substr(0, StartsWith.size()) == StartsWith;
 }

-static inline bool StringStartsWithLower(const std::string& Name1, const std::string& Name2) {
-    std::string Name1Lower = boost::algorithm::to_lower_copy(Name1);
-    return StringStartsWith(Name1Lower, Name2) || StringStartsWith(Name2, Name1Lower);
-};
-
-static inline bool StringStartsWithLowerBoth(const std::string& Name1, const std::string& Name2) {
-    std::string Name1Lower = boost::algorithm::to_lower_copy(Name1);
-    std::string Name2Lower = boost::algorithm::to_lower_copy(Name2);
-    return StringStartsWith(Name1Lower, Name2Lower) || StringStartsWith(Name2Lower, Name1Lower);
-};
-
-TEST_CASE("StringStartsWith") {
-    CHECK(StringStartsWith("Hello, World", "Hello"));
-    CHECK(StringStartsWith("Hello, World", "H"));
-    CHECK(StringStartsWith("Hello, World", ""));
-    CHECK(!StringStartsWith("Hello, World", "ello"));
-    CHECK(!StringStartsWith("Hello, World", "World"));
-    CHECK(StringStartsWith("", ""));
-    CHECK(!StringStartsWith("", "hello"));
-}
-
-// Trims leading and trailing spaces, newlines, tabs, etc.
 static inline std::string TrimString(std::string S) {
    S.erase(S.begin(), std::find_if(S.begin(), S.end(), [](unsigned char ch) {
        return !std::isspace(ch);
@@ -57,40 +25,14 @@ static inline std::string TrimString(std::string S) {
    return S;
 }

-TEST_CASE("TrimString") {
-    CHECK(TrimString("hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo ") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("     hel lo") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("    hel lo     ") == "hel lo");
-    CHECK(TrimString("\t\thel\nlo\n\n") == "hel\nlo");
-    CHECK(TrimString("\n\thel\tlo\n\t") == "hel\tlo");
-    CHECK(TrimString("  ") == "");
-    CHECK(TrimString(" \t\n\r ") == "");
-    CHECK(TrimString("") == "");
-}
-
-// TODO: add unit tests to SplitString
-static inline void SplitString(std::string const& str, const char delim, std::vector<std::string>& out) {
-    size_t start;
-    size_t end = 0;
-
-    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
-        end = str.find(delim, start);
-        out.push_back(str.substr(start, end - start));
-    }
-}
-
-static std::string GetDate() {
-    TimeType::time_point now = TimeType::now();
-    time_t tt = TimeType::to_time_t(now);
+std::string GetDate() {
+    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+    time_t tt = std::chrono::system_clock::to_time_t(now);
    auto local_tm = std::localtime(&tt);
    char buf[30];
    std::string date;
-    if (Application::GetSettingBool(StrDebug)) {
-        std::strftime(buf, sizeof(buf), "[%Y/%m/%d %T.", local_tm);
+    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);
        auto fraction = now - seconds;
@@ -100,7 +42,7 @@ static std::string GetDate() {
        date += fracstr;
        date += "] ";
    } else {
-        std::strftime(buf, sizeof(buf), "[%Y/%m/%d %T] ", local_tm);
+        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T] ", local_tm);
        date += buf;
    }

@@ -176,10 +118,10 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
        mStateId = LuaStateId;
        mIsLuaConsole = true;
        if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:exit`");
+            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:detach`");
            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
        } else {
-            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:exit`");
+            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:detach`");
            mCommandline.set_prompt("lua> ");
        }
        mCachedRegularHistory = mCommandline.history();
@@ -219,10 +161,10 @@ bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t min,
        return EnsureArgsCount(args, min);
    } else {
        if (args.size() > max) {
-            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
+            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " arguments expected, got " + std::to_string(args.size()) + " instead.");
            return false;
        } else if (args.size() < min) {
-            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(min) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
+            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(max) + " arguments expected, got " + std::to_string(args.size()) + " instead.");
            return false;
        }
    }
@@ -253,17 +195,13 @@ void TConsole::Command_Help(const std::string&, const std::vector<std::string>&
    static constexpr const char* sHelpString = R"(
    Commands:
        help                    displays this help
-        exit
-        quit                    shuts down the server
+        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
-        debug                   internal error and debug state of the server (for development)
-        clear                   clears the console window
-        version                 version info)";
+        status                  how the server is doing and what it's up to)";
    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
 }

@@ -276,121 +214,32 @@ std::string TConsole::ConcatArgs(const std::vector<std::string>& args, char spac
    return Result;
 }

-void TConsole::Command_Clear(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0, size_t(-1))) {
-        return;
-    }
-    mCommandline.write("\x1b[;H\x1b[2J");
-}
-
-void TConsole::Command_Debug(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
-    Application::Console().WriteRaw(fmt::format(R"(Debug info (for developers):
-    UDP:
-        Malformed packets:  {}
-        Invalid packets:    {})",
-        Application::MalformedUdpPackets,
-        Application::InvalidUdpPackets));
-    Application::Console().WriteRaw(fmt::format(R"(    Clients:
-        Note: All data/second rates are an average across the total time since
-              connection and do not necessarily reflect the *current* data rate
-              of that client.
-)"));
-    mLuaEngine->Server().ForEachClient([&](const auto& Client) {
-        std::string State = "";
-        if (Client->IsSyncing()) {
-            State += "Syncing";
-        }
-        if (Client->IsSynced()) {
-            if (!State.empty()) {
-                State += " & ";
-            }
-            State += "Synced";
-        }
-        if (Client->IsConnected()) {
-            if (!State.empty()) {
-                State += " & ";
-            }
-            State += "Connected";
-        }
-        if (Client->IsDisconnected()) {
-            if (!State.empty()) {
-                State += " & ";
-            }
-            State += "Disconnected";
-        }
-        auto Now = TimeType::now();
-        auto Seconds = std::chrono::duration_cast<std::chrono::seconds>(Now - Client->ConnectionTime);
-        std::string ConnectedSince = fmt::format("{:%Y/%m/%d %H:%M:%S}, {:%H:%M:%S} ago ({} seconds)",
-            fmt::localtime(TimeType::to_time_t(Client->ConnectionTime)),
-            Seconds,
-            Seconds.count());
-        Application::Console().WriteRaw(fmt::format(
-            R"(        {} ('{}'):
-            Roles:              {}
-            Cars:               {}
-            Is guest:           {}
-            Has unicycle:       {}
-            TCP:                {} (on port {})
-            UDP:                {} (on port {})
-            Sent via TCP:       {}
-            Received via TCP:   {}
-            Sent via UDP:       {} ({} packets)
-            Received via UDP:   {} ({} packets)
-            Status:             {}
-            Queued packets:     {}
-            Latest packet:      {}s ago
-            Connected since:    {}
-            Average send:       {}/s
-            Average receive:    {}/s)",
-            Client->GetID(), Client->GetName(),
-            Client->GetRoles(),
-            Client->GetCarCount(),
-            Client->IsGuest() ? "yes" : "no",
-            Client->GetUnicycleID() == -1 ? "no" : "yes",
-            Client->GetTCPSock().remote_endpoint().address() == ip::address::from_string("0.0.0.0") ? "not connected" : "connected", Client->GetTCPSock().remote_endpoint().port(),
-            Client->GetUDPAddr().address() == ip::address::from_string("0.0.0.0") ? "NOT connected" : "connected", Client->GetUDPAddr().port(),
-            ToHumanReadableSize(Client->TcpSent),
-            ToHumanReadableSize(Client->TcpReceived),
-            ToHumanReadableSize(Client->UdpSent), Client->UdpPacketsSent,
-            ToHumanReadableSize(Client->UdpReceived), Client->UdpPacketsReceived,
-            State.empty() ? "None (likely pre-sync)" : State,
-            Client->MissedPacketQueueSize(),
-            Client->SecondsSinceLastPing(),
-            ConnectedSince,
-            ToHumanReadableSize((Client->TcpSent + Client->UdpSent) / Seconds.count()),
-            ToHumanReadableSize((Client->TcpReceived + Client->UdpReceived) / Seconds.count())));
-    });
-}
-
-void TConsole::Command_Version(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
-    Application::Console().WriteRaw(fmt::format("BeamMP Server v{} ({})", Application::ServerVersionString(), BEAMMP_GIT_HASH));
-}
-
 void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
    if (!EnsureArgsCount(args, 1, size_t(-1))) {
        return;
    }
-    auto Name = boost::algorithm::to_lower_copy(args.at(0));
+    auto Name = args.at(0);
    std::string Reason = "Kicked by server console";
    if (args.size() > 1) {
        Reason = ConcatArgs({ args.begin() + 1, args.end() });
    }
    beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
    bool Kicked = false;
-
-    mLuaEngine->Server().ForEachClient([&](const auto& Client) -> IterationDecision {
-        if (StringStartsWithLower(Client->GetName(), Name)) {
-            mLuaEngine->Network().ClientKick(*Client, Reason);
-            Kicked = true;
-            return Break;
+    auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
+        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
+        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
+        return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
+    };
+    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (NameCompare(locked->GetName(), Name)) {
+                mLuaEngine->Network().ClientKick(*locked, Reason);
+                Kicked = true;
+                return false;
+            }
        }
-        return Continue;
+        return true;
    });
    if (!Kicked) {
        Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
@@ -437,9 +286,7 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
            }
            ++Ptr;
        }
-        // this is required, otherwise we get negative int to unsigned cast in the next operations
-        beammp_assert(PrevPtr <= Ptr);
-        Arg = std::string(PrevPtr, std::string::size_type(Ptr - PrevPtr));
+        Arg = std::string(PrevPtr, Ptr - PrevPtr);
        // remove quotes if enclosed in quotes
        for (char Quote : { '"', '\'', '`' }) {
            if (!Arg.empty() && Arg.at(0) == Quote && Arg.at(Arg.size() - 1) == Quote) {
@@ -455,80 +302,16 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
 }

 void TConsole::Command_Settings(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 1, 100)) {
+    if (!EnsureArgsCount(args, 0)) {
        return;
    }
-
-    static const char* SETTINGS_HELP = R"(Settings:
-    settings help                   Displays this help
-    settings list                   Lists all settings
-    settings get <setting>          Prints the current value of the specified setting
-    settings set <setting> <value>  Sets the specified setting to the value)";
-    if (args.at(0) == "help") {
-        Application::Console().WriteRaw(SETTINGS_HELP);
-    } else if (args.at(0) == "list") {
-        Application::Console().WriteRaw("Available settings:");
-        Application::Console().WriteRaw(fmt::format("\t{:<25} {}", "<NAME>", "<CURRENT VALUE>"));
-        for (const auto& [k, v] : Application::mSettings) {
-            if (k == StrAuthKey) {
-                Application::Console().WriteRaw(fmt::format("\t{:<25} <key of length {}>", k, Application::SettingToString(v).size()));
-            } else {
-                Application::Console().WriteRaw(fmt::format("\t{:<25} {}", k, Application::SettingToString(v)));
-            }
-        }
-    } else if (args.at(0) == "get") {
-        if (args.size() < 2) {
-            Application::Console().WriteRaw("Not enough arguments: `settings get` requires a setting name.");
-        } else {
-            if (Application::mSettings.contains(args.at(1))) {
-                if (args.at(1) != StrAuthKey) {
-                    Application::Console().WriteRaw(fmt::format("{} = {}", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1)))));
-                } else {
-                    Application::Console().WriteRaw(fmt::format("{} = <key of length {}>", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1))).size()));
-                }
-            } else {
-                Application::Console().WriteRaw(fmt::format("Setting '{}' doesn't exist.", args.at(1)));
-            }
-        }
-    } else if (args.at(0) == "set") {
-        if (args.size() < 3) {
-            Application::Console().WriteRaw("Not enough arguments: `settings set` requires a setting name and value.");
-        } else {
-            if (args.at(1) == StrAuthKey) {
-                Application::Console().WriteRaw("It's not allowed to set the AuthKey during runtime.");
-            } else {
-                using namespace boost::spirit;
-                using qi::_1;
-                std::string ValueString = args.at(2);
-                Application::SettingValue Value;
-                qi::rule<std::string::iterator, std::string()> StringRule;
-                StringRule
-                    %= qi::lexeme['"' >> *(qi::char_ - '"') >> '"']
-                    | +(qi::char_ - '"');
-                qi::rule<std::string::iterator, Application::SettingValue()> ValueRule
-                    = qi::bool_
-                    | qi::int_
-                    | StringRule;
-                auto It = ValueString.begin();
-                if (qi::phrase_parse(It, ValueString.end(), ValueRule[boost::phoenix::ref(Value) = _1], ascii::space)
-                    && It == ValueString.end()) {
-                    Application::SetSetting(args.at(1), Value);
-                    Application::Console().WriteRaw(fmt::format("{} := {}", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1)))));
-                } else {
-                    Application::Console().WriteRaw(fmt::format("New value '{}' did not parse as a valid value.", ValueString));
-                }
-            }
-        }
-    } else {
-        Application::Console().WriteRaw(fmt::format("Unknown argument '{}' - 'settings {}' is not a valid command.", args.at(0), args.at(0)));
-    }
 }

 void TConsole::Command_Say(const std::string& FullCmd) {
    if (FullCmd.size() > 3) {
        auto Message = FullCmd.substr(4);
        LuaAPI::MP::SendChatMessage(-1, Message);
-        if (!Application::GetSettingBool(StrLogChat)) {
+        if (!Application::Settings.LogChat) {
            Application::Console().WriteRaw("Chat message sent!");
        }
    }
@@ -543,10 +326,14 @@ void TConsole::Command_List(const std::string&, const std::vector<std::string>&
    } else {
        std::stringstream ss;
        ss << std::left << std::setw(25) << "Name" << std::setw(6) << "ID" << std::setw(6) << "Cars" << std::endl;
-        mLuaEngine->Server().ForEachClient([&](const auto& Client) {
-            ss << std::left << std::setw(25) << Client->GetName()
-               << std::setw(6) << Client->GetID()
-               << std::setw(6) << Client->GetCarCount() << "\n";
+        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+            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;
        });
        auto Str = ss.str();
        Application::Console().WriteRaw(Str.substr(0, Str.size() - 1));
@@ -566,16 +353,20 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    size_t SyncingCount = 0;
    size_t MissedPacketQueueSum = 0;
    int LargestSecondsSinceLastPing = 0;
-    mLuaEngine->Server().ForEachClient([&](const auto& Client) {
-        CarCount += Client->GetCarCount();
-        ConnectedCount += Client->IsConnected() ? 1 : 0;
-        GuestCount += Client->IsGuest() ? 1 : 0;
-        SyncedCount += Client->IsSynced() ? 1 : 0;
-        SyncingCount += Client->IsSyncing() ? 1 : 0;
-        MissedPacketQueueSum += Client->MissedPacketQueueSize();
-        if (Client->SecondsSinceLastPing() < LargestSecondsSinceLastPing) {
-            LargestSecondsSinceLastPing = Client->SecondsSinceLastPing();
+    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto Locked = Client.lock();
+            CarCount += Locked->GetCarCount();
+            ConnectedCount += Locked->IsConnected() ? 1 : 0;
+            GuestCount += Locked->IsGuest() ? 1 : 0;
+            SyncedCount += Locked->IsSynced() ? 1 : 0;
+            SyncingCount += Locked->IsSyncing() ? 1 : 0;
+            MissedPacketQueueSum += Locked->MissedPacketQueueSize();
+            if (Locked->SecondsSinceLastPing() < LargestSecondsSinceLastPing) {
+                LargestSecondsSinceLastPing = Locked->SecondsSinceLastPing();
+            }
        }
+        return true;
    });

    size_t SystemsStarting = 0;
@@ -611,8 +402,6 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
            SystemsShutdown++;
            SystemsShutdownList += NameStatusPair.first + ", ";
            break;
-        default:
-            beammp_assert_not_reachable();
        }
    }
    // remove ", " at the end
@@ -631,7 +420,7 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
           << "\tConnected Players:         " << ConnectedCount << "\n"
           << "\tGuests:                    " << GuestCount << "\n"
           << "\tCars:                      " << CarCount << "\n"
-           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(double(ElapsedTime) / 1000.0 / 60.0 / 60.0) << "h) \n"
+           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(ElapsedTime / 1000.0 / 60.0 / 60.0) << "h) \n"
           << "\tLua:\n"
           << "\t\tQueued results to check:     " << mLuaEngine->GetResultsToCheckSize() << "\n"
           << "\t\tStates:                      " << mLuaEngine->GetLuaStateCount() << "\n"
@@ -639,66 +428,17 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
           << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
           << "\tSubsystems:\n"
           << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
-           << "\t\tShutting down/Shut down:     " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
+           << "\t\tShutting down/Shut down:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
           << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
           << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
           << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
           << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShut down:                   [ " << SystemsShutdownList << " ]\n"
+           << "\t\tShut down:                    [ " << SystemsShutdownList << " ]\n"
           << "";

    Application::Console().WriteRaw(Status.str());
 }

-void TConsole::Autocomplete_Lua(const std::string& stub, std::vector<std::string>& suggestions) {
-    auto stateNames = mLuaEngine->GetLuaStateNames();
-
-    for (const auto& name : stateNames) {
-        if (name.find(stub) == 0) {
-            suggestions.push_back("lua " + name);
-        }
-    }
-}
-
-void TConsole::Autocomplete_Kick(const std::string& stub, std::vector<std::string>& suggestions) {
-    std::string stub_lower = boost::algorithm::to_lower_copy(stub);
-
-    mLuaEngine->Server().ForEachClient([&](const auto& Client) {
-        if (StringStartsWithLower(Client->GetName(), stub_lower)) {
-            suggestions.push_back("kick " + Client->GetName());
-        }
-    });
-}
-
-void TConsole::Autocomplete_Settings(const std::string& stub, std::vector<std::string>& suggestions) {
-    const std::string subcommands[] = { "help", "list", "set", "get" };
-
-    auto [command, args] = ParseCommand(stub);
-
-    std::string arg;
-    if (!args.empty())
-        arg = boost::algorithm::to_lower_copy(args.at(0));
-
-    // suggest setting names
-    if (command == "set" || command == "get") {
-        for (const auto& [k, v] : Application::mSettings) {
-            std::string key = std::string(k);
-            if (StringStartsWithLower(key, arg)) {
-                suggestions.push_back("settings " + command + " " + key);
-            }
-        }
-
-        return;
-    }
-
-    // suggest subcommands
-    for (const auto& cmd : subcommands) {
-        if (cmd.find(command) == 0) {
-            suggestions.push_back("settings " + cmd);
-        }
-    }
-}
-
 void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
    auto FutureIsNonNil =
        [](const std::shared_ptr<TLuaResult>& Future) {
@@ -800,6 +540,7 @@ Commands
 TConsole::TConsole() {
    mCommandline.enable_history();
    mCommandline.set_history_limit(20);
+    mCommandline.set_prompt("> ");
    BackupOldLog();
    mCommandline.on_command = [this](Commandline& c) {
        try {
@@ -824,7 +565,7 @@ TConsole::TConsole() {
            } else {
                if (!mLuaEngine) {
                    beammp_error("Attempted to run a command before Lua engine started. Please wait and try again.");
-                } else if (cmd == "exit" || cmd == "quit") {
+                } else if (cmd == "exit") {
                    beammp_info("gracefully shutting down");
                    Application::GracefullyShutdown();
                } else if (cmd == "say") {
@@ -846,66 +587,42 @@ TConsole::TConsole() {
    mCommandline.on_autocomplete = [this](Commandline&, std::string stub, int) {
        std::vector<std::string> suggestions;
        try {
+            auto cmd = TrimString(stub);
+            // beammp_error("yes 1");
+            // beammp_error(stub);
            if (mIsLuaConsole) { // if lua
                if (!mLuaEngine) {
                    beammp_info("Lua not started yet, please try again in a second");
                } else {
-                    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] != '.') {
+                    std::string prefix {};
+                    for (size_t i = stub.length(); i > 0; i--) {
+                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_') {
                            prefix = stub.substr(0, i);
                            stub = stub.substr(i);
                            break;
                        }
                    }
-
-                    // turn string into vector of keys
-                    std::vector<std::string> tablekeys;
-
-                    SplitString(stub, '.', tablekeys);
-
-                    // remove last key if incomplete
-                    if (stub.rfind('.') != stub.size() - 1 && !tablekeys.empty()) {
-                        tablekeys.pop_back();
-                    }
-
-                    auto keys = mLuaEngine->GetStateTableKeysForState(mStateId, tablekeys);
-
-                    for (const auto& key : keys) { // go through each bottom-level key
-                        auto last_dot = stub.rfind('.');
-                        std::string last_atom;
-                        if (last_dot != std::string::npos) {
-                            last_atom = stub.substr(last_dot + 1);
-                        }
-                        std::string before_last_atom = stub.substr(0, last_dot + 1); // get last confirmed key
-                        auto last = stub.substr(stub.rfind('.') + 1);
-                        std::string::size_type n = key.find(last);
+                    auto keys = mLuaEngine->GetStateGlobalKeysForState(mStateId);
+                    for (const auto& key : keys) {
+                        std::string::size_type n = key.find(stub);
                        if (n == 0) {
-                            suggestions.push_back(prefix + before_last_atom + key);
+                            suggestions.push_back(prefix + key);
+                            // beammp_warn(cmd_name);
                        }
                    }
                }
            } else { // if not lua
-                for (const auto& [cmd_name, autocomplete_fn] : mCommandAutocompleteMap) {
-                    if (stub.find(cmd_name) == 0) { // input starts with a full command (that has autocomplete)
-                        std::size_t cmd_len = cmd_name.length();
-                        std::string trimmed = TrimString(stub.substr(cmd_len));
-                        autocomplete_fn(trimmed, suggestions);
-                        break;
-                    }
-                }
-                if (suggestions.empty()) {
-                    for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
-                        if (cmd_name.find(stub) == 0) {
-                            suggestions.push_back(cmd_name);
-                        }
+                for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
+                    std::string::size_type n = cmd_name.find(stub);
+                    if (n == 0) {
+                        suggestions.push_back(cmd_name);
+                        // beammp_warn(cmd_name);
                    }
                }
            }
        } catch (const std::exception& e) {
            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
        }
-        std::sort(suggestions.begin(), suggestions.end());
        return suggestions;
    };
 }
@@ -7,7 +7,6 @@
 #include <rapidjson/rapidjson.h>
 #include <sstream>

-namespace json = rapidjson;

 void THeartbeatThread::operator()() {
    RegisterThread("Heartbeat");
@@ -17,14 +16,14 @@ void THeartbeatThread::operator()() {
    // these are "hot-change" related variables
    static std::string Last;

-    static TimeType::time_point LastNormalUpdateTime = TimeType::now();
+    static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::now();
    bool isAuth = false;
    size_t UpdateReminderCounter = 0;
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
        ++UpdateReminderCounter;
        Body = GenerateCall();
        // a hot-change occurs when a setting has changed, to update the backend of that change.
-        auto Now = TimeType::now();
+        auto Now = std::chrono::high_resolution_clock::now();
        bool Unchanged = Last == Body;
        auto TimePassed = (Now - LastNormalUpdateTime);
        auto Threshold = Unchanged ? 30 : 5;
@@ -36,10 +35,14 @@ void THeartbeatThread::operator()() {

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

+        Body += "&pps=" + Application::PPS();
+
+        beammp_trace("heartbeat body: '" + Body + "'");
+
        auto SentryReportError = [&](const std::string& transaction, int status) {
            auto Lock = Sentry.CreateExclusiveContext();
            Sentry.SetContext("heartbeat",
@@ -53,14 +56,15 @@ void THeartbeatThread::operator()() {
        auto Target = "/heartbeat";
        unsigned int ResponseCode = 0;

-        json::Document Doc;
+        rapidjson::Document Doc;
        bool Ok = false;
        for (const auto& Url : Application::GetBackendUrlsInOrder()) {
            T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
+            beammp_trace(T);
            Doc.Parse(T.data(), T.size());
            if (Doc.HasParseError() || !Doc.IsObject()) {
-                if (!Application::GetSettingBool(StrPrivate)) {
-                    beammp_trace("Backend response failed to parse as valid json");
+                if (!Application::Settings.Private) {
+                    beammp_error("Backend response failed to parse as valid json");
                    beammp_trace("Response was: `" + T + "`");
                }
                Sentry.SetContext("JSON Response", { { "reponse", T } });
@@ -105,12 +109,12 @@ void THeartbeatThread::operator()() {
                Sentry.LogError("Missing/invalid json members in backend response", __FILE__, std::to_string(__LINE__));
            }
        } else {
-            if (!Application::GetSettingBool(StrPrivate)) {
+            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::GetSettingBool(StrPrivate)) {
+        if (Ok && !isAuth && !Application::Settings.Private) {
            if (Status == "2000") {
                beammp_info(("Authenticated! " + Message));
                isAuth = true;
@@ -124,10 +128,10 @@ void THeartbeatThread::operator()() {
                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
            }
        }
-        if (isAuth || Application::GetSettingBool(StrPrivate)) {
+        if (isAuth || Application::Settings.Private) {
            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
        }
-        if (!Application::GetSettingBool(StrHideUpdateMessages) && UpdateReminderCounter % 5) {
+        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
            Application::CheckForUpdates();
        }
    }
@@ -136,20 +140,20 @@ void THeartbeatThread::operator()() {
 std::string THeartbeatThread::GenerateCall() {
    std::stringstream Ret;

-    Ret << "uuid=" << Application::GetSettingString(StrAuthKey)
+    Ret << "uuid=" << Application::Settings.Key
        << "&players=" << mServer.ClientCount()
-        << "&maxplayers=" << Application::GetSettingInt(StrMaxPlayers)
-        << "&port=" << Application::GetSettingInt(StrPort)
-        << "&map=" << Application::GetSettingString(StrMap)
-        << "&private=" << (Application::GetSettingBool(StrPrivate) ? "true" : "false")
+        << "&maxplayers=" << Application::Settings.MaxPlayers
+        << "&port=" << Application::Settings.Port
+        << "&map=" << Application::Settings.MapName
+        << "&private=" << (Application::Settings.Private ? "true" : "false")
        << "&version=" << Application::ServerVersionString()
-        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
-        << "&name=" << Application::GetSettingString(StrName)
-        << "&modlist=" << TResourceManager::FormatForBackend(mResourceManager.FileMap())
-        << "&modstotalsize=" << mResourceManager.TotalModsSize()
-        << "&modstotal=" << mResourceManager.LoadedModCount()
+        << "&clientversion=" << Application::ClientVersionString()
+        << "&name=" << Application::Settings.ServerName
+        << "&modlist=" << mResourceManager.TrimmedList()
+        << "&modstotalsize=" << mResourceManager.MaxModSize()
+        << "&modstotal=" << mResourceManager.ModsLoaded()
        << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::GetSettingString(StrDescription);
+        << "&desc=" << Application::Settings.ServerDesc;
    return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
@@ -159,6 +163,7 @@ THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& S
    Application::RegisterShutdownHandler([&] {
        Application::SetSubsystemStatus("Heartbeat", Application::Status::ShuttingDown);
        if (mThread.joinable()) {
+            mShutdown = true;
            mThread.join();
        }
        Application::SetSubsystemStatus("Heartbeat", Application::Status::Shutdown);
@@ -167,8 +172,12 @@ THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& S
 }
 std::string THeartbeatThread::GetPlayers() {
    std::string Return;
-    mServer.ForEachClient([&](const auto& Client) {
-        Return += Client->GetName() + ";";
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            Return += ClientPtr.lock()->GetName() + ";";
+        }
+        return true;
    });
    return Return;
 }
@@ -4,11 +4,10 @@
 #include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaPlugin.h"
-#include "Uuid.h"
-#include "sol/types.hpp"

 #include <chrono>
 #include <condition_variable>
+#include <httplib.h>
 #include <nlohmann/json.hpp>
 #include <random>
 #include <thread>
@@ -17,29 +16,26 @@
 TLuaEngine* LuaAPI::MP::Engine;

 TLuaEngine::TLuaEngine()
-    : mResourceServerPath(fs::path(Application::GetSettingString(StrResourceFolder)) / "Server") {
+    : mPluginMonitor(fs::path(Application::Settings.Resource) / "Server", *this, mShutdown) {
    Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
    LuaAPI::MP::Engine = this;
-    if (!fs::exists(Application::GetSettingString(StrResourceFolder))) {
-        fs::create_directory(Application::GetSettingString(StrResourceFolder));
+    if (!fs::exists(Application::Settings.Resource)) {
+        fs::create_directory(Application::Settings.Resource);
    }
-    if (!fs::exists(mResourceServerPath)) {
-        fs::create_directory(mResourceServerPath);
+    fs::path Path = fs::path(Application::Settings.Resource) / "Server";
+    if (!fs::exists(Path)) {
+        fs::create_directory(Path);
    }
+    mResourceServerPath = Path;
    Application::RegisterShutdownHandler([&] {
        Application::SetSubsystemStatus("LuaEngine", Application::Status::ShuttingDown);
+        mShutdown = true;
        if (mThread.joinable()) {
            mThread.join();
        }
        Application::SetSubsystemStatus("LuaEngine", Application::Status::Shutdown);
    });
-    IThreaded::Start();
-}
-
-TEST_CASE("TLuaEngine ctor & dtor") {
-    Application::SetSetting(StrResourceFolder, "beammp_server_test_resources");
-    TLuaEngine engine;
-    Application::GracefullyShutdown();
+    Start();
 }

 void TLuaEngine::operator()() {
@@ -58,27 +54,30 @@ void TLuaEngine::operator()() {

    auto ResultCheckThread = std::thread([&] {
        RegisterThread("ResultCheckThread");
-        while (!Application::IsShuttingDown()) {
+        while (!mShutdown) {
            std::unique_lock Lock(mResultsToCheckMutex);
+            mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
            if (!mResultsToCheck.empty()) {
                mResultsToCheck.remove_if([](const std::shared_ptr<TLuaResult>& Ptr) -> bool {
                    if (Ptr->Ready) {
-                        if (Ptr->Error) {
-                            if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
-                                beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
-                            }
+                        return true;
+                    } else if (Ptr->Error) {
+                        if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
+                            beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
                        }
                        return true;
                    }
                    return false;
                });
            }
-            mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(10));
        }
    });
    // event loop
-    auto Before = TimeType::now();
-    while (!Application::IsShuttingDown()) {
+    auto Before = std::chrono::high_resolution_clock::now();
+    while (!mShutdown) {
+        if (mLuaStates.size() == 0) {
+            std::this_thread::sleep_for(std::chrono::seconds(100));
+        }
        { // Timed Events Scope
            std::unique_lock Lock(mTimedEventsMutex);
            for (auto& Timer : mTimedEvents) {
@@ -104,20 +103,14 @@ void TLuaEngine::operator()() {
                }
            }
        }
-        if (mLuaStates.size() == 0) {
-            beammp_trace("No Lua states, event loop running extremely sparsely");
-            Application::SleepSafeSeconds(10);
+        const auto Expected = std::chrono::milliseconds(10);
+        if (auto Diff = std::chrono::high_resolution_clock::now() - Before;
+            Diff < Expected) {
+            std::this_thread::sleep_for(Expected - Diff);
        } else {
-            constexpr double NsFactor = 1000000.0;
-            constexpr double Expected = 10.0; // ms
-            const auto Diff = (TimeType::now() - Before).count() / NsFactor;
-            if (Diff < Expected) {
-                std::this_thread::sleep_for(std::chrono::nanoseconds(size_t((Expected - Diff) * NsFactor)));
-            } else {
-                beammp_tracef("Event loop cannot keep up! Running {}ms behind", Diff);
-            }
+            beammp_trace("Event loop cannot keep up! Running " + std::to_string(Diff.count()) + "s behind");
        }
-        Before = TimeType::now();
+        Before = std::chrono::high_resolution_clock::now();
    }

    if (ResultCheckThread.joinable()) {
@@ -162,7 +155,7 @@ void TLuaEngine::AddResultToCheck(const std::shared_ptr<TLuaResult>& Result) {
    mResultsToCheckCond.notify_one();
 }

-std::unordered_map<std::string /* event name */, std::vector<std::string> /* handlers */> TLuaEngine::Debug_GetEventsForState(TLuaStateId StateId) {
+std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> TLuaEngine::Debug_GetEventsForState(TLuaStateId StateId) {
    std::unordered_map<std::string, std::vector<std::string>> Result;
    std::unique_lock Lock(mLuaEventsMutex);
    for (const auto& EventNameToEventMap : mLuaEvents) {
@@ -221,71 +214,7 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateGlobalKeys() {
    return Result;
 }

-std::vector<std::string> TLuaEngine::GetStateTableKeysForState(TLuaStateId StateId, std::vector<std::string> keys) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    auto Result = mLuaStates.at(StateId)->GetStateTableKeys(keys);
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const std::vector<std::string>& keys) {
-    auto globals = mStateView.globals();
-
-    sol::table current = globals;
-    std::vector<std::string> Result {};
-
-    for (const auto& [key, value] : current) {
-        std::string s = key.as<std::string>();
-        if (value.get_type() == sol::type::function) {
-            s += "(";
-        }
-        Result.push_back(s);
-    }
-
-    if (!keys.empty()) {
-        Result.clear();
-    }
-
-    for (size_t i = 0; i < keys.size(); ++i) {
-        auto obj = current.get<sol::object>(keys.at(i));
-        if (obj.get_type() == sol::type::nil) {
-            // error
-            break;
-        } else if (i == keys.size() - 1) {
-            if (obj.get_type() == sol::type::table) {
-                for (const auto& [key, value] : obj.as<sol::table>()) {
-                    if (key.get_type() == sol::type::string) {
-                        std::string s = key.as<std::string>();
-
-                        if (value.get_type() == sol::type::function) {
-                            s += "(";
-                        }
-
-                        Result.push_back(s);
-                    }
-                }
-            } else {
-                Result = { obj.as<std::string>() };
-            }
-            break;
-        }
-        if (obj.get_type() == sol::type::table) {
-            current = obj;
-        } else {
-            // error
-            break;
-        }
-    }
-
-    return Result;
-}
-
-/*
-
-    _G.a.b.c.d.
-
-*/
-
-void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<TimeType::duration>& Max) {
+void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<std::chrono::high_resolution_clock::duration>& Max) {
    for (const auto& Result : Results) {
        bool Cancelled = false;
        size_t ms = 0;
@@ -334,15 +263,12 @@ std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const
    return mLuaStates.at(StateID)->EnqueueScript(Script);
 }

-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
    std::unique_lock Lock(mLuaStatesMutex);
    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
 }

 void TLuaEngine::CollectAndInitPlugins() {
-    if (!fs::exists(mResourceServerPath)) {
-        fs::create_directories(mResourceServerPath);
-    }
    for (const auto& Dir : fs::directory_iterator(mResourceServerPath)) {
        auto Path = Dir.path();
        Path = fs::relative(Path);
@@ -392,7 +318,7 @@ void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name,
    std::unique_lock Lock(mLuaStatesMutex);
    if (mLuaStates.find(StateId) == mLuaStates.end()) {
        beammp_debug("Creating lua state for state id \"" + StateId + "\"");
-        auto DataPtr = std::make_unique<StateThreadData>(Name, StateId, *this);
+        auto DataPtr = std::make_unique<StateThreadData>(Name, mShutdown, StateId, *this);
        mLuaStates[StateId] = std::move(DataPtr);
        RegisterEvent("onInit", StateId, "onInit");
        if (!DontCallOnInit) {
@@ -414,56 +340,15 @@ std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& Ev
    return mLuaEvents[EventName][StateId];
 }

-std::vector<sol::object> TLuaEngine::StateThreadData::JsonStringToArray(JsonString Str) {
-    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 {};
-        }
-    }
-    return LocalTable;
-}
-
 sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
-    auto Table = mStateView.create_table();
-    for (const sol::stack_proxy& Arg : EventArgs) {
-        switch (Arg.get_type()) {
-        case sol::type::none:
-        case sol::type::userdata:
-        case sol::type::lightuserdata:
-        case sol::type::thread:
-        case sol::type::function:
-        case sol::type::poly:
-            Table.add(BEAMMP_INTERNAL_NIL);
-            beammp_warnf("Passed a value of type '{}' to TriggerGlobalEvent(\"{}\", ...). This type can not be serialized, and cannot be passed between states. It will arrive as <nil> in handlers.", sol::type_name(EventArgs.lua_state(), Arg.get_type()), EventName);
-            break;
-        case sol::type::lua_nil:
-            Table.add(BEAMMP_INTERNAL_NIL);
-            break;
-        case sol::type::string:
-        case sol::type::number:
-        case sol::type::boolean:
-        case sol::type::table:
-            Table.add(Arg);
-            break;
-        }
-    }
-    JsonString Str { "" };
-    if (!Table.empty()) {
-        Str.value = LuaAPI::MP::JsonEncode(Table);
-    }
-
-    auto Return = mEngine->TriggerEvent(EventName, mStateId, Str);
-    mEngine->ReportErrors(Return);
+    auto Return = mEngine->TriggerEvent(EventName, mStateId, EventArgs);
    auto MyHandlers = mEngine->GetEventHandlersForState(EventName, mStateId);
-
-    sol::variadic_results LocalArgs = Str.value.empty() ? sol::variadic_results {} : JsonStringToArray(Str);
-
    for (const auto& Handler : MyHandlers) {
        auto Fn = mStateView[Handler];
        if (Fn.valid()) {
-            auto LuaResult = LocalArgs.empty() ? Fn() : Fn(LocalArgs);
+            auto LuaResult = Fn(EventArgs);
            auto Result = std::make_shared<TLuaResult>();
+            Result->Ready = true;
            if (LuaResult.valid()) {
                Result->Error = false;
                Result->Result = LuaResult;
@@ -471,7 +356,6 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                Result->Error = true;
                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
            }
-            Result->Ready = true;
            Return.push_back(Result);
        }
    }
@@ -501,44 +385,31 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
            }
            return Result;
        });
-    AsyncEventReturn.set_function("Wait",
-        [](const sol::table& Self, std::optional<float> TimeoutS) {
-            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
-            if (TimeoutS.has_value()) {
-                TLuaEngine::WaitForAll(Vector, std::chrono::milliseconds(size_t(TimeoutS.value() * 1000.0f)));
-            } else {
-                TLuaEngine::WaitForAll(Vector);
-            }
-        });
    return AsyncEventReturn;
 }

 sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
    // TODO: make asynchronous?
-    auto Result = mStateView.create_table();
+    sol::table Result = mStateView.create_table();
    for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) {
        auto Fn = mStateView[Handler];
        if (Fn.valid() && Fn.get_type() == sol::type::function) {
            auto FnRet = Fn(EventArgs);
            if (FnRet.valid()) {
-                for (const auto& Res : FnRet) {
-                    Result.add(Res);
-                }
+                Result.add(FnRet);
            } else {
                sol::error Err = FnRet;
                beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
            }
-        } else {
-            beammp_lua_errorf("Handler '{}' for event '{}' in state '{}' is NOT a function, and will be ignored.", Handler, EventName, mStateId);
        }
    }
    return Result;
 }

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
-    auto Client = GetClient(mEngine->Server(), ID);
-    if (Client) {
-        auto IDs = Client->GetIdentifiers();
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
        if (IDs.empty()) {
            return sol::lua_nil;
        }
@@ -554,20 +425,27 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
    sol::table Result = mStateView.create_table();
-    mEngine->Server().ForEachClient([&](const auto& Client) {
-        Result[Client->GetID()] = Client->GetName();
+    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            Result[locked->GetID()] = locked->GetName();
+        }
+        return true;
    });
    return Result;
 }

 int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
    int Id = -1;
-    mEngine->mServer->ForEachClient([&Id, &Name](const auto& Client) -> IterationDecision {
-        if (Client->GetName() == Name) {
-            Id = Client->GetID();
-            return Break;
+    mEngine->mServer->ForEachClient([&Id, &Name](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (locked->GetName() == Name) {
+                Id = locked->GetID();
+                return false;
+            }
        }
-        return Continue;
+        return true;
    });
    return Id;
 }
@@ -599,17 +477,18 @@ sol::table TLuaEngine::StateThreadData::Lua_FS_ListDirectories(const std::string
 }

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

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
-    auto Client = GetClient(mEngine->Server(), ID);
-    if (Client) {
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
        TClient::TSetOfVehicleData VehicleData;
        { // Vehicle Data Lock Scope
            auto LockedData = Client->GetAllCars();
@@ -628,32 +507,6 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
        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 Client = GetClient(mEngine->Server(), PID);
-    if (Client) {
-        std::string VehiclePos = Client->GetCarPositionRaw(VID);
-
-        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 = "Client expired";
-        return Result;
-    }
-}
-
 sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::string& host, uint16_t port) {
    auto table = mStateView.create_table();
    constexpr const char* InternalClient = "__InternalClient";
@@ -727,8 +580,6 @@ static void JsonDecodeRecursive(sol::state_view& StateView, sol::table& table, c
        return;
    case nlohmann::detail::value_t::discarded:
        return;
-    default:
-        beammp_assert_not_reachable();
    }
 }

@@ -755,8 +606,9 @@ sol::table TLuaEngine::StateThreadData::Lua_JsonDecode(const std::string& str) {
    return table;
 }

-TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine)
+TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine)
    : mName(Name)
+    , mShutdown(Shutdown)
    , mStateId(StateId)
    , mState(luaL_newstate())
    , mEngine(&Engine) {
@@ -776,14 +628,14 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("CreateTimer", [&]() -> sol::table {
        sol::state_view StateView(mState);
        sol::table Result = StateView.create_table();
-        Result["__StartTime"] = TimeType::now();
+        Result["__StartTime"] = std::chrono::high_resolution_clock::now();
        Result.set_function("GetCurrent", [&](const sol::table& Table) -> float {
-            auto End = TimeType::now();
-            auto Start = Table.get<TimeType::time_point>("__StartTime");
+            auto End = std::chrono::high_resolution_clock::now();
+            auto Start = Table.get<std::chrono::high_resolution_clock::time_point>("__StartTime");
            return std::chrono::duration_cast<std::chrono::microseconds>(End - Start).count() / 1000000.0f;
        });
        Result.set_function("Start", [&](sol::table Table) {
-            Table["__StartTime"] = TimeType::now();
+            Table["__StartTime"] = std::chrono::high_resolution_clock::now();
        });
        return Result;
    });
@@ -795,10 +647,9 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("TriggerGlobalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
        return Lua_TriggerGlobalEvent(EventName, EventArgs);
    });
-    MPTable.set_function(
-        "TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> auto{
-            return Lua_TriggerLocalEvent(EventName, EventArgs);
-        });
+    MPTable.set_function("TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
+        return Lua_TriggerLocalEvent(EventName, EventArgs);
+    });
    MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent);
    MPTable.set_function("TriggerClientEventJson", &LuaAPI::MP::TriggerClientEventJson);
    MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount);
@@ -813,9 +664,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("GetPlayerVehicles", [&](int ID) -> sol::table {
        return Lua_GetPlayerVehicles(ID);
    });
-    MPTable.set_function("GetPositionRaw", [&](int PID, int VID) -> std::pair<sol::table, std::string> {
-        return Lua_GetPositionRaw(PID, VID);
-    });
    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
    MPTable.set_function("GetPlayers", [&]() -> sol::table {
        return Lua_GetPlayers();
@@ -869,7 +717,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    UtilTable.set_function("JsonUnflatten", &LuaAPI::MP::JsonUnflatten);
    UtilTable.set_function("JsonPrettify", &LuaAPI::MP::JsonPrettify);
    UtilTable.set_function("JsonMinify", &LuaAPI::MP::JsonMinify);
-    UtilTable.set_function("GenerateUUID", &uuid::GenerateUuid);
    UtilTable.set_function("Random", [this] {
        return mUniformRealDistribution01(mMersenneTwister);
    });
@@ -926,7 +773,7 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLu
    return Result;
 }

-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy) {
    // TODO: Document all this
    decltype(mStateFunctionQueue)::iterator Iter = mStateFunctionQueue.end();
    if (Strategy == CallStrategy::BestEffort) {
@@ -948,7 +795,7 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFrom
    }
 }

-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
    auto Result = std::make_shared<TLuaResult>();
    Result->StateId = mStateId;
    Result->Function = FunctionName;
@@ -964,7 +811,7 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co

 void TLuaEngine::StateThreadData::operator()() {
    RegisterThread("Lua:" + mStateId);
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
        { // StateExecuteQueue Scope
            std::unique_lock Lock(mStateExecuteQueueMutex);
            if (!mStateExecuteQueue.empty()) {
@@ -999,6 +846,7 @@ 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);
+                S.second->Ready = true;
                if (Res.valid()) {
                    S.second->Error = false;
                    S.second->Result = std::move(Res);
@@ -1007,7 +855,6 @@ void TLuaEngine::StateThreadData::operator()() {
                    sol::error Err = Res;
                    S.second->ErrorMessage = Err.what();
                }
-                S.second->Ready = true;
            }
        }
        { // StateFunctionQueue Scope
@@ -1033,41 +880,18 @@ void TLuaEngine::StateThreadData::operator()() {
                            continue;
                        }
                        switch (Arg.index()) {
-                        case TLuaType::String:
+                        case TLuaArgTypes_String:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<std::string>(Arg)));
                            break;
-                        case TLuaType::Int:
+                        case TLuaArgTypes_Int:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<int>(Arg)));
                            break;
-                        case TLuaType::Json: {
-                            auto Str = std::get<JsonString>(Arg);
-                            if (!Str.value.empty()) {
-                                auto LocalArgs = JsonStringToArray(Str);
-                                LuaArgs.insert(LuaArgs.end(), LocalArgs.begin(), LocalArgs.end());
-                            }
+                        case TLuaArgTypes_VariadicArgs:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<sol::variadic_args>(Arg)));
                            break;
-                        }
-                        case TLuaType::Bool:
+                        case TLuaArgTypes_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;
-                            }
-                            LuaArgs.push_back(sol::make_object(StateView, Table));
-                            break;
-                        }
-                        case TLuaType::StringSizeTMap: {
-                            auto Map = std::get<std::unordered_map<std::string, size_t>>(Arg);
-                            auto Table = StateView.create_table();
-                            for (const auto& [k, v] : Map) {
-                                Table[k] = v;
-                            }
-                            LuaArgs.push_back(sol::make_object(StateView, Table));
-                            break;
-                        }
                        default:
                            beammp_error("Unknown argument type, passed as nil");
                            break;
@@ -1106,8 +930,8 @@ std::vector<TLuaEngine::QueuedFunction> TLuaEngine::StateThreadData::Debug_GetSt
 void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy) {
    std::unique_lock Lock(mTimedEventsMutex);
    TimedEvent Event {
-        TimeType::duration { std::chrono::milliseconds(IntervalMS) },
-        TimeType::now(),
+        std::chrono::high_resolution_clock::duration { std::chrono::milliseconds(IntervalMS) },
+        std::chrono::high_resolution_clock::now(),
        EventName,
        StateId,
        Strategy
@@ -1150,10 +974,76 @@ TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName,
 }

 bool TLuaEngine::TimedEvent::Expired() {
-    auto Waited = (TimeType::now() - LastCompletion);
+    auto Waited = (std::chrono::high_resolution_clock::now() - LastCompletion);
    return Waited >= Duration;
 }

 void TLuaEngine::TimedEvent::Reset() {
-    LastCompletion = TimeType::now();
+    LastCompletion = std::chrono::high_resolution_clock::now();
+}
+
+TPluginMonitor::TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown)
+    : mEngine(Engine)
+    , mPath(Path)
+    , mShutdown(Shutdown) {
+    if (!fs::exists(mPath)) {
+        fs::create_directories(mPath);
+    }
+    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
+        // TODO: trigger an event when a subfolder file changes
+        if (Entry.is_regular_file()) {
+            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
+        }
+    }
+    Start();
+}
+
+void TPluginMonitor::operator()() {
+    RegisterThread("PluginMonitor");
+    beammp_info("PluginMonitor started");
+    while (!mShutdown) {
+        std::this_thread::sleep_for(std::chrono::seconds(3));
+        std::vector<std::string> ToRemove;
+        for (const auto& Pair : mFileTimes) {
+            try {
+                auto CurrentTime = fs::last_write_time(Pair.first);
+                if (CurrentTime != Pair.second) {
+                    mFileTimes[Pair.first] = CurrentTime;
+                    // grandparent of the path should be Resources/Server
+                    if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
+                        beammp_info("File \"" + Pair.first + "\" changed, reloading");
+                        // 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);
+                        // TODO: call onInit
+                        mEngine.AddResultToCheck(Res);
+                    } else {
+                        // TODO: trigger onFileChanged event
+                        beammp_trace("Change detected in file \"" + Pair.first + "\", event trigger not implemented yet");
+                        /*
+                        // is in subfolder, dont reload, just trigger an event
+                        auto Results = mEngine.TriggerEvent("onFileChanged", "", Pair.first);
+                        mEngine.WaitForAll(Results);
+                        for (const auto& Result : Results)  {
+                            if (Result->Error) {
+                                beammp_lua_error(Result->ErrorMessage);
+                            }
+                        }*/
+                    }
+                }
+            } catch (const std::exception& e) {
+                ToRemove.push_back(Pair.first);
+            }
+        }
+        for (const auto& File : ToRemove) {
+            mFileTimes.erase(File);
+            beammp_warn("file '" + File + "' couldn't be accessed, so it was removed from plugin hot reload monitor (probably got deleted)");
+        }
+    }
 }
@@ -10,6 +10,7 @@ TPPSMonitor::TPPSMonitor(TServer& Server)
        Application::SetSubsystemStatus("PPSMonitor", Application::Status::ShuttingDown);
        if (mThread.joinable()) {
            beammp_debug("shutting down PPSMonitor");
+            mShutdown = true;
            mThread.join();
            beammp_debug("shut down PPSMonitor");
        }
@@ -26,23 +27,33 @@ void TPPSMonitor::operator()() {
    beammp_debug("PPSMonitor starting");
    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Good);
    std::vector<std::shared_ptr<TClient>> TimedOutClients;
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
        std::this_thread::sleep_for(std::chrono::seconds(1));
        int C = 0, V = 0;
        if (mServer.ClientCount() == 0) {
            Application::SetPPS("-");
            continue;
        }
-        mServer.ForEachClient([&](const auto& Client) {
-            if (Client->GetCarCount() > 0) {
+        mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+            std::shared_ptr<TClient> c;
+            {
+                ReadLock Lock(mServer.GetClientMutex());
+                if (!ClientPtr.expired()) {
+                    c = ClientPtr.lock();
+                } else
+                    return true;
+            }
+            if (c->GetCarCount() > 0) {
                C++;
-                V += Client->GetCarCount();
+                V += c->GetCarCount();
            }
            // kick on "no ping"
-            if (Client->SecondsSinceLastPing() > (20 * 60)) {
-                beammp_debugf("Client {} ({}) timing out: {}s since last contact", Client->GetName(), Client->GetID(), Client->SecondsSinceLastPing());
-                TimedOutClients.push_back(Client);
+            if (c->SecondsSinceLastPing() > (20 * 60)) {
+                beammp_debug("client " + std::string("(") + std::to_string(c->GetID()) + ")" + c->GetName() + " timing out: " + std::to_string(c->SecondsSinceLastPing()) + ", pps: " + Application::PPS());
+                TimedOutClients.push_back(c);
            }
+
+            return true;
        });
        for (auto& ClientToKick : TimedOutClients) {
            Network().ClientKick(*ClientToKick, "Timeout (no ping for way too long)");
@@ -1,75 +0,0 @@
-#include "TPluginMonitor.h"
-
-#include "TLuaEngine.h"
-
-TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine)
-    : mEngine(Engine)
-    , mPath(Path) {
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Starting);
-    if (!fs::exists(mPath)) {
-        fs::create_directories(mPath);
-    }
-    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
-        // TODO: trigger an event when a subfolder file changes
-        if (Entry.is_regular_file()) {
-            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
-        }
-    }
-
-    Application::RegisterShutdownHandler([this] {
-        if (mThread.joinable()) {
-            mThread.join();
-        }
-    });
-
-    Start();
-}
-
-void TPluginMonitor::operator()() {
-    RegisterThread("PluginMonitor");
-    beammp_info("PluginMonitor started");
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Good);
-    while (!Application::IsShuttingDown()) {
-        std::vector<std::string> ToRemove;
-        for (const auto& Pair : mFileTimes) {
-            try {
-                auto CurrentTime = fs::last_write_time(Pair.first);
-                if (CurrentTime > Pair.second) {
-                    mFileTimes[Pair.first] = CurrentTime;
-                    // grandparent of the path should be Resources/Server
-                    if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
-                        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 {
-                            mEngine->ReportErrors(mEngine->TriggerLocalEvent(StateID, "onInit"));
-                            mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
-                        }
-                    } else {
-                        // is in subfolder, dont reload, just trigger an event
-                        beammp_debugf("File \"{}\" changed, not reloading because it's in a subdirectory. Triggering 'onFileChanged' event instead", Pair.first);
-                        mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
-                    }
-                }
-            } catch (const std::exception& e) {
-                ToRemove.push_back(Pair.first);
-            }
-        }
-        Application::SleepSafeSeconds(3);
-        for (const auto& File : ToRemove) {
-            mFileTimes.erase(File);
-            beammp_warnf("File \"{}\" couldn't be accessed, so it was removed from plugin hot reload monitor (probably got deleted)", File);
-        }
-    }
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Shutdown);
-}
@@ -5,80 +5,31 @@

 namespace fs = std::filesystem;

-std::string TResourceManager::FormatForBackend(const ModMap& mods) {
-    std::string monkey;
-    for (const auto& [name, size] : mods) {
-        monkey += fs::path(name).filename().string() + ';';
-    }
-    return monkey;
-}
-
-std::string TResourceManager::FormatForClient(const ModMap& mods) {
-    std::string monkey;
-    for (const auto& [name, size] : mods) {
-        monkey += '/' + name + ';';
-    }
-    for (const auto& [name, size] : mods) {
-        monkey += std::to_string(size) + ';';
-    }
-    return monkey;
-}
-
-/// @brief Sanitizes a requested mod string
-/// @param pathString Raw mod path string
-/// @param mods List of allowed mods for this client
-/// @return Error, if any
-std::optional<std::string> TResourceManager::IsModValid(std::string& pathString, const ModMap& mods) {
-    auto path = fs::path(pathString);
-    if (!path.has_filename()) {
-        beammp_warn("File " + pathString + " is not a file!");
-        return { "the requested file doesn't contain a valid filename" };
-    }
-
-    auto BasePath = fs::path(Application::GetSettingString(StrResourceFolder) + "/Client");
-
-    auto CombinedPath = fs::path(BasePath.string() + pathString).lexically_normal();
-
-    // beammp_infof("path: {}, base: {}, combined: {}", pathString, BasePath.string(), CombinedPath.string());
-
-    if (!std::filesystem::exists(CombinedPath)) {
-        beammp_warn("File " + pathString + " could not be accessed!");
-        return { "the requested file doesn't exist or couldn't be accessed" };
-    }
-
-    auto relative = fs::relative(CombinedPath, BasePath);
-
-    if (mods.count(relative.string()) == 0) {
-        beammp_warn("File " + pathString + " is disallowed for this player!");
-        return { "the requested file is disallowed for this player" };
-    }
-
-    pathString = CombinedPath.string();
-    return {};
-}
-
 TResourceManager::TResourceManager() {
    Application::SetSubsystemStatus("ResourceManager", Application::Status::Starting);
-    std::string BasePath = Application::GetSettingString(StrResourceFolder) + "/Client";
-    if (!fs::exists(BasePath))
-        fs::create_directories(BasePath);
-    std::vector<std::string> modNames;
-
-    auto iterator = fs::recursive_directory_iterator(BasePath, fs::directory_options::follow_directory_symlink | fs::directory_options::skip_permission_denied);
-    for (const auto& entry : iterator) {
-        if (iterator.depth() > 0 && !Application::GetSettingBool(StrIncludeSubdirectories))
-            continue;
-        if ((entry.is_regular_file() || entry.is_symlink()) && entry.path().extension() == ".zip") {
-            auto relativePath = fs::relative(entry.path(), BasePath);
-
-            mMods[relativePath.string()] = entry.file_size();
-            mTotalModSize += entry.file_size();
+    std::string Path = Application::Settings.Resource + "/Client";
+    if (!fs::exists(Path))
+        fs::create_directories(Path);
+    for (const auto& entry : fs::directory_iterator(Path)) {
+        std::string File(entry.path().string());
+        if (auto pos = File.find(".zip"); pos != std::string::npos) {
+            if (File.length() - pos == 4) {
+                std::replace(File.begin(), File.end(), '\\', '/');
+                mFileList += File + ';';
+                if (auto i = File.find_last_of('/'); i != std::string::npos) {
+                    ++i;
+                    File = File.substr(i, pos - i);
+                }
+                mTrimmedList += "/" + fs::path(File).filename().string() + ';';
+                mFileSizes += std::to_string(size_t(fs::file_size(entry.path()))) + ';';
+                mMaxModSize += size_t(fs::file_size(entry.path()));
+                mModsLoaded++;
+            }
        }
    }

-    if (!mMods.empty()) {
-        beammp_infof("Loaded {} mod{}", mMods.size(), mMods.size() != 1 ? 's' : ' ');
-    }
+    if (mModsLoaded)
+        beammp_info("Loaded " + std::to_string(mModsLoaded) + " Mods");

    Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
 }
@@ -2,21 +2,21 @@
 #include "Common.h"

 TScopedTimer::TScopedTimer()
-    : mStartTime(TimeType::now()) {
+    : mStartTime(std::chrono::high_resolution_clock::now()) {
 }

 TScopedTimer::TScopedTimer(const std::string& mName)
-    : mStartTime(TimeType::now())
+    : mStartTime(std::chrono::high_resolution_clock::now())
    , Name(mName) {
 }

 TScopedTimer::TScopedTimer(std::function<void(size_t)> OnDestroy)
    : OnDestroy(OnDestroy)
-    , mStartTime(TimeType::now()) {
+    , mStartTime(std::chrono::high_resolution_clock::now()) {
 }

 TScopedTimer::~TScopedTimer() {
-    auto EndTime = TimeType::now();
+    auto EndTime = std::chrono::high_resolution_clock::now();
    auto Delta = EndTime - mStartTime;
    size_t TimeDelta = Delta / std::chrono::milliseconds(1);
    if (OnDestroy) {
@@ -6,7 +6,7 @@
 #include <sstream>

 TSentry::TSentry() {
-    if (std::strlen(S_DSN) == /* DISABLES CODE */ (0)) {
+    if (std::strlen(S_DSN) == 0) {
        mValid = false;
    } else {
        mValid = true;
@@ -28,22 +28,22 @@ TSentry::~TSentry() {

 void TSentry::PrintWelcome() {
    if (mValid) {
-        if (!Application::GetSettingBool("SendErrors")) {
+        if (!Application::Settings.SendErrors) {
            mValid = false;
-            if (Application::GetSettingBool(StrSendErrors)) {
+            if (Application::Settings.SendErrorsMessageEnabled) {
                beammp_info("Opted out of error reporting (SendErrors), Sentry disabled.");
            } else {
                beammp_info("Sentry disabled");
            }
        } else {
-            if (Application::GetSettingBool(StrSendErrors)) {
+            if (Application::Settings.SendErrorsMessageEnabled) {
                beammp_info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
            } else {
                beammp_info("Sentry started");
            }
        }
    } else {
-        if (Application::GetSettingBool(StrSendErrors)) {
+        if (Application::Settings.SendErrorsMessageEnabled) {
            beammp_info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
        } else {
            beammp_info("Sentry disabled in unofficial build");
@@ -57,8 +57,8 @@ void TSentry::SetupUser() {
    }
    Application::SetSubsystemStatus("Sentry", Application::Status::Good);
    sentry_value_t user = sentry_value_new_object();
-    if (Application::GetSettingString(StrAuthKey).size() == 36) {
-        sentry_value_set_by_key(user, "id", sentry_value_new_string(Application::GetSettingString(StrAuthKey).c_str()));
+    if (Application::Settings.Key.size() == 36) {
+        sentry_value_set_by_key(user, "id", sentry_value_new_string(Application::Settings.Key.c_str()));
    } else {
        sentry_value_set_by_key(user, "id", sentry_value_new_string("unauthenticated"));
    }
@@ -1,170 +1,29 @@
 #include "TServer.h"
 #include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
-#include "IterationDecision.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
 #include <TLuaPlugin.h>
-#include <algorithm>
 #include <any>
-#include <nlohmann/json.hpp>
 #include <sstream>

+#include <nlohmann/json.hpp>
+
 #include "LuaAPI.h"

 #undef GetObject // Fixes Windows

 #include "Json.h"

-struct VehiclePacket {
-    std::string Data;
-    int Pid;
-    int Vid;
-};
-
-static Result<std::pair<int, int>> GetPidVid(const std::string& str) {
-    auto IDSep = str.find('-');
-    if (IDSep == std::string::npos) {
-        return Error("Invalid packet: Could not parse pid/vid from packet, as there is no '-' separator: '{}'", str);
-    }
-    std::string pid = str.substr(0, IDSep);
-    std::string vid = str.substr(IDSep + 1);
-
-    if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
-        try {
-            int PID = std::stoi(pid);
-            int VID = std::stoi(vid);
-            return { { PID, VID } };
-        } catch (const std::exception&) {
-            return Error("Invalid packet: Could not parse pid/vid from packet, as one or both are not valid numbers: '{}'", str);
-        }
-    }
-    return Error("Invalid packet: Could not parse pid/vid from packet: '{}'", str);
-}
-
-static std::optional<VehiclePacket> ParseVehiclePacket(const std::string& Packet, const int playerID) {
-    if (Packet.size() < 8) { // 2 for code, 3<= for pidvid, 1<= for data, 2 for dividers
-        // invalid packet
-        return std::nullopt;
-    }
-    // Zp:serverVehicleID:data
-    // 0-0:data
-    std::string withoutCode = Packet.substr(3);
-
-    auto NameDataSep = withoutCode.find(':', 3);
-    if (NameDataSep == std::string::npos) {
-        beammp_debugf("Invalid packet from {} in ParseVehiclePacket: No ':' separator, assuming corrupted packet. Packet: '{}'", playerID, Packet);
-        return std::nullopt;
-    }
-    if (NameDataSep + 1 > withoutCode.size()) {
-        beammp_debugf("Invalid packet from {} in ParseVehiclePacket: Separator in unexpected place, assuming corrupted packet. Packet: '{}'", playerID, Packet);
-        return std::nullopt;
-    }
-
-    std::string ServerVehicleID = withoutCode.substr(0, NameDataSep);
-
-    std::string Data = withoutCode.substr(NameDataSep + 1);
-
-    // parse veh ID
-    auto MaybePidVid = GetPidVid(ServerVehicleID);
-    if (MaybePidVid) {
-        int PID, VID;
-        std::tie(PID, VID) = MaybePidVid.value();
-
-        if (PID == playerID) {
-            return { { Data, PID, VID } }; // std::vector<char>(Data.begin(), Data.end())
-        }
-    }
-    beammp_debugf("Failed to parse packet from player {}", playerID);
-    return std::nullopt;
-}
-
-TEST_CASE("GetPidVid") {
-    SUBCASE("Valid singledigit") {
-        const auto MaybePidVid = GetPidVid("0-1");
-        CHECK(MaybePidVid);
-        auto [pid, vid] = MaybePidVid.value();
-
-        CHECK_EQ(pid, 0);
-        CHECK_EQ(vid, 1);
-    }
-    SUBCASE("Valid doubledigit") {
-        const auto MaybePidVid = GetPidVid("10-12");
-        CHECK(MaybePidVid);
-        auto [pid, vid] = MaybePidVid.value();
-
-        CHECK_EQ(pid, 10);
-        CHECK_EQ(vid, 12);
-    }
-    SUBCASE("Empty string") {
-        const auto MaybePidVid = GetPidVid("");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid separator") {
-        const auto MaybePidVid = GetPidVid("0x0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Missing pid") {
-        const auto MaybePidVid = GetPidVid("-0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Missing vid") {
-        const auto MaybePidVid = GetPidVid("0-");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid pid") {
-        const auto MaybePidVid = GetPidVid("x-0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid vid") {
-        const auto MaybePidVid = GetPidVid("0-x");
-        CHECK(!MaybePidVid);
-    }
-}
-
-TEST_CASE("ParseVehiclePacket") {
-    SUBCASE("Valid packet") {
-        const auto valid = ParseVehiclePacket("Zp:0-0:{jsonstring}", 0);
-        CHECK(valid.has_value());
-    }
-    SUBCASE("Valid packet 2") {
-        const auto packet = ParseVehiclePacket("Zp:12-3:{jsonstring}", 12);
-        CHECK(packet.has_value());
-        CHECK_EQ(packet.value().Pid, 12);
-        CHECK_EQ(packet.value().Vid, 3);
-    }
-    SUBCASE("Missing packet") {
-        const auto valid = ParseVehiclePacket("", 0);
-        CHECK(!valid.has_value());
-    }
-    SUBCASE("Missing ServerVehicleID") {
-        const auto valid = ParseVehiclePacket("Zp:{jsonstring}", 0);
-        CHECK(!valid.has_value());
-    }
-    SUBCASE("Missing data") {
-        const auto valid = ParseVehiclePacket("Zp:0-0:", 0);
-        CHECK(!valid.has_value());
-    }
-    SUBCASE("Incorrect Pid") {
-        const auto valid = ParseVehiclePacket("Zp:0-0:{jsonstring}", 1);
-        CHECK(!valid.has_value());
-    }
-    SUBCASE("Incorrect Pid 2") {
-        const auto valid = ParseVehiclePacket("Zp:12-0:{jsonstring}", 13);
-        CHECK(!valid.has_value());
-    }
-}
-
 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::SetSetting(StrCustomIP, std::string(Arguments[0]));
-        auto CustomIP = Application::GetSettingString(StrCustomIP);
-        size_t n = std::count(CustomIP.begin(), CustomIP.end(), '.');
-        auto p = Application::GetSettingString(StrCustomIP).find_first_not_of(".0123456789");
-        if (p != std::string::npos || n != 3 || CustomIP.substr(0, 3) == "127") {
-            Application::SetSetting(StrCustomIP, "");
+        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");
@@ -174,32 +33,23 @@ TServer::TServer(const std::vector<std::string_view>& Arguments) {
 }

 void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
-    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(WeakClientPtr.lock());
-}
-
-void TServer::RemoveClientById(int Id) {
-    auto Client = GetClient(*this, Id);
-    if (Client) {
-        Client->ClearCars();
+    if (!WeakClientPtr.expired()) {
+        TClient& Client = *WeakClientPtr.lock();
+        beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
+        Client.ClearCars();
        WriteLock Lock(mClientsMutex);
-        mClients.erase(Client);
+        mClients.erase(WeakClientPtr.lock());
    }
 }

-void TServer::ForEachClientWeak(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
+std::weak_ptr<TClient> TServer::InsertNewClient() {
+    beammp_debug("inserting new client (" + std::to_string(ClientCount()) + ")");
+    WriteLock Lock(mClientsMutex);
+    auto [Iter, Replaced] = mClients.insert(std::make_shared<TClient>(*this));
+    return *Iter;
+}
+
+void TServer::ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
    decltype(mClients) Clients;
    {
        ReadLock lock(mClientsMutex);
@@ -217,11 +67,12 @@ size_t TServer::ClientCount() const {
    return mClients.size();
 }

-void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, 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());
-        Packet = DeComp(Packet);
+void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
+    if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
+        // abort();
+    }
+    if (Packet.substr(0, 4) == "ABG:") {
+        Packet = DeComp(Packet.substr(4));
    }
    if (Packet.empty()) {
        return;
@@ -235,53 +86,46 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
    std::any Res;
    char Code = Packet.at(0);

-    std::string StringPacket(reinterpret_cast<const char*>(Packet.data()), Packet.size());
-
-    // V to Y
-    if (Code <= 89 && Code >= 86) {
-        if (HandleVehicleUpdate(StringPacket, LockedClient->GetID())) {
-            Network.SendToAll(LockedClient.get(), Packet, false, false);
-        } else {
-            beammp_debugf("Invalid vehicle update packet received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-        }
+    // V to Z
+    if (Code <= 90 && Code >= 86) {
+        PPSMonitor.IncrementInternalPPS();
+        Network.SendToAll(LockedClient.get(), Packet, false, false);
        return;
    }
    switch (Code) {
    case 'H': // initial connection
+        beammp_trace(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
        if (!Network.SyncClient(Client)) {
            // TODO handle
        }
        return;
    case 'p':
-        if (!Network.Respond(*LockedClient, StringToVector("p"), false)) {
+        if (!Network.Respond(*LockedClient, ("p"), false)) {
            // failed to send
-            LockedClient->Disconnect("Failed to send ping");
+            if (LockedClient->GetStatus() > -1) {
+                LockedClient->SetStatus(-1);
+            }
        } else {
            Network.UpdatePlayer(*LockedClient);
        }
        return;
    case 'O':
-        if (Packet.size() > 1000) {
-            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.size()));
+        if (Packet.length() > 1000) {
+            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.length()));
        }
-        ParseVehicle(*LockedClient, StringPacket, Network);
+        ParseVehicle(*LockedClient, Packet, Network);
+        return;
+    case 'J':
+        beammp_trace(std::string(("got 'J' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        Network.SendToAll(LockedClient.get(), Packet, false, true);
        return;
    case 'C': {
-        if (Packet.size() < 4 || std::find(Packet.begin() + 3, Packet.end(), ':') == Packet.end())
+        beammp_trace(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        if (Packet.length() < 4 || Packet.find(':', 3) == std::string::npos)
            break;
-        const auto PacketAsString = std::string(reinterpret_cast<const char*>(Packet.data()), Packet.size());
-        std::string Message = "";
-        const auto ColonPos = PacketAsString.find(':', 3);
-        if (ColonPos != std::string::npos && ColonPos + 2 < PacketAsString.size()) {
-            Message = PacketAsString.substr(ColonPos + 2);
-        }
-        if (Message.empty()) {
-            beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-            return;
-        }
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
+        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 2));
        TLuaEngine::WaitForAll(Futures);
-        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1));
        if (std::any_of(Futures.begin(), Futures.end(),
                [](const std::shared_ptr<TLuaResult>& Elem) {
                    return !Elem->Error
@@ -290,23 +134,17 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
                })) {
            break;
        }
-        std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
-        Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
+        Network.SendToAll(nullptr, Packet, true, true);
        return;
    }
    case 'E':
-        HandleEvent(*LockedClient, StringPacket);
+        beammp_trace(std::string(("got 'E' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        HandleEvent(*LockedClient, Packet);
        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
-        if (HandlePosition(*LockedClient, StringPacket)) {
-            Network.SendToAll(LockedClient.get(), Packet, false, false);
-        } else {
-            beammp_debugf("Invalid vehicle position packet received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-        }
    default:
        return;
    }
@@ -315,10 +153,6 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
 void TServer::HandleEvent(TClient& c, const std::string& RawData) {
    // E:Name:Data
    // Data is allowed to have ':'
-    if (RawData.size() < 2) {
-        beammp_debugf("Client '{}' ({}) tried to send an empty event, ignoring", c.GetName(), c.GetID());
-        return;
-    }
    auto NameDataSep = RawData.find(':', 2);
    if (NameDataSep == std::string::npos) {
        beammp_warn("received event in invalid format (missing ':'), got: '" + RawData + "'");
@@ -336,7 +170,7 @@ bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
            return true;
        }
    } catch (const std::exception& e) {
-        beammp_warn("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'.");
+        beammp_error("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'");
    }
    return false;
 }
@@ -346,24 +180,24 @@ bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
        c.SetUnicycleID(ID);
        return true;
    } else {
-        return c.GetCarCount() < Application::GetSettingInt(StrMaxCars);
+        return c.GetCarCount() < Application::Settings.MaxCars;
    }
 }

 void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network) {
-    if (Pckt.length() < 6)
+    if (Pckt.length() < 4)
        return;
    std::string Packet = Pckt;
    char Code = Packet.at(1);
    int PID = -1;
-    int VID = -1;
+    int VID = -1, Pos;
    std::string Data = Packet.substr(3), pid, vid;
    switch (Code) { // Spawned Destroyed Switched/Moved NotFound Reset
    case 's':
-        beammp_tracef("got 'Os' packet: '{}' ({})", Packet, Packet.size());
+        beammp_trace(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
        if (Data.at(0) == '0') {
            int CarID = c.GetOpenCarID();
-            beammp_debugf("'{}' created a car with ID {}", c.GetName(), CarID);
+            beammp_debug(c.GetName() + (" created a car with ID ") + std::to_string(CarID));

            std::string CarJson = Packet.substr(5);
            Packet = "Os:" + c.GetRoles() + ":" + c.GetName() + ":" + std::to_string(c.GetID()) + "-" + std::to_string(CarID) + ":" + CarJson;
@@ -376,24 +210,26 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ

            if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn) {
                c.AddNewCar(CarID, Packet);
-                Network.SendToAll(nullptr, StringToVector(Packet), true, true);
+                Network.SendToAll(nullptr, Packet, true, true);
            } else {
-                if (!Network.Respond(c, StringToVector(Packet), true)) {
+                if (!Network.Respond(c, Packet, true)) {
                    // TODO: handle
                }
                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
-                if (!Network.Respond(c, StringToVector(Destroy), true)) {
+                if (!Network.Respond(c, Destroy, true)) {
                    // TODO: handle
                }
-                beammp_debugf("{} (force : car limit/lua) removed ID {}", c.GetName(), CarID);
+                beammp_debug(c.GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
            }
        }
        return;
-    case 'c': {
+    case 'c':
        beammp_trace(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
-        if (MaybePidVid) {
-            std::tie(PID, VID) = MaybePidVid.value();
+        pid = Data.substr(0, Data.find('-'));
+        vid = Data.substr(Data.find('-') + 1, Data.find(':', 1) - Data.find('-') - 1);
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
        }
        if (PID != -1 && VID != -1 && PID == c.GetID()) {
            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleEdited", "", c.GetID(), VID, Packet.substr(3));
@@ -407,57 +243,62 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
            FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
            if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
                && !ShouldntAllow) {
-                Network.SendToAll(&c, StringToVector(Packet), false, true);
+                Network.SendToAll(&c, Packet, false, true);
                Apply(c, VID, Packet);
            } 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);
+                if (!Network.Respond(c, Destroy, true)) {
+                    // TODO: handle
+                }
                c.DeleteCar(VID);
            }
        }
        return;
-    }
-    case 'd': {
+    case 'd':
        beammp_trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
-        if (MaybePidVid) {
-            std::tie(PID, VID) = MaybePidVid.value();
+        pid = Data.substr(0, Data.find('-'));
+        vid = Data.substr(Data.find('-') + 1);
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
        }
        if (PID != -1 && VID != -1 && PID == c.GetID()) {
            if (c.GetUnicycleID() == VID) {
                c.SetUnicycleID(-1);
            }
-            Network.SendToAll(nullptr, StringToVector(Packet), true, true);
+            Network.SendToAll(nullptr, Packet, true, true);
            // TODO: should this trigger on all vehicle deletions?
            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
            c.DeleteCar(VID);
            beammp_debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
        }
        return;
-    }
-    case 'r': {
+    case 'r':
        beammp_trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
-        if (MaybePidVid) {
-            std::tie(PID, VID) = MaybePidVid.value();
+        Pos = int(Data.find('-'));
+        pid = Data.substr(0, Pos++);
+        vid = Data.substr(Pos, Data.find(':') - Pos);
+
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
        }

        if (PID != -1 && VID != -1 && PID == c.GetID()) {
            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);
+            Network.SendToAll(&c, Packet, false, true);
        }
        return;
-    }
    case 't':
        beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        Network.SendToAll(&c, StringToVector(Packet), false, true);
+        Network.SendToAll(&c, Packet, false, true);
        return;
    case 'm':
-        Network.SendToAll(&c, StringToVector(Packet), true, true);
+        Network.SendToAll(&c, Packet, true, true);
        return;
    default:
        beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
@@ -524,20 +365,3 @@ void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
    WriteLock Lock(mClientsMutex); // TODO why is there 30+ threads locked here
    (void)mClients.insert(NewClient);
 }
-
-bool TServer::HandlePosition(TClient& c, const std::string& PacketStr) {
-    auto MaybePacket = ParseVehiclePacket(PacketStr, c.GetID());
-
-    if (MaybePacket) {
-        auto packet = MaybePacket.value();
-        c.SetCarPosition(packet.Vid, packet.Data);
-        return true;
-    }
-    return false;
-}
-
-bool TServer::HandleVehicleUpdate(const std::string& PacketStr, const int playerID) {
-    auto MaybePacket = ParseVehiclePacket(PacketStr, playerID);
-
-    return MaybePacket.has_value();
-}
@@ -1,15 +0,0 @@
-#include "Uuid.h"
-
-#include <boost/uuid/uuid.hpp>
-
-#include <boost/uuid/random_generator.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
-#include <fmt/format.h>
-#include <fmt/ostream.h>
-
-std::string uuid::GenerateUuid() {
-    static thread_local boost::uuids::random_generator Generator {};
-    boost::uuids::uuid Id { Generator() };
-    return boost::uuids::to_string(Id);
-}
@@ -1,14 +1,30 @@
 #include "VehicleData.h"

 #include "Common.h"
+#include <regex>
 #include <utility>

-TVehicleData::TVehicleData(int ID, std::string Data)
+TVehicleData::TVehicleData(int ID, const std::string& Data)
    : mID(ID)
-    , mData(std::move(Data)) {
+    , mData(Data) {
+    try {
+        std::regex Reg(R"(^[a-zA-Z0-9_\-.]+:[a-zA-Z0-9_\-.]+:[a-zA-Z0-9_\-.]+:\d+\-\d+:(\{.+\}))", std::regex::ECMAScript);
+        std::smatch Match;
+        std::string Result;
+        if (std::regex_search(Data, Match, Reg) && Match.size() > 1) {
+            Result = Match.str(1);
+            mJson = json::parse(Result);
+        }
+    } catch (const std::exception& e) {
+        beammp_debugf("Failed to parse vehicle data for vehicle {} as json, this isn't expected: {}", ID, e.what());
+    }
    beammp_trace("vehicle " + std::to_string(mID) + " constructed");
 }

 TVehicleData::~TVehicleData() {
    beammp_trace("vehicle " + std::to_string(mID) + " destroyed");
 }
+
+const json& TVehicleData::Json() const {
+    return mJson;
+}
@@ -2,6 +2,7 @@

 #include "ArgsParser.h"
 #include "Common.h"
+#include "CustomAssert.h"
 #include "Http.h"
 #include "LuaAPI.h"
 #include "SignalHandling.h"
@@ -10,13 +11,13 @@
 #include "TLuaEngine.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
-#include "TPluginMonitor.h"
 #include "TResourceManager.h"
+#include "TScopedTimer.h"
 #include "TServer.h"

 #include <iostream>
 #include <thread>
-
+#define CPPHTTPLIB_OPENSSL_SUPPORT 1
 static const std::string sCommandlineArguments = R"(
 USAGE: 
    BeamMP-Server [arguments]
@@ -43,6 +44,10 @@ EXAMPLES:
        'MyWestCoastServerConfig.toml'.
 )";

+// this is provided by the build system, leave empty for source builds
+// global, yes, this is ugly, no, it cant be done another way
+TSentry Sentry {};
+
 struct MainArguments {
    int argc {};
    char** argv {};
@@ -54,7 +59,7 @@ int BeamMPServerMain(MainArguments Arguments);

 int main(int argc, char** argv) {
    MainArguments Args { argc, argv, {}, argv[0] };
-    Args.List.reserve(size_t(argc));
+    Args.List.reserve(argc);
    for (int i = 1; i < argc; ++i) {
        Args.List.push_back(argv[i]);
    }
@@ -67,13 +72,12 @@ int main(int argc, char** argv) {
        Sentry.LogException(e, _file_basename, _line);
        MainRet = -1;
    }
-    std::exit(MainRet);
+    return MainRet;
 }

 int BeamMPServerMain(MainArguments Arguments) {
    setlocale(LC_ALL, "C");
    Application::InitializeConsole();
-    Application::Console().Internal().set_prompt("");
    ArgsParser Parser;
    Parser.RegisterArgument({ "help" }, ArgsParser::NONE);
    Parser.RegisterArgument({ "version" }, ArgsParser::NONE);
@@ -84,14 +88,16 @@ int BeamMPServerMain(MainArguments Arguments) {
        return 1;
    }
    if (Parser.FoundArgument({ "help" })) {
+        Application::Console().Internal().set_prompt("");
        Application::Console().WriteRaw(sCommandlineArguments);
        return 0;
    }
    if (Parser.FoundArgument({ "version" })) {
-        Application::Console().WriteRaw(fmt::format("BeamMP Server v{} ({})", Application::ServerVersionString(), BEAMMP_GIT_HASH));
+        Application::Console().Internal().set_prompt("");
+        Application::Console().WriteRaw("BeamMP-Server v" + Application::ServerVersionString());
        return 0;
    }
-    
+
    std::string ConfigPath = "ServerConfig.toml";
    if (Parser.FoundArgument({ "config" })) {
        auto MaybeConfigPath = Parser.GetValueOfArgument({ "config" });
@@ -114,36 +120,35 @@ int BeamMPServerMain(MainArguments Arguments) {

    Application::SetSubsystemStatus("Main", Application::Status::Starting);

-    SetupSignalHandlers();
-
-    beammp_infof("BeamMP Server v{} ({})", Application::ServerVersionString(), BEAMMP_GIT_HASH);
-
-    TConfig Config(ConfigPath);
-
-    if (Config.Failed()) {
-        beammp_info("Closing in 10 seconds");
-        // loop to make it possible to ctrl+c instead
-        Application::SleepSafeSeconds(5);
-        beammp_info("Closing in 5 seconds");
-        Application::SleepSafeSeconds(5);
-        Application::GracefullyShutdown();
-        return 1;
-    }
-
-    Application::Console().Internal().set_prompt("> ");
    Application::Console().StartLoggingToFile();

+    SetupSignalHandlers();
+
    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);
+    TConfig Config(ConfigPath);
+    TLuaEngine LuaEngine;
+    LuaEngine.SetServer(&Server);
+    Application::Console().InitializeLuaConsole(LuaEngine);
+
+    if (Config.Failed()) {
+        beammp_info("Closing in 10 seconds");
+        // loop to make it possible to ctrl+c instead
+        for (size_t i = 0; i < 20; ++i) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        }
+        return 1;
+    }

    RegisterThread("Main");

@@ -154,14 +159,16 @@ int BeamMPServerMain(MainArguments Arguments) {
    TPPSMonitor PPSMonitor(Server);
    THeartbeatThread Heartbeat(ResourceManager, Server);
    TNetwork Network(Server, PPSMonitor, ResourceManager);
-    LuaEngine->SetNetwork(&Network);
+    LuaEngine.SetNetwork(&Network);
    PPSMonitor.SetNetwork(Network);
    Application::CheckForUpdates();

-    TPluginMonitor PluginMonitor(fs::path(Application::GetSettingString(StrResourceFolder)) / "Server", LuaEngine);
-
-    if (Application::GetSettingBool(StrHTTPServerEnabled)) {
-        Http::Server::THttpServerInstance HttpServerInstance {};
+    std::unique_ptr<Http::Server::THttpServerInstance> HttpServer;
+    if (Application::Settings.HTTPServerEnabled) {
+        HttpServer = std::make_unique<Http::Server::THttpServerInstance>(
+            Server,
+            Network,
+            ResourceManager);
    }

    Application::SetSubsystemStatus("Main", Application::Status::Good);
@@ -1,22 +0,0 @@
-#define DOCTEST_CONFIG_IMPLEMENT
-#include <doctest/doctest.h>
-
-#include <Common.h>
-
-int main(int argc, char** argv) {
-    doctest::Context context;
-
-    // Application::InitializeConsole();
-
-    context.applyCommandLine(argc, argv);
-
-    int res = context.run(); // run
-
-    if (context.shouldExit()) // important - query flags (and --exit) rely on the user doing this
-        return res; // propagate the result of the tests
-
-    int client_stuff_return_code = 0;
-    // your program - if the testing framework is integrated in your production code
-
-    return res + client_stuff_return_code; // the result from doctest is propagated here as well
-}
@@ -0,0 +1,18 @@
+include(FetchContent)
+
+message(STATUS "Getting, checking and running vcpkg, this may take a while")
+
+FetchContent_Declare(
+  vcpkg
+  GIT_REPOSITORY    https://github.com/microsoft/vcpkg.git
+)
+
+FetchContent_GetProperties(vcpkg)
+
+if(NOT vcpkg_POPULATED)
+  FetchContent_Populate(vcpkg)
+  execute_process(COMMAND ./${vcpkg_SOURCE_DIR}/bootstrap-vcpkg.sh)
+endif()
+
+set(CMAKE_TOOLCHAIN_FILE ${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake
+CACHE STRING "Vcpkg toolchain file")
@@ -0,0 +1,17 @@
+{
+    "name": "beammp-server",
+    "version-string": "3.0.2",
+    "homepage": "https://beammp.com",
+    "dependencies": [
+        "sentry-native",
+        "lua",
+        "zlib",
+        "rapidjson",
+        "nlohmann-json",
+        "openssl",
+        "curl",
+        "sol2",
+        "cpp-httplib",
+        "toml11"
+    ]
+}
Author	SHA1	Message	Date
Lion Kortlepel	5c8826a337	rename HttpLibServerInstance to Server	2022-05-24 21:13:55 +02:00
Lion Kortlepel	9fccc27741	http: add /player/{name}/vehicles	2022-05-24 21:05:10 +02:00
Lion Kortlepel	b0021d42b5	add /player/{name}/ draft	2022-05-23 23:17:17 +02:00
Lion Kortlepel	5598d75fd5	fix lifetime of http server, add /version	2022-05-23 23:16:53 +02:00
Lion Kortlepel	48bb1373e1	fix toml11 include path	2022-05-23 19:03:51 +02:00
Lion Kortlepel	8fce2fc67f	http: add /players	2022-05-23 19:01:03 +02:00
Lion Kortlepel	f7acd1e819	http: add /config	2022-05-23 18:44:42 +02:00
Lion Kortlepel	b46dc664c6	http: add /ready	2022-05-23 18:30:47 +02:00
Lion Kortlepel	18b4c698fc	add openapi specification for http server	2022-05-23 18:02:07 +02:00
Lion Kortlepel	62c300f285	http: add error, exception handlers	2022-05-23 17:41:44 +02:00
Lion Kortlepel	d8e974429d	ci: use parallel build, only build server	2022-05-23 17:30:23 +02:00
Lion Kortlepel	634955660d	Revert "Remove unneeded submodules" This reverts commit `a5153e4bc1`.	2022-05-23 17:27:01 +02:00
Lion Kortlepel	1e9e068aec	Merge branch 'rc-v3.1.0' into feature-9	2022-05-23 17:26:32 +02:00
Lion Kortlepel	87ecfdbc72	use v1 endpoint	2022-05-23 17:21:44 +02:00
Lion Kortlepel	2f1881bbe7	Merge branch 'rc-v3.0.2' into feature-9	2022-05-23 17:06:23 +02:00
Lion Kortlepel	1e60ac5ba2	remove ssl options from config	2022-05-23 17:05:43 +02:00
Lion Kortlepel	cd2752a525	remove ssl code @jimkoen This was removed because, as useful and as much work as this was, we can't reasonably take responsibility for this. Instead, a server like this should always be localhost only, and if it's not, it should be behind an nginx reverse proxy anyways. We're removing the config options regarding this in one of the next commits.	2022-05-23 16:59:31 +02:00
Lion Kortlepel	66b10f19c2	update lionkor/commandline	2022-05-23 16:59:18 +02:00