CMake: Fix typo in SANITIZE codepath

Response Code"

.github/workflows/cmake-linux.yml

@@ -7,72 +7,40 @@ env:
 
 jobs:
   linux-build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
-        with:
+      with:
-          submodules: "recursive"
+          submodules: 'recursive'
 
-      - name: Install Dependencies
+    - name: Install Dependencies
-        env:
+      env:
-          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
-        run: |
+      run: |
           echo ${#beammp_sentry_url}
           sudo apt-get update
-          sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10 libboost1.74-all-dev
+          sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
+          sudo add-apt-repository ppa:mhier/libboost-latest
+          sudo apt-get install -y libboost1.70-dev libboost1.70
 
-      - name: Create Build Environment
+    - name: Create Build Environment
-        run: cmake -E make_directory ${{github.workspace}}/build-linux
+      run: cmake -E make_directory ${{github.workspace}}/build-linux
 
-      - name: Configure CMake
+    - name: Configure CMake
-        shell: bash
+      shell: bash
-        working-directory: ${{github.workspace}}/build-linux
+      working-directory: ${{github.workspace}}/build-linux
-        env:
+      env:
-          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        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"
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
 
-      - name: Build Server
+    - name: Build
-        working-directory: ${{github.workspace}}/build-linux
+      working-directory: ${{github.workspace}}/build-linux
-        shell: bash
+      shell: bash
-        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel
+      run: cmake --build . --config $BUILD_TYPE
 
-      - name: Build Tests
+    - name: Archive artifacts
-        working-directory: ${{github.workspace}}/build-linux
+      uses: actions/upload-artifact@v2
-        shell: bash
+      with:
-        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server-tests --parallel
+        name: BeamMP-Server-linux
-
+        path: ${{github.workspace}}/build-linux/BeamMP-Server
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-linux
-          path: ${{github.workspace}}/build-linux/BeamMP-Server
-
-      - name: Archive test artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-linux-tests
-          path: ${{github.workspace}}/build-linux/BeamMP-Server-tests
-
-  run-tests:
-    needs: linux-build
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/download-artifact@master
-        with:
-          name: BeamMP-Server-linux-tests
-          path: ${{github.workspace}}
-    
-      - name: Install Runtime Dependencies
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y liblua5.3-0 libssl3 curl
-
-      - name: Test
-        working-directory: ${{github.workspace}}
-        shell: bash
-        run: |
-            chmod +x ./BeamMP-Server-tests
-            ./BeamMP-Server-tests

.github/workflows/cmake-windows.yml

@@ -15,12 +15,12 @@ jobs:
             submodules: 'recursive'
       
       - name: Restore artifacts, or run vcpkg, build and cache artifacts
-        uses: lukka/run-vcpkg@v7
+        uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgArguments: 'lua zlib rapidjson boost-beast boost-asio openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: "16ee2ecb31788c336ace8bb14c21801efb6836e4"
+            vcpkgGitCommitId: '8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment
@@ -44,15 +44,4 @@ jobs:
           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

@@ -32,7 +32,7 @@ jobs:
 
   upload-release-files-linux:
     name: Upload Linux Release Files
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: create-release
     steps:
       - uses: actions/checkout@v2
@@ -42,7 +42,9 @@ jobs:
       - name: Install Dependencies
         run: |
             sudo apt-get update
-            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev libboost-dev libboost1.74-all-dev libboost1.74-dev
+            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
+            sudo add-apt-repository ppa:mhier/libboost-latest
+            sudo apt-get install -y libboost1.70-dev libboost1.70
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build-linux
@@ -80,12 +82,12 @@ jobs:
             submodules: 'recursive'
       
       - name: Restore artifacts, or run vcpkg, build and cache artifacts
-        uses: lukka/run-vcpkg@v7
+        uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgArguments: 'lua zlib rapidjson boost-beast boost-asio openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4'
+            vcpkgGitCommitId: '8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

.gitignore

@@ -1,5 +1,4 @@
 .idea/
-.sentry-native/
 *.orig
 *.toml
 boost_*

.gitmodules

@@ -1,33 +1,18 @@
-[submodule "deps/commandline"]
+[submodule "include/commandline"]
-	path = deps/commandline
+    path = include/commandline
-	url = https://github.com/lionkor/commandline
+    url = https://github.com/lionkor/commandline
-[submodule "deps/asio"]
+[submodule "socket.io-client-cpp"]
-	path = deps/asio
+	path = socket.io-client-cpp
+	url = https://github.com/socketio/socket.io-client-cpp
+[submodule "asio"]
+	path = asio
 	url = https://github.com/chriskohlhoff/asio
-[submodule "deps/rapidjson"]
+[submodule "rapidjson"]
-	path = deps/rapidjson
+	path = rapidjson
 	url = https://github.com/Tencent/rapidjson
-[submodule "deps/toml11"]
+[submodule "include/tomlplusplus"]
-	path = deps/toml11
+	path = include/tomlplusplus
-	url = https://github.com/ToruNiina/toml11
+	url = https://github.com/marzer/tomlplusplus
-[submodule "deps/sentry-native"]
+[submodule "include/sentry-native"]
-	path = deps/sentry-native
+	path = include/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
-[submodule "deps/fmt"]
-	path = deps/fmt
-	url = https://github.com/fmtlib/fmt
-[submodule "deps/doctest"]
-	path = deps/doctest
-	url = https://github.com/doctest/doctest

CMakeLists.txt

@@ -1,5 +1,4 @@
-# 3.4 is required for imported targets.
+cmake_minimum_required(VERSION 3.0)
-cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
 
 message(STATUS "You can find build instructions and a list of dependencies in the README at \
 https://github.com/BeamMP/BeamMP-Server")
@@ -9,62 +8,37 @@ project(BeamMP-Server
     HOMEPAGE_URL https://beammp.com
     LANGUAGES CXX C)
 
-find_package(Git REQUIRED)
+if (WIN32)
-# Update submodules as needed
+    # this has to happen before sentry, so that crashpad on windows links with these settings.
-option(GIT_SUBMODULE "Check submodules during build" ON)
+    message(STATUS "MSVC -> forcing use of statically-linked runtime.")
-if(GIT_SUBMODULE)
+    STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-    message(STATUS "Submodule update")
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
-    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-        message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
-    endif()
 endif()
 
-
+include_directories("include/sentry-native/include")
-set(HTTPLIB_REQUIRE_OPENSSL ON)
 set(SENTRY_BUILD_SHARED_LIBS OFF)
+if (MSVC)
+    set(SENTRY_BUILD_RUNTIMESTATIC ON)
+endif()
+set(SENTRY_BACKEND breakpad)
+add_subdirectory("include/sentry-native")
 
-add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
+message(STATUS "Setting compiler flags")
-
+if (WIN32)
-option(WIN32_STATIC_RUNTIME "Build statically-linked runtime on windows (don't touch unless you know what you're doing)" ON)
+    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
-
+    set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
-# ------------------------ APPLE ---------------------------------
+    include_directories(${VcpkgRoot}/include)
-if(APPLE)
+    link_directories(${VcpkgRoot}/lib)
-    if(IS_DIRECTORY /opt/homebrew/Cellar/lua@5.3/5.3.6)
-        set(LUA_INCLUDE_DIR /opt/homebrew/Cellar/lua@5.3/5.3.6/include/lua5.3)
-        link_directories(/opt/homebrew/Cellar/lua@5.3/5.3.6/lib)
-    else()
-        set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
-        link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
-    endif()
-    set(LUA_LIBRARIES lua)
-    if(IS_DIRECTORY /opt/homebrew/opt/openssl@1.1)
-        include_directories(/opt/homebrew/opt/openssl@1.1/include)
-        link_directories(/opt/homebrew/opt/openssl@1.1/lib)
-    else()
-        include_directories(/usr/local/opt/openssl@1.1/include)
-        link_directories(/usr/local/opt/openssl@1.1/lib)
-    endif()
-# ------------------------ WINDOWS ---------------------------------
-elseif (WIN32)
-    if (WIN32_STATIC_RUNTIME)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-    endif()
-# ------------------------ UNIX ------------------------------------
 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")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -gz -fno-builtin")
-    option(SANITIZE "Turns on thread and UB sanitizers" OFF)
     if (SANITIZE)
         message(STATUS "sanitize is ON")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize={address,thread,undefined}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,thread")
     endif (SANITIZE)
 endif ()
 
-set(BUILD_SHARED_LIBS OFF)
-# ------------------------ SENTRY ---------------------------------
 message(STATUS "Checking for Sentry URL")
 # this is set by the build system.
 # IMPORTANT: if you're building from source, just leave this empty
@@ -72,191 +46,90 @@ 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()
-    set(SENTRY_BACKEND breakpad)
+    string(LENGTH ${BEAMMP_SECRET_SENTRY_URL} URL_LEN)
+    message(STATUS "Sentry URL is length ${URL_LEN}")
 endif()
-add_subdirectory("deps/sentry-native")
 
-# ------------------------ C++ SETUP ---------------------------------
-set(CMAKE_CXX_STANDARD 17)
-
-# ------------------------ DEPENDENCIES ------------------------------
 message(STATUS "Adding local source dependencies")
 # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
-add_subdirectory(deps)
+include_directories("asio/asio/include")
+include_directories("rapidjson/include")
+include_directories("websocketpp")
+add_subdirectory("socket.io-client-cpp")
+add_subdirectory("include/commandline")
 
-# ------------------------ VARIABLES ---------------------------------
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
-include(FindLua)
+message(STATUS "Looking for Boost")
-include(FindOpenSSL)
+find_package(Boost REQUIRED COMPONENTS system thread)
-include(FindThreads)
-include(FindZLIB)
-
-find_package(Boost 1.70 REQUIRED COMPONENTS system)
-
-set(BeamMP_Sources
-    include/TConsole.h src/TConsole.cpp
-    include/TServer.h src/TServer.cpp
-    include/Compat.h src/Compat.cpp
-    include/Common.h src/Common.cpp
-    include/Client.h src/Client.cpp
-    include/VehicleData.h src/VehicleData.cpp
-    include/TConfig.h src/TConfig.cpp
-    include/TLuaEngine.h src/TLuaEngine.cpp
-    include/TLuaPlugin.h src/TLuaPlugin.cpp
-    include/TResourceManager.h src/TResourceManager.cpp
-    include/THeartbeatThread.h src/THeartbeatThread.cpp
-    include/Http.h src/Http.cpp
-    include/TSentry.h src/TSentry.cpp
-    include/TPPSMonitor.h src/TPPSMonitor.cpp
-    include/TNetwork.h src/TNetwork.cpp
-    include/LuaAPI.h src/LuaAPI.cpp
-    include/TScopedTimer.h src/TScopedTimer.cpp
-    include/SignalHandling.h src/SignalHandling.cpp
-    include/ArgsParser.h src/ArgsParser.cpp
-    include/TPluginMonitor.h src/TPluginMonitor.cpp
-    include/Environment.h
-    include/BoostAliases.h
-)
-
-set(BeamMP_Includes
-    ${LUA_INCLUDE_DIR}
-    ${CURL_INCLUDE_DIRS}
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps"
-)
-
-set(BeamMP_Definitions
-    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
-)
-
-if (WIN32)
-    list(APPEND BeamMP_Definitions _WIN32_WINNT=0x0601)
-    list(APPEND BeamMP_Definitions _CRT_SECURE_NO_WARNINGS)
-endif()
-if (UNIX)
-    set(BeamMP_CompileOptions
-        -Wall
-        -Wextra
-        -Wpedantic
-    
-        -Werror=uninitialized
-        -Werror=float-equal
-        -Werror=pointer-arith
-        -Werror=double-promotion
-        -Werror=write-strings
-        -Werror=cast-qual
-        -Werror=init-self
-        -Werror=cast-align
-        -Werror=unreachable-code
-        -Werror=strict-aliasing -fstrict-aliasing
-        -Werror=redundant-decls
-        -Werror=missing-declarations
-        -Werror=missing-field-initializers
-        -Werror=write-strings
-        -Werror=ctor-dtor-privacy
-        -Werror=switch-enum
-        -Werror=switch-default
-        -Werror=old-style-cast
-        -Werror=overloaded-virtual
-        -Werror=overloaded-virtual
-        -Werror=missing-include-dirs
-        -Werror=unused-result
-
-        -fstack-protector
-        -Wzero-as-null-pointer-constant
-    )
-else()
-
-    set(BeamMP_CompileOptions
-        /bigobj
-        /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMT
-    )
-endif()
-
-set(BeamMP_Libraries
-    Boost::boost
-    Boost::system
-    doctest::doctest
-    OpenSSL::SSL
-    OpenSSL::Crypto
-    sol2::sol2
-    fmt::fmt
-    Threads::Threads
-    ZLIB::ZLIB
-    ${LUA_LIBRARIES}
-    commandline
-    sentry
-)
-
-if (WIN32)
-    set(BeamMP_PlatformLibs wsock32 ws2_32)
-endif ()
-
-# ------------------------ BEAMMP SERVER -----------------------------
 
 add_executable(BeamMP-Server
         src/main.cpp
-        ${BeamMP_Sources}
+        include/TConsole.h src/TConsole.cpp
-)
+        include/TServer.h src/TServer.cpp
+        include/Compat.h src/Compat.cpp
+        include/Common.h src/Common.cpp
+        include/Client.h src/Client.cpp
+        include/VehicleData.h src/VehicleData.cpp
+        include/TConfig.h src/TConfig.cpp
+        include/TLuaEngine.h src/TLuaEngine.cpp
+        include/TLuaFile.h src/TLuaFile.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/SignalHandling.h src/SignalHandling.cpp)
 
-target_compile_definitions(BeamMP-Server PRIVATE
+target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}")
-    ${BeamMP_Definitions}
-    DOCTEST_CONFIG_DISABLE
-)
 
-target_compile_options(BeamMP-Server PRIVATE 
+target_include_directories(BeamMP-Server PUBLIC 
-    ${BeamMP_CompileOptions}
+    "${CMAKE_CURRENT_SOURCE_DIR}/include" 
-)
+    "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
 
-target_include_directories(BeamMP-Server PRIVATE
+message(STATUS "Looking for Lua")
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+find_package(Lua REQUIRED)
-)
+target_include_directories(BeamMP-Server PUBLIC 
+    ${Boost_INCLUDE_DIRS} 
+    ${LUA_INCLUDE_DIR} 
+    ${CURL_INCLUDE_DIRS}
+    "socket.io-client-cpp/src" 
+    "include/tomlplusplus" 
+    "include/sentry-native/include"
+    "include/curl/include")
 
-target_include_directories(BeamMP-Server SYSTEM PRIVATE
+message(STATUS "Looking for SSL")
-    ${BeamMP_Includes}
+find_package(OpenSSL REQUIRED)
-)
 
-target_link_libraries(BeamMP-Server
+message(STATUS "CURL IS ${CURL_LIBRARIES}")
-    ${BeamMP_Libraries}
-    ${BeamMP_PlatformLibs}
-)
-
-# ------------------------ BEAMMP SERVER TESTS -----------------------
-
-option(BUILD_TESTS "Build BeamMP-Server tests" ON)
-
-if(BUILD_TESTS)
-    add_executable(BeamMP-Server-tests
-            test/test_main.cpp
-            ${BeamMP_Sources}
-    )
-
-    target_compile_definitions(BeamMP-Server-tests PRIVATE
-        ${BeamMP_Definitions}
-    )
-    
-    target_compile_options(BeamMP-Server-tests PRIVATE 
-       ${BeamMP_CompileOptions}
-    )
-
-    target_include_directories(BeamMP-Server-tests PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    )
-
-    target_include_directories(BeamMP-Server-tests SYSTEM PRIVATE
-        ${BeamMP_Includes}
-    )
-    
-    target_link_libraries(BeamMP-Server-tests
-        ${BeamMP_Libraries}
-        ${BeamMP_PlatformLibs}
-    )
-endif()
 
+if (UNIX)
+    target_link_libraries(BeamMP-Server 
+        z 
+        pthread 
+        stdc++fs 
+        ${LUA_LIBRARIES} 
+        crypto
+        ${OPENSSL_LIBRARIES} 
+        commandline 
+        sioclient_tls 
+        sentry)
+elseif (WIN32)
+    include(FindLua)
+    message(STATUS "Looking for libz")
+    find_package(ZLIB REQUIRED)
+    message(STATUS "Looking for RapidJSON")
+    find_package(RapidJSON CONFIG REQUIRED)
+    target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+    target_link_libraries(BeamMP-Server PRIVATE 
+        ws2_32 
+        ZLIB::ZLIB 
+        ${LUA_LIBRARIES} 
+        ${OPENSSL_LIBRARIES} 
+        commandline
+        sioclient_tls
+        sentry)
+endif ()

CONTRIBUTING.md

@@ -1,111 +0,0 @@
-# Contributing to BeamMP-Server
-
-Unlike other parts of BeamMP, the BeamMP-Server does not have any dependency to the BeamNG.drive game. 
-
-To contribute *C++ code*, you'll need a MacOS, Linux or Windows PC, and intermediate to advanced knowledge of C++.
-For reference, you should know be reasonably comfortable with the STL, the concept of RAII, templates, and generally know how to read & write post-C++17 code. To contribute anything else, you won't need most of this (though it'd be helpful to have some vocabulary about computers).
-
-# Ways to Contribute
-
-## Bug Reports
-
-If you work with BeamMP-Server, either by simply using it, or even writing plugins for it, and you run into any issues, we definitely want to know about it. Please use [GitHub issues](https://github.com/BeamMP/BeamMP-Server/issues) and select the "Bug" template, read it, and fill it out accordingly.
-
-## Bug Fixes
-
-If you are interested in fixing bugs, check out the [GitHub issues](https://github.com/BeamMP/BeamMP-Server/issues). There, you can pick any issue that has nobody assigned to it. For example, some bugs which we definitely need some help with are marked with the "help wanted" tag.
-
-Once you picked a bug, you need to reproduce it. Start by following the instructions in the bug report, and don't be afraid to ask for more information or clarification on the issue itself.
-
-Refer to [getting started with the codebase](#getting-started-with-the-codebase) for more information on how to build the server. You can also ask on our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`).
-
-## Features
-
-If you want to add new features, please make an issue for it first or ask on our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`).
-
-You need to make sure the feature isn't being worked on by someone else, and aligns with the vision we have for the server.
-
-# Git Guidelines
-
-**Read this carefully. Failing to follow these rules results in your changes not being accepted**. This applies for outside contributors, members of the BeamMP development team ("BeamMP Developers"), project owners, maintainers, frequent contributors, and literally everyone else. **It applies to everyone**.
-
-## How to Commit
-
-Commit messages **MUST** (mandatory):
-
-- start with a **lower case action verb in present tense**, for example `add`, `fix`, `implement`, `refactor`, `remove`, `rename`. *Counter examples (these are bad): ~~`Fixed`, `fixing`, `added`, `removing`~~*.
-- not have a first line much longer than 70 characters.
-- explain briefly the changes made.
-- reference the issue by number, if there is an issue the commit addresses, like so: `#<number>`. Example: `#123`.
-
-If any of these are not followed, **your changes will not be accepted.**
-
-Commit messages **SHOULD** (optional, "nice to have"):
-
-- only address one "atomic" change.
-- have an empty second line, and the subsequent lines explaining the changes in more detail (if more detail is available).
-
-Commits may be squashed (via a Git "interactive rebase") in order to satisfy these rules, but history that is >1h old should not be rewritten if possible. Force pushes are ugly ;)
-
-## Pulling, Merging
-
-Do **NOT** pull with merge. This is the default git behavior for `git pull`, but creates ugly and unnecessary commit messages like `"merge origin/master into master"`. Instead, pull with rebase, for example via `git pull -r`. If you get conflicts, resolve them properly.
-
-The only acceptable merge commits are those which actually merge functionally different branches into each other, for example for merging one feature branch into another.
-
-## Branches
-
-### Which branch should I base my work on?
-
-Each *feature* or *bug-fix* is implemented on a new Git branch, branched off of the branch it should be based on. The `master` branch is usually stable, so we don't do development on it. It is always a safe bet to branch off of `master`, but it may be more work to merge later. Branches to base your work on are usually branches like `rc-v3.3.0`, when the latest public version is `3.2.0`, for example. These can often be found in Pull-Requests on GitHub which are tagged `Release Candidate`.
-
-## Unit tests & CI/CD
-
-We use GitHub Actions, which runs our unit-tests. PR's which fail these tests, or even fail any of our actions (which run automatically), will not be merged and require further changes until they compile, link, and all tests pass properly. If you have issues with this, feel free to ask in our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`)
-
-### What should I call by branch?
-
-Keep branch names **unique**, **descriptive**, and **shorter than 30 characters**. Names must be in present-tense, such as `fix-xyz`, **not** ~~`fixing-xyz`~~.
-
-We generally use *feature branches*, so we keep one branch per feature or fix.
-
-For example:
-- You want to fix issue number #123? You could call the branch `fix-123`.
-- You want to add a feature described in issue #456? You could call the branch `implement-456`.
-- You want to add a feature or fix a bug that has no issue? You should probably make an issue for it first! Or, if you're not ready for that yet, you could call it by the feature name or bug description, for example for a bug that makes cars disappear: `fix-disappearing-cars`.
-
-## Pull Requests, Code Review
-
-Once you are ready to show what you did, and get feedback on it, you open a Pull-Request on GitHub. Please make sure to pick the right branches, and a descriptive title. Mention any related issues with `#<issue number>`, for example `#123`.
-
-Make sure to explain what the PR does, what it fixes, and what needs to still be done (if anything).
-
-A BeamMP-Developer must review your code in detail, and leave a review. If this takes too long, feel free to @ a maintainer/developer, or leave another comment on the PR. It helps to say something like "Ready for review", for example.
-
-# Getting Started with the Codebase
-
-1. Look at current Pull-Requests, look at the git branches, or ask in our [Discord server](https://discord.gg/beammp), or on IRC ([irc.libera.chat](https://web.libera.chat/), join `#beammp`), in order to find out which branch you should work on to minimize conflict. See [this section on branches](#branches) for more info.
-2. Fork the repository (with that branch) on GitHub. GitHub, by default, gives you only the `master` branch when forking, so make sure you fork with other branches enabled when you want to work on a branch that isn't master (it's a checkbox when you fork).
-3. Clone the fork to your local machine.
-4. Check out the branch you want to work on (see 1.).
-5. Run `git submodule update --init --recursive`.
-6. Make a new branch for your feature or fix from the branch you are on. You can do this via `git checkout -b <branch name>`. See [this section on branches](#branches) for more info on branch naming.
-7. Install all dependencies. Those are usually listed in the `README.md` in the branch you're in, or, more reliably, in one of the files in `.github/workflows` (if you can read `yaml`).
-8. Run CMake to configure the project. You can find tutorials on this online. You will want to tell CMake to build with `CMAKE_BUILD_TYPE=Debug`, for example by passing it to CMake via the commandline switch `-DCMAKE_BUILD_TYPE=Debug`. You may also want to turn off sentry by setting `SENTRY_BACKEND=none` (for example via commandline switch `-DSENTRY_BACKEND=none`). An example invocation on Linux with GNU make would be 
-`cmake . -DCMAKE_BUILD_TYPE=Debug -DSENTRY_BACKEND=none` . 
-9. Build the `BeamMP-Server` target to build the BeamMP-Server, or the `BeamMP-Server-tests` target to build the unit-tests (does not include a working server). In the example from 8. (on Linux), you could build with  `make BeamMP-Server`, `make -j BeamMP-Server` or `cmake --build . --parallel --target BeamMP-Server` . Or, on Windows, (in Visual Studio), you would just press some big green "run" or "debug" button.
-10. When making changes, refer to [this section on how to commit properly](#how-to-commit). Not following those guidelines will result in your changes being rejected, so please take a look.
-11. Make sure to add Unit-tests with `doctest` if you build new stuff. You can find examples all over the latest version of the codebase (search for `TEST_CASE`).
-
-# Code Guidelines
-
-## Formatting
-
-1. Use `clang-format` to format your code before committig. A `.clang-format` file is provided in the root of the repository.
-2. All identifiers, type names, function names, etc. should be `PascalCase`. Type names may also have the `T` prefix, although this is not enforced (for example `TNetwork`).
-
-## Modular code
-
-Write code that is modular and testable. Generally, if you can write a good unit-test for it, it's modular. If you can't, it's not.
-
-Don't overdo it though - sometimes its okay to just write code, do the job, be done with it. You'll get feedback on this in the code review for your PR.

Changelog.md

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

README.md

@@ -4,17 +4,7 @@
 [![CMake Linux Build](https://github.com/BeamMP/BeamMP-Server/workflows/CMake%20Linux%20Build/badge.svg?branch=master)](https://github.com/BeamMP/BeamMP-Server/actions?query=workflow%3A%22CMake+Linux+Build%22)
 
 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
-The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
+The server is the point throug which all clients communicate. You can write lua mods for the server, detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
-
-**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**
-
-## 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
 
@@ -29,21 +19,21 @@ These values are guesstimated and are subject to change with each release.
 
 ## Contributing
 
-TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" or "good first issue" label or with nobody assigned.
+TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" label or with nobody assigned, any [trello](https://trello.com/b/Kw75j3zZ/beamngdrive-multiplayer) cards in the "To-Do" column.
 
-To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues). Any issues that have the "help wanted" label or don't have anyone assigned are good tasks to take on. You can either contribute by programming or by testing and adding more info and ideas.
+To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues) and at the [trello](https://trello.com/b/Kw75j3zZ/beamngdrive-multiplayer). Any issues that have the "help wanted" label or don't have anyone assigned and any trello cards that aren't assigned or in the "In-Progress" section are good tasks to take on. You can either contribute by programming or by testing and adding more info and ideas.
 
 Fork this repository, make a new branch for your feature, implement your feature or fix, and then create a pull-request here. Even incomplete features and fixes can be pull-requested.
 
-If you need support with understanding the codebase, please write us in the Discord. You'll need to be proficient in modern C++.
+If you need support with understanding the codebase, please write us in the discord. You'll need to be proficient in modern C++.
 
 ## About Building from Source
 
-We only allow building unmodified (original) source code for public use. `master` is considered **unstable** and we will not provide technical support if such a build doesn't work, so always build from a tag. You can checkout a tag with `git checkout tags/TAGNAME`, where `TAGNAME` is the tag, for example `v3.1.0`. 
+We only allow building unmodified (original) source code for public use. `master` is considered **unstable** and we will not provide technical support if such a build doesn't work, so always build from a tag. You can checkout a tag with `git checkout tags/TAGNAME`, where `TAGNAME` is the tag, for example `v1.20`. 
 
 ## Supported Operating Systems
 
-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and sometimes Linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.
+The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute windows binaries and sometimes linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.
 
 Recommended compilers: MSVC, GCC, CLANG. 
 
@@ -51,132 +41,54 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea
 
 ## Build Instructions
 
-**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v3.1.0`!__**
+**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.0`!__**
 
-Currently only Linux and Windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
+Currently only linux and windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
 
 ### Prerequisites
 
 #### Windows
 
-There are **no runtime libraries** needed for Windows.
-
 Please use the prepackaged binaries in [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
 
-Dependencies for **Windows** can be installed with `vcpkg`.
+Dependencies for windows can be installed with `vcpkg`, in which case the current dependencies are the `x64-windows-static` versions of `lua`, `zlib`, `rapidjson`, `boost-beast`, `boost-asio` and `openssl`.
-These are:
-```
-lua zlib rapidjson openssl websocketpp curl
-```
-The triplet we use for releases is `x64-windows-static`.
 
-#### Linux
+#### Linux / \*nix
 
-We recommend Ubuntu 22.04 or Arch Linux. Any Linux distribution will work, but you have to figure out the package names yourself (please feel free to PR in a change to this README with that info).
+These package names are in the debian / ubuntu style. Feel free to PR your own guide for a different distro.
 
-##### Runtime Dependencies
+- `git`
+- `make`
+- `cmake`
+- `g++`
+- `libcurl4-openssl-dev` or similar (search for `libcurl` and look for one with `-dev`)
+  
+  Must support ISO C++17. If your distro's `g++` doesn't support C++17, chances are that it has a `g++-8` or `g++-10` package that does. If this is the case. you just need to run CMake with `-DCMAKE_CXX_COMPILER=g++-10` (replace `g++-10` with your compiler's name).
+- `liblua5.3-dev` 
+  
+  Any 5.x version should work, but 5.3 is what we officially use. Any other version might break in the future.
+  You can also use any version of `libluajit`, but the same applies regarding the version.
+- `libz-dev`
+- `rapidjson-dev`
+- `libopenssl-dev` or `libssl-dev`
 
-These are needed to *run* the server.
+**If** you're building it from source, you'll need `libboost1.70-all-dev` or `libboost1.71-all-dev` or higher as well.
-
+If you can't find this version of boost (only 1.6x, for example), you can either update to a newer version of your distro, build boost yourself, or use an unstable rolling release (like Debian `sid` aka `unstable`).
-<details>
-<summary>
-Ubuntu 22.04
-</summary>
-
-`apt-get install` the following libraries:
-```
-liblua5.3-0
-libssl3
-curl
-```
-</details>
-
-<details>
-<summary>
-Arch Linux
-</summary>
-
-`pacman -Syu` the following libraries:
-```
-lua53
-openssl
-curl
-```
-</details>
-
-##### Build Dependencies
-These are needed for you to *build* the server, in addition to the [runtime dependencies](#runtime-dependencies).
-
-<details>
-<summary>
-Ubuntu 22.04
-</summary>
-
-`apt-get install` the following libraries and programs:
-```
-git
-libz-dev
-rapidjson-dev
-liblua5.3
-libssl-dev
-libwebsocketpp-dev
-libcurl4-openssl-dev
-cmake
-g++-10
-libboost1.74-all-dev
-libssl3
-curl
-```
-</details>
-
-<details>
-<summary>
-Arch Linux
-</summary>
-
-`pacman -Syu` the following libraries and programs:
-```
-lua53
-openssl
-curl
-git
-cmake
-g++
-cmake
-zlib
-boost
-websocketpp
-```
-</details>
-
-#### macOS
-
-Dependencies for **macOS** can be installed with homebrew.
-```
-brew install lua@5.3 rapidjson websocketpp cmake openssl@1.1
-```
-Some packages are included in **macOS** but you might want to install homebrew versions.
-```
-brew install curl zlib git make
-```
 
 ### How to build
 
-On Windows, use git-bash for these commands. On Linux, these should work in your shell.
+On windows, use git-bash for these commands. On Linux, these should work in your shell.
 
 1. Make sure you have all [prerequisites](#prerequisites) installed
-2. Clone the repository in a location of your choice with `git clone https://github.com/BeamMP/BeamMP-Server` . 
+2. Clone the repository in a location of your choice with **`git clone --recurse-submodules https://github.com/BeamMP/BeamMP-Server`**. Now change into the cloned directory by running `cd BeamMP-Server`.
-3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`. 
+3. Ensure that all submodules are initialized by running `git submodule update --init --recursive`. Then change into the cloned directory by running `cd BeamMP-Server`.
-4. Checkout the branch or tag of the release you want to compile, for example `git checkout tags/v3.0.2` for version 3.0.2. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
+4. Checkout the branch of the release you want to compile (`master` is often unstable), for example `git checkout tags/v1.20` for version 1.20. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
-6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`). This may take some time, and will update all submodules and prepare the build.
+5. Run `cmake .` (with `.`)
-7. Run `make -j` . This step will take some time and will use a lot of CPU and RAM. Remove the `-j` if you run out of memory. *If you change something in the source code, you only have to re-run this step.*
+6. Run `make`
-8. You now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (Windows or Linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/server-installation) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
+7. You will now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (windows or linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/Server_Mod) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
 
 *tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*
 
-## Support
-The BeamMP project is supported by community donations via our [Patreon](https://www.patreon.com/BeamMP). This brings perks such as Patreon-only channels on our Discord, early access to new updates, and more server keys. 
-
 ## Copyright
 
 Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor).

deps/CMakeLists.txt

@@ -1,6 +0,0 @@
-include_directories("${PROJECT_SOURCE_DIR}/deps")
-
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest")

include/ArgsParser.h

@@ -1,49 +0,0 @@
-#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/BoostAliases.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <boost/asio.hpp>
-#include <boost/system/error_code.hpp>
-
-using namespace boost::asio;

include/Client.h

@@ -2,28 +2,16 @@
 
 #include <chrono>
 #include <memory>
-#include <optional>
 #include <queue>
 #include <string>
 #include <unordered_set>
 
-#include "BoostAliases.h"
 #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 {
-    ip::tcp::socket Socket;
-    ip::tcp::endpoint SockAddr;
-};
-
 class TClient final {
 public:
     using TSetOfVehicleData = std::vector<TVehicleData>;
@@ -33,34 +21,27 @@ public:
         std::unique_lock<std::mutex> Lock;
     };
 
-    TClient(TServer& Server, ip::tcp::socket&& Socket);
+    explicit TClient(TServer& Server);
     TClient(const TClient&) = delete;
-    ~TClient();
     TClient& operator=(const TClient&) = delete;
 
     void AddNewCar(int Ident, const std::string& Data);
     void SetCarData(int Ident, const std::string& Data);
-    void SetCarPosition(int Ident, const std::string& Data);
     TVehicleDataLockPair GetAllCars();
     void SetName(const std::string& Name) { mName = Name; }
     void SetRoles(const std::string& Role) { mRole = Role; }
-    void SetIdentifier(const std::string& key, const std::string& value) { mIdentifiers[key] = value; }
+    void AddIdentifier(const std::string& ID) { mIdentifiers.insert(ID); };
     std::string GetCarData(int Ident);
-    std::string GetCarPositionRaw(int Ident);
+    void SetUDPAddr(sockaddr_in Addr) { mUDPAddress = Addr; }
-    void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
+    void SetDownSock(SOCKET CSock) { mSocket[1] = CSock; }
-    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
+    void SetTCPSock(SOCKET CSock) { mSocket[0] = CSock; }
-    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
+    void SetStatus(int Status) { mStatus = Status; }
-    void Disconnect(std::string_view Reason);
-    bool IsDisconnected() const { return !mSocket.is_open(); }
     // locks
     void DeleteCar(int Ident);
-    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
+    [[nodiscard]] std::set<std::string> GetIdentifiers() const { return mIdentifiers; }
-    [[nodiscard]] const ip::udp::endpoint& GetUDPAddr() const { return mUDPAddress; }
+    [[nodiscard]] sockaddr_in GetUDPAddr() const { return mUDPAddress; }
-    [[nodiscard]] ip::udp::endpoint& GetUDPAddr() { return mUDPAddress; }
+    [[nodiscard]] SOCKET GetDownSock() const { return mSocket[1]; }
-    [[nodiscard]] ip::tcp::socket& GetDownSock() { return mDownSocket; }
+    [[nodiscard]] SOCKET GetTCPSock() const { return mSocket[0]; }
-    [[nodiscard]] const ip::tcp::socket& GetDownSock() const { return mDownSocket; }
-    [[nodiscard]] ip::tcp::socket& GetTCPSock() { return mSocket; }
-    [[nodiscard]] const ip::tcp::socket& GetTCPSock() const { return mSocket; }
     [[nodiscard]] std::string GetRoles() const { return mRole; }
     [[nodiscard]] std::string GetName() const { return mName; }
     void SetUnicycleID(int ID) { mUnicycleID = ID; }
@@ -68,6 +49,7 @@ public:
     [[nodiscard]] int GetOpenCarID() const;
     [[nodiscard]] int GetCarCount() const;
     void ClearCars();
+    [[nodiscard]] int GetStatus() const { return mStatus; }
     [[nodiscard]] int GetID() const { return mID; }
     [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
     [[nodiscard]] bool IsConnected() const { return mIsConnected; }
@@ -77,9 +59,9 @@ public:
     void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
     void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
     void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
-    void EnqueuePacket(const std::vector<uint8_t>& Packet);
+    void EnqueuePacket(const std::string& Packet);
-    [[nodiscard]] std::queue<std::vector<uint8_t>>& MissedPacketQueue() { return mPacketsSync; }
+    [[nodiscard]] std::queue<std::string>& MissedPacketQueue() { return mPacketsSync; }
-    [[nodiscard]] const std::queue<std::vector<uint8_t>>& MissedPacketQueue() const { 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; }
@@ -95,22 +77,18 @@ private:
     bool mIsSynced = false;
     bool mIsSyncing = false;
     mutable std::mutex mMissedPacketsMutex;
-    std::queue<std::vector<uint8_t>> mPacketsSync;
+    std::queue<std::string> mPacketsSync;
-    std::unordered_map<std::string, std::string> mIdentifiers;
+    std::set<std::string> mIdentifiers;
     bool mIsGuest = false;
-    mutable std::mutex mVehicleDataMutex;
+    std::mutex mVehicleDataMutex;
-    mutable std::mutex mVehiclePositionMutex;
     TSetOfVehicleData mVehicleData;
-    SparseArray<std::string> mVehiclePosition;
     std::string mName = "Unknown Client";
-    ip::tcp::socket mSocket;
+    SOCKET mSocket[2] { SOCKET(0), SOCKET(0) };
-    ip::tcp::socket mDownSocket;
+    sockaddr_in mUDPAddress {}; // is this initialization OK? yes it is
-    ip::udp::endpoint mUDPAddress {};
     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/Common.h

@@ -5,36 +5,13 @@ extern TSentry Sentry;
 
 #include <array>
 #include <atomic>
-#include <cstring>
 #include <deque>
-#include <filesystem>
-#include <fmt/format.h>
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <shared_mutex>
-#include <sstream>
-#include <unordered_map>
-#include <zlib.h>
-
-#include <doctest/doctest.h>
-#include <filesystem>
-namespace fs = std::filesystem;
 
 #include "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();
-};
-
-template <typename T>
-using SparseArray = std::unordered_map<size_t, T>;
-
 // 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
@@ -44,30 +21,33 @@ class Application final {
 public:
     // types
     struct TSettings {
-        std::string ServerName { "BeamMP Server" };
+        TSettings() noexcept
-        std::string ServerDesc { "BeamMP Default Description" };
+            : ServerName("BeamMP Server")
-        std::string Resource { "Resources" };
+            , ServerDesc("BeamMP Default Description")
-        std::string MapName { "/levels/gridmap_v2/info.json" };
+            , Resource("Resources")
-        std::string Key {};
+            , MapName("/levels/gridmap_v2/info.json")
-        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
+            , MaxPlayers(10)
-        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
+            , Private(true)
-        bool HTTPServerEnabled { false };
+            , MaxCars(1)
-        int MaxPlayers { 8 };
+            , DebugModeEnabled(false)
-        bool Private { true };
+            , Port(30814)
-        int MaxCars { 1 };
+            , SendErrors(true)
-        bool DebugModeEnabled { false };
+            , SendErrorsMessageEnabled(true) { }
-        int Port { 30814 };
+        std::string ServerName;
-        std::string CustomIP {};
+        std::string ServerDesc;
-        bool LogChat { true };
+        std::string Resource;
-        bool SendErrors { true };
+        std::string MapName;
-        bool SendErrorsMessageEnabled { true };
+        std::string Key;
-        int HTTPServerPort { 8080 };
+        int MaxPlayers;
-        std::string HTTPServerIP { "127.0.0.1" };
+        bool Private;
-        bool HTTPServerUseSSL { false };
+        int MaxCars;
-        bool HideUpdateMessages { false };
+        bool DebugModeEnabled;
+        int Port;
+        std::string CustomIP;
+        bool SendErrors;
+        bool SendErrorsMessageEnabled;
         [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
     };
-
     using TShutdownHandler = std::function<void()>;
 
     // methods
@@ -78,246 +58,100 @@ public:
     // Causes all threads to finish up and exit gracefull gracefully
     static void GracefullyShutdown();
     static TConsole& Console() { return *mConsole; }
-    static std::string ServerVersionString();
+    static std::string ServerVersion() { return "2.3.2"; }
-    static const Version& ServerVersion() { return mVersion; }
+    static std::string ClientVersion() { return "2.0"; }
-    static uint8_t ClientMajorVersion() { return 2; }
     static std::string PPS() { return mPPS; }
     static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }
 
-    static TSettings Settings;
+    static inline 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 GetBackendHostname() { return "backend.beammp.com"; }
+    static std::string GetBackup1Hostname() { return "backup1.beammp.com"; }
+    static std::string GetBackup2Hostname() { return "backup2.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 std::array<int, 3> VersionStrToInts(const std::string& str);
-    static bool IsOutdated(const Version& Current, const Version& Newest);
+    static bool IsOutdated(const std::array<int, 3>& Current, const std::array<int, 3>& Newest);
-    static bool IsShuttingDown();
-    static void SleepSafeSeconds(size_t Seconds);
-
-    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 void SetShutdown(bool Val);
-
-    static inline SystemStatusMap mSystemStatusMap {};
-    static inline std::mutex mSystemStatusMapMutex {};
     static inline std::string mPPS;
-    static inline std::unique_ptr<TConsole> mConsole;
+    static std::unique_ptr<TConsole> mConsole;
-    static inline std::shared_mutex mShutdownMtx {};
-    static inline bool mShutdown { false };
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
-
-    static inline Version mVersion { 3, 1, 2 };
 };
 
 std::string ThreadName(bool DebugModeOverride = false);
 void RegisterThread(const std::string& str);
 #define RegisterThreadAuto() RegisterThread(__func__)
 
-#define KB 1024llu
+#define KB 1024
-#define MB (KB * 1024llu)
+#define MB (KB * 1024)
-#define GB (MB * 1024llu)
 #define SSU_UNRAW SECRET_SENTRY_URL
 
 #define _file_basename std::filesystem::path(__FILE__).filename().string()
 #define _line std::to_string(__LINE__)
 #define _in_lambda (std::string(__func__) == "operator()")
 
-// for those times when you just need to ignore something :^)
+// we would like the full function signature 'void a::foo() const'
-// explicity disables a [[nodiscard]] warning
+// on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
-#define beammp_ignore(x) (void)x
+// feel free to add more
-
+#if defined(WIN32)
-// clang-format off
+#define _function_name std::string(__FUNCSIG__)
-#ifdef DOCTEST_CONFIG_DISABLE
+#elif defined(__unix) || defined(__unix__)
-
+#define _function_name std::string(__PRETTY_FUNCTION__)
-    // we would like the full function signature 'void a::foo() const'
-    // on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
-    // feel free to add more
-    #if defined(WIN32)
-        #define _function_name std::string(__FUNCSIG__)
-    #elif defined(__unix) || defined(__unix__)
-        #define _function_name std::string(__PRETTY_FUNCTION__)
-    #else
-        #define _function_name std::string(__func__)
-    #endif
-    
-    #ifndef NDEBUG
-        #define DEBUG
-    #endif
-    
-    #if defined(DEBUG)
-        
-        // if this is defined, we will show the full function signature infront of
-        // each info/debug/warn... call instead of the 'filename:line' format.
-        #if defined(BMP_FULL_FUNCTION_NAMES)
-            #define _this_location (ThreadName() + _function_name + " ")
-        #else
-            #define _this_location (ThreadName() + _file_basename + ":" + _line + " ")
-        #endif
-
-    #endif // defined(DEBUG)
-    
-    #define beammp_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)
-    // 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)
-    
-    #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
-    #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
-    #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
-    #define beammp_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
-    #define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
-    #define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
-    #define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
-
-#else // DOCTEST_CONFIG_DISABLE
-
-    #define beammp_error(x) /* x */
-    #define beammp_lua_error(x) /* x */
-    #define beammp_warn(x) /* x */
-    #define beammp_lua_warn(x) /* x */
-    #define beammp_info(x) /* x */
-    #define beammp_event(x) /* x */
-    #define beammp_debug(x) /* x */
-    #define beammp_trace(x) /* x */
-    #define luaprint(x) /* x */
-    #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
-    #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
-    #define beammp_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
-    #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
-    #define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
-    #define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
-    #define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-#if defined(DEBUG)
-    #define SU_RAW SSU_UNRAW
 #else
-    #define SU_RAW RAWIFY(SSU_UNRAW)
+#define _function_name std::string(__func__)
-    #define _this_location (ThreadName())
 #endif
 
-// clang-format on
+#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 warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
+#define info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
+#define error(x)                                                                      \
+    do {                                                                              \
+        Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
+        Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                        \
+    } while (false)
+#define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
+#define debug(x)                                                                          \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
+        }                                                                                 \
+    } while (false)
+// trace() is a debug-build debug()
+#if defined(DEBUG)
+#define trace(x)                                                                          \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
+        }                                                                                 \
+    } while (false)
+#else
+#define trace(x)
+#endif // defined(DEBUG)
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg);
 
 #define Biggest 30000
+std::string Comp(std::string Data);
+std::string DeComp(std::string Compressed);
 
-template <typename T>
-inline T Comp(const T& Data) {
-    std::array<char, Biggest> C {};
-    // obsolete
-    C.fill(0);
-    z_stream defstream;
-    defstream.zalloc = nullptr;
-    defstream.zfree = nullptr;
-    defstream.opaque = nullptr;
-    defstream.avail_in = uInt(Data.size());
-    defstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Data[0]));
-    defstream.avail_out = Biggest;
-    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
-    deflateInit(&defstream, Z_BEST_COMPRESSION);
-    deflate(&defstream, Z_SYNC_FLUSH);
-    deflate(&defstream, Z_FINISH);
-    deflateEnd(&defstream);
-    size_t TotalOut = defstream.total_out;
-    T Ret;
-    Ret.resize(TotalOut);
-    std::fill(Ret.begin(), Ret.end(), 0);
-    std::copy_n(C.begin(), TotalOut, Ret.begin());
-    return Ret;
-}
-
-template <typename T>
-inline T DeComp(const T& Compressed) {
-    std::array<char, Biggest> C {};
-    // not needed
-    C.fill(0);
-    z_stream infstream;
-    infstream.zalloc = nullptr;
-    infstream.zfree = nullptr;
-    infstream.opaque = nullptr;
-    infstream.avail_in = Biggest;
-    infstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Compressed[0]));
-    infstream.avail_out = Biggest;
-    infstream.next_out = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(C.data()));
-    inflateInit(&infstream);
-    inflate(&infstream, Z_SYNC_FLUSH);
-    inflate(&infstream, Z_FINISH);
-    inflateEnd(&infstream);
-    size_t TotalOut = infstream.total_out;
-    T Ret;
-    Ret.resize(TotalOut);
-    std::fill(Ret.begin(), Ret.end(), 0);
-    std::copy_n(C.begin(), TotalOut, Ret.begin());
-    return Ret;
-}
-
-std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW

include/Compat.h

@@ -1,27 +1,36 @@
 #pragma once
 
-#include "Environment.h"
-
 // ======================= UNIX ========================
 
-#ifdef BEAMMP_LINUX
+#ifdef __unix
-#include <errno.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+using SOCKET = int;
+using DWORD = unsigned long;
+using PDWORD = unsigned long*;
+using LPDWORD = unsigned long*;
 char _getch();
+inline void CloseSocketProper(int TheSocket) {
+    shutdown(TheSocket, SHUT_RDWR);
+    close(TheSocket);
+}
 #endif // unix
 
-// ======================= APPLE ========================
+// ======================= WIN32 =======================
 
-#ifdef BEAMMP_APPLE
+#ifdef WIN32
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-char _getch();
-#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
+
+// ======================= OTHER =======================
+
+#if !defined(WIN32) && !defined(__unix)
+#error "OS not supported"
+#endif

include/Cryptography.h

@@ -91,14 +91,14 @@ static auto w_printf_s = [](const char* fmt, ...) {
     va_end(args);
 };
 
-static auto w_sprintf_s = [](char* buf, size_t, const char* fmt, ...) {
+static auto w_sprintf_s = [](char* buf, size_t buf_size, 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, ...) {
+static auto w_sprintf_s_ret = [](char* buf, size_t buf_size, const char* fmt, ...) {
     int ret;
     va_list args;
     va_start(args, fmt);

include/CustomAssert.h

@@ -55,20 +55,19 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
     }
 }
 
-#define beammp_assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
+#define Assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
-#define beammp_assert_not_reachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
+#define AssertNotReachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
 #else
-#define beammp_assert(cond)                                                            \
+// In release build, these macros turn into NOPs. The compiler will optimize these out.
-    do {                                                                               \
+#define Assert(cond)                                                  \
-        bool result = (cond);                                                          \
+    do {                                                              \
-        if (!result) {                                                                 \
+        bool result = (cond);                                         \
-            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
+        if (!result) {                                                \
-            Sentry.LogAssert(#cond, _file_basename, _line, __func__);                  \
+            Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
-        }                                                                              \
+        }                                                             \
     } while (false)
-#define beammp_assert_not_reachable()                                                      \
+#define AssertNotReachable()                                                      \
-    do {                                                                                   \
+    do {                                                                          \
-        beammp_errorf("Assertion failed in '{}:{}': Unreachable code reached. This may result in a crash or undefined state of the program.", __func__, _line); \
+        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__); \
-        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__);          \
     } while (false)
 #endif // DEBUG

include/Environment.h

@@ -1,17 +0,0 @@
-#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

@@ -1,42 +1,12 @@
 #pragma once
 
-#include <Common.h>
-#include <IThreaded.h>
-#include <filesystem>
 #include <string>
 #include <unordered_map>
 
-#if defined(BEAMMP_LINUX)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#include <httplib.h>
-#if defined(BEAMMP_LINUX)
-#pragma GCC diagnostic pop
-#endif
-
-namespace fs = std::filesystem;
-
 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 = {});
+std::string POST(const std::string& host, const std::string& target, const std::unordered_map<std::string, std::string>& fields, const std::string& body, bool json, int* status = nullptr);
 namespace Status {
     std::string ToString(int code);
 }
-const std::string ErrorString = "-1";
-
-namespace Server {
-    class THttpServerInstance {
-    public:
-        THttpServerInstance();
-
-    protected:
-        void operator()();
-
-    private:
-        std::thread mThread;
-    };
-}
 }

include/IThreaded.h

@@ -8,11 +8,6 @@ public:
     IThreaded()
         // invokes operator() on this object
         : mThread() { }
-    ~IThreaded() noexcept {
-        if (mThread.joinable()) {
-            mThread.join();
-        }
-    }
 
     virtual void Start() final {
         mThread = std::thread([this] { (*this)(); });

include/LuaAPI.h

@@ -1,48 +0,0 @@
-#pragma once
-
-#include "TLuaEngine.h"
-#include <tuple>
-
-namespace LuaAPI {
-int PanicHandler(lua_State* State);
-std::string LuaToString(const 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();
-    std::pair<bool, std::string> TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
-    std::pair<bool, std::string> TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
-    inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
-    std::pair<bool, std::string> DropPlayer(int ID, std::optional<std::string> MaybeReason);
-    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
-    std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);
-    void Set(int ConfigID, sol::object NewValue);
-    bool IsPlayerGuest(int ID);
-    bool IsPlayerConnected(int ID);
-    void Sleep(size_t Ms);
-    void PrintRaw(sol::variadic_args);
-    std::string JsonEncode(const sol::table& object);
-    std::string JsonDiff(const std::string& a, const std::string& b);
-    std::string JsonDiffApply(const std::string& data, const std::string& patch);
-    std::string JsonPrettify(const std::string& json);
-    std::string JsonMinify(const std::string& json);
-    std::string JsonFlatten(const std::string& json);
-    std::string JsonUnflatten(const std::string& json);
-}
-
-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);
-}
-}

include/SocketIO.h

@@ -0,0 +1,69 @@
+#pragma once
+
+#include <atomic>
+#include <deque>
+#include <mutex>
+#include <sio_client.h>
+#include <thread>
+#include <memory>
+
+/*
+ * We send relevant server events over socket.io to the backend.
+ *
+ * We send all events to `backend.beammp.com`, to the room `/key` 
+ * where `key` is the currently active auth-key. 
+ */
+
+enum class SocketIOEvent {
+    ConsoleOut,
+    CPUUsage,
+    MemoryUsage,
+    NetworkUsage,
+    PlayerList,
+};
+
+enum class SocketIORoom {
+    None,
+    Stats,
+    Player,
+    Info,
+    Console,
+};
+
+class SocketIO final {
+private:
+    struct Event;
+
+public:
+    enum class EventType {
+    };
+
+    // Singleton pattern
+    static SocketIO& Get();
+
+    void Emit(SocketIOEvent Event, const std::string& Data);
+
+    ~SocketIO();
+
+    void SetAuthenticated(bool auth) { mAuthenticated = auth; }
+
+private:
+    SocketIO() noexcept;
+
+    void ThreadMain();
+
+    struct Event {
+        std::string Name;
+        std::string Data;
+    };
+
+    bool mAuthenticated { false };
+    sio::client mClient;
+    std::thread mThread;
+    std::atomic_bool mCloseThread { false };
+    std::mutex mQueueMutex;
+    std::deque<Event> mQueue;
+
+    friend std::unique_ptr<SocketIO> std::make_unique<SocketIO>();
+};
+

include/TConfig.h

@@ -3,31 +3,19 @@
 #include "Common.h"
 
 #include <atomic>
-#include <filesystem>
-
-#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);
+    explicit TConfig();
 
     [[nodiscard]] bool Failed() const { return mFailed; }
 
-    void FlushToFile();
-
 private:
-    void CreateConfigFile();
+    void CreateConfigFile(std::string_view name);
     void ParseFromFile(std::string_view name);
     void PrintDebug();
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, 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

@@ -1,16 +1,10 @@
 #pragma once
 
+#include "commandline/commandline.h"
+#include "TLuaFile.h"
 #include "Cryptography.h"
-#include "commandline.h"
 #include <atomic>
 #include <fstream>
-#include <functional>
-#include <string>
-#include <tuple>
-#include <unordered_map>
-#include <vector>
-
-class TLuaEngine;
 
 class TConsole {
 public:
@@ -19,50 +13,8 @@ public:
     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);
+    std::unique_ptr<TLuaFile> mLuaConsole { nullptr };
-    void ChangeToLuaConsole(const std::string& LuaStateId);
-    void ChangeToRegularConsole();
-    void HandleLuaInternalCommand(const std::string& cmd);
-
-    void Command_Lua(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Help(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Kick(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_List(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Status(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Settings(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Clear(const std::string&, const std::vector<std::string>& args);
-
-    void Command_Say(const std::string& FullCommand);
-    bool EnsureArgsCount(const std::vector<std::string>& args, size_t n);
-    bool EnsureArgsCount(const std::vector<std::string>& args, size_t min, size_t max);
-
-    static std::tuple<std::string, std::vector<std::string>> ParseCommand(const std::string& cmd);
-    static std::string ConcatArgs(const std::vector<std::string>& args, char space = ' ');
-
-    std::unordered_map<std::string, std::function<void(const std::string&, const std::vector<std::string>&)>> mCommandMap = {
-        { "lua", [this](const auto& a, const auto& b) { Command_Lua(a, b); } },
-        { "help", [this](const auto& a, const auto& b) { Command_Help(a, b); } },
-        { "kick", [this](const auto& a, const auto& b) { Command_Kick(a, b); } },
-        { "list", [this](const auto& a, const auto& b) { Command_List(a, b); } },
-        { "status", [this](const auto& a, const auto& b) { Command_Status(a, b); } },
-        { "settings", [this](const auto& a, const auto& b) { Command_Settings(a, b); } },
-        { "clear", [this](const auto& a, const auto& b) { Command_Clear(a, b); } },
-        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
-    };
-
     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

@@ -15,6 +15,7 @@ private:
     std::string GenerateCall();
     std::string GetPlayers();
 
+    bool mShutdown = false;
     TResourceManager& mResourceManager;
     TServer& mServer;
-};
+};

include/TLuaEngine.h

@@ -1,273 +1,39 @@
 #pragma once
 
-#include "TNetwork.h"
+#include "Common.h"
+#include "IThreaded.h"
+#include "TLuaFile.h"
 #include "TServer.h"
-#include <any>
-#include <condition_variable>
-#include <filesystem>
-#include <initializer_list>
-#include <list>
 #include <lua.hpp>
 #include <memory>
-#include <mutex>
+#include <optional>
-#include <queue>
-#include <random>
 #include <set>
-#include <toml11/toml.hpp>
-#include <unordered_map>
-#include <vector>
 
-#define SOL_ALL_SAFETIES_ON 1
+class TLuaEngine : public IThreaded {
-#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, std::unordered_map<std::string, std::string>>;
-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;
-static constexpr size_t TLuaArgTypes_StringStringMap = 4;
-
-class TLuaPlugin;
-
-struct TLuaResult {
-    bool Ready;
-    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
-    // TODO: Build a better toml serializer, or some way to do this in an easier way
-};
-
-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 TLuaEngine : public std::enable_shared_from_this<TLuaEngine>, IThreaded {
 public:
-    enum CallStrategy : int {
+    explicit TLuaEngine(TServer& Server, TNetwork& Network);
-        BestEffort,
-        Precise,
-    };
 
-    struct QueuedFunction {
+    using TSetOfLuaFile = std::set<std::unique_ptr<TLuaFile>>;
-        std::string FunctionName;
-        std::shared_ptr<TLuaResult> Result;
-        std::vector<TLuaArgTypes> Args;
-        std::string EventName; // optional, may be empty
-    };
-
-    TLuaEngine();
-    virtual ~TLuaEngine() noexcept {
-        beammp_debug("Lua Engine terminated");
-    }
 
     void operator()() override;
 
-    TNetwork& Network() { return *mNetwork; }
+    [[nodiscard]] const TSetOfLuaFile& LuaFiles() const { return mLuaFiles; }
-    TServer& Server() { return *mServer; }
+    [[nodiscard]] TServer& Server() { return mServer; }
+    [[nodiscard]] const TServer& Server() const { return mServer; }
+    [[nodiscard]] TNetwork& Network() { return mNetwork; }
+    [[nodiscard]] const TNetwork& Network() const { return mNetwork; }
 
-    void SetNetwork(TNetwork* Network) { mNetwork = Network; }
+    std::optional<std::reference_wrapper<TLuaFile>> GetScript(lua_State* L);
-    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();
-    }
-    std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names{};
-        for(auto const& [stateId, _ ] : mLuaStates) {
-            names.push_back(stateId);
-        }
-        return names;
-    }
-    size_t GetTimedEventsCount() {
-        std::unique_lock Lock(mTimedEventsMutex);
-        return mTimedEvents.size();
-    }
-    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);
-    /**
-     *
-     * @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
-     */
-    template <typename... ArgsT>
-    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerEvent(const std::string& EventName, TLuaStateId IgnoreId, ArgsT&&... Args) {
-        std::unique_lock Lock(mLuaEventsMutex);
-        beammp_event(EventName);
-        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; //
-    }
-    template <typename... ArgsT>
-    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerLocalEvent(const TLuaStateId& StateId, const std::string& EventName, ArgsT&&... Args) {
-        std::unique_lock Lock(mLuaEventsMutex);
-        beammp_event(EventName + " in '" + StateId + "'");
-        if (mLuaEvents.find(EventName) == mLuaEvents.end()) { // if no event handler is defined for 'EventName', return immediately
-            return {};
-        }
-        std::vector<std::shared_ptr<TLuaResult>> Results;
-        std::vector<TLuaArgTypes> Arguments { TLuaArgTypes { std::forward<ArgsT>(Args) }... };
-        const auto Handlers = GetEventHandlersForState(EventName, StateId);
-        for (const auto& Handler : Handlers) {
-            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments));
-        }
-        return Results;
-    }
-    std::set<std::string> GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId);
-    void CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy);
-    void CancelEventTimers(const std::string& EventName, TLuaStateId StateId);
-    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";
-
-    std::vector<std::string> GetStateGlobalKeysForState(TLuaStateId StateId);
-    std::vector<std::string> GetStateTableKeysForState(TLuaStateId StateId, std::vector<std::string> keys);
-
-    // Debugging functions (slow)
-    std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> Debug_GetEventsForState(TLuaStateId StateId);
-    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueueForState(TLuaStateId StateId);
-    std::vector<QueuedFunction> Debug_GetStateFunctionQueueForState(TLuaStateId StateId);
-    std::vector<TLuaResult> Debug_GetResultsToCheckForState(TLuaStateId StateId);
 
 private:
-    void CollectAndInitPlugins();
+    void FolderList(const std::string& Path, bool HotSwap);
-    void InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config);
+    void RegisterFiles(const fs::path& Path, bool HotSwap);
-    void FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config);
+    bool IsNewFile(const std::string& Path);
-    size_t CalculateMemoryUsage();
 
-    class StateThreadData : IThreaded {
+    TNetwork& mNetwork;
-    public:
+    TServer& mServer;
-        StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
+    std::string mPath;
-        StateThreadData(const StateThreadData&) = delete;
+    bool mShutdown { false };
-        virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
+    TSetOfLuaFile mLuaFiles;
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
+    std::mutex mListMutex;
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy);
-        void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
-        void AddPath(const fs::path& Path); // to be added to path and cpath
-        void operator()() override;
-        sol::state_view State() { return sol::state_view(mState); }
-
-        std::vector<std::string> GetStateGlobalKeys();
-        std::vector<std::string> GetStateTableKeys(const std::vector<std::string>& keys);
-
-        // Debug functions, slow
-        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
-        std::vector<TLuaEngine::QueuedFunction> Debug_GetStateFunctionQueue();
-
-    private:
-        sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
-        sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
-        sol::table Lua_GetPlayerIdentifiers(int ID);
-        sol::table Lua_GetPlayers();
-        std::string Lua_GetPlayerName(int ID);
-        sol::table Lua_GetPlayerVehicles(int ID);
-        std::pair<sol::table, std::string> Lua_GetPositionRaw(int PID, int VID);
-        sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
-        sol::table Lua_JsonDecode(const std::string& str);
-        int Lua_GetPlayerIDByName(const std::string& Name);
-        sol::table Lua_FS_ListFiles(const std::string& Path);
-        sol::table Lua_FS_ListDirectories(const std::string& Path);
-
-        std::string mName;
-        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;
-        std::mt19937 mMersenneTwister;
-        std::uniform_real_distribution<double> mUniformRealDistribution01;
-    };
-
-    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;
-    const 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/TLuaFile.h

@@ -0,0 +1,62 @@
+#ifndef TLUAFILE_H
+#define TLUAFILE_H
+
+#include <any>
+#include <filesystem>
+#include <lua.hpp>
+#include <mutex>
+#include <set>
+#include <string>
+#include <vector>
+
+namespace fs = std::filesystem;
+
+struct TLuaArg {
+    std::vector<std::any> args;
+    void PushArgs(lua_State* State);
+};
+
+class TLuaEngine;
+
+class TLuaFile {
+public:
+    void RegisterEvent(const std::string& Event, const std::string& FunctionName);
+    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();
+    lua_State* GetState();
+    std::string GetOrigin();
+    std::mutex Lock;
+    void Reload();
+    void Init(const std::string& PluginName, const std::string& FileName, fs::file_time_type LastWrote);
+    explicit TLuaFile(TLuaEngine& Engine, bool Console = false);
+    ~TLuaFile();
+    void SetStopThread(bool StopThread) { mStopThread = StopThread; }
+    TLuaEngine& Engine() { return mEngine; }
+    [[nodiscard]] std::string GetPluginName() const;
+    [[nodiscard]] std::string GetFileName() const;
+    [[nodiscard]] const lua_State* GetState() const;
+    [[nodiscard]] bool GetStopThread() const { return mStopThread; }
+    [[nodiscard]] const TLuaEngine& Engine() const { return mEngine; }
+    [[nodiscard]] std::string GetRegistered(const std::string& Event) const;
+
+private:
+    TLuaEngine& mEngine;
+    std::set<std::pair<std::string, std::string>> mRegisteredEvents;
+    lua_State* mLuaState { nullptr };
+    fs::file_time_type mLastWrote;
+    std::string mPluginName {};
+    std::string mFileName {};
+    bool mStopThread = false;
+    bool mConsole = false;
+    void Load();
+    std::mutex mInitMutex;
+};
+
+std::any TriggerLuaEvent(const std::string& Event, bool local, TLuaFile* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);
+
+#endif // TLUAFILE_H

include/TLuaPlugin.h

@@ -1,19 +0,0 @@
-#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

@@ -1,30 +1,26 @@
 #pragma once
 
-#include "BoostAliases.h"
 #include "Compat.h"
 #include "TResourceManager.h"
 #include "TServer.h"
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/udp.hpp>
-
-struct TConnection;
 
 class TNetwork {
 public:
     TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager);
 
-    [[nodiscard]] bool TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync = false);
+    [[nodiscard]] bool TCPSend(TClient& c, const std::string& Data, bool IsSync = false);
-    [[nodiscard]] bool SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync = false);
+    [[nodiscard]] bool SendLarge(TClient& c, std::string Data, bool isSync = false);
-    [[nodiscard]] bool Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync = false);
+    [[nodiscard]] bool Respond(TClient& c, const std::string& MSG, bool Rel, bool isSync = false);
-    std::shared_ptr<TClient> CreateClient(ip::tcp::socket&& TCPSock);
+    std::shared_ptr<TClient> CreateClient(SOCKET TCPSock);
-    std::vector<uint8_t> TCPRcv(TClient& c);
+    std::string TCPRcv(TClient& c);
     void ClientKick(TClient& c, const std::string& R);
     [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
-    void Identify(TConnection&& client);
+    void Identify(SOCKET TCPSock);
-    std::shared_ptr<TClient> Authentication(TConnection&& ClientConnection);
+    void Authentication(SOCKET TCPSock);
+    [[nodiscard]] bool CheckBytes(TClient& c, int32_t BytesRcv);
     void SyncResources(TClient& c);
-    [[nodiscard]] bool UDPSend(TClient& Client, std::vector<uint8_t> Data);
+    [[nodiscard]] bool UDPSend(TClient& Client, std::string Data) const;
-    void SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self, bool Rel);
+    void SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel);
     void UpdatePlayer(TClient& Client);
 
 private:
@@ -33,23 +29,21 @@ private:
 
     TServer& mServer;
     TPPSMonitor& mPPSMonitor;
-    ip::udp::socket mUDPSock;
+    SOCKET mUDPSock {};
+    bool mShutdown { false };
     TResourceManager& mResourceManager;
     std::thread mUDPThread;
     std::thread mTCPThread;
 
-    std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
+    std::string UDPRcvFromClient(sockaddr_in& client) const;
-    void HandleDownload(TConnection&& TCPSock);
+    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);
+    void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr, bool kicked);
-    void Parse(TClient& c, const std::vector<uint8_t>& Packet);
+    void Parse(TClient& c, const std::string& Packet);
     void SendFile(TClient& c, const std::string& Name);
-    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
+    static bool TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_t Size);
     static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
-    static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };
-
-std::vector<uint8_t> StringToVector(const std::string& Str);

include/TPPSMonitor.h

@@ -22,5 +22,6 @@ private:
 
     TServer& mServer;
     std::optional<std::reference_wrapper<TNetwork>> mNetwork { std::nullopt };
+    bool mShutdown { false };
     int mInternalPPS { 0 };
-};
+};

include/TPluginMonitor.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "Common.h"
-#include "IThreaded.h"
-
-#include <atomic>
-#include <memory>
-#include <unordered_map>
-
-class TLuaEngine;
-
-class TPluginMonitor : IThreaded, public std::enable_shared_from_this<TPluginMonitor> {
-public:
-    TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine);
-
-    void operator()();
-
-private:
-    std::shared_ptr<TLuaEngine> mEngine;
-    fs::path mPath;
-    std::unordered_map<std::string, fs::file_time_type> mFileTimes;
-};

include/TScopedTimer.h

@@ -1,25 +0,0 @@
-#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/TServer.h

@@ -2,14 +2,11 @@
 
 #include "IThreaded.h"
 #include "RWMutex.h"
-#include "TScopedTimer.h"
 #include <functional>
 #include <memory>
 #include <mutex>
 #include <unordered_set>
 
-#include "BoostAliases.h"
-
 class TClient;
 class TNetwork;
 class TPPSMonitor;
@@ -18,38 +15,23 @@ class TServer final {
 public:
     using TClientSet = std::unordered_set<std::shared_ptr<TClient>>;
 
-    TServer(const std::vector<std::string_view>& Arguments);
+    TServer(int argc, char** argv);
 
     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::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
+    static void GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
     static void HandleEvent(TClient& c, const std::string& Data);
     RWMutex& GetClientMutex() const { return mClientsMutex; }
-
-    const TScopedTimer UptimeTimer;
-
-    // asio io context
-    io_context& IoCtx() { return mIoCtx; }
-
 private:
-    io_context mIoCtx {};
     TClientSet mClients;
     mutable RWMutex mClientsMutex;
     static void ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network);
     static bool ShouldSpawn(TClient& c, const std::string& CarJson, int ID);
     static bool IsUnicycle(TClient& c, const std::string& CarJson);
     static void Apply(TClient& c, int VID, const std::string& pckt);
-    static void HandlePosition(TClient& c, const std::string& Packet);
-};
-
-struct BufferView {
-    uint8_t* Data { nullptr };
-    size_t Size { 0 };
-    const uint8_t* data() const { return Data; }
-    uint8_t* data() { return Data; }
-    size_t size() const { return Size; }
 };

src/ArgsParser.cpp

@@ -1,170 +0,0 @@
-#include "ArgsParser.h"
-#include "Common.h"
-#include <algorithm>
-#include <doctest/doctest.h>
-
-void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
-    for (const auto& Arg : ArgList) {
-        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_errorf("Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
-        }
-    }
-}
-
-bool ArgsParser::Verify() {
-    bool Ok = true;
-    for (const auto& RegisteredArg : mRegisteredArguments) {
-        if (RegisteredArg.Flags & Flags::REQUIRED && !FoundArgument(RegisteredArg.Names)) {
-            beammp_errorf("Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
-            Ok = false;
-            continue;
-        } else if (FoundArgument(RegisteredArg.Names)) {
-            if (RegisteredArg.Flags & Flags::HAS_VALUE) {
-                if (!GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                    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.");
-    }
-}
-
-TEST_CASE("ArgsParser") {
-    ArgsParser parser;
-
-    SUBCASE("Simple args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::NONE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({ "--a", "--hello" });
-        CHECK(parser.Verify());
-        CHECK(parser.FoundArgument({ "a" }));
-        CHECK(parser.FoundArgument({ "hello" }));
-        CHECK(parser.FoundArgument({ "a", "hello" }));
-        CHECK(!parser.FoundArgument({ "b" }));
-        CHECK(!parser.FoundArgument({ "goodbye" }));
-    }
-
-    SUBCASE("No args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::NONE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({});
-        CHECK(parser.Verify());
-        CHECK(!parser.FoundArgument({ "a" }));
-        CHECK(!parser.FoundArgument({ "hello" }));
-        CHECK(!parser.FoundArgument({ "a", "hello" }));
-        CHECK(!parser.FoundArgument({ "b" }));
-        CHECK(!parser.FoundArgument({ "goodbye" }));
-        CHECK(!parser.FoundArgument({ "" }));
-    }
-
-    SUBCASE("Value args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::HAS_VALUE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::HAS_VALUE);
-        parser.Parse({ "--a=5", "--hello=world" });
-        CHECK(parser.Verify());
-        REQUIRE(parser.FoundArgument({ "a" }));
-        REQUIRE(parser.FoundArgument({ "hello" }));
-        CHECK(parser.GetValueOfArgument({ "a" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "a" }).value() == "5");
-        CHECK(parser.GetValueOfArgument({ "hello" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "hello" }).value() == "world");
-    }
-
-    SUBCASE("Mixed value & no-value args") {
-        parser.RegisterArgument({ "a" }, ArgsParser::Flags::HAS_VALUE);
-        parser.RegisterArgument({ "hello" }, ArgsParser::Flags::NONE);
-        parser.Parse({ "--a=5", "--hello" });
-        CHECK(parser.Verify());
-        REQUIRE(parser.FoundArgument({ "a" }));
-        REQUIRE(parser.FoundArgument({ "hello" }));
-        CHECK(parser.GetValueOfArgument({ "a" }).has_value());
-        CHECK(parser.GetValueOfArgument({ "a" }).value() == "5");
-        CHECK(!parser.GetValueOfArgument({ "hello" }).has_value());
-    }
-
-    SUBCASE("Required args") {
-        SUBCASE("Two required, two present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--a", "--hello" });
-            CHECK(parser.Verify());
-        }
-        SUBCASE("Two required, one present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--a" });
-            CHECK(!parser.Verify());
-        }
-        SUBCASE("Two required, none present") {
-            parser.RegisterArgument({ "a" }, ArgsParser::Flags::REQUIRED);
-            parser.RegisterArgument({ "hello" }, ArgsParser::Flags::REQUIRED);
-            parser.Parse({ "--b" });
-            CHECK(!parser.Verify());
-        }
-    }
-}

src/Client.cpp

@@ -1,12 +1,11 @@
 #include "Client.h"
 
 #include "CustomAssert.h"
-#include "TServer.h"
 #include <memory>
-#include <optional>
+
+// FIXME: add debug prints
 
 void TClient::DeleteCar(int Ident) {
-    // TODO: Send delete packets
     std::unique_lock lock(mVehicleDataMutex);
     auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {
         return Ident == elem.ID();
@@ -14,7 +13,7 @@ void TClient::DeleteCar(int Ident) {
     if (iter != mVehicleData.end()) {
         mVehicleData.erase(iter);
     } else {
-        beammp_debug("tried to erase a vehicle that doesn't exist (not an error)");
+        debug("tried to erase a vehicle that doesn't exist (not an error)");
     }
 }
 
@@ -26,7 +25,6 @@ void TClient::ClearCars() {
 int TClient::GetOpenCarID() const {
     int OpenID = 0;
     bool found;
-    std::unique_lock lock(mVehicleDataMutex);
     do {
         found = true;
         for (auto& v : mVehicleData) {
@@ -48,34 +46,6 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {
     return { &mVehicleData, std::unique_lock(mVehicleDataMutex) };
 }
 
-std::string TClient::GetCarPositionRaw(int Ident) {
-    std::unique_lock lock(mVehiclePositionMutex);
-    try {
-        return mVehiclePosition.at(Ident);
-    } catch (const std::out_of_range& oor) {
-        return "";
-    }
-    return "";
-}
-
-void TClient::Disconnect(std::string_view Reason) {
-    beammp_debugf("Disconnecting client {} for reason: {}", GetID(), Reason);
-    boost::system::error_code ec;
-    mSocket.shutdown(socket_base::shutdown_both, ec);
-    if (ec) {
-        beammp_debugf("Failed to shutdown client socket: {}", ec.message());
-    }
-    mSocket.close(ec);
-    if (ec) {
-        beammp_debugf("Failed to close client socket: {}", ec.message());
-    }
-}
-
-void TClient::SetCarPosition(int Ident, const std::string& Data) {
-    std::unique_lock lock(mVehiclePositionMutex);
-    mVehiclePosition[Ident] = Data;
-}
-
 std::string TClient::GetCarData(int Ident) {
     { // lock
         std::unique_lock lock(mVehicleDataMutex);
@@ -110,22 +80,16 @@ TServer& TClient::Server() const {
     return mServer;
 }
 
-void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
+void TClient::EnqueuePacket(const std::string& Packet) {
     std::unique_lock Lock(mMissedPacketsMutex);
     mPacketsSync.push(Packet);
 }
 
-TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
+TClient::TClient(TServer& Server)
     : mServer(Server)
-    , mSocket(std::move(Socket))
-    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
     , mLastPingTime(std::chrono::high_resolution_clock::now()) {
 }
 
-TClient::~TClient() {
-    beammp_debugf("client destroyed: {} ('{}')", this->GetID(), this->GetName());
-}
-
 void TClient::UpdatePingTime() {
     mLastPingTime = std::chrono::high_resolution_clock::now();
 }
@@ -135,19 +99,3 @@ int TClient::SecondsSinceLastPing() {
                        .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

@@ -8,15 +8,12 @@
 #include <regex>
 #include <sstream>
 #include <thread>
+#include <zlib.h>
 
-#include "Compat.h"
 #include "CustomAssert.h"
 #include "Http.h"
 
-// global, yes, this is ugly, no, it cant be done another way
+std::unique_ptr<TConsole> Application::mConsole = std::make_unique<TConsole>();
-TSentry Sentry {};
-
-Application::TSettings Application::Settings = {};
 
 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
     std::unique_lock Lock(mShutdownHandlersMutex);
@@ -26,39 +23,33 @@ void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
 }
 
 void Application::GracefullyShutdown() {
-    SetShutdown(true);
     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");
+            info("hard shutdown forced by multiple shutdown requests");
             std::exit(0);
         }
-        beammp_info("already shutting down!");
+        info("already shutting down!");
         return;
     } else {
         AlreadyShuttingDown = true;
     }
-    beammp_trace("waiting for lock release");
+    trace("waiting for lock release");
     std::unique_lock Lock(mShutdownHandlersMutex);
-    beammp_info("please wait while all subsystems are shutting down...");
+    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");
+        info("Subsystem " + std::to_string(i + 1) + "/" + std::to_string(mShutdownHandlers.size()) + " shutting down");
         mShutdownHandlers[i]();
     }
-    // std::exit(-1);
 }
 
-std::string Application::ServerVersionString() {
+std::array<int, 3> Application::VersionStrToInts(const std::string& str) {
-    return mVersion.AsString();
+    std::array<int, 3> Version;
-}
-
-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) {
+    for (int& i : Version) {
         std::string Part;
         std::getline(ss, Part, '.');
         std::from_chars(&*Part.begin(), &*Part.begin() + Part.size(), i);
@@ -66,170 +57,85 @@ std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
     return Version;
 }
 
-TEST_CASE("Application::VersionStrToInts") {
+bool Application::IsOutdated(const std::array<int, 3>& Current, const std::array<int, 3>& Newest) {
-    auto v = Application::VersionStrToInts("1.2.3");
+    if (Newest[0] > Current[0]) {
-    CHECK(v[0] == 1);
-    CHECK(v[1] == 2);
-    CHECK(v[2] == 3);
-
-    v = Application::VersionStrToInts("10.20.30");
-    CHECK(v[0] == 10);
-    CHECK(v[1] == 20);
-    CHECK(v[2] == 30);
-
-    v = Application::VersionStrToInts("100.200.255");
-    CHECK(v[0] == 100);
-    CHECK(v[1] == 200);
-    CHECK(v[2] == 255);
-}
-
-bool Application::IsOutdated(const Version& Current, const Version& Newest) {
-    if (Newest.major > Current.major) {
         return true;
-    } else if (Newest.major == Current.major && Newest.minor > Current.minor) {
+    } else if (Newest[0] == Current[0] && Newest[1] > Current[1]) {
         return true;
-    } else if (Newest.major == Current.major && Newest.minor == Current.minor && Newest.patch > Current.patch) {
+    } else if (Newest[0] == Current[0] && Newest[1] == Current[1] && Newest[2] > Current[2]) {
         return true;
     } else {
         return false;
     }
 }
 
-bool Application::IsShuttingDown() {
-    std::shared_lock Lock(mShutdownMtx);
-    return mShutdown;
-}
-
-void Application::SleepSafeSeconds(size_t Seconds) {
-    // Sleeps for 500 ms, checks if a shutdown occurred, and so forth
-    for (size_t i = 0; i < Seconds * 2; ++i) {
-        if (Application::IsShuttingDown()) {
-            return;
-        } else {
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        }
-    }
-}
-
-TEST_CASE("Application::IsOutdated (version check)") {
-    SUBCASE("Same version") {
-        CHECK(!Application::IsOutdated({ 1, 2, 3 }, { 1, 2, 3 }));
-    }
-    // we need to use over 1-2 digits to test against lexical comparisons
-    SUBCASE("Patch outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Minor outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor + 1), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Major outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("All outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor + 1), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-}
-
-void Application::SetSubsystemStatus(const std::string& Subsystem, Status status) {
-    switch (status) {
-    case Status::Good:
-        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;
-    default:
-        beammp_assert_not_reachable();
-    }
-    std::unique_lock Lock(mSystemStatusMapMutex);
-    mSystemStatusMap[Subsystem] = status;
-}
-
-void Application::SetShutdown(bool Val) {
-    std::unique_lock Lock(mShutdownMtx);
-    mShutdown = Val;
-}
-
-TEST_CASE("Application::SetSubsystemStatus") {
-    Application::SetSubsystemStatus("Test", Application::Status::Good);
-    auto Map = Application::GetSubsystemStatuses();
-    CHECK(Map.at("Test") == Application::Status::Good);
-    Application::SetSubsystemStatus("Test", Application::Status::Bad);
-    Map = Application::GetSubsystemStatuses();
-    CHECK(Map.at("Test") == Application::Status::Bad);
-}
-
 void Application::CheckForUpdates() {
-    Application::SetSubsystemStatus("UpdateCheck", Application::Status::Starting);
-    static bool FirstTime = true;
     // checks current version against latest version
     std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
-    for (const auto& url : GetBackendUrlsInOrder()) {
+    auto Response = Http::GET(GetBackendHostname(), 443, "/v/s");
-        auto Response = Http::GET(url, 443, "/v/s");
+    bool Matches = std::regex_match(Response, VersionRegex);
-        bool Matches = std::regex_match(Response, VersionRegex);
+    if (Matches) {
-        if (Matches) {
+        auto MyVersion = VersionStrToInts(ServerVersion());
-            auto MyVersion = ServerVersion();
+        auto RemoteVersion = VersionStrToInts(Response);
-            auto RemoteVersion = Version(VersionStrToInts(Response));
+        if (IsOutdated(MyVersion, RemoteVersion)) {
-            if (IsOutdated(MyVersion, RemoteVersion)) {
+            std::string RealVersionString = std::to_string(RemoteVersion[0]) + ".";
-                std::string RealVersionString = RemoteVersion.AsString();
+            RealVersionString += std::to_string(RemoteVersion[1]) + ".";
-                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));
+            RealVersionString += std::to_string(RemoteVersion[2]);
-            } else {
+            warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION OUT! There's a new version (v" + RealVersionString + ") of the BeamMP-Server available! For more info visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server." + std::string(ANSI_RESET));
-                if (FirstTime) {
-                    beammp_info("Server up-to-date!");
-                }
-            }
-            Application::SetSubsystemStatus("UpdateCheck", Application::Status::Good);
-            break;
         } else {
-            if (FirstTime) {
+            info("Server up-to-date!");
-                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);
-            }
         }
+    } else {
+        warn("Unable to fetch version from backend.");
+        trace("got " + Response);
+        auto Lock = Sentry.CreateExclusiveContext();
+        Sentry.SetContext("get-response", { { "response", Response } });
+        Sentry.LogError("failed to get server version", _file_basename, _line);
     }
-    if (Application::GetSubsystemStatuses().at("UpdateCheck") == Application::Status::Bad) {
+}
-        if (FirstTime) {
+
-            beammp_warn("Unable to fetch version info from backend.");
+std::string Comp(std::string Data) {
-        }
+    std::array<char, Biggest> C {};
-    }
+    // obsolete
-    FirstTime = false;
+    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;
 }
 
 // thread name stuff
@@ -249,108 +155,19 @@ std::string ThreadName(bool DebugModeOverride) {
     return "";
 }
 
-TEST_CASE("ThreadName") {
-    RegisterThread("MyThread");
-    auto OrigDebug = Application::Settings.DebugModeEnabled;
-
-    // ThreadName adds a space at the end, legacy but we need it still
-    SUBCASE("Debug mode enabled") {
-        Application::Settings.DebugModeEnabled = true;
-        CHECK(ThreadName(true) == "MyThread ");
-        CHECK(ThreadName(false) == "MyThread ");
-    }
-    SUBCASE("Debug mode disabled") {
-        Application::Settings.DebugModeEnabled = false;
-        CHECK(ThreadName(true) == "MyThread ");
-        CHECK(ThreadName(false) == "");
-    }
-    // cleanup
-    Application::Settings.DebugModeEnabled = OrigDebug;
-}
-
 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;
 }
 
-TEST_CASE("RegisterThread") {
-    RegisterThread("MyThread");
-    CHECK(threadNameMap.at(std::this_thread::get_id()) == "MyThread");
-}
-
-Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
-    : major(major)
-    , minor(minor)
-    , patch(patch) { }
-
-Version::Version(const std::array<uint8_t, 3>& v)
-    : Version(v[0], v[1], v[2]) {
-}
-
-std::string Version::AsString() {
-    return fmt::format("{:d}.{:d}.{:d}", major, minor, patch);
-}
-
-TEST_CASE("Version::AsString") {
-    CHECK(Version { 0, 0, 0 }.AsString() == "0.0.0");
-    CHECK(Version { 1, 2, 3 }.AsString() == "1.2.3");
-    CHECK(Version { 255, 255, 255 }.AsString() == "255.255.255");
-}
-
 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    if (Application::Settings.LogChat) {
+    std::stringstream ss;
-        std::stringstream ss;
+    ss << "[CHAT] ";
-        ss << ThreadName();
+    if (id != -1) {
-        ss << "[CHAT] ";
+        ss << "(" << id << ") <" << name << ">";
-        if (id != -1) {
-            ss << "(" << id << ") <" << name << "> ";
-        } else {
-            ss << name << "";
-        }
-        ss << msg;
-#ifdef DOCTEST_CONFIG_DISABLE
-        Application::Console().Write(ss.str());
-#endif
-    }
-}
-
-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());
+        ss << name << "";
     }
-#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+    ss << msg;
-    return std::strerror(errno);
+    Application::Console().Write(ss.str());
-#else
-    return "(no human-readable errors on this platform)";
-#endif
 }

src/Compat.cpp

@@ -1,13 +1,10 @@
 #include "Compat.h"
 
-#include <cstring>
-#include <doctest/doctest.h>
-
 #ifndef WIN32
 
 static struct termios old, current;
 
-static void initTermios(int echo) {
+void initTermios(int echo) {
     tcgetattr(0, &old); /* grab old terminal i/o settings */
     current = old; /* make new settings same as old settings */
     current.c_lflag &= ~ICANON; /* disable buffered i/o */
@@ -19,40 +16,14 @@ static void initTermios(int echo) {
     tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
 }
 
-static void resetTermios(void) {
+void resetTermios(void) {
     tcsetattr(0, TCSANOW, &old);
 }
 
-TEST_CASE("init and reset termios") {
+char getch_(int echo) {
-    if (isatty(STDIN_FILENO)) {
-        struct termios original;
-        tcgetattr(0, &original);
-        SUBCASE("no echo") {
-            initTermios(false);
-        }
-        SUBCASE("yes echo") {
-            initTermios(true);
-        }
-        resetTermios();
-        struct termios current;
-        tcgetattr(0, &current);
-        CHECK_EQ(std::memcmp(&current.c_cc, &original.c_cc, sizeof(current.c_cc)), 0);
-        CHECK_EQ(current.c_cflag, original.c_cflag);
-        CHECK_EQ(current.c_iflag, original.c_iflag);
-        CHECK_EQ(current.c_ispeed, original.c_ispeed);
-        CHECK_EQ(current.c_lflag, original.c_lflag);
-        CHECK_EQ(current.c_line, original.c_line);
-        CHECK_EQ(current.c_oflag, original.c_oflag);
-        CHECK_EQ(current.c_ospeed, original.c_ospeed);
-    }
-}
-
-static char getch_(int echo) {
     char ch;
     initTermios(echo);
-    if (read(STDIN_FILENO, &ch, 1) < 0) {
+    read(STDIN_FILENO, &ch, 1);
-        // ignore, not much we can do
-    }
     resetTermios();
     return ch;
 }

src/Http.cpp

@@ -1,55 +1,216 @@
 #include "Http.h"
 
-#include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
+#undef error
-#include "LuaAPI.h"
 
+#include <boost/asio/connect.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/beast.hpp>
+#include <boost/beast/ssl.hpp>
 #include <map>
-#include <nlohmann/json.hpp>
-#include <random>
-#include <stdexcept>
 
-// TODO: Add sentry error handling back
+namespace beast = boost::beast; // from <boost/beast.hpp>
-
+namespace http = beast::http; // from <boost/beast/http.hpp>
-using json = nlohmann::json;
+namespace net = boost::asio; // from <boost/asio.hpp>
+namespace ssl = net::ssl; // from <boost/asio/ssl.hpp>
+using tcp = net::ip::tcp; // from <boost/asio/ip/tcp.hpp>
 
 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
-    httplib::SSLClient client(host, port);
+    try {
-    client.enable_server_certificate_verification(false);
+        // Check command line arguments.
-    client.set_address_family(AF_INET);
+        int version = 11;
-    auto res = client.Get(target.c_str());
+
-    if (res) {
+        // The io_context is required for all I/O
-        if (status) {
+        net::io_context ioc;
-            *status = res->status;
+
+        // The SSL context is required, and holds certificates
+        ssl::context ctx(ssl::context::tlsv12_client);
+
+        // This holds the root certificate used for verification
+        // we don't do / have this
+        // load_root_certificates(ctx);
+
+        // Verify the remote server's certificate
+        ctx.set_verify_mode(ssl::verify_none);
+
+        // These objects perform our I/O
+        tcp::resolver resolver(ioc);
+        beast::ssl_stream<beast::tcp_stream> stream(ioc, ctx);
+
+        // Set SNI Hostname (many hosts need this to handshake successfully)
+        if (!SSL_set_tlsext_host_name(stream.native_handle(), host.c_str())) {
+            beast::error_code ec { static_cast<int>(::ERR_get_error()), net::error::get_ssl_category() };
+            throw beast::system_error { ec };
         }
-        return res->body;
+
-    } else {
+        // Look up the domain name
-        return Http::ErrorString;
+        auto const results = resolver.resolve(host.c_str(), std::to_string(port));
+
+        // Make the connection on the IP address we get from a lookup
+        beast::get_lowest_layer(stream).connect(results);
+
+        // Perform the SSL handshake
+        stream.handshake(ssl::stream_base::client);
+
+        // Set up an HTTP GET request message
+        http::request<http::string_body> req { http::verb::get, target, version };
+        req.set(http::field::host, host);
+
+        req.set(http::field::user_agent, BOOST_BEAST_VERSION_STRING);
+
+        // Send the HTTP request to the remote host
+        http::write(stream, req);
+
+        // This buffer is used for reading and must be persisted
+        beast::flat_buffer buffer;
+
+        // Declare a container to hold the response
+        http::response<http::string_body> res;
+
+        // Receive the HTTP response
+        http::read(stream, buffer, res);
+
+        // Gracefully close the stream
+        beast::error_code ec;
+        stream.shutdown(ec);
+        if (ec == net::error::eof) {
+            // Rationale:
+            // http://stackoverflow.com/questions/25587403/boost-asio-ssl-async-shutdown-always-finishes-with-an-error
+            ec = {};
+        }
+
+        if (status) {
+            *status = res.base().result_int();
+        }
+
+        // ignore ec
+
+        // If we get here then the connection is closed gracefully
+        return std::string(res.body());
+    } catch (std::exception const& e) {
+        Application::Console().Write(__func__ + std::string(": ") + e.what());
+        return "-1";
     }
 }
 
-std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
+std::string Http::POST(const std::string& host, const std::string& target, const std::unordered_map<std::string, std::string>& fields, const std::string& body, bool json, int* status) {
-    httplib::SSLClient client(host, port);
+    try {
-    client.set_read_timeout(std::chrono::seconds(10));
+        net::io_context io;
-    beammp_assert(client.is_valid());
+
-    client.enable_server_certificate_verification(false);
+        // The SSL context is required, and holds certificates
-    client.set_address_family(AF_INET);
+        ssl::context ctx(ssl::context::tlsv13);
-    auto res = client.Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
+
-    if (res) {
+        ctx.set_verify_mode(ssl::verify_none);
-        if (status) {
+
-            *status = res->status;
+        tcp::resolver resolver(io);
+        beast::ssl_stream<beast::tcp_stream> stream(io, ctx);
+        decltype(resolver)::results_type results;
+        auto try_connect_with_protocol = [&](tcp protocol) {
+            try {
+                results = resolver.resolve(protocol, host, std::to_string(443));
+                if (!SSL_set_tlsext_host_name(stream.native_handle(), host.c_str())) {
+                    boost::system::error_code ec { static_cast<int>(::ERR_get_error()), boost::asio::error::get_ssl_category() };
+                    // FIXME: we could throw and crash, if we like
+                    // throw boost::system::system_error { ec };
+                    //debug("POST " + host + target + " failed.");
+                    return false;
+                }
+                beast::get_lowest_layer(stream).connect(results);
+            } catch (const boost::system::system_error&) {
+                return false;
+            }
+            return true;
+        };
+        //bool ok = try_connect_with_protocol(tcp::v6());
+        //if (!ok) {
+        //debug("IPv6 connect failed, trying IPv4");
+        bool ok = try_connect_with_protocol(tcp::v4());
+        if (!ok) {
+            Application::Console().Write("[ERROR] failed to resolve or connect in POST " + host + target);
+            Sentry.AddErrorBreadcrumb("failed to resolve or connect to " + host + target, __FILE__, std::to_string(__LINE__)); // FIXME: this is ugly.
+            return "-1";
         }
-        return res->body;
+        //}
-    } else {
+        stream.handshake(ssl::stream_base::client);
-        beammp_debug("POST failed: " + httplib::to_string(res.error()));
+        http::request<http::string_body> req { http::verb::post, target, 11 /* http 1.1 */ };
-        return Http::ErrorString;
+
+        req.set(http::field::host, host);
+        if (!body.empty()) {
+            if (json) {
+                req.set(http::field::content_type, "application/json");
+            } else {
+                req.set(http::field::content_type, "application/x-www-form-urlencoded");
+            }
+            req.set(http::field::content_length, std::to_string(body.size()));
+            req.body() = body;
+            // info("body is " + body + " (" + req.body() + ")");
+            // info("content size is " + std::to_string(body.size()) + " (" + boost::lexical_cast<std::string>(body.size()) + ")");
+        }
+        for (const auto& pair : fields) {
+            // info("setting " + pair.first + " to " + pair.second);
+            req.set(pair.first, pair.second);
+        }
+
+        std::unordered_map<std::string, std::string> request_data;
+        for (const auto& header : req.base()) {
+            // need to do explicit casts to convert string_view to string
+            // since string_view may not be null-terminated (and in fact isn't, here)
+            std::string KeyString(header.name_string());
+            std::string ValueString(header.value());
+            request_data[KeyString] = ValueString;
+        }
+        Sentry.SetContext("https-post-request-data", request_data);
+
+        std::stringstream oss;
+        oss << req;
+
+        beast::get_lowest_layer(stream).expires_after(std::chrono::seconds(5));
+
+        http::write(stream, req);
+
+        // used for reading
+        beast::flat_buffer buffer;
+        http::response<http::string_body> response;
+
+        http::read(stream, buffer, response);
+
+        std::unordered_map<std::string, std::string> response_data;
+        response_data["reponse-code"] = std::to_string(response.result_int());
+        if (status) {
+            *status = response.result_int();
+        }
+        for (const auto& header : response.base()) {
+            // need to do explicit casts to convert string_view to string
+            // since string_view may not be null-terminated (and in fact isn't, here)
+            std::string KeyString(header.name_string());
+            std::string ValueString(header.value());
+            response_data[KeyString] = ValueString;
+        }
+        Sentry.SetContext("https-post-response-data", response_data);
+
+        std::stringstream result;
+        result << response;
+
+        beast::error_code ec;
+        stream.shutdown(ec);
+        // IGNORING ec
+
+        // info(result.str());
+        std::string debug_response_str;
+        std::getline(result, debug_response_str);
+        //debug("POST " + host + target + ": " + debug_response_str);
+        return std::string(response.body());
+
+    } catch (const std::exception& e) {
+        Application::Console().Write(e.what());
+        Sentry.AddErrorBreadcrumb(e.what(), __FILE__, std::to_string(__LINE__)); // FIXME: this is ugly.
+        return "-1";
     }
 }
 
 // RFC 2616, RFC 7231
 static std::map<size_t, const char*> Map = {
-    { -1, "Invalid Response Code" },
+    { -1, "Invalid Response Code"},
     { 100, "Continue" },
     { 101, "Switching Protocols" },
     { 102, "Processing" },
@@ -124,82 +285,10 @@ static std::map<size_t, const char*> Map = {
     { 530, "(CDN) 1XXX Internal Error" },
 };
 
-static const char Magic[] = {
+std::string Http::Status::ToString(int code) {
-    0x20, 0x2f, 0x5c, 0x5f,
+    if (Map.find(code) != Map.end()) {
-    0x2f, 0x5c, 0x0a, 0x28,
+        return Map.at(code);
-    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);
+        return std::to_string(code);
     }
 }
-
-TEST_CASE("Http::Status::ToString") {
-    CHECK(Http::Status::ToString(200) == "OK");
-    CHECK(Http::Status::ToString(696969) == "696969");
-    CHECK(Http::Status::ToString(-1) == "Invalid Response Code");
-}
-
-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;
-    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;
-            default:
-                beammp_assert_not_reachable();
-            }
-        }
-        res.set_content(
-            json {
-                { "ok", SystemsBad == 0 },
-            }
-                .dump(),
-            "application/json");
-        res.status = 200;
-    });
-    // 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/LuaAPI.cpp

@@ -1,680 +0,0 @@
-#include "LuaAPI.h"
-#include "Client.h"
-#include "Common.h"
-#include "CustomAssert.h"
-#include "TLuaEngine.h"
-
-#include <nlohmann/json.hpp>
-
-#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();
-    }
-    case sol::type::poly:
-        return "<poly>";
-    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);
-}
-
-TEST_CASE("LuaAPI::MP::GetServerVersion") {
-    const auto [ma, mi, pa] = LuaAPI::MP::GetServerVersion();
-    const auto real = Application::ServerVersion();
-    CHECK(ma == real.major);
-    CHECK(mi == real.minor);
-    CHECK(pa == real.patch);
-}
-
-static inline std::pair<bool, std::string> InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
-    std::string Packet = "E:" + EventName + ":" + Data;
-    if (PlayerID == -1) {
-        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
-        return { true, "" };
-    } else {
-        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
-        if (!MaybeClient || MaybeClient.value().expired()) {
-            beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
-            return { false, "Invalid Player ID" };
-        }
-        auto c = MaybeClient.value().lock();
-        if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
-            beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
-            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
-            return { false, "Respond failed, dropping client" };
-        }
-        return { true, "" };
-    }
-}
-
-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
-    std::string Data = DataObj.as<std::string>();
-    return InternalTriggerClientEvent(PlayerID, EventName, Data);
-}
-
-std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (!MaybeClient || MaybeClient.value().expired()) {
-        beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
-        return { false, "Player does not exist" };
-    }
-    auto c = MaybeClient.value().lock();
-    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
-    return { true, "" };
-}
-
-std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
-    std::pair<bool, std::string> Result;
-    std::string Packet = "C:Server: " + Message;
-    if (ID == -1) {
-        LogChatMessage("<Server> (to everyone) ", -1, Message);
-        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
-        Result.first = true;
-    } else {
-        auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient && !MaybeClient.value().expired()) {
-            auto c = MaybeClient.value().lock();
-            if (!c->IsSynced()) {
-                Result.first = false;
-                Result.second = "Player still syncing data";
-                return Result;
-            }
-            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
-            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
-                beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
-                // TODO: should we return an error here?
-            }
-            Result.first = true;
-        } else {
-            beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
-            Result.first = false;
-            Result.second = "Invalid Player ID";
-        }
-        return Result;
-    }
-    return Result;
-}
-
-std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
-    std::pair<bool, std::string> Result;
-    auto MaybeClient = GetClient(Engine->Server(), PID);
-    if (!MaybeClient || MaybeClient.value().expired()) {
-        beammp_lua_error("RemoveVehicle invalid Player ID");
-        Result.first = false;
-        Result.second = "Invalid Player ID";
-        return Result;
-    }
-    auto c = MaybeClient.value().lock();
-    if (!c->GetCarData(VID).empty()) {
-        std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
-        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
-        c->DeleteCar(VID);
-        Result.first = true;
-    } else {
-        Result.first = false;
-        Result.second = "Vehicle does not exist";
-    }
-    return Result;
-}
-
-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";
-    }
-#ifdef DOCTEST_CONFIG_DISABLE
-    Application::Console().WriteRaw(ToPrint);
-#endif
-}
-
-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(Path, errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-TEST_CASE("LuaAPI::FS::CreateDirectory") {
-    std::string TestDir = "beammp_test_dir";
-    fs::remove_all(TestDir);
-    SUBCASE("Single level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-    }
-    SUBCASE("Multi level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir + "/a/b/c");
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir + "/a/b/c"));
-    }
-    SUBCASE("Already exists") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-        const auto [Ok2, Err2] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok2);
-        CHECK(Err2 == "");
-    }
-    fs::remove_all(TestDir);
-}
-
-std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
-    std::error_code errc;
-    std::pair<bool, std::string> Result;
-    fs::remove(fs::relative(Path), errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-TEST_CASE("LuaAPI::FS::Remove") {
-    const std::string TestFileOrDir = "beammp_test_thing";
-    SUBCASE("Remove existing directory") {
-        fs::create_directory(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    SUBCASE("Remove non-existing directory") {
-        fs::remove_all(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    // TODO: add tests for files
-    // TODO: add tests for files and folders without access permissions (failure)
-}
-
-std::pair<bool, std::string> LuaAPI::FS::Rename(const std::string& Path, const std::string& NewPath) {
-    std::error_code errc;
-    std::pair<bool, std::string> Result;
-    fs::rename(Path, NewPath, errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-TEST_CASE("LuaAPI::FS::Rename") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Rename(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(!fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
-std::pair<bool, std::string> LuaAPI::FS::Copy(const std::string& Path, const std::string& NewPath) {
-    std::error_code errc;
-    std::pair<bool, std::string> Result;
-    fs::copy(Path, NewPath, fs::copy_options::recursive, errc);
-    Result.first = errc == std::error_code {};
-    if (!Result.first) {
-        Result.second = errc.message();
-    }
-    return Result;
-}
-
-TEST_CASE("LuaAPI::FS::Copy") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Copy(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
-bool LuaAPI::FS::Exists(const std::string& Path) {
-    return fs::exists(Path);
-}
-
-TEST_CASE("LuaAPI::FS::Exists") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-
-    CHECK(LuaAPI::FS::Exists(TestDir));
-    CHECK(!LuaAPI::FS::Exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
-std::string LuaAPI::FS::GetFilename(const std::string& Path) {
-    return fs::path(Path).filename().string();
-}
-
-TEST_CASE("LuaAPI::FS::GetFilename") {
-    CHECK(LuaAPI::FS::GetFilename("test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("/test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("place/test.txt") == "test.txt");
-    CHECK(LuaAPI::FS::GetFilename("/some/../place/test.txt") == "test.txt");
-}
-
-std::string LuaAPI::FS::GetExtension(const std::string& Path) {
-    return fs::path(Path).extension().string();
-}
-
-TEST_CASE("LuaAPI::FS::GetExtension") {
-    CHECK(LuaAPI::FS::GetExtension("test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("place/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.txt") == ".txt");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test") == "");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.a.b.c") == ".c");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.") == ".");
-    CHECK(LuaAPI::FS::GetExtension("/some/../place/test.a.b.") == ".");
-}
-
-std::string LuaAPI::FS::GetParentFolder(const std::string& Path) {
-    return fs::path(Path).parent_path().string();
-}
-
-TEST_CASE("LuaAPI::FS::GetParentFolder") {
-    CHECK(LuaAPI::FS::GetParentFolder("test.txt") == "");
-    CHECK(LuaAPI::FS::GetParentFolder("/test.txt") == "/");
-    CHECK(LuaAPI::FS::GetParentFolder("place/test.txt") == "place");
-    CHECK(LuaAPI::FS::GetParentFolder("/some/../place/test.txt") == "/some/../place");
-}
-
-// TODO: add tests
-bool LuaAPI::FS::IsDirectory(const std::string& Path) {
-    return fs::is_directory(Path);
-}
-
-// TODO: add tests
-bool LuaAPI::FS::IsFile(const std::string& Path) {
-    return fs::is_regular_file(Path);
-}
-
-// TODO: add tests
-std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
-    fs::path Path;
-    for (size_t i = 0; i < Args.size(); ++i) {
-        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;
-}
-
-static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, const sol::object& right, bool is_array, size_t depth = 0) {
-    if (depth > 100) {
-        beammp_lua_error("json serialize will not go deeper than 100 nested tables, internal references assumed, aborted this path");
-        return;
-    }
-    std::string key {};
-    switch (left.get_type()) {
-    case sol::type::lua_nil:
-    case sol::type::none:
-    case sol::type::poly:
-    case sol::type::boolean:
-    case sol::type::lightuserdata:
-    case sol::type::userdata:
-    case sol::type::thread:
-    case sol::type::function:
-    case sol::type::table:
-        beammp_lua_error("JsonEncode: left side of table field is unexpected type");
-        return;
-    case sol::type::string:
-        key = left.as<std::string>();
-        break;
-    case sol::type::number:
-        key = std::to_string(left.as<double>());
-        break;
-    default:
-        beammp_assert_not_reachable();
-    }
-    nlohmann::json value;
-    switch (right.get_type()) {
-    case sol::type::lua_nil:
-    case sol::type::none:
-        return;
-    case sol::type::poly:
-        beammp_lua_warn("unsure what to do with poly type in JsonEncode, ignoring");
-        return;
-    case sol::type::boolean:
-        value = right.as<bool>();
-        break;
-    case sol::type::lightuserdata:
-        beammp_lua_warn("unsure what to do with lightuserdata in JsonEncode, ignoring");
-        return;
-    case sol::type::userdata:
-        beammp_lua_warn("unsure what to do with userdata in JsonEncode, ignoring");
-        return;
-    case sol::type::thread:
-        beammp_lua_warn("unsure what to do with thread in JsonEncode, ignoring");
-        return;
-    case sol::type::string:
-        value = right.as<std::string>();
-        break;
-    case sol::type::number:
-        value = right.as<double>();
-        break;
-    case sol::type::function:
-        beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring");
-        return;
-    case sol::type::table: {
-        bool local_is_array = true;
-        for (const auto& pair : right.as<sol::table>()) {
-            if (pair.first.get_type() != sol::type::number) {
-                local_is_array = false;
-            }
-        }
-        for (const auto& pair : right.as<sol::table>()) {
-            JsonEncodeRecursive(value, pair.first, pair.second, local_is_array, depth + 1);
-        }
-        break;
-    }
-    default:
-        beammp_assert_not_reachable();
-    }
-    if (is_array) {
-        json.push_back(value);
-    } else {
-        json[key] = value;
-    }
-}
-
-std::string LuaAPI::MP::JsonEncode(const sol::table& object) {
-    nlohmann::json json;
-    // table
-    bool is_array = true;
-    for (const auto& pair : object.as<sol::table>()) {
-        if (pair.first.get_type() != sol::type::number) {
-            is_array = false;
-        }
-    }
-    for (const auto& entry : object) {
-        JsonEncodeRecursive(json, entry.first, entry.second, is_array);
-    }
-    return json.dump();
-}
-
-std::string LuaAPI::MP::JsonDiff(const std::string& a, const std::string& b) {
-    if (!nlohmann::json::accept(a)) {
-        beammp_lua_error("JsonDiff first argument is not valid json: `" + a + "`");
-        return "";
-    }
-    if (!nlohmann::json::accept(b)) {
-        beammp_lua_error("JsonDiff second argument is not valid json: `" + b + "`");
-        return "";
-    }
-    auto a_json = nlohmann::json::parse(a);
-    auto b_json = nlohmann::json::parse(b);
-    return nlohmann::json::diff(a_json, b_json).dump();
-}
-
-std::string LuaAPI::MP::JsonDiffApply(const std::string& data, const std::string& patch) {
-    if (!nlohmann::json::accept(data)) {
-        beammp_lua_error("JsonDiffApply first argument is not valid json: `" + data + "`");
-        return "";
-    }
-    if (!nlohmann::json::accept(patch)) {
-        beammp_lua_error("JsonDiffApply second argument is not valid json: `" + patch + "`");
-        return "";
-    }
-    auto a_json = nlohmann::json::parse(data);
-    auto b_json = nlohmann::json::parse(patch);
-    a_json.patch(b_json);
-    return a_json.dump();
-}
-
-std::string LuaAPI::MP::JsonPrettify(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonPrettify argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).dump(4);
-}
-
-std::string LuaAPI::MP::JsonMinify(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonMinify argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).dump(-1);
-}
-
-std::string LuaAPI::MP::JsonFlatten(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonFlatten argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).flatten().dump(-1);
-}
-
-std::string LuaAPI::MP::JsonUnflatten(const std::string& json) {
-    if (!nlohmann::json::accept(json)) {
-        beammp_lua_error("JsonUnflatten argument is not valid json: `" + json + "`");
-        return "";
-    }
-    return nlohmann::json::parse(json).unflatten().dump(-1);
-}
-
-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data) {
-    return InternalTriggerClientEvent(PlayerID, EventName, JsonEncode(Data));
-}

src/SignalHandling.cpp

@@ -1,62 +1,65 @@
 #include "SignalHandling.h"
 #include "Common.h"
 
-#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+#ifdef __unix
 #include <csignal>
 static void UnixSignalHandler(int sig) {
     switch (sig) {
     case SIGPIPE:
-        beammp_warn("ignoring SIGPIPE");
+        warn("ignoring SIGPIPE");
         break;
     case SIGTERM:
-        beammp_info("gracefully shutting down via SIGTERM");
+        info("gracefully shutting down via SIGTERM");
         Application::GracefullyShutdown();
         break;
     case SIGINT:
-        beammp_info("gracefully shutting down via SIGINT");
+        info("gracefully shutting down via SIGINT");
         Application::GracefullyShutdown();
         break;
     default:
-        beammp_debug("unhandled signal: " + std::to_string(sig));
+        debug("unhandled signal: " + std::to_string(sig));
         break;
     }
 }
-#endif // UNIX
+#endif // __unix
 
-#ifdef BEAMMP_WINDOWS
+#ifdef WIN32
 #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");
+        info("gracefully shutting down via CTRL+C");
         Application::GracefullyShutdown();
         return TRUE;
     case CTRL_BREAK_EVENT:
-        beammp_info("gracefully shutting down via CTRL+BREAK");
+        info("gracefully shutting down via CTRL+BREAK");
         Application::GracefullyShutdown();
         return TRUE;
     case CTRL_CLOSE_EVENT:
-        beammp_info("gracefully shutting down via close");
+        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
+#endif // WIN32
 
 void SetupSignalHandlers() {
     // signal handlers for unix#include <windows.h>
-#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+#ifdef __unix
-    beammp_trace("registering handlers for signals");
+    trace("registering handlers for SIGINT, SIGTERM, SIGPIPE");
     signal(SIGPIPE, UnixSignalHandler);
     signal(SIGTERM, UnixSignalHandler);
 #ifndef DEBUG
     signal(SIGINT, UnixSignalHandler);
 #endif // DEBUG
-#elif defined(BEAMMP_WINDOWS)
+#endif // __unix
-    beammp_trace("registering handlers for CTRL_*_EVENTs");
+
+    // signal handlers for win32
+#ifdef WIN32
+    trace("registering handlers for CTRL_*_EVENTs");
     SetConsoleCtrlHandler(Win32CtrlC_Handler, TRUE);
-#endif
+#endif // WIN32
 }

src/SocketIO.cpp

@@ -0,0 +1,98 @@
+#include "SocketIO.h"
+#include "Common.h"
+#include <iostream>
+
+
+//TODO Default disabled with config option
+static std::unique_ptr<SocketIO> SocketIOInstance = std::make_unique<SocketIO>();
+
+SocketIO& SocketIO::Get() {
+    return *SocketIOInstance;
+}
+
+SocketIO::SocketIO() noexcept
+    : mThread([this] { ThreadMain(); }) {
+
+    mClient.socket()->on("network", [&](sio::event&e) {
+        if(e.get_message()->get_string() == "Welcome"){
+            info("SocketIO Authenticated!");
+            mAuthenticated = true;
+        }
+    });
+
+    mClient.socket()->on("welcome", [&](sio::event&) {
+        info("Got welcome from backend! Authenticating SocketIO...");
+        mClient.socket()->emit("onInitConnection", Application::Settings.Key);
+    });
+
+    mClient.set_logs_quiet();
+    mClient.set_reconnect_delay(10000);
+    mClient.connect(Application::GetBackendUrlForSocketIO());
+}
+
+SocketIO::~SocketIO() {
+    mCloseThread.store(true);
+    mThread.join();
+}
+
+
+static constexpr auto EventNameFromEnum(SocketIOEvent Event) {
+    switch (Event) {
+    case SocketIOEvent::CPUUsage:
+        return "cpu usage";
+    case SocketIOEvent::MemoryUsage:
+        return "memory usage";
+    case SocketIOEvent::ConsoleOut:
+        return "console out";
+    case SocketIOEvent::NetworkUsage:
+        return "network usage";
+    case SocketIOEvent::PlayerList:
+        return "player list";
+    default:
+        error("unreachable code reached (developer error)");
+        abort();
+    }
+}
+
+void SocketIO::Emit(SocketIOEvent Event, const std::string& Data) {
+    if (!mAuthenticated) {
+        debug("trying to emit a socket.io event when not yet authenticated");
+        return;
+    }
+    std::string EventName = EventNameFromEnum(Event);
+    debug("emitting event \"" + EventName + "\" with data: \"" + Data);
+    std::unique_lock Lock(mQueueMutex);
+    mQueue.push_back({EventName, Data });
+    debug("queue now has " + std::to_string(mQueue.size()) + " events");
+}
+
+void SocketIO::ThreadMain() {
+    while (!mCloseThread.load()) {
+        bool empty;
+        { // queue lock scope
+            std::unique_lock Lock(mQueueMutex);
+            empty = mQueue.empty();
+        } // end queue lock scope
+        if (empty || !mClient.opened()) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            continue;
+        } else {
+            Event TheEvent;
+            { // queue lock scope
+                std::unique_lock Lock(mQueueMutex);
+                TheEvent = mQueue.front();
+                mQueue.pop_front();
+            } // end queue lock scope
+            debug("sending \"" + TheEvent.Name + "\" event");
+            mClient.socket()->emit(TheEvent.Name, TheEvent.Data);
+            debug("sent \"" + TheEvent.Name + "\" event");
+        }
+    }
+    // using std::cout as this happens during static destruction and the logger might be dead already
+    std::cout << "closing " + std::string(__func__) << std::endl;
+
+    mClient.sync_close();
+    mClient.clear_con_listeners();
+
+    std::cout << "closed" << std::endl;
+}

src/TConfig.cpp

@@ -1,4 +1,4 @@
-#include "Common.h"
+#include <toml.hpp> // header-only version of TOML++
 
 #include "TConfig.h"
 #include <fstream>
@@ -6,7 +6,8 @@
 #include <istream>
 #include <sstream>
 
-// General
+static const char* ConfigFileName = static_cast<const char*>("ServerConfig.toml");
+
 static constexpr std::string_view StrDebug = "Debug";
 static constexpr std::string_view StrPrivate = "Private";
 static constexpr std::string_view StrPort = "Port";
@@ -17,131 +18,32 @@ static constexpr std::string_view StrName = "Name";
 static constexpr std::string_view StrDescription = "Description";
 static constexpr std::string_view StrResourceFolder = "ResourceFolder";
 static constexpr std::string_view StrAuthKey = "AuthKey";
-static constexpr std::string_view StrLogChat = "LogChat";
-
-// Misc
 static constexpr std::string_view StrSendErrors = "SendErrors";
 static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
-static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
 
-// HTTP
+TConfig::TConfig() {
-static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
+    if (!fs::exists(ConfigFileName) || !fs::is_regular_file(ConfigFileName)) {
-static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
+        info("No config file found! Generating one...");
-static constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
+        CreateConfigFile(ConfigFileName);
-static constexpr std::string_view StrSSLCertPath = "SSLCertPath";
-static constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
-static constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";
-
-TEST_CASE("TConfig::TConfig") {
-    const std::string CfgFile = "beammp_server_testconfig.toml";
-    fs::remove(CfgFile);
-
-    TConfig Cfg(CfgFile);
-
-    CHECK(fs::file_size(CfgFile) != 0);
-
-    std::string buf;
-    {
-        buf.resize(fs::file_size(CfgFile));
-        auto fp = std::fopen(CfgFile.c_str(), "r");
-        auto res = std::fread(buf.data(), 1, buf.size(), fp);
-        if (res != buf.size()) {
-            // IGNORE?
-        }
-        std::fclose(fp);
-    }
-    INFO("file contents are:", buf);
-
-    const auto table = toml::parse(CfgFile);
-    CHECK(table.at("General").is_table());
-    CHECK(table.at("Misc").is_table());
-    CHECK(table.at("HTTP").is_table());
-
-    fs::remove(CfgFile);
-}
-
-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();
     }
     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\".");
+            warn("An old \"Server.cfg\" file still exists. Please note that this is no longer used. Instead, \"" + std::string(ConfigFileName) + "\" is used. You can safely delete the \"Server.cfg\".");
         }
-        ParseFromFile(mConfigFileName);
+        ParseFromFile(ConfigFileName);
     }
 }
 
-template <typename CommentsT>
+void WriteSendErrors(const std::string& name) {
-void SetComment(CommentsT& Comments, const std::string& Comment) {
+    std::ofstream CfgFile { name, std::ios::out | std::ios::app };
-    Comments.clear();
+    CfgFile << "# You can turn on/off the SendErrors message you get on startup here" << std::endl
-    Comments.push_back(Comment);
+            << StrSendErrorsMessageEnabled << " = true" << std::endl
+            << "# 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`."
+            << std::endl
+            << StrSendErrors << " = true" << std::endl;
 }
 
-/**
+void TConfig::CreateConfigFile(std::string_view name) {
- * @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"][StrLogChat.data()] = Application::Settings.LogChat;
-    SetComment(data["General"][StrLogChat.data()].comments(), " Whether to log chat messages in the console / log");
-    data["General"][StrDebug.data()] = Application::Settings.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() {
     // build from old config Server.cfg
 
     try {
@@ -150,96 +52,138 @@ void TConfig::CreateConfigFile() {
             ParseOldFormat();
         }
     } catch (const std::exception& e) {
-        beammp_error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
+        error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
     }
 
-    FlushToFile();
+    toml::table tbl { {
-}
 
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue) {
+        { "General",
-    if (Table[Category.c_str()][Key.data()].is_string()) {
+            toml::table { {
-        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) {
+                { StrDebug, Application::Settings.DebugModeEnabled },
-    if (Table[Category.c_str()][Key.data()].is_boolean()) {
+                { StrPrivate, Application::Settings.Private },
-        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
+                { StrPort, Application::Settings.Port },
-    }
+                { StrMaxCars, Application::Settings.MaxCars },
-}
+                { StrMaxPlayers, Application::Settings.MaxPlayers },
+                { StrMap, Application::Settings.MapName },
+                { StrName, Application::Settings.ServerName },
+                { StrDescription, Application::Settings.ServerDesc },
+                { StrResourceFolder, Application::Settings.Resource },
+                { StrAuthKey, Application::Settings.Key },
+                //{ StrSendErrors, Application::Settings.SendErrors },
 
-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 = int(Table[Category.c_str()][Key.data()].as_integer());
+    } };
+    std::ofstream ofs { std::string(name) };
+    if (ofs.good()) {
+        ofs << "# This is the BeamMP-Server config file.\n"
+               "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
+               "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
+            << '\n';
+        ofs << tbl << '\n';
+        error("There was no \"" + std::string(ConfigFileName) + "\" file (this is normal for the first time running the server), so one was generated for you. It was automatically filled with the settings from your Server.cfg, if you have one. Please open ServerConfig.toml and ensure your AuthKey and other settings are filled in and correct, then restart the server. The old Server.cfg file will no longer be used and causes a warning if it exists from now on.");
+        mFailed = true;
+        ofs.close();
+        WriteSendErrors(std::string(name));
+    } else {
+        error("Couldn't create " + std::string(name) + ". Check permissions, try again, and contact support if it continues not to work.");
+        mFailed = true;
     }
 }
 
 void TConfig::ParseFromFile(std::string_view name) {
     try {
-        toml::value data = toml::parse<toml::preserve_comments>(name.data());
+        toml::table FullTable = toml::parse_file(name);
-        // GENERAL
+        toml::table GeneralTable = *FullTable["General"].as_table();
-        TryReadValue(data, "General", StrDebug, Application::Settings.DebugModeEnabled);
+        if (auto val = GeneralTable[StrDebug].value<bool>(); val.has_value()) {
-        TryReadValue(data, "General", StrPrivate, Application::Settings.Private);
+            Application::Settings.DebugModeEnabled = val.value();
-        TryReadValue(data, "General", StrPort, Application::Settings.Port);
+        } else {
-        TryReadValue(data, "General", StrMaxCars, Application::Settings.MaxCars);
+            throw std::runtime_error(std::string(StrDebug));
-        TryReadValue(data, "General", StrMaxPlayers, Application::Settings.MaxPlayers);
+        }
-        TryReadValue(data, "General", StrMap, Application::Settings.MapName);
+        if (auto val = GeneralTable[StrPrivate].value<bool>(); val.has_value()) {
-        TryReadValue(data, "General", StrName, Application::Settings.ServerName);
+            Application::Settings.Private = val.value();
-        TryReadValue(data, "General", StrDescription, Application::Settings.ServerDesc);
+        } else {
-        TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
+            throw std::runtime_error(std::string(StrPrivate));
-        TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
+        }
-        TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
+        if (auto val = GeneralTable[StrPort].value<int>(); val.has_value()) {
-        // Misc
+            Application::Settings.Port = val.value();
-        TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
+        } else {
-        TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
+            throw std::runtime_error(std::string(StrPort));
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, Application::Settings.SendErrorsMessageEnabled);
+        }
-        // HTTP
+        if (auto val = GeneralTable[StrMaxCars].value<int>(); val.has_value()) {
-        TryReadValue(data, "HTTP", StrSSLKeyPath, Application::Settings.SSLKeyPath);
+            Application::Settings.MaxCars = val.value();
-        TryReadValue(data, "HTTP", StrSSLCertPath, Application::Settings.SSLCertPath);
+        } else {
-        TryReadValue(data, "HTTP", StrHTTPServerPort, Application::Settings.HTTPServerPort);
+            throw std::runtime_error(std::string(StrMaxCars));
-        TryReadValue(data, "HTTP", StrHTTPServerIP, Application::Settings.HTTPServerIP);
+        }
-        TryReadValue(data, "HTTP", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
+        if (auto val = GeneralTable[StrMaxPlayers].value<int>(); val.has_value()) {
-        TryReadValue(data, "HTTP", StrHTTPServerUseSSL, Application::Settings.HTTPServerUseSSL);
+            Application::Settings.MaxPlayers = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrMaxPlayers));
+        }
+        if (auto val = GeneralTable[StrMap].value<std::string>(); val.has_value()) {
+            Application::Settings.MapName = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrMap));
+        }
+        if (auto val = GeneralTable[StrName].value<std::string>(); val.has_value()) {
+            Application::Settings.ServerName = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrName));
+        }
+        if (auto val = GeneralTable[StrDescription].value<std::string>(); val.has_value()) {
+            Application::Settings.ServerDesc = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrDescription));
+        }
+        if (auto val = GeneralTable[StrResourceFolder].value<std::string>(); val.has_value()) {
+            Application::Settings.Resource = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrResourceFolder));
+        }
+        if (auto val = GeneralTable[StrAuthKey].value<std::string>(); val.has_value()) {
+            Application::Settings.Key = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrAuthKey));
+        }
+        // added later, so behaves differently
+        if (auto val = GeneralTable[StrSendErrors].value<bool>(); val.has_value()) {
+            Application::Settings.SendErrors = val.value();
+        } else {
+            // dont throw, instead write it into the file and use default
+            WriteSendErrors(std::string(name));
+        }
+        if (auto val = GeneralTable[StrSendErrorsMessageEnabled].value<bool>(); val.has_value()) {
+            Application::Settings.SendErrorsMessageEnabled = val.value();
+        } else {
+            // no idea what to do here, ignore...?
+            // this entire toml parser sucks and is replaced in the upcoming lua.
+        }
     } catch (const std::exception& err) {
-        beammp_error("Error parsing config file value: " + std::string(err.what()));
+        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.");
+        error("No AuthKey specified in the \"" + std::string(ConfigFileName) + "\" 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"));
+    debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
-    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
+    debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
-    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
+    debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
-    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
+    debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
-    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
+    debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
-    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
+    debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
-    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
+    debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
-    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
+    debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
-    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
+    debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
-    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()) + "");
+    debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
 }
 
 void TConfig::ParseOldFormat() {
@@ -289,7 +233,7 @@ void TConfig::ParseOldFormat() {
         } else if (Key == "AuthKey") {
             Application::Settings.Key = Value.substr(1, Value.size() - 3);
         } else {
-            beammp_warn("unknown key in old auth file (ignored): " + Key);
+            warn("unknown key in old auth file (ignored): " + Key);
         }
         Str >> std::ws;
     }

src/TConsole.cpp

@@ -2,716 +2,77 @@
 #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) {
+std::string GetDate() {
-    return What.size() >= StartsWith.size() && What.substr(0, StartsWith.size()) == StartsWith;
-}
-
-TEST_CASE("StringStartsWith") {
-    CHECK(StringStartsWith("Hello, World", "Hello"));
-    CHECK(StringStartsWith("Hello, World", "H"));
-    CHECK(StringStartsWith("Hello, World", ""));
-    CHECK(!StringStartsWith("Hello, World", "ello"));
-    CHECK(!StringStartsWith("Hello, World", "World"));
-    CHECK(StringStartsWith("", ""));
-    CHECK(!StringStartsWith("", "hello"));
-}
-
-// Trims leading and trailing spaces, newlines, tabs, etc.
-static inline std::string TrimString(std::string S) {
-    S.erase(S.begin(), std::find_if(S.begin(), S.end(), [](unsigned char ch) {
-        return !std::isspace(ch);
-    }));
-    S.erase(std::find_if(S.rbegin(), S.rend(), [](unsigned char ch) {
-        return !std::isspace(ch);
-    }).base(),
-        S.end());
-    return S;
-}
-
-TEST_CASE("TrimString") {
-    CHECK(TrimString("hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo ") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("     hel lo") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("    hel lo     ") == "hel lo");
-    CHECK(TrimString("\t\thel\nlo\n\n") == "hel\nlo");
-    CHECK(TrimString("\n\thel\tlo\n\t") == "hel\tlo");
-    CHECK(TrimString("  ") == "");
-    CHECK(TrimString(" \t\n\r ") == "");
-    CHECK(TrimString("") == "");
-}
-
-// TODO: add unit tests to SplitString
-static inline void SplitString(std::string const& str, const char delim, std::vector<std::string>& out) {
-    size_t start;
-    size_t end = 0;
-
-    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
-        end = str.find(delim, start);
-        out.push_back(str.substr(start, end - start));
-    }
-}
-
-static std::string GetDate() {
     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);
+    tm local_tm {};
-    char buf[30];
+#ifdef WIN32
-    std::string date;
+    localtime_s(&local_tm, &tt);
-    if (Application::Settings.DebugModeEnabled) {
+#else // unix
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T.", local_tm);
+    localtime_r(&tt, &local_tm);
-        date += buf;
+#endif // WIN32
-        auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
+    std::stringstream date;
-        auto fraction = now - seconds;
+    int S = local_tm.tm_sec;
-        size_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(fraction).count();
+    int M = local_tm.tm_min;
-        char fracstr[5];
+    int H = local_tm.tm_hour;
-        std::sprintf(fracstr, "%03lu", ms);
+    std::string Secs = (S > 9 ? std::to_string(S) : "0" + std::to_string(S));
-        date += fracstr;
+    std::string Min = (M > 9 ? std::to_string(M) : "0" + std::to_string(M));
-        date += "] ";
+    std::string Hour = (H > 9 ? std::to_string(H) : "0" + std::to_string(H));
-    } else {
+    date
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T] ", local_tm);
+        << "["
-        date += buf;
+        << local_tm.tm_mday << "/"
+        << local_tm.tm_mon + 1 << "/"
+        << local_tm.tm_year + 1900 << " "
+        << Hour << ":"
+        << Min << ":"
+        << Secs
+        << "] ";
+    /* TODO
+    if (Debug) {
+        date << ThreadName()
+             << " ";
     }
-
-    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);
     */
-    }
+    return date.str();
-}
-
-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("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:exit`");
-            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
-        } else {
-            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, 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("Detached from Lua state '" + mStateId + "'.");
-        } else {
-            Application::Console().WriteRaw("Detached from Lua.");
-        }
-        mCachedLuaHistory = mCommandline.history();
-        mCommandline.set_history(mCachedRegularHistory);
-        mCommandline.set_prompt("> ");
-        mStateId = mDefaultStateId;
-    }
-}
-
-bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
-    if (n == 0 && args.size() != 0) {
-        Application::Console().WriteRaw("This command expects no arguments.");
-        return false;
-    } else if (args.size() != n) {
-        Application::Console().WriteRaw("Expected " + std::to_string(n) + " argument(s), instead got " + std::to_string(args.size()));
-        return false;
-    } else {
-        return true;
-    }
-}
-
-bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t min, size_t max) {
-    if (min == max) {
-        return EnsureArgsCount(args, min);
-    } else {
-        if (args.size() > max) {
-            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
-            return false;
-        } else if (args.size() < min) {
-            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(min) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
-            return false;
-        }
-    }
-    return true;
-}
-
-void TConsole::Command_Lua(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0, 1)) {
-        return;
-    }
-    if (args.size() == 1) {
-        auto NewStateId = args.at(0);
-        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 if (args.size() == 0) {
-        ChangeToLuaConsole(mDefaultStateId);
-    }
-}
-
-void TConsole::Command_Help(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
-    static constexpr const char* sHelpString = R"(
-    Commands:
-        help                    displays this help
-        exit                    shuts down the server
-        kick <name> [reason]    kicks specified player with an optional reason
-        list                    lists all players and info about them
-        say <message>           sends the message to all players in chat
-        lua [state id]          switches to lua, optionally into a specific state id's lua
-        settings [command]      sets or gets settings for the server, run `settings help` for more info
-        status                  how the server is doing and what it's up to
-        clear                   clears the console window)";
-    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
-}
-
-std::string TConsole::ConcatArgs(const std::vector<std::string>& args, char space) {
-    std::string Result;
-    for (const auto& arg : args) {
-        Result += arg + space;
-    }
-    Result = Result.substr(0, Result.size() - 1); // strip trailing space
-    return Result;
-}
-
-void TConsole::Command_Clear(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0, size_t(-1))) {
-        return;
-    }
-    mCommandline.write("\x1b[;H\x1b[2J");
-}
-
-void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 1, size_t(-1))) {
-        return;
-    }
-    auto Name = args.at(0);
-    std::string Reason = "Kicked by server console";
-    if (args.size() > 1) {
-        Reason = ConcatArgs({ args.begin() + 1, args.end() });
-    }
-    beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
-    bool Kicked = false;
-    // TODO: this sucks, tolower is locale-dependent.
-    auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = char(std::tolower(char(c))); });
-        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = char(std::tolower(char(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 + "'.");
-    }
-}
-
-std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const std::string& CommandWithArgs) {
-    // Algorithm designed and implemented by Lion Kortlepel (c) 2022
-    // It correctly splits arguments, including respecting single and double quotes, as well as backticks
-    auto End_i = CommandWithArgs.find_first_of(' ');
-    std::string Command = CommandWithArgs.substr(0, End_i);
-    std::string ArgsStr {};
-    if (End_i != std::string::npos) {
-        ArgsStr = CommandWithArgs.substr(End_i);
-    }
-    std::vector<std::string> Args;
-    char* PrevPtr = ArgsStr.data();
-    char* Ptr = ArgsStr.data();
-    const char* End = ArgsStr.data() + ArgsStr.size();
-    while (Ptr != End) {
-        std::string Arg = "";
-        // advance while space
-        while (Ptr != End && std::isspace(*Ptr))
-            ++Ptr;
-        PrevPtr = Ptr;
-        // advance while NOT space, also handle quotes
-        while (Ptr != End && !std::isspace(*Ptr)) {
-            // TODO: backslash escaping quotes
-            for (char Quote : { '"', '\'', '`' }) {
-                if (*Ptr == Quote) {
-                    // seek if there's a closing quote
-                    // if there is, go there and continue, otherwise ignore
-                    char* Seeker = Ptr + 1;
-                    while (Seeker != End && *Seeker != Quote)
-                        ++Seeker;
-                    if (Seeker != End) {
-                        // found closing quote
-                        Ptr = Seeker;
-                    }
-                    break; // exit for loop
-                }
-            }
-            ++Ptr;
-        }
-        // this is required, otherwise we get negative int to unsigned cast in the next operations
-        beammp_assert(PrevPtr <= Ptr);
-        Arg = std::string(PrevPtr, std::string::size_type(Ptr - PrevPtr));
-        // remove quotes if enclosed in quotes
-        for (char Quote : { '"', '\'', '`' }) {
-            if (!Arg.empty() && Arg.at(0) == Quote && Arg.at(Arg.size() - 1) == Quote) {
-                Arg = Arg.substr(1, Arg.size() - 2);
-                break;
-            }
-        }
-        if (!Arg.empty()) {
-            Args.push_back(Arg);
-        }
-    }
-    return { Command, Args };
-}
-
-void TConsole::Command_Settings(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 1, 2)) {
-        return;
-    }
-    
-}
-
-void TConsole::Command_Say(const std::string& FullCmd) {
-    if (FullCmd.size() > 3) {
-        auto Message = FullCmd.substr(4);
-        LuaAPI::MP::SendChatMessage(-1, Message);
-        if (!Application::Settings.LogChat) {
-            Application::Console().WriteRaw("Chat message sent!");
-        }
-    }
-}
-
-void TConsole::Command_List(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
-    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&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
-    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;
-        default:
-            beammp_assert_not_reachable();
-        }
-    }
-    // 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(double(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/Shut down:     " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
-           << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
-           << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
-           << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
-           << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShut down:                   [ " << SystemsShutdownList << " ]\n"
-           << "";
-
-    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());
-    }
-}
-
-void TConsole::HandleLuaInternalCommand(const std::string& cmd) {
-    if (cmd == "exit") {
-        ChangeToRegularConsole();
-    } else if (cmd == "queued") {
-        auto QueuedFunctions = LuaAPI::MP::Engine->Debug_GetStateFunctionQueueForState(mStateId);
-        Application::Console().WriteRaw("Pending functions in State '" + mStateId + "'");
-        std::unordered_map<std::string, size_t> FunctionsCount;
-        std::vector<std::string> FunctionsInOrder;
-        while (!QueuedFunctions.empty()) {
-            auto Tuple = QueuedFunctions.front();
-            QueuedFunctions.erase(QueuedFunctions.begin());
-            FunctionsInOrder.push_back(Tuple.FunctionName);
-            FunctionsCount[Tuple.FunctionName] += 1;
-        }
-        std::set<std::string> Uniques;
-        for (const auto& Function : FunctionsInOrder) {
-            if (Uniques.count(Function) == 0) {
-                Uniques.insert(Function);
-                if (FunctionsCount.at(Function) > 1) {
-                    Application::Console().WriteRaw("    " + Function + " (" + std::to_string(FunctionsCount.at(Function)) + "x)");
-                } else {
-                    Application::Console().WriteRaw("    " + Function);
-                }
-            }
-        }
-        Application::Console().WriteRaw("Executed functions waiting to be checked in State '" + mStateId + "'");
-        for (const auto& Function : LuaAPI::MP::Engine->Debug_GetResultsToCheckForState(mStateId)) {
-            Application::Console().WriteRaw("    '" + Function.Function + "' (Ready? " + (Function.Ready ? "Yes" : "No") + ", Error? " + (Function.Error ? "Yes: '" + Function.ErrorMessage + "'" : "No") + ")");
-        }
-    } else if (cmd == "events") {
-        auto Events = LuaAPI::MP::Engine->Debug_GetEventsForState(mStateId);
-        Application::Console().WriteRaw("Registered Events + Handlers for State '" + mStateId + "'");
-        for (const auto& EventHandlerPair : Events) {
-            Application::Console().WriteRaw("    Event '" + EventHandlerPair.first + "'");
-            for (const auto& Handler : EventHandlerPair.second) {
-                Application::Console().WriteRaw("        " + Handler);
-            }
-        }
-    } else if (cmd == "help") {
-        Application::Console().WriteRaw(R"(BeamMP Lua Debugger
-    All commands must be prefixed with a `:`. Non-prefixed commands are interpreted as Lua.
-
-Commands
-    :exit         detaches (exits) from this Lua console
-    :help         displays this help
-    :events       shows a list of currently registered events
-    :queued       shows a list of all pending and queued functions)");
-    } else {
-        beammp_error("internal command '" + cmd + "' is not known");
-    }
 }
 
 TConsole::TConsole() {
     mCommandline.enable_history();
     mCommandline.set_history_limit(20);
     mCommandline.set_prompt("> ");
-    BackupOldLog();
+    bool success = mCommandline.enable_write_to_file("Server.log");
+    if (!success) {
+        error("unable to open file for writing: \"Server.log\"");
+    }
     mCommandline.on_command = [this](Commandline& c) {
-        try {
+        auto cmd = c.get_command();
-            auto TrimmedCmd = c.get_command();
+        mCommandline.write("> " + cmd);
-            TrimmedCmd = TrimString(TrimmedCmd);
+        if (cmd == "exit") {
-            auto [cmd, args] = ParseCommand(TrimmedCmd);
+            info("gracefully shutting down");
-            mCommandline.write(mCommandline.prompt() + TrimmedCmd);
+            Application::GracefullyShutdown();
-            if (mIsLuaConsole) {
+        } else if (cmd == "clear" || cmd == "cls") {
-                if (!mLuaEngine) {
+            // TODO: clear screen
-                    beammp_info("Lua not started yet, please try again in a second");
+        } else {
-                } else if (!cmd.empty() && cmd.at(0) == ':') {
+            if (mLuaConsole) {
-                    HandleLuaInternalCommand(cmd.substr(1));
+                mLuaConsole->Execute(cmd);
-                } else {
-                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    while (!Future->Ready) {
-                        std::this_thread::yield(); // TODO: Add a timeout
-                    }
-                    if (Future->Error) {
-                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
-                    }
-                }
             } else {
-                if (!mLuaEngine) {
+                error("Lua subsystem not yet initialized, please wait a few seconds and try again");
-                    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 (cmd == "say") {
-                    RunAsCommand(TrimmedCmd, true);
-                    Command_Say(TrimmedCmd);
-                } else {
-                    if (mCommandMap.find(cmd) != mCommandMap.end()) {
-                        mCommandMap.at(cmd)(cmd, args);
-                        RunAsCommand(TrimmedCmd, true);
-                    } else {
-                        RunAsCommand(TrimmedCmd);
-                    }
-                }
             }
-        } 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.");
         }
     };
-    mCommandline.on_autocomplete = [this](Commandline&, std::string stub, int) {
-        std::vector<std::string> suggestions;
-        try {
-            if (mIsLuaConsole) { // if lua
-                if (!mLuaEngine) {
-                    beammp_info("Lua not started yet, please try again in a second");
-                } else {
-                    std::string prefix {}; // stores non-table part of input
-                    for (size_t i = stub.length(); i > 0; i--) { // separate table from input
-                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_' && stub[i - 1] != '.') {
-                            prefix = stub.substr(0, i);
-                            stub = stub.substr(i);
-                            break;
-                        }
-                    }
-
-                    // turn string into vector of keys
-                    std::vector<std::string> tablekeys;
-
-                    SplitString(stub, '.', tablekeys);
-
-                    // remove last key if incomplete
-                    if (stub.rfind('.') != stub.size() - 1 && !tablekeys.empty()) {
-                        tablekeys.pop_back();
-                    }
-
-                    auto keys = mLuaEngine->GetStateTableKeysForState(mStateId, tablekeys);
-
-                    for (const auto& key : keys) { // go through each bottom-level key
-                        auto last_dot = stub.rfind('.');
-                        std::string last_atom;
-                        if (last_dot != std::string::npos) {
-                            last_atom = stub.substr(last_dot + 1);
-                        }
-                        std::string before_last_atom = stub.substr(0, last_dot + 1); // get last confirmed key
-                        auto last = stub.substr(stub.rfind('.') + 1);
-                        std::string::size_type n = key.find(last);
-                        if (n == 0) {
-                            suggestions.push_back(prefix + before_last_atom + key);
-                        }
-                    }
-                }
-            } else { // if not lua
-                if (stub.find("lua") == 0) { // starts with "lua" means we should suggest state names
-                    std::string after_prefix = TrimString(stub.substr(3));
-                    auto stateNames = mLuaEngine->GetLuaStateNames();
-
-                    for (const auto& name : stateNames) {
-                        if (name.find(after_prefix) == 0) {
-                            suggestions.push_back("lua " + name);
-                        }
-                    }
-                } else {
-                    for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
-                        if (cmd_name.find(stub) == 0) {
-                            suggestions.push_back(cmd_name);
-                        }
-                    }
-                }
-            }
-        } catch (const std::exception& e) {
-            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
-        }
-        std::sort(suggestions.begin(), suggestions.end());
-        return suggestions;
-    };
 }
 
 void TConsole::Write(const std::string& str) {
     auto ToWrite = GetDate() + str;
     mCommandline.write(ToWrite);
+    // TODO write to logfile, too
+}
+void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
+    mLuaConsole = std::make_unique<TLuaFile>(Engine, true);
 }
-
 void TConsole::WriteRaw(const std::string& str) {
     mCommandline.write(str);
 }
-
-void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
-    mLuaEngine = &Engine;
-}

src/THeartbeatThread.cpp

@@ -3,12 +3,8 @@
 #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;
@@ -19,9 +15,7 @@ void THeartbeatThread::operator()() {
 
     static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::now();
     bool isAuth = false;
-    size_t UpdateReminderCounter = 0;
+    while (!mShutdown) {
-    while (!Application::IsShuttingDown()) {
-        ++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();
@@ -32,13 +26,14 @@ void THeartbeatThread::operator()() {
             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)");
+        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()) {
+        if (!Application::Settings.CustomIP.empty())
             Body += "&ip=" + Application::Settings.CustomIP;
-        }
+
+        Body += "&pps=" + Application::PPS();
 
         auto SentryReportError = [&](const std::string& transaction, int status) {
             auto Lock = Sentry.CreateExclusiveContext();
@@ -46,90 +41,42 @@ void THeartbeatThread::operator()() {
                 { { "response-body", T },
                     { "request-body", Body } });
             Sentry.SetTransaction(transaction);
-            beammp_trace("sending log to sentry: " + std::to_string(status) + " for " + transaction);
+            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;
+        int ResponseCode = -1;
+        T = Http::POST(Application::GetBackendHostname(), Target, {}, Body, false, &ResponseCode);
 
-        json::Document Doc;
+        if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
-        bool Ok = false;
+            trace("got " + T + " from backend");
-        for (const auto& Url : Application::GetBackendUrlsInOrder()) {
+            SentryReportError(Application::GetBackendHostname() + Target, ResponseCode);
-            T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
-            Doc.Parse(T.data(), T.size());
-            if (Doc.HasParseError() || !Doc.IsObject()) {
-                if (!Application::Settings.Private) {
-                    beammp_trace("Backend response failed to parse as valid json");
-                    beammp_trace("Response was: `" + T + "`");
-                }
-                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));
-        }
+            T = Http::POST(Application::GetBackup1Hostname(), Target, {}, Body, false, &ResponseCode);
-        std::string Status {};
+            if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
-        std::string Code {};
+                SentryReportError(Application::GetBackup1Hostname() + Target, ResponseCode);
-        std::string Message {};
+                std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        const auto StatusKey = "status";
+                T = Http::POST(Application::GetBackup2Hostname(), Target, {}, Body, false, &ResponseCode);
-        const auto CodeKey = "code";
+                if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
-        const auto MessageKey = "msg";
+                    warn("Backend system refused server! Server will not show in the public server list.");
-
+                    isAuth = false;
-        if (Ok) {
+                    SentryReportError(Application::GetBackup2Hostname() + Target, ResponseCode);
-            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 && !Application::Settings.Private) {
-            if (Status == "2000") {
-                beammp_info(("Authenticated! " + Message));
-                isAuth = true;
-            } else if (Status == "200") {
-                beammp_info(("Resumed authenticated session! " + Message));
-                isAuth = true;
-            } else {
-                if (Message.empty()) {
-                    Message = "Backend didn't provide a reason.";
                 }
-                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
             }
         }
-        if (isAuth || Application::Settings.Private) {
+
-            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
+        if (!isAuth) {
-        }
+            if (T == "2000") {
-        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
+                info(("Authenticated!"));
-            Application::CheckForUpdates();
+                isAuth = true;
+            } else if (T == "200") {
+                info(("Resumed authenticated session!"));
+                isAuth = true;
+            }
         }
+
+        //SocketIO::Get().SetAuthenticated(isAuth);
     }
 }
 
@@ -142,8 +89,8 @@ std::string THeartbeatThread::GenerateCall() {
         << "&port=" << Application::Settings.Port
         << "&map=" << Application::Settings.MapName
         << "&private=" << (Application::Settings.Private ? "true" : "false")
-        << "&version=" << Application::ServerVersionString()
+        << "&version=" << Application::ServerVersion()
-        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
+        << "&clientversion=" << Application::ClientVersion()
         << "&name=" << Application::Settings.ServerName
         << "&modlist=" << mResourceManager.TrimmedList()
         << "&modstotalsize=" << mResourceManager.MaxModSize()
@@ -155,13 +102,11 @@ std::string THeartbeatThread::GenerateCall() {
 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();
 }

src/TLuaFile.cpp

@@ -0,0 +1,847 @@
+#include "TLuaFile.h"
+#include "Client.h"
+#include "Common.h"
+#include "CustomAssert.h"
+#include "Defer.h"
+#include "TLuaEngine.h"
+#include "TNetwork.h"
+#include "TServer.h"
+
+#include <future>
+#include <thread>
+
+// TODO: REWRITE
+
+void SendError(TLuaEngine& Engine, lua_State* L, const std::string& msg);
+std::any CallFunction(TLuaFile* lua, const std::string& FuncName, std::shared_ptr<TLuaArg> Arg);
+std::any TriggerLuaEvent(TLuaEngine& Engine, const std::string& Event, bool local, TLuaFile* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);
+
+extern TLuaEngine* TheEngine;
+
+static TLuaEngine& Engine() {
+    Assert(TheEngine);
+    return *TheEngine;
+}
+
+std::shared_ptr<TLuaArg> CreateArg(lua_State* L, int T, int S) {
+    if (S > T)
+        return nullptr;
+    std::shared_ptr<TLuaArg> temp(new TLuaArg);
+    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::any Trigger(TLuaFile* lua, const std::string& R, std::shared_ptr<TLuaArg> arg) {
+    std::lock_guard<std::mutex> lockGuard(lua->Lock);
+    std::packaged_task<std::any(std::shared_ptr<TLuaArg>)> task([lua, R](std::shared_ptr<TLuaArg> 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->Engine(), lua->GetState(), R + " took too long to respond");
+    return 0;
+}
+
+std::any FutureWait(TLuaFile* lua, const std::string& R, std::shared_ptr<TLuaArg> arg, bool Wait) {
+    Assert(lua);
+    std::packaged_task<std::any(std::shared_ptr<TLuaArg>)> task([lua, R](std::shared_ptr<TLuaArg> 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, TLuaFile* Caller, std::shared_ptr<TLuaArg> arg, bool Wait) {
+    std::any R;
+    int Ret = 0;
+    for (auto& Script : Engine().LuaFiles()) {
+        if (Script->IsRegistered(Event)) {
+            if (local) {
+                if (Script->GetPluginName() == Caller->GetPluginName()) {
+                    R = FutureWait(Script.get(), Script->GetRegistered(Event), arg, Wait);
+                    if (R.type() == typeid(int)) {
+                        if (std::any_cast<int>(R))
+                            Ret++;
+                    } else if (Event == "onPlayerAuth")
+                        return R;
+                }
+            } else {
+                R = FutureWait(Script.get(), Script->GetRegistered(Event), arg, Wait);
+                if (R.type() == typeid(int)) {
+                    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 = "Unknown";
+        if (lua_isstring(L, -1)) {
+            auto MsgMaybe = lua_tostring(L, -1);
+            if (MsgMaybe) {
+                msg = MsgMaybe;
+            }
+        }
+        auto MaybeS = Engine().GetScript(L);
+        if (MaybeS.has_value()) {
+            TLuaFile& S = MaybeS.value();
+            std::string a = fs::path(S.GetFileName()).filename().string();
+            warn(a + " | " + msg);
+            return false;
+        }
+        // This should never happen since it's not directly called from "userspace" Lua.
+        AssertNotReachable();
+    }
+    return true;
+}
+
+int lua_RegisterEvent(lua_State* L) {
+    int Args = lua_gettop(L);
+    auto MaybeScript = Engine().GetScript(L);
+    if (!MaybeScript.has_value()) {
+        error("RegisterEvent: There is no script associated with this lua_State.");
+        return 0;
+    }
+    TLuaFile& 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(Engine(), 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 = Engine().GetScript(L);
+    if (!MaybeScript.has_value()) {
+        error("TriggerEvent: There is no script associated with this lua_State.");
+        return 0;
+    }
+    TLuaFile& 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(Engine(), L, ("TriggerLocalEvent wrong argument [1] need string"));
+    } else {
+        SendError(Engine(), L, ("TriggerLocalEvent not enough arguments expected 1 got 0"));
+    }
+    return 0;
+}
+
+int lua_TriggerEventG(lua_State* L) {
+    int Args = lua_gettop(L);
+    auto MaybeScript = Engine().GetScript(L);
+    if (!MaybeScript.has_value()) {
+        error("TriggerGlobalEvent: There is no script associated with this lua_State.");
+        return 0;
+    }
+    TLuaFile& 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(Engine(), L, ("TriggerGlobalEvent wrong argument [1] need string"));
+    } else
+        SendError(Engine(), L, ("TriggerGlobalEvent not enough arguments"));
+    return 0;
+}
+
+void SafeExecution(TLuaFile* lua, const std::string& FuncName) {
+    lua_State* luaState = lua->GetState();
+    lua_getglobal(luaState, FuncName.c_str());
+    if (lua_isfunction(luaState, -1)) {
+        int R = lua_pcall(luaState, 0, 0, 0);
+        CheckLua(luaState, R);
+    }
+    ClearStack(luaState);
+}
+
+void ExecuteAsync(TLuaFile* lua, const std::string& FuncName) {
+    std::lock_guard<std::mutex> lockGuard(lua->Lock);
+    SafeExecution(lua, FuncName);
+}
+
+void CallAsync(TLuaFile* lua, const std::string& Func, int U) {
+    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 = Engine().GetScript(L);
+    if (!MaybeScript.has_value()) {
+        error("StopThread: There is no script associated with this lua_State.");
+        return 0;
+    }
+    // ugly, but whatever, this is very safe
+    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 = Engine().GetScript(L);
+                    if (!MaybeScript.has_value()) {
+                        error("CreateThread: There is no script associated with this lua_State.");
+                        return 0;
+                    }
+                    TLuaFile& Script = MaybeScript.value();
+                    std::thread t1(CallAsync, &Script, STR, U);
+                    t1.detach();
+                } else
+                    SendError(Engine(), L, ("CreateThread wrong argument [2] number must be between 1 and 500"));
+            } else
+                SendError(Engine(), L, ("CreateThread wrong argument [2] need number"));
+        } else
+            SendError(Engine(), L, ("CreateThread wrong argument [1] need string"));
+    } else
+        SendError(Engine(), 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(Engine(), L, ("Sleep not enough arguments"));
+        return 0;
+    }
+    return 1;
+}
+
+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;
+}
+
+int lua_isConnected(lua_State* L) {
+    if (lua_isnumber(L, 1)) {
+        int ID = int(lua_tonumber(L, 1));
+        auto MaybeClient = GetClient(Engine().Server(), ID);
+        if (MaybeClient && !MaybeClient.value().expired())
+            lua_pushboolean(L, MaybeClient.value().lock()->IsConnected());
+        else
+            return 0;
+    } else {
+        SendError(Engine(), 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));
+        auto MaybeClient = GetClient(Engine().Server(), ID);
+        if (MaybeClient && !MaybeClient.value().expired())
+            lua_pushstring(L, MaybeClient.value().lock()->GetName().c_str());
+        else
+            return 0;
+    } else {
+        SendError(Engine(), L, ("GetPlayerName not enough arguments"));
+        return 0;
+    }
+    return 1;
+}
+
+int lua_GetPlayerCount(lua_State* L) {
+    lua_pushinteger(L, Engine().Server().ClientCount());
+    return 1;
+}
+
+int lua_GetGuest(lua_State* L) {
+    if (lua_isnumber(L, 1)) {
+        int ID = int(lua_tonumber(L, 1));
+        auto MaybeClient = GetClient(Engine().Server(), ID);
+        if (MaybeClient && !MaybeClient.value().expired())
+            lua_pushboolean(L, MaybeClient.value().lock()->IsGuest());
+        else
+            return 0;
+    } else {
+        SendError(Engine(), L, "GetGuest not enough arguments");
+        return 0;
+    }
+    return 1;
+}
+
+int lua_GetAllPlayers(lua_State* L) {
+    lua_newtable(L);
+    Engine().Server().ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        std::shared_ptr<TClient> Client;
+        {
+            ReadLock Lock(Engine().Server().GetClientMutex());
+            if (ClientPtr.expired())
+                return true;
+            Client = ClientPtr.lock();
+        }
+        lua_pushinteger(L, Client->GetID());
+        lua_pushstring(L, Client->GetName().c_str());
+        lua_settable(L, -3);
+        return true;
+    });
+    if (Engine().Server().ClientCount() == 0)
+        return 0;
+    return 1;
+}
+
+int lua_GetIdentifiers(lua_State* L) {
+    if (lua_isnumber(L, 1)) {
+        auto MaybeClient = GetClient(Engine().Server(), int(lua_tonumber(L, 1)));
+        if (MaybeClient && !MaybeClient.value().expired()) {
+            auto IDs = MaybeClient.value().lock()->GetIdentifiers();
+            if (IDs.empty())
+                return 0;
+            lua_newtable(L);
+            for (const std::string& ID : IDs) {
+                lua_pushstring(L, ID.substr(0, ID.find(':')).c_str());
+                lua_pushstring(L, ID.c_str());
+                lua_settable(L, -3);
+            }
+        } else
+            return 0;
+    } else {
+        SendError(Engine(), L, "lua_GetIdentifiers wrong arguments");
+        return 0;
+    }
+    return 1;
+}
+
+int lua_GetCars(lua_State* L) {
+    if (lua_isnumber(L, 1)) {
+        int ID = int(lua_tonumber(L, 1));
+        auto MaybeClient = GetClient(Engine().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 0;
+            lua_newtable(L);
+            for (const auto& v : VehicleData) {
+                lua_pushinteger(L, v.ID());
+                lua_pushstring(L, v.Data().substr(3).c_str());
+                lua_settable(L, -3);
+            }
+        } else
+            return 0;
+    } else {
+        SendError(Engine(), L, ("GetPlayerVehicles wrong 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));
+        auto MaybeClient = GetClient(Engine().Server(), ID);
+        if (!MaybeClient || MaybeClient.value().expired())
+            return 0;
+        std::string Reason;
+        if (Args > 1 && lua_isstring(L, 2)) {
+            Reason = std::string((" Reason : ")) + lua_tostring(L, 2);
+        }
+        auto c = MaybeClient.value().lock();
+        Engine().Network().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(Engine(), 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) {
+                auto msg = std::string(lua_tostring(L, 2));
+                LogChatMessage("<Server> (to everyone) ", -1, msg);
+                std::string Packet = "C:Server: " + msg;
+                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 0;
+                    auto msg = std::string(lua_tostring(L, 2));
+                    LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, msg);
+                    std::string Packet = "C:Server: " + msg;
+                    Engine().Network().Respond(*c, Packet, true);
+                } else
+                    SendError(Engine(), L, ("SendChatMessage invalid argument [1] invalid ID"));
+            }
+        } else
+            SendError(Engine(), L, ("SendChatMessage invalid argument [2] expected string"));
+    } else
+        SendError(Engine(), L, ("SendChatMessage invalid argument [1] expected number"));
+    return 0;
+}
+
+int lua_RemoveVehicle(lua_State* L) {
+    int Args = lua_gettop(L);
+    if (Args != 2) {
+        SendError(Engine(), 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));
+        auto MaybeClient = GetClient(Engine().Server(), PID);
+        if (!MaybeClient || MaybeClient.value().expired()) {
+            SendError(Engine(), L, ("RemoveVehicle invalid Player ID"));
+            return 0;
+        }
+        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);
+        }
+    } else
+        SendError(Engine(), 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(Engine(), L, ("TriggerClientEvent invalid argument count expected 3 got ") + std::to_string(Args));
+        return 0;
+    }
+    if (!lua_isnumber(L, 1)) {
+        SendError(Engine(), L, ("TriggerClientEvent invalid argument [1] expected number"));
+        return 0;
+    }
+    if (!lua_isstring(L, 2)) {
+        SendError(Engine(), L, ("TriggerClientEvent invalid argument [2] expected string"));
+        return 0;
+    }
+    if (!lua_isstring(L, 3)) {
+        SendError(Engine(), 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)
+        Engine().Network().SendToAll(nullptr, Packet, true, true);
+    else {
+        auto MaybeClient = GetClient(Engine().Server(), ID);
+        if (!MaybeClient || MaybeClient.value().expired()) {
+            SendError(Engine(), L, ("TriggerClientEvent invalid Player ID"));
+            return 0;
+        }
+        auto c = MaybeClient.value().lock();
+        Engine().Network().Respond(*c, Packet, true);
+    }
+    return 0;
+}
+
+int lua_ServerExit(lua_State*) {
+    Application::GracefullyShutdown();
+    return 0;
+}
+
+int lua_Set(lua_State* L) {
+    int Args = lua_gettop(L);
+    if (Args != 2) {
+        SendError(Engine(), L, ("set invalid argument count expected 2 got ") + std::to_string(Args));
+        return 0;
+    }
+    if (!lua_isnumber(L, 1)) {
+        SendError(Engine(), L, ("set invalid argument [1] expected number"));
+        return 0;
+    }
+    auto MaybeSrc = Engine().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)) {
+            Application::Settings.DebugModeEnabled = lua_toboolean(L, 2);
+            info(Name + (" | Debug -> ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
+        } else
+            SendError(Engine(), L, ("set invalid argument [2] expected boolean for ID : 0"));
+        break;
+    case 1: //private
+        if (lua_isboolean(L, 2)) {
+            Application::Settings.Private = lua_toboolean(L, 2);
+            info(Name + (" | Private -> ") + (Application::Settings.Private ? "true" : "false"));
+        } else
+            SendError(Engine(), L, ("set invalid argument [2] expected boolean for ID : 1"));
+        break;
+    case 2: //max cars
+        if (lua_isnumber(L, 2)) {
+            Application::Settings.MaxCars = int(lua_tointeger(L, 2));
+            info(Name + (" | MaxCars -> ") + std::to_string(Application::Settings.MaxCars));
+        } else
+            SendError(Engine(), L, ("set invalid argument [2] expected number for ID : 2"));
+        break;
+    case 3: //max players
+        if (lua_isnumber(L, 2)) {
+            Application::Settings.MaxPlayers = int(lua_tointeger(L, 2));
+            info(Name + (" | MaxPlayers -> ") + std::to_string(Application::Settings.MaxPlayers));
+        } else
+            SendError(Engine(), L, ("set invalid argument [2] expected number for ID : 3"));
+        break;
+    case 4: //Map
+        if (lua_isstring(L, 2)) {
+            Application::Settings.MapName = lua_tostring(L, 2);
+            info(Name + (" | MapName -> ") + Application::Settings.MapName);
+        } else
+            SendError(Engine(), L, ("set invalid argument [2] expected string for ID : 4"));
+        break;
+    case 5: //Name
+        if (lua_isstring(L, 2)) {
+            Application::Settings.ServerName = lua_tostring(L, 2);
+            info(Name + (" | ServerName -> ") + Application::Settings.ServerName);
+        } else
+            SendError(Engine(), L, ("set invalid argument [2] expected string for ID : 5"));
+        break;
+    case 6: //Desc
+        if (lua_isstring(L, 2)) {
+            Application::Settings.ServerDesc = lua_tostring(L, 2);
+            info(Name + (" | ServerDesc -> ") + Application::Settings.ServerDesc);
+        } else
+            SendError(Engine(), 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);
+    std::string to_print;
+    for (int i = 1; i <= Arg; i++) {
+        if (lua_isstring(L, i)) {
+            to_print += lua_tostring(L, i);
+        } else if (lua_isinteger(L, i)) {
+            to_print += std::to_string(lua_tointeger(L, 1));
+        } else if (lua_isnumber(L, i)) {
+            to_print += std::to_string(lua_tonumber(L, 1));
+        } else if (lua_isboolean(L, i)) {
+            to_print += lua_toboolean(L, i) ? "true" : "false";
+        } else if (lua_isfunction(L, i)) {
+            std::stringstream ss;
+            ss << std::hex << reinterpret_cast<const void*>(lua_tocfunction(L, i));
+            to_print += "function: " + ss.str();
+        } else if (lua_istable(L, i)) {
+            std::stringstream ss;
+            ss << std::hex << reinterpret_cast<const void*>(lua_topointer(L, i));
+            to_print += "table: " + ss.str();
+        } else if (lua_isnoneornil(L, i)) {
+            to_print += "nil";
+        } else if (lua_isthread(L, i)) {
+            std::stringstream ss;
+            ss << std::hex << reinterpret_cast<const void*>(lua_tothread(L, i));
+            to_print += "thread: " + ss.str();
+        } else {
+            to_print += "(unknown)";
+        }
+        if (i + 1 <= Arg) {
+            to_print += "\t";
+        }
+    }
+    luaprint(to_print);
+    return 0;
+}
+}
+
+int lua_TempFix(lua_State* L);
+
+void TLuaFile::Init(const std::string& PluginName, const std::string& FileName, fs::file_time_type LastWrote) {
+    auto Lock = std::unique_lock(mInitMutex);
+    // set global engine for lua_* functions
+    if (!TheEngine) {
+        TheEngine = &mEngine;
+    }
+    Assert(mLuaState);
+    if (!PluginName.empty()) {
+        SetPluginName(PluginName);
+    }
+    if (!FileName.empty()) {
+        SetFileName(FileName);
+    }
+    SetLastWrite(LastWrote);
+    Load();
+}
+
+TLuaFile::TLuaFile(TLuaEngine& Engine, bool Console)
+    : mEngine(Engine)
+    , mLuaState(luaL_newstate()) {
+    if (Console) {
+        mConsole = Console;
+        Load();
+    }
+}
+
+void TLuaFile::Execute(const std::string& Command) {
+    if (ConsoleCheck(mLuaState, luaL_dostring(mLuaState, Command.c_str()))) {
+        lua_settop(mLuaState, 0);
+    }
+}
+
+void TLuaFile::Reload() {
+    if (CheckLua(mLuaState, luaL_dofile(mLuaState, mFileName.c_str()))) {
+        CallFunction(this, ("onInit"), nullptr);
+    }
+}
+
+std::string TLuaFile::GetOrigin() {
+    return fs::path(GetFileName()).filename().string();
+}
+
+std::any CallFunction(TLuaFile* lua, const std::string& FuncName, std::shared_ptr<TLuaArg> 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)) {
+                auto ret = int(lua_tointeger(luaState, -1));
+                ClearStack(luaState);
+                return ret;
+            } else if (lua_isstring(luaState, -1)) {
+                auto ret = std::string(lua_tostring(luaState, -1));
+                ClearStack(luaState);
+                return ret;
+            }
+        }
+    }
+    ClearStack(luaState);
+    return 0;
+}
+
+void TLuaFile::SetPluginName(const std::string& Name) {
+    mPluginName = Name;
+}
+
+void TLuaFile::SetFileName(const std::string& Name) {
+    mFileName = Name;
+}
+
+void TLuaFile::Load() {
+    Assert(mLuaState);
+    luaL_openlibs(mLuaState);
+    lua_register(mLuaState, "GetPlayerIdentifiers", lua_GetIdentifiers);
+    lua_register(mLuaState, "TriggerGlobalEvent", lua_TriggerEventG);
+    lua_register(mLuaState, "TriggerLocalEvent", lua_TriggerEventL);
+    lua_register(mLuaState, "TriggerClientEvent", lua_RemoteEvent);
+    lua_register(mLuaState, "GetPlayerCount", lua_GetPlayerCount);
+    lua_register(mLuaState, "isPlayerConnected", lua_isConnected);
+    lua_register(mLuaState, "RegisterEvent", lua_RegisterEvent);
+    lua_register(mLuaState, "GetPlayerName", lua_GetPlayerName);
+    lua_register(mLuaState, "RemoveVehicle", lua_RemoveVehicle);
+    lua_register(mLuaState, "GetPlayerDiscordID", lua_TempFix);
+    lua_register(mLuaState, "CreateThread", lua_CreateThread);
+    lua_register(mLuaState, "GetPlayerVehicles", lua_GetCars);
+    lua_register(mLuaState, "SendChatMessage", lua_sendChat);
+    lua_register(mLuaState, "GetPlayers", lua_GetAllPlayers);
+    lua_register(mLuaState, "GetPlayerGuest", lua_GetGuest);
+    lua_register(mLuaState, "StopThread", lua_StopThread);
+    lua_register(mLuaState, "DropPlayer", lua_dropPlayer);
+    lua_register(mLuaState, "GetPlayerHWID", lua_HWID);
+    lua_register(mLuaState, "exit", lua_ServerExit);
+    lua_register(mLuaState, "Sleep", lua_Sleep);
+    lua_register(mLuaState, "print", lua_Print);
+    lua_register(mLuaState, "Set", lua_Set);
+    if (!mConsole)
+        Reload();
+}
+
+void TLuaFile::RegisterEvent(const std::string& Event, const std::string& FunctionName) {
+    mRegisteredEvents.insert(std::make_pair(Event, FunctionName));
+}
+
+void TLuaFile::UnRegisterEvent(const std::string& Event) {
+    for (const std::pair<std::string, std::string>& a : mRegisteredEvents) {
+        if (a.first == Event) {
+            mRegisteredEvents.erase(a);
+            break;
+        }
+    }
+}
+
+bool TLuaFile::IsRegistered(const std::string& Event) {
+    for (const std::pair<std::string, std::string>& a : mRegisteredEvents) {
+        if (a.first == Event)
+            return true;
+    }
+    return false;
+}
+
+std::string TLuaFile::GetRegistered(const std::string& Event) const {
+    for (const std::pair<std::string, std::string>& a : mRegisteredEvents) {
+        if (a.first == Event)
+            return a.second;
+    }
+    return "";
+}
+
+std::string TLuaFile::GetFileName() const {
+    return mFileName;
+}
+
+std::string TLuaFile::GetPluginName() const {
+    return mPluginName;
+}
+
+lua_State* TLuaFile::GetState() {
+    return mLuaState;
+}
+
+const lua_State* TLuaFile::GetState() const {
+    return mLuaState;
+}
+
+void TLuaFile::SetLastWrite(fs::file_time_type time) {
+    mLastWrote = time;
+}
+fs::file_time_type TLuaFile::GetLastWrite() {
+    return mLastWrote;
+}
+
+TLuaFile::~TLuaFile() {
+    info("closing lua state");
+    lua_close(mLuaState);
+}
+
+void SendError(TLuaEngine& Engine, lua_State* L, const std::string& msg) {
+    Assert(L);
+    auto MaybeS = Engine.GetScript(L);
+    std::string a;
+    if (!MaybeS.has_value()) {
+        a = ("_Console");
+    } else {
+        TLuaFile& S = MaybeS.value();
+        a = fs::path(S.GetFileName()).filename().string();
+    }
+    warn(a + (" | Incorrect Call of ") + msg);
+}
+
+int lua_TempFix(lua_State* L) {
+    if (lua_isnumber(L, 1)) {
+        int ID = int(lua_tonumber(L, 1));
+        auto MaybeClient = GetClient(Engine().Server(), ID);
+        if (!MaybeClient || MaybeClient.value().expired())
+            return 0;
+        std::string Ret;
+        auto c = MaybeClient.value().lock();
+        if (c->IsGuest()) {
+            Ret = "Guest-" + c->GetName();
+        } else
+            Ret = c->GetName();
+        lua_pushstring(L, Ret.c_str());
+    } else
+        SendError(Engine(), L, "GetDID not enough arguments");
+    return 1;
+}
+
+void TLuaArg::PushArgs(lua_State* State) {
+    for (std::any arg : args) {
+        if (!arg.has_value()) {
+            error("arg didn't have a value, this is not expected, bad");
+            return;
+        }
+        const auto& Type = arg.type();
+        if (Type == typeid(bool)) {
+            lua_pushboolean(State, std::any_cast<bool>(arg));
+        } else if (Type == typeid(std::string)) {
+            lua_pushstring(State, std::any_cast<std::string>(arg).c_str());
+        } else if (Type == typeid(const char*)) {
+            lua_pushstring(State, std::any_cast<const char*>(arg));
+        } else if (Type == typeid(int)) {
+            lua_pushinteger(State, std::any_cast<int>(arg));
+        } else if (Type == typeid(float)) {
+            lua_pushnumber(State, std::any_cast<float>(arg));
+        } else if (Type == typeid(double)) {
+            lua_pushnumber(State, std::any_cast<double>(arg));
+        } else {
+            // if this happens, implement a sane behavior for that value
+            error("what in the hell is " + std::string(arg.type().name()));
+        }
+    }
+}

src/TLuaPlugin.cpp

@@ -1,52 +0,0 @@
-#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/TPPSMonitor.cpp

@@ -4,29 +4,24 @@
 
 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
+        // hard spi
-        std::this_thread::yield();
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
     }
-    beammp_debug("PPSMonitor starting");
+    info("PPSMonitor starting");
-    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Good);
     std::vector<std::shared_ptr<TClient>> TimedOutClients;
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
         std::this_thread::sleep_for(std::chrono::seconds(1));
         int C = 0, V = 0;
         if (mServer.ClientCount() == 0) {
@@ -48,7 +43,7 @@ void TPPSMonitor::operator()() {
             }
             // 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());
+                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);
             }
 

src/TPluginMonitor.cpp

@@ -1,75 +0,0 @@
-#include "TPluginMonitor.h"
-
-#include "TLuaEngine.h"
-
-TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine)
-    : mEngine(Engine)
-    , mPath(Path) {
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Starting);
-    if (!fs::exists(mPath)) {
-        fs::create_directories(mPath);
-    }
-    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
-        // TODO: trigger an event when a subfolder file changes
-        if (Entry.is_regular_file()) {
-            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
-        }
-    }
-
-    Application::RegisterShutdownHandler([this] {
-        if (mThread.joinable()) {
-            mThread.join();
-        }
-    });
-
-    Start();
-}
-
-void TPluginMonitor::operator()() {
-    RegisterThread("PluginMonitor");
-    beammp_info("PluginMonitor started");
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Good);
-    while (!Application::IsShuttingDown()) {
-        std::vector<std::string> ToRemove;
-        for (const auto& Pair : mFileTimes) {
-            try {
-                auto CurrentTime = fs::last_write_time(Pair.first);
-                if (CurrentTime > Pair.second) {
-                    mFileTimes[Pair.first] = CurrentTime;
-                    // grandparent of the path should be Resources/Server
-                    if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
-                        beammp_infof("File \"{}\" changed, reloading", Pair.first);
-                        // is in root folder, so reload
-                        std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
-                        auto Size = std::filesystem::file_size(Pair.first);
-                        auto Contents = std::make_shared<std::string>();
-                        Contents->resize(Size);
-                        FileStream.read(Contents->data(), Contents->size());
-                        TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
-                        auto StateID = mEngine->GetStateIDForPlugin(fs::path(Pair.first).parent_path());
-                        auto Res = mEngine->EnqueueScript(StateID, Chunk);
-                        Res->WaitUntilReady();
-                        if (Res->Error) {
-                            beammp_lua_errorf("Error while hot-reloading \"{}\": {}", Pair.first, Res->ErrorMessage);
-                        } else {
-                            mEngine->ReportErrors(mEngine->TriggerLocalEvent(StateID, "onInit"));
-                            mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
-                        }
-                    } else {
-                        // is in subfolder, dont reload, just trigger an event
-                        beammp_debugf("File \"{}\" changed, not reloading because it's in a subdirectory. Triggering 'onFileChanged' event instead", Pair.first);
-                        mEngine->ReportErrors(mEngine->TriggerEvent("onFileChanged", "", Pair.first));
-                    }
-                }
-            } catch (const std::exception& e) {
-                ToRemove.push_back(Pair.first);
-            }
-        }
-        Application::SleepSafeSeconds(3);
-        for (const auto& File : ToRemove) {
-            mFileTimes.erase(File);
-            beammp_warnf("File \"{}\" couldn't be accessed, so it was removed from plugin hot reload monitor (probably got deleted)", File);
-        }
-    }
-    Application::SetSubsystemStatus("PluginMonitor", Application::Status::Shutdown);
-}

src/TResourceManager.cpp

@@ -6,7 +6,6 @@
 namespace fs = std::filesystem;
 
 TResourceManager::TResourceManager() {
-    Application::SetSubsystemStatus("ResourceManager", Application::Status::Starting);
     std::string Path = Application::Settings.Resource + "/Client";
     if (!fs::exists(Path))
         fs::create_directories(Path);
@@ -14,11 +13,11 @@ TResourceManager::TResourceManager() {
         std::string File(entry.path().string());
         if (auto pos = File.find(".zip"); pos != std::string::npos) {
             if (File.length() - pos == 4) {
-                std::replace(File.begin(), File.end(), '\\', '/');
+                std::replace(File.begin(), File.end(),'\\','/');
                 mFileList += File + ';';
-                if (auto i = File.find_last_of('/'); i != std::string::npos) {
+                if(auto i = File.find_last_of('/'); i != std::string::npos){
                     ++i;
-                    File = File.substr(i, pos - i);
+                    File = File.substr(i,pos-i);
                 }
                 mTrimmedList += "/" + fs::path(File).filename().string() + ';';
                 mFileSizes += std::to_string(size_t(fs::file_size(entry.path()))) + ';';
@@ -28,9 +27,6 @@ TResourceManager::TResourceManager() {
         }
     }
 
-    if (mModsLoaded) {
+    if (mModsLoaded)
-        beammp_info("Loaded " + std::to_string(mModsLoaded) + " Mods");
+        info("Loaded " + std::to_string(mModsLoaded) + " Mods");
-    }
-
-    Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
 }

src/TScopedTimer.cpp

@@ -1,27 +0,0 @@
-#include "TScopedTimer.h"
-#include "Common.h"
-
-TScopedTimer::TScopedTimer()
-    : mStartTime(std::chrono::high_resolution_clock::now()) {
-}
-
-TScopedTimer::TScopedTimer(const std::string& mName)
-    : mStartTime(std::chrono::high_resolution_clock::now())
-    , Name(mName) {
-}
-
-TScopedTimer::TScopedTimer(std::function<void(size_t)> OnDestroy)
-    : OnDestroy(OnDestroy)
-    , mStartTime(std::chrono::high_resolution_clock::now()) {
-}
-
-TScopedTimer::~TScopedTimer() {
-    auto EndTime = std::chrono::high_resolution_clock::now();
-    auto Delta = EndTime - mStartTime;
-    size_t TimeDelta = Delta / std::chrono::milliseconds(1);
-    if (OnDestroy) {
-        OnDestroy(TimeDelta);
-    } else {
-        beammp_info("Scoped timer: \"" + Name + "\" took " + std::to_string(TimeDelta) + "ms ");
-    }
-}

src/TSentry.cpp

@@ -6,14 +6,15 @@
 #include <sstream>
 
 TSentry::TSentry() {
-    if (std::strlen(S_DSN) == /* DISABLES CODE */ (0)) {
+    if (std::strlen(S_DSN) == 0) {
         mValid = false;
     } else {
         mValid = true;
         sentry_options_t* options = sentry_options_new();
         sentry_options_set_dsn(options, S_DSN);
-        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersionString();
+        sentry_options_set_debug(options, false); // needs to always be false
         sentry_options_set_symbolize_stacktraces(options, true);
+        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersion();
         sentry_options_set_release(options, ReleaseString.c_str());
         sentry_options_set_max_breadcrumbs(options, 10);
         sentry_init(options);
@@ -31,22 +32,22 @@ void TSentry::PrintWelcome() {
         if (!Application::Settings.SendErrors) {
             mValid = false;
             if (Application::Settings.SendErrorsMessageEnabled) {
-                beammp_info("Opted out of error reporting (SendErrors), Sentry disabled.");
+                info("Opted out of error reporting (SendErrors), Sentry disabled.");
             } else {
-                beammp_info("Sentry disabled");
+                info("Sentry disabled");
             }
         } else {
             if (Application::Settings.SendErrorsMessageEnabled) {
-                beammp_info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
+                info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
             } else {
-                beammp_info("Sentry started");
+                info("Sentry started");
             }
         }
     } else {
         if (Application::Settings.SendErrorsMessageEnabled) {
-            beammp_info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
+            info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
         } else {
-            beammp_info("Sentry disabled in unofficial build");
+            info("Sentry disabled in unofficial build");
         }
     }
 }
@@ -55,7 +56,6 @@ void TSentry::SetupUser() {
     if (!mValid) {
         return;
     }
-    Application::SetSubsystemStatus("Sentry", Application::Status::Good);
     sentry_value_t user = sentry_value_new_object();
     if (Application::Settings.Key.size() == 36) {
         sentry_value_set_by_key(user, "id", sentry_value_new_string(Application::Settings.Key.c_str()));
@@ -72,7 +72,7 @@ void TSentry::Log(SentryLevel level, const std::string& logger, const std::strin
     SetContext("threads", { { "thread-name", ThreadName(true) } });
     auto Msg = sentry_value_new_message_event(sentry_level_t(level), logger.c_str(), text.c_str());
     sentry_capture_event(Msg);
-    sentry_set_transaction(nullptr);
+    sentry_remove_transaction();
 }
 
 void TSentry::LogError(const std::string& text, const std::string& file, const std::string& line) {

src/TServer.cpp

@@ -1,114 +1,48 @@
 #include "TServer.h"
 #include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
-#include <TLuaPlugin.h>
+#include <TLuaFile.h>
-#include <algorithm>
 #include <any>
 #include <sstream>
 
-#include <nlohmann/json.hpp>
-
-#include "LuaAPI.h"
-
 #undef GetObject // Fixes Windows
 
 #include "Json.h"
 
-static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {
+namespace json = rapidjson;
-    auto IDSep = str.find('-');
-    std::string pid = str.substr(0, IDSep);
-    std::string vid = str.substr(IDSep + 1);
 
-    if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+TServer::TServer(int argc, char** argv) {
-        try {
+    info("BeamMP Server v" + Application::ServerVersion());
-            int PID = stoi(pid);
+    if (argc > 1) {
-            int VID = stoi(vid);
+        Application::Settings.CustomIP = argv[1];
-            return { { PID, VID } };
-        } catch (const std::exception&) {
-            return std::nullopt;
-        }
-    }
-    return std::nullopt;
-}
-
-TEST_CASE("GetPidVid") {
-    SUBCASE("Valid singledigit") {
-        const auto MaybePidVid = GetPidVid("0-1");
-        CHECK(MaybePidVid);
-        auto [pid, vid] = MaybePidVid.value();
-
-        CHECK_EQ(pid, 0);
-        CHECK_EQ(vid, 1);
-    }
-    SUBCASE("Valid doubledigit") {
-        const auto MaybePidVid = GetPidVid("10-12");
-        CHECK(MaybePidVid);
-        auto [pid, vid] = MaybePidVid.value();
-
-        CHECK_EQ(pid, 10);
-        CHECK_EQ(vid, 12);
-    }
-    SUBCASE("Empty string") {
-        const auto MaybePidVid = GetPidVid("");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid separator") {
-        const auto MaybePidVid = GetPidVid("0x0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Missing pid") {
-        const auto MaybePidVid = GetPidVid("-0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Missing vid") {
-        const auto MaybePidVid = GetPidVid("0-");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid pid") {
-        const auto MaybePidVid = GetPidVid("x-0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid vid") {
-        const auto MaybePidVid = GetPidVid("0-x");
-        CHECK(!MaybePidVid);
-    }
-}
-
-TServer::TServer(const std::vector<std::string_view>& Arguments) {
-    beammp_info("BeamMP Server v" + Application::ServerVersionString());
-    Application::SetSubsystemStatus("Server", Application::Status::Starting);
-    if (Arguments.size() > 1) {
-        Application::Settings.CustomIP = Arguments[0];
         size_t n = std::count(Application::Settings.CustomIP.begin(), Application::Settings.CustomIP.end(), '.');
         auto p = Application::Settings.CustomIP.find_first_not_of(".0123456789");
         if (p != std::string::npos || n != 3 || Application::Settings.CustomIP.substr(0, 3) == "127") {
             Application::Settings.CustomIP.clear();
-            beammp_warn("IP Specified is invalid! Ignoring");
+            warn("IP Specified is invalid! Ignoring");
         } else {
-            beammp_info("server started with custom IP");
+            info("server started with custom IP");
         }
     }
-    Application::SetSubsystemStatus("Server", Application::Status::Good);
 }
 
 void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
-    std::shared_ptr<TClient> LockedClientPtr { nullptr };
+    if (!WeakClientPtr.expired()) {
-    try {
+        TClient& Client = *WeakClientPtr.lock();
-        LockedClientPtr = WeakClientPtr.lock();
+        debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
-    } catch (const std::exception&) {
+        Client.ClearCars();
-        // silently fail, as there's nothing to do
+        WriteLock Lock(mClientsMutex);
-        return;
+        mClients.erase(WeakClientPtr.lock());
     }
-    beammp_assert(LockedClientPtr != nullptr);
+}
-    TClient& Client = *LockedClientPtr;
+
-    beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
+std::weak_ptr<TClient> TServer::InsertNewClient() {
-    // TODO: Send delete packets for all cars
+    debug("inserting new client (" + std::to_string(ClientCount()) + ")");
-    Client.ClearCars();
     WriteLock Lock(mClientsMutex);
-    mClients.erase(WeakClientPtr.lock());
+    auto [Iter, Replaced] = mClients.insert(std::make_shared<TClient>(*this));
+    return *Iter;
 }
 
 void TServer::ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
@@ -129,11 +63,12 @@ size_t TServer::ClientCount() const {
     return mClients.size();
 }
 
-void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
+void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
-    constexpr std::string_view ABG = "ABG:";
+    if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
-    if (Packet.size() >= ABG.size() && std::equal(Packet.begin(), Packet.begin() + ABG.size(), ABG.begin(), ABG.end())) {
+        //abort();
-        Packet.erase(Packet.begin(), Packet.begin() + ABG.size());
+    }
-        Packet = DeComp(Packet);
+    if (Packet.substr(0, 4) == "ABG:") {
+        Packet = DeComp(Packet.substr(4));
     }
     if (Packet.empty()) {
         return;
@@ -147,227 +82,215 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
     std::any Res;
     char Code = Packet.at(0);
 
-    std::string StringPacket(reinterpret_cast<const char*>(Packet.data()), Packet.size());
+    //V to Z
-
+    if (Code <= 90 && Code >= 86) {
-    // V to Y
-    if (Code <= 89 && Code >= 86) {
         PPSMonitor.IncrementInternalPPS();
         Network.SendToAll(LockedClient.get(), Packet, false, false);
         return;
     }
     switch (Code) {
     case 'H': // initial connection
+        trace(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
         if (!Network.SyncClient(Client)) {
             // TODO handle
         }
         return;
     case 'p':
-        if (!Network.Respond(*LockedClient, StringToVector("p"), false)) {
+        if (!Network.Respond(*LockedClient, ("p"), false)) {
             // failed to send
-            LockedClient->Disconnect("Failed to send ping");
+            if (LockedClient->GetStatus() > -1) {
+                LockedClient->SetStatus(-1);
+            }
         } else {
             Network.UpdatePlayer(*LockedClient);
         }
         return;
     case 'O':
-        if (Packet.size() > 1000) {
+        if (Packet.length() > 1000) {
-            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.size()));
+            debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.length()));
         }
-        ParseVehicle(*LockedClient, StringPacket, Network);
+        ParseVehicle(*LockedClient, Packet, Network);
         return;
-    case 'C': {
+    case 'J':
-        if (Packet.size() < 4 || std::find(Packet.begin() + 3, Packet.end(), ':') == Packet.end())
+        trace(std::string(("got 'J' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-            break;
+        Network.SendToAll(LockedClient.get(), Packet, false, true);
-        const auto PacketAsString = std::string(reinterpret_cast<const char*>(Packet.data()), Packet.size());
+        return;
-        std::string Message = "";
+    case 'C':
-        const auto ColonPos = PacketAsString.find(':', 3);
+        trace(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        if (ColonPos != std::string::npos && ColonPos + 2 < PacketAsString.size()) {
+        if (Packet.length() < 4 || Packet.find(':', 3) == std::string::npos)
-            Message = PacketAsString.substr(ColonPos + 2);
+            break;
-        }
+        Res = TriggerLuaEvent("onChatMessage", false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 1) } }), true);
-        if (Message.empty()) {
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1)); // FIXME: this needs to be adjusted once lua is merged
-            beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
+        if (std::any_cast<int>(Res))
-            return;
+            break;
-        }
+        Network.SendToAll(nullptr, Packet, true, true);
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
+        return;
-        TLuaEngine::WaitForAll(Futures);
+    case 'E':
-        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
+        trace(std::string(("got 'E' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        if (std::any_of(Futures.begin(), Futures.end(),
+        HandleEvent(*LockedClient, Packet);
-                [](const std::shared_ptr<TLuaResult>& Elem) {
+        return;
-                    return !Elem->Error
+    case 'N':
-                        && Elem->Result.is<int>()
+        trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
-                        && bool(Elem->Result.as<int>());
-                })) {
-            break;
-        }
-        std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
-        Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
-        return;
-    }
-    case 'E':
-        HandleEvent(*LockedClient, StringPacket);
-        return;
-    case 'N':
-        beammp_trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
         Network.SendToAll(LockedClient.get(), Packet, false, true);
         return;
-    case 'Z': // position packet
-        PPSMonitor.IncrementInternalPPS();
-        Network.SendToAll(LockedClient.get(), Packet, false, false);
-        HandlePosition(*LockedClient, StringPacket);
     default:
         return;
     }
 }
 
-void TServer::HandleEvent(TClient& c, const std::string& RawData) {
+void TServer::HandleEvent(TClient& c, const std::string& Data) {
-    // E:Name:Data
+    std::stringstream ss(Data);
-    // Data is allowed to have ':'
+    std::string t, Name;
-    if (RawData.size() < 2) {
+    int a = 0;
-        beammp_debugf("Client '{}' ({}) tried to send an empty event, ignoring", c.GetName(), c.GetID());
+    while (std::getline(ss, t, ':')) {
-        return;
+        switch (a) {
-    }
+        case 1:
-    auto NameDataSep = RawData.find(':', 2);
+            Name = t;
-    if (NameDataSep == std::string::npos) {
+            break;
-        beammp_warn("received event in invalid format (missing ':'), got: '" + RawData + "'");
+        case 2:
-    }
+            TriggerLuaEvent(Name, false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), t } }), false);
-    std::string Name = RawData.substr(2, NameDataSep - 2);
+            break;
-    std::string Data = RawData.substr(NameDataSep + 1);
+        default:
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.GetID(), Data));
+            break;
-}
-
-bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
-    try {
-        auto Car = nlohmann::json::parse(CarJson);
-        const std::string jbm = "jbm";
-        if (Car.contains(jbm) && Car[jbm].is_string() && Car[jbm] == "unicycle") {
-            return true;
         }
-    } catch (const std::exception& e) {
+        if (a == 2)
-        beammp_warn("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'.");
+            break;
+        a++;
+    }
+}
+bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
+    rapidjson::Document Car;
+    Car.Parse(CarJson.c_str(), CarJson.size());
+    if (Car.HasParseError()) {
+        error("Failed to parse vehicle data -> " + CarJson);
+    } else if (Car["jbm"].IsString() && std::string(Car["jbm"].GetString()) == "unicycle") {
+        return true;
     }
     return false;
 }
-
 bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
-    if (IsUnicycle(c, CarJson) && c.GetUnicycleID() < 0) {
+
+    if (c.GetUnicycleID() > -1 && (c.GetCarCount() - 1) < Application::Settings.MaxCars) {
+        return true;
+    }
+
+    if (IsUnicycle(c, CarJson)) {
         c.SetUnicycleID(ID);
         return true;
-    } else {
-        return c.GetCarCount() < Application::Settings.MaxCars;
     }
+
+    return Application::Settings.MaxCars > c.GetCarCount();
 }
 
 void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network) {
-    if (Pckt.length() < 6)
+    if (Pckt.length() < 4)
         return;
     std::string Packet = Pckt;
     char Code = Packet.at(1);
     int PID = -1;
-    int VID = -1;
+    int VID = -1, Pos;
     std::string Data = Packet.substr(3), pid, vid;
-    switch (Code) { // Spawned Destroyed Switched/Moved NotFound Reset
+    switch (Code) { //Spawned Destroyed Switched/Moved NotFound Reset
     case 's':
-        beammp_tracef("got 'Os' packet: '{}' ({})", Packet, Packet.size());
+        trace(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         if (Data.at(0) == '0') {
             int CarID = c.GetOpenCarID();
-            beammp_debugf("'{}' created a car with ID {}", c.GetName(), CarID);
+            debug(c.GetName() + (" created a car with ID ") + std::to_string(CarID));
 
             std::string CarJson = Packet.substr(5);
             Packet = "Os:" + c.GetRoles() + ":" + c.GetName() + ":" + std::to_string(c.GetID()) + "-" + std::to_string(CarID) + ":" + CarJson;
-            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleSpawn", "", c.GetID(), CarID, Packet.substr(3));
+            auto Res = TriggerLuaEvent(("onVehicleSpawn"), false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), CarID, Packet.substr(3) } }), true);
-            TLuaEngine::WaitForAll(Futures);
-            bool ShouldntSpawn = std::any_of(Futures.begin(), Futures.end(),
-                [](const std::shared_ptr<TLuaResult>& Result) {
-                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
-                });
 
-            if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn) {
+            if (ShouldSpawn(c, CarJson, CarID) && std::any_cast<int>(Res) == 0) {
                 c.AddNewCar(CarID, Packet);
-                Network.SendToAll(nullptr, StringToVector(Packet), true, true);
+                Network.SendToAll(nullptr, Packet, true, true);
             } else {
-                if (!Network.Respond(c, StringToVector(Packet), true)) {
+                if (!Network.Respond(c, Packet, true)) {
                     // TODO: handle
                 }
                 std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
-                if (!Network.Respond(c, StringToVector(Destroy), true)) {
+                if (!Network.Respond(c, Destroy, true)) {
                     // TODO: handle
                 }
-                beammp_debugf("{} (force : car limit/lua) removed ID {}", c.GetName(), CarID);
+                debug(c.GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
             }
         }
         return;
-    case 'c': {
+    case 'c':
-        beammp_trace(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        pid = Data.substr(0, Data.find('-'));
-        if (MaybePidVid) {
+        vid = Data.substr(Data.find('-') + 1, Data.find(':', 1) - Data.find('-') - 1);
-            std::tie(PID, VID) = MaybePidVid.value();
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
         }
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleEdited", "", c.GetID(), VID, Packet.substr(3));
+            auto Res = TriggerLuaEvent(("onVehicleEdited"), false, nullptr,
-            TLuaEngine::WaitForAll(Futures);
+                std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), VID, Packet.substr(3) } }),
-            bool ShouldntAllow = std::any_of(Futures.begin(), Futures.end(),
+                true);
-                [](const std::shared_ptr<TLuaResult>& Result) {
-                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
-                });
 
             auto FoundPos = Packet.find('{');
             FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
             if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
-                && !ShouldntAllow) {
+                && std::any_cast<int>(Res) == 0) {
-                Network.SendToAll(&c, StringToVector(Packet), false, true);
+                Network.SendToAll(&c, Packet, false, true);
                 Apply(c, VID, Packet);
             } else {
                 if (c.GetUnicycleID() == VID) {
                     c.SetUnicycleID(-1);
                 }
                 std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(VID);
-                Network.SendToAll(nullptr, StringToVector(Destroy), true, true);
+                if (!Network.Respond(c, Destroy, true)) {
+                    // TODO: handle
+                }
                 c.DeleteCar(VID);
             }
         }
         return;
-    }
+    case 'd':
-    case 'd': {
+        trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        beammp_trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        pid = Data.substr(0, Data.find('-'));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        vid = Data.substr(Data.find('-') + 1);
-        if (MaybePidVid) {
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
-            std::tie(PID, VID) = MaybePidVid.value();
+            PID = stoi(pid);
+            VID = stoi(vid);
         }
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
             if (c.GetUnicycleID() == VID) {
                 c.SetUnicycleID(-1);
             }
-            Network.SendToAll(nullptr, StringToVector(Packet), true, true);
+            Network.SendToAll(nullptr, Packet, true, true);
-            // TODO: should this trigger on all vehicle deletions?
+            TriggerLuaEvent(("onVehicleDeleted"), false, nullptr,
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
+                std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), VID } }), false);
             c.DeleteCar(VID);
-            beammp_debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
+            debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
         }
         return;
-    }
+    case 'r':
-    case 'r': {
+        trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        beammp_trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        Pos = int(Data.find('-'));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        pid = Data.substr(0, Pos++);
-        if (MaybePidVid) {
+        vid = Data.substr(Pos, Data.find(':') - Pos);
-            std::tie(PID, VID) = MaybePidVid.value();
+
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
         }
 
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
             Data = Data.substr(Data.find('{'));
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
+            TriggerLuaEvent("onVehicleReset", false, nullptr,
-            Network.SendToAll(&c, StringToVector(Packet), false, true);
+                std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), VID, Data } }),
+                false);
+            Network.SendToAll(&c, Packet, false, true);
         }
         return;
-    }
     case 't':
-        beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        Network.SendToAll(&c, StringToVector(Packet), false, true);
+        Network.SendToAll(&c, Packet, false, true);
-        return;
-    case 'm':
-        Network.SendToAll(&c, StringToVector(Packet), true, true);
         return;
     default:
-        beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
+        trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
         return;
     }
 }
@@ -375,13 +298,13 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
 void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
     auto FoundPos = pckt.find('{');
     if (FoundPos == std::string::npos) {
-        beammp_error("Malformed packet received, no '{' found");
+        error("Malformed packet received, no '{' found");
         return;
     }
     std::string Packet = pckt.substr(FoundPos);
     std::string VD = c.GetCarData(VID);
     if (VD.empty()) {
-        beammp_error("Tried to apply change to vehicle that does not exist");
+        error("Tried to apply change to vehicle that does not exist");
         auto Lock = Sentry.CreateExclusiveContext();
         Sentry.SetContext("vehicle-change",
             { { "packet", Packet },
@@ -398,18 +321,19 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
         Sentry.SetContext("vehicle-change-packet",
             { { "packet", VD } });
         Sentry.LogError("malformed packet", _file_basename, _line);
+        error("Malformed packet received, no '{' found");
         return;
     }
     VD = VD.substr(FoundPos);
     rapidjson::Document Veh, Pack;
     Veh.Parse(VD.c_str());
     if (Veh.HasParseError()) {
-        beammp_error("Could not get vehicle config!");
+        error("Could not get vehicle config!");
         return;
     }
     Pack.Parse(Packet.c_str());
     if (Pack.HasParseError() || Pack.IsNull()) {
-        beammp_error("Could not get active vehicle config!");
+        error("Could not get active vehicle config!");
         return;
     }
 
@@ -427,40 +351,7 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
 }
 
 void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
-    beammp_debug("inserting client (" + std::to_string(ClientCount()) + ")");
+    debug("inserting client (" + std::to_string(ClientCount()) + ")");
-    WriteLock Lock(mClientsMutex); // TODO why is there 30+ threads locked here
+    WriteLock Lock(mClientsMutex); //TODO why is there 30+ threads locked here
     (void)mClients.insert(NewClient);
 }
-
-void TServer::HandlePosition(TClient& c, const std::string& Packet) {
-    if (Packet.size() < 3) {
-        // invalid packet
-        return;
-    }
-    // Zp:serverVehicleID:data
-    // Zp:0:data
-    std::string withoutCode = Packet.substr(3);
-    auto NameDataSep = withoutCode.find(':', 2);
-    if (NameDataSep == std::string::npos || NameDataSep < 2) {
-        // invalid packet
-        return;
-    }
-    // FIXME: ensure that -2 does what it should... it seems weird.
-    std::string ServerVehicleID = withoutCode.substr(2, NameDataSep - 2);
-    if (NameDataSep + 1 > withoutCode.size()) {
-        // invalid packet
-        return;
-    }
-    std::string Data = withoutCode.substr(NameDataSep + 1);
-
-    // parse veh ID
-    auto MaybePidVid = GetPidVid(ServerVehicleID);
-    if (MaybePidVid) {
-        int PID = -1;
-        int VID = -1;
-        // FIXME: check that the VID and PID are valid, so that we don't waste memory
-        std::tie(PID, VID) = MaybePidVid.value();
-
-        c.SetCarPosition(VID, Data);
-    }
-}

src/VehicleData.cpp

@@ -6,9 +6,9 @@
 TVehicleData::TVehicleData(int ID, std::string Data)
     : mID(ID)
     , mData(std::move(Data)) {
-    beammp_trace("vehicle " + std::to_string(mID) + " constructed");
+    trace("vehicle " + std::to_string(mID) + " constructed");
 }
 
 TVehicleData::~TVehicleData() {
-    beammp_trace("vehicle " + std::to_string(mID) + " destroyed");
+    trace("vehicle " + std::to_string(mID) + " destroyed");
 }

src/main.cpp

@@ -1,143 +1,37 @@
 #include "TSentry.h"
 
-#include "ArgsParser.h"
 #include "Common.h"
+#include "CustomAssert.h"
 #include "Http.h"
-#include "LuaAPI.h"
 #include "SignalHandling.h"
 #include "TConfig.h"
 #include "THeartbeatThread.h"
 #include "TLuaEngine.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
-#include "TPluginMonitor.h"
 #include "TResourceManager.h"
 #include "TServer.h"
 
 #include <iostream>
 #include <thread>
 
-static const std::string sCommandlineArguments = R"(
+// this is provided by the build system, leave empty for source builds
-USAGE: 
+// global, yes, this is ugly, no, it cant be done another way
-    BeamMP-Server [arguments]
+TSentry Sentry {};
-    
-ARGUMENTS:
-    --help              
-                        Displays this help and exits.
-    --config=/path/to/ServerConfig.toml
-                        Absolute or relative path to the 
-                        Server Config file, including the
-                        filename. For paths and filenames with 
-                        spaces, put quotes around the path.
-    --working-directory=/path/to/folder
-                        Sets the working directory of the Server.
-                        All paths are considered relative to this,
-                        including the path given in --config.
-    --version
-                        Prints version info and exits.
 
-EXAMPLES:
+int main(int argc, char** argv) try {
-    BeamMP-Server --config=../MyWestCoastServerConfig.toml
-        Runs the BeamMP-Server and uses the server config file 
-        which is one directory above it and is named
-        'MyWestCoastServerConfig.toml'.
-)";
-
-struct MainArguments {
-    int argc {};
-    char** argv {};
-    std::vector<std::string_view> List;
-    std::string InvokedAs;
-};
-
-int BeamMPServerMain(MainArguments Arguments);
-
-int main(int argc, char** argv) {
-    MainArguments Args { argc, argv, {}, argv[0] };
-    Args.List.reserve(size_t(argc));
-    for (int i = 1; i < argc; ++i) {
-        Args.List.push_back(argv[i]);
-    }
-    int MainRet = 0;
-    try {
-        MainRet = BeamMPServerMain(std::move(Args));
-    } catch (const std::exception& e) {
-        beammp_error("A fatal exception has occurred and the server is forcefully shutting down.");
-        beammp_error(e.what());
-        Sentry.LogException(e, _file_basename, _line);
-        MainRet = -1;
-    }
-    std::exit(MainRet);
-}
-
-int BeamMPServerMain(MainArguments Arguments) {
     setlocale(LC_ALL, "C");
-    Application::InitializeConsole();
-    ArgsParser Parser;
-    Parser.RegisterArgument({ "help" }, ArgsParser::NONE);
-    Parser.RegisterArgument({ "version" }, ArgsParser::NONE);
-    Parser.RegisterArgument({ "config" }, ArgsParser::HAS_VALUE);
-    Parser.RegisterArgument({ "working-directory" }, ArgsParser::HAS_VALUE);
-    Parser.Parse(Arguments.List);
-    if (!Parser.Verify()) {
-        return 1;
-    }
-    if (Parser.FoundArgument({ "help" })) {
-        Application::Console().Internal().set_prompt("");
-        Application::Console().WriteRaw(sCommandlineArguments);
-        return 0;
-    }
-    if (Parser.FoundArgument({ "version" })) {
-        Application::Console().Internal().set_prompt("");
-        Application::Console().WriteRaw("BeamMP-Server v" + Application::ServerVersionString());
-        return 0;
-    }
-
-    std::string ConfigPath = "ServerConfig.toml";
-    if (Parser.FoundArgument({ "config" })) {
-        auto MaybeConfigPath = Parser.GetValueOfArgument({ "config" });
-        if (MaybeConfigPath.has_value()) {
-            ConfigPath = MaybeConfigPath.value();
-            beammp_info("Custom config requested via commandline arguments: '" + ConfigPath + "'");
-        }
-    }
-    if (Parser.FoundArgument({ "working-directory" })) {
-        auto MaybeWorkingDirectory = Parser.GetValueOfArgument({ "working-directory" });
-        if (MaybeWorkingDirectory.has_value()) {
-            beammp_info("Custom working directory requested via commandline arguments: '" + MaybeWorkingDirectory.value() + "'");
-            try {
-                fs::current_path(fs::path(MaybeWorkingDirectory.value()));
-            } catch (const std::exception& e) {
-                beammp_errorf("Could not set working directory to '{}': {}", MaybeWorkingDirectory.value(), e.what());
-            }
-        }
-    }
-
-    Application::SetSubsystemStatus("Main", Application::Status::Starting);
-
-    Application::Console().StartLoggingToFile();
 
     SetupSignalHandlers();
 
     bool Shutdown = false;
-    Application::RegisterShutdownHandler([&Shutdown] {
+    Application::RegisterShutdownHandler([&Shutdown] { Shutdown = true; });
-        beammp_info("If this takes too long, you can press Ctrl+C repeatedly to force a shutdown.");
-        Application::SetSubsystemStatus("Main", Application::Status::ShuttingDown);
-        Shutdown = true;
-    });
-    Application::RegisterShutdownHandler([] {
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", "");
-        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
-    });
 
-    TServer Server(Arguments.List);
+    TServer Server(argc, argv);
-    TConfig Config(ConfigPath);
+    TConfig Config;
-    auto LuaEngine = std::make_shared<TLuaEngine>();
-    LuaEngine->SetServer(&Server);
-    Application::Console().InitializeLuaConsole(*LuaEngine);
 
     if (Config.Failed()) {
-        beammp_info("Closing in 10 seconds");
+        info("Closing in 10 seconds");
         // loop to make it possible to ctrl+c instead
         for (size_t i = 0; i < 20; ++i) {
             std::this_thread::sleep_for(std::chrono::milliseconds(500));
@@ -147,61 +41,25 @@ int BeamMPServerMain(MainArguments Arguments) {
 
     RegisterThread("Main");
 
-    beammp_trace("Running in debug mode on a debug build");
+    trace("Running in debug mode on a debug build");
+
     Sentry.SetupUser();
     Sentry.PrintWelcome();
     TResourceManager ResourceManager;
     TPPSMonitor PPSMonitor(Server);
     THeartbeatThread Heartbeat(ResourceManager, Server);
     TNetwork Network(Server, PPSMonitor, ResourceManager);
-    LuaEngine->SetNetwork(&Network);
+    TLuaEngine LuaEngine(Server, Network);
     PPSMonitor.SetNetwork(Network);
+    Application::Console().InitializeLuaConsole(LuaEngine);
     Application::CheckForUpdates();
 
-    TPluginMonitor PluginMonitor(fs::path(Application::Settings.Resource) / "Server", LuaEngine);
+    // TODO: replace
-
-    if (Application::Settings.HTTPServerEnabled) {
-        Http::Server::THttpServerInstance HttpServerInstance {};
-    }
-
-    Application::SetSubsystemStatus("Main", Application::Status::Good);
-    RegisterThread("Main(Waiting)");
-
-    std::set<std::string> IgnoreSubsystems {
-        "UpdateCheck" // Ignore as not to confuse users (non-vital system)
-    };
-
-    bool FullyStarted = false;
     while (!Shutdown) {
-        if (!FullyStarted) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(50));
-            FullyStarted = true;
-            bool WithErrors = false;
-            std::string SystemsBadList {};
-            auto Statuses = Application::GetSubsystemStatuses();
-            for (const auto& NameStatusPair : Statuses) {
-                if (IgnoreSubsystems.count(NameStatusPair.first) > 0) {
-                    continue; // ignore
-                }
-                if (NameStatusPair.second == Application::Status::Starting) {
-                    FullyStarted = false;
-                } else if (NameStatusPair.second == Application::Status::Bad) {
-                    SystemsBadList += NameStatusPair.first + ", ";
-                    WithErrors = true;
-                }
-            }
-            // remove ", "
-            SystemsBadList = SystemsBadList.substr(0, SystemsBadList.size() - 2);
-            if (FullyStarted) {
-                if (!WithErrors) {
-                    beammp_info("ALL SYSTEMS STARTED SUCCESSFULLY, EVERYTHING IS OKAY");
-                } else {
-                    beammp_error("STARTUP NOT SUCCESSFUL, SYSTEMS " + SystemsBadList + " HAD ERRORS. THIS MAY OR MAY NOT CAUSE ISSUES.");
-                }
-            }
-        }
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
-    Application::SetSubsystemStatus("Main", Application::Status::Shutdown);
+    info("Shutdown.");
-    beammp_info("Shutdown.");
+} catch (const std::exception& e) {
-    return 0;
+    error(e.what());
+    Sentry.LogException(e, _file_basename, _line);
 }

test/test_main.cpp

@@ -1,22 +0,0 @@
-#define DOCTEST_CONFIG_IMPLEMENT
-#include <doctest/doctest.h>
-
-#include <Common.h>
-
-int main(int argc, char** argv) {
-    doctest::Context context;
-
-    // Application::InitializeConsole();
-
-    context.applyCommandLine(argc, argv);
-
-    int res = context.run(); // run
-
-    if (context.shouldExit()) // important - query flags (and --exit) rely on the user doing this
-        return res; // propagate the result of the tests
-
-    int client_stuff_return_code = 0;
-    // your program - if the testing framework is integrated in your production code
-
-    return res + client_stuff_return_code; // the result from doctest is propagated here as well
-}