Add PyAPI skell

Optimization for Russian locale.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[Bug] Enter issue title here"
+labels: bug
+assignees: ''
+
+---
+
+**Fill out general information**
+OS (windows, linux, ...):
+BeamMP-Server Version:
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Do x ...
+2. Do y ...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs**
+Please attach the `Server.log` from the run in which the issue appeared, preferably with Debug turned on in the `ServerConfig.toml`.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature Request]"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. For example: "I'm always frustrated when ...".
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen. Also supply OS information if relevant, for example "*On Linux*, I would like to be able to...".
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context about the feature request here.

.github/workflows/cmake-linux.yml

@@ -0,0 +1,44 @@
+name: CMake Linux Build
+
+on: [push]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  linux-build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+          submodules: 'recursive'
+
+    - 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
+
+    - 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: Build
+      working-directory: ${{github.workspace}}/build-linux
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: BeamMP-Server-linux
+        path: ${{github.workspace}}/build-linux/BeamMP-Server

.github/workflows/cmake-windows.yml

@@ -0,0 +1,58 @@
+name: CMake Windows Build
+
+on: [push]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  windows-build:
+    runs-on: windows-latest
+    
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'recursive'
+      
+      - name: Restore artifacts, or run vcpkg, build and cache artifacts
+        uses: lukka/run-vcpkg@v7
+        id: runvcpkg
+        with:
+            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
+            vcpkgTriplet: 'x64-windows-static'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-windows
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-windows
+        env:
+          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server.exe
+          path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
+
+      - name: Build debug
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: |
+          cmake --build . --config Debug
+      
+      - name: Archive debug artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-debug.exe
+          path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe
+

.github/workflows/release-build.yml

@@ -0,0 +1,115 @@
+name: Release Create & Build
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    name: Create Release
+    outputs: 
+      upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: true
+          body: |
+              Files included in this release:
+              - `BeamMP-Server.exe` is the windows build
+              - `BeamMP-Server-linux` is a ubuntu build, so you need the dependencies listed in README.md to run it. For any other distros please build from source as described in README.md.
+
+  upload-release-files-linux:
+    name: Upload Linux Release Files
+    runs-on: ubuntu-latest
+    needs: create-release
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'recursive'
+
+      - 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
+
+      - 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: Build
+        working-directory: ${{github.workspace}}/build-linux
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ${{github.workspace}}/build-linux/BeamMP-Server
+          asset_name: BeamMP-Server-linux
+          asset_content_type: application/x-elf
+
+  upload-release-files-windows:
+    name: Upload Windows Release Files
+    runs-on: windows-latest
+    needs: create-release
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'recursive'
+      
+      - name: Restore artifacts, or run vcpkg, build and cache artifacts
+        uses: lukka/run-vcpkg@v7
+        id: runvcpkg
+        with:
+            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
+            vcpkgTriplet: 'x64-windows-static'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-windows
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-windows
+        env:
+          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
+          asset_name: BeamMP-Server.exe
+          asset_content_type: application/vnd.microsoft.portable-executable

.gitignore

@@ -1,5 +1,10 @@
+.idea/
+.sentry-native/
+*.orig
+*.toml
 boost_*
 Resources
+run-in-env.sh
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -22,16 +27,8 @@ mono_crash.*
 out/
 
 #Clion Files
-cmake-build-debug/CMakeFiles/
-cmake-build-release/CMakeFiles/
-cmake-build-debug/Resources/
-cmake-build-release/Resources/
-cmake-build-debug/*.*
-cmake-build-release/*.*
-cmake-build-debug/Makefile
-cmake-build-release/Makefile
-!cmake-build-debug/*.lib
-!cmake-build-release/*.lib
+cmake-build-*/
+.idea/
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -51,7 +48,6 @@ bld/
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
-
 # Visual Studio 2017 auto generated files
 Generated\ Files/
 
@@ -462,3 +458,23 @@ out/build/x86-Debug/.cmake/api/v1/reply/index-2020-01-28T17-35-38-0764.json
 out/build/x86-Debug/.cmake/api/v1/reply/codemodel-v2-6a61e390ef8eaf17e9f8.json
 out/build/x86-Debug/Server.cfg
 *Server.cfg*
+*.cmake
+*.make
+*.xml
+*.includecache
+cmake-build-release/include/commandline/Makefile
+*.lib
+*.cbp
+*.marks
+*.internal
+*.xml
+cmake-build-debug/include/commandline/Makefile
+*.manifest
+*.rc
+*.res
+BeamMP-Server
+*.patch
+callgrind.*
+notes/*
+compile_commands.json
+nohup.out

.gitmodules

@@ -0,0 +1,27 @@
+[submodule "deps/commandline"]
+	path = deps/commandline
+	url = https://github.com/lionkor/commandline
+[submodule "deps/asio"]
+	path = deps/asio
+	url = https://github.com/chriskohlhoff/asio
+[submodule "deps/rapidjson"]
+	path = deps/rapidjson
+	url = https://github.com/Tencent/rapidjson
+[submodule "deps/toml11"]
+	path = deps/toml11
+	url = https://github.com/ToruNiina/toml11
+[submodule "deps/sentry-native"]
+	path = deps/sentry-native
+	url = https://github.com/getsentry/sentry-native
+[submodule "deps/sol2"]
+	path = deps/sol2
+	url = https://github.com/ThePhD/sol2
+[submodule "deps/libzip"]
+	path = deps/libzip
+	url = https://github.com/nih-at/libzip
+[submodule "deps/cpp-httplib"]
+	path = deps/cpp-httplib
+	url = https://github.com/yhirose/cpp-httplib
+[submodule "deps/json"]
+	path = deps/json
+	url = https://github.com/nlohmann/json

.idea/.gitignore

@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml

.idea/.name

@@ -1 +0,0 @@
-Server

.idea/BeamNG-MP-Server.iml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module classpath="CMake" type="CPP_MODULE" version="4" />

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

CMakeLists.txt

@@ -1,43 +1,172 @@
-cmake_minimum_required(VERSION 3.13)
-project(Server)
+cmake_minimum_required(VERSION 3.0)
+
+message(STATUS "You can find build instructions and a list of dependencies in the README at \
+https://github.com/BeamMP/BeamMP-Server")
+
+project(BeamMP-Server
+    DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
+    HOMEPAGE_URL https://beammp.com
+    LANGUAGES CXX C)
+
+set(HTTPLIB_REQUIRE_OPENSSL ON)
+
+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/json/single_include")
+include_directories("${PROJECT_SOURCE_DIR}/deps")
+
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT)
+
+if(APPLE)
+    set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
+    set(LUA_LIBRARIES lua)
+    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)
+endif()
+
+if (WIN32)
+    # 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})
+endif()
+
+include_directories("include/sentry-native/include")
+set(BUILD_SHARED_LIBS OFF)
+if (MSVC)
+    set(SENTRY_BUILD_RUNTIMESTATIC ON)
+endif()
+message(STATUS "Checking for Sentry URL")
+# this is set by the build system.
+# IMPORTANT: if you're building from source, just leave this empty
+if (NOT DEFINED BEAMMP_SECRET_SENTRY_URL)
+    message(WARNING "No sentry URL configured. Sentry logging is disabled for this build. \
+    This is not an error, and if you're building the BeamMP-Server yourself, this is expected and can be ignored.")
+    set(BEAMMP_SECRET_SENTRY_URL "")
+    set(SENTRY_BACKEND none)
+else()
+    string(LENGTH ${BEAMMP_SECRET_SENTRY_URL} URL_LEN)
+    message(STATUS "Sentry URL is length ${URL_LEN}")
+    set(SENTRY_BACKEND breakpad)
+endif()
+add_subdirectory("deps/sentry-native")
+
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+endif ()
+
+message(STATUS "Adding local source dependencies")
+# this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
+add_subdirectory(deps)
+
+message(STATUS "Setting compiler flags")
+if (WIN32)
+
+    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+    set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
+    include_directories(${VcpkgRoot}/include)
+    link_directories(${VcpkgRoot}/lib)
+elseif (UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
+    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=undefined,thread")
+    endif (SANITIZE)
+endif ()
+
+
+
 set(CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
-if (UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -g")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s -fno-builtin")
-elseif (WIN32)
-    # This might cause issues with old windows headers, but it's worth the trouble to keep the code
-    #   completely cross platform. For fixes to common issues arising from /permissive- visit:
-    #   https://docs.microsoft.com/en-us/cpp/build/reference/permissive-standards-conformance
+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
+        src/TPyEngine.cpp include/TPyEngine.h
+        src/TPyPlugin.cpp include/TPyPlugin.h
+        src/PyAPI.cpp include/PyAPI.h)
 
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /permissive-")
-    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})
-    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
-endif ()
+target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}")
+include_directories(BeamMP-Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-#find_package(Boost 1.70.0 REQUIRED COMPONENTS system thread)
+target_include_directories(BeamMP-Server PUBLIC 
+    "${CMAKE_CURRENT_SOURCE_DIR}/include" 
+    "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
 
-file(GLOB source_files "src/*.cpp" "include/*.h" "include/*/*.h" "include/*/*/*.h" "include/*.hpp" "include/*/*.hpp" "src/*/*.cpp")
-add_executable(BeamMP-Server ${source_files})
-    
-target_include_directories(BeamMP-Server PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+if (APPLE)
+    message(STATUS "NOT looking for Lua on APPLE")
+else()
+    message(STATUS "Looking for Lua")
+    find_package(Lua REQUIRED VERSION 5.3)
+endif()
 
-find_package(Lua REQUIRED)
-target_include_directories(BeamMP-Server PUBLIC ${LUA_INCLUDE_DIR})
+target_include_directories(BeamMP-Server PUBLIC 
+    ${LUA_INCLUDE_DIR} 
+    ${CURL_INCLUDE_DIRS}
+    "include/tomlplusplus" 
+    "include/sentry-native/include"
+    "include/curl/include")
+
+message(STATUS "Looking for SSL")
+
+if (APPLE)
+    set(OPENSSL_LIBRARIES ssl crypto)
+else()
+    find_package(OpenSSL REQUIRED)
+endif()
+
+target_link_libraries(BeamMP-Server sol2::sol2 ${LUA_LIBRARIES})
+message(STATUS "CURL IS ${CURL_LIBRARIES}")
 
 if (UNIX)
-    target_link_libraries(BeamMP-Server z pthread stdc++fs ${Boost_LINK_DIRS} ${LUA_LIBRARIES} curl dl)
+    target_link_libraries(BeamMP-Server
+        z 
+        pthread
+        ${LUA_LIBRARIES} 
+        crypto
+        ${OPENSSL_LIBRARIES} 
+        commandline 
+        sentry
+        ssl)
 elseif (WIN32)
     include(FindLua)
+    message(STATUS "Looking for libz")
     find_package(ZLIB REQUIRED)
-    find_package(CURL CONFIG REQUIRED)
+    message(STATUS "Looking for RapidJSON")
     find_package(RapidJSON CONFIG REQUIRED)
     target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
-    target_link_libraries(BeamMP-Server PRIVATE ws2_32 CURL::libcurl ZLIB::ZLIB ${LUA_LIBRARIES})
-    #${Boost_LINK_DIRS}
+    target_link_libraries(BeamMP-Server
+        ws2_32 
+        ZLIB::ZLIB 
+        ${LUA_LIBRARIES} 
+        ${OPENSSL_LIBRARIES} 
+        commandline
+        sentry)
 endif ()

Changelog.md

@@ -0,0 +1,123 @@
+# v3.0.2
+
+- ADDED Periodic update message if a new server is released
+- ADDED Config setting for the IP the http server listens on
+- CHANGED Default MaxPlayers to 8
+- CHANGED Default http server listen IP to localhost
+- 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
+
+- ADDED Backup URLs to UpdateCheck (will fail less often now)
+- ADDED console cursor left and right movement (with arrow keys) and working HOME and END key (via github.com/lionkor/commandline)
+- FIXED infinite snowmen / infinite unicycle spawning bug
+- FIXED a bug where, when run with --working-directory, the Server.log would still be in the original directory
+- FIXED a bug which could cause the plugin reload thread to spin at 100% if the reloaded plugin's didn't terminate
+- FIXED an issue which would cause servers to crash on mod download via SIGPIPE on POSIX
+- FIXED an issue which would cause servers to crash when checking if a vehicle is a unicycle
+
+# v3.0.0
+
+- CHANGED entire plugin Lua implementation (rewrite)
+- CHANGED moved *almost all* Lua functions into MP.\*
+- CHANGED console to use a custom language (type `help`, `list`, or `status`!)
+- CHANGED all files of a Lua plugin to share a Lua state (no more state-per-file)
+- ADDED many new Lua API functions, which can be found at <https://wiki.beammp.com/en/Scripting/functions>
+- ADDED Commandline options. Run with `--help` to see all options.
+- ADDED HTTP(S) Server (OpenAPI spec coming soon!)
+- ADDED plugin directories to `package.path` and `package.cpath` before `onInit`
+- ADDED ability to add `PluginConfig.toml` to your plugin folder to change some settings
+- ADDED ability to share a lua state with other plugins via `StateId` setting in `PluginConfig.toml`
+- ADDED ability to see name-to-thread-ID association in debug mode
+- ADDED dumping tables with `print()` (try it with `print(MP)`)
+- ADDED `MP.GetOSName()`, `MP.CreateTimer()`, `MP.GetLuaMemoryUsage()` and many more (see <https://wiki.beammp.com/en/Scripting/functions>)
+- ADDED `MP.Settings` table to make usage of `MP.Set()` easier
+- ADDED `FS.*` table with common filesystem operations (do `print(FS)` to see them!)
+- FIXED i/o thread spin when stdout is /dev/null on linux
+- FIXED removed extra whitespace infront of onChatMessage message
+
+# v2.3.3
+
+- CHANGED servers to be private by default
+
+# v2.3.2
+
+- ADDED Ctrl+C causes a graceful shutdown on windows (did already on linux)
+- ADDED more meaningful shutdown messages
+- ADDED even better backend connection error reporting
+- ADDED `SendErrors` config in `ServerConfig.toml` to opt-out of error reporting
+- ADDED hard-shutdown if Ctrl+C pressed 3 times
+- FIXED issue with shells like bash being unusable after server exit
+
+# v2.3.1
+
+- CHANGED join/sync timeout to 20 minutes, players wont drop if loading takes >5 mins
+
+# v2.3.0
+
+- ADDED version check - the server will now let you know when a new release is out
+- ADDED logging of various errors, crashes and exceptions to the backend
+- ADDED chat messages are now logged to the server console as [CHAT]
+- ADDED debug message telling you when the server heartbeats to the backend
+- REMOVED various [DEBUG] messages which were confusing (such as "breaking client loop")
+- FIXED various crashes and issues with handling unexpected backend responses
+- FIXED minor bugs due to code correctness
+
+# v2.2.0
+
+- FIXED major security flaw
+- FIXED minor bugs
+
+# v2.1.4
+
+- ADDED debug heartbeat print
+- ADDED kicking every player before shutdown
+- FIXED rare bug which led to violent crash
+- FIXED minor bugs
+
+# v2.1.3
+
+- FIXED Lua events not cancelling properly on Linux
+
+# v2.1.2
+
+- CHANGED default map to gridmap v2
+- FIXED version number display
+
+# v2.1.1
+# v2.1.0 (pre-v2.1.1)
+# v2.0.4 (pre-v2.1.0)
+
+- REMOVED boost as a runtime dependency
+- FIXED Lua plugins on Linux
+- FIXED console history on Windows
+- CHANGED to new config format TOML
+
+# v2.0.3
+
+- WORKAROUND for timeout bug / ghost player bug
+- FIXED 100% CPU spin when stdin is /dev/null.
+
+# v2.0.2
+
+- ADDED fully new commandline
+- ADDED new backend
+- ADDED automated build system
+- ADDED lua GetPlayerIdentifiers
+- ADDED lots of debug info
+- ADDED better POSTing and GETing
+- ADDED a license
+- FIXED ghost players in player list issue
+- FIXED ghost vehicle after joining issue
+- FIXED missing vehicle after joining issue
+- FIXED a lot of desync issues
+- FIXED some memory leaks
+- FIXED various crashes
+- FIXED various data-races
+- FIXED some linux-specific crashes
+- FIXED some linux-specific issues
+- FIXED bug which caused kicking to be logged as leaving
+- FIXED various internal developer quality-of-life things

LICENSE

@@ -1 +1,2 @@
-Copyright (c) 2019-present Anonymous275. BeamMP Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries, the only permission that has been granted is to use the software in its compiled form as distributed from the BeamMP.com website. Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
+Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor). BeamMP-Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder(s) in order to modify or distribute any part of the source or binaries. Special permission to modify the source-code is implicitly granted only for the purpose of upstreaming those changes directly to github.com/BeamMP/BeamMP-Server via a GitHub pull-request.
+Commercial usage is prohibited, unless explicit permission has been granted prior to usage.

README.md

@@ -1,41 +1,123 @@
 # BeamMP-Server
 
-The Server is the way we link client to each other and handle authentication, compression, and data management. It also allows lua plugins, that system is always being reviewed and improved with detailed instructions on wiki.beammp.com.
+[![CMake Windows Build](https://github.com/BeamMP/BeamMP-Server/workflows/CMake%20Windows%20Build/badge.svg?branch=master)](https://github.com/BeamMP/BeamMP-Server/actions?query=workflow%3A%22CMake+Windows+Build%22)
+[![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).
+
+**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**
+
+## Support + Contact
+
+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
+
+These values are guesstimated and are subject to change with each release.
+
+* RAM: 50+ MiB usable (not counting OS overhead)
+* CPU: >1GHz, preferably multicore
+* OS: Windows, Linux (theoretically any POSIX)
+* GPU: None
+* HDD: 10 MiB + Mods/Plugins
+* Bandwidth: 5-10 Mb/s upload
+
+## Contributing
+
+TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" label or with nobody assigned.
+
+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.
+
+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++.
+
+## 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 check out 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 only distribute windows binaries and instructions to build on Debian 10 (stable). 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 ARM or any big-endian architectures. 
+The code itself supports (the 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. 
+Recommended compilers: MSVC, GCC, CLANG.
 
-## Linux / POSIX specific build instructions
+You can find precompiled binaries under [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
 
-Currently only linux and windows are supported (generally). 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)).
+## Build Instructions
+
+**__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)).
 
 ### Prerequisites
 
-All package names are ones found in debian's (debian 10 stable) repositories, but will exist under similar names in other distros. Feel free to PR your own guide for a different distro.
+#### Windows
 
-- `git`
-- `make`
-- `cmake`
-- `g++` (must support ISO C++17)
-- `liblua5.3`
-- `libz-dev`
-- `rapidjson-dev`
-- `libcurl4-openssl-dev` (or other `libcurl4-*-dev`)
+Please use the prepackaged binaries in [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
+
+Dependencies for **windows** can be installed with [`vcpkg`](https://github.com/microsoft/vcpkg).
+These are:
+```
+> vcpkg install lua:x64-windows-static zlib:x64-windows-static rapidjson:x64-windows-static openssl:x64-windows-static websocketpp:x64-windows-static curl:x64-windows-static
+```
+
+#### Linux
+
+These package names are in the debian / ubuntu style. Feel free to PR your own guide for a different distro.
+
+Runtime dependencies for **linux**:
+
+**Debian / Ubuntu**
+```shell
+$ sudo apt install libz-dev rapidjson-dev liblua5.3-dev libssl-dev libwebsocketpp-dev libcurl4-openssl-dev git make cmake g++
+```
+
+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
+
+
+#### 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
+```
 
 ### How to build
 
+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 --recursive https://github.com/BeamMP/BeamMP-Server`
-3. `cd` into it with `cd BeamMP-Server`
-4. Run `cmake .` (with `.`)
-5. Run `make`
-6. You will now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server`. 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.
+2. Clone the repository in a location of your choice with `git clone -b v3.0.2-WithPython --recurse-submodules https://github.com/SantaSpeen/BeamMP-Server`.
+3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`.
+4. Ensure that all submodules are initialized by running `git submodule update --init --recursive`. Then change into the cloned directory by running `cd BeamMP-Server`.
+5. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
+6. Run `make -j 4` (Set `-j {cores in your CPU}`. This param use for quickly compile.)
+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, doesn't 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. BeamMP Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries, the only permission that has been granted is to use the software in its compiled form as distributed from the BeamMP.com website. Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
+Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor).
+BeamMP-Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder(s) in order to modify or distribute any part of the source or binaries. Special permission to modify the source-code is implicitly granted only for the purpose of upstreaming those changes directly to github.com/BeamMP/BeamMP-Server via a GitHub pull-request.
+Commercial usage is prohibited, unless explicit permission has been granted prior to usage.

deps/CMakeLists.txt

@@ -0,0 +1,9 @@
+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")
+
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")

include/ArgsParser.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <initializer_list>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
+
+/*
+ * Allows syntax:
+ *  --help              : long flags
+ *  --path=/home/lion   : long assignments
+ */
+class ArgsParser {
+public:
+    enum Flags : int {
+        NONE = 0,
+        REQUIRED = 1, // argument is required
+        HAS_VALUE = 2, // argument must have a value
+    };
+
+    ArgsParser() = default;
+
+    void Parse(const std::vector<std::string_view>& ArgList);
+    // prints errors if any errors occurred, in that case also returns false
+    bool Verify();
+    void RegisterArgument(std::vector<std::string>&& ArgumentNames, int Flags);
+    // pass all possible names for this argument (short, long, etc)
+    bool FoundArgument(const std::vector<std::string>& Names);
+    std::optional<std::string> GetValueOfArgument(const std::vector<std::string>& Names);
+
+private:
+    void ConsumeLongAssignment(const std::string& Arg);
+    void ConsumeLongFlag(const std::string& Arg);
+    bool IsRegistered(const std::string& Name);
+
+    struct Argument {
+        std::string Name;
+        std::optional<std::string> Value;
+    };
+
+    struct RegisteredArgument {
+        std::vector<std::string> Names;
+        int Flags;
+    };
+
+    std::vector<RegisteredArgument> mRegisteredArguments;
+    std::vector<Argument> mFoundArgs;
+};

include/Client.h

@@ -0,0 +1,108 @@
+#pragma once
+
+#include <chrono>
+#include <memory>
+#include <optional>
+#include <queue>
+#include <string>
+#include <unordered_set>
+
+#include "Common.h"
+#include "Compat.h"
+#include "VehicleData.h"
+
+class TServer;
+
+#ifdef BEAMMP_WINDOWS
+// for socklen_t
+#include <WS2tcpip.h>
+#endif // WINDOWS
+
+struct TConnection final {
+    SOCKET Socket;
+    struct sockaddr SockAddr;
+    socklen_t SockAddrLen;
+};
+
+class TClient final {
+public:
+    using TSetOfVehicleData = std::vector<TVehicleData>;
+
+    struct TVehicleDataLockPair {
+        TSetOfVehicleData* VehicleData;
+        std::unique_lock<std::mutex> Lock;
+    };
+
+    explicit TClient(TServer& Server);
+    TClient(const TClient&) = delete;
+    TClient& operator=(const TClient&) = delete;
+
+    void AddNewCar(int Ident, const std::string& Data);
+    void SetCarData(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);
+    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]] 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; }
+    void SetID(int ID) { mID = ID; }
+    [[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; }
+    [[nodiscard]] bool IsConnected() const { return mIsConnected; }
+    [[nodiscard]] bool IsSynced() const { return mIsSynced; }
+    [[nodiscard]] bool IsSyncing() const { return mIsSyncing; }
+    [[nodiscard]] bool IsGuest() const { return mIsGuest; }
+    void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
+    void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
+    void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
+    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; }
+    [[nodiscard]] TServer& Server() const;
+    void UpdatePingTime();
+    int SecondsSinceLastPing();
+
+private:
+    void InsertVehicle(int ID, const std::string& Data);
+
+    TServer& mServer;
+    bool mIsConnected = false;
+    bool mIsSynced = false;
+    bool mIsSyncing = false;
+    mutable std::mutex mMissedPacketsMutex;
+    std::queue<std::string> mPacketsSync;
+    std::unordered_map<std::string, std::string> mIdentifiers;
+    bool mIsGuest = false;
+    mutable std::mutex mVehicleDataMutex;
+    TSetOfVehicleData mVehicleData;
+    std::string mName = "Unknown Client";
+    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<std::chrono::high_resolution_clock> mLastPingTime;
+};
+
+std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);

include/Client.hpp

@@ -1,91 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 5/8/2020
-///
-
-#pragma once
-#ifdef WIN32
-#include <WS2tcpip.h>
-#else
-#include <arpa/inet.h>
-#define SOCKET int
-#endif
-#include "CustomAssert.h"
-#include <algorithm>
-#include <chrono>
-#include <set>
-#include <string>
-#include <vector>
-
-struct VData {
-    int ID = -1;
-    std::string Data;
-};
-
-class Client {
-private:
-    std::set<std::unique_ptr<VData>> VehicleData; //ID and Data;
-    std::string Name = "Unknown Client";
-    SOCKET SOCK[2] { SOCKET(-1) };
-    sockaddr_in UDPADDR;
-    std::string Role;
-    std::string DID;
-    int Status = 0;
-    int ID = -1;
-
-public:
-    bool isConnected = false;
-    bool isSynced = false;
-    bool isGuest = false;
-
-    void AddNewCar(int ident, const std::string& Data);
-    void SetCarData(int ident, const std::string& Data);
-    std::set<std::unique_ptr<VData>>& GetAllCars();
-    void SetName(const std::string& name) { Name = name; }
-    void SetRoles(const std::string& role) { Role = role; }
-    std::string GetCarData(int ident);
-    void SetUDPAddr(sockaddr_in Addr) { UDPADDR = Addr; }
-    void SetDownSock(SOCKET CSock) { SOCK[1] = CSock; }
-    void SetTCPSock(SOCKET CSock) { SOCK[0] = CSock; }
-    void SetStatus(int status) { Status = status; }
-    void DeleteCar(int ident);
-    sockaddr_in GetUDPAddr() { return UDPADDR; }
-    std::string GetRoles() { return Role; }
-    std::string GetName() { return Name; }
-    SOCKET GetDownSock() { return SOCK[1]; }
-    SOCKET GetTCPSock() { return SOCK[0]; }
-    void SetID(int ID) { this->ID = ID; }
-    int GetOpenCarID();
-    int GetCarCount();
-    void ClearCars();
-    int GetStatus() { return Status; }
-    int GetID() { return ID; }
-};
-struct ClientInterface {
-    std::set<std::unique_ptr<Client>> Clients;
-    void RemoveClient(Client*& c) {
-        Assert(c);
-        c->ClearCars();
-        auto Iter = std::find_if(Clients.begin(), Clients.end(), [&](auto& ptr) {
-            return c == ptr.get();
-        });
-        Assert(Iter != Clients.end());
-        if (Iter == Clients.end()) {
-            return;
-        }
-        Clients.erase(Iter);
-        c = nullptr;
-    }
-    void AddClient(Client*&& c) {
-        Assert(c);
-        Clients.insert(std::unique_ptr<Client>(c));
-    }
-    int Size() {
-        return int(Clients.size());
-    }
-};
-
-extern std::unique_ptr<ClientInterface> CI;

include/Common.h

@@ -0,0 +1,269 @@
+#pragma once
+
+#include "TSentry.h"
+extern TSentry Sentry;
+
+#include <array>
+#include <atomic>
+#include <cstring>
+#include <deque>
+#include <filesystem>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <sstream>
+#include <zlib.h>
+
+#include "Compat.h"
+
+#include "TConsole.h"
+
+struct Version {
+    uint8_t major;
+    uint8_t minor;
+    uint8_t patch;
+    Version(uint8_t major, uint8_t minor, uint8_t patch);
+    Version(const std::array<uint8_t, 3>& v);
+    std::string AsString();
+};
+
+// 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
+// stuff like graceful shutdown, global settings (its in the name),
+// etc.
+class Application final {
+public:
+    // types
+    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 {};
+        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
+        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
+        bool HTTPServerEnabled { false };
+        int MaxPlayers { 8 };
+        bool Private { true };
+        int MaxCars { 1 };
+        bool DebugModeEnabled { false };
+        int Port { 30814 };
+        std::string CustomIP {};
+        bool 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()>;
+
+    // methods
+    Application() = delete;
+
+    // 'Handler' is called when GracefullyShutdown is called
+    static void RegisterShutdownHandler(const TShutdownHandler& Handler);
+    // Causes all threads to finish up and exit gracefull gracefully
+    static void GracefullyShutdown();
+    static TConsole& Console() { return *mConsole; }
+    static std::string ServerVersionString();
+    static const Version& ServerVersion() { return mVersion; }
+    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",
+            "backup1.beammp.com",
+            "backup2.beammp.com"
+        };
+    }
+
+    static std::string GetBackendUrlForAuth() { return "auth.beammp.com"; }
+    static std::string GetBackendUrlForSocketIO() { return "https://backend.beammp.com"; }
+    static void CheckForUpdates();
+    static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
+    static bool IsOutdated(const Version& Current, const Version& Newest);
+
+    static void InitializeConsole() {
+        if (!mConsole) {
+            mConsole = std::make_unique<TConsole>();
+        }
+    }
+
+    enum class Status {
+        Starting,
+        Good,
+        Bad,
+        ShuttingDown,
+        Shutdown,
+    };
+
+    using SystemStatusMap = std::unordered_map<std::string /* system name */, Status /* status */>;
+
+    static const SystemStatusMap& GetSubsystemStatuses() {
+        std::unique_lock Lock(mSystemStatusMapMutex);
+        return mSystemStatusMap;
+    }
+
+    static void SetSubsystemStatus(const std::string& Subsystem, Status status);
+
+private:
+    static inline SystemStatusMap mSystemStatusMap {};
+    static inline std::mutex mSystemStatusMapMutex {};
+    static inline std::string mPPS;
+    static inline std::unique_ptr<TConsole> mConsole;
+    static inline std::mutex mShutdownHandlersMutex {};
+    static inline std::deque<TShutdownHandler> mShutdownHandlers {};
+
+    static inline Version mVersion { 3, 0, 2 };
+};
+
+std::string ThreadName(bool DebugModeOverride = false);
+void RegisterThread(const std::string& str);
+#define RegisterThreadAuto() RegisterThread(__func__)
+
+#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
+
+#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
+// trace() is a debug-build debug()
+#if defined(DEBUG)
+#define beammp_trace(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
+        }                                                                                 \
+    } while (false)
+#else
+#define beammp_trace(x)
+#endif // defined(DEBUG)
+
+void LogChatMessage(const std::string& name, int id, const std::string& msg);
+
+#define Biggest 30000
+
+template <typename T>
+inline T Comp(const T& Data) {
+    std::array<char, Biggest> C {};
+    // obsolete
+    C.fill(0);
+    z_stream defstream;
+    defstream.zalloc = 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);
+    deflate(&defstream, Z_SYNC_FLUSH);
+    deflate(&defstream, Z_FINISH);
+    deflateEnd(&defstream);
+    size_t TotalOut = defstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}
+
+template <typename T>
+inline T DeComp(const T& Compressed) {
+    std::array<char, Biggest> C {};
+    // not needed
+    C.fill(0);
+    z_stream infstream;
+    infstream.zalloc = Z_NULL;
+    infstream.zfree = Z_NULL;
+    infstream.opaque = Z_NULL;
+    infstream.avail_in = Biggest;
+    infstream.next_in = (Bytef*)(&Compressed[0]);
+    infstream.avail_out = Biggest;
+    infstream.next_out = (Bytef*)(C.data());
+    inflateInit(&infstream);
+    inflate(&infstream, Z_SYNC_FLUSH);
+    inflate(&infstream, Z_FINISH);
+    inflateEnd(&infstream);
+    size_t TotalOut = infstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}
+
+std::string GetPlatformAgnosticErrorString();
+#define S_DSN SU_RAW
+
+void LogChatMessage(const std::string& name, int id, const std::string& msg);

include/Compat.h

@@ -0,0 +1,53 @@
+#pragma once
+
+#include "Environment.h"
+
+// ======================= UNIX ========================
+
+#ifdef BEAMMP_LINUX
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <termios.h>
+#include <unistd.h>
+#include <errno.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 <sys/socket.h>
+#include <termios.h>
+#include <unistd.h>
+#include <errno.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

include/Compressor.h

@@ -1,11 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/24/2020
-///
-#pragma once
-#include <string>
-std::string Comp(std::string Data);
-std::string DeComp(std::string Compressed);

include/Cryptography.h

@@ -0,0 +1,114 @@
+// Copyright Anonymous275 8/11/2020
+
+#pragma once
+#include <array>
+#include <cstdarg>
+#include <string>
+
+namespace Crypto {
+
+constexpr auto time = __TIME__;
+constexpr auto seed = static_cast<int>(time[7]) + static_cast<int>(time[6]) * 10 + static_cast<int>(time[4]) * 60 + static_cast<int>(time[3]) * 600 + static_cast<int>(time[1]) * 3600 + static_cast<int>(time[0]) * 36000;
+
+// 1988, Stephen Park and Keith Miller
+// "Random Number Generators: Good Ones Are Hard To Find", considered as "minimal standard"
+// Park-Miller 31 bit pseudo-random number generator, implemented with G. Carta's optimisation:
+// with 32-bit math and without division
+
+template <int N>
+struct RandomGenerator {
+private:
+    static constexpr unsigned a = 16807; // 7^5
+    static constexpr unsigned m = 2147483647; // 2^31 - 1
+
+    static constexpr unsigned s = RandomGenerator<N - 1>::value;
+    static constexpr unsigned lo = a * (s & 0xFFFFu); // Multiply lower 16 bits by 16807
+    static constexpr unsigned hi = a * (s >> 16u); // Multiply higher 16 bits by 16807
+    static constexpr unsigned lo2 = lo + ((hi & 0x7FFFu) << 16u); // Combine lower 15 bits of hi with lo's upper bits
+    static constexpr unsigned hi2 = hi >> 15u; // Discard lower 15 bits of hi
+    static constexpr unsigned lo3 = lo2 + hi;
+
+public:
+    static constexpr unsigned max = m;
+    static constexpr unsigned value = lo3 > m ? lo3 - m : lo3;
+};
+
+template <>
+struct RandomGenerator<0> {
+    static constexpr unsigned value = seed;
+};
+
+template <int N, int M>
+struct RandomInt {
+    static constexpr auto value = RandomGenerator<N + 1>::value % M;
+};
+
+template <int N>
+struct RandomChar {
+    static const char value = static_cast<char>(1 + RandomInt<N, 0x7F - 1>::value);
+};
+
+template <size_t N, int K, typename Char>
+struct MangleString {
+private:
+    const char _key;
+    std::array<Char, N + 1> _encrypted;
+
+    constexpr Char enc(Char c) const {
+        return c ^ _key;
+    }
+
+    Char dec(Char c) const {
+        return c ^ _key;
+    }
+
+public:
+    template <size_t... Is>
+    constexpr MangleString(const Char* str, std::index_sequence<Is...>)
+        : _key(RandomChar<K>::value)
+        , _encrypted { enc(str[Is])... } { }
+
+    decltype(auto) decrypt() {
+        for (size_t i = 0; i < N; ++i) {
+            _encrypted[i] = dec(_encrypted[i]);
+        }
+        _encrypted[N] = '\0';
+        return _encrypted.data();
+    }
+};
+
+static auto w_printf = [](const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    vprintf(fmt, args);
+    va_end(args);
+};
+
+static auto w_printf_s = [](const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    vprintf(fmt, args);
+    va_end(args);
+};
+
+static auto w_sprintf_s = [](char* buf, size_t, const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    vsprintf(buf, fmt, args);
+    va_end(args);
+};
+
+static auto w_sprintf_s_ret = [](char* buf, size_t, const char* fmt, ...) {
+    int ret;
+    va_list args;
+    va_start(args, fmt);
+    ret = vsprintf(buf, fmt, args);
+    va_end(args);
+    return ret;
+};
+
+#define XOR_C(s) [] { constexpr Crypto::MangleString< sizeof(s)/sizeof(char) - 1, __COUNTER__, char > expr( s, std::make_index_sequence< sizeof(s)/sizeof(char) - 1>() ); return expr; }().decrypt()
+#define XOR_W(s) [] { constexpr Crypto::MangleString< sizeof(s)/sizeof(wchar_t) - 1, __COUNTER__, wchar_t > expr( s, std::make_index_sequence< sizeof(s)/sizeof(wchar_t) - 1>() ); return expr; }().decrypt()
+#define RAWIFY(s) XOR_C(s)
+
+}

include/Curl/Http.h

@@ -1,11 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/18/2020
-///
-#pragma once
-#include <string>
-std::string HttpRequest(const std::string& IP, int port);
-std::string PostHTTP(const std::string& IP, const std::string& Fields, bool json);

include/CustomAssert.h

@@ -15,7 +15,7 @@
 #include <sstream>
 #include <thread>
 
-#include "Logger.h"
+#include "Common.h"
 
 static const char* const ANSI_RESET = "\u001b[0m";
 
@@ -40,7 +40,8 @@ static const char* const ANSI_WHITE_BOLD = "\u001b[37;1m";
 static const char* const ANSI_BOLD = "\u001b[1m";
 static const char* const ANSI_UNDERLINE = "\u001b[4m";
 
-#if DEBUG
+#ifdef DEBUG
+#include <iostream>
 inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const char* function, [[maybe_unused]] unsigned line,
     [[maybe_unused]] const char* condition_string, [[maybe_unused]] bool result) {
     if (!result) {
@@ -54,14 +55,19 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
     }
 }
 
-#define Assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
-#define AssertNotReachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
+#define beammp_assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
+#define beammp_assert_not_reachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
 #else
 // In release build, these macros turn into NOPs. The compiler will optimize these out.
-#define Assert(x) \
-    do {          \
+#define beammp_assert(cond)                                           \
+    do {                                                              \
+        bool result = (cond);                                         \
+        if (!result) {                                                \
+            Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
+        }                                                             \
     } while (false)
-#define AssertNotReachable() \
-    do {                     \
+#define beammp_assert_not_reachable()                                             \
+    do {                                                                          \
+        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__); \
     } while (false)
 #endif // DEBUG

include/Defer.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <functional>
+
+template <typename FnT>
+class Defer final {
+public:
+    Defer(FnT fn)
+        : mFunction([&fn] { (void)fn(); }) { }
+    ~Defer() {
+        if (mFunction) {
+            mFunction();
+        }
+    }
+
+private:
+    std::function<void()> mFunction;
+};

include/Environment.h

@@ -0,0 +1,17 @@
+#pragma once
+
+// one of BEAMMP_{WINDOWS,LINUX,APPLE} will be set at the end of this
+
+// clang-format off
+#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE)
+    #if defined(_WIN32) || defined(__CYGWIN__)
+        #define BEAMMP_WINDOWS
+    #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__unix__) || defined(__unix) || defined(unix)
+        #define BEAMMP_LINUX
+    #elif defined(__APPLE__) || defined(__MACH__)
+        #define BEAMMP_APPLE
+    #else
+        #error "This platform is not known. Please define one of the above for your OS."
+    #endif
+#endif
+// clang-format on

include/Http.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#include <Common.h>
+#include <IThreaded.h>
+#include <filesystem>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <string>
+#include <unordered_map>
+
+#if defined(BEAMMP_LINUX)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+#include <httplib.h>
+#if defined(BEAMMP_LINUX)
+#pragma GCC diagnostic pop
+#endif
+
+namespace fs = std::filesystem;
+
+namespace Crypto {
+constexpr size_t RSA_DEFAULT_KEYLENGTH { 2048 };
+}
+
+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 = {});
+namespace Status {
+    std::string ToString(int code);
+}
+const std::string ErrorString = "-1";
+
+namespace Server {
+    void SetupEnvironment();
+    // todo: Add non TLS Server Instance, this one is TLS only
+    class THttpServerInstance {
+    public:
+        THttpServerInstance();
+        static fs::path KeyFilePath;
+        static fs::path CertFilePath;
+
+    protected:
+        void operator()();
+
+    private:
+        std::thread mThread;
+    };
+    // todo: all of these functions are likely unsafe,
+    // todo: replace with something that's managed by a domain specific crypto library
+    class Tx509KeypairGenerator {
+    public:
+        static long GenerateRandomId();
+        static bool EnsureTLSConfigExists();
+        static X509* GenerateCertificate(EVP_PKEY& pkey);
+        static EVP_PKEY* GenerateKey();
+        static void GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath);
+    };
+}
+}

include/IThreaded.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <thread>
+
+// pure virtual class to be inherited from by classes which intend to be threaded
+class IThreaded {
+public:
+    IThreaded()
+        // invokes operator() on this object
+        : mThread() { }
+    ~IThreaded() noexcept {
+        if (mThread.joinable()) {
+            mThread.join();
+        }
+    }
+
+    virtual void Start() final {
+        mThread = std::thread([this] { (*this)(); });
+    }
+    virtual void operator()() = 0;
+
+protected:
+    std::thread mThread;
+};

include/Json.h

@@ -1,12 +1,9 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 11/27/2020
-///
+//
+// Created by anon on 4/21/21.
+//
+
 #pragma once
-#include "rapidjson/document.h"
 #include "rapidjson/stringbuffer.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/document.h"
 #include "rapidjson/writer.h"
-namespace json = rapidjson;

include/Logger.h

@@ -1,21 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 4/2/2020.
-///
-#pragma once
-
-#include <iostream>
-#include <mutex>
-#include <string>
-void InitLog();
-#define DebugPrintTID() DebugPrintTIDInternal(__func__, false)
-void DebugPrintTIDInternal(const std::string& func, bool overwrite = true); // prints the current thread id in debug mode, to make tracing of crashes and asserts easier
-void ConsoleOut(const std::string& msg);
-void except(const std::string& toPrint);
-void debug(const std::string& toPrint);
-void error(const std::string& toPrint);
-void info(const std::string& toPrint);
-void warn(const std::string& toPrint);

include/Lua/LuaSystem.hpp

@@ -1,81 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 5/20/2020
-///
-
-#pragma once
-#include <any>
-#include <filesystem>
-#include <iostream>
-#include <lua.hpp>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <thread>
-#include <vector>
-
-namespace fs = std::filesystem;
-
-struct LuaArg {
-    std::vector<std::any> args;
-    void PushArgs(lua_State* State) {
-        for (std::any arg : args) {
-            if (!arg.has_value())
-                return;
-            std::string Type = arg.type().name();
-            if (Type.find("bool") != std::string::npos) {
-                lua_pushboolean(State, std::any_cast<bool>(arg));
-            }
-            if (Type.find("basic_string") != std::string::npos || Type.find("char") != std::string::npos) {
-                lua_pushstring(State, std::any_cast<std::string>(arg).c_str());
-            }
-            if (Type.find("int") != std::string::npos) {
-                lua_pushinteger(State, std::any_cast<int>(arg));
-            }
-            if (Type.find("float") != std::string::npos) {
-                lua_pushnumber(State, std::any_cast<float>(arg));
-            }
-        }
-    }
-};
-
-class Lua {
-private:
-    std::set<std::pair<std::string, std::string>> _RegisteredEvents;
-    lua_State* luaState { nullptr };
-    fs::file_time_type _LastWrote;
-    std::string _PluginName {};
-    std::string _FileName {};
-    bool _StopThread = false;
-    bool _Console = false;
-
-public:
-    void Init();
-    void RegisterEvent(const std::string& Event, const std::string& FunctionName);
-    std::string GetRegistered(const std::string& Event) const;
-    void UnRegisterEvent(const std::string& Event);
-    void SetLastWrite(fs::file_time_type time);
-    bool IsRegistered(const std::string& Event);
-    void SetPluginName(const std::string& Name);
-    void Execute(const std::string& Command);
-    void SetFileName(const std::string& Name);
-    fs::file_time_type GetLastWrite();
-    std::string GetPluginName() const;
-    std::string GetFileName() const;
-    lua_State* GetState();
-    const lua_State* GetState() const;
-    std::string GetOrigin();
-    std::mutex Lock;
-    void Reload();
-    Lua(const std::string& PluginName, const std::string& FileName, fs::file_time_type LastWrote, bool Console = false);
-    Lua(bool Console = false);
-    ~Lua();
-    void SetStopThread(bool StopThread) { _StopThread = StopThread; }
-    bool GetStopThread() const { return _StopThread; }
-};
-std::any CallFunction(Lua* lua, const std::string& FuncName, std::shared_ptr<LuaArg> args);
-std::any TriggerLuaEvent(const std::string& Event, bool local, Lua* Caller, std::shared_ptr<LuaArg> arg, bool Wait);
-extern std::set<std::unique_ptr<Lua>> PluginEngine;

include/LuaAPI.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include "TLuaEngine.h"
+#include <tuple>
+
+namespace LuaAPI {
+    int PanicHandler(lua_State* State);
+    std::string LuaToString(sol::object Value, size_t Indent = 1, bool QuoteStrings = false);
+    void Print(sol::variadic_args);
+    namespace MP {
+        extern TLuaEngine* Engine;
+
+        std::string GetOSName();
+        std::tuple<int, int, int> GetServerVersion();
+        bool TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data);
+        inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
+        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);
+        void Sleep(size_t Ms);
+        void PrintRaw(sol::variadic_args);
+    }
+    namespace FS {
+        std::pair<bool, std::string> CreateDirectory(const std::string& Path);
+        std::pair<bool, std::string> Remove(const std::string& Path);
+        std::pair<bool, std::string> Rename(const std::string& Path, const std::string& NewPath);
+        std::pair<bool, std::string> Copy(const std::string& Path, const std::string& NewPath);
+        std::string GetFilename(const std::string& Path);
+        std::string GetExtension(const std::string& Path);
+        std::string GetParentFolder(const std::string& Path);
+        bool Exists(const std::string& Path);
+        bool IsDirectory(const std::string& Path);
+        bool IsFile(const std::string& Path);
+        std::string ConcatPaths(sol::variadic_args Args);
+    }
+    namespace CL {
+        void SendPacket(int ID, const std::string& Packet);
+        void SendNotify(int ID, const std::string& Notify);
+    }
+}

include/Network.h

@@ -1,25 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/31/2020
-///
-#pragma once
-#include "Client.hpp"
-#include <string>
-void TCPServerMain();
-void UpdatePlayers();
-void OnConnect(Client* c);
-void TCPClient(Client* c);
-std::string TCPRcv(Client* c);
-void SyncResources(Client* c);
-[[noreturn]] void UDPServerMain();
-void OnDisconnect(Client* c, bool kicked);
-void UDPSend(Client* c, std::string Data);
-void SendLarge(Client* c, std::string Data);
-bool TCPSend(Client* c, const std::string& Data);
-void GParser(Client* c, const std::string& Packet);
-std::string StaticReason(bool Set, const std::string& R);
-void Respond(Client* c, const std::string& MSG, bool Rel);
-void SendToAll(Client* c, const std::string& Data, bool Self, bool Rel);

include/PyAPI.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "TPyEngine.h"
+#include <tuple>
+
+namespace PyAPI {
+    namespace MP {
+    }
+    namespace FS {
+    }
+    namespace CL {
+    }
+}

include/RWMutex.h

@@ -7,6 +7,7 @@
  */
 
 #include <shared_mutex>
+#include <mutex>
 
 // Use ReadLock(m) and WriteLock(m) to lock it.
 using RWMutex = std::shared_mutex;

include/Security/Enc.h

@@ -1,15 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#pragma once
-#ifdef __linux
-#define EXCEPTION_POINTERS void
-#else
-#include <WS2tcpip.h>
-#endif
-#include <string>
-int Handle(EXCEPTION_POINTERS* ep, char* Origin);

include/Settings.h

@@ -1,28 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#pragma once
-#include <string>
-extern std::string ServerName;
-extern std::string ServerDesc;
-extern std::string StatReport;
-extern std::string FileSizes;
-extern std::string Resource;
-extern std::string FileList;
-extern std::string CustomIP;
-extern std::string MapName;
-extern uint64_t MaxModSize;
-extern std::string Key;
-std::string GetSVer();
-std::string GetCVer();
-extern int MaxPlayers;
-extern int ModsLoaded;
-extern bool Private;
-extern int MaxCars;
-extern bool Debug;
-extern int Port;
-extern int PPS;

include/SignalHandling.h

@@ -0,0 +1,3 @@
+#pragma once
+
+void SetupSignalHandlers();

include/Startup.h

@@ -1,16 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#pragma once
-void InitServer(int argc, char* argv[]);
-void ConsoleInit();
-void InitConfig();
-void InitLua();
-void InitRes();
-void HBInit();
-void StatInit();
-void NetMain();

include/TConfig.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "Common.h"
+
+#include <atomic>
+
+#define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
+#include <toml11/toml.hpp> // header-only version of TOML++
+
+namespace fs = std::filesystem;
+
+class TConfig {
+public:
+    explicit TConfig(const std::string& ConfigFileName);
+
+    [[nodiscard]] bool Failed() const { return mFailed; }
+
+    void FlushToFile();
+
+private:
+    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, 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();
+    bool mFailed { false };
+    std::string mConfigFileName;
+};

include/TConsole.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include "Cryptography.h"
+#include "commandline.h"
+#include <atomic>
+#include <fstream>
+
+class TLuaEngine;
+
+class TConsole {
+public:
+    TConsole();
+
+    void Write(const std::string& str);
+    void WriteRaw(const std::string& str);
+    void InitializeLuaConsole(TLuaEngine& Engine);
+    void BackupOldLog();
+    void StartLoggingToFile();
+    Commandline& Internal() { return mCommandline; }
+
+private:
+    void RunAsCommand(const std::string& cmd, bool IgnoreNotACommand = false);
+    void ChangeToLuaConsole(const std::string& LuaStateId);
+    void ChangeToRegularConsole();
+
+    void Command_Lua(const std::string& cmd);
+    void Command_Help(const std::string& cmd);
+    void Command_Kick(const std::string& cmd);
+    void Command_Say(const std::string& cmd);
+    void Command_List(const std::string& cmd);
+    void Command_Status(const std::string& cmd);
+
+    Commandline mCommandline;
+    std::vector<std::string> mCachedLuaHistory;
+    std::vector<std::string> mCachedRegularHistory;
+    TLuaEngine* mLuaEngine { nullptr };
+    bool mIsLuaConsole { false };
+    bool mFirstTime { true };
+    std::string mStateId;
+    const std::string mDefaultStateId = "BEAMMP_SERVER_CONSOLE";
+    std::ofstream mLogFileStream;
+    std::mutex mLogFileStreamMtx;
+};

include/THeartbeatThread.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "Common.h"
+#include "IThreaded.h"
+#include "TResourceManager.h"
+#include "TServer.h"
+
+class THeartbeatThread : public IThreaded {
+public:
+    THeartbeatThread(TResourceManager& ResourceManager, TServer& Server);
+    //~THeartbeatThread();
+    void operator()() override;
+
+private:
+    std::string GenerateCall();
+    std::string GetPlayers();
+
+    bool mShutdown = false;
+    TResourceManager& mResourceManager;
+    TServer& mServer;
+};

include/TLuaEngine.h

@@ -0,0 +1,241 @@
+#pragma once
+
+#include "TNetwork.h"
+#include "TServer.h"
+#include <any>
+#include <condition_variable>
+#include <filesystem>
+#include <initializer_list>
+#include <list>
+#include <lua.hpp>
+#include <memory>
+#include <mutex>
+#include <queue>
+#include <set>
+#include <toml11/toml.hpp>
+#include <unordered_map>
+#include <vector>
+
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+using TLuaStateId = std::string;
+namespace fs = std::filesystem;
+/**
+ * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
+ */
+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;
+
+struct TLuaResult {
+    std::atomic_bool Ready;
+    std::atomic_bool Error;
+    std::string ErrorMessage;
+    sol::object Result { sol::lua_nil };
+    TLuaStateId StateId;
+    std::string Function;
+    // TODO: Add condition_variable
+    void WaitUntilReady();
+};
+
+struct TLuaPluginConfig {
+    static inline const std::string FileName = "PluginConfig.toml";
+    TLuaStateId StateId;
+    // TODO: Add execute list
+};
+
+struct TLuaChunk {
+    TLuaChunk(std::shared_ptr<std::string> Content,
+        std::string FileName,
+        std::string PluginPath);
+    std::shared_ptr<std::string> Content;
+    std::string FileName;
+    std::string PluginPath;
+};
+
+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,
+        Precise,
+    };
+
+    struct QueuedFunction {
+        std::string FunctionName;
+        std::shared_ptr<TLuaResult> Result;
+        std::vector<TLuaArgTypes> Args;
+        std::string EventName; // optional, may be empty
+    };
+
+    TLuaEngine();
+    ~TLuaEngine() noexcept {
+        beammp_debug("Lua Engine terminated");
+    }
+
+    void operator()() override;
+
+    TNetwork& Network() { return *mNetwork; }
+    TServer& Server() { return *mServer; }
+
+    void SetNetwork(TNetwork* Network) { mNetwork = Network; }
+    void SetServer(TServer* Server) { mServer = Server; }
+
+    size_t GetResultsToCheckSize() {
+        std::unique_lock Lock(mResultsToCheckMutex);
+        return mResultsToCheck.size();
+    }
+    size_t GetLuaStateCount() {
+        std::unique_lock Lock(mLuaStatesMutex);
+        return mLuaStates.size();
+    }
+    size_t GetTimedEventsCount() {
+        std::unique_lock Lock(mTimedEventsMutex);
+        return mTimedEvents.size();
+    }
+    size_t GetRegisteredEventHandlerCount() {
+        std::unique_lock Lock(mLuaEventsMutex);
+        size_t LuaEventsCount = 0;
+        for (const auto& State : mLuaEvents) {
+            for (const auto& Events : State.second) {
+                LuaEventsCount += Events.second.size();
+            }
+        }
+        return LuaEventsCount - GetLuaStateCount();
+    }
+
+    static void WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results,
+        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<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
+     * @param EventName Name of the event
+     * @param IgnoreId
+     * @param Args
+     * @return
+     */
+    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerEvent(const std::string& EventName, TLuaStateId IgnoreId, ArgsT&&... Args) {
+        std::unique_lock Lock(mLuaEventsMutex);
+        beammp_event(EventName);
+        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<TLuaArgTypes> Arguments { TLuaArgTypes { std::forward<ArgsT>(Args) }... };
+
+        for (const auto& Event : mLuaEvents.at(EventName)) {
+            for (const auto& Function : Event.second) {
+                if (Event.first != IgnoreId) {
+                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments));
+                }
+            }
+        }
+        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);
+    sol::state_view GetStateForPlugin(const fs::path& PluginPath);
+    TLuaStateId GetStateIDForPlugin(const fs::path& PluginPath);
+    void AddResultToCheck(const std::shared_ptr<TLuaResult>& Result);
+
+    static constexpr const char* BeamMPFnNotFoundError = "BEAMMP_FN_NOT_FOUND";
+
+private:
+    void CollectAndInitPlugins();
+    void InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config);
+    void FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config);
+    size_t CalculateMemoryUsage();
+
+    class StateThreadData : IThreaded {
+    public:
+        StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine);
+        StateThreadData(const StateThreadData&) = delete;
+        ~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<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); }
+
+    private:
+        sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
+        sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
+        sol::table Lua_GetPlayerIdentifiers(int ID);
+        sol::table Lua_GetPlayers();
+        std::string Lua_GetPlayerName(int ID);
+        sol::table Lua_GetPlayerVehicles(int ID);
+        sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
+        int Lua_GetPlayerIDByName(const std::string& Name);
+
+        std::string mName;
+        std::atomic_bool& mShutdown;
+        TLuaStateId mStateId;
+        lua_State* mState;
+        std::thread mThread;
+        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> mStateExecuteQueue;
+        std::recursive_mutex mStateExecuteQueueMutex;
+        std::vector<QueuedFunction> mStateFunctionQueue;
+        std::mutex mStateFunctionQueueMutex;
+        std::condition_variable mStateFunctionQueueCond;
+        TLuaEngine* mEngine;
+        sol::state_view mStateView { mState };
+        std::queue<fs::path> mPaths;
+        std::recursive_mutex mPathsMutex;
+    };
+
+    struct TimedEvent {
+        std::chrono::high_resolution_clock::duration Duration {};
+        std::chrono::high_resolution_clock::time_point LastCompletion {};
+        std::string EventName;
+        TLuaStateId StateId;
+        CallStrategy Strategy;
+        bool Expired();
+        void Reset();
+    };
+
+    TNetwork* mNetwork;
+    TServer* mServer;
+    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;
+    std::unordered_map<std::string /* event name */, std::unordered_map<TLuaStateId, std::set<std::string>>> mLuaEvents;
+    std::recursive_mutex mLuaEventsMutex;
+    std::vector<TimedEvent> mTimedEvents;
+    std::recursive_mutex mTimedEventsMutex;
+    std::list<std::shared_ptr<TLuaResult>> mResultsToCheck;
+    std::mutex mResultsToCheckMutex;
+    std::condition_variable mResultsToCheckCond;
+};
+
+// std::any TriggerLuaEvent(const std::string& Event, bool local, TLuaPlugin* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);

include/TLuaPlugin.h

@@ -0,0 +1,19 @@
+#include "TLuaEngine.h"
+
+class TLuaPlugin {
+public:
+    TLuaPlugin(TLuaEngine& Engine, const TLuaPluginConfig& Config, const fs::path& MainFolder);
+    TLuaPlugin(const TLuaPlugin&) = delete;
+    TLuaPlugin& operator=(const TLuaPlugin&) = delete;
+    ~TLuaPlugin() noexcept = default;
+
+    const TLuaPluginConfig& GetConfig() const { return mConfig; }
+    fs::path GetFolder() const { return mFolder; }
+
+private:
+    TLuaPluginConfig mConfig;
+    TLuaEngine& mEngine;
+    fs::path mFolder;
+    std::string mPluginName;
+    std::unordered_map<std::string, std::shared_ptr<std::string>> mFileContents;
+};

include/TNetwork.h

@@ -0,0 +1,51 @@
+#pragma once
+
+#include "Compat.h"
+#include "TResourceManager.h"
+#include "TServer.h"
+
+struct TConnection;
+
+class TNetwork {
+public:
+    TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager);
+
+    [[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(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::string Data) const;
+    void SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel);
+    void UpdatePlayer(TClient& Client);
+
+private:
+    void UDPServerMain();
+    void TCPServerMain();
+
+    TServer& mServer;
+    TPPSMonitor& mPPSMonitor;
+    SOCKET mUDPSock {};
+    bool mShutdown { false };
+    TResourceManager& mResourceManager;
+    std::thread mUDPThread;
+    std::thread mTCPThread;
+
+    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, bool kicked);
+    void Parse(TClient& c, const std::string& Packet);
+    void SendFile(TClient& c, const std::string& Name);
+    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);
+};

include/TPPSMonitor.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "Common.h"
+#include "TServer.h"
+#include <optional>
+
+class TNetwork;
+
+class TPPSMonitor : public IThreaded {
+public:
+    explicit TPPSMonitor(TServer& Server);
+
+    void operator()() override;
+
+    void SetInternalPPS(int NewPPS) { mInternalPPS = NewPPS; }
+    void IncrementInternalPPS() { ++mInternalPPS; }
+    [[nodiscard]] int InternalPPS() const { return mInternalPPS; }
+    void SetNetwork(TNetwork& Server) { mNetwork = std::ref(Server); }
+
+private:
+    TNetwork& Network() { return mNetwork->get(); }
+
+    TServer& mServer;
+    std::optional<std::reference_wrapper<TNetwork>> mNetwork { std::nullopt };
+    bool mShutdown { false };
+    int mInternalPPS { 0 };
+};

include/TPyEngine.h

@@ -0,0 +1,3 @@
+#pragma once
+
+class TPyPlugin;

include/TPyPlugin.h

@@ -0,0 +1 @@
+#pragma once

include/TResourceManager.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "Common.h"
+
+class TResourceManager {
+public:
+    TResourceManager();
+
+    [[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 mMaxModSize = 0;
+    std::string mFileSizes;
+    std::string mFileList;
+    std::string mTrimmedList;
+    int mModsLoaded = 0;
+};

include/TScopedTimer.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <chrono>
+#include <functional>
+#include <string>
+
+class TScopedTimer {
+public:
+    TScopedTimer();
+    TScopedTimer(const std::string& Name);
+    TScopedTimer(std::function<void(size_t)> OnDestroy);
+    ~TScopedTimer();
+    auto GetElapsedTime() const {
+        auto EndTime = std::chrono::high_resolution_clock::now();
+        auto Delta = EndTime - mStartTime;
+        size_t TimeDelta = Delta / std::chrono::milliseconds(1);
+        return TimeDelta;
+    }
+
+    std::function<void(size_t /* time_ms */)> OnDestroy { nullptr };
+
+private:
+    std::chrono::high_resolution_clock::time_point mStartTime;
+    std::string Name;
+};

include/TSentry.h

@@ -0,0 +1,38 @@
+#ifndef SENTRY_H
+#define SENTRY_H
+
+#include <mutex>
+#include <string>
+#include <unordered_map>
+enum class SentryLevel {
+    Debug = -1,
+    Info = 0,
+    Warning = 1,
+    Error = 2,
+    Fatal = 3,
+};
+
+// singleton, dont make this twice
+class TSentry final {
+public:
+    TSentry();
+    ~TSentry();
+
+    void PrintWelcome();
+    void SetupUser();
+    void Log(SentryLevel level, const std::string& logger, const std::string& text);
+    void LogError(const std::string& text, const std::string& file, const std::string& line);
+    void SetContext(const std::string& context_name, const std::unordered_map<std::string, std::string>& map);
+    void LogException(const std::exception& e, const std::string& file, const std::string& line);
+    void LogAssert(const std::string& condition_string, const std::string& file, const std::string& line, const std::string& function);
+    void AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line);
+    // cleared when Logged
+    void SetTransaction(const std::string& id);
+    [[nodiscard]] std::unique_lock<std::mutex> CreateExclusiveContext();
+
+private:
+    bool mValid { true };
+    std::mutex mMutex;
+};
+
+#endif // SENTRY_H

include/TServer.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include "IThreaded.h"
+#include "RWMutex.h"
+#include "TScopedTimer.h"
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <unordered_set>
+
+class TClient;
+class TNetwork;
+class TPPSMonitor;
+
+class TServer final {
+public:
+    using TClientSet = std::unordered_set<std::shared_ptr<TClient>>;
+
+    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>&);
+    // in Fn, return true to continue, return false to break
+    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::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
+    static void HandleEvent(TClient& c, const std::string& Data);
+    RWMutex& GetClientMutex() const { return mClientsMutex; }
+
+    
+    const TScopedTimer UptimeTimer;
+private:
+    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);
+};

include/UnixCompat.h

@@ -1,38 +0,0 @@
-// Author: lionkor
-
-#pragma once
-
-// This header defines unix equivalents of common win32 functions.
-
-#ifndef WIN32
-
-#include "CustomAssert.h"
-#include <cstring>
-#include <sys/socket.h>
-#include <unistd.h>
-
-// ZeroMemory is just a {0} or a memset(addr, 0, len), and it's a macro on MSVC
-inline void ZeroMemory([[maybe_unused]] void* dst, [[maybe_unused]] size_t len) {
-    [[maybe_unused]] auto res = std::memset(dst, 0, len);
-    Assert(res != nullptr);
-}
-// provides unix equivalent of closesocket call in win32
-inline void CloseSocketProper(int socket) {
-    shutdown(socket, SHUT_RDWR);
-    close(socket);
-}
-
-#ifndef __try
-#define __try
-#endif
-
-#ifndef __except
-#define __except (x) /**/
-#endif
-
-#else // win32
-inline void CloseSocketProper(uint64_t socket) {
-    shutdown(socket, SD_BOTH);
-    closesocket(socket);
-}
-#endif // WIN32

include/VehicleData.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <string>
+
+class TVehicleData final {
+public:
+    TVehicleData(int ID, std::string Data);
+    ~TVehicleData();
+    // We cannot delete this, since vector needs to be able to copy when it resizes.
+    // Deleting this causes some wacky template errors which are hard to decipher,
+    // and end up making no sense, so let's just leave the copy ctor.
+    // TVehicleData(const TVehicleData&) = delete;
+
+    [[nodiscard]] bool IsInvalid() const { return mID == -1; }
+    [[nodiscard]] int ID() const { return mID; }
+
+    [[nodiscard]] std::string Data() const { return mData; }
+    void SetData(const std::string& Data) { mData = Data; }
+
+    bool operator==(const TVehicleData& v) const { return mID == v.mID; }
+
+private:
+    int mID { -1 };
+    std::string mData;
+};
+
+// TODO: unused now, remove?
+namespace std {
+template <>
+struct hash<TVehicleData> {
+    std::size_t operator()(const TVehicleData& s) const noexcept {
+        return s.ID();
+    }
+};
+}

src/ArgsParser.cpp

@@ -0,0 +1,94 @@
+#include "ArgsParser.h"
+#include "Common.h"
+#include <algorithm>
+
+void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
+    for (const auto& Arg : ArgList) {
+        if (Arg.size() > 2 && Arg.substr(0, 2) == "--") {
+            // long arg
+            if (Arg.find("=") != Arg.npos) {
+                ConsumeLongAssignment(std::string(Arg));
+            } else {
+                ConsumeLongFlag(std::string(Arg));
+            }
+        } else {
+            beammp_error("Error parsing commandline arguments: Supplied argument '" + std::string(Arg) + "' is not a valid argument and was ignored.");
+        }
+    }
+}
+
+bool ArgsParser::Verify() {
+    bool Ok = true;
+    for (const auto& RegisteredArg : mRegisteredArguments) {
+        if (RegisteredArg.Flags & Flags::REQUIRED && !FoundArgument(RegisteredArg.Names)) {
+            beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' is required but wasn't found.");
+            Ok = false;
+            continue;
+        } else if (FoundArgument(RegisteredArg.Names)) {
+            if (RegisteredArg.Flags & Flags::HAS_VALUE) {
+                if (!GetValueOfArgument(RegisteredArg.Names).has_value()) {
+                    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()) {
+                beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' does not expect a value, but one was given.");
+                Ok = false;
+            }
+        }
+    }
+    return Ok;
+}
+
+void ArgsParser::RegisterArgument(std::vector<std::string>&& ArgumentNames, int Flags) {
+    mRegisteredArguments.push_back({ ArgumentNames, Flags });
+}
+
+bool ArgsParser::FoundArgument(const std::vector<std::string>& Names) {
+    // if any of the found args match any of the names
+    return std::any_of(mFoundArgs.begin(), mFoundArgs.end(),
+        [&Names](const Argument& Arg) -> bool {
+            // if any of the names match this arg's name
+            return std::any_of(Names.begin(), Names.end(), [&Arg](const std::string& Name) -> bool {
+                return Arg.Name == Name;
+            });
+        });
+}
+
+std::optional<std::string> ArgsParser::GetValueOfArgument(const std::vector<std::string>& Names) {
+    // finds an entry which has a name that is any of the names in 'Names'
+    auto Found = std::find_if(mFoundArgs.begin(), mFoundArgs.end(), [&Names](const Argument& Arg) -> bool {
+        return std::any_of(Names.begin(), Names.end(), [&Arg](const std::string_view& Name) -> bool {
+            return Arg.Name == Name;
+        });
+    });
+    if (Found != mFoundArgs.end()) {
+        // found
+        return Found->Value;
+    } else {
+        return std::nullopt;
+    }
+}
+
+bool ArgsParser::IsRegistered(const std::string& Name) {
+    return std::any_of(mRegisteredArguments.begin(), mRegisteredArguments.end(), [&Name](const RegisteredArgument& Arg) {
+        auto Iter = std::find(Arg.Names.begin(), Arg.Names.end(), Name);
+        return Iter != Arg.Names.end();
+    });
+}
+
+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)) {
+        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
+    }
+    mFoundArgs.push_back({ Name, Value });
+}
+
+void ArgsParser::ConsumeLongFlag(const std::string& Arg) {
+    auto Name = Arg.substr(2, Arg.rfind("=") - 2);
+    mFoundArgs.push_back({ Name, std::nullopt });
+    if (!IsRegistered(Name)) {
+        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
+    }
+}

src/Client.cpp

@@ -0,0 +1,120 @@
+#include "Client.h"
+
+#include "CustomAssert.h"
+#include "TServer.h"
+#include <memory>
+#include <optional>
+
+// FIXME: add debug prints
+
+void TClient::DeleteCar(int Ident) {
+    std::unique_lock lock(mVehicleDataMutex);
+    auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {
+        return Ident == elem.ID();
+    });
+    if (iter != mVehicleData.end()) {
+        mVehicleData.erase(iter);
+    } else {
+        beammp_debug("tried to erase a vehicle that doesn't exist (not an error)");
+    }
+}
+
+void TClient::ClearCars() {
+    std::unique_lock lock(mVehicleDataMutex);
+    mVehicleData.clear();
+}
+
+int TClient::GetOpenCarID() const {
+    int OpenID = 0;
+    bool found;
+    std::unique_lock lock(mVehicleDataMutex);
+    do {
+        found = true;
+        for (auto& v : mVehicleData) {
+            if (v.ID() == OpenID) {
+                OpenID++;
+                found = false;
+            }
+        }
+    } while (!found);
+    return OpenID;
+}
+
+void TClient::AddNewCar(int Ident, const std::string& Data) {
+    std::unique_lock lock(mVehicleDataMutex);
+    mVehicleData.emplace_back(Ident, Data);
+}
+
+TClient::TVehicleDataLockPair TClient::GetAllCars() {
+    return { &mVehicleData, std::unique_lock(mVehicleDataMutex) };
+}
+
+std::string TClient::GetCarData(int Ident) {
+    { // lock
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
+            if (v.ID() == Ident) {
+                return v.Data();
+            }
+        }
+    } // unlock
+    DeleteCar(Ident);
+    return "";
+}
+
+void TClient::SetCarData(int Ident, const std::string& Data) {
+    { // lock
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
+            if (v.ID() == Ident) {
+                v.SetData(Data);
+                return;
+            }
+        }
+    } // unlock
+    DeleteCar(Ident);
+}
+
+int TClient::GetCarCount() const {
+    return int(mVehicleData.size());
+}
+
+TServer& TClient::Server() const {
+    return mServer;
+}
+
+void TClient::EnqueuePacket(const std::string& Packet) {
+    std::unique_lock Lock(mMissedPacketsMutex);
+    mPacketsSync.push(Packet);
+}
+
+TClient::TClient(TServer& Server)
+    : mServer(Server)
+    , mLastPingTime(std::chrono::high_resolution_clock::now()) {
+}
+
+void TClient::UpdatePingTime() {
+    mLastPingTime = std::chrono::high_resolution_clock::now();
+}
+int TClient::SecondsSinceLastPing() {
+    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(
+        std::chrono::high_resolution_clock::now() - mLastPingTime)
+                       .count();
+    return int(seconds);
+}
+
+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 true;
+    });
+    return MaybeClient;
+}

src/Common.cpp

@@ -0,0 +1,225 @@
+#include "Common.h"
+
+#include "TConsole.h"
+#include <array>
+#include <charconv>
+#include <iostream>
+#include <map>
+#include <regex>
+#include <sstream>
+#include <thread>
+
+#include "CustomAssert.h"
+#include "Http.h"
+
+Application::TSettings Application::Settings = {};
+
+void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
+    std::unique_lock Lock(mShutdownHandlersMutex);
+    if (Handler) {
+        mShutdownHandlers.push_front(Handler);
+    }
+}
+
+void Application::GracefullyShutdown() {
+    static bool AlreadyShuttingDown = false;
+    static uint8_t ShutdownAttempts = 0;
+    if (AlreadyShuttingDown) {
+        ++ShutdownAttempts;
+        // hard shutdown at 2 additional tries
+        if (ShutdownAttempts == 2) {
+            beammp_info("hard shutdown forced by multiple shutdown requests");
+            std::exit(0);
+        }
+        beammp_info("already shutting down!");
+        return;
+    } else {
+        AlreadyShuttingDown = true;
+    }
+    beammp_trace("waiting for lock release");
+    std::unique_lock Lock(mShutdownHandlersMutex);
+    beammp_info("please wait while all subsystems are shutting down...");
+    for (size_t i = 0; i < mShutdownHandlers.size(); ++i) {
+        beammp_info("Subsystem " + std::to_string(i + 1) + "/" + std::to_string(mShutdownHandlers.size()) + " shutting down");
+        mShutdownHandlers[i]();
+    }
+}
+
+std::string Application::ServerVersionString() {
+    return mVersion.AsString();
+}
+
+std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
+    std::array<uint8_t, 3> Version;
+    std::stringstream ss(str);
+    for (uint8_t& i : Version) {
+        std::string Part;
+        std::getline(ss, Part, '.');
+        std::from_chars(&*Part.begin(), &*Part.begin() + Part.size(), i);
+    }
+    return Version;
+}
+
+// FIXME: This should be used by operator< on Version
+bool Application::IsOutdated(const Version& Current, const Version& Newest) {
+    if (Newest.major > Current.major) {
+        return true;
+    } else if (Newest.major == Current.major && Newest.minor > Current.minor) {
+        return true;
+    } else if (Newest.major == Current.major && Newest.minor == Current.minor && Newest.patch > Current.patch) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void Application::SetSubsystemStatus(const std::string& Subsystem, Status status) {
+    switch (status) {
+    case Status::Good:
+        beammp_trace("Subsystem '" + Subsystem + "': Good");
+        break;
+    case Status::Bad:
+        beammp_trace("Subsystem '" + Subsystem + "': Bad");
+        break;
+    case Status::Starting:
+        beammp_trace("Subsystem '" + Subsystem + "': Starting");
+        break;
+    case Status::ShuttingDown:
+        beammp_trace("Subsystem '" + Subsystem + "': Shutting down");
+        break;
+    case Status::Shutdown:
+        beammp_trace("Subsystem '" + Subsystem + "': Shutdown");
+        break;
+    }
+    std::unique_lock Lock(mSystemStatusMapMutex);
+    mSystemStatusMap[Subsystem] = status;
+}
+
+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(GetBackendUrlsInOrder().at(0), 443, "/v/s");
+        bool Matches = std::regex_match(Response, VersionRegex);
+        if (Matches) {
+            auto MyVersion = ServerVersion();
+            auto RemoteVersion = Version(VersionStrToInts(Response));
+            if (IsOutdated(MyVersion, RemoteVersion)) {
+                std::string RealVersionString = RemoteVersion.AsString();
+                beammp_warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION IS OUT! Please update to the new version (v" + RealVersionString + ") of the BeamMP-Server! Download it here: https://beammp.com/! For a guide on how to update, visit: https://wiki.beammp.com/en/home/server-maintenance#updating-the-server" + std::string(ANSI_RESET));
+            } else {
+                if (FirstTime) {
+                    beammp_info("Server up-to-date!");
+                }
+            }
+            Application::SetSubsystemStatus("UpdateCheck", Application::Status::Good);
+            break;
+        } else {
+            if (FirstTime) {
+                beammp_debug("Failed to fetch version from: " + url);
+                beammp_trace("got " + Response);
+                auto Lock = Sentry.CreateExclusiveContext();
+                Sentry.SetContext("get-response", { { "response", Response } });
+                Sentry.LogError("failed to get server version", _file_basename, _line);
+                Application::SetSubsystemStatus("UpdateCheck", Application::Status::Bad);
+            }
+        }
+    }
+    if (Application::GetSubsystemStatuses().at("UpdateCheck") == Application::Status::Bad) {
+        if (FirstTime) {
+            beammp_warn("Unable to fetch version info from backend.");
+        }
+    }
+    FirstTime = false;
+}
+
+// thread name stuff
+
+static std::map<std::thread::id, std::string> threadNameMap {};
+static std::mutex ThreadNameMapMutex {};
+
+std::string ThreadName(bool DebugModeOverride) {
+    auto Lock = std::unique_lock(ThreadNameMapMutex);
+    if (DebugModeOverride || Application::Settings.DebugModeEnabled) {
+        auto id = std::this_thread::get_id();
+        if (threadNameMap.find(id) != threadNameMap.end()) {
+            // found
+            return threadNameMap.at(id) + " ";
+        }
+    }
+    return "";
+}
+
+void RegisterThread(const std::string& str) {
+    std::string ThreadId;
+#ifdef BEAMMP_WINDOWS
+    ThreadId = std::to_string(GetCurrentThreadId());
+#elif defined(BEAMMP_APPLE)
+    ThreadId = std::to_string(getpid()); // todo: research if 'getpid()' is a valid, posix compliant alternative to 'gettid()'
+#elif defined(BEAMMP_LINUX)
+    ThreadId = std::to_string(gettid());
+#endif
+    if (Application::Settings.DebugModeEnabled) {
+        std::ofstream ThreadFile("Threads.log", std::ios::app);
+        ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
+    }
+    auto Lock = std::unique_lock(ThreadNameMapMutex);
+    threadNameMap[std::this_thread::get_id()] = str;
+}
+
+Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
+    : major(major)
+    , minor(minor)
+    , patch(patch) { }
+
+Version::Version(const std::array<uint8_t, 3>& v)
+    : Version(v[0], v[1], v[2]) {
+}
+
+std::string Version::AsString() {
+    std::stringstream ss {};
+    ss << int(major) << "." << int(minor) << "." << int(patch);
+    return ss.str();
+}
+
+void LogChatMessage(const std::string& name, int id, const std::string& msg) {
+    std::stringstream ss;
+    ss << ThreadName();
+    ss << "[CHAT] ";
+    if (id != -1) {
+        ss << "(" << id << ") <" << name << "> ";
+    } else {
+        ss << name << "";
+    }
+    ss << msg;
+    Application::Console().Write(ss.str());
+}
+
+std::string GetPlatformAgnosticErrorString() {
+#ifdef BEAMMP_WINDOWS
+    // This will provide us with the error code and an error message, all in one.
+    int err;
+    char msgbuf[256];
+    msgbuf[0] = '\0';
+
+    err = GetLastError();
+
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+        nullptr,
+        err,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        msgbuf,
+        sizeof(msgbuf),
+        nullptr);
+
+    if (*msgbuf) {
+        return std::to_string(GetLastError()) + " - " + std::string(msgbuf);
+    } else {
+        return std::to_string(GetLastError());
+    }
+#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+    return std::strerror(errno);
+#endif
+}

src/Compat.cpp

@@ -0,0 +1,35 @@
+#include "Compat.h"
+
+#ifndef WIN32
+
+static struct termios old, current;
+
+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 */
+    if (echo) {
+        current.c_lflag |= ECHO; /* set echo mode */
+    } else {
+        current.c_lflag &= ~ECHO; /* set no echo mode */
+    }
+    tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
+}
+
+void resetTermios(void) {
+    tcsetattr(0, TCSANOW, &old);
+}
+
+char getch_(int echo) {
+    char ch;
+    initTermios(echo);
+    read(STDIN_FILENO, &ch, 1);
+    resetTermios();
+    return ch;
+}
+
+char _getch(void) {
+    return getch_(0);
+}
+
+#endif // !WIN32

src/Compressor.cpp

@@ -1,56 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/15/2020
-///
-
-#include <algorithm>
-#include <array>
-#include <iostream>
-#include <zlib.h>
-
-#define Biggest 30000
-std::string Comp(std::string Data) {
-    std::array<char, Biggest> C {};
-    // obsolete
-    C.fill(0);
-    z_stream defstream;
-    defstream.zalloc = Z_NULL;
-    defstream.zfree = Z_NULL;
-    defstream.opaque = Z_NULL;
-    defstream.avail_in = (uInt)Data.length();
-    defstream.next_in = (Bytef*)&Data[0];
-    defstream.avail_out = Biggest;
-    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
-    deflateInit(&defstream, Z_BEST_COMPRESSION);
-    deflate(&defstream, Z_SYNC_FLUSH);
-    deflate(&defstream, Z_FINISH);
-    deflateEnd(&defstream);
-    size_t TO = defstream.total_out;
-    std::string Ret(TO, 0);
-    std::copy_n(C.begin(), TO, Ret.begin());
-    return Ret;
-}
-std::string DeComp(std::string Compressed) {
-    std::array<char, Biggest> C {};
-    // not needed
-    C.fill(0);
-    z_stream infstream;
-    infstream.zalloc = Z_NULL;
-    infstream.zfree = Z_NULL;
-    infstream.opaque = Z_NULL;
-    infstream.avail_in = Biggest;
-    infstream.next_in = (Bytef*)(&Compressed[0]);
-    infstream.avail_out = Biggest;
-    infstream.next_out = (Bytef*)(C.data());
-    inflateInit(&infstream);
-    inflate(&infstream, Z_SYNC_FLUSH);
-    inflate(&infstream, Z_FINISH);
-    inflateEnd(&infstream);
-    size_t TO = infstream.total_out;
-    std::string Ret(TO, 0);
-    std::copy_n(C.begin(), TO, Ret.begin());
-    return Ret;
-}

src/Console.cpp

@@ -1,263 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 10/29/2020
-///
-
-#include "Lua/LuaSystem.hpp"
-#ifdef WIN32
-#include <conio.h>
-#include <windows.h>
-#else // *nix
-typedef unsigned long DWORD, *PDWORD, *LPDWORD;
-#include <termios.h>
-#include <unistd.h>
-#endif // WIN32
-#include "Logger.h"
-#include <array>
-#include <cstring>
-#include <iostream>
-#include <mutex>
-#include <string>
-#include <thread>
-
-std::vector<std::string> QConsoleOut;
-std::string CInputBuff;
-std::mutex MLock;
-std::unique_ptr<Lua> LuaConsole;
-void HandleInput(const std::string& cmd) {
-    std::cout << std::endl;
-    if (cmd == ("exit")) {
-        _Exit(0);
-    } else if (cmd == ("clear") || cmd == ("cls")) {
-        // 2J is clearscreen, H is reset position to top-left
-        ConsoleOut(("\x1b[2J\x1b[H"));
-    } else {
-        LuaConsole->Execute(cmd);
-    }
-}
-
-void ProcessOut() {
-    printf("%c[2K\r", 27);
-    for (const std::string& msg : QConsoleOut)
-        if (!msg.empty())
-            std::cout << msg;
-    MLock.lock();
-    QConsoleOut.clear();
-    MLock.unlock();
-    std::cout << "> " << CInputBuff << std::flush;
-}
-
-void ConsoleOut(const std::string& msg) {
-    MLock.lock();
-    QConsoleOut.emplace_back(msg);
-    MLock.unlock();
-}
-
-[[noreturn]] void OutputRefresh() {
-    DebugPrintTID();
-    while (true) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        ProcessOut();
-    }
-}
-
-#ifndef WIN32
-
-static struct termios old, current;
-
-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 */
-    if (echo) {
-        current.c_lflag |= ECHO; /* set echo mode */
-    } else {
-        current.c_lflag &= ~ECHO; /* set no echo mode */
-    }
-    tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
-}
-
-void resetTermios(void) {
-    tcsetattr(0, TCSANOW, &old);
-}
-
-char getch_(int echo) {
-    char ch;
-    initTermios(echo);
-    read(STDIN_FILENO, &ch, 1);
-    resetTermios();
-    return ch;
-}
-
-char _getch(void) {
-    return getch_(0);
-}
-
-#endif // WIN32
-
-void SetupConsole() {
-#if defined(WIN32)
-    DWORD outMode = 0;
-    HANDLE stdoutHandle = GetStdHandle(STD_OUTPUT_HANDLE);
-    if (stdoutHandle == INVALID_HANDLE_VALUE) {
-        error("Invalid console handle! Inputs will not work properly");
-        return;
-    }
-    if (!GetConsoleMode(stdoutHandle, &outMode)) {
-        error("Invalid console mode! Inputs will not work properly");
-        return;
-    }
-    // Enable ANSI escape codes
-    outMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-    if (!SetConsoleMode(stdoutHandle, outMode)) {
-        error("failed to set console mode! Inputs will not work properly");
-        return;
-    }
-#else
-#endif // WIN32
-}
-
-static std::vector<std::string> ConsoleHistory {};
-// buffer used to revert back to what we were writing when we go all the way forward in history
-static std::string LastInputBuffer {};
-static size_t ConsoleHistoryReadIndex { 0 };
-
-static inline void ConsoleHistoryAdd(const std::string& cmd) {
-    LastInputBuffer.clear();
-    ConsoleHistory.push_back(cmd);
-    ConsoleHistoryReadIndex = ConsoleHistory.size();
-}
-
-static inline void ConsoleHistoryEnsureBounds() {
-    if (ConsoleHistoryReadIndex >= ConsoleHistory.size()) {
-        ConsoleHistoryReadIndex = ConsoleHistory.size() - 1;
-    }
-}
-
-static inline void ConsoleHistoryGoBack() {
-    if (ConsoleHistoryReadIndex > 0) {
-        --ConsoleHistoryReadIndex;
-        ConsoleHistoryEnsureBounds();
-    }
-}
-
-static inline void ConsoleHistoryGoForward() {
-    ++ConsoleHistoryReadIndex;
-    ConsoleHistoryEnsureBounds();
-}
-
-static std::string CompositeInput;
-static bool CompositeInputExpected { false };
-
-static void ProcessCompositeInput() {
-#ifdef WIN32
-    if (CompositeInput.size() == 1 && memcmp(CompositeInput.data(), std::array<char, 1> { 72 }.data(), 1) == 0) {
-#else // unix
-    if (CompositeInput.size() == 2 && memcmp(CompositeInput.data(), std::array<char, 2> { 91, 65 }.data(), 2) == 0) {
-#endif // WIN32
-
-        // UP ARROW
-        if (!ConsoleHistory.empty()) {
-            ConsoleHistoryGoBack();
-            CInputBuff = ConsoleHistory.at(ConsoleHistoryReadIndex);
-        }
-#ifdef WIN32
-    } else if (CompositeInput.size() == 1 && memcmp(CompositeInput.data(), std::array<char, 1> { 80 }.data(), 1) == 0) {
-#else // unix
-    } else if (CompositeInput.size() == 2 && memcmp(CompositeInput.data(), std::array<char, 2> { 91, 66 }.data(), 2) == 0) {
-#endif // WIN32
-
-        // DOWN ARROW
-        if (!ConsoleHistory.empty()) {
-            if (ConsoleHistoryReadIndex == ConsoleHistory.size() - 1) {
-                CInputBuff = LastInputBuffer;
-            } else {
-                ConsoleHistoryGoForward();
-                CInputBuff = ConsoleHistory.at(ConsoleHistoryReadIndex);
-            }
-        }
-    } else {
-        // not composite input, we made a mistake, so lets just add it to the buffer like usual
-        CInputBuff += CompositeInput;
-    }
-    // ensure history doesnt grow too far beyond a max
-    static constexpr size_t MaxHistory = 10;
-    if (ConsoleHistory.size() > 2 * MaxHistory) {
-        decltype(ConsoleHistory) NewHistory(ConsoleHistory.begin() + ConsoleHistory.size() - MaxHistory, ConsoleHistory.end());
-        ConsoleHistory = std::move(NewHistory);
-        ConsoleHistoryReadIndex = ConsoleHistory.size();
-    }
-}
-
-void ReadCin() {
-    DebugPrintTID();
-    size_t null_byte_counter = 0;
-    while (true) {
-        int In = _getch();
-        //info(std::to_string(In));
-        if (In == 0) {
-            ++null_byte_counter;
-            if (null_byte_counter > 50) {
-                info(("too many null bytes in input, this is now assumed to be a background thread - console input is now disabled"));
-                break;
-            }
-        }
-        if (CompositeInputExpected) {
-            CompositeInput += char(In);
-#ifdef WIN32
-            if (CompositeInput.size() == 1) {
-#else // unix
-            if (CompositeInput.size() == 2) {
-#endif // WIN32
-                CompositeInputExpected = false;
-                ProcessCompositeInput();
-            }
-            continue;
-        }
-        if (In == 13 || In == '\n') {
-            if (!CInputBuff.empty()) {
-                HandleInput(CInputBuff);
-                ConsoleHistoryAdd(CInputBuff);
-                CInputBuff.clear();
-            }
-        } else if (In == 8 || In == 127) {
-            if (!CInputBuff.empty())
-                CInputBuff.pop_back();
-        } else if (In == 4) {
-            CInputBuff = "exit";
-            HandleInput(CInputBuff);
-            CInputBuff.clear();
-        } else if (In == 12) {
-            CInputBuff = "clear";
-            HandleInput(CInputBuff);
-            CInputBuff.clear();
-#ifdef WIN32
-        } else if (In == 224) {
-#else // unix
-        } else if (In == 27) {
-#endif // WIN32
-
-            // escape char, assume stuff follows
-            CompositeInputExpected = true;
-            CompositeInput.clear();
-        } else if (!isprint(In)) {
-            // ignore
-        } else {
-            CInputBuff += char(In);
-            LastInputBuffer = CInputBuff;
-        }
-    }
-}
-void ConsoleInit() {
-    SetupConsole();
-    LuaConsole = std::make_unique<Lua>(true);
-    LuaConsole->Init();
-    printf("> ");
-    std::thread In(ReadCin);
-    In.detach();
-    std::thread Out(OutputRefresh);
-    Out.detach();
-}

src/Enc.cpp

@@ -1,27 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#include "Security/Enc.h"
-#include "CustomAssert.h"
-#include "Logger.h"
-#include <sstream>
-
-#ifdef WIN32
-#include <WS2tcpip.h>
-int Handle(EXCEPTION_POINTERS* ep, char* Origin) {
-    Assert(false);
-    std::stringstream R;
-    R << ("Code : ") << std::hex
-      << ep->ExceptionRecord->ExceptionCode
-      << std::dec << (" Origin : ") << Origin;
-    except(R.str());
-    return 1;
-}
-#else
-// stub
-int Handle(EXCEPTION_POINTERS*, char*) { return 1; }
-#endif // WIN32

src/Http.cpp

@@ -0,0 +1,383 @@
+#include "Http.h"
+
+#include "Client.h"
+#include "Common.h"
+#include "CustomAssert.h"
+#include "LuaAPI.h"
+#include "httplib.h"
+
+#include <map>
+#include <random>
+#include <rapidjson/document.h>
+#include <rapidjson/rapidjson.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+#include <stdexcept>
+fs::path Http::Server::THttpServerInstance::KeyFilePath;
+fs::path Http::Server::THttpServerInstance::CertFilePath;
+// TODO: Add sentry error handling back
+
+namespace json = rapidjson;
+
+std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
+    httplib::SSLClient client(host, port);
+    client.enable_server_certificate_verification(false);
+    client.set_address_family(AF_INET);
+    auto res = client.Get(target.c_str());
+    if (res) {
+        if (status) {
+            *status = res->status;
+        }
+        return res->body;
+    } else {
+        return Http::ErrorString;
+    }
+}
+
+std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
+    httplib::SSLClient client(host, port);
+    client.set_read_timeout(std::chrono::seconds(10));
+    beammp_assert(client.is_valid());
+    client.enable_server_certificate_verification(false);
+    client.set_address_family(AF_INET);
+    auto res = client.Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
+    if (res) {
+        if (status) {
+            *status = res->status;
+        }
+        return res->body;
+    } else {
+        beammp_debug("POST failed: " + httplib::to_string(res.error()));
+        return Http::ErrorString;
+    }
+}
+
+// RFC 2616, RFC 7231
+static std::map<size_t, const char*> Map = {
+    { -1, "Invalid Response Code" },
+    { 100, "Continue" },
+    { 101, "Switching Protocols" },
+    { 102, "Processing" },
+    { 103, "Early Hints" },
+    { 200, "OK" },
+    { 201, "Created" },
+    { 202, "Accepted" },
+    { 203, "Non-Authoritative Information" },
+    { 204, "No Content" },
+    { 205, "Reset Content" },
+    { 206, "Partial Content" },
+    { 207, "Multi-Status" },
+    { 208, "Already Reported" },
+    { 226, "IM Used" },
+    { 300, "Multiple Choices" },
+    { 301, "Moved Permanently" },
+    { 302, "Found" },
+    { 303, "See Other" },
+    { 304, "Not Modified" },
+    { 305, "Use Proxy" },
+    { 306, "(Unused)" },
+    { 307, "Temporary Redirect" },
+    { 308, "Permanent Redirect" },
+    { 400, "Bad Request" },
+    { 401, "Unauthorized" },
+    { 402, "Payment Required" },
+    { 403, "Forbidden" },
+    { 404, "Not Found" },
+    { 405, "Method Not Allowed" },
+    { 406, "Not Acceptable" },
+    { 407, "Proxy Authentication Required" },
+    { 408, "Request Timeout" },
+    { 409, "Conflict" },
+    { 410, "Gone" },
+    { 411, "Length Required" },
+    { 412, "Precondition Failed" },
+    { 413, "Payload Too Large" },
+    { 414, "URI Too Long" },
+    { 415, "Unsupported Media Type" },
+    { 416, "Range Not Satisfiable" },
+    { 417, "Expectation Failed" },
+    { 421, "Misdirected Request" },
+    { 422, "Unprocessable Entity" },
+    { 423, "Locked" },
+    { 424, "Failed Dependency" },
+    { 425, "Too Early" },
+    { 426, "Upgrade Required" },
+    { 428, "Precondition Required" },
+    { 429, "Too Many Requests" },
+    { 431, "Request Header Fields Too Large" },
+    { 451, "Unavailable For Legal Reasons" },
+    { 500, "Internal Server Error" },
+    { 501, "Not Implemented" },
+    { 502, "Bad Gateway" },
+    { 503, "Service Unavailable" },
+    { 504, "Gateway Timeout" },
+    { 505, "HTTP Version Not Supported" },
+    { 506, "Variant Also Negotiates" },
+    { 507, "Insufficient Storage" },
+    { 508, "Loop Detected" },
+    { 510, "Not Extended" },
+    { 511, "Network Authentication Required" },
+    // cloudflare status codes
+    { 520, "(CDN) Web Server Returns An Unknown Error" },
+    { 521, "(CDN) Web Server Is Down" },
+    { 522, "(CDN) Connection Timed Out" },
+    { 523, "(CDN) Origin Is Unreachable" },
+    { 524, "(CDN) A Timeout Occurred" },
+    { 525, "(CDN) SSL Handshake Failed" },
+    { 526, "(CDN) Invalid SSL Certificate" },
+    { 527, "(CDN) Railgun Listener To Origin Error" },
+    { 530, "(CDN) 1XXX Internal Error" },
+};
+
+static const char Magic[] = {
+    0x20, 0x2f, 0x5c, 0x5f,
+    0x2f, 0x5c, 0x0a, 0x28,
+    0x20, 0x6f, 0x2e, 0x6f,
+    0x20, 0x29, 0x0a, 0x20,
+    0x3e, 0x20, 0x5e, 0x20,
+    0x3c, 0x0a, 0x00
+};
+
+std::string Http::Status::ToString(int Code) {
+    if (Map.find(Code) != Map.end()) {
+        return Map.at(Code);
+    } else {
+        return std::to_string(Code);
+    }
+}
+
+long Http::Server::Tx509KeypairGenerator::GenerateRandomId() {
+    std::random_device R;
+    std::default_random_engine E1(R());
+    std::uniform_int_distribution<long> UniformDist(0, ULONG_MAX);
+    return UniformDist(E1);
+}
+
+// Http::Server::THttpServerInstance::THttpServerInstance() { }
+EVP_PKEY* Http::Server::Tx509KeypairGenerator::GenerateKey() {
+    /**
+     * Allocate memory for the pkey
+     */
+    EVP_PKEY* PKey = EVP_PKEY_new();
+    if (PKey == nullptr) {
+        beammp_error("Could not allocate memory for X.509 private key (PKEY) generation.");
+        throw std::runtime_error { std::string { "X.509 PKEY allocation error" } };
+    }
+    BIGNUM* E = BN_new();
+    beammp_assert(E); // TODO: replace all these asserts with beammp_errors
+    unsigned char three = 3;
+    BIGNUM* EErr = BN_bin2bn(&three, sizeof(three), E);
+    beammp_assert(EErr);
+    RSA* Rsa = RSA_new();
+    beammp_assert(Rsa);
+    int Ret = RSA_generate_key_ex(Rsa, Crypto::RSA_DEFAULT_KEYLENGTH, E, nullptr);
+    beammp_assert(Ret == 1);
+    BN_free(E);
+    if (!EVP_PKEY_assign_RSA(PKey, Rsa)) {
+        EVP_PKEY_free(PKey);
+        beammp_error(std::string("Could not generate " + std::to_string(Crypto::RSA_DEFAULT_KEYLENGTH) + "-bit RSA key."));
+        throw std::runtime_error { std::string("X.509 RSA key generation error") };
+    }
+    // todo: figure out if returning by reference instead of passing pointers is a security breach
+    return PKey;
+}
+
+X509* Http::Server::Tx509KeypairGenerator::GenerateCertificate(EVP_PKEY& PKey) {
+    X509* X509 = X509_new();
+    if (X509 == nullptr) {
+        X509_free(X509);
+        beammp_error("Could not allocate memory for X.509 certificate generation.");
+        throw std::runtime_error { std::string("X.509 certificate generation error") };
+    }
+
+    /**Set the metadata of the certificate*/
+    ASN1_INTEGER_set(X509_get_serialNumber(X509), GenerateRandomId());
+
+    /**Set the cert validity to a year*/
+    X509_gmtime_adj(X509_get_notBefore(X509), 0);
+    X509_gmtime_adj(X509_get_notAfter(X509), 31536000L);
+
+    /**Set the public key of the cert*/
+    X509_set_pubkey(X509, &PKey);
+
+    X509_NAME* Name = X509_get_subject_name(X509);
+
+    /**Set cert metadata*/
+    X509_NAME_add_entry_by_txt(Name, "C", MBSTRING_ASC, (unsigned char*)"GB", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(Name, "O", MBSTRING_ASC, (unsigned char*)"BeamMP Ltd.", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(Name, "CN", MBSTRING_ASC, (unsigned char*)"localhost", -1, -1, 0);
+
+    X509_set_issuer_name(X509, Name);
+
+    // TODO: Hashing with sha256 might cause problems, check later
+    if (!X509_sign(X509, &PKey, EVP_sha1())) {
+        X509_free(X509);
+        beammp_error("Could not sign X.509 certificate.");
+        throw std::runtime_error { std::string("X.509 certificate signing error") };
+    }
+    return X509;
+}
+
+void Http::Server::Tx509KeypairGenerator::GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath) {
+    // todo: generate directories for ssl keys
+    FILE* KeyFile = std::fopen(reinterpret_cast<const char*>(KeyFilePath.c_str()), "wb");
+    if (!KeyFile) {
+        beammp_error("Could not create file 'key.pem', check your permissions");
+        throw std::runtime_error("Could not create file 'key.pem'");
+    }
+
+    EVP_PKEY* PKey = Http::Server::Tx509KeypairGenerator::GenerateKey();
+
+    bool WriteOpResult = PEM_write_PrivateKey(KeyFile, PKey, nullptr, nullptr, 0, nullptr, nullptr);
+    fclose(KeyFile);
+
+    if (!WriteOpResult) {
+        beammp_error("Could not write to file 'key.pem', check your permissions");
+        throw std::runtime_error("Could not write to file 'key.pem'");
+    }
+
+    FILE* CertFile = std::fopen(reinterpret_cast<const char*>(CertFilePath.c_str()), "wb"); // x509 file
+    if (!CertFile) {
+        beammp_error("Could not create file 'cert.pem', check your permissions");
+        throw std::runtime_error("Could not create file 'cert.pem'");
+    }
+
+    X509* x509 = Http::Server::Tx509KeypairGenerator::GenerateCertificate(*PKey);
+    WriteOpResult = PEM_write_X509(CertFile, x509);
+    fclose(CertFile);
+
+    if (!WriteOpResult) {
+        beammp_error("Could not write to file 'cert.pem', check your permissions");
+        throw std::runtime_error("Could not write to file 'cert.pem'");
+    }
+    EVP_PKEY_free(PKey);
+    X509_free(x509);
+    return;
+}
+
+bool Http::Server::Tx509KeypairGenerator::EnsureTLSConfigExists() {
+    if (fs::is_regular_file(Application::Settings.SSLKeyPath)
+        && fs::is_regular_file(Application::Settings.SSLCertPath)) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void Http::Server::SetupEnvironment() {
+    if (!Application::Settings.HTTPServerUseSSL) {
+        return;
+    }
+    auto parent = fs::path(Application::Settings.SSLKeyPath).parent_path();
+    if (!fs::exists(parent))
+        fs::create_directories(parent);
+
+    Application::TSettings defaultSettings {};
+    if (!Tx509KeypairGenerator::EnsureTLSConfigExists()) {
+        beammp_warn(std::string("No default TLS Key / Cert found. "
+                                "IF YOU HAVE NOT MODIFIED THE SSLKeyPath OR SSLCertPath VALUES "
+                                "THIS IS NORMAL ON FIRST STARTUP! BeamMP will generate it's own certs in the default directory "
+                                "(Check for permissions or corrupted key-/certfile)"));
+        Tx509KeypairGenerator::GenerateAndWriteToDisk(defaultSettings.SSLKeyPath, defaultSettings.SSLCertPath);
+        Http::Server::THttpServerInstance::KeyFilePath = defaultSettings.SSLKeyPath;
+        Http::Server::THttpServerInstance::CertFilePath = defaultSettings.SSLCertPath;
+    } else {
+        Http::Server::THttpServerInstance::KeyFilePath = Application::Settings.SSLKeyPath;
+        Http::Server::THttpServerInstance::CertFilePath = Application::Settings.SSLCertPath;
+    }
+}
+
+Http::Server::THttpServerInstance::THttpServerInstance() {
+    Application::SetSubsystemStatus("HTTPServer", Application::Status::Starting);
+    mThread = std::thread(&Http::Server::THttpServerInstance::operator(), this);
+    mThread.detach();
+}
+
+void Http::Server::THttpServerInstance::operator()() try {
+    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
+    std::unique_ptr<httplib::Server> HttpLibServerInstance;
+    if (Application::Settings.HTTPServerUseSSL) {
+        HttpLibServerInstance = std::make_unique<httplib::SSLServer>(
+            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::CertFilePath.c_str()),
+            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::KeyFilePath.c_str()));
+    } else {
+        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");
+    });
+    HttpLibServerInstance->Get("/health", [](const httplib::Request&, httplib::Response& res) {
+        size_t SystemsGood = 0;
+        size_t SystemsBad = 0;
+        auto Statuses = Application::GetSubsystemStatuses();
+        for (const auto& NameStatusPair : Statuses) {
+            switch (NameStatusPair.second) {
+            case Application::Status::Starting:
+            case Application::Status::ShuttingDown:
+            case Application::Status::Shutdown:
+            case Application::Status::Good:
+                SystemsGood++;
+                break;
+            case Application::Status::Bad:
+                SystemsBad++;
+                break;
+            }
+        }
+        res.set_content(SystemsBad == 0 ? "0" : "1", "text/plain");
+        res.status = 200;
+    });
+    /*
+    HttpLibServerInstance->Get("/status", [](const httplib::Request&, httplib::Response& res) {
+        try {
+            json::Document response;
+            response.SetObject();
+            rapidjson::Document::AllocatorType& Allocator = response.GetAllocator();
+            // add to response
+            auto& Server = LuaAPI::MP::Engine->Server();
+            size_t CarCount = 0;
+            size_t GuestCount = 0;
+            json::Value Array(rapidjson::kArrayType);
+            LuaAPI::MP::Engine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+                if (!Client.expired()) {
+                    auto Locked = Client.lock();
+                    CarCount += Locked->GetCarCount();
+                    GuestCount += Locked->IsGuest() ? 1 : 0;
+                    json::Value Player(json::kObjectType);
+                    Player.AddMember("name", json::StringRef(Locked->GetName().c_str()), Allocator);
+                    Player.AddMember("id", Locked->GetID(), Allocator);
+                    Array.PushBack(Player, Allocator);
+                }
+                return true;
+            });
+            response.AddMember("players", Array, Allocator);
+            response.AddMember("player_count", Server.ClientCount(), Allocator);
+            response.AddMember("guest_count", GuestCount, Allocator);
+            response.AddMember("car_count", CarCount, Allocator);
+
+            // compile & send response
+            json::StringBuffer sb;
+            json::Writer<json::StringBuffer> writer(sb);
+            response.Accept(writer);
+            res.set_content(sb.GetString(), "application/json");
+        } catch (const std::exception& e) {
+            beammp_error("Exception in /status endpoint: " + std::string(e.what()));
+            res.status = 500;
+        }
+    });
+    */
+    // magic endpoint
+    HttpLibServerInstance->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) {
+        beammp_debug("Http Server: " + Req.method + " " + Req.target + " -> " + std::to_string(Res.status));
+    });
+    Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
+    auto ret = HttpLibServerInstance->listen(Application::Settings.HTTPServerIP.c_str(), Application::Settings.HTTPServerPort);
+    if (!ret) {
+        beammp_error("Failed to start http server (failed to listen). Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it.");
+    }
+} catch (const std::exception& e) {
+    beammp_error("Failed to start http server. Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it. Error: " + std::string(e.what()));
+}

src/Init/Config.cpp

@@ -1,167 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#include "CustomAssert.h"
-#include "Logger.h"
-#include "Security/Enc.h"
-#include <fstream>
-#include <string>
-#include <thread>
-std::string ServerName;
-std::string ServerDesc;
-std::string Resource;
-std::string MapName;
-std::string Key;
-int MaxPlayers;
-bool Private;
-int MaxCars;
-bool Debug;
-int Port;
-
-void SetValues(const std::string& Line, int Index) {
-    int state = 0;
-    std::string Data;
-    bool Switch = false;
-    if (Index > 5)
-        Switch = true;
-    for (char c : Line) {
-        if (Switch) {
-            if (c == '\"')
-                state++;
-            if (state > 0 && state < 2)
-                Data += c;
-        } else {
-            if (c == ' ')
-                state++;
-            if (state > 1)
-                Data += c;
-        }
-    }
-    Data = Data.substr(1);
-    std::string::size_type sz;
-    bool FoundTrue = std::string(Data).find("true") != std::string::npos; //searches for "true"
-    switch (Index) {
-    case 1:
-        Debug = FoundTrue; //checks and sets the Debug Value
-        break;
-    case 2:
-        Private = FoundTrue; //checks and sets the Private Value
-        break;
-    case 3:
-        Port = std::stoi(Data, &sz); //sets the Port
-        break;
-    case 4:
-        MaxCars = std::stoi(Data, &sz); //sets the Max Car amount
-        break;
-    case 5:
-        MaxPlayers = std::stoi(Data, &sz); //sets the Max Amount of player
-        break;
-    case 6:
-        MapName = Data; //Map
-        break;
-    case 7:
-        ServerName = Data; //Name
-        break;
-    case 8:
-        ServerDesc = Data; //desc
-        break;
-    case 9:
-        Resource = Data; //File name
-        break;
-    case 10:
-        Key = Data; //File name
-    default:
-        break;
-    }
-}
-std::string RemoveComments(const std::string& Line) {
-    std::string Return;
-    for (char c : Line) {
-        if (c == '#')
-            break;
-        Return += c;
-    }
-    return Return;
-}
-void LoadConfig(std::ifstream& IFS) {
-    Assert(IFS.is_open());
-    std::string line;
-    int index = 1;
-    while (getline(IFS, line)) {
-        index++;
-    }
-    if (index - 1 < 11) {
-        error(("Outdated/Incorrect config please remove it server will close in 5 secs"));
-        std::this_thread::sleep_for(std::chrono::seconds(3));
-        _Exit(0);
-    }
-    IFS.close();
-    IFS.open(("Server.cfg"));
-    info(("Config found updating values"));
-    index = 1;
-    while (getline(IFS, line)) {
-        if (line.rfind('#', 0) != 0 && line.rfind(' ', 0) != 0) { //Checks if it starts as Comment
-            std::string CleanLine = RemoveComments(line); //Cleans it from the Comments
-            SetValues(CleanLine, index); //sets the values
-            index++;
-        }
-    }
-}
-void GenerateConfig() {
-    std::ofstream FileStream;
-    FileStream.open(("Server.cfg"));
-    FileStream << ("# This is the BeamMP Server Configuration File v0.60\n"
-                   "Debug = false # true or false to enable debug console output\n"
-                   "Private = true # Private?\n"
-                   "Port = 30814 # Port to run the server on UDP and TCP\n"
-                   "Cars = 1 # Max cars for every player\n"
-                   "MaxPlayers = 10 # Maximum Amount of Clients\n"
-                   "Map = \"/levels/gridmap/info.json\" # Default Map\n"
-                   "Name = \"BeamMP New Server\" # Server Name\n"
-                   "Desc = \"BeamMP Default Description\" # Server Description\n"
-                   "use = \"Resources\" # Resource file name\n"
-                   "AuthKey = \"\" # Auth Key");
-    FileStream.close();
-}
-void Default() {
-    info(("Config not found generating default"));
-    GenerateConfig();
-    error(("You are required to input the AuthKey"));
-    std::this_thread::sleep_for(std::chrono::seconds(3));
-    _Exit(0);
-}
-void DebugData() {
-    debug(std::string("Debug : ") + (Debug ? "true" : "false"));
-    debug(std::string("Private : ") + (Private ? "true" : "false"));
-    debug("Port : " + std::to_string(Port));
-    debug("Max Cars : " + std::to_string(MaxCars));
-    debug("MaxPlayers : " + std::to_string(MaxPlayers));
-    debug("MapName : " + MapName);
-    debug("ServerName : " + ServerName);
-    debug("ServerDesc : " + ServerDesc);
-    debug("File : " + Resource);
-    debug("Key length: " + std::to_string(Key.length()));
-}
-void InitConfig() {
-    ////TODO: Move to json after update 4
-
-    std::ifstream IFS;
-    IFS.open(("Server.cfg"));
-    if (IFS.good())
-        LoadConfig(IFS);
-    else
-        Default();
-    if (IFS.is_open())
-        IFS.close();
-    if (Key.empty()) {
-        error(("No AuthKey was found"));
-        std::this_thread::sleep_for(std::chrono::seconds(3));
-        _Exit(0);
-    }
-    if (Debug)
-        DebugData();
-}

src/Init/Heartbeat.cpp

@@ -1,84 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#include "Client.hpp"
-#include "Curl/Http.h"
-#include "Logger.h"
-#include "Settings.h"
-#include <chrono>
-#include <future>
-#include <sstream>
-#include <thread>
-
-void WebsocketInit();
-std::string GetPlayers() {
-    std::string Return;
-    for (auto& c : CI->Clients) {
-        if (c != nullptr) {
-            Return += c->GetName() + ";";
-        }
-    }
-    return Return;
-}
-std::string GenerateCall() {
-    std::stringstream Ret;
-    Ret << "uuid=" << Key << "&players=" << CI->Size()
-        << "&maxplayers=" << MaxPlayers << "&port=" << Port
-        << "&map=" << MapName << "&private=" << (Private ? "true" : "false")
-        << "&version=" << GetSVer() << "&clientversion=" << GetCVer()
-        << "&name=" << ServerName << "&pps=" << StatReport
-        << "&modlist=" << FileList << "&modstotalsize=" << MaxModSize
-        << "&modstotal=" << ModsLoaded << "&playerslist=" << GetPlayers()
-        << "&desc=" << ServerDesc;
-    return Ret.str();
-}
-std::string RunPromise(const std::string& IP, const std::string& R) {
-    std::packaged_task<std::string()> task([&] { return PostHTTP(IP, R, false); });
-    std::future<std::string> f1 = task.get_future();
-    std::thread t(std::move(task));
-    t.detach();
-    auto status = f1.wait_for(std::chrono::seconds(15));
-    if (status != std::future_status::timeout)
-        return f1.get();
-    error("Backend system Timeout please try again later");
-    return "";
-}
-
-[[noreturn]] void Heartbeat() {
-    DebugPrintTID();
-    std::string R, T;
-    bool isAuth = false;
-    while (true) {
-        R = GenerateCall();
-        if (!CustomIP.empty())
-            R += "&ip=" + CustomIP;
-        std::string link = "https://beammp.com/heartbeatv2";
-        T = RunPromise(link, R);
-
-        if (T.substr(0, 2) != "20") {
-            //Backend system refused server startup!
-            std::this_thread::sleep_for(std::chrono::seconds(10));
-            std::string Backup = "https://backup1.beammp.com/heartbeatv2";
-            T = RunPromise(Backup, R);
-            if (T.substr(0, 2) != "20") {
-                warn("Backend system refused server! Server might not show in the public list");
-            }
-        }
-        //Server Authenticated
-        if (!isAuth) {
-            WebsocketInit();
-            if (T.length() == 4)info(("Authenticated!"));
-            else info(("Resumed authenticated session!"));
-            isAuth = true;
-        }
-        //std::this_thread::sleep_for(std::chrono::seconds(5));
-    }
-}
-void HBInit() {
-    std::thread HB(Heartbeat);
-    HB.detach();
-}

src/Init/Resources.cpp

@@ -1,39 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#include "Logger.h"
-#include "Security/Enc.h"
-#include "Settings.h"
-#include <algorithm>
-#include <filesystem>
-
-namespace fs = std::filesystem;
-
-uint64_t MaxModSize = 0;
-std::string FileSizes;
-std::string FileList;
-int ModsLoaded = 0;
-
-void InitRes() {
-    std::string Path = Resource + "/Client";
-    if (!fs::exists(Path))
-        fs::create_directory(Path);
-    for (const auto& entry : fs::directory_iterator(Path)) {
-        auto pos = entry.path().string().find(".zip");
-        if (pos != std::string::npos) {
-            if (entry.path().string().length() - pos == 4) {
-                FileList += entry.path().string() + ";";
-                FileSizes += std::to_string(uint64_t(fs::file_size(entry.path()))) + ";";
-                MaxModSize += uint64_t(fs::file_size(entry.path()));
-                ModsLoaded++;
-            }
-        }
-    }
-    std::replace(FileList.begin(), FileList.end(), '\\', '/');
-    if (ModsLoaded)
-        info("Loaded " + std::to_string(ModsLoaded) + " Mods");
-}

src/Init/Startup.cpp

@@ -1,38 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/28/2020
-///
-#include "Client.hpp"
-#include "Logger.h"
-#include "Security/Enc.h"
-#include <algorithm>
-#include <string>
-
-std::string CustomIP;
-std::string GetSVer() {
-    return "1.20";
-}
-std::string GetCVer() {
-    return "1.80";
-}
-void Args(int argc, char* argv[]) {
-    info("BeamMP Server Running version " + GetSVer());
-    if (argc > 1) {
-        CustomIP = argv[1];
-        size_t n = std::count(CustomIP.begin(), CustomIP.end(), '.');
-        auto p = CustomIP.find_first_not_of((".0123456789"));
-        if (p != std::string::npos || n != 3 || CustomIP.substr(0, 3) == ("127")) {
-            CustomIP.clear();
-            warn("IP Specified is invalid! Ignoring");
-        } else
-            info("Server started with custom IP");
-    }
-}
-void InitServer(int argc, char* argv[]) {
-    InitLog();
-    Args(argc, argv);
-    CI = std::make_unique<ClientInterface>();
-}

src/Lua/LuaMain.cpp

@@ -1,92 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 5/20/2020
-///
-
-#include "Logger.h"
-#include "Lua/LuaSystem.hpp"
-#include "Security/Enc.h"
-#include "Settings.h"
-#include <thread>
-
-#ifdef __linux
-// we need this for `struct stat`
-#include <sys/stat.h>
-#endif // __linux
-
-std::set<std::unique_ptr<Lua>> PluginEngine;
-bool NewFile(const std::string& Path) {
-    for (auto& Script : PluginEngine) {
-        if (Path == Script->GetFileName())
-            return false;
-    }
-    return true;
-}
-void RegisterFiles(const std::string& Path, bool HotSwap) {
-    std::string Name = Path.substr(Path.find_last_of('\\') + 1);
-    if (!HotSwap)
-        info(("Loading plugin : ") + Name);
-    for (const auto& entry : fs::directory_iterator(Path)) {
-        auto pos = entry.path().string().find((".lua"));
-        if (pos != std::string::npos && entry.path().string().length() - pos == 4) {
-            if (!HotSwap || NewFile(entry.path().string())) {
-                auto FileName = entry.path().string();
-                std::unique_ptr<Lua> ScriptToInsert(new Lua(Name, FileName, fs::last_write_time(FileName)));
-                auto& Script = *ScriptToInsert;
-                PluginEngine.insert(std::move(ScriptToInsert));
-                Script.Init();
-                if (HotSwap)
-                    info(("[HOTSWAP] Added : ") + Script.GetFileName().substr(Script.GetFileName().find('\\')));
-            }
-        }
-    }
-}
-void FolderList(const std::string& Path, bool HotSwap) {
-    for (const auto& entry : fs::directory_iterator(Path)) {
-        auto pos = entry.path().filename().string().find('.');
-        if (pos == std::string::npos) {
-            RegisterFiles(entry.path().string(), HotSwap);
-        }
-    }
-}
-[[noreturn]] void HotSwaps(const std::string& path) {
-    DebugPrintTID();
-    while (true) {
-        if (!PluginEngine.empty()) {
-            for (auto& Script : PluginEngine) {
-                struct stat Info { };
-                if (stat(Script->GetFileName().c_str(), &Info) != 0) {
-                    Script->SetStopThread(true);
-                    PluginEngine.erase(Script);
-                    info(("[HOTSWAP] Removed removed script due to delete"));
-                    break;
-                }
-                if (Script->GetLastWrite() != fs::last_write_time(Script->GetFileName())) {
-                    Script->SetStopThread(true);
-                    info(("[HOTSWAP] Updated Scripts due to edit"));
-                    Script->SetLastWrite(fs::last_write_time(Script->GetFileName()));
-                    Script->Reload();
-                }
-            }
-        }
-        FolderList(path, true);
-        std::this_thread::sleep_for(std::chrono::seconds(2));
-    }
-}
-
-void InitLua() {
-    if (!fs::exists(Resource)) {
-        fs::create_directory(Resource);
-    }
-    std::string Path = Resource + ("/Server");
-    if (!fs::exists(Path)) {
-        fs::create_directory(Path);
-    }
-    FolderList(Path, false);
-    std::thread t1(HotSwaps, Path);
-    t1.detach();
-    info(("Lua system online"));
-}

src/Lua/LuaSystem.cpp

@@ -1,705 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 5/19/2020
-///
-
-#include "Lua/LuaSystem.hpp"
-#include "Client.hpp"
-#include "Logger.h"
-#include "Network.h"
-#include "Security/Enc.h"
-#include "Settings.h"
-#include "UnixCompat.h"
-#include <future>
-#include <iostream>
-#include <optional>
-#include <utility>
-
-std::shared_ptr<LuaArg> CreateArg(lua_State* L, int T, int S) {
-    if (S > T)
-        return nullptr;
-    std::shared_ptr<LuaArg> temp(new LuaArg);
-    for (int C = S; C <= T; C++) {
-        if (lua_isstring(L, C)) {
-            temp->args.emplace_back(std::string(lua_tostring(L, C)));
-        } else if (lua_isinteger(L, C)) {
-            temp->args.emplace_back(int(lua_tointeger(L, C)));
-        } else if (lua_isboolean(L, C)) {
-            temp->args.emplace_back(bool(lua_toboolean(L, C)));
-        } else if (lua_isnumber(L, C)) {
-            temp->args.emplace_back(float(lua_tonumber(L, C)));
-        }
-    }
-    return temp;
-}
-void ClearStack(lua_State* L) {
-    lua_settop(L, 0);
-}
-std::optional<std::reference_wrapper<Lua>> GetScript(lua_State* L) {
-    for (auto& Script : PluginEngine) {
-        if (Script->GetState() == L)
-            return *Script;
-    }
-    return std::nullopt;
-}
-void SendError(lua_State* L, const std::string& msg) {
-    Assert(L);
-    auto MaybeS = GetScript(L);
-    std::string a;
-    if (!MaybeS.has_value()) {
-        a = ("_Console");
-    } else {
-        Lua& S = MaybeS.value();
-        a = fs::path(S.GetFileName()).filename().string();
-    }
-    warn(a + (" | Incorrect Call of ") + msg);
-}
-std::any Trigger(Lua* lua, const std::string& R, std::shared_ptr<LuaArg> arg) {
-    std::lock_guard<std::mutex> lockGuard(lua->Lock);
-    std::packaged_task<std::any(std::shared_ptr<LuaArg>)> task([lua, R](std::shared_ptr<LuaArg> arg) { return CallFunction(lua, R, arg); });
-    std::future<std::any> f1 = task.get_future();
-    std::thread t(std::move(task), arg);
-    t.detach();
-    auto status = f1.wait_for(std::chrono::seconds(5));
-    if (status != std::future_status::timeout)
-        return f1.get();
-    SendError(lua->GetState(), R + " took too long to respond");
-    return 0;
-}
-std::any FutureWait(Lua* lua, const std::string& R, std::shared_ptr<LuaArg> arg, bool Wait) {
-    Assert(lua);
-    std::packaged_task<std::any(std::shared_ptr<LuaArg>)> task([lua, R](std::shared_ptr<LuaArg> arg) { return Trigger(lua, R, arg); });
-    std::future<std::any> f1 = task.get_future();
-    std::thread t(std::move(task), arg);
-    t.detach();
-    int T = 0;
-    if (Wait)
-        T = 6;
-    auto status = f1.wait_for(std::chrono::seconds(T));
-    if (status != std::future_status::timeout)
-        return f1.get();
-    return 0;
-}
-std::any TriggerLuaEvent(const std::string& Event, bool local, Lua* Caller, std::shared_ptr<LuaArg> arg, bool Wait) {
-    std::any R;
-    std::string Type;
-    int Ret = 0;
-    for (auto& Script : PluginEngine) {
-        if (Script->IsRegistered(Event)) {
-            if (local) {
-                if (Script->GetPluginName() == Caller->GetPluginName()) {
-                    R = FutureWait(Script.get(), Script->GetRegistered(Event), arg, Wait);
-                    Type = R.type().name();
-                    if (Type.find("int") != std::string::npos) {
-                        if (std::any_cast<int>(R))
-                            Ret++;
-                    } else if (Event == "onPlayerAuth")
-                        return R;
-                }
-            } else {
-                R = FutureWait(Script.get(), Script->GetRegistered(Event), arg, Wait);
-                Type = R.type().name();
-                if (Type.find("int") != std::string::npos) {
-                    if (std::any_cast<int>(R))
-                        Ret++;
-                } else if (Event == "onPlayerAuth")
-                    return R;
-            }
-        }
-    }
-    return Ret;
-}
-bool ConsoleCheck(lua_State* L, int r) {
-    if (r != LUA_OK) {
-        std::string msg = lua_tostring(L, -1);
-        warn(("_Console | ") + msg);
-        return false;
-    }
-    return true;
-}
-bool CheckLua(lua_State* L, int r) {
-    if (r != LUA_OK) {
-        std::string msg = lua_tostring(L, -1);
-        auto MaybeS = GetScript(L);
-        if (MaybeS.has_value()) {
-            Lua& S = MaybeS.value();
-            std::string a = fs::path(S.GetFileName()).filename().string();
-            warn(a + " | " + msg);
-            return false;
-        }
-        // What the fuck, what do we do?!
-        AssertNotReachable();
-    }
-    return true;
-}
-
-int lua_RegisterEvent(lua_State* L) {
-    int Args = lua_gettop(L);
-    auto MaybeScript = GetScript(L);
-    Assert(MaybeScript.has_value());
-    Lua& Script = MaybeScript.value();
-    if (Args == 2 && lua_isstring(L, 1) && lua_isstring(L, 2)) {
-        Script.RegisterEvent(lua_tostring(L, 1), lua_tostring(L, 2));
-    } else
-        SendError(L, ("RegisterEvent invalid argument count expected 2 got ") + std::to_string(Args));
-    return 0;
-}
-int lua_TriggerEventL(lua_State* L) {
-    int Args = lua_gettop(L);
-    auto MaybeScript = GetScript(L);
-    Assert(MaybeScript.has_value());
-    Lua& Script = MaybeScript.value();
-    if (Args > 0) {
-        if (lua_isstring(L, 1)) {
-            TriggerLuaEvent(lua_tostring(L, 1), true, &Script, CreateArg(L, Args, 2), false);
-        } else
-            SendError(L, ("TriggerLocalEvent wrong argument [1] need string"));
-    } else {
-        SendError(L, ("TriggerLocalEvent not enough arguments expected 1 got 0"));
-    }
-    return 0;
-}
-
-int lua_TriggerEventG(lua_State* L) {
-    int Args = lua_gettop(L);
-    auto MaybeScript = GetScript(L);
-    Assert(MaybeScript.has_value());
-    Lua& Script = MaybeScript.value();
-    if (Args > 0) {
-        if (lua_isstring(L, 1)) {
-            TriggerLuaEvent(lua_tostring(L, 1), false, &Script, CreateArg(L, Args, 2), false);
-        } else
-            SendError(L, ("TriggerGlobalEvent wrong argument [1] need string"));
-    } else
-        SendError(L, ("TriggerGlobalEvent not enough arguments"));
-    return 0;
-}
-
-char* ThreadOrigin(Lua* lua) {
-    std::string T = "Thread in " + fs::path(lua->GetFileName()).filename().string();
-    char* Data = new char[T.size() + 1];
-    ZeroMemory(Data, T.size() + 1);
-    memcpy(Data, T.c_str(), T.size());
-    return Data;
-}
-void SafeExecution(Lua* lua, const std::string& FuncName) {
-    lua_State* luaState = lua->GetState();
-    lua_getglobal(luaState, FuncName.c_str());
-    if (lua_isfunction(luaState, -1)) {
-        char* Origin = ThreadOrigin(lua);
-#ifdef WIN32
-        __try {
-            int R = lua_pcall(luaState, 0, 0, 0);
-            CheckLua(luaState, R);
-        } __except (Handle(GetExceptionInformation(), Origin)) {
-        }
-#else // unix
-        int R = lua_pcall(luaState, 0, 0, 0);
-        CheckLua(luaState, R);
-#endif // WIN32
-        delete[] Origin;
-    }
-    ClearStack(luaState);
-}
-
-void ExecuteAsync(Lua* lua, const std::string& FuncName) {
-    std::lock_guard<std::mutex> lockGuard(lua->Lock);
-    SafeExecution(lua, FuncName);
-}
-void CallAsync(Lua* lua, const std::string& Func, int U) {
-    DebugPrintTID();
-    lua->SetStopThread(false);
-    int D = 1000 / U;
-    while (!lua->GetStopThread()) {
-        ExecuteAsync(lua, Func);
-        std::this_thread::sleep_for(std::chrono::milliseconds(D));
-    }
-}
-int lua_StopThread(lua_State* L) {
-    auto MaybeScript = GetScript(L);
-    Assert(MaybeScript.has_value());
-    // ugly, but whatever, this is safe as fuck
-    MaybeScript.value().get().SetStopThread(true);
-    return 0;
-}
-int lua_CreateThread(lua_State* L) {
-    int Args = lua_gettop(L);
-    if (Args > 1) {
-        if (lua_isstring(L, 1)) {
-            std::string STR = lua_tostring(L, 1);
-            if (lua_isinteger(L, 2) || lua_isnumber(L, 2)) {
-                int U = int(lua_tointeger(L, 2));
-                if (U > 0 && U < 501) {
-                    auto MaybeScript = GetScript(L);
-                    Assert(MaybeScript.has_value());
-                    Lua& Script = MaybeScript.value();
-                    std::thread t1(CallAsync, &Script, STR, U);
-                    t1.detach();
-                } else
-                    SendError(L, ("CreateThread wrong argument [2] number must be between 1 and 500"));
-            } else
-                SendError(L, ("CreateThread wrong argument [2] need number"));
-        } else
-            SendError(L, ("CreateThread wrong argument [1] need string"));
-    } else
-        SendError(L, ("CreateThread not enough arguments"));
-    return 0;
-}
-int lua_Sleep(lua_State* L) {
-    if (lua_isnumber(L, 1)) {
-        int t = int(lua_tonumber(L, 1));
-        std::this_thread::sleep_for(std::chrono::milliseconds(t));
-    } else {
-        SendError(L, ("Sleep not enough arguments"));
-        return 0;
-    }
-    return 1;
-}
-Client* GetClient(int ID) {
-    for (auto& c : CI->Clients) {
-        if (c != nullptr && c->GetID() == ID) {
-            return c.get();
-        }
-    }
-    return nullptr;
-}
-int lua_isConnected(lua_State* L) {
-    if (lua_isnumber(L, 1)) {
-        int ID = int(lua_tonumber(L, 1));
-        Client* c = GetClient(ID);
-        if (c != nullptr)
-            lua_pushboolean(L, c->isConnected);
-        else
-            return 0;
-    } else {
-        SendError(L, ("isConnected not enough arguments"));
-        return 0;
-    }
-    return 1;
-}
-int lua_GetPlayerName(lua_State* L) {
-    if (lua_isnumber(L, 1)) {
-        int ID = int(lua_tonumber(L, 1));
-        Client* c = GetClient(ID);
-        if (c != nullptr)
-            lua_pushstring(L, c->GetName().c_str());
-        else
-            return 0;
-    } else {
-        SendError(L, ("GetPlayerName not enough arguments"));
-        return 0;
-    }
-    return 1;
-}
-int lua_GetPlayerCount(lua_State* L) {
-    lua_pushinteger(L, CI->Size());
-    return 1;
-}
-int lua_GetGuest(lua_State* L) {
-    if (lua_isnumber(L, 1)) {
-        int ID = int(lua_tonumber(L, 1));
-        Client* c = GetClient(ID);
-        if (c != nullptr)
-            lua_pushboolean(L, c->isGuest);
-        else
-            return 0;
-    } else {
-        SendError(L, "GetGuest not enough arguments");
-        return 0;
-    }
-    return 1;
-}
-int lua_GetAllPlayers(lua_State* L) {
-    lua_newtable(L);
-    int i = 1;
-    for (auto& c : CI->Clients) {
-        if (c == nullptr)
-            continue;
-        lua_pushinteger(L, c->GetID());
-        lua_pushstring(L, c->GetName().c_str());
-        lua_settable(L, -3);
-        i++;
-    }
-    if (CI->Clients.empty())
-        return 0;
-    return 1;
-}
-int lua_GetCars(lua_State* L) {
-    if (lua_isnumber(L, 1)) {
-        int ID = int(lua_tonumber(L, 1));
-        Client* c = GetClient(ID);
-        if (c != nullptr) {
-            int i = 1;
-            for (auto& v : c->GetAllCars()) {
-                if (v != nullptr) {
-                    lua_pushinteger(L, v->ID);
-                    lua_pushstring(L, v->Data.substr(3).c_str());
-                    lua_settable(L, -3);
-                    i++;
-                }
-            }
-            if (c->GetAllCars().empty())
-                return 0;
-        } else
-            return 0;
-    } else {
-        SendError(L, ("GetPlayerVehicles not enough arguments"));
-        return 0;
-    }
-    return 1;
-}
-int lua_dropPlayer(lua_State* L) {
-    int Args = lua_gettop(L);
-    if (lua_isnumber(L, 1)) {
-        int ID = int(lua_tonumber(L, 1));
-        Client* c = GetClient(ID);
-        if (c == nullptr)
-            return 0;
-        std::string Reason;
-        if (Args > 1 && lua_isstring(L, 2)) {
-            Reason = std::string((" Reason : ")) + lua_tostring(L, 2);
-        }
-        Respond(c, "C:Server:You have been Kicked from the server! " + Reason, true);
-        c->SetStatus(-2);
-        info(("Closing socket due to kick"));
-        CloseSocketProper(c->GetTCPSock());
-    } else
-        SendError(L, ("DropPlayer not enough arguments"));
-    return 0;
-}
-int lua_sendChat(lua_State* L) {
-    if (lua_isinteger(L, 1) || lua_isnumber(L, 1)) {
-        if (lua_isstring(L, 2)) {
-            int ID = int(lua_tointeger(L, 1));
-            if (ID == -1) {
-                std::string Packet = "C:Server: " + std::string(lua_tostring(L, 2));
-                SendToAll(nullptr, Packet, true, true);
-            } else {
-                Client* c = GetClient(ID);
-                if (c != nullptr) {
-                    if (!c->isSynced)
-                        return 0;
-                    std::string Packet = "C:Server: " + std::string(lua_tostring(L, 2));
-                    Respond(c, Packet, true);
-                } else
-                    SendError(L, ("SendChatMessage invalid argument [1] invalid ID"));
-            }
-        } else
-            SendError(L, ("SendChatMessage invalid argument [2] expected string"));
-    } else
-        SendError(L, ("SendChatMessage invalid argument [1] expected number"));
-    return 0;
-}
-int lua_RemoveVehicle(lua_State* L) {
-    int Args = lua_gettop(L);
-    if (Args != 2) {
-        SendError(L, ("RemoveVehicle invalid argument count expected 2 got ") + std::to_string(Args));
-        return 0;
-    }
-    if ((lua_isinteger(L, 1) || lua_isnumber(L, 1)) && (lua_isinteger(L, 2) || lua_isnumber(L, 2))) {
-        int PID = int(lua_tointeger(L, 1));
-        int VID = int(lua_tointeger(L, 2));
-        Client* c = GetClient(PID);
-        if (c == nullptr) {
-            SendError(L, ("RemoveVehicle invalid Player ID"));
-            return 0;
-        }
-        if (!c->GetCarData(VID).empty()) {
-            std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
-            SendToAll(nullptr, Destroy, true, true);
-            c->DeleteCar(VID);
-        }
-    } else
-        SendError(L, ("RemoveVehicle invalid argument expected number"));
-    return 0;
-}
-int lua_HWID(lua_State* L) {
-    lua_pushinteger(L, -1);
-    return 1;
-}
-int lua_RemoteEvent(lua_State* L) {
-    int Args = lua_gettop(L);
-    if (Args != 3) {
-        SendError(L, ("TriggerClientEvent invalid argument count expected 3 got ") + std::to_string(Args));
-        return 0;
-    }
-    if (!lua_isnumber(L, 1)) {
-        SendError(L, ("TriggerClientEvent invalid argument [1] expected number"));
-        return 0;
-    }
-    if (!lua_isstring(L, 2)) {
-        SendError(L, ("TriggerClientEvent invalid argument [2] expected string"));
-        return 0;
-    }
-    if (!lua_isstring(L, 3)) {
-        SendError(L, ("TriggerClientEvent invalid argument [3] expected string"));
-        return 0;
-    }
-    int ID = int(lua_tointeger(L, 1));
-    std::string Packet = "E:" + std::string(lua_tostring(L, 2)) + ":" + std::string(lua_tostring(L, 3));
-    if (ID == -1)
-        SendToAll(nullptr, Packet, true, true);
-    else {
-        Client* c = GetClient(ID);
-        if (c == nullptr) {
-            SendError(L, ("TriggerClientEvent invalid Player ID"));
-            return 0;
-        }
-        Respond(c, Packet, true);
-    }
-    return 0;
-}
-int lua_ServerExit(lua_State* L) {
-    if (lua_gettop(L) > 0) {
-        if (lua_isnumber(L, 1)) {
-            _Exit(int(lua_tointeger(L, 1)));
-        }
-    }
-    _Exit(0);
-}
-int lua_Set(lua_State* L) {
-    int Args = lua_gettop(L);
-    if (Args != 2) {
-        SendError(L, ("set invalid argument count expected 2 got ") + std::to_string(Args));
-        return 0;
-    }
-    if (!lua_isnumber(L, 1)) {
-        SendError(L, ("set invalid argument [1] expected number"));
-        return 0;
-    }
-    auto MaybeSrc = GetScript(L);
-    std::string Name;
-    if (!MaybeSrc.has_value()) {
-        Name = ("_Console");
-    } else {
-        Name = MaybeSrc.value().get().GetPluginName();
-    }
-    int C = int(lua_tointeger(L, 1));
-    switch (C) {
-    case 0: //debug
-        if (lua_isboolean(L, 2)) {
-            Debug = lua_toboolean(L, 2);
-            info(Name + (" | Debug -> ") + (Debug ? "true" : "false"));
-        } else
-            SendError(L, ("set invalid argument [2] expected boolean for ID : 0"));
-        break;
-    case 1: //private
-        if (lua_isboolean(L, 2)) {
-            Private = lua_toboolean(L, 2);
-            info(Name + (" | Private -> ") + (Private ? "true" : "false"));
-        } else
-            SendError(L, ("set invalid argument [2] expected boolean for ID : 1"));
-        break;
-    case 2: //max cars
-        if (lua_isnumber(L, 2)) {
-            MaxCars = int(lua_tointeger(L, 2));
-            info(Name + (" | MaxCars -> ") + std::to_string(MaxCars));
-        } else
-            SendError(L, ("set invalid argument [2] expected number for ID : 2"));
-        break;
-    case 3: //max players
-        if (lua_isnumber(L, 2)) {
-            MaxPlayers = int(lua_tointeger(L, 2));
-            info(Name + (" | MaxPlayers -> ") + std::to_string(MaxPlayers));
-        } else
-            SendError(L, ("set invalid argument [2] expected number for ID : 3"));
-        break;
-    case 4: //Map
-        if (lua_isstring(L, 2)) {
-            MapName = lua_tostring(L, 2);
-            info(Name + (" | MapName -> ") + MapName);
-        } else
-            SendError(L, ("set invalid argument [2] expected string for ID : 4"));
-        break;
-    case 5: //Name
-        if (lua_isstring(L, 2)) {
-            ServerName = lua_tostring(L, 2);
-            info(Name + (" | ServerName -> ") + ServerName);
-        } else
-            SendError(L, ("set invalid argument [2] expected string for ID : 5"));
-        break;
-    case 6: //Desc
-        if (lua_isstring(L, 2)) {
-            ServerDesc = lua_tostring(L, 2);
-            info(Name + (" | ServerDesc -> ") + ServerDesc);
-        } else
-            SendError(L, ("set invalid argument [2] expected string for ID : 6"));
-        break;
-    default:
-        warn(("Invalid config ID : ") + std::to_string(C));
-        break;
-    }
-
-    return 0;
-}
-extern "C" {
-int lua_Print(lua_State* L) {
-    int Arg = lua_gettop(L);
-    for (int i = 1; i <= Arg; i++) {
-        auto str = lua_tostring(L, i);
-        if (str != nullptr) {
-            ConsoleOut(str + std::string(("\n")));
-        } else {
-            ConsoleOut(("nil\n"));
-        }
-    }
-    return 0;
-}
-}
-
-Lua::Lua(const std::string& PluginName, const std::string& FileName, fs::file_time_type LastWrote, bool Console)
-    : luaState(luaL_newstate()) {
-    Assert(luaState);
-    if (!PluginName.empty()) {
-        SetPluginName(PluginName);
-    }
-    if (!FileName.empty()) {
-        SetFileName(FileName);
-    }
-    SetLastWrite(LastWrote);
-    _Console = Console;
-}
-
-Lua::Lua(bool Console)
-    : luaState(luaL_newstate()) {
-    _Console = Console;
-}
-
-void Lua::Execute(const std::string& Command) {
-    if (ConsoleCheck(luaState, luaL_dostring(luaState, Command.c_str()))) {
-        lua_settop(luaState, 0);
-    }
-}
-void Lua::Reload() {
-    if (CheckLua(luaState, luaL_dofile(luaState, _FileName.c_str()))) {
-        CallFunction(this, ("onInit"), nullptr);
-    }
-}
-std::string Lua::GetOrigin() {
-    return fs::path(GetFileName()).filename().string();
-}
-
-std::any CallFunction(Lua* lua, const std::string& FuncName, std::shared_ptr<LuaArg> Arg) {
-    lua_State* luaState = lua->GetState();
-    lua_getglobal(luaState, FuncName.c_str());
-    if (lua_isfunction(luaState, -1)) {
-        int Size = 0;
-        if (Arg != nullptr) {
-            Size = int(Arg->args.size());
-            Arg->PushArgs(luaState);
-        }
-        int R = lua_pcall(luaState, Size, 1, 0);
-        if (CheckLua(luaState, R)) {
-            if (lua_isnumber(luaState, -1)) {
-                return int(lua_tointeger(luaState, -1));
-            } else if (lua_isstring(luaState, -1)) {
-                return std::string(lua_tostring(luaState, -1));
-            }
-        }
-    }
-    ClearStack(luaState);
-    return 0;
-}
-void Lua::SetPluginName(const std::string& Name) {
-    _PluginName = Name;
-}
-void Lua::SetFileName(const std::string& Name) {
-    _FileName = Name;
-}
-int lua_TempFix(lua_State* L) {
-    if (lua_isnumber(L, 1)) {
-        int ID = int(lua_tonumber(L, 1));
-        Client* c = GetClient(ID);
-        if (c == nullptr)
-            return 0;
-        std::string Ret;
-        if (c->isGuest) {
-            Ret = "Guest-" + c->GetName();
-        } else
-            Ret = c->GetName();
-        lua_pushstring(L, Ret.c_str());
-    } else
-        SendError(L, "GetDID not enough arguments");
-    return 1;
-}
-void Lua::Init() {
-    Assert(luaState);
-    luaL_openlibs(luaState);
-    lua_register(luaState, "TriggerGlobalEvent", lua_TriggerEventG);
-    lua_register(luaState, "TriggerLocalEvent", lua_TriggerEventL);
-    lua_register(luaState, "TriggerClientEvent", lua_RemoteEvent);
-    lua_register(luaState, "GetPlayerCount", lua_GetPlayerCount);
-    lua_register(luaState, "isPlayerConnected", lua_isConnected);
-    lua_register(luaState, "RegisterEvent", lua_RegisterEvent);
-    lua_register(luaState, "GetPlayerName", lua_GetPlayerName);
-    lua_register(luaState, "RemoveVehicle", lua_RemoveVehicle);
-    lua_register(luaState, "GetPlayerDiscordID", lua_TempFix);
-    lua_register(luaState, "CreateThread", lua_CreateThread);
-    lua_register(luaState, "GetPlayerVehicles", lua_GetCars);
-    lua_register(luaState, "SendChatMessage", lua_sendChat);
-    lua_register(luaState, "GetPlayers", lua_GetAllPlayers);
-    lua_register(luaState, "GetPlayerGuest", lua_GetGuest);
-    lua_register(luaState, "StopThread", lua_StopThread);
-    lua_register(luaState, "DropPlayer", lua_dropPlayer);
-    lua_register(luaState, "GetPlayerHWID", lua_HWID);
-    lua_register(luaState, "exit", lua_ServerExit);
-    lua_register(luaState, "Sleep", lua_Sleep);
-    lua_register(luaState, "print", lua_Print);
-    lua_register(luaState, "Set", lua_Set);
-    if (!_Console)
-        Reload();
-}
-
-void Lua::RegisterEvent(const std::string& Event, const std::string& FunctionName) {
-    _RegisteredEvents.insert(std::make_pair(Event, FunctionName));
-}
-void Lua::UnRegisterEvent(const std::string& Event) {
-    for (const std::pair<std::string, std::string>& a : _RegisteredEvents) {
-        if (a.first == Event) {
-            _RegisteredEvents.erase(a);
-            break;
-        }
-    }
-}
-bool Lua::IsRegistered(const std::string& Event) {
-    for (const std::pair<std::string, std::string>& a : _RegisteredEvents) {
-        if (a.first == Event)
-            return true;
-    }
-    return false;
-}
-std::string Lua::GetRegistered(const std::string& Event) const {
-    for (const std::pair<std::string, std::string>& a : _RegisteredEvents) {
-        if (a.first == Event)
-            return a.second;
-    }
-    return "";
-}
-std::string Lua::GetFileName() const {
-    return _FileName;
-}
-std::string Lua::GetPluginName() const {
-    return _PluginName;
-}
-lua_State* Lua::GetState() {
-    return luaState;
-}
-
-const lua_State* Lua::GetState() const {
-    return luaState;
-}
-
-void Lua::SetLastWrite(fs::file_time_type time) {
-    _LastWrote = time;
-}
-fs::file_time_type Lua::GetLastWrite() {
-    return _LastWrote;
-}
-
-Lua::~Lua() {
-    info("closing lua state");
-    lua_close(luaState);
-}

src/LuaAPI.cpp

@@ -0,0 +1,375 @@
+#include "LuaAPI.h"
+#include "Client.h"
+#include "Common.h"
+#include "TLuaEngine.h"
+
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+std::string LuaAPI::LuaToString(const sol::object Value, size_t Indent, bool QuoteStrings) {
+    if (Indent > 80) {
+        return "[[possible recursion, refusing to keep printing]]";
+    }
+    switch (Value.get_type()) {
+    case sol::type::userdata: {
+        std::stringstream ss;
+        ss << "[[userdata: " << Value.as<sol::userdata>().pointer() << "]]";
+        return ss.str();
+    }
+    case sol::type::thread: {
+        std::stringstream ss;
+        ss << "[[thread: " << Value.as<sol::thread>().pointer() << "]] {"
+           << "\n";
+        for (size_t i = 0; i < Indent; ++i) {
+            ss << "\t";
+        }
+        ss << "status: " << std::to_string(int(Value.as<sol::thread>().status())) << "\n}";
+        return ss.str();
+    }
+    case sol::type::lightuserdata: {
+        std::stringstream ss;
+        ss << "[[lightuserdata: " << Value.as<sol::lightuserdata>().pointer() << "]]";
+        return ss.str();
+    }
+    case sol::type::string:
+        if (QuoteStrings) {
+            return "\"" + Value.as<std::string>() + "\"";
+        } else {
+            return Value.as<std::string>();
+        }
+    case sol::type::number: {
+        std::stringstream ss;
+        ss << Value.as<float>();
+        return ss.str();
+    }
+    case sol::type::lua_nil:
+    case sol::type::none:
+        return "<nil>";
+    case sol::type::boolean:
+        return Value.as<bool>() ? "true" : "false";
+    case sol::type::table: {
+        std::stringstream Result;
+        auto Table = Value.as<sol::table>();
+        Result << "[[table: " << Table.pointer() << "]]: {";
+        if (!Table.empty()) {
+            for (const auto& Entry : Table) {
+                Result << "\n";
+                for (size_t i = 0; i < Indent; ++i) {
+                    Result << "\t";
+                }
+                Result << LuaToString(Entry.first, Indent + 1) << ": " << LuaToString(Entry.second, Indent + 1, true) << ",";
+            }
+            Result << "\n";
+        }
+        for (size_t i = 0; i < Indent - 1; ++i) {
+            Result << "\t";
+        }
+        Result << "}";
+        return Result.str();
+    }
+    case sol::type::function: {
+        std::stringstream ss;
+        ss << "[[function: " << Value.as<sol::function>().pointer() << "]]";
+        return ss.str();
+    }
+    default:
+        return "((unprintable type))";
+    }
+}
+
+std::string LuaAPI::MP::GetOSName() {
+#if WIN32
+    return "Windows";
+#elif __linux
+    return "Linux";
+#else
+    return "Other";
+#endif
+}
+
+std::tuple<int, int, int> LuaAPI::MP::GetServerVersion() {
+    return { Application::ServerVersion().major, Application::ServerVersion().minor, Application::ServerVersion().patch };
+}
+
+void LuaAPI::Print(sol::variadic_args Args) {
+    std::string ToPrint = "";
+    for (const auto& Arg : Args) {
+        ToPrint += LuaToString(static_cast<const sol::object>(Arg));
+        ToPrint += "\t";
+    }
+    luaprint(ToPrint);
+}
+
+bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
+    std::string Packet = "E:" + EventName + ":" + Data;
+    if (PlayerID == -1)
+        Engine->Network().SendToAll(nullptr, Packet, true, true);
+    else {
+        auto MaybeClient = GetClient(Engine->Server(), PlayerID);
+        if (!MaybeClient || MaybeClient.value().expired()) {
+            beammp_lua_error("TriggerClientEvent invalid Player ID");
+            return false;
+        }
+        auto c = MaybeClient.value().lock();
+        if (!Engine->Network().Respond(*c, Packet, true)) {
+            beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
+            Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
+            return false;
+        }
+    }
+    return true;
+}
+
+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;
+    }
+    auto c = MaybeClient.value().lock();
+    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
+}
+
+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, Packet, true, true);
+    } else {
+        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");
+        }
+    }
+}
+
+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");
+        return;
+    }
+    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, Destroy, true, true);
+        c->DeleteCar(VID);
+    }
+}
+
+void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
+    switch (ConfigID) {
+    case 0: // debug
+        if (NewValue.is<bool>()) {
+            Application::Settings.DebugModeEnabled = NewValue.as<bool>();
+            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
+        } else
+            beammp_lua_error("set invalid argument [2] expected boolean");
+        break;
+    case 1: // private
+        if (NewValue.is<bool>()) {
+            Application::Settings.Private = NewValue.as<bool>();
+            beammp_info(std::string("Set `Private` to ") + (Application::Settings.Private ? "true" : "false"));
+        } else
+            beammp_lua_error("set invalid argument [2] expected boolean");
+        break;
+    case 2: // max cars
+        if (NewValue.is<int>()) {
+            Application::Settings.MaxCars = NewValue.as<int>();
+            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.MaxCars));
+        } else
+            beammp_lua_error("set invalid argument [2] expected integer");
+        break;
+    case 3: // max players
+        if (NewValue.is<int>()) {
+            Application::Settings.MaxPlayers = NewValue.as<int>();
+            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.MaxPlayers));
+        } else
+            beammp_lua_error("set invalid argument [2] expected integer");
+        break;
+    case 4: // Map
+        if (NewValue.is<std::string>()) {
+            Application::Settings.MapName = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Map` to ") + Application::Settings.MapName);
+        } else
+            beammp_lua_error("set invalid argument [2] expected string");
+        break;
+    case 5: // Name
+        if (NewValue.is<std::string>()) {
+            Application::Settings.ServerName = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Name` to ") + Application::Settings.ServerName);
+        } else
+            beammp_lua_error("set invalid argument [2] expected string");
+        break;
+    case 6: // Desc
+        if (NewValue.is<std::string>()) {
+            Application::Settings.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.");
+        break;
+    }
+}
+
+void LuaAPI::MP::Sleep(size_t Ms) {
+    std::this_thread::sleep_for(std::chrono::milliseconds(Ms));
+}
+
+bool LuaAPI::MP::IsPlayerConnected(int ID) {
+    auto MaybeClient = GetClient(Engine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsConnected();
+    } else {
+        return false;
+    }
+}
+
+bool LuaAPI::MP::IsPlayerGuest(int ID) {
+    auto MaybeClient = GetClient(Engine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsGuest();
+    } else {
+        return false;
+    }
+}
+
+void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
+    std::string ToPrint = "";
+    for (const auto& Arg : Args) {
+        ToPrint += LuaToString(static_cast<const sol::object>(Arg));
+        ToPrint += "\t";
+    }
+    Application::Console().WriteRaw(ToPrint);
+}
+
+int LuaAPI::PanicHandler(lua_State* State) {
+    beammp_lua_error("PANIC: " + sol::stack::get<std::string>(State, 1));
+    return 0;
+}
+
+template <typename FnT, typename... ArgsT>
+static std::pair<bool, std::string> FSWrapper(FnT Fn, ArgsT&&... Args) {
+    std::error_code errc;
+    std::pair<bool, std::string> Result;
+    Fn(std::forward<ArgsT>(Args)..., errc);
+    Result.first = errc == std::error_code {};
+    if (!Result.first) {
+        Result.second = errc.message();
+    }
+    return Result;
+}
+
+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(fs::relative(Path), errc);
+    Result.first = errc == std::error_code {};
+    if (!Result.first) {
+        Result.second = errc.message();
+    }
+    return Result;
+}
+
+std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
+    std::error_code errc;
+    std::pair<bool, std::string> Result;
+    fs::remove(fs::relative(Path), errc);
+    Result.first = errc == std::error_code {};
+    if (!Result.first) {
+        Result.second = errc.message();
+    }
+    return Result;
+}
+
+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(fs::relative(Path), fs::relative(NewPath), errc);
+    Result.first = errc == std::error_code {};
+    if (!Result.first) {
+        Result.second = errc.message();
+    }
+    return Result;
+}
+
+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(fs::relative(Path), fs::relative(NewPath), fs::copy_options::recursive, errc);
+    Result.first = errc == std::error_code {};
+    if (!Result.first) {
+        Result.second = errc.message();
+    }
+    return Result;
+}
+
+bool LuaAPI::FS::Exists(const std::string& Path) {
+    return fs::exists(fs::relative(Path));
+}
+
+std::string LuaAPI::FS::GetFilename(const std::string& Path) {
+    return fs::path(Path).filename().string();
+}
+
+std::string LuaAPI::FS::GetExtension(const std::string& Path) {
+    return fs::path(Path).extension().string();
+}
+
+std::string LuaAPI::FS::GetParentFolder(const std::string& Path) {
+    return fs::path(Path).parent_path().string();
+}
+
+bool LuaAPI::FS::IsDirectory(const std::string& Path) {
+    return fs::is_directory(Path);
+}
+
+bool LuaAPI::FS::IsFile(const std::string& Path) {
+    return fs::is_regular_file(Path);
+}
+
+std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
+    fs::path Path;
+    for (size_t i = 0; i < Args.size(); ++i) {
+        auto Obj = Args[i];
+        if (!Obj.is<std::string>()) {
+            beammp_lua_error("FS.Concat called with non-string argument");
+            return "";
+        }
+        Path += Obj.as<std::string>();
+        if (i < Args.size() - 1 && !Path.empty()) {
+            Path += fs::path::preferred_separator;
+        }
+    }
+    auto Result = Path.lexically_normal().string();
+    return Result;
+}
+
+void LuaAPI::CL::SendPacket(int ID, const std::string& Packet) {
+    if (ID == -1) {
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, Packet, true, true);
+    } else {
+        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), ID);
+        if (MaybeClient && !MaybeClient.value().expired()) {
+            auto c = MaybeClient.value().lock();
+            if (!c->IsSynced())
+                return;
+            beammp_info("[LUA] Send packet to <" + c->GetName() + ">: " + Packet);
+            LuaAPI::MP::Engine->Network().Respond(*c, Packet, true);
+        } else {
+            beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
+        }
+    }
+}
+
+void LuaAPI::CL::SendNotify(int ID, const std::string& Notify) {
+    SendPacket(ID, "L:Server: " + Notify);
+}

src/Network/Auth.cpp

@@ -1,228 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 7/31/2020
-///
-
-#include "Curl/Http.h"
-#include "Json.h"
-#include "Logger.h"
-#include "Network.h"
-#include "Security/Enc.h"
-#include "Settings.h"
-#include "UnixCompat.h"
-#include <Lua/LuaSystem.hpp>
-#include <cstring>
-#include <string>
-#include <thread>
-
-std::string GetClientInfo(const std::string& PK) {
-    if (!PK.empty()) {
-        return PostHTTP("https://auth.beammp.com/pkToUser", R"({"key":")" + PK + "\"}", true);
-        ;
-    }
-    return "";
-}
-
-Client* CreateClient(SOCKET TCPSock) {
-    auto* c = new Client;
-    c->SetTCPSock(TCPSock);
-    return c;
-}
-
-void ClientKick(Client* c, const std::string& R) {
-    info("Client kicked: " + R);
-    TCPSend(c, "E" + R);
-    CloseSocketProper(c->GetTCPSock());
-}
-
-void Authentication(SOCKET TCPSock) {
-    DebugPrintTID();
-    auto* c = CreateClient(TCPSock);
-
-    info("Identifying new client...");
-    std::string Rc = TCPRcv(c);
-
-    if (Rc.size() > 3 && Rc.substr(0, 2) == "VC") {
-        Rc = Rc.substr(2);
-        if (Rc.length() > 4 || Rc != GetCVer()) {
-            ClientKick(c, "Outdated Version!");
-            return;
-        }
-    } else {
-        ClientKick(c, "Invalid version header!");
-        return;
-    }
-    TCPSend(c, "S");
-
-    Rc = TCPRcv(c);
-
-    if (Rc.size() > 50) {
-        ClientKick(c, "Invalid Key!");
-        return;
-    }
-
-    Rc = GetClientInfo(Rc);
-    json::Document d;
-    d.Parse(Rc.c_str());
-    if (Rc == "-1" || d.HasParseError()) {
-        ClientKick(c, "Invalid key! Please restart your game.");
-        return;
-    }
-
-    if (d["username"].IsString() && d["roles"].IsString() && d["guest"].IsBool()) {
-        c->SetName(d["username"].GetString());
-        c->SetRoles(d["roles"].GetString());
-        c->isGuest = d["guest"].GetBool();
-    } else {
-        ClientKick(c, "Invalid authentication data!");
-        return;
-    }
-
-    debug("Name -> " + c->GetName() + ", Guest -> " + std::to_string(c->isGuest) + ", Roles -> " + c->GetRoles());
-    for (auto& Cl : CI->Clients) {
-        if (Cl != nullptr) {
-            if (Cl->GetName() == c->GetName() && Cl->isGuest == c->isGuest) {
-                info("Old client (" + Cl->GetName() + ") kicked: Reconnecting");
-                CloseSocketProper(Cl->GetTCPSock());
-                Cl->SetStatus(-2);
-                break;
-            }
-        }
-    }
-
-    auto arg = std::make_unique<LuaArg>(LuaArg { { c->GetName(), c->GetRoles(), c->isGuest } });
-    std::any Res = TriggerLuaEvent("onPlayerAuth", false, nullptr, std::move(arg), true);
-    std::string Type = Res.type().name();
-    if (Type.find("int") != std::string::npos && std::any_cast<int>(Res)) {
-        ClientKick(c, "you are not allowed on the server!");
-        return;
-    } else if (Type.find("string") != std::string::npos) {
-        ClientKick(c, std::any_cast<std::string>(Res));
-        return;
-    }
-    if (CI->Size() < MaxPlayers) {
-        info("Identification success");
-        Client& Client = *c;
-        CI->AddClient(std::move(c));
-        TCPClient(&Client);
-    } else
-        ClientKick(c, "Server full!");
-}
-
-void HandleDownload(SOCKET TCPSock) {
-    char D;
-    if (recv(TCPSock, &D, 1, 0) != 1) {
-        CloseSocketProper(TCPSock);
-        return;
-    }
-    auto ID = uint8_t(D);
-    for (auto& c : CI->Clients) {
-        if (c->GetID() == ID) {
-            c->SetDownSock(TCPSock);
-        }
-    }
-}
-
-void Identify(SOCKET TCPSock) {
-    char Code;
-    if (recv(TCPSock, &Code, 1, 0) != 1) {
-        CloseSocketProper(TCPSock);
-        return;
-    }
-    if (Code == 'C') {
-        Authentication(TCPSock);
-    } else if (Code == 'D') {
-        HandleDownload(TCPSock);
-    } else
-        CloseSocketProper(TCPSock);
-}
-
-void TCPServerMain() {
-    DebugPrintTID();
-#ifdef WIN32
-    WSADATA wsaData;
-    if (WSAStartup(514, &wsaData)) {
-        error("Can't start Winsock!");
-        return;
-    }
-    SOCKET client, Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    sockaddr_in addr {};
-    addr.sin_addr.S_un.S_addr = ADDR_ANY;
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(Port);
-    if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) == SOCKET_ERROR) {
-        error("Can't bind socket! " + std::to_string(WSAGetLastError()));
-        std::this_thread::sleep_for(std::chrono::seconds(5));
-        _Exit(-1);
-    }
-    if (Listener == -1) {
-        error("Invalid listening socket");
-        return;
-    }
-    if (listen(Listener, SOMAXCONN)) {
-        error("listener failed " + std::to_string(GetLastError()));
-        return;
-    }
-    info("Vehicle event network online");
-    do {
-        try {
-            client = accept(Listener, nullptr, nullptr);
-            if (client == -1) {
-                warn("Got an invalid client socket on connect! Skipping...");
-                continue;
-            }
-            std::thread ID(Identify, client);
-            ID.detach();
-        } catch (const std::exception& e) {
-            error("fatal: " + std::string(e.what()));
-        }
-    } while (client);
-
-    CloseSocketProper(client);
-    WSACleanup();
-#else // unix
-    // wondering why we need slightly different implementations of this?
-    // ask ms.
-    SOCKET client = -1, Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    int optval = 1;
-    setsockopt(Listener, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval));
-    // TODO: check optval or return value idk
-    sockaddr_in addr {};
-    addr.sin_addr.s_addr = INADDR_ANY;
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(uint16_t(Port));
-    if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) != 0) {
-        error(("Can't bind socket! ") + std::string(strerror(errno)));
-        std::this_thread::sleep_for(std::chrono::seconds(5));
-        _Exit(-1);
-    }
-    if (Listener == -1) {
-        error(("Invalid listening socket"));
-        return;
-    }
-    if (listen(Listener, SOMAXCONN)) {
-        error(("listener failed ") + std::string(strerror(errno)));
-        return;
-    }
-    info(("Vehicle event network online"));
-    do {
-        try {
-            client = accept(Listener, nullptr, nullptr);
-            if (client == -1) {
-                warn(("Got an invalid client socket on connect! Skipping..."));
-                continue;
-            }
-            std::thread ID(Identify, client);
-            ID.detach();
-        } catch (const std::exception& e) {
-            error(("fatal: ") + std::string(e.what()));
-        }
-    } while (client);
-
-    debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));
-    CloseSocketProper(client);
-#endif // WIN32
-}

src/Network/Client.cpp

@@ -1,66 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 5/8/2020
-///
-#include "Client.hpp"
-
-#include <memory>
-
-void Client::DeleteCar(int ident) {
-    for (auto& v : VehicleData) {
-        if (v != nullptr && v->ID == ident) {
-            VehicleData.erase(v);
-            break;
-        }
-    }
-}
-void Client::ClearCars() {
-    VehicleData.clear();
-}
-int Client::GetOpenCarID() {
-    int OpenID = 0;
-    bool found;
-    do {
-        found = true;
-        for (auto& v : VehicleData) {
-            if (v != nullptr && v->ID == OpenID) {
-                OpenID++;
-                found = false;
-            }
-        }
-    } while (!found);
-    return OpenID;
-}
-void Client::AddNewCar(int ident, const std::string& Data) {
-    VehicleData.insert(std::make_unique<VData>(VData { ident, Data }));
-}
-
-std::set<std::unique_ptr<VData>>& Client::GetAllCars() {
-    return VehicleData;
-}
-
-std::string Client::GetCarData(int ident) {
-    for (auto& v : VehicleData) {
-        if (v != nullptr && v->ID == ident) {
-            return v->Data;
-        }
-    }
-    DeleteCar(ident);
-    return "";
-}
-
-void Client::SetCarData(int ident, const std::string& Data) {
-    for (auto& v : VehicleData) {
-        if (v != nullptr && v->ID == ident) {
-            v->Data = Data;
-            return;
-        }
-    }
-    DeleteCar(ident);
-}
-int Client::GetCarCount() {
-    return int(VehicleData.size());
-}

src/Network/GParser.cpp

@@ -1,268 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 8/1/2020
-///
-
-#include "Client.hpp"
-#include "Logger.h"
-#include "Lua/LuaSystem.hpp"
-#include "Network.h"
-#include "Security/Enc.h"
-#include "Settings.h"
-#include "UnixCompat.h"
-#undef GetObject //to fix microsoft bs
-#include "Json.h"
-
-void Apply(Client* c, int VID, const std::string& pckt) {
-    Assert(c);
-    std::string Packet = pckt.substr(pckt.find('{')), VD = c->GetCarData(VID);
-    std::string Header = VD.substr(0, VD.find('{'));
-    VD = VD.substr(VD.find('{'));
-    rapidjson::Document Veh, Pack;
-    Veh.Parse(VD.c_str());
-    if (Veh.HasParseError()) {
-        error("Could not get vehicle config!");
-        return;
-    }
-    Pack.Parse(Packet.c_str());
-    if (Pack.HasParseError() || Pack.IsNull()) {
-        error("Could not get active vehicle config!");
-        return;
-    }
-
-    for (auto& M : Pack.GetObject()) {
-        if (Veh[M.name].IsNull()) {
-            Veh.AddMember(M.name, M.value, Veh.GetAllocator());
-        } else {
-            Veh[M.name] = Pack[M.name];
-        }
-    }
-    rapidjson::StringBuffer Buffer;
-    rapidjson::Writer<rapidjson::StringBuffer> writer(Buffer);
-    Veh.Accept(writer);
-    c->SetCarData(VID, Header + Buffer.GetString());
-}
-
-void VehicleParser(Client* c, const std::string& Pckt) {
-    Assert(c);
-    if (c == nullptr || Pckt.length() < 4)
-        return;
-    std::string Packet = Pckt;
-    char Code = Packet.at(1);
-    int PID = -1;
-    int VID = -1;
-    std::string Data = Packet.substr(3), pid, vid;
-    switch (Code) { //Spawned Destroyed Switched/Moved NotFound Reset
-    case 's':
-#ifdef DEBUG
-        debug(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        if (Data.at(0) == '0') {
-            int CarID = c->GetOpenCarID();
-            debug(c->GetName() + (" created a car with ID ") + std::to_string(CarID));
-            Packet = "Os:" + c->GetRoles() + ":" + c->GetName() + ":" + std::to_string(c->GetID()) + "-" + std::to_string(CarID) + Packet.substr(4);
-            auto Res = TriggerLuaEvent(("onVehicleSpawn"), false, nullptr, std::make_unique<LuaArg>(LuaArg { { c->GetID(), CarID, Packet.substr(3) } }), true);
-            if (c->GetCarCount() >= MaxCars || std::any_cast<int>(Res)) {
-                Respond(c, Packet, true);
-                std::string Destroy = "Od:" + std::to_string(c->GetID()) + "-" + std::to_string(CarID);
-                Respond(c, Destroy, true);
-                debug(c->GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
-            } else {
-                c->AddNewCar(CarID, Packet);
-                SendToAll(nullptr, Packet, true, true);
-            }
-        }
-        return;
-    case 'c':
-#ifdef DEBUG
-        debug(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        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 Res = TriggerLuaEvent(("onVehicleEdited"), false, nullptr,
-                std::make_unique<LuaArg>(LuaArg { { c->GetID(), VID, Packet.substr(3) } }),
-                true);
-            if (!std::any_cast<int>(Res)) {
-                SendToAll(c, Packet, false, true);
-                Apply(c, VID, Packet);
-            } else {
-                std::string Destroy = "Od:" + std::to_string(c->GetID()) + "-" + std::to_string(VID);
-                Respond(c, Destroy, true);
-                c->DeleteCar(VID);
-            }
-        }
-        return;
-    case 'd':
-#ifdef DEBUG
-        debug(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        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()) {
-            SendToAll(nullptr, Packet, true, true);
-            TriggerLuaEvent(("onVehicleDeleted"), false, nullptr,
-                std::make_unique<LuaArg>(LuaArg { { c->GetID(), VID } }), false);
-            c->DeleteCar(VID);
-            debug(c->GetName() + (" deleted car with ID ") + std::to_string(VID));
-        }
-        return;
-    case 'r':
-#ifdef DEBUG
-        debug(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        SendToAll(c, Packet, false, true);
-        return;
-    case 't':
-#ifdef DEBUG
-        debug(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        SendToAll(c, Packet, false, true);
-        return;
-    default:
-#ifdef DEBUG
-        warn(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
-#endif // DEBUG
-        return;
-    }
-}
-void SyncClient(Client* c) {
-    Assert(c);
-    if (c->isSynced)
-        return;
-    c->isSynced = true;
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    Respond(c, ("Sn") + c->GetName(), true);
-    SendToAll(c, ("JWelcome ") + c->GetName() + "!", false, true);
-    TriggerLuaEvent(("onPlayerJoin"), false, nullptr, std::make_unique<LuaArg>(LuaArg { { c->GetID() } }), false);
-    for (auto& client : CI->Clients) {
-        if (client != nullptr) {
-            if (client.get() != c) {
-                for (auto& v : client->GetAllCars()) {
-                    if (v != nullptr) {
-                        if (c->GetStatus() < 0)
-                            return;
-                        Respond(c, v->Data, true);
-                        std::this_thread::sleep_for(std::chrono::seconds(2));
-                    }
-                }
-            }
-        }
-    }
-    info(c->GetName() + (" is now synced!"));
-}
-void ParseVeh(Client* c, const std::string& Packet) {
-    Assert(c);
-#ifdef WIN32
-    __try {
-        VehicleParser(c, Packet);
-    } __except (Handle(GetExceptionInformation(), ("Vehicle Handler"))) { }
-#else // unix
-    VehicleParser(c, Packet);
-#endif // WIN32
-}
-
-void HandleEvent(Client* c, const std::string& Data) {
-    Assert(c);
-    std::stringstream ss(Data);
-    std::string t, Name;
-    int a = 0;
-    while (std::getline(ss, t, ':')) {
-        switch (a) {
-        case 1:
-            Name = t;
-            break;
-        case 2:
-            TriggerLuaEvent(Name, false, nullptr, std::make_unique<LuaArg>(LuaArg { { c->GetID(), t } }), false);
-            break;
-        default:
-            break;
-        }
-        if (a == 2)
-            break;
-        a++;
-    }
-}
-
-void GlobalParser(Client* c, const std::string& Packet) {
-    Assert(c);
-    if (Packet.empty() || c == nullptr)
-        return;
-    std::any Res;
-    char Code = Packet.at(0);
-
-    //V to Z
-    if (Code <= 90 && Code >= 86) {
-        PPS++;
-        SendToAll(c, Packet, false, false);
-        return;
-    }
-    switch (Code) {
-    case 'H': // initial connection
-#ifdef DEBUG
-        debug(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
-#endif
-        SyncClient(c);
-        return;
-    case 'p':
-        Respond(c, ("p"), false);
-        UpdatePlayers();
-        return;
-    case 'O':
-        if (Packet.length() > 1000) {
-            debug(("Received data from: ") + c->GetName() + (" Size: ") + std::to_string(Packet.length()));
-        }
-        ParseVeh(c, Packet);
-        return;
-    case 'J':
-#ifdef DEBUG
-        debug(std::string(("got 'J' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        SendToAll(c, Packet, false, true);
-        return;
-    case 'C':
-#ifdef DEBUG
-        debug(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        if (Packet.length() < 4 || Packet.find(':', 3) == std::string::npos)
-            break;
-        Res = TriggerLuaEvent("onChatMessage", false, nullptr, std::make_unique<LuaArg>(LuaArg { { c->GetID(), c->GetName(), Packet.substr(Packet.find(':', 3) + 1) } }), true);
-        if (std::any_cast<int>(Res))
-            break;
-        SendToAll(nullptr, Packet, true, true);
-        return;
-    case 'E':
-#ifdef DEBUG
-        debug(std::string(("got 'E' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-#endif
-        HandleEvent(c, Packet);
-        return;
-    default:
-        return;
-    }
-}
-
-void GParser(Client* c, const std::string& Packet) {
-    Assert(c);
-    if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
-        abort();
-    }
-#ifdef WIN32
-    __try {
-        GlobalParser(c, Packet);
-    } __except (Handle(GetExceptionInformation(), ("Global Handler"))) { }
-#else
-    GlobalParser(c, Packet);
-#endif // WIN32
-}

src/Network/Http.cpp

@@ -1,75 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 4/9/2020
-///
-
-#include "CustomAssert.h"
-#include <curl/curl.h>
-#include <iostream>
-
-class CurlManager{
-public:
-    CurlManager(){
-        curl = curl_easy_init();
-    }
-    ~CurlManager(){
-        curl_easy_cleanup(curl);
-    }
-    inline CURL* Get(){
-        return curl;
-    }
-private:
-    CURL *curl;
-};
-
-static size_t WriteCallback(void* contents, size_t size, size_t nmemb, void* userp) {
-    ((std::string*)userp)->append((char*)contents, size * nmemb);
-    return size * nmemb;
-}
-std::string HttpRequest(const std::string& IP, int port) {
-    static thread_local CurlManager M;
-    std::string readBuffer;
-    CURL* curl = M.Get();
-    CURLcode res;
-    Assert(curl);
-    if (curl) {
-        curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
-        curl_easy_setopt(curl, CURLOPT_PORT, port);
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
-        res = curl_easy_perform(curl);
-        if (res != CURLE_OK)
-            return "-1";
-    }
-    return readBuffer;
-}
-
-std::string PostHTTP(const std::string& IP, const std::string& Fields, bool json) {
-    auto header = curl_slist { (char*)"Content-Type: application/json" };
-    static thread_local CurlManager M;
-    static std::mutex Lock;
-    std::scoped_lock Guard(Lock);
-    CURL* curl = M.Get();
-    CURLcode res;
-    std::string readBuffer;
-
-    Assert(curl);
-    if (curl) {
-        curl_easy_setopt(curl, CURLOPT_URL, IP.c_str());
-        if (json)
-            curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header);
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, Fields.size());
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, Fields.c_str());
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
-        curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5);
-        res = curl_easy_perform(curl);
-        if (res != CURLE_OK)
-            return "-1";
-    }
-    return readBuffer;
-}

src/Network/InitClient.cpp

@@ -1,109 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 8/1/2020
-///
-#include "Client.hpp"
-#include "Logger.h"
-#include "Lua/LuaSystem.hpp"
-#include "Network.h"
-#include "Settings.h"
-#include "UnixCompat.h"
-#include <memory>
-
-int OpenID() {
-    int ID = 0;
-    bool found;
-    do {
-        found = true;
-        for (auto& c : CI->Clients) {
-            if (c != nullptr) {
-                if (c->GetID() == ID) {
-                    found = false;
-                    ID++;
-                }
-            }
-        }
-    } while (!found);
-    return ID;
-}
-void Respond(Client* c, const std::string& MSG, bool Rel) {
-    Assert(c);
-    char C = MSG.at(0);
-    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
-        if (C == 'O' || C == 'T' || MSG.length() > 1000) {
-            SendLarge(c, MSG);
-        } else {
-            TCPSend(c, MSG);
-        }
-    } else {
-        UDPSend(c, MSG);
-    }
-}
-void SendToAll(Client* c, const std::string& Data, bool Self, bool Rel) {
-    if (!Self)
-        Assert(c);
-    char C = Data.at(0);
-    for (auto& client : CI->Clients) {
-        if (client != nullptr) {
-            if (Self || client.get() != c) {
-                if (client->isSynced) {
-                    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
-                        if (C == 'O' || C == 'T' || Data.length() > 1000)
-                            SendLarge(client.get(), Data);
-                        else
-                            TCPSend(client.get(), Data);
-                    } else
-                        UDPSend(client.get(), Data);
-                }
-            }
-        }
-    }
-}
-void UpdatePlayers() {
-    std::string Packet = ("Ss") + std::to_string(CI->Size()) + "/" + std::to_string(MaxPlayers) + ":";
-    for (auto& c : CI->Clients) {
-        if (c != nullptr)
-            Packet += c->GetName() + ",";
-    }
-    Packet = Packet.substr(0, Packet.length() - 1);
-    SendToAll(nullptr, Packet, true, true);
-}
-void OnDisconnect(Client* c, bool kicked) {
-    Assert(c);
-    info(c->GetName() + (" Connection Terminated"));
-    std::string Packet;
-    for (auto& v : c->GetAllCars()) {
-        if (v != nullptr) {
-            Packet = "Od:" + std::to_string(c->GetID()) + "-" + std::to_string(v->ID);
-            SendToAll(c, Packet, false, true);
-        }
-    }
-    if (kicked)
-        Packet = ("L") + c->GetName() + (" was kicked!");
-    else
-        Packet = ("L") + c->GetName() + (" left the server!");
-    SendToAll(c, Packet, false, true);
-    Packet.clear();
-    TriggerLuaEvent(("onPlayerDisconnect"), false, nullptr, std::make_unique<LuaArg>(LuaArg { { c->GetID() } }), false);
-    if (c->GetTCPSock())
-        CloseSocketProper(c->GetTCPSock());
-    if (c->GetDownSock())
-        CloseSocketProper(c->GetDownSock());
-    CI->RemoveClient(c);
-}
-void OnConnect(Client* c) {
-    Assert(c);
-    info("Client connected");
-    c->SetID(OpenID());
-    info("Assigned ID " + std::to_string(c->GetID()) + " to " + c->GetName());
-    TriggerLuaEvent("onPlayerConnecting", false, nullptr, std::make_unique<LuaArg>(LuaArg { { c->GetID() } }), false);
-    SyncResources(c);
-    if (c->GetStatus() < 0)
-        return;
-    Respond(c, "M" + MapName, true); //Send the Map on connect
-    info(c->GetName() + " : Connected");
-    TriggerLuaEvent("onPlayerJoining", false, nullptr, std::make_unique<LuaArg>(LuaArg { { c->GetID() } }), false);
-}

src/Network/NetMain.cpp

@@ -1,9 +0,0 @@
-#include "Network.h"
-#include <memory>
-#include <thread>
-std::unique_ptr<ClientInterface> CI;
-void NetMain() {
-    std::thread TCP(TCPServerMain);
-    TCP.detach();
-    UDPServerMain();
-}

src/Network/StatMonitor.cpp

@@ -1,48 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 6/18/2020
-///
-#include "Client.hpp"
-#include "Security/Enc.h"
-#include <iostream>
-#include <string>
-#include <thread>
-std::string StatReport;
-int PPS = 0;
-void Monitor() {
-    int C = 0, V = 0;
-    if (CI->Clients.empty()) {
-        StatReport = "-";
-        return;
-    }
-    for (auto& c : CI->Clients) {
-        if (c != nullptr && c->GetCarCount() > 0) {
-            C++;
-            V += c->GetCarCount();
-        }
-    }
-    if (C == 0 || PPS == 0) {
-        StatReport = "-";
-    } else {
-        int R = (PPS / C) / V;
-        StatReport = std::to_string(R);
-    }
-    PPS = 0;
-}
-
-[[noreturn]] void Stat() {
-    DebugPrintTID();
-    while (true) {
-        Monitor();
-        std::this_thread::sleep_for(std::chrono::seconds(1));
-    }
-}
-
-void StatInit() {
-    StatReport = "-";
-    std::thread Init(Stat);
-    Init.detach();
-}

src/Network/Sync.cpp

@@ -1,154 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 8/1/2020
-///
-
-#include "Client.hpp"
-#include "Logger.h"
-#include "Network.h"
-#include "Security/Enc.h"
-#include "Settings.h"
-#include "UnixCompat.h"
-#include <filesystem>
-#include <fstream>
-
-bool TCPSendRaw(SOCKET C, char* Data, int32_t Size) {
-    int64_t Sent = 0;
-    do {
-        int64_t Temp = send(C, &Data[Sent], int(Size - Sent), 0);
-        if (Temp < 1) {
-            info("Socket Closed! " + std::to_string(C));
-            CloseSocketProper(C);
-            return false;
-        }
-        Sent += Temp;
-    } while (Sent < Size);
-    return true;
-}
-
-void SplitLoad(Client* c, int64_t Sent, int64_t Size, bool D, const std::string& Name) {
-    std::ifstream f(Name.c_str(), std::ios::binary);
-    int32_t Split = 0x7735940; //125MB
-    char* Data;
-    if (Size > Split)
-        Data = new char[Split];
-    else
-        Data = new char[Size];
-    SOCKET TCPSock;
-    if (D)
-        TCPSock = c->GetDownSock();
-    else
-        TCPSock = c->GetTCPSock();
-    info("Split load Socket " + std::to_string(TCPSock));
-    while (c->GetStatus() > -1 && Sent < Size) {
-        int64_t Diff = Size - Sent;
-        if (Diff > Split) {
-            f.seekg(Sent, std::ios_base::beg);
-            f.read(Data, Split);
-            if (!TCPSendRaw(TCPSock, Data, Split)) {
-                if (c->GetStatus() > -1)
-                    c->SetStatus(-1);
-                break;
-            }
-            Sent += Split;
-        } else {
-            f.seekg(Sent, std::ios_base::beg);
-            f.read(Data, Diff);
-            if (!TCPSendRaw(TCPSock, Data, int32_t(Diff))) {
-                if (c->GetStatus() > -1)
-                    c->SetStatus(-1);
-                break;
-            }
-            Sent += Diff;
-        }
-    }
-    delete[] Data;
-    f.close();
-}
-
-void SendFile(Client* c, const std::string& Name) {
-    Assert(c);
-    info(c->GetName() + " requesting : " + Name.substr(Name.find_last_of('/')));
-
-    if (!std::filesystem::exists(Name)) {
-        TCPSend(c, "CO");
-        warn("File " + Name + " could not be accessed!");
-        return;
-    } else
-        TCPSend(c, "AG");
-
-    ///Wait for connections
-    int T = 0;
-    while (c->GetDownSock() < 1 && T < 50) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        T++;
-    }
-
-    if (c->GetDownSock() < 1) {
-        error("Client doesn't have a download socket!");
-        if (c->GetStatus() > -1)
-            c->SetStatus(-1);
-        return;
-    }
-
-    int64_t Size = std::filesystem::file_size(Name), MSize = Size / 2;
-
-    std::thread Dt(SplitLoad, c, 0, MSize, false, Name);
-    Dt.detach();
-
-    SplitLoad(c, MSize, Size, true, Name);
-
-    if (Dt.joinable())
-        Dt.join();
-}
-
-void Parse(Client* c, const std::string& Packet) {
-    Assert(c);
-    if (c == nullptr || Packet.empty())
-        return;
-    char Code = Packet.at(0), SubCode = 0;
-    if (Packet.length() > 1)
-        SubCode = Packet.at(1);
-    switch (Code) {
-    case 'f':
-        SendFile(c, Packet.substr(1));
-        return;
-    case 'S':
-        if (SubCode == 'R') {
-            debug("Sending Mod Info");
-            std::string ToSend = FileList + FileSizes;
-            if (ToSend.empty())
-                ToSend = "-";
-            TCPSend(c, ToSend);
-        }
-        return;
-    default:
-        return;
-    }
-}
-
-void SyncResources(Client* c) {
-    Assert(c);
-    if (c == nullptr)
-        return;
-#ifndef DEBUG
-    try {
-#endif
-        TCPSend(c, "P" + std::to_string(c->GetID()));
-        std::string Data;
-        while (c->GetStatus() > -1) {
-            Data = TCPRcv(c);
-            if (Data == "Done")
-                break;
-            Parse(c, Data);
-        }
-#ifndef DEBUG
-    } catch (std::exception& e) {
-        except("Exception! : " + std::string(e.what()));
-        c->SetStatus(-1);
-    }
-#endif
-}

src/Network/TCPHandler.cpp

@@ -1,137 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 8/1/2020
-///
-#include "Compressor.h"
-#include "Logger.h"
-#include "Network.h"
-#include "Security/Enc.h"
-#include "UnixCompat.h"
-#include <thread>
-
-bool TCPSend(Client* c, const std::string& Data) {
-    Assert(c);
-    if (c == nullptr)
-        return false;
-
-    int32_t Size, Sent;
-    std::string Send(4, 0);
-    Size = int32_t(Data.size());
-    memcpy(&Send[0], &Size, sizeof(Size));
-    Send += Data;
-    Sent = 0;
-    Size += 4;
-    do {
-        int32_t Temp = send(c->GetTCPSock(), &Send[Sent], Size - Sent, 0);
-        if (Temp == 0) {
-            if (c->GetStatus() > -1)
-                c->SetStatus(-1);
-            return false;
-        } else if (Temp < 0) {
-            if (c->GetStatus() > -1)
-                c->SetStatus(-1);
-            CloseSocketProper(c->GetTCPSock());
-            return false;
-        }
-        Sent += Temp;
-    } while (Sent < Size);
-    return true;
-}
-
-bool CheckBytes(Client* c, int32_t BytesRcv) {
-    Assert(c);
-    if (BytesRcv == 0) {
-        debug("(TCP) Connection closing...");
-        if (c->GetStatus() > -1)
-            c->SetStatus(-1);
-        return false;
-    } else if (BytesRcv < 0) {
-#ifdef WIN32
-        debug(("(TCP) recv failed with error: ") + std::to_string(WSAGetLastError()));
-#else // unix
-        debug(("(TCP) recv failed with error: ") + std::string(strerror(errno)));
-#endif // WIN32
-        if (c->GetStatus() > -1)
-            c->SetStatus(-1);
-        info(("Closing socket in CheckBytes, BytesRcv < 0"));
-        CloseSocketProper(c->GetTCPSock());
-        return false;
-    }
-    return true;
-}
-
-std::string TCPRcv(Client* c) {
-    Assert(c);
-    int32_t Header, BytesRcv = 0, Temp;
-    if (c == nullptr || c->GetStatus() < 0)
-        return "";
-
-    std::vector<char> Data(sizeof(Header));
-    do {
-        Temp = recv(c->GetTCPSock(), &Data[BytesRcv], 4 - BytesRcv, 0);
-        if (!CheckBytes(c, Temp)) {
-#ifdef DEBUG
-            error(std::string(__func__) + (": failed on CheckBytes in while(BytesRcv < 4)"));
-#endif // DEBUG
-            return "";
-        }
-        BytesRcv += Temp;
-    } while (size_t(BytesRcv) < sizeof(Header));
-    memcpy(&Header, &Data[0], sizeof(Header));
-
-#ifdef DEBUG
-    //debug(std::string(__func__) + (": expecting ") + std::to_string(Header) + (" bytes."));
-#endif // DEBUG
-    if (!CheckBytes(c, BytesRcv)) {
-#ifdef DEBUG
-        error(std::string(__func__) + (": failed on CheckBytes"));
-#endif // DEBUG
-        return "";
-    }
-    Data.resize(Header);
-    BytesRcv = 0;
-    do {
-        Temp = recv(c->GetTCPSock(), &Data[BytesRcv], Header - BytesRcv, 0);
-        if (!CheckBytes(c, Temp)) {
-#ifdef DEBUG
-            error(std::string(__func__) + (": failed on CheckBytes in while(BytesRcv < Header)"));
-#endif // DEBUG
-
-            return "";
-        }
-#ifdef DEBUG
-        //debug(std::string(__func__) + (": Temp: ") + std::to_string(Temp) + (", BytesRcv: ") + std::to_string(BytesRcv));
-#endif // DEBUG
-        BytesRcv += Temp;
-    } while (BytesRcv < Header);
-#ifdef DEBUG
-    //debug(std::string(__func__) + (": finished recv with Temp: ") + std::to_string(Temp) + (", BytesRcv: ") + std::to_string(BytesRcv));
-#endif // DEBUG
-    std::string Ret(Data.data(), Header);
-
-    if (Ret.substr(0, 4) == "ABG:") {
-        Ret = DeComp(Ret.substr(4));
-    }
-#ifdef DEBUG
-    //debug("Parsing from " + c->GetName() + " -> " +std::to_string(Ret.size()));
-#endif
-
-    return Ret;
-}
-
-void TCPClient(Client* c) {
-    DebugPrintTIDInternal("Client(" + c->GetName() + ")", true);
-    Assert(c);
-    if (c->GetTCPSock() == -1) {
-        CI->RemoveClient(c);
-        return;
-    }
-    OnConnect(c);
-    while (c->GetStatus() > -1) {
-        GParser(c, TCPRcv(c));
-    }
-    OnDisconnect(c, c->GetStatus() == -2);
-}

src/Network/VehicleData.cpp

@@ -1,193 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 5/8/2020
-///
-
-#include "Client.hpp"
-#include "Compressor.h"
-#include "Logger.h"
-#include "Network.h"
-#include "Security/Enc.h"
-#include "Settings.h"
-#include "UnixCompat.h"
-#include <cmath>
-#include <cstring>
-#include <sstream>
-#include <thread>
-#include <vector>
-#include <array>
-
-SOCKET UDPSock;
-void UDPSend(Client* c, std::string Data) {
-    Assert(c);
-    if (c == nullptr || !c->isConnected || c->GetStatus() < 0)
-        return;
-    sockaddr_in Addr = c->GetUDPAddr();
-    socklen_t AddrSize = sizeof(c->GetUDPAddr());
-    if (Data.length() > 400) {
-        std::string CMP(Comp(Data));
-        Data = "ABG:" + CMP;
-    }
-#ifdef WIN32
-    int sendOk;
-    int len = static_cast<int>(Data.size());
-#else
-    int64_t sendOk;
-    size_t len = Data.size();
-#endif // WIN32
-
-    sendOk = sendto(UDPSock, Data.c_str(), len, 0, (sockaddr*)&Addr, AddrSize);
-#ifdef WIN32
-    if (sendOk == -1) {
-        debug(("(UDP) Send Failed Code : ") + std::to_string(WSAGetLastError()));
-        if (c->GetStatus() > -1)
-            c->SetStatus(-1);
-    } else if (sendOk == 0) {
-        debug(("(UDP) sendto returned 0"));
-        if (c->GetStatus() > -1)
-            c->SetStatus(-1);
-    }
-#else // unix
-    if (sendOk == -1) {
-        debug(("(UDP) Send Failed Code : ") + std::string(strerror(errno)));
-        if (c->GetStatus() > -1)
-            c->SetStatus(-1);
-    } else if (sendOk == 0) {
-        debug(("(UDP) sendto returned 0"));
-        if (c->GetStatus() > -1)
-            c->SetStatus(-1);
-    }
-#endif // WIN32
-}
-
-void SendLarge(Client* c, std::string Data) {
-    Assert(c);
-    if (Data.length() > 400) {
-        std::string CMP(Comp(Data));
-        Data = "ABG:" + CMP;
-    }
-    TCPSend(c, Data);
-}
-
-std::string UDPRcvFromClient(sockaddr_in& client) {
-    size_t clientLength = sizeof(client);
-    std::array<char, 1024> Ret{};
-    int64_t Rcv = recvfrom(UDPSock, Ret.data(), Ret.size(), 0, (sockaddr*)&client, (socklen_t*)&clientLength);
-    if (Rcv == -1) {
-#ifdef WIN32
-        error(("(UDP) Error receiving from Client! Code : ") + std::to_string(WSAGetLastError()));
-#else // unix
-        error(("(UDP) Error receiving from Client! Code : ") + std::string(strerror(errno)));
-#endif // WIN32
-        return "";
-    }
-    return std::string(Ret.begin(), Ret.begin() + Rcv);
-}
-
-void UDPParser(Client* c, std::string Packet) {
-    if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
-        abort();
-    }
-    Assert(c);
-    if (Packet.substr(0, 4) == "ABG:") {
-        Packet = DeComp(Packet.substr(4));
-    }
-    GParser(c, Packet);
-}
-
-[[noreturn]] void UDPServerMain() {
-#ifdef WIN32
-    WSADATA data;
-    if (WSAStartup(514, &data)) {
-        error(("Can't start Winsock!"));
-        //return;
-    }
-
-    UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
-    // Create a server hint structure for the server
-    sockaddr_in serverAddr {};
-    serverAddr.sin_addr.S_un.S_addr = ADDR_ANY; //Any Local
-    serverAddr.sin_family = AF_INET; // Address format is IPv4
-    serverAddr.sin_port = htons(Port); // Convert from little to big endian
-
-    // Try and bind the socket to the IP and port
-    if (bind(UDPSock, (sockaddr*)&serverAddr, sizeof(serverAddr)) == SOCKET_ERROR) {
-        error(("Can't bind socket!") + std::to_string(WSAGetLastError()));
-        std::this_thread::sleep_for(std::chrono::seconds(5));
-        _Exit(-1);
-        //return;
-    }
-
-    info(("Vehicle data network online on port ") + std::to_string(Port) + (" with a Max of ") + std::to_string(MaxPlayers) + (" Clients"));
-    while (true) {
-        try {
-            sockaddr_in client {};
-            std::string Data = UDPRcvFromClient(client); //Receives any data from Socket
-            auto Pos = Data.find(':');
-            if (Data.empty() || Pos == std::string::npos || Pos > 2)
-                continue;
-            /*char clientIp[256];
-            ZeroMemory(clientIp, 256); ///Code to get IP we don't need that yet
-            inet_ntop(AF_INET, &client.sin_addr, clientIp, 256);*/
-            uint8_t ID = Data.at(0) - 1;
-            for (auto& c : CI->Clients) {
-                if (c != nullptr && c->GetID() == ID) {
-                    c->SetUDPAddr(client);
-                    c->isConnected = true;
-                    UDPParser(c.get(), Data.substr(2));
-                }
-            }
-        } catch (const std::exception& e) {
-            error(("fatal: ") + std::string(e.what()));
-        }
-    }
-    /*CloseSocketProper(UDPSock);
-    WSACleanup();
-    return;*/
-#else // unix
-    UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
-    // Create a server hint structure for the server
-    sockaddr_in serverAddr {};
-    serverAddr.sin_addr.s_addr = INADDR_ANY; //Any Local
-    serverAddr.sin_family = AF_INET; // Address format is IPv4
-    serverAddr.sin_port = htons(uint16_t(Port)); // Convert from little to big endian
-
-    // Try and bind the socket to the IP and port
-    if (bind(UDPSock, (sockaddr*)&serverAddr, sizeof(serverAddr)) != 0) {
-        error(("Can't bind socket!") + std::string(strerror(errno)));
-        std::this_thread::sleep_for(std::chrono::seconds(5));
-        _Exit(-1);
-        //return;
-    }
-
-    info(("Vehicle data network online on port ") + std::to_string(Port) + (" with a Max of ") + std::to_string(MaxPlayers) + (" Clients"));
-    while (true) {
-        try {
-            sockaddr_in client {};
-            std::string Data = UDPRcvFromClient(client); //Receives any data from Socket
-            size_t Pos = Data.find(':');
-            if (Data.empty() || Pos > 2)
-                continue;
-            /*char clientIp[256];
-            ZeroMemory(clientIp, 256); ///Code to get IP we don't need that yet
-            inet_ntop(AF_INET, &client.sin_addr, clientIp, 256);*/
-            uint8_t ID = uint8_t(Data.at(0)) - 1;
-            for (auto& c : CI->Clients) {
-                if (c != nullptr && c->GetID() == ID) {
-                    c->SetUDPAddr(client);
-                    c->isConnected = true;
-                    UDPParser(c.get(), Data.substr(2));
-                }
-            }
-        } catch (const std::exception& e) {
-            error(("fatal: ") + std::string(e.what()));
-        }
-    }
-    /*CloseSocketProper(UDPSock); // TODO: Why not this? We did this in TCPServerMain?
-    return;
-     */
-#endif // WIN32
-}

src/Network/Websocket.cpp

@@ -1,60 +0,0 @@
-// Copyright (c) 2019-present Anonymous275.
-// BeamMP Server code is not in the public domain and is not free software.
-// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
-// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
-///
-/// Created by Anonymous275 on 11/6/2020
-///
-/*#include <boost/beast/core.hpp>
-#include "Logger.h"
-#include "Security/Enc.h"
-#include <boost/asio/connect.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/beast/websocket.hpp>
-#include <iostream>
-#include <string>
-#include <thread>*/
-
-/*namespace beast = boost::beast;
-namespace http = beast::http;
-namespace websocket = beast::websocket;
-namespace net = boost::asio;
-using tcp = boost::asio::ip::tcp;
-
-std::string GetRes(const beast::flat_buffer& buff) {
-    return (char*)buff.data().data();
-}*/
-
-void SyncData() {
-    /*DebugPrintTID();
-    try {
-        std::string const host = ("95.216.35.232");
-
-        net::io_context ioc;
-        tcp::resolver r(ioc);
-
-        websocket::stream<tcp::socket> ws(ioc);
-        auto const results = r.resolve(host, ("3600"));
-        net::connect(ws.next_layer(), results.begin(), results.end());
-
-
-        ws.handshake(host, "/");
-        beast::flat_buffer buffer;
-        ws.write(boost::asio::buffer("Hello, world!"));
-        ws.read(buffer);
-
-        std::cout << GetRes(buffer) << std::endl;
-
-        ws.close(websocket::close_code::normal);
-
-    }catch(std::exception const& e){
-        error(e.what());
-        std::this_thread::sleep_for(std::chrono::seconds(3));
-        _Exit(0);
-    }*/
-}
-
-void WebsocketInit() {
-    /*std::thread t1(SyncData);
-    t1.detach();*/
-}

src/PyAPI.cpp

@@ -0,0 +1 @@
+#include "PyAPI.h"

src/SignalHandling.cpp

@@ -0,0 +1,62 @@
+#include "SignalHandling.h"
+#include "Common.h"
+
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+#include <csignal>
+static void UnixSignalHandler(int sig) {
+    switch (sig) {
+    case SIGPIPE:
+        beammp_warn("ignoring SIGPIPE");
+        break;
+    case SIGTERM:
+        beammp_info("gracefully shutting down via SIGTERM");
+        Application::GracefullyShutdown();
+        break;
+    case SIGINT:
+        beammp_info("gracefully shutting down via SIGINT");
+        Application::GracefullyShutdown();
+        break;
+    default:
+        beammp_debug("unhandled signal: " + std::to_string(sig));
+        break;
+    }
+}
+#endif // UNIX
+
+#ifdef BEAMMP_WINDOWS
+#include <windows.h>
+// return TRUE if handled, FALSE if not
+BOOL WINAPI Win32CtrlC_Handler(DWORD CtrlType) {
+    switch (CtrlType) {
+    case CTRL_C_EVENT:
+        beammp_info("gracefully shutting down via CTRL+C");
+        Application::GracefullyShutdown();
+        return TRUE;
+    case CTRL_BREAK_EVENT:
+        beammp_info("gracefully shutting down via CTRL+BREAK");
+        Application::GracefullyShutdown();
+        return TRUE;
+    case CTRL_CLOSE_EVENT:
+        beammp_info("gracefully shutting down via close");
+        Application::GracefullyShutdown();
+        return TRUE;
+    }
+    // we dont care for any others like CTRL_LOGOFF_EVENT and CTRL_SHUTDOWN_EVENT
+    return FALSE;
+}
+#endif // WINDOWS
+
+void SetupSignalHandlers() {
+    // signal handlers for unix#include <windows.h>
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+    beammp_trace("registering handlers for signals");
+    signal(SIGPIPE, UnixSignalHandler);
+    signal(SIGTERM, UnixSignalHandler);
+#ifndef DEBUG
+    signal(SIGINT, UnixSignalHandler);
+#endif // DEBUG
+#elif defined(BEAMMP_WINDOWS)
+    beammp_trace("registering handlers for CTRL_*_EVENTs");
+    SetConsoleCtrlHandler(Win32CtrlC_Handler, TRUE);
+#endif
+}

src/TConfig.cpp

@@ -0,0 +1,263 @@
+#include "Common.h"
+
+#include "TConfig.h"
+#include <fstream>
+#include <iostream>
+#include <istream>
+#include <sstream>
+
+// 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";
+
+// Misc
+static constexpr std::string_view StrSendErrors = "SendErrors";
+static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
+static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
+
+// HTTP
+static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
+static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
+static constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
+static constexpr std::string_view StrSSLCertPath = "SSLCertPath";
+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(mConfigFileName);
+    }
+    if (!mFailed) {
+        if (fs::exists("Server.cfg")) {
+            beammp_warn("An old \"Server.cfg\" file still exists. Please note that this is no longer used. Instead, \"" + std::string(mConfigFileName) + "\" is used. You can safely delete the \"Server.cfg\".");
+        }
+        ParseFromFile(mConfigFileName);
+    }
+}
+
+template <typename CommentsT>
+void SetComment(CommentsT& Comments, const std::string& Comment) {
+    Comments.clear();
+    Comments.push_back(Comment);
+}
+
+/**
+ * @brief Writes out the loaded application state into ServerConfig.toml
+ *
+ * This writes out the current state of application settings that are
+ * applied to the server instance (i.e. the current application settings loaded in the server).
+ * If the state of the application settings changes during runtime,
+ * call this function whenever something about the config changes
+ * 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::Settings.Key;
+    SetComment(data["General"][StrAuthKey.data()].comments(), " AuthKey has to be filled out in order to run the server");
+    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::Settings.HideUpdateMessages;
+    SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
+    data["Misc"][StrSendErrors.data()] = Application::Settings.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::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`");
+    // HTTP
+    data["HTTP"][StrSSLKeyPath.data()] = Application::Settings.SSLKeyPath;
+    data["HTTP"][StrSSLCertPath.data()] = Application::Settings.SSLCertPath;
+    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::Settings.HTTPServerIP;
+    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::Settings.HTTPServerUseSSL;
+    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::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);
+}
+
+void TConfig::CreateConfigFile(std::string_view name) {
+    // build from old config Server.cfg
+
+    try {
+        if (fs::exists("Server.cfg")) {
+            // parse it (this is weird and bad and should be removed in some future version)
+            ParseOldFormat();
+        }
+    } catch (const std::exception& e) {
+        beammp_error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
+    }
+
+    FlushToFile();
+}
+
+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, 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);
+        // Misc
+        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, Application::Settings.SSLKeyPath);
+        TryReadValue(data, "HTTP", StrSSLCertPath, Application::Settings.SSLCertPath);
+        TryReadValue(data, "HTTP", StrHTTPServerPort, Application::Settings.HTTPServerPort);
+        TryReadValue(data, "HTTP", StrHTTPServerIP, Application::Settings.HTTPServerIP);
+        TryReadValue(data, "HTTP", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
+        TryReadValue(data, "HTTP", StrHTTPServerUseSSL, Application::Settings.HTTPServerUseSSL);
+    } catch (const std::exception& err) {
+        beammp_error("Error parsing config file value: " + std::string(err.what()));
+        mFailed = true;
+        Application::SetSubsystemStatus("Config", Application::Status::Bad);
+        return;
+    }
+    PrintDebug();
+
+    // Update in any case
+    FlushToFile();
+    // all good so far, let's check if there's a key
+    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::Settings.Key.size() != 36) {
+        beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
+    }
+}
+
+void TConfig::PrintDebug() {
+    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
+    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
+    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
+    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
+    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
+    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
+    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
+    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
+    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
+    beammp_debug(std::string(StrSSLKeyPath) + ": \"" + Application::Settings.SSLKeyPath + "\"");
+    beammp_debug(std::string(StrSSLCertPath) + ": \"" + Application::Settings.SSLCertPath + "\"");
+    beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
+    beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
+    // special!
+    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
+}
+
+void TConfig::ParseOldFormat() {
+    std::ifstream File("Server.cfg");
+    // read all, strip comments
+    std::string Content;
+    for (;;) {
+        std::string Line;
+        std::getline(File, Line);
+        if (!Line.empty() && Line.at(0) != '#') {
+            Line = Line.substr(0, Line.find_first_of('#'));
+            Content += Line + "\n";
+        }
+        if (!File.good()) {
+            break;
+        }
+    }
+    std::stringstream Str(Content);
+    std::string Key, Ignore, Value;
+    for (;;) {
+        Str >> Key >> std::ws >> Ignore >> std::ws;
+        std::getline(Str, Value);
+        if (Str.eof()) {
+            break;
+        }
+        std::stringstream ValueStream(Value);
+        ValueStream >> std::ws; // strip leading whitespace if any
+        Value = ValueStream.str();
+        if (Key == "Debug") {
+            Application::Settings.DebugModeEnabled = Value.find("true") != std::string::npos;
+        } else if (Key == "Private") {
+            Application::Settings.Private = Value.find("true") != std::string::npos;
+        } else if (Key == "Port") {
+            ValueStream >> Application::Settings.Port;
+        } else if (Key == "Cars") {
+            ValueStream >> Application::Settings.MaxCars;
+        } else if (Key == "MaxPlayers") {
+            ValueStream >> Application::Settings.MaxPlayers;
+        } else if (Key == "Map") {
+            Application::Settings.MapName = Value.substr(1, Value.size() - 3);
+        } else if (Key == "Name") {
+            Application::Settings.ServerName = Value.substr(1, Value.size() - 3);
+        } else if (Key == "Desc") {
+            Application::Settings.ServerDesc = Value.substr(1, Value.size() - 3);
+        } else if (Key == "use") {
+            Application::Settings.Resource = Value.substr(1, Value.size() - 3);
+        } else if (Key == "AuthKey") {
+            Application::Settings.Key = Value.substr(1, Value.size() - 3);
+        } else {
+            beammp_warn("unknown key in old auth file (ignored): " + Key);
+        }
+        Str >> std::ws;
+    }
+}

src/TConsole.cpp

@@ -0,0 +1,446 @@
+#include "TConsole.h"
+#include "Common.h"
+#include "Compat.h"
+
+#include "Client.h"
+#include "CustomAssert.h"
+#include "LuaAPI.h"
+#include "TLuaEngine.h"
+
+#include <ctime>
+#include <sstream>
+
+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 std::string TrimString(std::string S) {
+    S.erase(S.begin(), std::find_if(S.begin(), S.end(), [](unsigned char ch) {
+        return !std::isspace(ch);
+    }));
+    S.erase(std::find_if(S.rbegin(), S.rend(), [](unsigned char ch) {
+        return !std::isspace(ch);
+    }).base(),
+        S.end());
+    return S;
+}
+
+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::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;
+        size_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(fraction).count();
+        char fracstr[5];
+        std::sprintf(fracstr, "%03lu", ms);
+        date += fracstr;
+        date += "] ";
+    } else {
+        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T] ", local_tm);
+        date += buf;
+    }
+
+    return date;
+}
+
+void TConsole::BackupOldLog() {
+    fs::path Path = "server.log";
+    if (fs::exists(Path)) {
+        auto OldLog = Path.filename().stem().string() + ".old.log";
+        try {
+            fs::rename(Path, OldLog);
+            beammp_debug("renamed old log file to '" + OldLog + "'");
+        } catch (const std::exception& e) {
+            beammp_warn(e.what());
+        }
+        /*
+        int err = 0;
+        zip* z = zip_open("ServerLogs.zip", ZIP_CREATE, &err);
+        if (!z) {
+            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
+            return;
+        }
+        FILE* File = std::fopen(Path.string().c_str(), "r");
+        if (!File) {
+            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
+            return;
+        }
+        std::vector<uint8_t> Buffer;
+        Buffer.resize(fs::file_size(Path));
+        std::fread(Buffer.data(), 1, Buffer.size(), File);
+        std::fclose(File);
+
+        auto s = zip_source_buffer(z, Buffer.data(), Buffer.size(), 0);
+
+        auto TimePoint = fs::last_write_time(Path);
+        auto Secs = TimePoint.time_since_epoch().count();
+        auto MyTimeT = std::time(&Secs);
+
+        std::string NewName = Path.stem().string();
+        NewName += "_";
+        std::string Time;
+        Time.resize(32);
+        size_t n = strftime(Time.data(), Time.size(), "%F_%H.%M.%S", localtime(&MyTimeT));
+        Time.resize(n);
+        NewName += Time;
+        NewName += ".log";
+
+        zip_file_add(z, NewName.c_str(), s, 0);
+        zip_close(z);
+    */
+    }
+}
+
+void TConsole::StartLoggingToFile() {
+    mLogFileStream.open("server.log");
+    Application::Console().Internal().on_write = [this](const std::string& ToWrite) {
+        // TODO: Sanitize by removing all ansi escape codes (vt100)
+        std::unique_lock Lock(mLogFileStreamMtx);
+        mLogFileStream.write(ToWrite.c_str(), ToWrite.size());
+        mLogFileStream.write("\n", 1);
+        mLogFileStream.flush();
+    };
+}
+
+void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
+    if (!mIsLuaConsole) {
+        if (!mLuaEngine) {
+            beammp_error("Lua engine not initialized yet, please wait and try again");
+            return;
+        }
+        mLuaEngine->EnsureStateExists(mDefaultStateId, "Console");
+        mStateId = LuaStateId;
+        mIsLuaConsole = true;
+        if (mStateId != mDefaultStateId) {
+            Application::Console().WriteRaw("Entered Lua console for state '" + mStateId + "'. To exit, type `exit()`");
+            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
+        } else {
+            Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
+            mCommandline.set_prompt("lua> ");
+        }
+        mCachedRegularHistory = mCommandline.history();
+        mCommandline.set_history(mCachedLuaHistory);
+    }
+}
+
+void TConsole::ChangeToRegularConsole() {
+    if (mIsLuaConsole) {
+        mIsLuaConsole = false;
+        if (mStateId != mDefaultStateId) {
+            Application::Console().WriteRaw("Left Lua console for state '" + mStateId + "'.");
+        } else {
+            Application::Console().WriteRaw("Left Lua console.");
+        }
+        mCachedLuaHistory = mCommandline.history();
+        mCommandline.set_history(mCachedRegularHistory);
+        mCommandline.set_prompt("> ");
+        mStateId = mDefaultStateId;
+    }
+}
+
+void TConsole::Command_Lua(const std::string& cmd) {
+    if (cmd.size() > 3) {
+        auto NewStateId = cmd.substr(4);
+        beammp_assert(!NewStateId.empty());
+        if (mLuaEngine->HasState(NewStateId)) {
+            ChangeToLuaConsole(NewStateId);
+        } else {
+            Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
+        }
+    } else {
+        ChangeToLuaConsole(mDefaultStateId);
+    }
+}
+
+void TConsole::Command_Help(const std::string&) {
+    static constexpr const char* sHelpString = R"(
+    Commands:
+        help                    displays this help
+        exit                    shuts down the server
+        kick <name> [reason]    kicks specified player with an optional reason
+        list                    lists all players and info about them
+        say <message>           sends the message to all players in chat
+        lua [state id]          switches to lua, optionally into a specific state id's lua
+        status                  how the server is doing and what it's up to)";
+    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
+}
+
+void TConsole::Command_Kick(const std::string& cmd) {
+    if (cmd.size() > 4) {
+        auto Name = cmd.substr(5);
+        std::string Reason = "Kicked by server console";
+        auto SpacePos = Name.find(' ');
+        if (SpacePos != Name.npos) {
+            Reason = Name.substr(SpacePos + 1);
+            Name = cmd.substr(5, cmd.size() - Reason.size() - 5 - 1);
+        }
+        beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
+        bool Kicked = false;
+        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 true;
+        });
+        if (!Kicked) {
+            Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
+        } else {
+            Application::Console().WriteRaw("Kicked player '" + Name + "' for reason: '" + Reason + "'.");
+        }
+    }
+}
+
+void TConsole::Command_Say(const std::string& cmd) {
+    if (cmd.size() > 3) {
+        auto Message = cmd.substr(4);
+        LuaAPI::MP::SendChatMessage(-1, Message);
+    }
+}
+
+void TConsole::Command_List(const std::string&) {
+    if (mLuaEngine->Server().ClientCount() == 0) {
+        Application::Console().WriteRaw("No players online.");
+    } else {
+        std::stringstream ss;
+        ss << std::left << std::setw(25) << "Name" << std::setw(6) << "ID" << std::setw(6) << "Cars" << std::endl;
+        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+            if (!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));
+    }
+}
+
+void TConsole::Command_Status(const std::string&) {
+    std::stringstream Status;
+
+    size_t CarCount = 0;
+    size_t ConnectedCount = 0;
+    size_t GuestCount = 0;
+    size_t SyncedCount = 0;
+    size_t SyncingCount = 0;
+    size_t MissedPacketQueueSum = 0;
+    int LargestSecondsSinceLastPing = 0;
+    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;
+    size_t SystemsGood = 0;
+    size_t SystemsBad = 0;
+    size_t SystemsShuttingDown = 0;
+    size_t SystemsShutdown = 0;
+    std::string SystemsBadList {};
+    std::string SystemsGoodList {};
+    std::string SystemsStartingList {};
+    std::string SystemsShuttingDownList {};
+    std::string SystemsShutdownList {};
+    auto Statuses = Application::GetSubsystemStatuses();
+    for (const auto& NameStatusPair : Statuses) {
+        switch (NameStatusPair.second) {
+        case Application::Status::Good:
+            SystemsGood++;
+            SystemsGoodList += NameStatusPair.first + ", ";
+            break;
+        case Application::Status::Bad:
+            SystemsBad++;
+            SystemsBadList += NameStatusPair.first + ", ";
+            break;
+        case Application::Status::Starting:
+            SystemsStarting++;
+            SystemsStartingList += NameStatusPair.first + ", ";
+            break;
+        case Application::Status::ShuttingDown:
+            SystemsShuttingDown++;
+            SystemsShuttingDownList += NameStatusPair.first + ", ";
+            break;
+        case Application::Status::Shutdown:
+            SystemsShutdown++;
+            SystemsShutdownList += NameStatusPair.first + ", ";
+            break;
+        }
+    }
+    // remove ", " at the end
+    SystemsBadList = SystemsBadList.substr(0, SystemsBadList.size() - 2);
+    SystemsGoodList = SystemsGoodList.substr(0, SystemsGoodList.size() - 2);
+    SystemsStartingList = SystemsStartingList.substr(0, SystemsStartingList.size() - 2);
+    SystemsShuttingDownList = SystemsShuttingDownList.substr(0, SystemsShuttingDownList.size() - 2);
+    SystemsShutdownList = SystemsShutdownList.substr(0, SystemsShutdownList.size() - 2);
+
+    auto ElapsedTime = mLuaEngine->Server().UptimeTimer.GetElapsedTime();
+
+    Status << "BeamMP-Server Status:\n"
+           << "\tTotal Players:             " << mLuaEngine->Server().ClientCount() << "\n"
+           << "\tSyncing Players:           " << SyncingCount << "\n"
+           << "\tSynced Players:            " << SyncedCount << "\n"
+           << "\tConnected Players:         " << ConnectedCount << "\n"
+           << "\tGuests:                    " << GuestCount << "\n"
+           << "\tCars:                      " << CarCount << "\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"
+           << "\t\tEvent timers:                " << mLuaEngine->GetTimedEventsCount() << "\n"
+           << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
+           << "\tSubsystems:\n"
+           << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
+           << "\t\tShutting down/Shutdown:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
+           << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
+           << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
+           << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
+           << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
+           << "\t\tShutdown:                    [ " << SystemsShutdownList << " ]\n"
+           << "";
+
+    Application::Console().WriteRaw(Status.str());
+}
+
+void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
+    auto FutureIsNonNil =
+        [](const std::shared_ptr<TLuaResult>& Future) {
+            if (!Future->Error && Future->Result.valid()) {
+                auto Type = Future->Result.get_type();
+                return Type != sol::type::lua_nil && Type != sol::type::none;
+            }
+            return false;
+        };
+    std::vector<std::shared_ptr<TLuaResult>> NonNilFutures;
+    { // Futures scope
+        auto Futures = mLuaEngine->TriggerEvent("onConsoleInput", "", cmd);
+        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
+        size_t Count = 0;
+        for (auto& Future : Futures) {
+            if (!Future->Error) {
+                ++Count;
+            }
+        }
+        for (const auto& Future : Futures) {
+            if (FutureIsNonNil(Future)) {
+                NonNilFutures.push_back(Future);
+            }
+        }
+    }
+    if (NonNilFutures.size() == 0) {
+        if (!IgnoreNotACommand) {
+            Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");
+        }
+    } else {
+        std::stringstream Reply;
+        if (NonNilFutures.size() > 1) {
+            for (size_t i = 0; i < NonNilFutures.size(); ++i) {
+                Reply << NonNilFutures[i]->StateId << ": \n"
+                      << LuaAPI::LuaToString(NonNilFutures[i]->Result);
+                if (i < NonNilFutures.size() - 1) {
+                    Reply << "\n";
+                }
+            }
+        } else {
+            Reply << LuaAPI::LuaToString(NonNilFutures[0]->Result);
+        }
+        Application::Console().WriteRaw(Reply.str());
+    }
+}
+
+TConsole::TConsole() {
+    mCommandline.enable_history();
+    mCommandline.set_history_limit(20);
+    mCommandline.set_prompt("> ");
+    BackupOldLog();
+    mCommandline.on_command = [this](Commandline& c) {
+        try {
+            auto cmd = c.get_command();
+            cmd = TrimString(cmd);
+            mCommandline.write(mCommandline.prompt() + cmd);
+            if (mIsLuaConsole) {
+                if (!mLuaEngine) {
+                    beammp_info("Lua not started yet, please try again in a second");
+                } else if (cmd == "exit()") {
+                    ChangeToRegularConsole();
+                } else {
+                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(cmd), "", "" });
+                    while (!Future->Ready) {
+                        std::this_thread::yield(); // TODO: Add a timeout
+                    }
+                    if (Future->Error) {
+                        beammp_lua_error(Future->ErrorMessage);
+                    }
+                }
+            } else {
+                if (!mLuaEngine) {
+                    beammp_error("Attempted to run a command before Lua engine started. Please wait and try again.");
+                } else if (cmd == "exit") {
+                    beammp_info("gracefully shutting down");
+                    Application::GracefullyShutdown();
+                } else if (StringStartsWith(cmd, "lua")) {
+                    Command_Lua(cmd);
+                } else if (StringStartsWith(cmd, "help")) {
+                    RunAsCommand(cmd, true);
+                    Command_Help(cmd);
+                } else if (StringStartsWith(cmd, "kick")) {
+                    RunAsCommand(cmd, true);
+                    Command_Kick(cmd);
+                } else if (StringStartsWith(cmd, "say")) {
+                    RunAsCommand(cmd, true);
+                    Command_Say(cmd);
+                } else if (StringStartsWith(cmd, "list")) {
+                    RunAsCommand(cmd, true);
+                    Command_List(cmd);
+                } else if (StringStartsWith(cmd, "status")) {
+                    RunAsCommand(cmd, true);
+                    Command_Status(cmd);
+                } else if (!cmd.empty()) {
+                    RunAsCommand(cmd);
+                }
+            }
+        } 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.");
+        }
+    };
+}
+
+void TConsole::Write(const std::string& str) {
+    auto ToWrite = GetDate() + str;
+    mCommandline.write(ToWrite);
+}
+
+void TConsole::WriteRaw(const std::string& str) {
+    mCommandline.write(str);
+}
+
+void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
+    mLuaEngine = &Engine;
+}

src/THeartbeatThread.cpp

@@ -0,0 +1,184 @@
+#include "THeartbeatThread.h"
+
+#include "Client.h"
+#include "Http.h"
+//#include "SocketIO.h"
+#include <rapidjson/document.h>
+#include <rapidjson/rapidjson.h>
+#include <sstream>
+
+namespace json = rapidjson;
+
+void THeartbeatThread::operator()() {
+    RegisterThread("Heartbeat");
+    std::string Body;
+    std::string T;
+
+    // these are "hot-change" related variables
+    static std::string Last;
+
+    static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::now();
+    bool isAuth = false;
+    size_t UpdateReminderCounter = 0;
+    while (!mShutdown) {
+        ++UpdateReminderCounter;
+        Body = GenerateCall();
+        // a hot-change occurs when a setting has changed, to update the backend of that change.
+        auto Now = std::chrono::high_resolution_clock::now();
+        bool Unchanged = Last == Body;
+        auto TimePassed = (Now - LastNormalUpdateTime);
+        auto Threshold = Unchanged ? 30 : 5;
+        if (TimePassed < std::chrono::seconds(Threshold)) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            continue;
+        }
+        beammp_debug("heartbeat (after " + std::to_string(std::chrono::duration_cast<std::chrono::seconds>(TimePassed).count()) + "s)");
+
+        Last = Body;
+        LastNormalUpdateTime = Now;
+        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",
+                { { "response-body", T },
+                    { "request-body", Body } });
+            Sentry.SetTransaction(transaction);
+            beammp_trace("sending log to sentry: " + std::to_string(status) + " for " + transaction);
+            Sentry.Log(SentryLevel::Error, "default", Http::Status::ToString(status) + " (" + std::to_string(status) + ")");
+        };
+
+        auto Target = "/heartbeat";
+        unsigned int ResponseCode = 0;
+
+        json::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()) {
+                beammp_debug("Failed to contact backend at " + Url + " (this is not an error).");
+                beammp_trace("Response was: " + T);
+                Sentry.SetContext("JSON Response", { { "reponse", T } });
+                SentryReportError(Url + Target, ResponseCode);
+            } else if (ResponseCode != 200) {
+                SentryReportError(Url + Target, ResponseCode);
+            } else {
+                // all ok
+                Ok = true;
+                break;
+            }
+            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        }
+        std::string Status {};
+        std::string Code {};
+        std::string Message {};
+        const auto StatusKey = "status";
+        const auto CodeKey = "code";
+        const auto MessageKey = "msg";
+
+        if (Ok) {
+            if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) {
+                Status = Doc[StatusKey].GetString();
+            } else {
+                Sentry.SetContext("JSON Response", { { StatusKey, "invalid string / missing" } });
+                Ok = false;
+            }
+            if (Doc.HasMember(CodeKey) && Doc[CodeKey].IsString()) {
+                Code = Doc[CodeKey].GetString();
+            } else {
+                Sentry.SetContext("JSON Response", { { CodeKey, "invalid string / missing" } });
+                Ok = false;
+            }
+            if (Doc.HasMember(MessageKey) && Doc[MessageKey].IsString()) {
+                Message = Doc[MessageKey].GetString();
+            } else {
+                Sentry.SetContext("JSON Response", { { MessageKey, "invalid string / missing" } });
+                Ok = false;
+            }
+            if (!Ok) {
+                beammp_error("Missing/invalid json members in backend response");
+                Sentry.LogError("Missing/invalid json members in backend response", __FILE__, std::to_string(__LINE__));
+            }
+        } else {
+            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) {
+            if (Status == "2000") {
+                beammp_info(("Authenticated!"));
+                isAuth = true;
+            } else if (Status == "200") {
+                beammp_info(("Resumed authenticated session!"));
+                isAuth = true;
+            } else {
+                if (Message.empty()) {
+                    Message = "Backend didn't provide a reason";
+                }
+                beammp_error("Backend REFUSED the auth key. " + Message);
+            }
+        }
+        if (isAuth) {
+            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
+        }
+        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
+            Application::CheckForUpdates();
+        }
+    }
+}
+
+std::string THeartbeatThread::GenerateCall() {
+    std::stringstream Ret;
+
+    Ret << "uuid=" << Application::Settings.Key
+        << "&players=" << mServer.ClientCount()
+        << "&maxplayers=" << Application::Settings.MaxPlayers
+        << "&port=" << Application::Settings.Port
+        << "&map=" << Application::Settings.MapName
+        << "&private=" << (Application::Settings.Private ? "true" : "false")
+        << "&version=" << Application::ServerVersionString()
+        << "&clientversion=" << Application::ClientVersionString()
+        << "&name=" << Application::Settings.ServerName
+        << "&modlist=" << mResourceManager.TrimmedList()
+        << "&modstotalsize=" << mResourceManager.MaxModSize()
+        << "&modstotal=" << mResourceManager.ModsLoaded()
+        << "&playerslist=" << GetPlayers()
+        << "&desc=" << Application::Settings.ServerDesc;
+    return Ret.str();
+}
+THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
+    : mResourceManager(ResourceManager)
+    , mServer(Server) {
+    Application::SetSubsystemStatus("Heartbeat", Application::Status::Starting);
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("Heartbeat", Application::Status::ShuttingDown);
+        if (mThread.joinable()) {
+            mShutdown = true;
+            mThread.join();
+        }
+        Application::SetSubsystemStatus("Heartbeat", Application::Status::Shutdown);
+    });
+    Start();
+}
+std::string THeartbeatThread::GetPlayers() {
+    std::string Return;
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            Return += ClientPtr.lock()->GetName() + ";";
+        }
+        return true;
+    });
+    return Return;
+}
+/*THeartbeatThread::~THeartbeatThread() {
+}*/

src/TLuaEngine.cpp

@@ -0,0 +1,840 @@
+#include "TLuaEngine.h"
+#include "Client.h"
+#include "CustomAssert.h"
+#include "Http.h"
+#include "LuaAPI.h"
+#include "TLuaPlugin.h"
+
+#include <chrono>
+#include <condition_variable>
+#include <httplib.h>
+#include <random>
+#include <thread>
+#include <tuple>
+
+TLuaEngine* LuaAPI::MP::Engine;
+
+TLuaEngine::TLuaEngine()
+    : mPluginMonitor(fs::path(Application::Settings.Resource) / "server", *this, mShutdown) {
+    Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
+    LuaAPI::MP::Engine = this;
+    if (!fs::exists(Application::Settings.Resource)) {
+        fs::create_directory(Application::Settings.Resource);
+    }
+    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);
+    });
+    Start();
+}
+
+void TLuaEngine::operator()() {
+    RegisterThread("LuaEngine");
+    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
+    // lua engine main thread
+    CollectAndInitPlugins();
+    // now call all onInit's
+    auto Futures = TriggerEvent("onInit", "");
+    WaitForAll(Futures, std::chrono::seconds(5));
+    for (const auto& Future : Futures) {
+        if (Future->Error && Future->ErrorMessage != BeamMPFnNotFoundError) {
+            beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage);
+        }
+    }
+
+    auto ResultCheckThread = std::thread([&] {
+        RegisterThread("ResultCheckThread");
+        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) {
+                        return true;
+                    } else if (Ptr->Error) {
+                        if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
+                            beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
+                        }
+                        return true;
+                    }
+                    return false;
+                });
+            }
+        }
+    });
+    // event loop
+    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) {
+                if (Timer.Expired()) {
+                    auto LastCompletionBeforeReset = Timer.LastCompletion;
+                    Timer.Reset();
+                    auto Handlers = GetEventHandlersForState(Timer.EventName, Timer.StateId);
+                    std::unique_lock StateLock(mLuaStatesMutex);
+                    std::unique_lock Lock2(mResultsToCheckMutex);
+                    for (auto& Handler : Handlers) {
+                        auto Res = mLuaStates[Timer.StateId]->EnqueueFunctionCallFromCustomEvent(Handler, {}, Timer.EventName, Timer.Strategy);
+                        if (Res) {
+                            mResultsToCheck.push_back(Res);
+                            mResultsToCheckCond.notify_one();
+                        } else {
+                            // "revert" reset
+                            Timer.LastCompletion = LastCompletionBeforeReset;
+                            // beammp_trace("Reverted reset of \"" + Timer.EventName + "\" timer");
+                            // no need to try to enqueue more handlers for this event (they will all fail)
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        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 {
+            beammp_trace("Event loop cannot keep up! Running " + std::to_string(Diff.count()) + "s behind");
+        }
+        Before = std::chrono::high_resolution_clock::now();
+    }
+
+    if (ResultCheckThread.joinable()) {
+        ResultCheckThread.join();
+    }
+}
+
+size_t TLuaEngine::CalculateMemoryUsage() {
+    size_t Usage = 0;
+    std::unique_lock Lock(mLuaStatesMutex);
+    for (auto& State : mLuaStates) {
+        Usage += State.second->State().memory_used();
+    }
+    return Usage;
+}
+
+sol::state_view TLuaEngine::GetStateForPlugin(const fs::path& PluginPath) {
+    for (const auto& Plugin : mLuaPlugins) {
+        if (fs::equivalent(Plugin->GetFolder(), PluginPath)) {
+            std::unique_lock Lock(mLuaStatesMutex);
+            return mLuaStates.at(Plugin->GetConfig().StateId)->State();
+        }
+    }
+    beammp_assert_not_reachable();
+    return mLuaStates.begin()->second->State();
+}
+
+TLuaStateId TLuaEngine::GetStateIDForPlugin(const fs::path& PluginPath) {
+    for (const auto& Plugin : mLuaPlugins) {
+        if (fs::equivalent(Plugin->GetFolder(), PluginPath)) {
+            std::unique_lock Lock(mLuaStatesMutex);
+            return Plugin->GetConfig().StateId;
+        }
+    }
+    beammp_assert_not_reachable();
+    return "";
+}
+
+void TLuaEngine::AddResultToCheck(const std::shared_ptr<TLuaResult>& Result) {
+    std::unique_lock Lock(mResultsToCheckMutex);
+    mResultsToCheck.push_back(Result);
+    mResultsToCheckCond.notify_one();
+}
+
+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;
+        while (!Result->Ready && !Cancelled) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+            ms += 10;
+            if (Max.has_value() && std::chrono::milliseconds(ms) > Max.value()) {
+                beammp_trace("'" + Result->Function + "' in '" + Result->StateId + "' did not finish executing in time (took: " + std::to_string(ms) + "ms).");
+                Cancelled = true;
+            } else if (ms > 1000 * 60) {
+                beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' is taking very long. The event it's handling is too important to discard the result of this handler, but may block this event and possibly the whole lua state.");
+            }
+        }
+        if (Cancelled) {
+            beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
+            LuaAPI::MP::Engine->ReportErrors({ Result });
+        } else if (Result->Error) {
+            if (Result->ErrorMessage != BeamMPFnNotFoundError) {
+                beammp_lua_error(Result->Function + ": " + Result->ErrorMessage);
+            }
+        }
+    }
+}
+
+// run this on the error checking thread
+void TLuaEngine::ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results) {
+    std::unique_lock Lock2(mResultsToCheckMutex);
+    for (const auto& Result : Results) {
+        mResultsToCheck.push_back(Result);
+        mResultsToCheckCond.notify_one();
+    }
+}
+
+bool TLuaEngine::HasState(TLuaStateId StateId) {
+    std::unique_lock Lock(mLuaStatesMutex);
+    return mLuaStates.find(StateId) != mLuaStates.end();
+}
+
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script) {
+    std::unique_lock Lock(mLuaStatesMutex);
+    return mLuaStates.at(StateID)->EnqueueScript(Script);
+}
+
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
+    std::unique_lock Lock(mLuaStatesMutex);
+    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
+}
+
+void TLuaEngine::CollectAndInitPlugins() {
+    for (const auto& Dir : fs::directory_iterator(mResourceServerPath)) {
+        auto Path = Dir.path();
+        Path = fs::relative(Path);
+        if (!Dir.is_directory()) {
+            beammp_error("\"" + Dir.path().string() + "\" is not a directory, skipping");
+        } else {
+            TLuaPluginConfig Config { Path.stem().string() };
+            FindAndParseConfig(Path, Config);
+            InitializePlugin(Path, Config);
+        }
+    }
+}
+
+void TLuaEngine::InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config) {
+    beammp_assert(fs::exists(Folder));
+    beammp_assert(fs::is_directory(Folder));
+    std::unique_lock Lock(mLuaStatesMutex);
+    EnsureStateExists(Config.StateId, Folder.stem().string(), true);
+    mLuaStates[Config.StateId]->AddPath(Folder); // add to cpath + path
+    Lock.unlock();
+    auto Plugin = std::make_shared<TLuaPlugin>(*this, Config, Folder);
+    mLuaPlugins.emplace_back(std::move(Plugin));
+}
+
+void TLuaEngine::FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config) {
+    auto ConfigFile = Folder / TLuaPluginConfig::FileName;
+    if (fs::exists(ConfigFile) && fs::is_regular_file(ConfigFile)) {
+        try {
+            auto Data = toml::parse(ConfigFile);
+            if (Data.contains("LuaStateID")) {
+                auto ID = toml::find<std::string>(Data, "LuaStateID");
+                if (!ID.empty()) {
+                    beammp_debug("Plugin \"" + Folder.string() + "\" specified it wants LuaStateID \"" + ID + "\"");
+                    Config.StateId = ID;
+                } else {
+                    beammp_debug("LuaStateID empty, using plugin name");
+                }
+            }
+        } catch (const std::exception& e) {
+            beammp_error(Folder.string() + ": " + e.what());
+        }
+    }
+}
+
+void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit) {
+    beammp_assert(!StateId.empty());
+    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, mShutdown, StateId, *this);
+        mLuaStates[StateId] = std::move(DataPtr);
+        RegisterEvent("onInit", StateId, "onInit");
+        if (!DontCallOnInit) {
+            auto Res = EnqueueFunctionCall(StateId, "onInit", {});
+            Res->WaitUntilReady();
+            if (Res->Error && Res->ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
+                beammp_lua_error("Calling \"onInit\" on \"" + StateId + "\" failed: " + Res->ErrorMessage);
+            }
+        }
+    }
+}
+
+void TLuaEngine::RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName) {
+    std::unique_lock Lock(mLuaEventsMutex);
+    mLuaEvents[EventName][StateId].insert(FunctionName);
+}
+
+std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId) {
+    return mLuaEvents[EventName][StateId];
+}
+
+sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
+    auto Return = mEngine->TriggerEvent(EventName, mStateId, EventArgs);
+    // TODO Synchronous call to the event handlers
+    auto MyHandlers = mEngine->GetEventHandlersForState(EventName, mStateId);
+    for (const auto& Handler : MyHandlers) {
+        auto Fn = mStateView[Handler];
+        if (Fn.valid()) {
+            auto LuaResult = Fn(EventArgs);
+            auto Result = std::make_shared<TLuaResult>();
+            Result->Ready = true;
+            if (LuaResult.valid()) {
+                Result->Error = false;
+                Result->Result = LuaResult;
+            } else {
+                Result->Error = true;
+                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
+            }
+            Return.push_back(Result);
+        }
+    }
+    sol::state_view StateView(mState);
+    sol::table AsyncEventReturn = StateView.create_table();
+    AsyncEventReturn["ReturnValueImpl"] = Return;
+    AsyncEventReturn.set_function("IsDone",
+        [&](const sol::table& Self) -> bool {
+            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
+            for (const auto& Value : Vector) {
+                if (!Value->Ready) {
+                    return false;
+                }
+            }
+            return true;
+        });
+    AsyncEventReturn.set_function("GetResults",
+        [&](const sol::table& Self) -> sol::table {
+            sol::state_view StateView(mState);
+            sol::table Result = StateView.create_table();
+            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
+            for (const auto& Value : Vector) {
+                if (!Value->Ready) {
+                    return sol::lua_nil;
+                }
+                Result.add(Value->Result);
+            }
+            return Result;
+        });
+    return AsyncEventReturn;
+}
+
+sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
+    // TODO: make asynchronous?
+    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()) {
+                Result.add(FnRet);
+            } else {
+                sol::error Err = FnRet;
+                beammp_lua_error(Err.what());
+            }
+        }
+    }
+    return Result;
+}
+
+sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
+        if (IDs.empty()) {
+            return sol::lua_nil;
+        }
+        sol::table Result = mStateView.create_table();
+        for (const auto& Pair : IDs) {
+            Result[Pair.first] = Pair.second;
+        }
+        return Result;
+    } else {
+        return sol::lua_nil;
+    }
+}
+
+sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
+    sol::table Result = mStateView.create_table();
+    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](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (locked->GetName() == Name) {
+                Id = locked->GetID();
+                return false;
+            }
+        }
+        return true;
+    });
+    return Id;
+}
+
+std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
+    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 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();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (VehicleData.empty()) {
+            return sol::lua_nil;
+        }
+        sol::state_view StateView(mState);
+        sol::table Result = StateView.create_table();
+        for (const auto& v : VehicleData) {
+            Result[v.ID()] = v.Data().substr(3);
+        }
+        return Result;
+    } else
+        return sol::lua_nil;
+}
+
+sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::string& host, uint16_t port) {
+    auto table = mStateView.create_table();
+    constexpr const char* InternalClient = "__InternalClient";
+    table["host"] = host;
+    table["port"] = port;
+    auto client = std::make_shared<httplib::Client>(host, port);
+    table[InternalClient] = client;
+    table.set_function("Get", [&InternalClient](const sol::table& table, const std::string& path, const sol::table& headers) {
+        httplib::Headers GetHeaders;
+        for (const auto& pair : headers) {
+            if (pair.first.is<std::string>() && pair.second.is<std::string>()) {
+                GetHeaders.insert(std::pair(pair.first.as<std::string>(), pair.second.as<std::string>()));
+            } else {
+                beammp_lua_error("Http:Get: Expected string-string pairs for headers, got something else, ignoring that header");
+            }
+        }
+        auto client = table[InternalClient].get<std::shared_ptr<httplib::Client>>();
+        client->Get(path.c_str(), GetHeaders);
+    });
+    return table;
+}
+
+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) {
+    if (!mState) {
+        beammp_error("failed to create lua state for \"" + StateId + "\"");
+        return;
+    }
+    luaL_openlibs(mState);
+    sol::state_view StateView(mState);
+    lua_atpanic(mState, LuaAPI::PanicHandler);
+    // StateView.globals()["package"].get()
+    StateView.set_function("print", &LuaAPI::Print);
+    StateView.set_function("printRaw", &LuaAPI::MP::PrintRaw);
+    StateView.set_function("exit", &Application::GracefullyShutdown);
+
+    auto MPTable = StateView.create_named_table("MP");
+    MPTable.set_function("CreateTimer", [&]() -> sol::table {
+        sol::state_view StateView(mState);
+        sol::table Result = StateView.create_table();
+        Result["__StartTime"] = std::chrono::high_resolution_clock::now();
+        Result.set_function("GetCurrent", [&](const sol::table& Table) -> float {
+            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"] = std::chrono::high_resolution_clock::now();
+        });
+        return Result;
+    });
+    MPTable.set_function("GetOSName", &LuaAPI::MP::GetOSName);
+    MPTable.set_function("GetServerVersion", &LuaAPI::MP::GetServerVersion);
+    MPTable.set_function("RegisterEvent", [this](const std::string& EventName, const std::string& FunctionName) {
+        RegisterEvent(EventName, FunctionName);
+    });
+    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) -> sol::table {
+        return Lua_TriggerLocalEvent(EventName, EventArgs);
+    });
+    MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent);
+    MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount);
+    MPTable.set_function("IsPlayerConnected", &LuaAPI::MP::IsPlayerConnected);
+    MPTable.set_function("GetPlayerIDByName", [&](const std::string& Name) -> int {
+        return Lua_GetPlayerIDByName(Name);
+    });
+    MPTable.set_function("GetPlayerName", [&](int ID) -> std::string {
+        return Lua_GetPlayerName(ID);
+    });
+    MPTable.set_function("RemoveVehicle", &LuaAPI::MP::RemoveVehicle);
+    MPTable.set_function("GetPlayerVehicles", [&](int ID) -> sol::table {
+        return Lua_GetPlayerVehicles(ID);
+    });
+    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
+    MPTable.set_function("GetPlayers", [&]() -> sol::table {
+        return Lua_GetPlayers();
+    });
+    MPTable.set_function("IsPlayerGuest", &LuaAPI::MP::IsPlayerGuest);
+    MPTable.set_function("DropPlayer", &LuaAPI::MP::DropPlayer);
+    MPTable.set_function("GetStateMemoryUsage", [&]() -> size_t {
+        return mStateView.memory_used();
+    });
+    MPTable.set_function("GetLuaMemoryUsage", [&]() -> size_t {
+        return mEngine->CalculateMemoryUsage();
+    });
+    MPTable.set_function("GetPlayerIdentifiers", [&](int ID) -> sol::table {
+        return Lua_GetPlayerIdentifiers(ID);
+    });
+    MPTable.set_function("Sleep", &LuaAPI::MP::Sleep);
+    //  const std::string& EventName, size_t IntervalMS, int strategy
+    MPTable.set_function("CreateEventTimer", [&](sol::variadic_args Args) {
+        if (Args.size() < 2 || Args.size() > 3) {
+            beammp_lua_error("CreateEventTimer expects 2 or 3 arguments.");
+        }
+        if (Args.get_type(0) != sol::type::string) {
+            beammp_lua_error("CreateEventTimer expects 1st argument to be a string");
+        }
+        if (Args.get_type(1) != sol::type::number) {
+            beammp_lua_error("CreateEventTimer expects 2nd argument to be a number");
+        }
+        if (Args.size() == 3 && Args.get_type(2) != sol::type::number) {
+            beammp_lua_error("CreateEventTimer expects 3rd argument to be a number (MP.CallStrategy)");
+        }
+        auto EventName = Args.get<std::string>(0);
+        auto IntervalMS = Args.get<size_t>(1);
+        CallStrategy Strategy = Args.size() > 2 ? Args.get<CallStrategy>(2) : CallStrategy::BestEffort;
+        if (IntervalMS < 25) {
+            beammp_warn("Timer for \"" + EventName + "\" on \"" + mStateId + "\" is set to trigger at <25ms, which is likely too fast and won't cancel properly.");
+        }
+        mEngine->CreateEventTimer(EventName, mStateId, IntervalMS, Strategy);
+    });
+    MPTable.set_function("CancelEventTimer", [&](const std::string& EventName) {
+        mEngine->CancelEventTimers(EventName, mStateId);
+    });
+    MPTable.set_function("Set", &LuaAPI::MP::Set);
+    auto HttpTable = StateView.create_named_table("Http");
+    HttpTable.set_function("CreateConnection", [this](const std::string& host, uint16_t port) {
+        return Lua_HttpCreateConnection(host, port);
+    });
+
+    MPTable.create_named("Settings",
+        "Debug", 0,
+        "Private", 1,
+        "MaxCars", 2,
+        "MaxPlayers", 3,
+        "Map", 4,
+        "Name", 5,
+        "Description", 6);
+
+    MPTable.create_named("CallStrategy",
+        "BestEffort", CallStrategy::BestEffort,
+        "Precise", CallStrategy::Precise);
+
+    auto FSTable = StateView.create_named_table("FS");
+    FSTable.set_function("CreateDirectory", &LuaAPI::FS::CreateDirectory);
+    FSTable.set_function("Exists", &LuaAPI::FS::Exists);
+    FSTable.set_function("Remove", &LuaAPI::FS::Remove);
+    FSTable.set_function("Rename", &LuaAPI::FS::Rename);
+    FSTable.set_function("Copy", &LuaAPI::FS::Copy);
+    FSTable.set_function("GetFilename", &LuaAPI::FS::GetFilename);
+    FSTable.set_function("GetExtension", &LuaAPI::FS::GetExtension);
+    FSTable.set_function("GetParentFolder", &LuaAPI::FS::GetParentFolder);
+    FSTable.set_function("IsDirectory", &LuaAPI::FS::IsDirectory);
+    FSTable.set_function("IsFile", &LuaAPI::FS::IsFile);
+    FSTable.set_function("ConcatPaths", &LuaAPI::FS::ConcatPaths);
+
+    auto CLTable = StateView.create_named_table("CL");
+    CLTable.set_function("SendPacket", &LuaAPI::CL::SendPacket);
+    CLTable.set_function("SendNotify", &LuaAPI::CL::SendNotify);
+
+    Start();
+}
+
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLuaChunk& Script) {
+    std::unique_lock Lock(mStateExecuteQueueMutex);
+    auto Result = std::make_shared<TLuaResult>();
+    mStateExecuteQueue.push({ Script, Result });
+    return Result;
+}
+
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy) {
+    // TODO: Document all this
+    decltype(mStateFunctionQueue)::iterator Iter = mStateFunctionQueue.end();
+    if (Strategy == CallStrategy::BestEffort) {
+        Iter = std::find_if(mStateFunctionQueue.begin(), mStateFunctionQueue.end(),
+            [&EventName](const QueuedFunction& Element) {
+                return Element.EventName == EventName;
+            });
+    }
+    if (Iter == mStateFunctionQueue.end()) {
+        auto Result = std::make_shared<TLuaResult>();
+        Result->StateId = mStateId;
+        Result->Function = FunctionName;
+        std::unique_lock Lock(mStateFunctionQueueMutex);
+        mStateFunctionQueue.push_back({ FunctionName, Result, Args, EventName });
+        mStateFunctionQueueCond.notify_all();
+        return Result;
+    } else {
+        return nullptr;
+    }
+}
+
+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;
+    std::unique_lock Lock(mStateFunctionQueueMutex);
+    mStateFunctionQueue.push_back({ FunctionName, Result, Args, "" });
+    mStateFunctionQueueCond.notify_all();
+    return Result;
+}
+
+void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, const std::string& FunctionName) {
+    mEngine->RegisterEvent(EventName, mStateId, FunctionName);
+}
+
+void TLuaEngine::StateThreadData::operator()() {
+    RegisterThread("Lua:" + mStateId);
+    while (!mShutdown) {
+        { // StateExecuteQueue Scope
+            std::unique_lock Lock(mStateExecuteQueueMutex);
+            if (!mStateExecuteQueue.empty()) {
+                auto S = mStateExecuteQueue.front();
+                mStateExecuteQueue.pop();
+                Lock.unlock();
+
+                { // Paths Scope
+                    std::unique_lock Lock(mPathsMutex);
+                    if (!mPaths.empty()) {
+                        std::stringstream PathAdditions;
+                        std::stringstream CPathAdditions;
+                        while (!mPaths.empty()) {
+                            auto Path = mPaths.front();
+                            mPaths.pop();
+                            PathAdditions << ";" << (Path / "?.lua").string();
+                            PathAdditions << ";" << (Path / "lua/?.lua").string();
+#if WIN32
+                            CPathAdditions << ";" << (Path / "?.dll").string();
+                            CPathAdditions << ";" << (Path / "lib/?.dll").string();
+#else // unix
+                            CPathAdditions << ";" << (Path / "?.so").string();
+                            CPathAdditions << ";" << (Path / "lib/?.so").string();
+#endif
+                        }
+                        sol::state_view StateView(mState);
+                        auto PackageTable = StateView.globals().get<sol::table>("package");
+                        PackageTable["path"] = PackageTable.get<std::string>("path") + PathAdditions.str();
+                        PackageTable["cpath"] = PackageTable.get<std::string>("cpath") + CPathAdditions.str();
+                        StateView.globals()["package"] = PackageTable;
+                    }
+                }
+                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);
+                } else {
+                    S.second->Error = true;
+                    sol::error Err = Res;
+                    S.second->ErrorMessage = Err.what();
+                }
+            }
+        }
+        { // StateFunctionQueue Scope
+            std::unique_lock Lock(mStateFunctionQueueMutex);
+            auto NotExpired = mStateFunctionQueueCond.wait_for(Lock,
+                std::chrono::milliseconds(500),
+                [&]() -> bool { return !mStateFunctionQueue.empty(); });
+            if (NotExpired) {
+                auto TheQueuedFunction = std::move(mStateFunctionQueue.front());
+                mStateFunctionQueue.erase(mStateFunctionQueue.begin());
+                Lock.unlock();
+                auto& FnName = TheQueuedFunction.FunctionName;
+                auto& Result = TheQueuedFunction.Result;
+                auto Args = TheQueuedFunction.Args;
+                // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
+                Result->StateId = mStateId;
+                sol::state_view StateView(mState);
+                auto Fn = StateView[FnName];
+                if (Fn.valid() && Fn.get_type() == sol::type::function) {
+                    std::vector<sol::object> LuaArgs;
+                    for (const auto& Arg : Args) {
+                        if (Arg.valueless_by_exception()) {
+                            continue;
+                        }
+                        switch (Arg.index()) {
+                        case TLuaArgTypes_String:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<std::string>(Arg)));
+                            break;
+                        case TLuaArgTypes_Int:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<int>(Arg)));
+                            break;
+                        case TLuaArgTypes_VariadicArgs:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<sol::variadic_args>(Arg)));
+                            break;
+                        case TLuaArgTypes_Bool:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
+                            break;
+                        default:
+                            beammp_error("Unknown argument type, passed as nil");
+                            break;
+                        }
+                    }
+                    auto Res = Fn(sol::as_args(LuaArgs));
+                    if (Res.valid()) {
+                        Result->Error = false;
+                        Result->Result = std::move(Res);
+                    } else {
+                        Result->Error = true;
+                        sol::error Err = Res;
+                        Result->ErrorMessage = Err.what();
+                    }
+                    Result->Ready = true;
+                } else {
+                    Result->Error = true;
+                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
+                    Result->Ready = true;
+                }
+            }
+        }
+    }
+}
+
+void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy) {
+    std::unique_lock Lock(mTimedEventsMutex);
+    TimedEvent Event {
+        std::chrono::high_resolution_clock::duration { std::chrono::milliseconds(IntervalMS) },
+        std::chrono::high_resolution_clock::now(),
+        EventName,
+        StateId,
+        Strategy
+    };
+    mTimedEvents.push_back(std::move(Event));
+    beammp_trace("created event timer for \"" + EventName + "\" on \"" + StateId + "\" with " + std::to_string(IntervalMS) + "ms interval");
+}
+
+void TLuaEngine::CancelEventTimers(const std::string& EventName, TLuaStateId StateId) {
+    std::unique_lock Lock(mTimedEventsMutex);
+    beammp_trace("cancelling event timer for \"" + EventName + "\" on \"" + StateId + "\"");
+    for (;;) {
+        auto Iter = std::find_if(mTimedEvents.begin(), mTimedEvents.end(), [&](const TimedEvent& Event) -> bool {
+            return Event.EventName == EventName && Event.StateId == StateId;
+        });
+        if (Iter != mTimedEvents.end()) {
+            mTimedEvents.erase(Iter);
+        } else {
+            break;
+        }
+    }
+}
+
+void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
+    std::unique_lock Lock(mPathsMutex);
+    mPaths.push(Path);
+}
+
+void TLuaResult::WaitUntilReady() {
+    while (!Ready) {
+        std::this_thread::yield();
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
+}
+
+TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
+    : Content(Content)
+    , FileName(FileName)
+    , PluginPath(PluginPath) {
+}
+
+bool TLuaEngine::TimedEvent::Expired() {
+    auto Waited = (std::chrono::high_resolution_clock::now() - LastCompletion);
+    return Waited >= Duration;
+}
+
+void TLuaEngine::TimedEvent::Reset() {
+    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));
+        for (const auto& Pair : mFileTimes) {
+            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);
+                        }
+                    }*/
+                }
+            }
+        }
+    }
+}

src/TLuaPlugin.cpp

@@ -0,0 +1,52 @@
+#include "TLuaPlugin.h"
+#include <chrono>
+#include <functional>
+#include <random>
+#include <utility>
+
+TLuaPlugin::TLuaPlugin(TLuaEngine& Engine, const TLuaPluginConfig& Config, const fs::path& MainFolder)
+    : mConfig(Config)
+    , mEngine(Engine)
+    , mFolder(MainFolder)
+    , mPluginName(MainFolder.stem().string())
+    , mFileContents(0) {
+    beammp_debug("Lua plugin \"" + mPluginName + "\" starting in \"" + mFolder.string() + "\"");
+    std::vector<fs::path> Entries;
+    for (const auto& Entry : fs::directory_iterator(mFolder)) {
+        if (Entry.is_regular_file() && Entry.path().extension() == ".lua") {
+            Entries.push_back(Entry);
+        }
+    }
+    // sort alphabetically (not needed if config is used to determine call order)
+    // TODO: Use config to figure out what to run in which order
+    std::sort(Entries.begin(), Entries.end(), [](const fs::path& first, const fs::path& second) {
+        auto firstStr = first.string();
+        auto secondStr = second.string();
+        std::transform(firstStr.begin(), firstStr.end(), firstStr.begin(), ::tolower);
+        std::transform(secondStr.begin(), secondStr.end(), secondStr.begin(), ::tolower);
+        return firstStr < secondStr;
+    });
+    std::vector<std::pair<fs::path, std::shared_ptr<TLuaResult>>> ResultsToCheck;
+    for (const auto& Entry : Entries) {
+        // read in entire file
+        try {
+            std::ifstream FileStream(Entry.string(), std::ios::in | std::ios::binary);
+            auto Size = std::filesystem::file_size(Entry);
+            auto Contents = std::make_shared<std::string>();
+            Contents->resize(Size);
+            FileStream.read(Contents->data(), Contents->size());
+            mFileContents[fs::relative(Entry).string()] = Contents;
+            // Execute first time
+            auto Result = mEngine.EnqueueScript(mConfig.StateId, TLuaChunk(Contents, Entry.string(), MainFolder.string()));
+            ResultsToCheck.emplace_back(Entry.string(), std::move(Result));
+        } catch (const std::exception& e) {
+            beammp_error("Error loading file \"" + Entry.string() + "\": " + e.what());
+        }
+    }
+    for (auto& Result : ResultsToCheck) {
+        Result.second->WaitUntilReady();
+        if (Result.second->Error) {
+            beammp_lua_error("Failed: \"" + Result.first.string() + "\": " + Result.second->ErrorMessage);
+        }
+    }
+}

src/TNetwork.cpp

@@ -0,0 +1,982 @@
+#include "TNetwork.h"
+#include "Client.h"
+#include "LuaAPI.h"
+#include "TLuaEngine.h"
+#include <CustomAssert.h>
+#include <Http.h>
+#include <array>
+#include <cstring>
+
+TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager)
+    : mServer(Server)
+    , mPPSMonitor(PPSMonitor)
+    , mResourceManager(ResourceManager) {
+    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Starting);
+    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Starting);
+    Application::RegisterShutdownHandler([&] {
+        beammp_debug("Kicking all players due to shutdown");
+        Server.ForEachClient([&](std::weak_ptr<TClient> client) -> bool {
+            if (!client.expired()) {
+                ClientKick(*client.lock(), "Server shutdown");
+            }
+            return true;
+        });
+    });
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("UDPNetwork", Application::Status::ShuttingDown);
+        if (mUDPThread.joinable()) {
+            mShutdown = true;
+            mUDPThread.detach();
+        }
+        Application::SetSubsystemStatus("UDPNetwork", Application::Status::Shutdown);
+    });
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("TCPNetwork", Application::Status::ShuttingDown);
+        if (mTCPThread.joinable()) {
+            mShutdown = true;
+            mTCPThread.detach();
+        }
+        Application::SetSubsystemStatus("TCPNetwork", Application::Status::Shutdown);
+    });
+    mTCPThread = std::thread(&TNetwork::TCPServerMain, this);
+    mUDPThread = std::thread(&TNetwork::UDPServerMain, this);
+}
+
+void TNetwork::UDPServerMain() {
+    RegisterThread("UDPServer");
+#if defined(BEAMMP_WINDOWS)
+    WSADATA data;
+    if (WSAStartup(514, &data)) {
+        beammp_error(("Can't start Winsock!"));
+        // return;
+    }
+#endif // WINDOWS
+    mUDPSock = socket(AF_INET, SOCK_DGRAM, 0);
+    // Create a server hint structure for the server
+    sockaddr_in serverAddr {};
+    serverAddr.sin_addr.s_addr = INADDR_ANY; // Any Local
+    serverAddr.sin_family = AF_INET; // Address format is IPv4
+    serverAddr.sin_port = htons(uint16_t(Application::Settings.Port)); // Convert from little to big endian
+
+    // Try and bind the socket to the IP and port
+    if (bind(mUDPSock, (sockaddr*)&serverAddr, sizeof(serverAddr)) != 0) {
+        beammp_error("bind() failed: " + GetPlatformAgnosticErrorString());
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        exit(-1); // TODO: Wtf.
+        // return;
+    }
+    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Good);
+    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.Port) + (" with a Max of ")
+        + std::to_string(Application::Settings.MaxPlayers) + (" Clients"));
+    while (!mShutdown) {
+        try {
+            sockaddr_in client {};
+            std::string Data = UDPRcvFromClient(client); // Receives any data from Socket
+            size_t Pos = Data.find(':');
+            if (Data.empty() || Pos > 2)
+                continue;
+            /*char clientIp[256];
+            ZeroMemory(clientIp, 256); ///Code to get IP we don't need that yet
+            inet_ntop(AF_INET, &client.sin_addr, clientIp, 256);*/
+            uint8_t ID = uint8_t(Data.at(0)) - 1;
+            mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) -> bool {
+                std::shared_ptr<TClient> Client;
+                {
+                    ReadLock Lock(mServer.GetClientMutex());
+                    if (!ClientPtr.expired()) {
+                        Client = ClientPtr.lock();
+                    } else
+                        return true;
+                }
+
+                if (Client->GetID() == ID) {
+                    Client->SetUDPAddr(client);
+                    Client->SetIsConnected(true);
+                    TServer::GlobalParser(ClientPtr, Data.substr(2), mPPSMonitor, *this);
+                }
+
+                return true;
+            });
+        } catch (const std::exception& e) {
+            beammp_error(("fatal: ") + std::string(e.what()));
+        }
+    }
+}
+
+void TNetwork::TCPServerMain() {
+    RegisterThread("TCPServer");
+#if defined(BEAMMP_WINDOWS)
+    WSADATA wsaData;
+    if (WSAStartup(514, &wsaData)) {
+        beammp_error("Can't start Winsock!");
+        return;
+    }
+#endif // WINDOWS
+    TConnection client {};
+    SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    int optval = 1;
+#if defined(BEAMMP_WINDOWS)
+    const char* optval_ptr = reinterpret_cast<const char*>(&optval);
+#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+    void* optval_ptr = reinterpret_cast<void*>(&optval);
+#endif
+    setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, optval_ptr, sizeof(optval));
+    // TODO: check optval or return value idk
+    sockaddr_in addr {};
+    addr.sin_addr.s_addr = INADDR_ANY;
+    addr.sin_family = AF_INET;
+    addr.sin_port = htons(uint16_t(Application::Settings.Port));
+    if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) != 0) {
+        beammp_error("bind() failed: " + GetPlatformAgnosticErrorString());
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        exit(-1); // TODO: Wtf.
+    }
+    if (Listener == -1) {
+        beammp_error("Invalid listening socket");
+        return;
+    }
+    if (listen(Listener, SOMAXCONN)) {
+        beammp_error("listen() failed: " + GetPlatformAgnosticErrorString());
+        // FIXME leak Listener
+        return;
+    }
+    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good);
+    beammp_info(("Vehicle event network online"));
+    do {
+        try {
+            if (mShutdown) {
+                beammp_debug("shutdown during TCP wait for accept loop");
+                break;
+            }
+            client.SockAddrLen = sizeof(client.SockAddr);
+            client.Socket = accept(Listener, &client.SockAddr, &client.SockAddrLen);
+            if (client.Socket == -1) {
+                beammp_warn(("Got an invalid client socket on connect! Skipping..."));
+                continue;
+            }
+            // set timeout (DWORD, aka uint32_t)
+            uint32_t SendTimeoutMS = 30 * 1000;
+#if defined(BEAMMP_WINDOWS)
+            int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<const char*>(&SendTimeoutMS), sizeof(SendTimeoutMS));
+#else // POSIX
+            struct timeval optval;
+            optval.tv_sec = (int)(SendTimeoutMS / 1000);
+            optval.tv_usec = (SendTimeoutMS % 1000) * 1000;
+            int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<void*>(&optval), sizeof(optval));
+#endif
+            if (ret < 0) {
+                throw std::runtime_error("setsockopt recv timeout: " + GetPlatformAgnosticErrorString());
+            }
+            std::thread ID(&TNetwork::Identify, this, client);
+            ID.detach(); // TODO: Add to a queue and attempt to join periodically
+        } catch (const std::exception& e) {
+            beammp_error(("fatal: ") + std::string(e.what()));
+        }
+    } while (client.Socket);
+
+    beammp_debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));
+
+    CloseSocketProper(client.Socket);
+#ifdef BEAMMP_WINDOWS
+    CloseSocketProper(client.Socket);
+    WSACleanup();
+#endif // WINDOWS
+}
+
+#undef GetObject // Fixes Windows
+
+#include "Json.h"
+namespace json = rapidjson;
+
+void TNetwork::Identify(const TConnection& client) {
+    RegisterThreadAuto();
+    char Code;
+    if (recv(client.Socket, &Code, 1, 0) != 1) {
+        CloseSocketProper(client.Socket);
+        return;
+    }
+    if (Code == 'C') {
+        Authentication(client);
+    } else if (Code == 'D') {
+        HandleDownload(client.Socket);
+    } else if (Code == 'P') {
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        send(client.Socket, "P", 1, MSG_NOSIGNAL);
+#else
+        send(client.Socket, "P", 1, 0);
+#endif
+        CloseSocketProper(client.Socket);
+        return;
+    } else {
+        CloseSocketProper(client.Socket);
+    }
+}
+
+void TNetwork::HandleDownload(SOCKET TCPSock) {
+    char D;
+    if (recv(TCPSock, &D, 1, 0) != 1) {
+        CloseSocketProper(TCPSock);
+        return;
+    }
+    auto ID = uint8_t(D);
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            auto c = ClientPtr.lock();
+            if (c->GetID() == ID) {
+                c->SetDownSock(TCPSock);
+            }
+        }
+        return true;
+    });
+}
+
+void TNetwork::Authentication(const TConnection& ClientConnection) {
+    auto Client = CreateClient(ClientConnection.Socket);
+    char AddrBuf[64];
+    // TODO: IPv6 would need this to be changed
+    auto str = inet_ntop(AF_INET, reinterpret_cast<const void*>(&ClientConnection.SockAddr), AddrBuf, sizeof(ClientConnection.SockAddr));
+    beammp_trace("This thread is ip " + std::string(str));
+    Client->SetIdentifier("ip", str);
+
+    std::string Rc; // TODO: figure out why this is not default constructed
+    beammp_info("Identifying new ClientConnection...");
+
+    Rc = TCPRcv(*Client);
+
+    if (Rc.size() > 3 && Rc.substr(0, 2) == "VC") {
+        Rc = Rc.substr(2);
+        if (Rc.length() > 4 || Rc != Application::ClientVersionString()) {
+            ClientKick(*Client, "Outdated Version!");
+            return;
+        }
+    } else {
+        ClientKick(*Client, "Invalid version header!");
+        return;
+    }
+    if (!TCPSend(*Client, "S")) {
+        // TODO: handle
+    }
+
+    Rc = TCPRcv(*Client);
+
+    if (Rc.size() > 50) {
+        ClientKick(*Client, "Invalid Key!");
+        return;
+    }
+
+    auto RequestString = R"({"key":")" + Rc + "\"}";
+
+    auto Target = "/pkToUser";
+    unsigned int ResponseCode = 0;
+    if (!Rc.empty()) {
+        Rc = Http::POST(Application::GetBackendUrlForAuth(), 443, Target, RequestString, "application/json", &ResponseCode);
+    }
+
+    json::Document AuthResponse;
+    AuthResponse.Parse(Rc.c_str());
+    if (Rc == Http::ErrorString || AuthResponse.HasParseError()) {
+        ClientKick(*Client, "Invalid key! Please restart your game.");
+        return;
+    }
+
+    if (!AuthResponse.IsObject()) {
+        if (Rc == "0") {
+            auto Lock = Sentry.CreateExclusiveContext();
+            Sentry.SetContext("auth",
+                { { "response-body", Rc },
+                    { "key", RequestString } });
+            Sentry.SetTransaction(Application::GetBackendUrlForAuth() + Target);
+            Sentry.Log(SentryLevel::Info, "default", "backend returned 0 instead of json (" + std::to_string(ResponseCode) + ")");
+        } else { // Rc != "0"
+            ClientKick(*Client, "Backend returned invalid auth response format.");
+            beammp_error("Backend returned invalid auth response format. This should never happen.");
+            auto Lock = Sentry.CreateExclusiveContext();
+            Sentry.SetContext("auth",
+                { { "response-body", Rc },
+                    { "key", RequestString } });
+            Sentry.SetTransaction(Application::GetBackendUrlForAuth() + Target);
+            Sentry.Log(SentryLevel::Error, "default", "unexpected backend response (" + std::to_string(ResponseCode) + ")");
+        }
+        return;
+    }
+
+    if (AuthResponse["username"].IsString() && AuthResponse["roles"].IsString()
+        && AuthResponse["guest"].IsBool() && AuthResponse["identifiers"].IsArray()) {
+
+        Client->SetName(AuthResponse["username"].GetString());
+        Client->SetRoles(AuthResponse["roles"].GetString());
+        Client->SetIsGuest(AuthResponse["guest"].GetBool());
+        for (const auto& ID : AuthResponse["identifiers"].GetArray()) {
+            auto Raw = std::string(ID.GetString());
+            auto SepIndex = Raw.find(':');
+            Client->SetIdentifier(Raw.substr(0, SepIndex), Raw.substr(SepIndex + 1));
+        }
+    } else {
+        ClientKick(*Client, "Invalid authentication data!");
+        return;
+    }
+
+    beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        std::shared_ptr<TClient> Cl;
+        {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                Cl = ClientPtr.lock();
+            } else
+                return true;
+        }
+        if (Cl->GetName() == Client->GetName() && Cl->IsGuest() == Client->IsGuest()) {
+            CloseSocketProper(Cl->GetTCPSock());
+            Cl->SetStatus(-2);
+            return false;
+        }
+
+        return true;
+    });
+
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest());
+    TLuaEngine::WaitForAll(Futures);
+    bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
+        [](const std::shared_ptr<TLuaResult>& Result) {
+            return !Result->Error && Result->Result.is<int>() && bool(Result->Result.as<int>());
+        });
+    std::string Reason;
+    bool NotAllowedWithReason = std::any_of(Futures.begin(), Futures.end(),
+        [&Reason](const std::shared_ptr<TLuaResult>& Result) -> bool {
+            if (!Result->Error && Result->Result.is<std::string>()) {
+                Reason = Result->Result.as<std::string>();
+                return true;
+            }
+            return false;
+        });
+
+    if (NotAllowed) {
+        ClientKick(*Client, "you are not allowed on the server!");
+        return;
+    } else if (NotAllowedWithReason) {
+        ClientKick(*Client, Reason);
+        return;
+    }
+
+    if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) {
+        beammp_info("Identification success");
+        mServer.InsertClient(Client);
+        TCPClient(Client);
+    } else
+        ClientKick(*Client, "Server full!");
+}
+
+std::shared_ptr<TClient> TNetwork::CreateClient(SOCKET TCPSock) {
+    auto c = std::make_shared<TClient>(mServer);
+    c->SetTCPSock(TCPSock);
+    return c;
+}
+
+bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) {
+    if (!IsSync) {
+        if (c.IsSyncing()) {
+            if (!Data.empty()) {
+                if (Data.at(0) == 'O' || Data.at(0) == 'A' || Data.at(0) == 'C' || Data.at(0) == 'E') {
+                    c.EnqueuePacket(Data);
+                }
+            }
+            return true;
+        }
+    }
+
+    int32_t Size, Sent;
+    std::string Send(4, 0);
+    Size = int32_t(Data.size());
+    memcpy(&Send[0], &Size, sizeof(Size));
+    Send += Data;
+    Sent = 0;
+    Size += 4;
+    do {
+#if defined(BEAMMP_WINDOWS)
+        int32_t Temp = send(c.GetTCPSock(), &Send[Sent], Size - Sent, 0);
+#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        int32_t Temp = send(c.GetTCPSock(), &Send[Sent], Size - Sent, MSG_NOSIGNAL);
+#endif
+        if (Temp == 0) {
+            beammp_debug("send() == 0: " + GetPlatformAgnosticErrorString());
+            if (c.GetStatus() > -1)
+                c.SetStatus(-1);
+            return false;
+        } else if (Temp < 0) {
+            beammp_debug("send() < 0: " + GetPlatformAgnosticErrorString()); // TODO fix it was spamming yet everyone stayed on the server
+            if (c.GetStatus() > -1)
+                c.SetStatus(-1);
+            CloseSocketProper(c.GetTCPSock());
+            return false;
+        }
+        Sent += Temp;
+        c.UpdatePingTime();
+    } while (Sent < Size);
+    return true;
+}
+
+bool TNetwork::CheckBytes(TClient& c, int32_t BytesRcv) {
+    if (BytesRcv == 0) {
+        beammp_trace("(TCP) Connection closing...");
+        if (c.GetStatus() > -1)
+            c.SetStatus(-1);
+        return false;
+    } else if (BytesRcv < 0) {
+        beammp_debug("(TCP) recv() failed: " + GetPlatformAgnosticErrorString());
+        if (c.GetStatus() > -1)
+            c.SetStatus(-1);
+        CloseSocketProper(c.GetTCPSock());
+        return false;
+    }
+    return true;
+}
+
+std::string TNetwork::TCPRcv(TClient& c) {
+    int32_t Header, BytesRcv = 0, Temp;
+    if (c.GetStatus() < 0)
+        return "";
+
+    std::vector<char> Data(sizeof(Header));
+    do {
+        Temp = recv(c.GetTCPSock(), &Data[BytesRcv], 4 - BytesRcv, 0);
+        if (!CheckBytes(c, Temp)) {
+            return "";
+        }
+        BytesRcv += Temp;
+    } while (size_t(BytesRcv) < sizeof(Header));
+    memcpy(&Header, &Data[0], sizeof(Header));
+
+    if (!CheckBytes(c, BytesRcv)) {
+        return "";
+    }
+    if (Header < 100 * MB) {
+        Data.resize(Header);
+    } else {
+        ClientKick(c, "Header size limit exceeded");
+        beammp_warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header of >100MB - assuming malicious intent and disconnecting the client.");
+        return "";
+    }
+    BytesRcv = 0;
+    do {
+        Temp = recv(c.GetTCPSock(), &Data[BytesRcv], Header - BytesRcv, 0);
+        if (!CheckBytes(c, Temp)) {
+            return "";
+        }
+        BytesRcv += Temp;
+    } while (BytesRcv < Header);
+    std::string Ret(Data.data(), Header);
+
+    if (Ret.substr(0, 4) == "ABG:") {
+        Ret = DeComp(Ret.substr(4));
+    }
+    return Ret;
+}
+
+void TNetwork::ClientKick(TClient& c, const std::string& R) {
+    beammp_info("Client kicked: " + R);
+    if (!TCPSend(c, "K" + R)) {
+        // TODO handle
+    }
+    c.SetStatus(-2);
+
+    if (c.GetTCPSock())
+        CloseSocketProper(c.GetTCPSock());
+
+    if (c.GetDownSock())
+        CloseSocketProper(c.GetDownSock());
+}
+
+void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
+    RegisterThreadAuto();
+    while (!c.expired()) {
+        auto Client = c.lock();
+        if (Client->GetStatus() < 0) {
+            beammp_debug("client status < 0, breaking client loop");
+            break;
+        }
+        if (!Client->IsSyncing() && Client->IsSynced() && Client->MissedPacketQueueSize() != 0) {
+            // debug("sending " + std::to_string(Client->MissedPacketQueueSize()) + " queued packets");
+            while (Client->MissedPacketQueueSize() > 0) {
+                std::string QData {};
+                { // locked context
+                    std::unique_lock lock(Client->MissedPacketQueueMutex());
+                    if (Client->MissedPacketQueueSize() <= 0) {
+                        break;
+                    }
+                    QData = Client->MissedPacketQueue().front();
+                    Client->MissedPacketQueue().pop();
+                } // end locked context
+                // beammp_debug("sending a missed packet: " + QData);
+                if (!TCPSend(*Client, QData, true)) {
+                    if (Client->GetStatus() > -1)
+                        Client->SetStatus(-1);
+                    {
+                        std::unique_lock lock(Client->MissedPacketQueueMutex());
+                        while (!Client->MissedPacketQueue().empty()) {
+                            Client->MissedPacketQueue().pop();
+                        }
+                    }
+                    CloseSocketProper(Client->GetTCPSock());
+                    break;
+                }
+            }
+        } else {
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        }
+    }
+}
+
+void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
+    // TODO: the c.expired() might cause issues here, remove if you end up here with your debugger
+    if (c.expired() || c.lock()->GetTCPSock() == -1) {
+        mServer.RemoveClient(c);
+        return;
+    }
+    OnConnect(c);
+    RegisterThread("(" + std::to_string(c.lock()->GetID()) + ") \"" + c.lock()->GetName() + "\"");
+
+    std::thread QueueSync(&TNetwork::Looper, this, c);
+
+    while (true) {
+        if (c.expired())
+            break;
+        auto Client = c.lock();
+        if (Client->GetStatus() < 0) {
+            beammp_debug("client status < 0, breaking client loop");
+            break;
+        }
+
+        auto res = TCPRcv(*Client);
+        if (res == "") {
+            beammp_debug("TCPRcv error, break client loop");
+            break;
+        }
+        TServer::GlobalParser(c, res, mPPSMonitor, *this);
+    }
+    if (QueueSync.joinable())
+        QueueSync.join();
+
+    if (!c.expired()) {
+        auto Client = c.lock();
+        OnDisconnect(c, Client->GetStatus() == -2);
+    } else {
+        beammp_warn("client expired in TCPClient, should never happen");
+    }
+}
+
+void TNetwork::UpdatePlayer(TClient& Client) {
+    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::Settings.MaxPlayers) + ":";
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            auto c = ClientPtr.lock();
+            Packet += c->GetName() + ",";
+        }
+        return true;
+    });
+    Packet = Packet.substr(0, Packet.length() - 1);
+    Client.EnqueuePacket(Packet);
+    //(void)Respond(Client, Packet, true);
+}
+
+void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr, bool kicked) {
+    beammp_assert(!ClientPtr.expired());
+    auto LockedClientPtr = ClientPtr.lock();
+    TClient& c = *LockedClientPtr;
+    beammp_info(c.GetName() + (" Connection Terminated"));
+    std::string Packet;
+    TClient::TSetOfVehicleData VehicleData;
+    { // Vehicle Data Lock Scope
+        auto LockedData = c.GetAllCars();
+        VehicleData = *LockedData.VehicleData;
+    } // End Vehicle Data Lock Scope
+    for (auto& v : VehicleData) {
+        Packet = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(v.ID());
+        SendToAll(&c, Packet, false, true);
+    }
+    if (kicked)
+        Packet = ("L") + c.GetName() + (" was kicked!");
+    else
+        Packet = ("L") + c.GetName() + (" left the server!");
+    SendToAll(&c, Packet, false, true);
+    Packet.clear();
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerDisconnect", "", c.GetID());
+    LuaAPI::MP::Engine->ReportErrors(Futures);
+    if (c.GetTCPSock())
+        CloseSocketProper(c.GetTCPSock());
+    if (c.GetDownSock())
+        CloseSocketProper(c.GetDownSock());
+    mServer.RemoveClient(ClientPtr);
+}
+
+int TNetwork::OpenID() {
+    int ID = 0;
+    bool found;
+    do {
+        found = true;
+        mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                auto c = ClientPtr.lock();
+                if (c->GetID() == ID) {
+                    found = false;
+                    ID++;
+                }
+            }
+            return true;
+        });
+    } while (!found);
+    return ID;
+}
+
+void TNetwork::OnConnect(const std::weak_ptr<TClient>& c) {
+    beammp_assert(!c.expired());
+    beammp_info("Client connected");
+    auto LockedClient = c.lock();
+    LockedClient->SetID(OpenID());
+    beammp_info("Assigned ID " + std::to_string(LockedClient->GetID()) + " to " + LockedClient->GetName());
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerConnecting", "", LockedClient->GetID()));
+    SyncResources(*LockedClient);
+    if (LockedClient->GetStatus() < 0)
+        return;
+    (void)Respond(*LockedClient, "M" + Application::Settings.MapName, true); // Send the Map on connect
+    beammp_info(LockedClient->GetName() + " : Connected");
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->GetID()));
+}
+
+void TNetwork::SyncResources(TClient& c) {
+#ifndef DEBUG
+    try {
+#endif
+        if (!TCPSend(c, "P" + std::to_string(c.GetID()))) {
+            // TODO handle
+        }
+        std::string Data;
+        while (c.GetStatus() > -1) {
+            Data = TCPRcv(c);
+            if (Data == "Done")
+                break;
+            Parse(c, Data);
+        }
+#ifndef DEBUG
+    } catch (std::exception& e) {
+        beammp_error("Exception! : " + std::string(e.what()));
+        c.SetStatus(-1);
+    }
+#endif
+}
+
+void TNetwork::Parse(TClient& c, const std::string& Packet) {
+    if (Packet.empty())
+        return;
+    char Code = Packet.at(0), SubCode = 0;
+    if (Packet.length() > 1)
+        SubCode = Packet.at(1);
+    switch (Code) {
+    case 'f':
+        SendFile(c, Packet.substr(1));
+        return;
+    case 'S':
+        if (SubCode == 'R') {
+            beammp_debug("Sending Mod Info");
+            std::string ToSend = mResourceManager.FileList() + mResourceManager.FileSizes();
+            if (ToSend.empty())
+                ToSend = "-";
+            if (!TCPSend(c, ToSend)) {
+                // TODO: error
+            }
+        }
+        return;
+    default:
+        return;
+    }
+}
+
+void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
+    beammp_info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
+
+    if (!fs::path(UnsafeName).has_filename()) {
+        if (!TCPSend(c, "CO")) {
+            // TODO: handle
+        }
+        beammp_warn("File " + UnsafeName + " is not a file!");
+        return;
+    }
+    auto FileName = fs::path(UnsafeName).filename().string();
+    FileName = Application::Settings.Resource + "/Client/" + FileName;
+
+    if (!std::filesystem::exists(FileName)) {
+        if (!TCPSend(c, "CO")) {
+            // TODO: handle
+        }
+        beammp_warn("File " + UnsafeName + " could not be accessed!");
+        return;
+    }
+
+    if (!TCPSend(c, "AG")) {
+        // TODO: handle
+    }
+
+    /// Wait for connections
+    int T = 0;
+    while (c.GetDownSock() < 1 && T < 50) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        T++;
+    }
+
+    if (c.GetDownSock() < 1) {
+        beammp_error("Client doesn't have a download socket!");
+        if (c.GetStatus() > -1)
+            c.SetStatus(-1);
+        return;
+    }
+
+    size_t Size = size_t(std::filesystem::file_size(FileName)), MSize = Size / 2;
+
+    std::thread SplitThreads[2] {
+        std::thread([&] {
+            RegisterThread("SplitLoad_0");
+            SplitLoad(c, 0, MSize, false, FileName);
+        }),
+        std::thread([&] {
+            RegisterThread("SplitLoad_1");
+            SplitLoad(c, MSize, Size, true, FileName);
+        })
+    };
+
+    for (auto& SplitThread : SplitThreads) {
+        if (SplitThread.joinable()) {
+            SplitThread.join();
+        }
+    }
+}
+
+void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name) {
+    std::ifstream f(Name.c_str(), std::ios::binary);
+    uint32_t Split = 0x7735940; // 125MB
+    std::vector<char> Data;
+    if (Size > Split)
+        Data.resize(Split);
+    else
+        Data.resize(Size);
+    SOCKET TCPSock;
+    if (D)
+        TCPSock = c.GetDownSock();
+    else
+        TCPSock = c.GetTCPSock();
+    beammp_debug("Split load Socket " + std::to_string(TCPSock));
+    while (c.GetStatus() > -1 && Sent < Size) {
+        size_t Diff = Size - Sent;
+        if (Diff > Split) {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(Data.data(), Split);
+            if (!TCPSendRaw(c, TCPSock, Data.data(), Split)) {
+                if (c.GetStatus() > -1)
+                    c.SetStatus(-1);
+                break;
+            }
+            Sent += Split;
+        } else {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(Data.data(), Diff);
+            if (!TCPSendRaw(c, TCPSock, Data.data(), int32_t(Diff))) {
+                if (c.GetStatus() > -1)
+                    c.SetStatus(-1);
+                break;
+            }
+            Sent += Diff;
+        }
+    }
+}
+
+bool TNetwork::TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_t Size) {
+    intmax_t Sent = 0;
+    do {
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        intmax_t Temp = send(socket, &Data[Sent], int(Size - Sent), MSG_NOSIGNAL);
+#else
+        intmax_t Temp = send(socket, &Data[Sent], int(Size - Sent), 0);
+#endif
+        if (Temp < 1) {
+            beammp_info("Socket Closed! " + std::to_string(socket));
+            CloseSocketProper(socket);
+            return false;
+        }
+        Sent += Temp;
+        C.UpdatePingTime();
+    } while (Sent < Size);
+    return true;
+}
+
+bool TNetwork::SendLarge(TClient& c, std::string Data, bool isSync) {
+    if (Data.length() > 400) {
+        std::string CMP(Comp(Data));
+        Data = "ABG:" + CMP;
+    }
+    return TCPSend(c, Data, isSync);
+}
+
+bool TNetwork::Respond(TClient& c, const std::string& MSG, bool Rel, bool isSync) {
+    char C = MSG.at(0);
+    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+        if (C == 'O' || C == 'T' || MSG.length() > 1000) {
+            return SendLarge(c, MSG, isSync);
+        } else {
+            return TCPSend(c, MSG, isSync);
+        }
+    } else {
+        return UDPSend(c, MSG);
+    }
+}
+
+bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
+    if (c.expired()) {
+        return false;
+    }
+    auto LockedClient = c.lock();
+    if (LockedClient->IsSynced())
+        return true;
+    // Syncing, later set isSynced
+    // after syncing is done, we apply all packets they missed
+    if (!Respond(*LockedClient, ("Sn") + LockedClient->GetName(), true)) {
+        return false;
+    }
+    // ignore error
+    (void)SendToAll(LockedClient.get(), ("JWelcome ") + LockedClient->GetName() + "!", false, true);
+
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoin", "", LockedClient->GetID()));
+    LockedClient->SetIsSyncing(true);
+    bool Return = false;
+    bool res = true;
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        std::shared_ptr<TClient> client;
+        {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                client = ClientPtr.lock();
+            } else
+                return true;
+        }
+        TClient::TSetOfVehicleData VehicleData;
+        { // Vehicle Data Lock Scope
+            auto LockedData = client->GetAllCars();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (client != LockedClient) {
+            for (auto& v : VehicleData) {
+                if (LockedClient->GetStatus() < 0) {
+                    Return = true;
+                    res = false;
+                    return false;
+                }
+                res = Respond(*LockedClient, v.Data(), true, true);
+            }
+        }
+
+        return true;
+    });
+    LockedClient->SetIsSyncing(false);
+    if (Return) {
+        return res;
+    }
+    LockedClient->SetIsSynced(true);
+    beammp_info(LockedClient->GetName() + (" is now synced!"));
+    return true;
+}
+
+void TNetwork::SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel) {
+    if (!Self)
+        beammp_assert(c);
+    char C = Data.at(0);
+    bool ret = true;
+    mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) -> bool {
+        std::shared_ptr<TClient> Client;
+        {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                Client = ClientPtr.lock();
+            } else
+                return true;
+        }
+        if (Self || Client.get() != c) {
+            if (Client->IsSynced() || Client->IsSyncing()) {
+                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+                    if (C == 'O' || C == 'T' || Data.length() > 1000) {
+                        if (Data.length() > 400) {
+                            std::string CMP(Comp(Data));
+                            Client->EnqueuePacket("ABG:" + CMP);
+                        } else {
+                            Client->EnqueuePacket(Data);
+                        }
+                        // ret = SendLarge(*Client, Data);
+                    } else {
+                        Client->EnqueuePacket(Data);
+                        // ret = TCPSend(*Client, Data);
+                    }
+                } else {
+                    ret = UDPSend(*Client, Data);
+                }
+            }
+        }
+        return true;
+    });
+    if (!ret) {
+        // TODO: handle
+    }
+    return;
+}
+
+bool TNetwork::UDPSend(TClient& Client, std::string Data) const {
+    if (!Client.IsConnected() || Client.GetStatus() < 0) {
+        // this can happen if we try to send a packet to a client that is either
+        // 1. not yet fully connected, or
+        // 2. disconnected and not yet fully removed
+        // this is fine can can be ignored :^)
+        return true;
+    }
+    sockaddr_in Addr = Client.GetUDPAddr();
+    auto AddrSize = sizeof(Client.GetUDPAddr());
+    if (Data.length() > 400) {
+        std::string CMP(Comp(Data));
+        Data = "ABG:" + CMP;
+    }
+#ifdef WIN32
+    int sendOk;
+    int len = static_cast<int>(Data.size());
+#else
+    int64_t sendOk;
+    size_t len = Data.size();
+#endif // WIN32
+
+    sendOk = sendto(mUDPSock, Data.c_str(), len, 0, (sockaddr*)&Addr, int(AddrSize));
+    if (sendOk == -1) {
+        beammp_debug("(UDP) sendto() failed: " + GetPlatformAgnosticErrorString());
+        if (Client.GetStatus() > -1)
+            Client.SetStatus(-1);
+        return false;
+    } else if (sendOk == 0) {
+        beammp_debug(("(UDP) sendto() returned 0"));
+        if (Client.GetStatus() > -1)
+            Client.SetStatus(-1);
+        return false;
+    }
+    return true;
+}
+
+std::string TNetwork::UDPRcvFromClient(sockaddr_in& client) const {
+    size_t clientLength = sizeof(client);
+    std::array<char, 1024> Ret {};
+#ifdef WIN32
+    auto Rcv = recvfrom(mUDPSock, Ret.data(), int(Ret.size()), 0, (sockaddr*)&client, (int*)&clientLength);
+#else // unix
+    int64_t Rcv = recvfrom(mUDPSock, Ret.data(), Ret.size(), 0, (sockaddr*)&client, (socklen_t*)&clientLength);
+#endif // WIN32
+
+    if (Rcv == -1) {
+        beammp_error("(UDP) Error receiving from client! recvfrom() failed: " + GetPlatformAgnosticErrorString());
+        return "";
+    }
+    return std::string(Ret.begin(), Ret.begin() + Rcv);
+}

src/TPPSMonitor.cpp

@@ -0,0 +1,70 @@
+#include "TPPSMonitor.h"
+#include "Client.h"
+#include "TNetwork.h"
+
+TPPSMonitor::TPPSMonitor(TServer& Server)
+    : mServer(Server) {
+    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Starting);
+    Application::SetPPS("-");
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("PPSMonitor", Application::Status::ShuttingDown);
+        if (mThread.joinable()) {
+            beammp_debug("shutting down PPSMonitor");
+            mShutdown = true;
+            mThread.join();
+            beammp_debug("shut down PPSMonitor");
+        }
+        Application::SetSubsystemStatus("PPSMonitor", Application::Status::Shutdown);
+    });
+    Start();
+}
+void TPPSMonitor::operator()() {
+    RegisterThread("PPSMonitor");
+    while (!mNetwork) {
+        // hard(-ish) spin
+        std::this_thread::yield();
+    }
+    beammp_debug("PPSMonitor starting");
+    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Good);
+    std::vector<std::shared_ptr<TClient>> TimedOutClients;
+    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 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 += c->GetCarCount();
+            }
+            // kick on "no ping"
+            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)");
+        }
+        TimedOutClients.clear();
+        if (C == 0 || mInternalPPS == 0) {
+            Application::SetPPS("-");
+        } else {
+            int R = (mInternalPPS / C) / V;
+            Application::SetPPS(std::to_string(R));
+        }
+        mInternalPPS = 0;
+    }
+}