add section about adding features

Update README.md

.github/workflows/cmake-linux.yml

@@ -7,72 +7,38 @@ env:
 
 jobs:
   linux-build:
-    runs-on: ubuntu-20.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
+          sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
 
-      - 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-20.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 openssl 
-
-      - name: Test
-        working-directory: ${{github.workspace}}
-        shell: bash
-        run: |
-            chmod +x ./BeamMP-Server-tests
-            ./BeamMP-Server-tests

.gitmodules

@@ -25,9 +25,3 @@
 [submodule "deps/json"]
 	path = deps/json
 	url = https://github.com/nlohmann/json
-[submodule "deps/fmt"]
-	path = deps/fmt
-	url = https://github.com/fmtlib/fmt
-[submodule "deps/doctest"]
-	path = deps/doctest
-	url = https://github.com/doctest/doctest

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,39 @@ project(BeamMP-Server
     HOMEPAGE_URL https://beammp.com
     LANGUAGES CXX C)
 
-find_package(Git REQUIRED)
-# Update submodules as needed
-option(GIT_SUBMODULE "Check submodules during build" ON)
-if(GIT_SUBMODULE)
-    message(STATUS "Submodule update")
-    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()
-
-
 set(HTTPLIB_REQUIRE_OPENSSL ON)
-set(SENTRY_BUILD_SHARED_LIBS OFF)
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp")
+include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline")
+include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib")
+include_directories("${PROJECT_SOURCE_DIR}/deps/cpp-httplib")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/json/single_include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps")
+include_directories("${PROJECT_SOURCE_DIR}/deps")
 
-add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT)
 
-# ------------------------ APPLE ---------------------------------
 if(APPLE)
     set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
     set(LUA_LIBRARIES lua)
     include_directories(/usr/local/opt/openssl@1.1/include)
     link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
     link_directories(/usr/local/opt/openssl@1.1/lib)
-# ------------------------ WINDOWS ---------------------------------
+endif()
-elseif (WIN32)
+
+if (WIN32)
     # this has to happen before sentry, so that crashpad on windows links with these settings.
     message(STATUS "MSVC -> forcing use of statically-linked runtime.")
     STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
     STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-# ------------------------ LINUX ---------------------------------
+endif()
-elseif (UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++ -static-libgcc")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -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=undefined,thread")
-    endif (SANITIZE)
-endif ()
 
 include_directories("include/sentry-native/include")
 set(BUILD_SHARED_LIBS OFF)
-# ------------------------ SENTRY ---------------------------------
+if (MSVC)
+    set(SENTRY_BUILD_RUNTIMESTATIC ON)
+endif()
 message(STATUS "Checking for Sentry URL")
 # this is set by the build system.
 # IMPORTANT: if you're building from source, just leave this empty
@@ -74,125 +50,120 @@ if (NOT DEFINED BEAMMP_SECRET_SENTRY_URL)
     set(BEAMMP_SECRET_SENTRY_URL "")
     set(SENTRY_BACKEND none)
 else()
+    string(LENGTH ${BEAMMP_SECRET_SENTRY_URL} URL_LEN)
+    message(STATUS "Sentry URL is length ${URL_LEN}")
     set(SENTRY_BACKEND breakpad)
 endif()
 add_subdirectory("deps/sentry-native")
 
-# ------------------------ C++ SETUP ---------------------------------
-set(CMAKE_CXX_STANDARD 17)
 if (MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 endif ()
 
-# ------------------------ DEPENDENCIES ------------------------------
 message(STATUS "Adding local source dependencies")
 # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
 add_subdirectory(deps)
 
-# ------------------------ VARIABLES ---------------------------------
+message(STATUS "Setting compiler flags")
-
-include(FindLua)
-include(FindOpenSSL)
-include(FindThreads)
-include(FindZLIB)
-
-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
-)
-
-set(BeamMP_Includes
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/commandline"
-    ${LUA_INCLUDE_DIR}
-    ${CURL_INCLUDE_DIRS}
-    "include/tomlplusplus"
-    "include/sentry-native/include"
-    "include/curl/include"
-)
-
-set(BeamMP_Definitions
-    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
-)
-
-set(BeamMP_Libraries
-    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)
+
+    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
+    set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
+    include_directories(${VcpkgRoot}/include)
+    link_directories(${VcpkgRoot}/lib)
+elseif (UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
+    if (SANITIZE)
+        message(STATUS "sanitize is ON")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,thread")
+    endif (SANITIZE)
 endif ()
 
-# ------------------------ BEAMMP SERVER -----------------------------
+
+
+set(CMAKE_CXX_STANDARD 17)
+
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 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/TLuaPlugin.h src/TLuaPlugin.cpp
+        include/TResourceManager.h src/TResourceManager.cpp
+        include/THeartbeatThread.h src/THeartbeatThread.cpp
+        include/Http.h src/Http.cpp
+        include/TSentry.h src/TSentry.cpp
+        include/TPPSMonitor.h src/TPPSMonitor.cpp
+        include/TNetwork.h src/TNetwork.cpp
+        include/LuaAPI.h src/LuaAPI.cpp
+        include/TScopedTimer.h src/TScopedTimer.cpp
+        include/SignalHandling.h src/SignalHandling.cpp
+        include/ArgsParser.h src/ArgsParser.cpp
+        include/Environment.h)
 
-target_compile_definitions(BeamMP-Server PRIVATE
+target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}")
-    ${BeamMP_Definitions}
+include_directories(BeamMP-Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-    DOCTEST_CONFIG_DISABLE
-)
 
 target_include_directories(BeamMP-Server PUBLIC 
-    ${BeamMP_Includes}
+    "${CMAKE_CURRENT_SOURCE_DIR}/include" 
-)
+    "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
 
-target_link_libraries(BeamMP-Server
+if (APPLE)
-    ${BeamMP_Libraries}
+    message(STATUS "NOT looking for Lua on APPLE")
-    ${BeamMP_PlatformLibs}
+else()
-)
+    message(STATUS "Looking for Lua")
-
+    find_package(Lua REQUIRED VERSION 5.3)
-# ------------------------ 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_include_directories(BeamMP-Server-tests PUBLIC
-        ${BeamMP_Includes}
-    )
-
-    target_link_libraries(BeamMP-Server-tests
-        ${BeamMP_Libraries}
-        ${BeamMP_PlatformLibs}
-    )
 endif()
 
+target_include_directories(BeamMP-Server PUBLIC 
+    ${LUA_INCLUDE_DIR} 
+    ${CURL_INCLUDE_DIRS}
+    "include/tomlplusplus" 
+    "include/sentry-native/include"
+    "include/curl/include")
+
+message(STATUS "Looking for SSL")
+
+if (APPLE)
+    set(OPENSSL_LIBRARIES ssl crypto)
+else()
+    find_package(OpenSSL REQUIRED)
+endif()
+
+target_link_libraries(BeamMP-Server sol2::sol2 ${LUA_LIBRARIES})
+message(STATUS "CURL IS ${CURL_LIBRARIES}")
+
+if (UNIX)
+    target_link_libraries(BeamMP-Server
+        z 
+        pthread
+        ${LUA_LIBRARIES} 
+        crypto
+        ${OPENSSL_LIBRARIES} 
+        commandline 
+        sentry
+        ssl)
+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})
+    target_link_libraries(BeamMP-Server
+        ws2_32 
+        ZLIB::ZLIB 
+        ${LUA_LIBRARIES} 
+        ${OPENSSL_LIBRARIES} 
+        commandline
+        sentry)
+endif ()

CONTRIBUTING.md

@@ -0,0 +1,111 @@
+# 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,19 +1,3 @@
-
-# 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 MP.JsonEncode() and MP.JsonDecode(), which turn lua tables into json and vice-versa
-- ADDED FS.ListFiles and FS.ListDirectories
-- ADDED onFileChanged event, triggered when a server plugin file changes
-- FIXED `ip` in MP.GetIdentifiers
-- 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
-
 # v3.0.2
 
 - ADDED Periodic update message if a new server is released

README.md

@@ -4,9 +4,9 @@
 [![CMake Linux Build](https://github.com/BeamMP/BeamMP-Server/workflows/CMake%20Linux%20Build/badge.svg?branch=master)](https://github.com/BeamMP/BeamMP-Server/actions?query=workflow%3A%22CMake+Linux+Build%22)
 
 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
-The server is the point throug which all clients communicate. You can write lua mods for the server, detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
+The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
 
-**For Linux, you __need__ the runtime dependencies, listed below under "prerequisites".**
+**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**
 
 ## Support + Contact
 
@@ -14,6 +14,7 @@ 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
 
@@ -28,13 +29,13 @@ 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" label or with nobody assigned, any [trello](https://trello.com/b/Kw75j3zZ/beamngdrive-multiplayer) cards in the "To-Do" column.
+TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" label or with nobody assigned.
 
-To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues) 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.
+To contribute, look at the active [issues](https://github.com/BeamMP/BeamMP-Server/issues). Any issues that have the "help wanted" label or don't have anyone assigned are good tasks to take on. You can either contribute by programming or by testing and adding more info and ideas.
 
 Fork this repository, make a new branch for your feature, implement your feature or fix, and then create a pull-request here. Even incomplete features and fixes can be pull-requested.
 
-If you need support with understanding the codebase, please write us in the discord. You'll need to be proficient in modern C++.
+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
 
@@ -42,7 +43,7 @@ We only allow building unmodified (original) source code for public use. `master
 
 ## 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. 
 
@@ -52,7 +53,7 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea
 
 **__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.3.3`!__**
 
-Currently only linux and windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
+Currently only Linux and Windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
 
 ### Prerequisites
 
@@ -60,7 +61,7 @@ Currently only linux and windows are supported (generally). See [Releases](https
 
 Please use the prepackaged binaries in [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
 
-Dependencies for **windows** can be installed with `vcpkg`.
+Dependencies for **Windows** can be installed with `vcpkg`.
 These are:
 ```
 lua
@@ -73,19 +74,15 @@ curl
 
 #### Linux
 
-These package names are in the debian / ubuntu style. Feel free to PR your own guide for a different distro.
+Runtime dependencies - you want to find packages for:
+- libz
+- rapidjson
+- lua5.3
+- ssl / openssl
+- websocketpp
+- curl (with ssl support)
 
-Runtime dependencies for **linux** are (debian/ubuntu):
+Build-time dependencies are:
-```
-libz-dev
-rapidjson-dev
-liblua5.3
-libssl-dev
-libwebsocketpp-dev
-libcurl4-openssl-dev
-```
-
-Build-time dependencies for **linux** are:
 ```
 git
 make
@@ -93,29 +90,24 @@ cmake
 g++
 ```
 
-For other distributions (e.g. Arch) you want to find packages for:
-- libz
-- rapidjson
-- lua5.3
-- ssl / openssl
-- websocketpp
-- curl (with ssl support)
-- \+ the build time dependencies from above
-
 ### 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 --recurse-submodules https://github.com/BeamMP/BeamMP-Server`. 
-3. Ensure that all submodules are initialized by running `git submodule update --init --recursive`. Then change into the cloned directory by running `cd BeamMP-Server`.
+3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`. 
-4. Checkout the branch of the release you want to compile (`master` is often unstable), for example `git checkout tags/v3.0.1` for version 3.0.1. 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, 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).
-5. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
+5. Ensure that all submodules are initialized by running `git submodule update --init --recursive`
-6. Run `make`
+6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
-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.
+7. Run `make`
+8. 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-installation) 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,7 +1,9 @@
-include_directories("${PROJECT_SOURCE_DIR}/deps")
+include_directories("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
 include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
+include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
+include_directories("${PROJECT_SOURCE_DIR}/deps")
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest")

include/Common.h

@@ -8,18 +8,12 @@ extern TSentry Sentry;
 #include <cstring>
 #include <deque>
 #include <filesystem>
-#include <fmt/format.h>
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <shared_mutex>
 #include <sstream>
 #include <zlib.h>
 
-#include <doctest/doctest.h>
-#include <filesystem>
-namespace fs = std::filesystem;
-
 #include "Compat.h"
 
 #include "TConsole.h"
@@ -56,7 +50,6 @@ public:
         bool DebugModeEnabled { false };
         int Port { 30814 };
         std::string CustomIP {};
-        bool LogChat { true };
         bool SendErrors { true };
         bool SendErrorsMessageEnabled { true };
         int HTTPServerPort { 8080 };
@@ -97,8 +90,6 @@ public:
     static void CheckForUpdates();
     static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
     static bool IsOutdated(const Version& Current, const Version& Newest);
-    static bool IsShuttingDown();
-    static void SleepSafeSeconds(size_t Seconds);
 
     static void InitializeConsole() {
         if (!mConsole) {
@@ -124,144 +115,99 @@ public:
     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 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, 0 };
+    static inline Version mVersion { 3, 0, 2 };
 };
 
 std::string ThreadName(bool DebugModeOverride = false);
 void RegisterThread(const std::string& str);
 #define RegisterThreadAuto() RegisterThread(__func__)
 
-#define KB 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()")
 
+// we would like the full function signature 'void a::foo() const'
+// on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
+// feel free to add more
+#if defined(WIN32)
+#define _function_name std::string(__FUNCSIG__)
+#elif defined(__unix) || defined(__unix__)
+#define _function_name std::string(__PRETTY_FUNCTION__)
+#else
+#define _function_name std::string(__func__)
+#endif
+
+#if defined(DEBUG)
+
+// if this is defined, we will show the full function signature infront of
+// each info/debug/warn... call instead of the 'filename:line' format.
+#if defined(BMP_FULL_FUNCTION_NAMES)
+#define _this_location (ThreadName() + _function_name + " ")
+#else
+#define _this_location (ThreadName() + _file_basename + ":" + _line + " ")
+#endif
+#define SU_RAW SSU_UNRAW
+
+#else // !defined(DEBUG)
+
+#define SU_RAW RAWIFY(SSU_UNRAW)
+#define _this_location (ThreadName())
+
+#endif // defined(DEBUG)
+
+#define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
+#define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
+#define beammp_error(x)                                                               \
+    do {                                                                              \
+        Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
+        Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                        \
+    } while (false)
+#define beammp_lua_error(x)                                                               \
+    do {                                                                                  \
+        Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x)); \
+    } while (false)
+#define beammp_lua_warn(x)                                                               \
+    do {                                                                                 \
+        Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x)); \
+    } while (false)
+#define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
+#define beammp_debug(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
+        }                                                                                 \
+    } while (false)
+#define beammp_event(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
+        }                                                                                 \
+    } while (false)
 // for those times when you just need to ignore something :^)
 // explicity disables a [[nodiscard]] warning
 #define beammp_ignore(x) (void)x
-
+// trace() is a debug-build debug()
-// clang-format off
-#ifdef DOCTEST_CONFIG_DISABLE
-
-    // we would like the full function signature 'void a::foo() const'
-    // on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
-    // feel free to add more
-    #if defined(WIN32)
-        #define _function_name std::string(__FUNCSIG__)
-    #elif defined(__unix) || defined(__unix__)
-        #define _function_name std::string(__PRETTY_FUNCTION__)
-    #else
-        #define _function_name std::string(__func__)
-    #endif
-    
-    #ifndef NDEBUG
-        #define DEBUG
-    #endif
-    
-    #if defined(DEBUG)
-        
-        // if this is defined, we will show the full function signature infront of
-        // each info/debug/warn... call instead of the 'filename:line' format.
-        #if defined(BMP_FULL_FUNCTION_NAMES)
-            #define _this_location (ThreadName() + _function_name + " ")
-        #else
-            #define _this_location (ThreadName() + _file_basename + ":" + _line + " ")
-        #endif
-
-    #endif // defined(DEBUG)
-    
-    #define beammp_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
+#define beammp_trace(x)                                                                   \
+    do {                                                                                  \
+        if (Application::Settings.DebugModeEnabled) {                                     \
+            Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
+        }                                                                                 \
+    } while (false)
 #else
-    #define SU_RAW RAWIFY(SSU_UNRAW)
+#define beammp_trace(x)
-    #define _this_location (ThreadName())
+#endif // defined(DEBUG)
-#endif
-
-// clang-format on
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg);
 

include/Compat.h

@@ -6,10 +6,10 @@
 
 #ifdef BEAMMP_LINUX
 #include <arpa/inet.h>
-#include <errno.h>
 #include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+#include <errno.h>
 using SOCKET = int;
 using DWORD = unsigned long;
 using PDWORD = unsigned long*;
@@ -25,10 +25,10 @@ inline void CloseSocketProper(int TheSocket) {
 
 #ifdef BEAMMP_APPLE
 #include <arpa/inet.h>
-#include <errno.h>
 #include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+#include <errno.h>
 using SOCKET = int;
 using DWORD = unsigned long;
 using PDWORD = unsigned long*;
@@ -48,11 +48,6 @@ inline void CloseSocketProper(int TheSocket) {
 inline void CloseSocketProper(SOCKET TheSocket) {
     shutdown(TheSocket, 2); // 2 == SD_BOTH
     closesocket(TheSocket);
+
 }
 #endif // WIN32
-
-#ifdef INVALID_SOCKET
-static inline constexpr int BEAMMP_INVALID_SOCKET = INVALID_SOCKET;
-#else
-static inline constexpr int BEAMMP_INVALID_SOCKET = -1;
-#endif

include/Http.h

@@ -3,6 +3,8 @@
 #include <Common.h>
 #include <IThreaded.h>
 #include <filesystem>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
 #include <string>
 #include <unordered_map>
 
@@ -17,6 +19,10 @@
 
 namespace fs = std::filesystem;
 
+namespace Crypto {
+constexpr size_t RSA_DEFAULT_KEYLENGTH { 2048 };
+}
+
 namespace Http {
 std::string GET(const std::string& host, int port, const std::string& target, unsigned int* status = nullptr);
 std::string POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr, const httplib::Headers& headers = {});
@@ -26,9 +32,13 @@ namespace Status {
 const std::string ErrorString = "-1";
 
 namespace Server {
+    void SetupEnvironment();
+    // todo: Add non TLS Server Instance, this one is TLS only
     class THttpServerInstance {
     public:
         THttpServerInstance();
+        static fs::path KeyFilePath;
+        static fs::path CertFilePath;
 
     protected:
         void operator()();
@@ -36,5 +46,15 @@ namespace Server {
     private:
         std::thread mThread;
     };
+    // todo: all of these functions are likely unsafe,
+    // todo: replace with something that's managed by a domain specific crypto library
+    class Tx509KeypairGenerator {
+    public:
+        static long GenerateRandomId();
+        static bool EnsureTLSConfigExists();
+        static X509* GenerateCertificate(EVP_PKEY& pkey);
+        static EVP_PKEY* GenerateKey();
+        static void GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath);
+    };
 }
 }

include/LuaAPI.h

@@ -12,8 +12,7 @@ namespace MP {
 
     std::string GetOSName();
     std::tuple<int, int, int> GetServerVersion();
-    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
+    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data);
-    bool TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
     inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
     void DropPlayer(int ID, std::optional<std::string> MaybeReason);
     void SendChatMessage(int ID, const std::string& Message);
@@ -23,15 +22,7 @@ namespace MP {
     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);

include/TConfig.h

@@ -3,7 +3,6 @@
 #include "Common.h"
 
 #include <atomic>
-#include <filesystem>
 
 #define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
 #include <toml11/toml.hpp> // header-only version of TOML++
@@ -19,7 +18,7 @@ public:
     void FlushToFile();
 
 private:
-    void CreateConfigFile();
+    void CreateConfigFile(std::string_view name);
     void ParseFromFile(std::string_view name);
     void PrintDebug();
     void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue);

include/TConsole.h

@@ -4,11 +4,6 @@
 #include "commandline.h"
 #include <atomic>
 #include <fstream>
-#include <functional>
-#include <string>
-#include <tuple>
-#include <unordered_map>
-#include <vector>
 
 class TLuaEngine;
 
@@ -27,33 +22,13 @@ private:
     void RunAsCommand(const std::string& cmd, bool IgnoreNotACommand = false);
     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_Lua(const std::string& cmd);
-    void Command_Help(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Help(const std::string& cmd);
-    void Command_Kick(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Kick(const std::string& cmd);
-    void Command_List(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Say(const std::string& cmd);
-    void Command_Status(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_List(const std::string& cmd);
-    void Command_Settings(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Status(const std::string& cmd);
-    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;

include/THeartbeatThread.h

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

include/TLuaEngine.h

@@ -11,7 +11,6 @@
 #include <memory>
 #include <mutex>
 #include <queue>
-#include <random>
 #include <set>
 #include <toml11/toml.hpp>
 #include <unordered_map>
@@ -34,8 +33,8 @@ static constexpr size_t TLuaArgTypes_Bool = 3;
 class TLuaPlugin;
 
 struct TLuaResult {
-    bool Ready;
+    std::atomic_bool Ready;
-    bool Error;
+    std::atomic_bool Error;
     std::string ErrorMessage;
     sol::object Result { sol::lua_nil };
     TLuaStateId StateId;
@@ -48,7 +47,6 @@ struct TLuaPluginConfig {
     static inline const std::string FileName = "PluginConfig.toml";
     TLuaStateId StateId;
     // TODO: Add execute list
-    // TODO: Build a better toml serializer, or some way to do this in an easier way
 };
 
 struct TLuaChunk {
@@ -60,7 +58,20 @@ struct TLuaChunk {
     std::string PluginPath;
 };
 
-class TLuaEngine : public std::enable_shared_from_this<TLuaEngine>, IThreaded {
+class TPluginMonitor : IThreaded {
+public:
+    TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown);
+
+    void operator()();
+
+private:
+    TLuaEngine& mEngine;
+    fs::path mPath;
+    std::atomic_bool& mShutdown;
+    std::unordered_map<std::string, fs::file_time_type> mFileTimes;
+};
+
+class TLuaEngine : IThreaded {
 public:
     enum CallStrategy : int {
         BestEffort,
@@ -91,7 +102,6 @@ public:
         std::unique_lock Lock(mResultsToCheckMutex);
         return mResultsToCheck.size();
     }
-
     size_t GetLuaStateCount() {
         std::unique_lock Lock(mLuaStatesMutex);
         return mLuaStates.size();
@@ -119,6 +129,7 @@ public:
     [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
     void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);
     void RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName);
+    template <typename... ArgsT>
     /**
      *
      * @tparam ArgsT Template Arguments for the event (Metadata) todo: figure out what this means
@@ -127,7 +138,6 @@ public:
      * @param Args
      * @return
      */
-    template <typename... ArgsT>
     [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerEvent(const std::string& EventName, TLuaStateId IgnoreId, ArgsT&&... Args) {
         std::unique_lock Lock(mLuaEventsMutex);
         beammp_event(EventName);
@@ -147,21 +157,6 @@ public:
         }
         return Results; //
     }
-    template <typename... ArgsT>
-    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerLocalEvent(const TLuaStateId& StateId, const std::string& EventName, ArgsT&&... Args) {
-        std::unique_lock Lock(mLuaEventsMutex);
-        beammp_event(EventName + " in '" + StateId + "'");
-        if (mLuaEvents.find(EventName) == mLuaEvents.end()) { // if no event handler is defined for 'EventName', return immediately
-            return {};
-        }
-        std::vector<std::shared_ptr<TLuaResult>> Results;
-        std::vector<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);
@@ -171,14 +166,6 @@ public:
 
     static constexpr const char* BeamMPFnNotFoundError = "BEAMMP_FN_NOT_FOUND";
 
-    std::vector<std::string> GetStateGlobalKeysForState(TLuaStateId StateId);
-
-    // 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 InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config);
@@ -187,7 +174,7 @@ private:
 
     class StateThreadData : IThreaded {
     public:
-        StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
+        StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine);
         StateThreadData(const StateThreadData&) = delete;
         ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
@@ -198,12 +185,6 @@ private:
         void operator()() override;
         sol::state_view State() { return sol::state_view(mState); }
 
-        std::vector<std::string> GetStateGlobalKeys();
-
-        // 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);
@@ -212,12 +193,10 @@ private:
         std::string Lua_GetPlayerName(int ID);
         sol::table Lua_GetPlayerVehicles(int ID);
         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;
+        std::atomic_bool& mShutdown;
         TLuaStateId mStateId;
         lua_State* mState;
         std::thread mThread;
@@ -230,8 +209,6 @@ private:
         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 {
@@ -246,7 +223,9 @@ private:
 
     TNetwork* mNetwork;
     TServer* mServer;
-    const fs::path mResourceServerPath;
+    TPluginMonitor mPluginMonitor;
+    std::atomic_bool mShutdown { false };
+    fs::path mResourceServerPath;
     std::vector<std::shared_ptr<TLuaPlugin>> mLuaPlugins;
     std::unordered_map<TLuaStateId, std::unique_ptr<StateThreadData>> mLuaStates;
     std::recursive_mutex mLuaStatesMutex;

include/TNetwork.h

@@ -32,6 +32,7 @@ private:
     TServer& mServer;
     TPPSMonitor& mPPSMonitor;
     SOCKET mUDPSock {};
+    bool mShutdown { false };
     TResourceManager& mResourceManager;
     std::thread mUDPThread;
     std::thread mTCPThread;
@@ -47,5 +48,4 @@ private:
     void SendFile(TClient& c, const std::string& Name);
     static bool TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_t Size);
     static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
-    static uint8_t* SendSplit(TClient& c, SOCKET Socket, uint8_t* DataPtr, size_t Size);
 };

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;
-};

src/ArgsParser.cpp

@@ -1,7 +1,6 @@
 #include "ArgsParser.h"
 #include "Common.h"
 #include <algorithm>
-#include <doctest/doctest.h>
 
 void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
     for (const auto& Arg : ArgList) {
@@ -13,7 +12,7 @@ void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
                 ConsumeLongFlag(std::string(Arg));
             }
         } else {
-            beammp_errorf("Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
+            beammp_error("Error parsing commandline arguments: Supplied argument '" + std::string(Arg) + "' is not a valid argument and was ignored.");
         }
     }
 }
@@ -22,7 +21,7 @@ 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));
+            beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' is required but wasn't found.");
             Ok = false;
             continue;
         } else if (FoundArgument(RegisteredArg.Names)) {
@@ -93,78 +92,3 @@ void ArgsParser::ConsumeLongFlag(const std::string& Arg) {
         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

@@ -5,6 +5,8 @@
 #include <memory>
 #include <optional>
 
+// FIXME: add debug prints
+
 void TClient::DeleteCar(int Ident) {
     std::unique_lock lock(mVehicleDataMutex);
     auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {

src/Common.cpp

@@ -12,9 +12,6 @@
 #include "CustomAssert.h"
 #include "Http.h"
 
-// global, yes, this is ugly, no, it cant be done another way
-TSentry Sentry {};
-
 Application::TSettings Application::Settings = {};
 
 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
@@ -25,7 +22,6 @@ void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
 }
 
 void Application::GracefullyShutdown() {
-    SetShutdown(true);
     static bool AlreadyShuttingDown = false;
     static uint8_t ShutdownAttempts = 0;
     if (AlreadyShuttingDown) {
@@ -47,7 +43,6 @@ void Application::GracefullyShutdown() {
         beammp_info("Subsystem " + std::to_string(i + 1) + "/" + std::to_string(mShutdownHandlers.size()) + " shutting down");
         mShutdownHandlers[i]();
     }
-    // std::exit(-1);
 }
 
 std::string Application::ServerVersionString() {
@@ -65,23 +60,7 @@ std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
     return Version;
 }
 
-TEST_CASE("Application::VersionStrToInts") {
+// FIXME: This should be used by operator< on Version
-    auto v = Application::VersionStrToInts("1.2.3");
-    CHECK(v[0] == 1);
-    CHECK(v[1] == 2);
-    CHECK(v[2] == 3);
-
-    v = Application::VersionStrToInts("10.20.30");
-    CHECK(v[0] == 10);
-    CHECK(v[1] == 20);
-    CHECK(v[2] == 30);
-
-    v = Application::VersionStrToInts("100.200.255");
-    CHECK(v[0] == 100);
-    CHECK(v[1] == 200);
-    CHECK(v[2] == 255);
-}
-
 bool Application::IsOutdated(const Version& Current, const Version& Newest) {
     if (Newest.major > Current.major) {
         return true;
@@ -94,65 +73,6 @@ bool Application::IsOutdated(const Version& Current, const Version& Newest) {
     }
 }
 
-bool Application::IsShuttingDown() {
-    std::shared_lock Lock(mShutdownMtx);
-    return mShutdown;
-}
-
-void Application::SleepSafeSeconds(size_t Seconds) {
-    // Sleeps for 500 ms, checks if a shutdown occurred, and so forth
-    for (size_t i = 0; i < Seconds * 2; ++i) {
-        if (Application::IsShuttingDown()) {
-            return;
-        } else {
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        }
-    }
-}
-
-TEST_CASE("Application::IsOutdated (version check)") {
-    SUBCASE("Same version") {
-        CHECK(!Application::IsOutdated({ 1, 2, 3 }, { 1, 2, 3 }));
-    }
-    // we need to use over 1-2 digits to test against lexical comparisons
-    SUBCASE("Patch outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Minor outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major), uint8_t(Minor + 1), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("Major outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor), uint8_t(Patch) }));
-                }
-            }
-        }
-    }
-    SUBCASE("All outdated") {
-        for (uint8_t Patch = 0; Patch < 10; ++Patch) {
-            for (uint8_t Minor = 0; Minor < 10; ++Minor) {
-                for (uint8_t Major = 0; Major < 10; ++Major) {
-                    CHECK(Application::IsOutdated({ uint8_t(Major), uint8_t(Minor), uint8_t(Patch) }, { uint8_t(Major + 1), uint8_t(Minor + 1), uint8_t(Patch + 1) }));
-                }
-            }
-        }
-    }
-}
-
 void Application::SetSubsystemStatus(const std::string& Subsystem, Status status) {
     switch (status) {
     case Status::Good:
@@ -175,20 +95,6 @@ void Application::SetSubsystemStatus(const std::string& Subsystem, Status status
     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;
@@ -246,25 +152,6 @@ 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
@@ -275,18 +162,13 @@ void RegisterThread(const std::string& str) {
     ThreadId = std::to_string(gettid());
 #endif
     if (Application::Settings.DebugModeEnabled) {
-        std::ofstream ThreadFile(".Threads.log", std::ios::app);
+        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)
@@ -297,30 +179,22 @@ Version::Version(const std::array<uint8_t, 3>& v)
 }
 
 std::string Version::AsString() {
-    return fmt::format("{:d}.{:d}.{:d}", major, minor, patch);
+    std::stringstream ss {};
-}
+    ss << int(major) << "." << int(minor) << "." << int(patch);
-
+    return ss.str();
-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 << ThreadName();
-        ss << ThreadName();
+    ss << "[CHAT] ";
-        ss << "[CHAT] ";
+    if (id != -1) {
-        if (id != -1) {
+        ss << "(" << id << ") <" << name << "> ";
-            ss << "(" << id << ") <" << name << "> ";
+    } else {
-        } else {
+        ss << name << "";
-            ss << name << "";
-        }
-        ss << msg;
-#ifdef DOCTEST_CONFIG_DISABLE
-        Application::Console().Write(ss.str());
-#endif
     }
+    ss << msg;
+    Application::Console().Write(ss.str());
 }
 
 std::string GetPlatformAgnosticErrorString() {

src/Compat.cpp

@@ -1,8 +1,5 @@
 #include "Compat.h"
 
-#include <cstring>
-#include <doctest/doctest.h>
-
 #ifndef WIN32
 
 static struct termios old, current;
@@ -23,23 +20,6 @@ void resetTermios(void) {
     tcsetattr(0, TCSANOW, &old);
 }
 
-TEST_CASE("init and reset termios") {
-    if (isatty(STDIN_FILENO)) {
-        struct termios original;
-        tcgetattr(0, &original);
-        SUBCASE("no echo") {
-            initTermios(false);
-        }
-        SUBCASE("yes echo") {
-            initTermios(true);
-        }
-        resetTermios();
-        struct termios current;
-        tcgetattr(0, &current);
-        CHECK(std::memcmp(&original, &current, sizeof(struct termios)) == 0);
-    }
-}
-
 char getch_(int echo) {
     char ch;
     initTermios(echo);

src/Http.cpp

@@ -7,13 +7,17 @@
 #include "httplib.h"
 
 #include <map>
-#include <nlohmann/json.hpp>
 #include <random>
+#include <rapidjson/document.h>
+#include <rapidjson/rapidjson.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
 #include <stdexcept>
-
+fs::path Http::Server::THttpServerInstance::KeyFilePath;
+fs::path Http::Server::THttpServerInstance::CertFilePath;
 // TODO: Add sentry error handling back
 
-using json = nlohmann::json;
+namespace json = rapidjson;
 
 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
     httplib::SSLClient client(host, port);
@@ -142,10 +146,145 @@ std::string Http::Status::ToString(int Code) {
     }
 }
 
-TEST_CASE("Http::Status::ToString") {
+long Http::Server::Tx509KeypairGenerator::GenerateRandomId() {
-    CHECK(Http::Status::ToString(200) == "OK");
+    std::random_device R;
-    CHECK(Http::Status::ToString(696969) == "696969");
+    std::default_random_engine E1(R());
-    CHECK(Http::Status::ToString(-1) == "Invalid Response Code");
+    std::uniform_int_distribution<long> UniformDist(0, ULONG_MAX);
+    return UniformDist(E1);
+}
+
+// Http::Server::THttpServerInstance::THttpServerInstance() { }
+EVP_PKEY* Http::Server::Tx509KeypairGenerator::GenerateKey() {
+    /**
+     * Allocate memory for the pkey
+     */
+    EVP_PKEY* PKey = EVP_PKEY_new();
+    if (PKey == nullptr) {
+        beammp_error("Could not allocate memory for X.509 private key (PKEY) generation.");
+        throw std::runtime_error { std::string { "X.509 PKEY allocation error" } };
+    }
+    BIGNUM* E = BN_new();
+    beammp_assert(E); // TODO: replace all these asserts with beammp_errors
+    unsigned char three = 3;
+    BIGNUM* EErr = BN_bin2bn(&three, sizeof(three), E);
+    beammp_assert(EErr);
+    RSA* Rsa = RSA_new();
+    beammp_assert(Rsa);
+    int Ret = RSA_generate_key_ex(Rsa, Crypto::RSA_DEFAULT_KEYLENGTH, E, nullptr);
+    beammp_assert(Ret == 1);
+    BN_free(E);
+    if (!EVP_PKEY_assign_RSA(PKey, Rsa)) {
+        EVP_PKEY_free(PKey);
+        beammp_error(std::string("Could not generate " + std::to_string(Crypto::RSA_DEFAULT_KEYLENGTH) + "-bit RSA key."));
+        throw std::runtime_error { std::string("X.509 RSA key generation error") };
+    }
+    // todo: figure out if returning by reference instead of passing pointers is a security breach
+    return PKey;
+}
+
+X509* Http::Server::Tx509KeypairGenerator::GenerateCertificate(EVP_PKEY& PKey) {
+    X509* X509 = X509_new();
+    if (X509 == nullptr) {
+        X509_free(X509);
+        beammp_error("Could not allocate memory for X.509 certificate generation.");
+        throw std::runtime_error { std::string("X.509 certificate generation error") };
+    }
+
+    /**Set the metadata of the certificate*/
+    ASN1_INTEGER_set(X509_get_serialNumber(X509), GenerateRandomId());
+
+    /**Set the cert validity to a year*/
+    X509_gmtime_adj(X509_get_notBefore(X509), 0);
+    X509_gmtime_adj(X509_get_notAfter(X509), 31536000L);
+
+    /**Set the public key of the cert*/
+    X509_set_pubkey(X509, &PKey);
+
+    X509_NAME* Name = X509_get_subject_name(X509);
+
+    /**Set cert metadata*/
+    X509_NAME_add_entry_by_txt(Name, "C", MBSTRING_ASC, (unsigned char*)"GB", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(Name, "O", MBSTRING_ASC, (unsigned char*)"BeamMP Ltd.", -1, -1, 0);
+    X509_NAME_add_entry_by_txt(Name, "CN", MBSTRING_ASC, (unsigned char*)"localhost", -1, -1, 0);
+
+    X509_set_issuer_name(X509, Name);
+
+    // TODO: Hashing with sha256 might cause problems, check later
+    if (!X509_sign(X509, &PKey, EVP_sha1())) {
+        X509_free(X509);
+        beammp_error("Could not sign X.509 certificate.");
+        throw std::runtime_error { std::string("X.509 certificate signing error") };
+    }
+    return X509;
+}
+
+void Http::Server::Tx509KeypairGenerator::GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath) {
+    // todo: generate directories for ssl keys
+    FILE* KeyFile = std::fopen(reinterpret_cast<const char*>(KeyFilePath.c_str()), "wb");
+    if (!KeyFile) {
+        beammp_error("Could not create file 'key.pem', check your permissions");
+        throw std::runtime_error("Could not create file 'key.pem'");
+    }
+
+    EVP_PKEY* PKey = Http::Server::Tx509KeypairGenerator::GenerateKey();
+
+    bool WriteOpResult = PEM_write_PrivateKey(KeyFile, PKey, nullptr, nullptr, 0, nullptr, nullptr);
+    fclose(KeyFile);
+
+    if (!WriteOpResult) {
+        beammp_error("Could not write to file 'key.pem', check your permissions");
+        throw std::runtime_error("Could not write to file 'key.pem'");
+    }
+
+    FILE* CertFile = std::fopen(reinterpret_cast<const char*>(CertFilePath.c_str()), "wb"); // x509 file
+    if (!CertFile) {
+        beammp_error("Could not create file 'cert.pem', check your permissions");
+        throw std::runtime_error("Could not create file 'cert.pem'");
+    }
+
+    X509* x509 = Http::Server::Tx509KeypairGenerator::GenerateCertificate(*PKey);
+    WriteOpResult = PEM_write_X509(CertFile, x509);
+    fclose(CertFile);
+
+    if (!WriteOpResult) {
+        beammp_error("Could not write to file 'cert.pem', check your permissions");
+        throw std::runtime_error("Could not write to file 'cert.pem'");
+    }
+    EVP_PKEY_free(PKey);
+    X509_free(x509);
+    return;
+}
+
+bool Http::Server::Tx509KeypairGenerator::EnsureTLSConfigExists() {
+    if (fs::is_regular_file(Application::Settings.SSLKeyPath)
+        && fs::is_regular_file(Application::Settings.SSLCertPath)) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void Http::Server::SetupEnvironment() {
+    if (!Application::Settings.HTTPServerUseSSL) {
+        return;
+    }
+    auto parent = fs::path(Application::Settings.SSLKeyPath).parent_path();
+    if (!fs::exists(parent))
+        fs::create_directories(parent);
+
+    Application::TSettings defaultSettings {};
+    if (!Tx509KeypairGenerator::EnsureTLSConfigExists()) {
+        beammp_warn(std::string("No default TLS Key / Cert found. "
+                                "IF YOU HAVE NOT MODIFIED THE SSLKeyPath OR SSLCertPath VALUES "
+                                "THIS IS NORMAL ON FIRST STARTUP! BeamMP will generate it's own certs in the default directory "
+                                "(Check for permissions or corrupted key-/certfile)"));
+        Tx509KeypairGenerator::GenerateAndWriteToDisk(defaultSettings.SSLKeyPath, defaultSettings.SSLCertPath);
+        Http::Server::THttpServerInstance::KeyFilePath = defaultSettings.SSLKeyPath;
+        Http::Server::THttpServerInstance::CertFilePath = defaultSettings.SSLCertPath;
+    } else {
+        Http::Server::THttpServerInstance::KeyFilePath = Application::Settings.SSLKeyPath;
+        Http::Server::THttpServerInstance::CertFilePath = Application::Settings.SSLCertPath;
+    }
 }
 
 Http::Server::THttpServerInstance::THttpServerInstance() {
@@ -157,7 +296,13 @@ Http::Server::THttpServerInstance::THttpServerInstance() {
 void Http::Server::THttpServerInstance::operator()() try {
     beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
     std::unique_ptr<httplib::Server> HttpLibServerInstance;
-    HttpLibServerInstance = std::make_unique<httplib::Server>();
+    if (Application::Settings.HTTPServerUseSSL) {
+        HttpLibServerInstance = std::make_unique<httplib::SSLServer>(
+            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::CertFilePath.c_str()),
+            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::KeyFilePath.c_str()));
+    } else {
+        HttpLibServerInstance = std::make_unique<httplib::Server>();
+    }
     // todo: make this IP agnostic so people can set their own IP
     HttpLibServerInstance->Get("/", [](const httplib::Request&, httplib::Response& res) {
         res.set_content("<!DOCTYPE html><article><h1>Hello World!</h1><section><p>BeamMP Server can now serve HTTP requests!</p></section></article></html>", "text/html");
@@ -179,14 +324,48 @@ void Http::Server::THttpServerInstance::operator()() try {
                 break;
             }
         }
-        res.set_content(
+        res.set_content(SystemsBad == 0 ? "0" : "1", "text/plain");
-            json {
-                { "ok", SystemsBad == 0 },
-            }
-                .dump(),
-            "application/json");
         res.status = 200;
     });
+    /*
+    HttpLibServerInstance->Get("/status", [](const httplib::Request&, httplib::Response& res) {
+        try {
+            json::Document response;
+            response.SetObject();
+            rapidjson::Document::AllocatorType& Allocator = response.GetAllocator();
+            // add to response
+            auto& Server = LuaAPI::MP::Engine->Server();
+            size_t CarCount = 0;
+            size_t GuestCount = 0;
+            json::Value Array(rapidjson::kArrayType);
+            LuaAPI::MP::Engine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+                if (!Client.expired()) {
+                    auto Locked = Client.lock();
+                    CarCount += Locked->GetCarCount();
+                    GuestCount += Locked->IsGuest() ? 1 : 0;
+                    json::Value Player(json::kObjectType);
+                    Player.AddMember("name", json::StringRef(Locked->GetName().c_str()), Allocator);
+                    Player.AddMember("id", Locked->GetID(), Allocator);
+                    Array.PushBack(Player, Allocator);
+                }
+                return true;
+            });
+            response.AddMember("players", Array, Allocator);
+            response.AddMember("player_count", Server.ClientCount(), Allocator);
+            response.AddMember("guest_count", GuestCount, Allocator);
+            response.AddMember("car_count", CarCount, Allocator);
+
+            // compile & send response
+            json::StringBuffer sb;
+            json::Writer<json::StringBuffer> writer(sb);
+            response.Accept(writer);
+            res.set_content(sb.GetString(), "application/json");
+        } catch (const std::exception& e) {
+            beammp_error("Exception in /status endpoint: " + std::string(e.what()));
+            res.status = 500;
+        }
+    });
+    */
     // magic endpoint
     HttpLibServerInstance->Get({ 0x2f, 0x6b, 0x69, 0x74, 0x74, 0x79 }, [](const httplib::Request&, httplib::Response& res) {
         res.set_content(std::string(Magic), "text/plain");

src/LuaAPI.cpp

@@ -3,8 +3,6 @@
 #include "Common.h"
 #include "TLuaEngine.h"
 
-#include <nlohmann/json.hpp>
-
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
@@ -102,39 +100,26 @@ void LuaAPI::Print(sol::variadic_args Args) {
     luaprint(ToPrint);
 }
 
-TEST_CASE("LuaAPI::MP::GetServerVersion") {
+bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
-    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 bool InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
     std::string Packet = "E:" + EventName + ":" + Data;
     if (PlayerID == -1)
-        LuaAPI::MP::Engine->Network().SendToAll(nullptr, Packet, true, true);
+        Engine->Network().SendToAll(nullptr, Packet, true, true);
     else {
-        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
+        auto MaybeClient = GetClient(Engine->Server(), PlayerID);
         if (!MaybeClient || MaybeClient.value().expired()) {
             beammp_lua_error("TriggerClientEvent invalid Player ID");
             return false;
         }
         auto c = MaybeClient.value().lock();
-        if (!LuaAPI::MP::Engine->Network().Respond(*c, Packet, true)) {
+        if (!Engine->Network().Respond(*c, Packet, true)) {
             beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
-            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
+            Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
             return false;
         }
     }
     return true;
 }
 
-bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
-    std::string Data = DataObj.as<std::string>();
-    return InternalTriggerClientEvent(PlayerID, EventName, Data);
-}
-
 void LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
     auto MaybeClient = GetClient(Engine->Server(), ID);
     if (!MaybeClient || MaybeClient.value().expired()) {
@@ -184,57 +169,50 @@ void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
         if (NewValue.is<bool>()) {
             Application::Settings.DebugModeEnabled = NewValue.as<bool>();
             beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
-        } else {
+        } 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 {
+        } 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 {
+        } 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 {
+        } 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 {
+        } 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 {
+        } 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 {
+        } 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.");
@@ -270,9 +248,7 @@ void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
         ToPrint += LuaToString(static_cast<const sol::object>(Arg));
         ToPrint += "\t";
     }
-#ifdef DOCTEST_CONFIG_DISABLE
     Application::Console().WriteRaw(ToPrint);
-#endif
 }
 
 int LuaAPI::PanicHandler(lua_State* State) {
@@ -295,7 +271,7 @@ static std::pair<bool, std::string> FSWrapper(FnT Fn, ArgsT&&... Args) {
 std::pair<bool, std::string> LuaAPI::FS::CreateDirectory(const std::string& Path) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
-    fs::create_directories(Path, errc);
+    fs::create_directories(fs::relative(Path), errc);
     Result.first = errc == std::error_code {};
     if (!Result.first) {
         Result.second = errc.message();
@@ -303,33 +279,6 @@ std::pair<bool, std::string> LuaAPI::FS::CreateDirectory(const std::string& Path
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::CreateDirectory") {
-    std::string TestDir = "beammp_test_dir";
-    fs::remove_all(TestDir);
-    SUBCASE("Single level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-    }
-    SUBCASE("Multi level dir") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir + "/a/b/c");
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir + "/a/b/c"));
-    }
-    SUBCASE("Already exists") {
-        const auto [Ok, Err] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok);
-        CHECK(Err == "");
-        CHECK(fs::exists(TestDir));
-        const auto [Ok2, Err2] = LuaAPI::FS::CreateDirectory(TestDir);
-        CHECK(Ok2);
-        CHECK(Err2 == "");
-    }
-    fs::remove_all(TestDir);
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
@@ -341,30 +290,10 @@ std::pair<bool, std::string> LuaAPI::FS::Remove(const std::string& Path) {
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::Remove") {
-    const std::string TestFileOrDir = "beammp_test_thing";
-    SUBCASE("Remove existing directory") {
-        fs::create_directory(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    SUBCASE("Remove non-existing directory") {
-        fs::remove_all(TestFileOrDir);
-        const auto [Ok, Err] = LuaAPI::FS::Remove(TestFileOrDir);
-        CHECK(Ok);
-        CHECK_EQ(Err, "");
-        CHECK(!fs::exists(TestFileOrDir));
-    }
-    // TODO: add tests for files
-    // TODO: add tests for files and folders without access permissions (failure)
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Rename(const std::string& Path, const std::string& NewPath) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
-    fs::rename(Path, NewPath, errc);
+    fs::rename(fs::relative(Path), fs::relative(NewPath), errc);
     Result.first = errc == std::error_code {};
     if (!Result.first) {
         Result.second = errc.message();
@@ -372,25 +301,10 @@ std::pair<bool, std::string> LuaAPI::FS::Rename(const std::string& Path, const s
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::Rename") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Rename(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(!fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
 std::pair<bool, std::string> LuaAPI::FS::Copy(const std::string& Path, const std::string& NewPath) {
     std::error_code errc;
     std::pair<bool, std::string> Result;
-    fs::copy(Path, NewPath, fs::copy_options::recursive, errc);
+    fs::copy(fs::relative(Path), fs::relative(NewPath), fs::copy_options::recursive, errc);
     Result.first = errc == std::error_code {};
     if (!Result.first) {
         Result.second = errc.message();
@@ -398,86 +312,30 @@ std::pair<bool, std::string> LuaAPI::FS::Copy(const std::string& Path, const std
     return Result;
 }
 
-TEST_CASE("LuaAPI::FS::Copy") {
-    const auto TestDir = "beammp_test_dir";
-    const auto OtherTestDir = "beammp_test_dir_2";
-    fs::remove_all(OtherTestDir);
-    fs::create_directory(TestDir);
-    const auto [Ok, Err] = LuaAPI::FS::Copy(TestDir, OtherTestDir);
-    CHECK(Ok);
-    CHECK_EQ(Err, "");
-    CHECK(fs::exists(TestDir));
-    CHECK(fs::exists(OtherTestDir));
-
-    fs::remove_all(OtherTestDir);
-    fs::remove_all(TestDir);
-}
-
 bool LuaAPI::FS::Exists(const std::string& Path) {
-    return fs::exists(Path);
+    return fs::exists(fs::relative(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) {
@@ -494,157 +352,3 @@ std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
     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;
-    }
-    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;
-    }
-    }
-    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);
-}
-
-bool LuaAPI::MP::TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data) {
-    return InternalTriggerClientEvent(PlayerID, EventName, JsonEncode(Data));
-}

src/TConfig.cpp

@@ -17,7 +17,6 @@ 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";
@@ -32,37 +31,12 @@ 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");
-        std::fread(buf.data(), 1, buf.size(), fp);
-        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();
+        CreateConfigFile(mConfigFileName);
     }
     if (!mFailed) {
         if (fs::exists("Server.cfg")) {
@@ -92,8 +66,6 @@ void TConfig::FlushToFile() {
     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;
@@ -138,7 +110,7 @@ void TConfig::FlushToFile() {
     std::fclose(File);
 }
 
-void TConfig::CreateConfigFile() {
+void TConfig::CreateConfigFile(std::string_view name) {
     // build from old config Server.cfg
 
     try {
@@ -185,7 +157,6 @@ void TConfig::ParseFromFile(std::string_view name) {
         TryReadValue(data, "General", StrDescription, Application::Settings.ServerDesc);
         TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
         TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
-        TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
         // Misc
         TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
         TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
@@ -229,7 +200,6 @@ void TConfig::PrintDebug() {
     beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
     beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
     beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
-    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
     beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
     beammp_debug(std::string(StrSSLKeyPath) + ": \"" + Application::Settings.SSLKeyPath + "\"");
     beammp_debug(std::string(StrSSLCertPath) + ": \"" + Application::Settings.SSLCertPath + "\"");

src/TConsole.cpp

@@ -14,17 +14,6 @@ static inline bool StringStartsWith(const std::string& What, const std::string&
     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);
@@ -36,21 +25,6 @@ static inline std::string TrimString(std::string S) {
     return S;
 }
 
-TEST_CASE("TrimString") {
-    CHECK(TrimString("hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo") == "hel lo");
-    CHECK(TrimString(" hel lo ") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("     hel lo") == "hel lo");
-    CHECK(TrimString("hel lo     ") == "hel lo");
-    CHECK(TrimString("    hel lo     ") == "hel lo");
-    CHECK(TrimString("\t\thel\nlo\n\n") == "hel\nlo");
-    CHECK(TrimString("\n\thel\tlo\n\t") == "hel\tlo");
-    CHECK(TrimString("  ") == "");
-    CHECK(TrimString(" \t\n\r ") == "");
-    CHECK(TrimString("") == "");
-}
-
 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);
@@ -144,10 +118,10 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
         mStateId = LuaStateId;
         mIsLuaConsole = true;
         if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:detach`");
+            Application::Console().WriteRaw("Entered Lua console for state '" + mStateId + "'. To exit, type `exit()`");
             mCommandline.set_prompt("lua @" + LuaStateId + "> ");
         } else {
-            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:detach`");
+            Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
             mCommandline.set_prompt("lua> ");
         }
         mCachedRegularHistory = mCommandline.history();
@@ -159,9 +133,9 @@ void TConsole::ChangeToRegularConsole() {
     if (mIsLuaConsole) {
         mIsLuaConsole = false;
         if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Detached from Lua state '" + mStateId + "'.");
+            Application::Console().WriteRaw("Left Lua console for state '" + mStateId + "'.");
         } else {
-            Application::Console().WriteRaw("Detached from Lua.");
+            Application::Console().WriteRaw("Left Lua console.");
         }
         mCachedLuaHistory = mCommandline.history();
         mCommandline.set_history(mCachedRegularHistory);
@@ -170,54 +144,21 @@ void TConsole::ChangeToRegularConsole() {
     }
 }
 
-bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
+void TConsole::Command_Lua(const std::string& cmd) {
-    if (n == 0 && args.size() != 0) {
+    if (cmd.size() > 3) {
-        Application::Console().WriteRaw("This command expects no arguments.");
+        auto NewStateId = cmd.substr(4);
-        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) + " arguments expected, got " + std::to_string(args.size()) + " instead.");
-            return false;
-        } else if (args.size() < min) {
-            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(max) + " arguments 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) {
+    } else {
         ChangeToLuaConsole(mDefaultStateId);
     }
 }
 
-void TConsole::Command_Help(const std::string&, const std::vector<std::string>& args) {
+void TConsole::Command_Help(const std::string&) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
     static constexpr const char* sHelpString = R"(
     Commands:
         help                    displays this help
@@ -226,135 +167,53 @@ void TConsole::Command_Help(const std::string&, const std::vector<std::string>&
         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)";
-        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) {
+void TConsole::Command_Kick(const std::string& cmd) {
-    std::string Result;
+    if (cmd.size() > 4) {
-    for (const auto& arg : args) {
+        auto Name = cmd.substr(5);
-        Result += arg + space;
+        std::string Reason = "Kicked by server console";
-    }
+        auto SpacePos = Name.find(' ');
-    Result = Result.substr(0, Result.size() - 1); // strip trailing space
+        if (SpacePos != Name.npos) {
-    return Result;
+            Reason = Name.substr(SpacePos + 1);
-}
+            Name = cmd.substr(5, cmd.size() - Reason.size() - 5 - 1);
-
-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;
-    auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
-        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
-        return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
-    };
-    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-        if (!Client.expired()) {
-            auto locked = Client.lock();
-            if (NameCompare(locked->GetName(), Name)) {
-                mLuaEngine->Network().ClientKick(*locked, Reason);
-                Kicked = true;
-                return false;
-            }
         }
-        return true;
+        beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
-    });
+        bool Kicked = false;
-    if (!Kicked) {
+        auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-        Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
+            std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
-    } else {
+            std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
-        Application::Console().WriteRaw("Kicked player '" + Name + "' for reason: '" + Reason + "'.");
+            return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
-    }
+        };
-}
+        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-
+            if (!Client.expired()) {
-std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const std::string& CommandWithArgs) {
+                auto locked = Client.lock();
-    // Algorithm designed and implemented by Lion Kortlepel (c) 2022
+                if (NameCompare(locked->GetName(), Name)) {
-    // It correctly splits arguments, including respecting single and double quotes, as well as backticks
+                    mLuaEngine->Network().ClientKick(*locked, Reason);
-    auto End_i = CommandWithArgs.find_first_of(' ');
+                    Kicked = true;
-    std::string Command = CommandWithArgs.substr(0, End_i);
+                    return false;
-    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;
+            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 + "'.");
         }
-        Arg = std::string(PrevPtr, Ptr - PrevPtr);
-        // remove quotes if enclosed in quotes
-        for (char Quote : { '"', '\'', '`' }) {
-            if (!Arg.empty() && Arg.at(0) == Quote && Arg.at(Arg.size() - 1) == Quote) {
-                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, 0)) {
-        return;
     }
 }
 
-void TConsole::Command_Say(const std::string& FullCmd) {
+void TConsole::Command_Say(const std::string& cmd) {
-    if (FullCmd.size() > 3) {
+    if (cmd.size() > 3) {
-        auto Message = FullCmd.substr(4);
+        auto Message = cmd.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) {
+void TConsole::Command_List(const std::string&) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
     if (mLuaEngine->Server().ClientCount() == 0) {
         Application::Console().WriteRaw("No players online.");
     } else {
@@ -374,10 +233,7 @@ void TConsole::Command_List(const std::string&, const std::vector<std::string>&
     }
 }
 
-void TConsole::Command_Status(const std::string&, const std::vector<std::string>& args) {
+void TConsole::Command_Status(const std::string&) {
-    if (!EnsureArgsCount(args, 0)) {
-        return;
-    }
     std::stringstream Status;
 
     size_t CarCount = 0;
@@ -462,12 +318,12 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
            << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
            << "\tSubsystems:\n"
            << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
-           << "\t\tShutting down/Shut down:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
+           << "\t\tShutting down/Shutdown:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
            << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
            << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
            << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
            << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShut down:                    [ " << SystemsShutdownList << " ]\n"
+           << "\t\tShutdown:                    [ " << SystemsShutdownList << " ]\n"
            << "";
 
     Application::Console().WriteRaw(Status.str());
@@ -519,58 +375,6 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
     }
 }
 
-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);
@@ -578,22 +382,21 @@ TConsole::TConsole() {
     BackupOldLog();
     mCommandline.on_command = [this](Commandline& c) {
         try {
-            auto TrimmedCmd = c.get_command();
+            auto cmd = c.get_command();
-            TrimmedCmd = TrimString(TrimmedCmd);
+            cmd = TrimString(cmd);
-            auto [cmd, args] = ParseCommand(TrimmedCmd);
+            mCommandline.write(mCommandline.prompt() + cmd);
-            mCommandline.write(mCommandline.prompt() + TrimmedCmd);
             if (mIsLuaConsole) {
                 if (!mLuaEngine) {
                     beammp_info("Lua not started yet, please try again in a second");
-                } else if (!cmd.empty() && cmd.at(0) == ':') {
+                } else if (cmd == "exit()") {
-                    HandleLuaInternalCommand(cmd.substr(1));
+                    ChangeToRegularConsole();
                 } else {
-                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
+                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(cmd), "", "" });
                     while (!Future->Ready) {
                         std::this_thread::yield(); // TODO: Add a timeout
                     }
                     if (Future->Error) {
-                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
+                        beammp_lua_error(Future->ErrorMessage);
                     }
                 }
             } else {
@@ -602,63 +405,31 @@ TConsole::TConsole() {
                 } else if (cmd == "exit") {
                     beammp_info("gracefully shutting down");
                     Application::GracefullyShutdown();
-                } else if (cmd == "say") {
+                } else if (StringStartsWith(cmd, "lua")) {
-                    RunAsCommand(TrimmedCmd, true);
+                    Command_Lua(cmd);
-                    Command_Say(TrimmedCmd);
+                } else if (StringStartsWith(cmd, "help")) {
-                } else {
+                    RunAsCommand(cmd, true);
-                    if (mCommandMap.find(cmd) != mCommandMap.end()) {
+                    Command_Help(cmd);
-                        mCommandMap.at(cmd)(cmd, args);
+                } else if (StringStartsWith(cmd, "kick")) {
-                        RunAsCommand(TrimmedCmd, true);
+                    RunAsCommand(cmd, true);
-                    } else {
+                    Command_Kick(cmd);
-                        RunAsCommand(TrimmedCmd);
+                } else if (StringStartsWith(cmd, "say")) {
-                    }
+                    RunAsCommand(cmd, true);
+                    Command_Say(cmd);
+                } else if (StringStartsWith(cmd, "list")) {
+                    RunAsCommand(cmd, true);
+                    Command_List(cmd);
+                } else if (StringStartsWith(cmd, "status")) {
+                    RunAsCommand(cmd, true);
+                    Command_Status(cmd);
+                } else if (!cmd.empty()) {
+                    RunAsCommand(cmd);
                 }
             }
         } catch (const std::exception& e) {
             beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
         }
     };
-    mCommandline.on_autocomplete = [this](Commandline&, std::string stub, int) {
-        std::vector<std::string> suggestions;
-        try {
-            auto cmd = TrimString(stub);
-            // beammp_error("yes 1");
-            // beammp_error(stub);
-            if (mIsLuaConsole) { // if lua
-                if (!mLuaEngine) {
-                    beammp_info("Lua not started yet, please try again in a second");
-                } else {
-                    std::string prefix {};
-                    for (size_t i = stub.length(); i > 0; i--) {
-                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_') {
-                            prefix = stub.substr(0, i);
-                            stub = stub.substr(i);
-                            break;
-                        }
-                    }
-                    auto keys = mLuaEngine->GetStateGlobalKeysForState(mStateId);
-                    for (const auto& key : keys) {
-                        std::string::size_type n = key.find(stub);
-                        if (n == 0) {
-                            suggestions.push_back(prefix + key);
-                            // beammp_warn(cmd_name);
-                        }
-                    }
-                }
-            } else { // if not lua
-                for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
-                    std::string::size_type n = cmd_name.find(stub);
-                    if (n == 0) {
-                        suggestions.push_back(cmd_name);
-                        // beammp_warn(cmd_name);
-                    }
-                }
-            }
-        } catch (const std::exception& e) {
-            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
-        }
-        return suggestions;
-    };
 }
 
 void TConsole::Write(const std::string& str) {

src/THeartbeatThread.cpp

@@ -20,7 +20,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 (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
         ++UpdateReminderCounter;
         Body = GenerateCall();
         // a hot-change occurs when a setting has changed, to update the backend of that change.
@@ -64,10 +64,8 @@ void THeartbeatThread::operator()() {
             beammp_trace(T);
             Doc.Parse(T.data(), T.size());
             if (Doc.HasParseError() || !Doc.IsObject()) {
-                if (!Application::Settings.Private) {
+                beammp_debug("Failed to contact backend at " + Url + " (this is not an error).");
-                    beammp_error("Backend response failed to parse as valid json");
+                beammp_trace("Response was: " + T);
-                    beammp_trace("Response was: `" + T + "`");
-                }
                 Sentry.SetContext("JSON Response", { { "reponse", T } });
                 SentryReportError(Url + Target, ResponseCode);
             } else if (ResponseCode != 200) {
@@ -115,21 +113,21 @@ void THeartbeatThread::operator()() {
             }
         }
 
-        if (Ok && !isAuth && !Application::Settings.Private) {
+        if (Ok && !isAuth) {
             if (Status == "2000") {
-                beammp_info(("Authenticated! " + Message));
+                beammp_info(("Authenticated!"));
                 isAuth = true;
             } else if (Status == "200") {
-                beammp_info(("Resumed authenticated session! " + Message));
+                beammp_info(("Resumed authenticated session!"));
                 isAuth = true;
             } else {
                 if (Message.empty()) {
-                    Message = "Backend didn't provide a reason.";
+                    Message = "Backend didn't provide a reason";
                 }
-                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
+                beammp_error("Backend REFUSED the auth key. " + Message);
             }
         }
-        if (isAuth || Application::Settings.Private) {
+        if (isAuth) {
             Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
         }
         if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
@@ -164,6 +162,7 @@ THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& S
     Application::RegisterShutdownHandler([&] {
         Application::SetSubsystemStatus("Heartbeat", Application::Status::ShuttingDown);
         if (mThread.joinable()) {
+            mShutdown = true;
             mThread.join();
         }
         Application::SetSubsystemStatus("Heartbeat", Application::Status::Shutdown);

src/TLuaEngine.cpp

@@ -8,7 +8,6 @@
 #include <chrono>
 #include <condition_variable>
 #include <httplib.h>
-#include <nlohmann/json.hpp>
 #include <random>
 #include <thread>
 #include <tuple>
@@ -16,29 +15,26 @@
 TLuaEngine* LuaAPI::MP::Engine;
 
 TLuaEngine::TLuaEngine()
-    : mResourceServerPath(fs::path(Application::Settings.Resource) / "Server") {
+    : mPluginMonitor(fs::path(Application::Settings.Resource) / "Server", *this, mShutdown) {
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
     LuaAPI::MP::Engine = this;
     if (!fs::exists(Application::Settings.Resource)) {
         fs::create_directory(Application::Settings.Resource);
     }
-    if (!fs::exists(mResourceServerPath)) {
+    fs::path Path = fs::path(Application::Settings.Resource) / "Server";
-        fs::create_directory(mResourceServerPath);
+    if (!fs::exists(Path)) {
+        fs::create_directory(Path);
     }
+    mResourceServerPath = Path;
     Application::RegisterShutdownHandler([&] {
         Application::SetSubsystemStatus("LuaEngine", Application::Status::ShuttingDown);
+        mShutdown = true;
         if (mThread.joinable()) {
             mThread.join();
         }
         Application::SetSubsystemStatus("LuaEngine", Application::Status::Shutdown);
     });
-    IThreaded::Start();
+    Start();
-}
-
-TEST_CASE("TLuaEngine ctor & dtor") {
-    Application::Settings.Resource = "beammp_server_test_resources";
-    TLuaEngine engine;
-    Application::GracefullyShutdown();
 }
 
 void TLuaEngine::operator()() {
@@ -57,28 +53,30 @@ void TLuaEngine::operator()() {
 
     auto ResultCheckThread = std::thread([&] {
         RegisterThread("ResultCheckThread");
-        while (!Application::IsShuttingDown()) {
+        while (!mShutdown) {
             std::unique_lock Lock(mResultsToCheckMutex);
+            mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
             if (!mResultsToCheck.empty()) {
                 mResultsToCheck.remove_if([](const std::shared_ptr<TLuaResult>& Ptr) -> bool {
                     if (Ptr->Ready) {
-                        if (Ptr->Error) {
+                        return true;
-                            if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
+                    } else if (Ptr->Error) {
-                                beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
+                        if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
-                            }
+                            beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
                         }
                         return true;
                     }
                     return false;
                 });
-            } else {
-                mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
             }
         }
     });
     // event loop
     auto Before = std::chrono::high_resolution_clock::now();
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
+        if (mLuaStates.size() == 0) {
+            std::this_thread::sleep_for(std::chrono::seconds(100));
+        }
         { // Timed Events Scope
             std::unique_lock Lock(mTimedEventsMutex);
             for (auto& Timer : mTimedEvents) {
@@ -104,18 +102,12 @@ void TLuaEngine::operator()() {
                 }
             }
         }
-        if (mLuaStates.size() == 0) {
+        const auto Expected = std::chrono::milliseconds(10);
-            beammp_trace("No Lua states, event loop running extremely sparsely");
+        if (auto Diff = std::chrono::high_resolution_clock::now() - Before;
-            Application::SleepSafeSeconds(10);
+            Diff < Expected) {
+            std::this_thread::sleep_for(Expected - Diff);
         } else {
-            constexpr double NsFactor = 1000000.0;
+            beammp_trace("Event loop cannot keep up! Running " + std::to_string(Diff.count()) + "s behind");
-            constexpr double Expected = 10.0; // ms
-            const auto Diff = (std::chrono::high_resolution_clock::now() - Before).count() / NsFactor;
-            if (Diff < Expected) {
-                std::this_thread::sleep_for(std::chrono::nanoseconds(size_t((Expected - Diff) * NsFactor)));
-            } else {
-                beammp_tracef("Event loop cannot keep up! Running {}ms behind", Diff);
-            }
         }
         Before = std::chrono::high_resolution_clock::now();
     }
@@ -162,70 +154,10 @@ void TLuaEngine::AddResultToCheck(const std::shared_ptr<TLuaResult>& Result) {
     mResultsToCheckCond.notify_one();
 }
 
-std::unordered_map<std::string /* event name */, std::vector<std::string> /* handlers */> TLuaEngine::Debug_GetEventsForState(TLuaStateId StateId) {
-    std::unordered_map<std::string, std::vector<std::string>> Result;
-    std::unique_lock Lock(mLuaEventsMutex);
-    for (const auto& EventNameToEventMap : mLuaEvents) {
-        for (const auto& IdSetOfHandlersPair : EventNameToEventMap.second) {
-            if (IdSetOfHandlersPair.first == StateId) {
-                for (const auto& Handler : IdSetOfHandlersPair.second) {
-                    Result[EventNameToEventMap.first].push_back(Handler);
-                }
-            }
-        }
-    }
-    return Result;
-}
-
-std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::Debug_GetStateExecuteQueueForState(TLuaStateId StateId) {
-    std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Result;
-    std::unique_lock Lock(mLuaStatesMutex);
-    Result = mLuaStates.at(StateId)->Debug_GetStateExecuteQueue();
-    return Result;
-}
-
-std::vector<TLuaEngine::QueuedFunction> TLuaEngine::Debug_GetStateFunctionQueueForState(TLuaStateId StateId) {
-    std::vector<TLuaEngine::QueuedFunction> Result;
-    std::unique_lock Lock(mLuaStatesMutex);
-    Result = mLuaStates.at(StateId)->Debug_GetStateFunctionQueue();
-    return Result;
-}
-
-std::vector<TLuaResult> TLuaEngine::Debug_GetResultsToCheckForState(TLuaStateId StateId) {
-    std::unique_lock Lock(mResultsToCheckMutex);
-    auto ResultsToCheckCopy = mResultsToCheck;
-    Lock.unlock();
-    std::vector<TLuaResult> Result;
-    while (!ResultsToCheckCopy.empty()) {
-        auto ResultToCheck = std::move(ResultsToCheckCopy.front());
-        ResultsToCheckCopy.pop_front();
-        if (ResultToCheck->StateId == StateId) {
-            Result.push_back(*ResultToCheck);
-        }
-    }
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::GetStateGlobalKeysForState(TLuaStateId StateId) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    auto Result = mLuaStates.at(StateId)->GetStateGlobalKeys();
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::StateThreadData::GetStateGlobalKeys() {
-    auto globals = mStateView.globals();
-    std::vector<std::string> Result;
-    for (const auto& [key, value] : globals) {
-        Result.push_back(key.as<std::string>());
-    }
-    return Result;
-}
-
 void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<std::chrono::high_resolution_clock::duration>& Max) {
     for (const auto& Result : Results) {
         bool Cancelled = false;
         size_t ms = 0;
-        std::set<std::string> WarnedResults;
         while (!Result->Ready && !Cancelled) {
             std::this_thread::sleep_for(std::chrono::milliseconds(10));
             ms += 10;
@@ -233,11 +165,7 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                 beammp_trace("'" + Result->Function + "' in '" + Result->StateId + "' did not finish executing in time (took: " + std::to_string(ms) + "ms).");
                 Cancelled = true;
             } else if (ms > 1000 * 60) {
-                auto ResultId = Result->StateId + "_" + Result->Function;
+                beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' is taking very long. The event it's handling is too important to discard the result of this handler, but may block this event and possibly the whole lua state.");
-                if (WarnedResults.count(ResultId) == 0) {
-                    WarnedResults.insert(ResultId);
-                    beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' is taking very long. The event it's handling is too important to discard the result of this handler, but may block this event and possibly the whole lua state.");
-                }
             }
         }
         if (Cancelled) {
@@ -276,9 +204,6 @@ std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID,
 }
 
 void TLuaEngine::CollectAndInitPlugins() {
-    if (!fs::exists(mResourceServerPath)) {
-        fs::create_directories(mResourceServerPath);
-    }
     for (const auto& Dir : fs::directory_iterator(mResourceServerPath)) {
         auto Path = Dir.path();
         Path = fs::relative(Path);
@@ -328,7 +253,7 @@ void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name,
     std::unique_lock Lock(mLuaStatesMutex);
     if (mLuaStates.find(StateId) == mLuaStates.end()) {
         beammp_debug("Creating lua state for state id \"" + StateId + "\"");
-        auto DataPtr = std::make_unique<StateThreadData>(Name, StateId, *this);
+        auto DataPtr = std::make_unique<StateThreadData>(Name, mShutdown, StateId, *this);
         mLuaStates[StateId] = std::move(DataPtr);
         RegisterEvent("onInit", StateId, "onInit");
         if (!DontCallOnInit) {
@@ -352,6 +277,7 @@ std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& Ev
 
 sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
     auto Return = mEngine->TriggerEvent(EventName, mStateId, EventArgs);
+    // TODO Synchronous call to the event handlers
     auto MyHandlers = mEngine->GetEventHandlersForState(EventName, mStateId);
     for (const auto& Handler : MyHandlers) {
         auto Fn = mStateView[Handler];
@@ -409,7 +335,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&
                 Result.add(FnRet);
             } else {
                 sol::error Err = FnRet;
-                beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
+                beammp_lua_error(Err.what());
             }
         }
     }
@@ -460,32 +386,6 @@ int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name)
     return Id;
 }
 
-sol::table TLuaEngine::StateThreadData::Lua_FS_ListFiles(const std::string& Path) {
-    if (!std::filesystem::exists(Path)) {
-        return sol::lua_nil;
-    }
-    auto table = mStateView.create_table();
-    for (const auto& entry : std::filesystem::directory_iterator(Path)) {
-        if (entry.is_regular_file() || entry.is_symlink()) {
-            table[table.size() + 1] = entry.path().lexically_relative(Path).string();
-        }
-    }
-    return table;
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_FS_ListDirectories(const std::string& Path) {
-    if (!std::filesystem::exists(Path)) {
-        return sol::lua_nil;
-    }
-    auto table = mStateView.create_table();
-    for (const auto& entry : std::filesystem::directory_iterator(Path)) {
-        if (entry.is_directory()) {
-            table[table.size() + 1] = entry.path().lexically_relative(Path).string();
-        }
-    }
-    return table;
-}
-
 std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
     auto MaybeClient = GetClient(mEngine->Server(), ID);
     if (MaybeClient && !MaybeClient.value().expired()) {
@@ -539,85 +439,9 @@ sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::stri
     return table;
 }
 
-template <typename T>
+TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine)
-static void AddToTable(sol::table& table, const std::string& left, const T& value) {
-    if (left.empty()) {
-        table[table.size() + 1] = value;
-    } else {
-        table[left] = value;
-    }
-}
-
-static void JsonDecodeRecursive(sol::state_view& StateView, sol::table& table, const std::string& left, const nlohmann::json& right) {
-    switch (right.type()) {
-    case nlohmann::detail::value_t::null:
-        return;
-    case nlohmann::detail::value_t::object: {
-        auto value = table.create();
-        value.clear();
-        for (const auto& entry : right.items()) {
-            JsonDecodeRecursive(StateView, value, entry.key(), entry.value());
-        }
-        AddToTable(table, left, value);
-        break;
-    }
-    case nlohmann::detail::value_t::array: {
-        auto value = table.create();
-        value.clear();
-        for (const auto& entry : right.items()) {
-            JsonDecodeRecursive(StateView, value, "", entry.value());
-        }
-        AddToTable(table, left, value);
-        break;
-    }
-    case nlohmann::detail::value_t::string:
-        AddToTable(table, left, right.get<std::string>());
-        break;
-    case nlohmann::detail::value_t::boolean:
-        AddToTable(table, left, right.get<bool>());
-        break;
-    case nlohmann::detail::value_t::number_integer:
-        AddToTable(table, left, right.get<int64_t>());
-        break;
-    case nlohmann::detail::value_t::number_unsigned:
-        AddToTable(table, left, right.get<uint64_t>());
-        break;
-    case nlohmann::detail::value_t::number_float:
-        AddToTable(table, left, right.get<double>());
-        break;
-    case nlohmann::detail::value_t::binary:
-        beammp_lua_error("JsonDecode can't handle binary blob in json, ignoring");
-        return;
-    case nlohmann::detail::value_t::discarded:
-        return;
-    }
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_JsonDecode(const std::string& str) {
-    sol::state_view StateView(mState);
-    auto table = StateView.create_table();
-    if (!nlohmann::json::accept(str)) {
-        beammp_lua_error("string given to JsonDecode is not valid json: `" + str + "`");
-        return sol::lua_nil;
-    }
-    nlohmann::json json = nlohmann::json::parse(str);
-    if (json.is_object()) {
-        for (const auto& entry : json.items()) {
-            JsonDecodeRecursive(StateView, table, entry.key(), entry.value());
-        }
-    } else if (json.is_array()) {
-        for (const auto& entry : json) {
-            JsonDecodeRecursive(StateView, table, "", entry);
-        }
-    } else {
-        beammp_lua_error("JsonDecode expected array or object json, instead got " + std::string(json.type_name()));
-        return sol::lua_nil;
-    }
-    return table;
-}
-
-TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine)
     : mName(Name)
+    , mShutdown(Shutdown)
     , mStateId(StateId)
     , mState(luaL_newstate())
     , mEngine(&Engine) {
@@ -660,7 +484,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
         return Lua_TriggerLocalEvent(EventName, EventArgs);
     });
     MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent);
-    MPTable.set_function("TriggerClientEventJson", &LuaAPI::MP::TriggerClientEventJson);
     MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount);
     MPTable.set_function("IsPlayerConnected", &LuaAPI::MP::IsPlayerConnected);
     MPTable.set_function("GetPlayerIDByName", [&](const std::string& Name) -> int {
@@ -715,36 +538,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
         mEngine->CancelEventTimers(EventName, mStateId);
     });
     MPTable.set_function("Set", &LuaAPI::MP::Set);
-
-    auto UtilTable = StateView.create_named_table("Util");
-    UtilTable.set_function("JsonEncode", &LuaAPI::MP::JsonEncode);
-    UtilTable.set_function("JsonDecode", [this](const std::string& str) {
-        return Lua_JsonDecode(str);
-    });
-    UtilTable.set_function("JsonDiff", &LuaAPI::MP::JsonDiff);
-    UtilTable.set_function("JsonFlatten", &LuaAPI::MP::JsonFlatten);
-    UtilTable.set_function("JsonUnflatten", &LuaAPI::MP::JsonUnflatten);
-    UtilTable.set_function("JsonPrettify", &LuaAPI::MP::JsonPrettify);
-    UtilTable.set_function("JsonMinify", &LuaAPI::MP::JsonMinify);
-    UtilTable.set_function("Stress", [](size_t n) {
-        std::vector<std::thread> s;
-        for (size_t i = 0; i < n; ++i) {
-            s.emplace_back([]{ while (true); });
-        }
-        for (auto& t : s) {
-            t.detach();
-        }
-    });
-    UtilTable.set_function("Random", [this] {
-        return mUniformRealDistribution01(mMersenneTwister);
-    });
-    UtilTable.set_function("RandomRange", [this](double min, double max) -> double {
-        return std::uniform_real_distribution(min, max)(mMersenneTwister);
-    });
-    UtilTable.set_function("RandomIntRange", [this](int64_t min, int64_t max) -> int64_t {
-        return std::uniform_int_distribution(min, max)(mMersenneTwister);
-    });
-
     auto HttpTable = StateView.create_named_table("Http");
     HttpTable.set_function("CreateConnection", [this](const std::string& host, uint16_t port) {
         return Lua_HttpCreateConnection(host, port);
@@ -775,12 +568,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     FSTable.set_function("IsDirectory", &LuaAPI::FS::IsDirectory);
     FSTable.set_function("IsFile", &LuaAPI::FS::IsFile);
     FSTable.set_function("ConcatPaths", &LuaAPI::FS::ConcatPaths);
-    FSTable.set_function("ListFiles", [this](const std::string& Path) {
-        return Lua_FS_ListFiles(Path);
-    });
-    FSTable.set_function("ListDirectories", [this](const std::string& Path) {
-        return Lua_FS_ListDirectories(Path);
-    });
     Start();
 }
 
@@ -829,7 +616,7 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co
 
 void TLuaEngine::StateThreadData::operator()() {
     RegisterThread("Lua:" + mStateId);
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
         { // StateExecuteQueue Scope
             std::unique_lock Lock(mStateExecuteQueueMutex);
             if (!mStateExecuteQueue.empty()) {
@@ -935,16 +722,6 @@ void TLuaEngine::StateThreadData::operator()() {
     }
 }
 
-std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> TLuaEngine::StateThreadData::Debug_GetStateExecuteQueue() {
-    std::unique_lock Lock(mStateExecuteQueueMutex);
-    return mStateExecuteQueue;
-}
-
-std::vector<TLuaEngine::QueuedFunction> TLuaEngine::StateThreadData::Debug_GetStateFunctionQueue() {
-    std::unique_lock Lock(mStateFunctionQueueMutex);
-    return mStateFunctionQueue;
-}
-
 void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy) {
     std::unique_lock Lock(mTimedEventsMutex);
     TimedEvent Event {
@@ -999,3 +776,60 @@ bool TLuaEngine::TimedEvent::Expired() {
 void TLuaEngine::TimedEvent::Reset() {
     LastCompletion = std::chrono::high_resolution_clock::now();
 }
+
+TPluginMonitor::TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown)
+    : mEngine(Engine)
+    , mPath(Path)
+    , mShutdown(Shutdown) {
+    if (!fs::exists(mPath)) {
+        fs::create_directories(mPath);
+    }
+    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
+        // TODO: trigger an event when a subfolder file changes
+        if (Entry.is_regular_file()) {
+            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
+        }
+    }
+    Start();
+}
+
+void TPluginMonitor::operator()() {
+    RegisterThread("PluginMonitor");
+    beammp_info("PluginMonitor started");
+    while (!mShutdown) {
+        std::this_thread::sleep_for(std::chrono::seconds(3));
+        for (const auto& Pair : mFileTimes) {
+            auto CurrentTime = fs::last_write_time(Pair.first);
+            if (CurrentTime != Pair.second) {
+                mFileTimes[Pair.first] = CurrentTime;
+                // grandparent of the path should be Resources/Server
+                if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
+                    beammp_info("File \"" + Pair.first + "\" changed, reloading");
+                    // is in root folder, so reload
+                    std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
+                    auto Size = std::filesystem::file_size(Pair.first);
+                    auto Contents = std::make_shared<std::string>();
+                    Contents->resize(Size);
+                    FileStream.read(Contents->data(), Contents->size());
+                    TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
+                    auto StateID = mEngine.GetStateIDForPlugin(fs::path(Pair.first).parent_path());
+                    auto Res = mEngine.EnqueueScript(StateID, Chunk);
+                    // TODO: call onInit
+                    mEngine.AddResultToCheck(Res);
+                } else {
+                    // TODO: trigger onFileChanged event
+                    beammp_trace("Change detected in file \"" + Pair.first + "\", event trigger not implemented yet");
+                    /*
+                    // is in subfolder, dont reload, just trigger an event
+                    auto Results = mEngine.TriggerEvent("onFileChanged", "", Pair.first);
+                    mEngine.WaitForAll(Results);
+                    for (const auto& Result : Results)  {
+                        if (Result->Error) {
+                            beammp_lua_error(Result->ErrorMessage);
+                        }
+                    }*/
+                }
+            }
+        }
+    }
+}

src/TNetwork.cpp

@@ -25,6 +25,7 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
     Application::RegisterShutdownHandler([&] {
         Application::SetSubsystemStatus("UDPNetwork", Application::Status::ShuttingDown);
         if (mUDPThread.joinable()) {
+            mShutdown = true;
             mUDPThread.detach();
         }
         Application::SetSubsystemStatus("UDPNetwork", Application::Status::Shutdown);
@@ -32,6 +33,7 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
     Application::RegisterShutdownHandler([&] {
         Application::SetSubsystemStatus("TCPNetwork", Application::Status::ShuttingDown);
         if (mTCPThread.joinable()) {
+            mShutdown = true;
             mTCPThread.detach();
         }
         Application::SetSubsystemStatus("TCPNetwork", Application::Status::Shutdown);
@@ -66,7 +68,7 @@ void TNetwork::UDPServerMain() {
     Application::SetSubsystemStatus("UDPNetwork", Application::Status::Good);
     beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.Port) + (" with a Max of ")
         + std::to_string(Application::Settings.MaxPlayers) + (" Clients"));
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
         try {
             sockaddr_in client {};
             std::string Data = UDPRcvFromClient(client); // Receives any data from Socket
@@ -106,51 +108,43 @@ void TNetwork::TCPServerMain() {
 #if defined(BEAMMP_WINDOWS)
     WSADATA wsaData;
     if (WSAStartup(514, &wsaData)) {
-        beammp_error("Can't start Winsock! Shutting down");
+        beammp_error("Can't start Winsock!");
-        Application::GracefullyShutdown();
+        return;
     }
 #endif // WINDOWS
     TConnection client {};
     SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if (Listener == BEAMMP_INVALID_SOCKET) {
+    int optval = 1;
-        beammp_error("Failed to create socket: " + GetPlatformAgnosticErrorString()
-            + ". This is a fatal error, as a socket is needed for the server to operate. Shutting down.");
-        Application::GracefullyShutdown();
-    }
 #if defined(BEAMMP_WINDOWS)
-    const char optval = 0;
+    const char* optval_ptr = reinterpret_cast<const char*>(&optval);
-    int ret = ::setsockopt(Listener, SOL_SOCKET, SO_DONTLINGER, &optval, sizeof(optval));
 #elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
-    int optval = true;
+    void* optval_ptr = reinterpret_cast<void*>(&optval);
-    int ret = ::setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<void*>(&optval), sizeof(optval));
 #endif
-    // not a fatal error
+    setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, optval_ptr, sizeof(optval));
-    if (ret < 0) {
+    // TODO: check optval or return value idk
-        beammp_error("Failed to set up listening socket to not linger / reuse address. "
-                     "This may cause the socket to refuse to bind(). Error: "
-            + GetPlatformAgnosticErrorString());
-    }
     sockaddr_in addr {};
     addr.sin_addr.s_addr = INADDR_ANY;
     addr.sin_family = AF_INET;
     addr.sin_port = htons(uint16_t(Application::Settings.Port));
-    if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) < 0) {
+    if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) != 0) {
-        beammp_error("bind() failed, the server cannot operate and will shut down now. "
+        beammp_error("bind() failed: " + GetPlatformAgnosticErrorString());
-                     "Error: "
+        std::this_thread::sleep_for(std::chrono::seconds(5));
-            + GetPlatformAgnosticErrorString());
+        exit(-1); // TODO: Wtf.
-        Application::GracefullyShutdown();
     }
-    if (listen(Listener, SOMAXCONN) < 0) {
+    if (Listener == -1) {
-        beammp_error("listen() failed, which is needed for the server to operate. "
+        beammp_error("Invalid listening socket");
-                     "Shutting down. Error: "
+        return;
-            + GetPlatformAgnosticErrorString());
+    }
-        Application::GracefullyShutdown();
+    if (listen(Listener, SOMAXCONN)) {
+        beammp_error("listen() failed: " + GetPlatformAgnosticErrorString());
+        // FIXME leak Listener
+        return;
     }
     Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good);
-    beammp_info("Vehicle event network online");
+    beammp_info(("Vehicle event network online"));
     do {
         try {
-            if (Application::IsShuttingDown()) {
+            if (mShutdown) {
                 beammp_debug("shutdown during TCP wait for accept loop");
                 break;
             }
@@ -160,15 +154,15 @@ void TNetwork::TCPServerMain() {
                 beammp_warn(("Got an invalid client socket on connect! Skipping..."));
                 continue;
             }
-            // set timeout
+            // set timeout (DWORD, aka uint32_t)
-            size_t SendTimeoutMS = 30 * 1000;
+            uint32_t SendTimeoutMS = 30 * 1000;
 #if defined(BEAMMP_WINDOWS)
             int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<const char*>(&SendTimeoutMS), sizeof(SendTimeoutMS));
 #else // POSIX
             struct timeval optval;
             optval.tv_sec = (int)(SendTimeoutMS / 1000);
             optval.tv_usec = (SendTimeoutMS % 1000) * 1000;
-            ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<void*>(&optval), sizeof(optval));
+            int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<void*>(&optval), sizeof(optval));
 #endif
             if (ret < 0) {
                 throw std::runtime_error("setsockopt recv timeout: " + GetPlatformAgnosticErrorString());
@@ -176,9 +170,9 @@ void TNetwork::TCPServerMain() {
             std::thread ID(&TNetwork::Identify, this, client);
             ID.detach(); // TODO: Add to a queue and attempt to join periodically
         } catch (const std::exception& e) {
-            beammp_error("fatal: " + std::string(e.what()));
+            beammp_error(("fatal: ") + std::string(e.what()));
         }
-    } while (client.Socket != BEAMMP_INVALID_SOCKET);
+    } while (client.Socket);
 
     beammp_debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));
 
@@ -237,26 +231,13 @@ void TNetwork::HandleDownload(SOCKET TCPSock) {
     });
 }
 
-static int get_ip_str(const struct sockaddr* sa, char* strBuf, size_t strBufSize) {
-    switch (sa->sa_family) {
-    case AF_INET:
-        inet_ntop(AF_INET, &(((struct sockaddr_in*)sa)->sin_addr), strBuf, strBufSize);
-        break;
-    case AF_INET6:
-        inet_ntop(AF_INET6, &(((struct sockaddr_in6*)sa)->sin6_addr), strBuf, strBufSize);
-        break;
-    default:
-        return 1;
-    }
-    return 0;
-}
-
 void TNetwork::Authentication(const TConnection& ClientConnection) {
     auto Client = CreateClient(ClientConnection.Socket);
-    char AddrBuf[INET6_ADDRSTRLEN];
+    char AddrBuf[64];
-    get_ip_str(&ClientConnection.SockAddr, AddrBuf, sizeof(AddrBuf));
+    // TODO: IPv6 would need this to be changed
-    beammp_trace("This thread is ip " + std::string(AddrBuf));
+    auto str = inet_ntop(AF_INET, reinterpret_cast<const void*>(&ClientConnection.SockAddr), AddrBuf, sizeof(ClientConnection.SockAddr));
-    Client->SetIdentifier("ip", AddrBuf);
+    beammp_trace("This thread is ip " + std::string(str));
+    Client->SetIdentifier("ip", str);
 
     std::string Rc; // TODO: figure out why this is not default constructed
     beammp_info("Identifying new ClientConnection...");
@@ -496,7 +477,7 @@ std::string TNetwork::TCPRcv(TClient& c) {
 void TNetwork::ClientKick(TClient& c, const std::string& R) {
     beammp_info("Client kicked: " + R);
     if (!TCPSend(c, "K" + R)) {
-        beammp_warn("tried to kick player '" + c.GetName() + "' (id " + std::to_string(c.GetID()) + "), but was already disconnected");
+        // TODO handle
     }
     c.SetStatus(-2);
 
@@ -772,59 +753,10 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
     }
 }
 
-static std::pair<size_t /* count */, size_t /* last chunk */> SplitIntoChunks(size_t FullSize, size_t ChunkSize) {
-    if (FullSize < ChunkSize) {
-        return { 0, FullSize };
-    }
-    size_t Count = FullSize / (FullSize / ChunkSize);
-    size_t LastChunkSize = FullSize - (Count * ChunkSize);
-    return { Count, LastChunkSize };
-}
-
-TEST_CASE("SplitIntoChunks") {
-    size_t FullSize;
-    size_t ChunkSize;
-    SUBCASE("Normal case") {
-        FullSize = 1234567;
-        ChunkSize = 1234;
-    }
-    SUBCASE("Zero original size") {
-        FullSize = 0;
-        ChunkSize = 100;
-    }
-    SUBCASE("Equal full size and chunk size") {
-        FullSize = 125;
-        ChunkSize = 125;
-    }
-    SUBCASE("Even split") {
-        FullSize = 10000;
-        ChunkSize = 100;
-    }
-    SUBCASE("Odd split") {
-        FullSize = 13;
-        ChunkSize = 2;
-    }
-    SUBCASE("Large sizes") {
-        FullSize = 10 * GB;
-        ChunkSize = 125 * MB;
-    }
-    auto [Count, LastSize] = SplitIntoChunks(FullSize, ChunkSize);
-    CHECK((Count * ChunkSize) + LastSize == FullSize);
-}
-
-uint8_t* /* end ptr */ TNetwork::SendSplit(TClient& c, SOCKET Socket, uint8_t* DataPtr, size_t Size) {
-    if (TCPSendRaw(c, Socket, reinterpret_cast<char*>(DataPtr), Size)) {
-        return DataPtr + Size;
-    } else {
-        return nullptr;
-    }
-}
-
 void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name) {
     std::ifstream f(Name.c_str(), std::ios::binary);
-    auto Buf = f.rdbuf();
+    uint32_t Split = 0x7735940; // 125MB
-    uint32_t Split = 125 * MB;
+    std::vector<char> Data;
-    std::vector<uint8_t> Data;
     if (Size > Split)
         Data.resize(Split);
     else
@@ -839,8 +771,8 @@ void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std
         size_t Diff = Size - Sent;
         if (Diff > Split) {
             f.seekg(Sent, std::ios_base::beg);
-            f.read(reinterpret_cast<char*>(Data.data()), Split);
+            f.read(Data.data(), Split);
-            if (!TCPSendRaw(c, TCPSock, reinterpret_cast<char*>(Data.data()), Split)) {
+            if (!TCPSendRaw(c, TCPSock, Data.data(), Split)) {
                 if (c.GetStatus() > -1)
                     c.SetStatus(-1);
                 break;
@@ -848,8 +780,8 @@ void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std
             Sent += Split;
         } else {
             f.seekg(Sent, std::ios_base::beg);
-            f.read(reinterpret_cast<char*>(Data.data()), Diff);
+            f.read(Data.data(), Diff);
-            if (!TCPSendRaw(c, TCPSock, reinterpret_cast<char*>(Data.data()), int32_t(Diff))) {
+            if (!TCPSendRaw(c, TCPSock, Data.data(), int32_t(Diff))) {
                 if (c.GetStatus() > -1)
                     c.SetStatus(-1);
                 break;

src/TPPSMonitor.cpp

@@ -10,6 +10,7 @@ TPPSMonitor::TPPSMonitor(TServer& Server)
         Application::SetSubsystemStatus("PPSMonitor", Application::Status::ShuttingDown);
         if (mThread.joinable()) {
             beammp_debug("shutting down PPSMonitor");
+            mShutdown = true;
             mThread.join();
             beammp_debug("shut down PPSMonitor");
         }
@@ -26,7 +27,7 @@ void TPPSMonitor::operator()() {
     beammp_debug("PPSMonitor starting");
     Application::SetSubsystemStatus("PPSMonitor", Application::Status::Good);
     std::vector<std::shared_ptr<TClient>> TimedOutClients;
-    while (!Application::IsShuttingDown()) {
+    while (!mShutdown) {
         std::this_thread::sleep_for(std::chrono::seconds(1));
         int C = 0, V = 0;
         if (mServer.ClientCount() == 0) {

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

@@ -28,9 +28,8 @@ TResourceManager::TResourceManager() {
         }
     }
 
-    if (mModsLoaded) {
+    if (mModsLoaded)
         beammp_info("Loaded " + std::to_string(mModsLoaded) + " Mods");
-    }
 
     Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
 }

src/TSentry.cpp

@@ -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

@@ -125,7 +125,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
             break;
         auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 2));
         TLuaEngine::WaitForAll(Futures);
-        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1));
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1)); // FIXME: this needs to be adjusted once lua is merged
         if (std::any_of(Futures.begin(), Futures.end(),
                 [](const std::shared_ptr<TLuaResult>& Elem) {
                     return !Elem->Error
@@ -150,18 +150,26 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
     }
 }
 
-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;
-    auto NameDataSep = RawData.find(':', 2);
+    int a = 0;
-    if (NameDataSep == std::string::npos) {
+    while (std::getline(ss, t, ':')) {
-        beammp_warn("received event in invalid format (missing ':'), got: '" + RawData + "'");
+        switch (a) {
+        case 1:
+            Name = t;
+            break;
+        case 2:
+            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.GetID(), t));
+            break;
+        default:
+            break;
+        }
+        if (a == 2)
+            break;
+        a++;
     }
-    std::string Name = RawData.substr(2, NameDataSep - 2);
-    std::string Data = RawData.substr(NameDataSep + 1);
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.GetID(), Data));
 }
-
 bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
     try {
         auto Car = nlohmann::json::parse(CarJson);

src/main.cpp

@@ -11,14 +11,13 @@
 #include "TLuaEngine.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
-#include "TPluginMonitor.h"
 #include "TResourceManager.h"
 #include "TScopedTimer.h"
 #include "TServer.h"
 
 #include <iostream>
 #include <thread>
-
+#define CPPHTTPLIB_OPENSSL_SUPPORT 1
 static const std::string sCommandlineArguments = R"(
 USAGE: 
     BeamMP-Server [arguments]
@@ -45,6 +44,10 @@ EXAMPLES:
         'MyWestCoastServerConfig.toml'.
 )";
 
+// this is provided by the build system, leave empty for source builds
+// global, yes, this is ugly, no, it cant be done another way
+TSentry Sentry {};
+
 struct MainArguments {
     int argc {};
     char** argv {};
@@ -69,7 +72,7 @@ int main(int argc, char** argv) {
         Sentry.LogException(e, _file_basename, _line);
         MainRet = -1;
     }
-    std::exit(MainRet);
+    return MainRet;
 }
 
 int BeamMPServerMain(MainArguments Arguments) {
@@ -110,7 +113,7 @@ int BeamMPServerMain(MainArguments Arguments) {
             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());
+                beammp_error("Could not set working directory to '" + MaybeWorkingDirectory.value() + "': " + e.what());
             }
         }
     }
@@ -134,9 +137,9 @@ int BeamMPServerMain(MainArguments Arguments) {
 
     TServer Server(Arguments.List);
     TConfig Config(ConfigPath);
-    auto LuaEngine = std::make_shared<TLuaEngine>();
+    TLuaEngine LuaEngine;
-    LuaEngine->SetServer(&Server);
+    LuaEngine.SetServer(&Server);
-    Application::Console().InitializeLuaConsole(*LuaEngine);
+    Application::Console().InitializeLuaConsole(LuaEngine);
 
     if (Config.Failed()) {
         beammp_info("Closing in 10 seconds");
@@ -156,13 +159,12 @@ int BeamMPServerMain(MainArguments Arguments) {
     TPPSMonitor PPSMonitor(Server);
     THeartbeatThread Heartbeat(ResourceManager, Server);
     TNetwork Network(Server, PPSMonitor, ResourceManager);
-    LuaEngine->SetNetwork(&Network);
+    LuaEngine.SetNetwork(&Network);
     PPSMonitor.SetNetwork(Network);
     Application::CheckForUpdates();
 
-    TPluginMonitor PluginMonitor(fs::path(Application::Settings.Resource) / "Server", LuaEngine);
-
     if (Application::Settings.HTTPServerEnabled) {
+        Http::Server::SetupEnvironment();
         Http::Server::THttpServerInstance HttpServerInstance {};
     }
 

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
-}