rename HttpLibServerInstance to Server

This reverts commit a5153e4bc1.

.github/workflows/cmake-linux.yml

@@ -35,7 +35,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}/build-linux
       shell: bash
-      run: cmake --build . --config $BUILD_TYPE
+      run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel
 
     - name: Archive artifacts
       uses: actions/upload-artifact@v2

.github/workflows/cmake-windows.yml

@@ -20,7 +20,7 @@ jobs:
         with:
             vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment
@@ -44,4 +44,15 @@ jobs:
           name: BeamMP-Server.exe
           path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
 
+      - name: Build debug
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: |
+          cmake --build . --config Debug -t BeamMP-Server --parallel
+      
+      - name: Archive debug artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-debug.exe
+          path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe
 

.github/workflows/release-build.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Build
         working-directory: ${{github.workspace}}/build-linux
         shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel
 
       - name: Upload Release Asset
         id: upload-release-asset 
@@ -85,7 +85,7 @@ jobs:
         with:
             vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment
@@ -101,7 +101,7 @@ jobs:
       - name: Build
         working-directory: ${{github.workspace}}/build-windows
         shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel
 
       - name: Upload Release Asset
         id: upload-release-asset 

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "deps/commandline"]
 	path = deps/commandline
 	url = https://github.com/lionkor/commandline
+[submodule "deps/fmt"]
+	path = deps/fmt
+	url = https://github.com/fmtlib/fmt
 [submodule "deps/asio"]
 	path = deps/asio
 	url = https://github.com/chriskohlhoff/asio
@@ -22,3 +25,6 @@
 [submodule "deps/cpp-httplib"]
 	path = deps/cpp-httplib
 	url = https://github.com/yhirose/cpp-httplib
+[submodule "deps/json"]
+	path = deps/json
+	url = https://github.com/nlohmann/json

CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.0)
+# 3.4 is required for imported targets.
+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")
@@ -8,48 +9,58 @@ 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("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
 include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
 include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
 include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
 include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
 include_directories("${PROJECT_SOURCE_DIR}/deps/cpp-httplib")
+include_directories("${PROJECT_SOURCE_DIR}/deps/toml11")
+include_directories("${PROJECT_SOURCE_DIR}/deps/json/single_include")
 include_directories("${PROJECT_SOURCE_DIR}/deps")
 
 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)
-endif()
+# ------------------------ WINDOWS ---------------------------------
-
+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})
-endif()
+    if (MSVC)
-
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-include_directories("include/sentry-native/include")
+        set(SENTRY_BUILD_RUNTIMESTATIC ON)
-set(SENTRY_BUILD_SHARED_LIBS OFF)
+    endif ()
-if (MSVC)
-    set(SENTRY_BUILD_RUNTIMESTATIC ON)
-endif()
-set(SENTRY_BACKEND breakpad)
-add_subdirectory("deps/sentry-native")
-
-message(STATUS "Setting compiler flags")
-if (WIN32)
-
-    #-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static
     set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
     include_directories(${VcpkgRoot}/include)
     link_directories(${VcpkgRoot}/lib)
+# ------------------------ LINUX ---------------------------------
 elseif (UNIX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
+    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")
     if (SANITIZE)
@@ -58,6 +69,9 @@ elseif (UNIX)
     endif (SANITIZE)
 endif ()
 
+include_directories("include/sentry-native/include")
+
+# ------------------------ SENTRY ---------------------------------
 message(STATUS "Checking for Sentry URL")
 # this is set by the build system.
 # IMPORTANT: if you're building from source, just leave this empty
@@ -65,18 +79,21 @@ if (NOT DEFINED BEAMMP_SECRET_SENTRY_URL)
     message(WARNING "No sentry URL configured. Sentry logging is disabled for this build. \
     This is not an error, and if you're building the BeamMP-Server yourself, this is expected and can be ignored.")
     set(BEAMMP_SECRET_SENTRY_URL "")
+    set(SENTRY_BACKEND none)
 else()
-    string(LENGTH ${BEAMMP_SECRET_SENTRY_URL} URL_LEN)
+    set(SENTRY_BACKEND breakpad)
-    message(STATUS "Sentry URL is length ${URL_LEN}")
 endif()
+add_subdirectory("deps/sentry-native")
 
+# ------------------------ C++ SETUP ---------------------------------
+set(CMAKE_CXX_STANDARD 17)
+
+# ------------------------ DEPENDENCIES ------------------------------
 message(STATUS "Adding local source dependencies")
 # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
 add_subdirectory(deps)
 
-set(CMAKE_CXX_STANDARD 17)
+# ------------------------ BEAMMP SERVER -----------------------------
-
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 add_executable(BeamMP-Server
         src/main.cpp
@@ -108,12 +125,10 @@ target_include_directories(BeamMP-Server PUBLIC
     "${CMAKE_CURRENT_SOURCE_DIR}/include" 
     "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
 
-if (APPLE)
+include(FindLua)
-    message(STATUS "NOT looking for Lua on APPLE")
+include(FindOpenSSL)
-else()
+include(FindThreads)
-    message(STATUS "Looking for Lua")
+include(FindZLIB)
-    find_package(Lua REQUIRED VERSION 5.3)
-endif()
 
 target_include_directories(BeamMP-Server PUBLIC 
     ${LUA_INCLUDE_DIR} 
@@ -122,39 +137,17 @@ target_include_directories(BeamMP-Server PUBLIC
     "include/sentry-native/include"
     "include/curl/include")
 
-message(STATUS "Looking for SSL")
+target_link_libraries(BeamMP-Server 
+    OpenSSL::SSL
+    OpenSSL::Crypto
+    sol2::sol2
+    fmt::fmt
+    Threads::Threads
+    ZLIB::ZLIB
+    ${LUA_LIBRARIES}
+    commandline
+    sentry)
 
-if (APPLE)
+if (WIN32)
-    set(OPENSSL_LIBRARIES ssl crypto)
+    target_link_libraries(BeamMP-Server wsock32 ws2_32)
-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 ()

Changelog.md

@@ -1,4 +1,32 @@
-# v2.4.0
+# 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
+- FIXED issue with client->server events which contain ':'
+
+# v3.0.2
+
+- ADDED Periodic update message if a new server is released
+- ADDED Config setting for the IP the http server listens on
+- CHANGED Default MaxPlayers to 8
+- CHANGED Default http server listen IP to localhost
+- FIXED `MP.CreateEventTimer` filling up the queue (see <https://wiki.beammp.com/en/Scripting/new-lua-scripting#mpcreateeventtimerevent_name-string-interval_ms-number-strategy-number-since-v302>)
+- FIXED `MP.TriggerClientEvent` not kicking the client if it failed
+- FIXED Lua result queue handling not checking all results
+
+# v3.0.1
+
+- ADDED Backup URLs to UpdateCheck (will fail less often now)
+- ADDED console cursor left and right movement (with arrow keys) and working HOME and END key (via github.com/lionkor/commandline)
+- FIXED infinite snowmen / infinite unicycle spawning bug
+- FIXED a bug where, when run with --working-directory, the Server.log would still be in the original directory
+- FIXED a bug which could cause the plugin reload thread to spin at 100% if the reloaded plugin's didn't terminate
+- FIXED an issue which would cause servers to crash on mod download via SIGPIPE on POSIX
+- FIXED an issue which would cause servers to crash when checking if a vehicle is a unicycle
+
+# v3.0.0
 
 - CHANGED entire plugin Lua implementation (rewrite)
 - CHANGED moved *almost all* Lua functions into MP.\*

README.md

@@ -6,6 +6,8 @@
 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).
 
+**For Linux, you __need__ the runtime dependencies, listed below under "prerequisites".**
+
 ## Support + Contact
 
 Feel free to ask any questions via the following channels:
@@ -48,7 +50,7 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea
 
 ## Build Instructions
 
-**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.0`!__**
+**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.3.3`!__**
 
 Currently only linux and windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
 
@@ -58,38 +60,47 @@ 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`, in which case the current dependencies are the `x64-windows-static` versions of `lua`, `zlib`, `rapidjson`, and `openssl`.
+Dependencies for **windows** can be installed with `vcpkg`.
+These are:
+```
+lua
+zlib
+rapidjson
+openssl
+websocketpp
+curl
+```
 
-#### Linux / \*nix
+#### Linux
 
 These package names are in the debian / ubuntu style. Feel free to PR your own guide for a different distro.
 
-- `git`
+Runtime dependencies for **linux** are (debian/ubuntu):
-- `make`
+```
-- `cmake`
+libz-dev
-- `g++`
+rapidjson-dev
-- `libcurl4-openssl-dev` or similar (search for `libcurl` and look for one with `-dev`)
+liblua5.3
-  
+libssl-dev
-  Must support ISO C++17. If your distro's `g++` doesn't support C++17, chances are that it has a `g++-8` or `g++-10` package that does. If this is the case. you just need to run CMake with `-DCMAKE_CXX_COMPILER=g++-10` (replace `g++-10` with your compiler's name).
+libwebsocketpp-dev
-- `liblua5.3-dev` 
+libcurl4-openssl-dev
-  
-  Any 5.x version should work, but 5.3 is what we officially use. Any other version might break in the future.
-  You can also use any version of `libluajit`, but the same applies regarding the version.
-- `libz-dev`
-- `rapidjson-dev`
-- `libopenssl-dev` or `libssl-dev`
-
-In the end you should end up with a command something like this:
-
-```sh
-sudo apt install git make cmake g++-10 liblua5.3 libz-dev rapidjson-dev libopenssl-dev
 ```
 
-In the end you should end up with a command something like this:
+Build-time dependencies for **linux** are:
-
-```sh
-sudo apt install git make cmake g++-10 liblua5.3 libz-dev rapidjson-dev libopenssl-dev
 ```
+git
+make
+cmake
+g++
+```
+
+For other distributions (e.g. Arch) you want to find packages for:
+- libz
+- rapidjson
+- lua5.3
+- ssl / openssl
+- websocketpp
+- curl (with ssl support)
+- \+ the build time dependencies from above
 
 ### How to build
 
@@ -98,7 +109,7 @@ On windows, use git-bash for these commands. On Linux, these should work in your
 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`.
-4. Checkout the branch of the release you want to compile (`master` is often unstable), for example `git checkout tags/v1.20` for version 1.20. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
+4. Checkout the branch of the release you want to compile (`master` is often unstable), for example `git checkout tags/v2.3.3` for version 2.3.3. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
 5. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
 6. Run `make`
 7. You will now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (windows or linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/Server_Mod) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.

deps/CMakeLists.txt

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

include/Client.h

@@ -92,7 +92,7 @@ private:
     std::queue<std::string> mPacketsSync;
     std::unordered_map<std::string, std::string> mIdentifiers;
     bool mIsGuest = false;
-    std::mutex mVehicleDataMutex;
+    mutable std::mutex mVehicleDataMutex;
     TSetOfVehicleData mVehicleData;
     std::string mName = "Unknown Client";
     SOCKET mSocket[2] { SOCKET(0), SOCKET(0) };

include/Common.h

@@ -7,6 +7,8 @@ extern TSentry Sentry;
 #include <atomic>
 #include <cstring>
 #include <deque>
+#include <filesystem>
+#include <fmt/format.h>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -40,19 +42,20 @@ public:
         std::string Resource { "Resources" };
         std::string MapName { "/levels/gridmap_v2/info.json" };
         std::string Key {};
-        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
+        bool HTTPServerEnabled { false };
-        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
+        int MaxPlayers { 8 };
-        bool HTTPServerEnabled { true };
-        int MaxPlayers { 10 };
         bool Private { true };
         int MaxCars { 1 };
         bool DebugModeEnabled { false };
         int Port { 30814 };
         std::string CustomIP {};
+        bool LogChat { true };
         bool SendErrors { true };
         bool SendErrorsMessageEnabled { true };
         int HTTPServerPort { 8080 };
-        bool HTTPServerUseSSL { true };
+        std::string HTTPServerIP { "127.0.0.1" };
+        bool HTTPServerUseSSL { false };
+        bool HideUpdateMessages { false };
         [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
     };
 
@@ -74,10 +77,15 @@ public:
 
     static TSettings Settings;
 
+    static std::vector<std::string> GetBackendUrlsInOrder() {
+        return {
+            "backend.beammp.com",
+            "backup1.beammp.com",
+            "backup2.beammp.com"
+        };
+    }
+
     static std::string GetBackendUrlForAuth() { return "auth.beammp.com"; }
-    static std::string GetBackendHostname() { return "backend.beammp.com"; }
-    static std::string GetBackup1Hostname() { return "backup1.beammp.com"; }
-    static std::string GetBackup2Hostname() { return "backup2.beammp.com"; }
     static std::string GetBackendUrlForSocketIO() { return "https://backend.beammp.com"; }
     static void CheckForUpdates();
     static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
@@ -114,7 +122,7 @@ private:
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
 
-    static inline Version mVersion { 3, 0, 0 };
+    static inline Version mVersion { 3, 1, 0 };
 };
 
 std::string ThreadName(bool DebugModeOverride = false);
@@ -140,6 +148,10 @@ void RegisterThread(const std::string& str);
 #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
@@ -201,6 +213,14 @@ void RegisterThread(const std::string& str);
 #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_warnf(...) beammp_warn(fmt::format(__VA_ARGS__))
+#define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
+#define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
+#define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
+#define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
+
 void LogChatMessage(const std::string& name, int id, const std::string& msg);
 
 #define Biggest 30000

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,6 +48,11 @@ 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,8 +3,6 @@
 #include <Common.h>
 #include <IThreaded.h>
 #include <filesystem>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
 #include <string>
 #include <unordered_map>
 
@@ -19,24 +17,23 @@
 
 namespace fs = std::filesystem;
 
-namespace Crypto {
+class TServer;
-constexpr size_t RSA_DEFAULT_KEYLENGTH { 2048 };
+class TNetwork;
-}
+class TResourceManager;
 
 namespace Http {
 std::string GET(const std::string& host, int port, const std::string& target, unsigned int* status = nullptr);
-std::string POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr);
+std::string POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr, const httplib::Headers& headers = {});
 namespace Status {
     std::string ToString(int code);
 }
 const std::string ErrorString = "-1";
 
 namespace Server {
-    void SetupEnvironment();
-    // todo: Add non TLS Server Instance, this one is TLS only
     class THttpServerInstance {
     public:
-        THttpServerInstance();
+        THttpServerInstance(TServer&, TNetwork&, TResourceManager&);
+        ~THttpServerInstance();
         static fs::path KeyFilePath;
         static fs::path CertFilePath;
 
@@ -45,16 +42,9 @@ namespace Server {
 
     private:
         std::thread mThread;
-    };
+        TServer& mServer;
-    // todo: all of these functions are likely unsafe,
+        TNetwork& mNetwork;
-    // todo: replace with something that's managed by a domain specific crypto library
+        TResourceManager& mResourceManager;
-    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,7 +12,8 @@ namespace MP {
 
     std::string GetOSName();
     std::tuple<int, int, int> GetServerVersion();
-    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data);
+    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
+    bool TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
     inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
     void DropPlayer(int ID, std::optional<std::string> MaybeReason);
     void SendChatMessage(int ID, const std::string& Message);
@@ -22,7 +23,15 @@ 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,9 +3,10 @@
 #include "Common.h"
 
 #include <atomic>
+#include <filesystem>
 
 #define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
-#include <toml11/toml.hpp> // header-only version of TOML++
+#include <toml.hpp> // header-only version of TOML++
 
 namespace fs = std::filesystem;
 

include/TConsole.h

@@ -4,6 +4,11 @@
 #include "commandline.h"
 #include <atomic>
 #include <fstream>
+#include <functional>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
 
 class TLuaEngine;
 
@@ -15,19 +20,38 @@ public:
     void WriteRaw(const std::string& str);
     void InitializeLuaConsole(TLuaEngine& Engine);
     void BackupOldLog();
+    void StartLoggingToFile();
     Commandline& Internal() { return mCommandline; }
 
 private:
     void RunAsCommand(const std::string& cmd, bool IgnoreNotACommand = false);
     void ChangeToLuaConsole(const std::string& LuaStateId);
     void ChangeToRegularConsole();
+    void HandleLuaInternalCommand(const std::string& cmd);
 
-    void Command_Lua(const std::string& cmd);
+    void Command_Lua(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Help(const std::string& cmd);
+    void Command_Help(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Kick(const std::string& cmd);
+    void Command_Kick(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Say(const std::string& cmd);
+    void Command_List(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_List(const std::string& cmd);
+    void Command_Status(const std::string& cmd, const std::vector<std::string>& args);
-    void Command_Status(const std::string& cmd);
+    void Command_Settings(const std::string& cmd, const std::vector<std::string>& args);
+
+    void Command_Say(const std::string& FullCommand);
+    bool EnsureArgsCount(const std::vector<std::string>& args, size_t n);
+    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); } },
+        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
+    };
 
     Commandline mCommandline;
     std::vector<std::string> mCachedLuaHistory;
@@ -37,4 +61,6 @@ private:
     bool mFirstTime { true };
     std::string mStateId;
     const std::string mDefaultStateId = "BEAMMP_SERVER_CONSOLE";
+    std::ofstream mLogFileStream;
+    std::mutex mLogFileStreamMtx;
 };

include/TLuaEngine.h

@@ -6,12 +6,14 @@
 #include <condition_variable>
 #include <filesystem>
 #include <initializer_list>
+#include <list>
 #include <lua.hpp>
 #include <memory>
 #include <mutex>
 #include <queue>
+#include <random>
 #include <set>
-#include <toml11/toml.hpp>
+#include <toml.hpp>
 #include <unordered_map>
 #include <vector>
 
@@ -32,8 +34,8 @@ static constexpr size_t TLuaArgTypes_Bool = 3;
 class TLuaPlugin;
 
 struct TLuaResult {
-    std::atomic_bool Ready;
+    bool Ready;
-    std::atomic_bool Error;
+    bool Error;
     std::string ErrorMessage;
     sol::object Result { sol::lua_nil };
     TLuaStateId StateId;
@@ -72,6 +74,18 @@ private:
 
 class TLuaEngine : IThreaded {
 public:
+    enum CallStrategy : int {
+        BestEffort,
+        Precise,
+    };
+
+    struct QueuedFunction {
+        std::string FunctionName;
+        std::shared_ptr<TLuaResult> Result;
+        std::vector<TLuaArgTypes> Args;
+        std::string EventName; // optional, may be empty
+    };
+
     TLuaEngine();
     ~TLuaEngine() noexcept {
         beammp_debug("Lua Engine terminated");
@@ -89,6 +103,7 @@ public:
         std::unique_lock Lock(mResultsToCheckMutex);
         return mResultsToCheck.size();
     }
+
     size_t GetLuaStateCount() {
         std::unique_lock Lock(mLuaStatesMutex);
         return mLuaStates.size();
@@ -145,13 +160,22 @@ public:
         return Results; //
     }
     std::set<std::string> GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId);
-    void CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS);
+    void CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy);
     void CancelEventTimers(const std::string& EventName, TLuaStateId StateId);
     sol::state_view GetStateForPlugin(const fs::path& PluginPath);
     TLuaStateId GetStateIDForPlugin(const fs::path& PluginPath);
+    void AddResultToCheck(const std::shared_ptr<TLuaResult>& Result);
 
     static constexpr const char* BeamMPFnNotFoundError = "BEAMMP_FN_NOT_FOUND";
 
+    std::vector<std::string> GetStateGlobalKeysForState(TLuaStateId StateId);
+
+    // 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);
@@ -165,11 +189,18 @@ private:
         ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
+        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy);
         void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
         void AddPath(const fs::path& Path); // to be added to path and cpath
         void operator()() override;
         sol::state_view State() { return sol::state_view(mState); }
 
+        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);
@@ -178,7 +209,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;
@@ -187,13 +221,15 @@ private:
         std::thread mThread;
         std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> mStateExecuteQueue;
         std::recursive_mutex mStateExecuteQueueMutex;
-        std::queue<std::tuple<std::string, std::shared_ptr<TLuaResult>, std::vector<TLuaArgTypes>>> mStateFunctionQueue;
+        std::vector<QueuedFunction> mStateFunctionQueue;
         std::mutex mStateFunctionQueueMutex;
         std::condition_variable mStateFunctionQueueCond;
         TLuaEngine* mEngine;
         sol::state_view mStateView { mState };
         std::queue<fs::path> mPaths;
         std::recursive_mutex mPathsMutex;
+        std::mt19937 mMersenneTwister;
+        std::uniform_real_distribution<double> mUniformRealDistribution01;
     };
 
     struct TimedEvent {
@@ -201,6 +237,7 @@ private:
         std::chrono::high_resolution_clock::time_point LastCompletion {};
         std::string EventName;
         TLuaStateId StateId;
+        CallStrategy Strategy;
         bool Expired();
         void Reset();
     };
@@ -217,8 +254,9 @@ private:
     std::recursive_mutex mLuaEventsMutex;
     std::vector<TimedEvent> mTimedEvents;
     std::recursive_mutex mTimedEventsMutex;
-    std::queue<std::shared_ptr<TLuaResult>> mResultsToCheck;
+    std::list<std::shared_ptr<TLuaResult>> mResultsToCheck;
-    std::recursive_mutex mResultsToCheckMutex;
+    std::mutex mResultsToCheckMutex;
+    std::condition_variable mResultsToCheckCond;
 };
 
 // std::any TriggerLuaEvent(const std::string& Event, bool local, TLuaPlugin* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);

include/VehicleData.h

@@ -1,10 +1,13 @@
 #pragma once
 
+#include <nlohmann/json.hpp>
 #include <string>
 
+using json = nlohmann::json;
+
 class TVehicleData final {
 public:
-    TVehicleData(int ID, std::string Data);
+    TVehicleData(int ID, const std::string& Data);
     ~TVehicleData();
     // We cannot delete this, since vector needs to be able to copy when it resizes.
     // Deleting this causes some wacky template errors which are hard to decipher,
@@ -19,9 +22,12 @@ public:
 
     bool operator==(const TVehicleData& v) const { return mID == v.mID; }
 
+    const json& Json() const;
+
 private:
     int mID { -1 };
     std::string mData;
+    json mJson;
 };
 
 // TODO: unused now, remove?

openapi.yml

@@ -0,0 +1,135 @@
+openapi: "3.0.2"
+info:
+  title: BeamMP-Server
+  version: "api-v1"
+  description: |
+    The BeamMP-Server optionally runs an HTTP server
+    which can be used to query information about the server's 
+    status, health, players, etc.
+servers:
+  - url: http://localhost:{port}/api/v1
+    description: BeamMP-Server API v1
+    variables:
+      port:
+        default: "8000"
+
+paths:
+  /player/{name}/vehicles:
+    parameters:
+      - name: "name"
+        in: path
+        required: true
+        schema:
+          type: string
+          example: "LionKor"
+    get:
+      summary: vehicles this player has spawend
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    jbm:
+                      type: string
+                      example: "bolide"
+  /version:
+    get:
+      summary: server version
+      description: |
+        Server version in 'major.minor.patch' semver format
+      responses:
+        "200":
+          description: OK
+          content:
+            "text/plain":
+              schema:
+                type: string
+                example: "3.1.0"
+  /players:
+    get:
+      summary: list of players on this server
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: array
+                example:
+                  - "LionKor"
+                  - "Titch"
+                items:
+                  type: string
+  /config:
+    get:
+      summary: describes server configuration
+      description: |
+        An overview over the configuration currently
+        used by this server.
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: object
+                properties:
+                  name:
+                    type: string
+                    example: "my awesome beammp server"
+                  description:
+                    type: string
+                    example: "join!"
+                  max_players:
+                    type: integer
+                    example: 7
+                  max_cars:
+                    type: integer
+                    example: 2
+                  map:
+                    type: string
+                    example: "/levels/gridmap_v2/info.json"
+                  private:
+                    type: boolean
+  /ready:
+    get:
+      summary: whether the server has started fully
+      description: |
+        True once all subsystems have started up.
+        This doesn't tell you whether they're healthy, 
+        check /health for that information.
+      responses:
+        "200":
+          description: OK
+          content:
+            "text/plain":
+              schema:
+                type: boolean
+  /health:
+    get:
+      summary: health of the server's systems
+      responses:
+        "200":
+          description: OK
+          content:
+            "application/json":
+              schema:
+                type: object
+                properties:
+                  healthy:
+                    type: boolean
+                  good:
+                    type: array
+                    items:
+                      type: string
+                      example: "Heartbeat"
+                  bad:
+                    type: array
+                    items:
+                      type: string
+                      example: "ResourceManager"

src/ArgsParser.cpp

@@ -12,7 +12,7 @@ void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
                 ConsumeLongFlag(std::string(Arg));
             }
         } else {
-            beammp_error("Error parsing commandline arguments: Supplied argument '" + std::string(Arg) + "' is not a valid argument and was ignored.");
+            beammp_errorf("Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
         }
     }
 }
@@ -21,7 +21,7 @@ bool ArgsParser::Verify() {
     bool Ok = true;
     for (const auto& RegisteredArg : mRegisteredArguments) {
         if (RegisteredArg.Flags & Flags::REQUIRED && !FoundArgument(RegisteredArg.Names)) {
-            beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' is required but wasn't found.");
+            beammp_errorf("Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
             Ok = false;
             continue;
         } else if (FoundArgument(RegisteredArg.Names)) {

src/Client.cpp

@@ -5,8 +5,6 @@
 #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) {
@@ -27,6 +25,7 @@ void TClient::ClearCars() {
 int TClient::GetOpenCarID() const {
     int OpenID = 0;
     bool found;
+    std::unique_lock lock(mVehicleDataMutex);
     do {
         found = true;
         for (auto& v : mVehicleData) {

src/Common.cpp

@@ -43,6 +43,7 @@ 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() {
@@ -60,7 +61,6 @@ std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
     return Version;
 }
 
-// FIXME: This should be used by operator< on Version
 bool Application::IsOutdated(const Version& Current, const Version& Newest) {
     if (Newest.major > Current.major) {
         return true;
@@ -97,28 +97,42 @@ void Application::SetSubsystemStatus(const std::string& Subsystem, Status status
 
 void Application::CheckForUpdates() {
     Application::SetSubsystemStatus("UpdateCheck", Application::Status::Starting);
+    static bool FirstTime = true;
     // checks current version against latest version
     std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
-    auto Response = Http::GET(GetBackendHostname(), 443, "/v/s");
+    for (const auto& url : GetBackendUrlsInOrder()) {
-    bool Matches = std::regex_match(Response, VersionRegex);
+        auto Response = Http::GET(GetBackendUrlsInOrder().at(0), 443, "/v/s");
-    if (Matches) {
+        bool Matches = std::regex_match(Response, VersionRegex);
-        auto MyVersion = ServerVersion();
+        if (Matches) {
-        auto RemoteVersion = Version(VersionStrToInts(Response));
+            auto MyVersion = ServerVersion();
-        if (IsOutdated(MyVersion, RemoteVersion)) {
+            auto RemoteVersion = Version(VersionStrToInts(Response));
-            std::string RealVersionString = RemoteVersion.AsString();
+            if (IsOutdated(MyVersion, RemoteVersion)) {
-            beammp_warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION OUT! There's a new version (v" + RealVersionString + ") of the BeamMP-Server available! For more info visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server." + std::string(ANSI_RESET));
+                std::string RealVersionString = RemoteVersion.AsString();
+                beammp_warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION IS OUT! Please update to the new version (v" + RealVersionString + ") of the BeamMP-Server! Download it here: https://beammp.com/! For a guide on how to update, visit: https://wiki.beammp.com/en/home/server-maintenance#updating-the-server" + std::string(ANSI_RESET));
+            } else {
+                if (FirstTime) {
+                    beammp_info("Server up-to-date!");
+                }
+            }
+            Application::SetSubsystemStatus("UpdateCheck", Application::Status::Good);
+            break;
         } else {
-            beammp_info("Server up-to-date!");
+            if (FirstTime) {
+                beammp_debug("Failed to fetch version from: " + url);
+                beammp_trace("got " + Response);
+                auto Lock = Sentry.CreateExclusiveContext();
+                Sentry.SetContext("get-response", { { "response", Response } });
+                Sentry.LogError("failed to get server version", _file_basename, _line);
+                Application::SetSubsystemStatus("UpdateCheck", Application::Status::Bad);
+            }
         }
-        Application::SetSubsystemStatus("UpdateCheck", Application::Status::Good);
-    } else {
-        beammp_warn("Unable to fetch version from backend.");
-        beammp_trace("got " + Response);
-        auto Lock = Sentry.CreateExclusiveContext();
-        Sentry.SetContext("get-response", { { "response", Response } });
-        Sentry.LogError("failed to get server version", _file_basename, _line);
-        Application::SetSubsystemStatus("UpdateCheck", Application::Status::Bad);
     }
+    if (Application::GetSubsystemStatuses().at("UpdateCheck") == Application::Status::Bad) {
+        if (FirstTime) {
+            beammp_warn("Unable to fetch version info from backend.");
+        }
+    }
+    FirstTime = false;
 }
 
 // thread name stuff
@@ -148,7 +162,7 @@ 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);
@@ -165,22 +179,22 @@ Version::Version(const std::array<uint8_t, 3>& v)
 }
 
 std::string Version::AsString() {
-    std::stringstream ss {};
+    return fmt::format("{:d}.{:d}.{:d}", major, minor, patch);
-    ss << int(major) << "." << int(minor) << "." << int(patch);
-    return ss.str();
 }
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    std::stringstream ss;
+    if (Application::Settings.LogChat) {
-    ss << ThreadName();
+        std::stringstream ss;
-    ss << "[CHAT] ";
+        ss << ThreadName();
-    if (id != -1) {
+        ss << "[CHAT] ";
-        ss << "(" << id << ") <" << name << "> ";
+        if (id != -1) {
-    } else {
+            ss << "(" << id << ") <" << name << "> ";
-        ss << name << "";
+        } else {
+            ss << name << "";
+        }
+        ss << msg;
+        Application::Console().Write(ss.str());
     }
-    ss << msg;
-    Application::Console().Write(ss.str());
 }
 
 std::string GetPlatformAgnosticErrorString() {

src/Http.cpp

@@ -4,19 +4,19 @@
 #include "Common.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
+#include "TNetwork.h"
+#include "TResourceManager.h"
+#include "TServer.h"
+#include "httplib.h"
 
 #include <map>
+#include <nlohmann/json.hpp>
 #include <random>
-#include <rapidjson/document.h>
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
 #include <stdexcept>
-fs::path Http::Server::THttpServerInstance::KeyFilePath;
+
-fs::path Http::Server::THttpServerInstance::CertFilePath;
 // TODO: Add sentry error handling back
 
-namespace json = rapidjson;
+using json = nlohmann::json;
 
 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
     httplib::SSLClient client(host, port);
@@ -33,17 +33,20 @@ std::string Http::GET(const std::string& host, int port, const std::string& targ
     }
 }
 
-std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status) {
+std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
     httplib::SSLClient client(host, port);
+    client.set_read_timeout(std::chrono::seconds(10));
+    beammp_assert(client.is_valid());
     client.enable_server_certificate_verification(false);
     client.set_address_family(AF_INET);
-    auto res = client.Post(target.c_str(), body.c_str(), body.size(), ContentType.c_str());
+    auto res = client.Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
     if (res) {
         if (status) {
             *status = res->status;
         }
         return res->body;
     } else {
+        beammp_debug("POST failed: " + httplib::to_string(res.error()));
         return Http::ErrorString;
     }
 }
@@ -142,170 +145,115 @@ std::string Http::Status::ToString(int Code) {
     }
 }
 
-long Http::Server::Tx509KeypairGenerator::GenerateRandomId() {
+#define API_V1 "/api/v1"
-    std::random_device R;
-    std::default_random_engine E1(R());
-    std::uniform_int_distribution<long> UniformDist(0, ULONG_MAX);
-    return UniformDist(E1);
-}
 
-// Http::Server::THttpServerInstance::THttpServerInstance() { }
+Http::Server::THttpServerInstance::THttpServerInstance(TServer& Server, TNetwork& Network, TResourceManager& ResMan)
-EVP_PKEY* Http::Server::Tx509KeypairGenerator::GenerateKey() {
+    : mServer(Server)
-    /**
+    , mNetwork(Network)
-     * Allocate memory for the pkey
+    , mResourceManager(ResMan) {
-     */
-    EVP_PKEY* PKey = EVP_PKEY_new();
-    if (PKey == nullptr) {
-        beammp_error("Could not allocate memory for X.509 private key (PKEY) generation.");
-        throw std::runtime_error { std::string { "X.509 PKEY allocation error" } };
-    }
-    BIGNUM* E = BN_new();
-    beammp_assert(E); // TODO: replace all these asserts with beammp_errors
-    unsigned char three = 3;
-    BIGNUM* EErr = BN_bin2bn(&three, sizeof(three), E);
-    beammp_assert(EErr);
-    RSA* Rsa = RSA_new();
-    beammp_assert(Rsa);
-    int Ret = RSA_generate_key_ex(Rsa, Crypto::RSA_DEFAULT_KEYLENGTH, E, nullptr);
-    beammp_assert(Ret == 1);
-    BN_free(E);
-    if (!EVP_PKEY_assign_RSA(PKey, Rsa)) {
-        EVP_PKEY_free(PKey);
-        beammp_error(std::string("Could not generate " + std::to_string(Crypto::RSA_DEFAULT_KEYLENGTH) + "-bit RSA key."));
-        throw std::runtime_error { std::string("X.509 RSA key generation error") };
-    }
-    // todo: figure out if returning by reference instead of passing pointers is a security breach
-    return PKey;
-}
-
-X509* Http::Server::Tx509KeypairGenerator::GenerateCertificate(EVP_PKEY& PKey) {
-    X509* X509 = X509_new();
-    if (X509 == nullptr) {
-        X509_free(X509);
-        beammp_error("Could not allocate memory for X.509 certificate generation.");
-        throw std::runtime_error { std::string("X.509 certificate generation error") };
-    }
-
-    /**Set the metadata of the certificate*/
-    ASN1_INTEGER_set(X509_get_serialNumber(X509), GenerateRandomId());
-
-    /**Set the cert validity to a year*/
-    X509_gmtime_adj(X509_get_notBefore(X509), 0);
-    X509_gmtime_adj(X509_get_notAfter(X509), 31536000L);
-
-    /**Set the public key of the cert*/
-    X509_set_pubkey(X509, &PKey);
-
-    X509_NAME* Name = X509_get_subject_name(X509);
-
-    /**Set cert metadata*/
-    X509_NAME_add_entry_by_txt(Name, "C", MBSTRING_ASC, (unsigned char*)"GB", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(Name, "O", MBSTRING_ASC, (unsigned char*)"BeamMP Ltd.", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(Name, "CN", MBSTRING_ASC, (unsigned char*)"localhost", -1, -1, 0);
-
-    X509_set_issuer_name(X509, Name);
-
-    // TODO: Hashing with sha256 might cause problems, check later
-    if (!X509_sign(X509, &PKey, EVP_sha1())) {
-        X509_free(X509);
-        beammp_error("Could not sign X.509 certificate.");
-        throw std::runtime_error { std::string("X.509 certificate signing error") };
-    }
-    return X509;
-}
-
-void Http::Server::Tx509KeypairGenerator::GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath) {
-    // todo: generate directories for ssl keys
-    FILE* KeyFile = std::fopen(reinterpret_cast<const char*>(KeyFilePath.c_str()), "wb");
-    if (!KeyFile) {
-        beammp_error("Could not create file 'key.pem', check your permissions");
-        throw std::runtime_error("Could not create file 'key.pem'");
-    }
-
-    EVP_PKEY* PKey = Http::Server::Tx509KeypairGenerator::GenerateKey();
-
-    bool WriteOpResult = PEM_write_PrivateKey(KeyFile, PKey, nullptr, nullptr, 0, nullptr, nullptr);
-    fclose(KeyFile);
-
-    if (!WriteOpResult) {
-        beammp_error("Could not write to file 'key.pem', check your permissions");
-        throw std::runtime_error("Could not write to file 'key.pem'");
-    }
-
-    FILE* CertFile = std::fopen(reinterpret_cast<const char*>(CertFilePath.c_str()), "wb"); // x509 file
-    if (!CertFile) {
-        beammp_error("Could not create file 'cert.pem', check your permissions");
-        throw std::runtime_error("Could not create file 'cert.pem'");
-    }
-
-    X509* x509 = Http::Server::Tx509KeypairGenerator::GenerateCertificate(*PKey);
-    WriteOpResult = PEM_write_X509(CertFile, x509);
-    fclose(CertFile);
-
-    if (!WriteOpResult) {
-        beammp_error("Could not write to file 'cert.pem', check your permissions");
-        throw std::runtime_error("Could not write to file 'cert.pem'");
-    }
-    EVP_PKEY_free(PKey);
-    X509_free(x509);
-    return;
-}
-
-bool Http::Server::Tx509KeypairGenerator::EnsureTLSConfigExists() {
-    if (fs::is_regular_file(Application::Settings.SSLKeyPath)
-        && fs::is_regular_file(Application::Settings.SSLCertPath)) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-void Http::Server::SetupEnvironment() {
-    if (!Application::Settings.HTTPServerUseSSL) {
-        return;
-    }
-    auto parent = fs::path(Application::Settings.SSLKeyPath).parent_path();
-    if (!fs::exists(parent))
-        fs::create_directories(parent);
-
-    Application::TSettings defaultSettings {};
-    if (!Tx509KeypairGenerator::EnsureTLSConfigExists()) {
-        beammp_warn(std::string("No default TLS Key / Cert found. "
-                                "IF YOU HAVE NOT MODIFIED THE SSLKeyPath OR SSLCertPath VALUES "
-                                "THIS IS NORMAL ON FIRST STARTUP! BeamMP will generate it's own certs in the default directory "
-                                "(Check for permissions or corrupted key-/certfile)"));
-        Tx509KeypairGenerator::GenerateAndWriteToDisk(defaultSettings.SSLKeyPath, defaultSettings.SSLCertPath);
-        Http::Server::THttpServerInstance::KeyFilePath = defaultSettings.SSLKeyPath;
-        Http::Server::THttpServerInstance::CertFilePath = defaultSettings.SSLCertPath;
-    } else {
-        Http::Server::THttpServerInstance::KeyFilePath = Application::Settings.SSLKeyPath;
-        Http::Server::THttpServerInstance::CertFilePath = Application::Settings.SSLCertPath;
-    }
-}
-
-Http::Server::THttpServerInstance::THttpServerInstance() {
     Application::SetSubsystemStatus("HTTPServer", Application::Status::Starting);
     mThread = std::thread(&Http::Server::THttpServerInstance::operator(), this);
+}
+
+Http::Server::THttpServerInstance::~THttpServerInstance() {
     mThread.detach();
 }
 
-void Http::Server::THttpServerInstance::operator()() {
+void Http::Server::THttpServerInstance::operator()() try {
-    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
+    beammp_infof("HTTP Server starting on [{}]:{}", Application::Settings.HTTPServerIP, Application::Settings.HTTPServerPort);
-    std::unique_ptr<httplib::Server> HttpLibServerInstance;
+    if (Application::Settings.Private
-    if (Application::Settings.HTTPServerUseSSL) {
+        && Application::Settings.HTTPServerIP != "::"
-        HttpLibServerInstance = std::make_unique<httplib::SSLServer>(
+        && Application::Settings.HTTPServerIP != "localhost"
-            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::CertFilePath.c_str()),
+        && Application::Settings.HTTPServerIP != "127.0.0.1") {
-            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::KeyFilePath.c_str()));
+        beammp_warnf("HTTP Server is running on a possibly public IP ({}), but the server is private. The server's HTTP API supports viewing config, players, and other information, even though the server is private. (this is not an error)", Application::Settings.HTTPServerIP);
-    } else {
-        HttpLibServerInstance = std::make_unique<httplib::Server>();
     }
-    // todo: make this IP agnostic so people can set their own IP
+    std::unique_ptr<httplib::Server> Server = std::make_unique<httplib::Server>();
-    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");
+    Server->Get(API_V1 R"(/player/(.+)/vehicles)", [this](const httplib::Request& Req, httplib::Response& Res) {
+        if (Req.matches.empty()) {
+            Res.status = 404;
+        } else {
+            const std::string PlayerName = Req.matches[1];
+            bool Found = false;
+            json Result = json::array();
+            mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) {
+                if (!ClientPtr.expired()) {
+                    const auto Client = ClientPtr.lock();
+                    if (Client->GetName() == PlayerName) {
+                        const auto [Cars, Lock] = Client->GetAllCars();
+                        for (const auto& Car : *Cars) {
+                            Result.emplace_back().at("jbm") = Car.Json().at("jbm");
+                        }
+                        Found = true;
+                    }
+                }
+                return true;
+            });
+            if (!Found) {
+                Res.status = 404;
+            } else {
+                Res.status = 200;
+                Res.set_content(Result.dump(), "application/json");
+            }
+        }
     });
-    HttpLibServerInstance->Get("/health", [](const httplib::Request&, httplib::Response& res) {
+
+    Server->Get(API_V1 "/players", [this](const httplib::Request&, httplib::Response& res) {
+        res.status = 200;
+        json Players = json::array();
+        mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) {
+            if (!ClientPtr.expired()) {
+                Players.push_back(ClientPtr.lock()->GetName());
+            }
+            return true;
+        });
+        res.set_content(Players.dump(),
+            "application/json");
+    });
+
+    Server->Get(API_V1 "/version", [](const httplib::Request&, httplib::Response& res) {
+        res.status = 200;
+        res.set_content(Application::ServerVersionString(), "text/plain");
+    });
+
+    Server->Get(API_V1 "/config", [](const httplib::Request&, httplib::Response& res) {
+        res.status = 200;
+        res.set_content(json {
+                            { "name", Application::Settings.ServerName },
+                            { "description", Application::Settings.ServerDesc },
+                            { "max_players", Application::Settings.MaxPlayers },
+                            { "max_cars", Application::Settings.MaxCars },
+                            { "map", Application::Settings.MapName },
+                            { "private", Application::Settings.Private },
+                        }
+                            .dump(),
+            "application/json");
+    });
+
+    Server->Get(API_V1 "/ready", [](const httplib::Request&, httplib::Response& res) {
+        auto Statuses = Application::GetSubsystemStatuses();
+        bool Started = true;
+        for (const auto& NameStatusPair : Statuses) {
+            switch (NameStatusPair.second) {
+            case Application::Status::Starting:
+            case Application::Status::ShuttingDown:
+            case Application::Status::Shutdown:
+                Started = false;
+                break;
+            case Application::Status::Good:
+            case Application::Status::Bad:
+                break;
+            }
+        }
+        res.status = 200;
+        res.set_content(Started ? "true" : "false", "text/plain");
+    });
+
+    Server->Get(API_V1 "/health", [](const httplib::Request&, httplib::Response& res) {
         size_t SystemsGood = 0;
         size_t SystemsBad = 0;
+        json Good = json::array();
+        json Bad = json::array();
         auto Statuses = Application::GetSubsystemStatuses();
         for (const auto& NameStatusPair : Statuses) {
             switch (NameStatusPair.second) {
@@ -313,59 +261,47 @@ void Http::Server::THttpServerInstance::operator()() {
             case Application::Status::ShuttingDown:
             case Application::Status::Shutdown:
             case Application::Status::Good:
+                Good.push_back(NameStatusPair.first);
                 SystemsGood++;
                 break;
             case Application::Status::Bad:
+                Bad.push_back(NameStatusPair.first);
                 SystemsBad++;
                 break;
             }
         }
-        res.set_content(SystemsBad == 0 ? "0" : "1", "text/plain");
+        res.set_content(
+            json {
+                { "healthy", SystemsBad == 0 },
+                { "good", Good },
+                { "bad", Bad },
+            }
+                .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) {
+    Server->Get({ 0x2f, 0x6b, 0x69, 0x74, 0x74, 0x79 }, [](const httplib::Request&, httplib::Response& res) {
         res.set_content(std::string(Magic), "text/plain");
     });
+    Server->set_logger([](const httplib::Request& Req, const httplib::Response& Res) {
+        beammp_debug("Http Server: " + Req.method + " " + Req.target + " -> " + std::to_string(Res.status));
+    });
+    Server->set_error_handler([](const httplib::Request&, httplib::Response& Res) {
+        if (Res.status >= 400 && Res.body.empty()) {
+            Res.set_content("Error: " + std::to_string(Res.status) + " " + Map.at(Res.status), "text/plain");
+        }
+    });
+    Server->set_exception_handler([](const httplib::Request& Req, httplib::Response& Res, std::exception& e) {
+        Res.status = 500;
+        Res.set_content("Internal Server Error", "text/plain");
+        beammp_errorf("Exception in http server serving '{}': {}", Req.target, e.what());
+    });
     Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
-    HttpLibServerInstance->listen("0.0.0.0", Application::Settings.HTTPServerPort);
+    auto ret = Server->listen(Application::Settings.HTTPServerIP.c_str(), Application::Settings.HTTPServerPort);
+    if (!ret) {
+        beammp_error("Failed to start http server (failed to listen). Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it.");
+    }
+} catch (const std::exception& e) {
+    beammp_error("Failed to start http server. Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it. Error: " + std::string(e.what()));
 }

src/LuaAPI.cpp

@@ -3,6 +3,8 @@
 #include "Common.h"
 #include "TLuaEngine.h"
 
+#include <nlohmann/json.hpp>
+
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
@@ -100,25 +102,31 @@ void LuaAPI::Print(sol::variadic_args Args) {
     luaprint(ToPrint);
 }
 
-bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
+static inline bool InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
     std::string Packet = "E:" + EventName + ":" + Data;
     if (PlayerID == -1)
-        Engine->Network().SendToAll(nullptr, Packet, true, true);
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, Packet, true, true);
     else {
-        auto MaybeClient = GetClient(Engine->Server(), PlayerID);
+        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
         if (!MaybeClient || MaybeClient.value().expired()) {
             beammp_lua_error("TriggerClientEvent invalid Player ID");
             return false;
         }
         auto c = MaybeClient.value().lock();
-        if (!Engine->Network().Respond(*c, Packet, true)) {
+        if (!LuaAPI::MP::Engine->Network().Respond(*c, Packet, true)) {
-            beammp_lua_error("Respond failed");
+            beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
+            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
             return false;
         }
     }
     return true;
 }
 
+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()) {
@@ -351,3 +359,157 @@ 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,15 +17,18 @@ static constexpr std::string_view StrName = "Name";
 static constexpr std::string_view StrDescription = "Description";
 static constexpr std::string_view StrResourceFolder = "ResourceFolder";
 static constexpr std::string_view StrAuthKey = "AuthKey";
+static constexpr std::string_view StrLogChat = "LogChat";
+
+// Misc
 static constexpr std::string_view StrSendErrors = "SendErrors";
 static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
-static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
+static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
-static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
 
 // HTTP
-static constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
+static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
-static constexpr std::string_view StrSSLCertPath = "SSLCertPath";
+static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
 static constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
+static constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";
 
 TConfig::TConfig(const std::string& ConfigFileName)
     : mConfigFileName(ConfigFileName) {
@@ -59,9 +62,10 @@ void SetComment(CommentsT& Comments, const std::string& Comment) {
  */
 void TConfig::FlushToFile() {
     auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
-    data["General"] = toml::table();
     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;
@@ -71,18 +75,20 @@ void TConfig::FlushToFile() {
     data["General"][StrMap.data()] = Application::Settings.MapName;
     data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
     data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
-    data["General"][StrSendErrors.data()] = Application::Settings.SendErrors;
+    // Misc
-    SetComment(data["General"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
+    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
-    data["General"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
+    SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
-    SetComment(data["General"][StrSendErrorsMessageEnabled.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
+    data["Misc"][StrSendErrors.data()] = Application::Settings.SendErrors;
-    data["HTTP"][StrSSLKeyPath.data()] = Application::Settings.SSLKeyPath;
+    SetComment(data["Misc"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
-    data["HTTP"][StrSSLCertPath.data()] = Application::Settings.SSLCertPath;
+    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
+    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
+    // HTTP
     data["HTTP"][StrHTTPServerPort.data()] = Application::Settings.HTTPServerPort;
-    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::Settings.HTTPServerUseSSL;
+    SetComment(data["HTTP"][StrHTTPServerIP.data()].comments(), " Which IP to listen on. Pick 0.0.0.0 for a public-facing server with no specific IP, and 127.0.0.1 or 'localhost' for a local server.");
-    SetComment(data["HTTP"][StrHTTPServerUseSSL.data()].comments(), " Recommended to keep enabled. With SSL the server will serve https and requires valid key and cert files");
+    data["HTTP"][StrHTTPServerIP.data()] = Application::Settings.HTTPServerIP;
     data["HTTP"][StrHTTPServerEnabled.data()] = Application::Settings.HTTPServerEnabled;
     SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
-    std::ofstream Stream(mConfigFileName);
+    std::ofstream Stream(mConfigFileName, std::ios::trunc | std::ios::out);
     Stream << data << std::flush;
 }
 
@@ -158,14 +164,15 @@ 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", StrSendErrors, Application::Settings.SendErrors);
+        TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
-        TryReadValue(data, "General", StrSendErrorsMessageEnabled, Application::Settings.SendErrorsMessageEnabled);
+        // Misc
+        TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, Application::Settings.SendErrorsMessageEnabled);
         // HTTP
-        TryReadValue(data, "HTTP", StrSSLKeyPath, Application::Settings.SSLKeyPath);
-        TryReadValue(data, "HTTP", StrSSLCertPath, Application::Settings.SSLCertPath);
         TryReadValue(data, "HTTP", StrHTTPServerPort, Application::Settings.HTTPServerPort);
+        TryReadValue(data, "HTTP", StrHTTPServerIP, Application::Settings.HTTPServerIP);
         TryReadValue(data, "HTTP", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
-        TryReadValue(data, "HTTP", StrHTTPServerUseSSL, Application::Settings.HTTPServerUseSSL);
     } catch (const std::exception& err) {
         beammp_error("Error parsing config file value: " + std::string(err.what()));
         mFailed = true;
@@ -198,10 +205,10 @@ 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 + "\"");
     beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
+    beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
     // special!
     beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
 }

src/TConsole.cpp

@@ -97,6 +97,17 @@ void TConsole::BackupOldLog() {
     }
 }
 
+void TConsole::StartLoggingToFile() {
+    mLogFileStream.open("Server.log");
+    Application::Console().Internal().on_write = [this](const std::string& ToWrite) {
+        // TODO: Sanitize by removing all ansi escape codes (vt100)
+        std::unique_lock Lock(mLogFileStreamMtx);
+        mLogFileStream.write(ToWrite.c_str(), ToWrite.size());
+        mLogFileStream.write("\n", 1);
+        mLogFileStream.flush();
+    };
+}
+
 void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
     if (!mIsLuaConsole) {
         if (!mLuaEngine) {
@@ -107,10 +118,10 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
         mStateId = LuaStateId;
         mIsLuaConsole = true;
         if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Entered Lua console for state '" + mStateId + "'. To exit, type `exit()`");
+            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:detach`");
             mCommandline.set_prompt("lua @" + LuaStateId + "> ");
         } else {
-            Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
+            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:detach`");
             mCommandline.set_prompt("lua> ");
         }
         mCachedRegularHistory = mCommandline.history();
@@ -122,9 +133,9 @@ void TConsole::ChangeToRegularConsole() {
     if (mIsLuaConsole) {
         mIsLuaConsole = false;
         if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Left Lua console for state '" + mStateId + "'.");
+            Application::Console().WriteRaw("Detached from Lua state '" + mStateId + "'.");
         } else {
-            Application::Console().WriteRaw("Left Lua console.");
+            Application::Console().WriteRaw("Detached from Lua.");
         }
         mCachedLuaHistory = mCommandline.history();
         mCommandline.set_history(mCachedRegularHistory);
@@ -133,21 +144,54 @@ void TConsole::ChangeToRegularConsole() {
     }
 }
 
-void TConsole::Command_Lua(const std::string& cmd) {
+bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
-    if (cmd.size() > 3) {
+    if (n == 0 && args.size() != 0) {
-        auto NewStateId = cmd.substr(4);
+        Application::Console().WriteRaw("This command expects no arguments.");
+        return false;
+    } else if (args.size() != n) {
+        Application::Console().WriteRaw("Expected " + std::to_string(n) + " argument(s), instead got " + std::to_string(args.size()));
+        return false;
+    } else {
+        return true;
+    }
+}
+
+bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t min, size_t max) {
+    if (min == max) {
+        return EnsureArgsCount(args, min);
+    } else {
+        if (args.size() > max) {
+            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " 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 {
+    } else if (args.size() == 0) {
         ChangeToLuaConsole(mDefaultStateId);
     }
 }
 
-void TConsole::Command_Help(const std::string&) {
+void TConsole::Command_Help(const std::string&, const std::vector<std::string>& args) {
+    if (!EnsureArgsCount(args, 0)) {
+        return;
+    }
     static constexpr const char* sHelpString = R"(
     Commands:
         help                    displays this help
@@ -156,53 +200,127 @@ void TConsole::Command_Help(const 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)";
     Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
 }
 
-void TConsole::Command_Kick(const std::string& cmd) {
+std::string TConsole::ConcatArgs(const std::vector<std::string>& args, char space) {
-    if (cmd.size() > 4) {
+    std::string Result;
-        auto Name = cmd.substr(5);
+    for (const auto& arg : args) {
-        std::string Reason = "Kicked by server console";
+        Result += arg + space;
-        auto SpacePos = Name.find(' ');
+    }
-        if (SpacePos != Name.npos) {
+    Result = Result.substr(0, Result.size() - 1); // strip trailing space
-            Reason = Name.substr(SpacePos + 1);
+    return Result;
-            Name = cmd.substr(5, cmd.size() - Reason.size() - 5 - 1);
+}
+
+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;
+            }
         }
-        beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
+        return true;
-        bool Kicked = false;
+    });
-        auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
+    if (!Kicked) {
-            std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
+        Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
-            std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
+    } else {
-            return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
+        Application::Console().WriteRaw("Kicked player '" + Name + "' for reason: '" + Reason + "'.");
-        };
+    }
-        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+}
-            if (!Client.expired()) {
+
-                auto locked = Client.lock();
+std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const std::string& CommandWithArgs) {
-                if (NameCompare(locked->GetName(), Name)) {
+    // Algorithm designed and implemented by Lion Kortlepel (c) 2022
-                    mLuaEngine->Network().ClientKick(*locked, Reason);
+    // It correctly splits arguments, including respecting single and double quotes, as well as backticks
-                    Kicked = true;
+    auto End_i = CommandWithArgs.find_first_of(' ');
-                    return false;
+    std::string Command = CommandWithArgs.substr(0, End_i);
+    std::string ArgsStr {};
+    if (End_i != std::string::npos) {
+        ArgsStr = CommandWithArgs.substr(End_i);
+    }
+    std::vector<std::string> Args;
+    char* PrevPtr = ArgsStr.data();
+    char* Ptr = ArgsStr.data();
+    const char* End = ArgsStr.data() + ArgsStr.size();
+    while (Ptr != End) {
+        std::string Arg = "";
+        // advance while space
+        while (Ptr != End && std::isspace(*Ptr))
+            ++Ptr;
+        PrevPtr = Ptr;
+        // advance while NOT space, also handle quotes
+        while (Ptr != End && !std::isspace(*Ptr)) {
+            // TODO: backslash escaping quotes
+            for (char Quote : { '"', '\'', '`' }) {
+                if (*Ptr == Quote) {
+                    // seek if there's a closing quote
+                    // if there is, go there and continue, otherwise ignore
+                    char* Seeker = Ptr + 1;
+                    while (Seeker != End && *Seeker != Quote)
+                        ++Seeker;
+                    if (Seeker != End) {
+                        // found closing quote
+                        Ptr = Seeker;
+                    }
+                    break; // exit for loop
                 }
             }
-            return true;
+            ++Ptr;
-        });
+        }
-        if (!Kicked) {
+        Arg = std::string(PrevPtr, Ptr - PrevPtr);
-            Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
+        // remove quotes if enclosed in quotes
-        } else {
+        for (char Quote : { '"', '\'', '`' }) {
-            Application::Console().WriteRaw("Kicked player '" + Name + "' for reason: '" + Reason + "'.");
+            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) {
+    if (FullCmd.size() > 3) {
+        auto Message = FullCmd.substr(4);
+        LuaAPI::MP::SendChatMessage(-1, Message);
+        if (!Application::Settings.LogChat) {
+            Application::Console().WriteRaw("Chat message sent!");
         }
     }
 }
 
-void TConsole::Command_Say(const std::string& cmd) {
+void TConsole::Command_List(const std::string&, const std::vector<std::string>& args) {
-    if (cmd.size() > 3) {
+    if (!EnsureArgsCount(args, 0)) {
-        auto Message = cmd.substr(4);
+        return;
-        LuaAPI::MP::SendChatMessage(-1, Message);
     }
-}
-
-void TConsole::Command_List(const std::string&) {
     if (mLuaEngine->Server().ClientCount() == 0) {
         Application::Console().WriteRaw("No players online.");
     } else {
@@ -222,7 +340,10 @@ void TConsole::Command_List(const std::string&) {
     }
 }
 
-void TConsole::Command_Status(const std::string&) {
+void TConsole::Command_Status(const std::string&, const std::vector<std::string>& args) {
+    if (!EnsureArgsCount(args, 0)) {
+        return;
+    }
     std::stringstream Status;
 
     size_t CarCount = 0;
@@ -307,12 +428,12 @@ void TConsole::Command_Status(const std::string&) {
            << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
            << "\tSubsystems:\n"
            << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
-           << "\t\tShutting down/Shutdown:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
+           << "\t\tShutting down/Shut down:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
            << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
            << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
            << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
            << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShutdown:                    [ " << SystemsShutdownList << " ]\n"
+           << "\t\tShut down:                    [ " << SystemsShutdownList << " ]\n"
            << "";
 
     Application::Console().WriteRaw(Status.str());
@@ -364,32 +485,81 @@ 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);
     mCommandline.set_prompt("> ");
     BackupOldLog();
-    bool success = mCommandline.enable_write_to_file("Server.log");
-    if (!success) {
-        beammp_error("unable to open file for writing: \"Server.log\"");
-    }
     mCommandline.on_command = [this](Commandline& c) {
         try {
-            auto cmd = c.get_command();
+            auto TrimmedCmd = c.get_command();
-            cmd = TrimString(cmd);
+            TrimmedCmd = TrimString(TrimmedCmd);
-            mCommandline.write(mCommandline.prompt() + cmd);
+            auto [cmd, args] = ParseCommand(TrimmedCmd);
+            mCommandline.write(mCommandline.prompt() + TrimmedCmd);
             if (mIsLuaConsole) {
                 if (!mLuaEngine) {
                     beammp_info("Lua not started yet, please try again in a second");
-                } else if (cmd == "exit()") {
+                } else if (!cmd.empty() && cmd.at(0) == ':') {
-                    ChangeToRegularConsole();
+                    HandleLuaInternalCommand(cmd.substr(1));
                 } else {
-                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(cmd), "", "" });
+                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
                     while (!Future->Ready) {
-                        std::this_thread::sleep_for(std::chrono::milliseconds(1)); // TODO: Add a timeout
+                        std::this_thread::yield(); // TODO: Add a timeout
                     }
                     if (Future->Error) {
-                        beammp_lua_error(Future->ErrorMessage);
+                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                     }
                 }
             } else {
@@ -398,31 +568,63 @@ TConsole::TConsole() {
                 } else if (cmd == "exit") {
                     beammp_info("gracefully shutting down");
                     Application::GracefullyShutdown();
-                } else if (StringStartsWith(cmd, "lua")) {
+                } else if (cmd == "say") {
-                    Command_Lua(cmd);
+                    RunAsCommand(TrimmedCmd, true);
-                } else if (StringStartsWith(cmd, "help")) {
+                    Command_Say(TrimmedCmd);
-                    RunAsCommand(cmd, true);
+                } else {
-                    Command_Help(cmd);
+                    if (mCommandMap.find(cmd) != mCommandMap.end()) {
-                } else if (StringStartsWith(cmd, "kick")) {
+                        mCommandMap.at(cmd)(cmd, args);
-                    RunAsCommand(cmd, true);
+                        RunAsCommand(TrimmedCmd, true);
-                    Command_Kick(cmd);
+                    } else {
-                } else if (StringStartsWith(cmd, "say")) {
+                        RunAsCommand(TrimmedCmd);
-                    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

@@ -7,7 +7,6 @@
 #include <rapidjson/rapidjson.h>
 #include <sstream>
 
-namespace json = rapidjson;
 
 void THeartbeatThread::operator()() {
     RegisterThread("Heartbeat");
@@ -19,7 +18,9 @@ void THeartbeatThread::operator()() {
 
     static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::now();
     bool isAuth = false;
+    size_t UpdateReminderCounter = 0;
     while (!mShutdown) {
+        ++UpdateReminderCounter;
         Body = GenerateCall();
         // a hot-change occurs when a setting has changed, to update the backend of that change.
         auto Now = std::chrono::high_resolution_clock::now();
@@ -54,43 +55,85 @@ void THeartbeatThread::operator()() {
 
         auto Target = "/heartbeat";
         unsigned int ResponseCode = 0;
-        T = Http::POST(Application::GetBackendHostname(), 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode);
 
-        if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
+        rapidjson::Document Doc;
-            beammp_trace("got " + T + " from backend");
+        bool Ok = false;
-            Application::SetSubsystemStatus("Heartbeat", Application::Status::Bad);
+        for (const auto& Url : Application::GetBackendUrlsInOrder()) {
-            SentryReportError(Application::GetBackendHostname() + Target, ResponseCode);
+            T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+            beammp_trace(T);
-            T = Http::POST(Application::GetBackup1Hostname(), 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode);
+            Doc.Parse(T.data(), T.size());
-            if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
+            if (Doc.HasParseError() || !Doc.IsObject()) {
-                SentryReportError(Application::GetBackup1Hostname() + Target, ResponseCode);
+                if (!Application::Settings.Private) {
-                Application::SetSubsystemStatus("Heartbeat", Application::Status::Bad);
+                    beammp_error("Backend response failed to parse as valid json");
-                std::this_thread::sleep_for(std::chrono::milliseconds(500));
+                    beammp_trace("Response was: `" + T + "`");
-                T = Http::POST(Application::GetBackup2Hostname(), 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode);
-                if ((T.substr(0, 2) != "20" && ResponseCode != 200) || ResponseCode != 200) {
-                    beammp_warn("Backend system refused server! Server will not show in the public server list.");
-                    Application::SetSubsystemStatus("Heartbeat", Application::Status::Bad);
-                    isAuth = false;
-                    SentryReportError(Application::GetBackup2Hostname() + Target, ResponseCode);
-                } else {
-                    Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
                 }
+                Sentry.SetContext("JSON Response", { { "reponse", T } });
+                SentryReportError(Url + Target, ResponseCode);
+            } else if (ResponseCode != 200) {
+                SentryReportError(Url + Target, ResponseCode);
             } else {
-                Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
+                // all ok
+                Ok = true;
+                break;
+            }
+            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        }
+        std::string Status {};
+        std::string Code {};
+        std::string Message {};
+        const auto StatusKey = "status";
+        const auto CodeKey = "code";
+        const auto MessageKey = "msg";
+
+        if (Ok) {
+            if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) {
+                Status = Doc[StatusKey].GetString();
+            } else {
+                Sentry.SetContext("JSON Response", { { StatusKey, "invalid string / missing" } });
+                Ok = false;
+            }
+            if (Doc.HasMember(CodeKey) && Doc[CodeKey].IsString()) {
+                Code = Doc[CodeKey].GetString();
+            } else {
+                Sentry.SetContext("JSON Response", { { CodeKey, "invalid string / missing" } });
+                Ok = false;
+            }
+            if (Doc.HasMember(MessageKey) && Doc[MessageKey].IsString()) {
+                Message = Doc[MessageKey].GetString();
+            } else {
+                Sentry.SetContext("JSON Response", { { MessageKey, "invalid string / missing" } });
+                Ok = false;
+            }
+            if (!Ok) {
+                beammp_error("Missing/invalid json members in backend response");
+                Sentry.LogError("Missing/invalid json members in backend response", __FILE__, std::to_string(__LINE__));
             }
         } else {
-            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
+            if (!Application::Settings.Private) {
+                beammp_warn("Backend failed to respond to a heartbeat. Your server may temporarily disappear from the server list. This is not an error, and will likely resolve itself soon. Direct connect will still work.");
+            }
         }
 
-        if (!isAuth) {
+        if (Ok && !isAuth && !Application::Settings.Private) {
-            if (T == "2000") {
+            if (Status == "2000") {
-                beammp_info(("Authenticated!"));
+                beammp_info(("Authenticated! " + Message));
                 isAuth = true;
-            } else if (T == "200") {
+            } else if (Status == "200") {
-                beammp_info(("Resumed authenticated session!"));
+                beammp_info(("Resumed authenticated session! " + Message));
                 isAuth = true;
+            } else {
+                if (Message.empty()) {
+                    Message = "Backend didn't provide a reason.";
+                }
+                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
             }
         }
+        if (isAuth || Application::Settings.Private) {
+            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
+        }
+        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
+            Application::CheckForUpdates();
+        }
     }
 }
 

src/TLuaEngine.cpp

@@ -8,6 +8,7 @@
 #include <chrono>
 #include <condition_variable>
 #include <httplib.h>
+#include <nlohmann/json.hpp>
 #include <random>
 #include <thread>
 #include <tuple>
@@ -44,7 +45,7 @@ void TLuaEngine::operator()() {
     CollectAndInitPlugins();
     // now call all onInit's
     auto Futures = TriggerEvent("onInit", "");
-    WaitForAll(Futures);
+    WaitForAll(Futures, std::chrono::seconds(5));
     for (const auto& Future : Futures) {
         if (Future->Error && Future->ErrorMessage != BeamMPFnNotFoundError) {
             beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage);
@@ -54,31 +55,20 @@ void TLuaEngine::operator()() {
     auto ResultCheckThread = std::thread([&] {
         RegisterThread("ResultCheckThread");
         while (!mShutdown) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
             std::unique_lock Lock(mResultsToCheckMutex);
+            mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
             if (!mResultsToCheck.empty()) {
-                auto Res = mResultsToCheck.front();
+                mResultsToCheck.remove_if([](const std::shared_ptr<TLuaResult>& Ptr) -> bool {
-                mResultsToCheck.pop();
+                    if (Ptr->Ready) {
-                Lock.unlock();
+                        return true;
-
+                    } else if (Ptr->Error) {
-                size_t Waited = 0;
+                        if (Ptr->ErrorMessage != BeamMPFnNotFoundError) {
-                while (!Res->Ready) {
+                            beammp_lua_error(Ptr->Function + ": " + Ptr->ErrorMessage);
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                        }
-                    Waited++;
+                        return true;
-                    if (Waited > 250) {
-                        // FIXME: This should *eventually* timeout.
-                        // beammp_lua_error(Res->Function + " in " + Res->StateId + " took >1s to respond, not printing possible errors");
-                        Lock.lock();
-                        mResultsToCheck.push(Res);
-                        Lock.unlock();
-                        break;
                     }
-                }
+                    return false;
-                if (Res->Error) {
+                });
-                    if (Res->ErrorMessage != BeamMPFnNotFoundError) {
-                        beammp_lua_error(Res->Function + ": " + Res->ErrorMessage);
-                    }
-                }
             }
         }
     });
@@ -86,27 +76,37 @@ void TLuaEngine::operator()() {
     auto Before = std::chrono::high_resolution_clock::now();
     while (!mShutdown) {
         if (mLuaStates.size() == 0) {
-            std::this_thread::sleep_for(std::chrono::seconds(500));
+            std::this_thread::sleep_for(std::chrono::seconds(100));
         }
         { // Timed Events Scope
             std::unique_lock Lock(mTimedEventsMutex);
             for (auto& Timer : mTimedEvents) {
                 if (Timer.Expired()) {
+                    auto LastCompletionBeforeReset = Timer.LastCompletion;
                     Timer.Reset();
                     auto Handlers = GetEventHandlersForState(Timer.EventName, Timer.StateId);
                     std::unique_lock StateLock(mLuaStatesMutex);
                     std::unique_lock Lock2(mResultsToCheckMutex);
                     for (auto& Handler : Handlers) {
-                        auto Res = mLuaStates[Timer.StateId]->EnqueueFunctionCall(Handler, {});
+                        auto Res = mLuaStates[Timer.StateId]->EnqueueFunctionCallFromCustomEvent(Handler, {}, Timer.EventName, Timer.Strategy);
-                        mResultsToCheck.push(Res);
+                        if (Res) {
+                            mResultsToCheck.push_back(Res);
+                            mResultsToCheckCond.notify_one();
+                        } else {
+                            // "revert" reset
+                            Timer.LastCompletion = LastCompletionBeforeReset;
+                            // beammp_trace("Reverted reset of \"" + Timer.EventName + "\" timer");
+                            // no need to try to enqueue more handlers for this event (they will all fail)
+                            break;
+                        }
                     }
                 }
             }
         }
-        std::chrono::high_resolution_clock::duration Diff;
+        const auto Expected = std::chrono::milliseconds(10);
-        if ((Diff = std::chrono::high_resolution_clock::now() - Before)
+        if (auto Diff = std::chrono::high_resolution_clock::now() - Before;
-            < std::chrono::milliseconds(10)) {
+            Diff < Expected) {
-            std::this_thread::sleep_for(Diff);
+            std::this_thread::sleep_for(Expected - Diff);
         } else {
             beammp_trace("Event loop cannot keep up! Running " + std::to_string(Diff.count()) + "s behind");
         }
@@ -149,16 +149,88 @@ TLuaStateId TLuaEngine::GetStateIDForPlugin(const fs::path& PluginPath) {
     return "";
 }
 
+void TLuaEngine::AddResultToCheck(const std::shared_ptr<TLuaResult>& Result) {
+    std::unique_lock Lock(mResultsToCheckMutex);
+    mResultsToCheck.push_back(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;
             if (Max.has_value() && std::chrono::milliseconds(ms) > Max.value()) {
-                beammp_trace("'" + Result->Function + "' in '" + Result->StateId + "' did not finish executing in time (took: " + std::to_string(ms) + "ms)");
+                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;
+                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) {
@@ -176,7 +248,8 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
 void TLuaEngine::ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results) {
     std::unique_lock Lock2(mResultsToCheckMutex);
     for (const auto& Result : Results) {
-        mResultsToCheck.push(Result);
+        mResultsToCheck.push_back(Result);
+        mResultsToCheckCond.notify_one();
     }
 }
 
@@ -269,7 +342,6 @@ 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];
@@ -327,7 +399,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&
                 Result.add(FnRet);
             } else {
                 sol::error Err = FnRet;
-                beammp_lua_error(Err.what());
+                beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
             }
         }
     }
@@ -378,6 +450,32 @@ 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()) {
@@ -431,6 +529,83 @@ sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::stri
     return table;
 }
 
+template <typename T>
+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, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine)
     : mName(Name)
     , mShutdown(Shutdown)
@@ -476,6 +651,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomi
         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 {
@@ -504,16 +680,53 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomi
         return Lua_GetPlayerIdentifiers(ID);
     });
     MPTable.set_function("Sleep", &LuaAPI::MP::Sleep);
-    MPTable.set_function("CreateEventTimer", [&](const std::string& EventName, size_t IntervalMS) {
+    //  const std::string& EventName, size_t IntervalMS, int strategy
+    MPTable.set_function("CreateEventTimer", [&](sol::variadic_args Args) {
+        if (Args.size() < 2 || Args.size() > 3) {
+            beammp_lua_error("CreateEventTimer expects 2 or 3 arguments.");
+        }
+        if (Args.get_type(0) != sol::type::string) {
+            beammp_lua_error("CreateEventTimer expects 1st argument to be a string");
+        }
+        if (Args.get_type(1) != sol::type::number) {
+            beammp_lua_error("CreateEventTimer expects 2nd argument to be a number");
+        }
+        if (Args.size() == 3 && Args.get_type(2) != sol::type::number) {
+            beammp_lua_error("CreateEventTimer expects 3rd argument to be a number (MP.CallStrategy)");
+        }
+        auto EventName = Args.get<std::string>(0);
+        auto IntervalMS = Args.get<size_t>(1);
+        CallStrategy Strategy = Args.size() > 2 ? Args.get<CallStrategy>(2) : CallStrategy::BestEffort;
         if (IntervalMS < 25) {
             beammp_warn("Timer for \"" + EventName + "\" on \"" + mStateId + "\" is set to trigger at <25ms, which is likely too fast and won't cancel properly.");
         }
-        mEngine->CreateEventTimer(EventName, mStateId, IntervalMS);
+        mEngine->CreateEventTimer(EventName, mStateId, IntervalMS, Strategy);
     });
     MPTable.set_function("CancelEventTimer", [&](const std::string& EventName) {
         mEngine->CancelEventTimers(EventName, mStateId);
     });
     MPTable.set_function("Set", &LuaAPI::MP::Set);
+
+    auto 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("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);
@@ -528,6 +741,10 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomi
         "Name", 5,
         "Description", 6);
 
+    MPTable.create_named("CallStrategy",
+        "BestEffort", CallStrategy::BestEffort,
+        "Precise", CallStrategy::Precise);
+
     auto FSTable = StateView.create_named_table("FS");
     FSTable.set_function("CreateDirectory", &LuaAPI::FS::CreateDirectory);
     FSTable.set_function("Exists", &LuaAPI::FS::Exists);
@@ -540,6 +757,12 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomi
     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();
 }
 
@@ -550,12 +773,34 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLu
     return Result;
 }
 
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy) {
+    // TODO: Document all this
+    decltype(mStateFunctionQueue)::iterator Iter = mStateFunctionQueue.end();
+    if (Strategy == CallStrategy::BestEffort) {
+        Iter = std::find_if(mStateFunctionQueue.begin(), mStateFunctionQueue.end(),
+            [&EventName](const QueuedFunction& Element) {
+                return Element.EventName == EventName;
+            });
+    }
+    if (Iter == mStateFunctionQueue.end()) {
+        auto Result = std::make_shared<TLuaResult>();
+        Result->StateId = mStateId;
+        Result->Function = FunctionName;
+        std::unique_lock Lock(mStateFunctionQueueMutex);
+        mStateFunctionQueue.push_back({ FunctionName, Result, Args, EventName });
+        mStateFunctionQueueCond.notify_all();
+        return Result;
+    } else {
+        return nullptr;
+    }
+}
+
 std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
     auto Result = std::make_shared<TLuaResult>();
     Result->StateId = mStateId;
     Result->Function = FunctionName;
     std::unique_lock Lock(mStateFunctionQueueMutex);
-    mStateFunctionQueue.push({ FunctionName, Result, Args });
+    mStateFunctionQueue.push_back({ FunctionName, Result, Args, "" });
     mStateFunctionQueueCond.notify_all();
     return Result;
 }
@@ -618,12 +863,13 @@ void TLuaEngine::StateThreadData::operator()() {
                 std::chrono::milliseconds(500),
                 [&]() -> bool { return !mStateFunctionQueue.empty(); });
             if (NotExpired) {
-                auto FnNameResultPair = std::move(mStateFunctionQueue.front());
+                auto TheQueuedFunction = std::move(mStateFunctionQueue.front());
-                mStateFunctionQueue.pop();
+                mStateFunctionQueue.erase(mStateFunctionQueue.begin());
                 Lock.unlock();
-                auto& FnName = std::get<0>(FnNameResultPair);
+                auto& FnName = TheQueuedFunction.FunctionName;
-                auto& Result = std::get<1>(FnNameResultPair);
+                auto& Result = TheQueuedFunction.Result;
-                auto Args = std::get<2>(FnNameResultPair);
+                auto Args = TheQueuedFunction.Args;
+                // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
                 Result->StateId = mStateId;
                 sol::state_view StateView(mState);
                 auto Fn = StateView[FnName];
@@ -671,13 +917,24 @@ void TLuaEngine::StateThreadData::operator()() {
     }
 }
 
-void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS) {
+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 {
         std::chrono::high_resolution_clock::duration { std::chrono::milliseconds(IntervalMS) },
         std::chrono::high_resolution_clock::now(),
         EventName,
-        StateId
+        StateId,
+        Strategy
     };
     mTimedEvents.push_back(std::move(Event));
     beammp_trace("created event timer for \"" + EventName + "\" on \"" + StateId + "\" with " + std::to_string(IntervalMS) + "ms interval");
@@ -705,6 +962,7 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
 
 void TLuaResult::WaitUntilReady() {
     while (!Ready) {
+        std::this_thread::yield();
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
 }
@@ -745,43 +1003,47 @@ void TPluginMonitor::operator()() {
     beammp_info("PluginMonitor started");
     while (!mShutdown) {
         std::this_thread::sleep_for(std::chrono::seconds(3));
+        std::vector<std::string> ToRemove;
         for (const auto& Pair : mFileTimes) {
-            auto CurrentTime = fs::last_write_time(Pair.first);
+            try {
-            if (CurrentTime != Pair.second) {
+                auto CurrentTime = fs::last_write_time(Pair.first);
-                mFileTimes[Pair.first] = CurrentTime;
+                if (CurrentTime != Pair.second) {
-                // grandparent of the path should be Resources/Server
+                    mFileTimes[Pair.first] = CurrentTime;
-                if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
+                    // grandparent of the path should be Resources/Server
-                    beammp_info("File \"" + Pair.first + "\" changed, reloading");
+                    if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
-                    // is in root folder, so reload
+                        beammp_info("File \"" + Pair.first + "\" changed, reloading");
-                    std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
+                        // is in root folder, so reload
-                    auto Size = std::filesystem::file_size(Pair.first);
+                        std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
-                    auto Contents = std::make_shared<std::string>();
+                        auto Size = std::filesystem::file_size(Pair.first);
-                    Contents->resize(Size);
+                        auto Contents = std::make_shared<std::string>();
-                    FileStream.read(Contents->data(), Contents->size());
+                        Contents->resize(Size);
-                    TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
+                        FileStream.read(Contents->data(), Contents->size());
-                    auto StateID = mEngine.GetStateIDForPlugin(fs::path(Pair.first).parent_path());
+                        TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
-                    auto Res = mEngine.EnqueueScript(StateID, Chunk);
+                        auto StateID = mEngine.GetStateIDForPlugin(fs::path(Pair.first).parent_path());
-                    // TODO: call onInit
+                        auto Res = mEngine.EnqueueScript(StateID, Chunk);
-                    while (!Res->Ready) {
+                        // TODO: call onInit
-                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                        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);
+                            }
+                        }*/
                     }
-                    if (Res->Error) {
-                        beammp_lua_error(Res->ErrorMessage);
-                    }
-                } else {
-                    // TODO: trigger onFileChanged event
-                    beammp_trace("Change detected in file \"" + Pair.first + "\", event trigger not implemented yet");
-                    /*
-                    // is in subfolder, dont reload, just trigger an event
-                    auto Results = mEngine.TriggerEvent("onFileChanged", "", Pair.first);
-                    mEngine.WaitForAll(Results);
-                    for (const auto& Result : Results)  {
-                        if (Result->Error) {
-                            beammp_lua_error(Result->ErrorMessage);
-                        }
-                    }*/
                 }
+            } catch (const std::exception& e) {
+                ToRemove.push_back(Pair.first);
             }
         }
+        for (const auto& File : ToRemove) {
+            mFileTimes.erase(File);
+            beammp_warn("file '" + File + "' couldn't be accessed, so it was removed from plugin hot reload monitor (probably got deleted)");
+        }
     }
 }

src/TNetwork.cpp

@@ -108,40 +108,48 @@ void TNetwork::TCPServerMain() {
 #if defined(BEAMMP_WINDOWS)
     WSADATA wsaData;
     if (WSAStartup(514, &wsaData)) {
-        beammp_error("Can't start Winsock!");
+        beammp_error("Can't start Winsock! Shutting down");
-        return;
+        Application::GracefullyShutdown();
     }
 #endif // WINDOWS
     TConnection client {};
     SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    int optval = 1;
+    if (Listener == BEAMMP_INVALID_SOCKET) {
+        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_ptr = reinterpret_cast<const char*>(&optval);
+    const char optval = 0;
+    int ret = ::setsockopt(Listener, SOL_SOCKET, SO_DONTLINGER, &optval, sizeof(optval));
 #elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
-    void* optval_ptr = reinterpret_cast<void*>(&optval);
+    int optval = true;
+    int ret = ::setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<void*>(&optval), sizeof(optval));
 #endif
-    setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, optval_ptr, sizeof(optval));
+    // not a fatal error
-    // TODO: check optval or return value idk
+    if (ret < 0) {
+        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: " + GetPlatformAgnosticErrorString());
+        beammp_error("bind() failed, the server cannot operate and will shut down now. "
-        std::this_thread::sleep_for(std::chrono::seconds(5));
+                     "Error: "
-        exit(-1); // TODO: Wtf.
+            + GetPlatformAgnosticErrorString());
+        Application::GracefullyShutdown();
     }
-    if (Listener == -1) {
+    if (listen(Listener, SOMAXCONN) < 0) {
-        beammp_error("Invalid listening socket");
+        beammp_error("listen() failed, which is needed for the server to operate. "
-        return;
+                     "Shutting down. Error: "
-    }
+            + GetPlatformAgnosticErrorString());
-    if (listen(Listener, SOMAXCONN)) {
+        Application::GracefullyShutdown();
-        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 (mShutdown) {
@@ -154,12 +162,25 @@ void TNetwork::TCPServerMain() {
                 beammp_warn(("Got an invalid client socket on connect! Skipping..."));
                 continue;
             }
+            // set timeout
+            size_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));
+#endif
+            if (ret < 0) {
+                throw std::runtime_error("setsockopt recv timeout: " + GetPlatformAgnosticErrorString());
+            }
             std::thread ID(&TNetwork::Identify, this, client);
             ID.detach(); // TODO: Add to a queue and attempt to join periodically
         } catch (const std::exception& e) {
-            beammp_error(("fatal: ") + std::string(e.what()));
+            beammp_error("fatal: " + std::string(e.what()));
         }
-    } while (client.Socket);
+    } while (client.Socket != BEAMMP_INVALID_SOCKET);
 
     beammp_debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));
 
@@ -173,7 +194,6 @@ void TNetwork::TCPServerMain() {
 #undef GetObject // Fixes Windows
 
 #include "Json.h"
-namespace json = rapidjson;
 
 void TNetwork::Identify(const TConnection& client) {
     RegisterThreadAuto();
@@ -187,7 +207,11 @@ void TNetwork::Identify(const TConnection& client) {
     } else if (Code == 'D') {
         HandleDownload(client.Socket);
     } else if (Code == 'P') {
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        send(client.Socket, "P", 1, MSG_NOSIGNAL);
+#else
         send(client.Socket, "P", 1, 0);
+#endif
         CloseSocketProper(client.Socket);
         return;
     } else {
@@ -256,7 +280,7 @@ void TNetwork::Authentication(const TConnection& ClientConnection) {
         Rc = Http::POST(Application::GetBackendUrlForAuth(), 443, Target, RequestString, "application/json", &ResponseCode);
     }
 
-    json::Document AuthResponse;
+    rapidjson::Document AuthResponse;
     AuthResponse.Parse(Rc.c_str());
     if (Rc == Http::ErrorString || AuthResponse.HasParseError()) {
         ClientKick(*Client, "Invalid key! Please restart your game.");
@@ -460,7 +484,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)) {
-        // TODO handle
+        beammp_warn("tried to kick player '" + c.GetName() + "' (id " + std::to_string(c.GetID()) + "), but was already disconnected");
     }
     c.SetStatus(-2);
 
@@ -510,6 +534,7 @@ void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
         }
     }
 }
+
 void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
     // TODO: the c.expired() might cause issues here, remove if you end up here with your debugger
     if (c.expired() || c.lock()->GetTCPSock() == -1) {
@@ -737,7 +762,7 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
 
 void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name) {
     std::ifstream f(Name.c_str(), std::ios::binary);
-    uint32_t Split = 0x7735940; // 125MB
+    uint32_t Split = 125 * MB;
     char* Data;
     if (Size > Split)
         Data = new char[Split];
@@ -778,7 +803,11 @@ void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std
 bool TNetwork::TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_t Size) {
     intmax_t Sent = 0;
     do {
+#if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+        intmax_t Temp = send(socket, &Data[Sent], int(Size - Sent), MSG_NOSIGNAL);
+#else
         intmax_t Temp = send(socket, &Data[Sent], int(Size - Sent), 0);
+#endif
         if (Temp < 1) {
             beammp_info("Socket Closed! " + std::to_string(socket));
             CloseSocketProper(socket);

src/TPPSMonitor.cpp

@@ -21,8 +21,8 @@ TPPSMonitor::TPPSMonitor(TServer& Server)
 void TPPSMonitor::operator()() {
     RegisterThread("PPSMonitor");
     while (!mNetwork) {
-        // hard spi
+        // hard(-ish) spin
-        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        std::this_thread::yield();
     }
     beammp_debug("PPSMonitor starting");
     Application::SetSubsystemStatus("PPSMonitor", 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_remove_transaction();
+    sentry_set_transaction(nullptr);
 }
 
 void TSentry::LogError(const std::string& text, const std::string& file, const std::string& line) {

src/TServer.cpp

@@ -7,14 +7,14 @@
 #include <any>
 #include <sstream>
 
+#include <nlohmann/json.hpp>
+
 #include "LuaAPI.h"
 
 #undef GetObject // Fixes Windows
 
 #include "Json.h"
 
-namespace json = rapidjson;
-
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
     beammp_info("BeamMP Server v" + Application::ServerVersionString());
     Application::SetSubsystemStatus("Server", Application::Status::Starting);
@@ -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)); // FIXME: this needs to be adjusted once lua is merged
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1));
         if (std::any_of(Futures.begin(), Futures.end(),
                 [](const std::shared_ptr<TLuaResult>& Elem) {
                     return !Elem->Error
@@ -150,48 +150,38 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
     }
 }
 
-void TServer::HandleEvent(TClient& c, const std::string& Data) {
+void TServer::HandleEvent(TClient& c, const std::string& RawData) {
-    std::stringstream ss(Data);
+    // E:Name:Data
-    std::string t, Name;
+    // Data is allowed to have ':'
-    int a = 0;
+    auto NameDataSep = RawData.find(':', 2);
-    while (std::getline(ss, t, ':')) {
+    if (NameDataSep == std::string::npos) {
-        switch (a) {
+        beammp_warn("received event in invalid format (missing ':'), got: '" + RawData + "'");
-        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) {
-    rapidjson::Document Car;
+    try {
-    Car.Parse(CarJson.c_str(), CarJson.size());
+        auto Car = nlohmann::json::parse(CarJson);
-    if (Car.HasParseError()) {
+        const std::string jbm = "jbm";
-        beammp_error("Failed to parse vehicle data -> " + CarJson);
+        if (Car.contains(jbm) && Car[jbm].is_string() && Car[jbm] == "unicycle") {
-    } else if (Car["jbm"].IsString() && std::string(Car["jbm"].GetString()) == "unicycle") {
+            return true;
-        return true;
+        }
+    } catch (const std::exception& e) {
+        beammp_error("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'");
     }
     return false;
 }
+
 bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
-
+    if (IsUnicycle(c, CarJson) && c.GetUnicycleID() < 0) {
-    if (c.GetUnicycleID() > -1 && (c.GetCarCount() - 1) < Application::Settings.MaxCars) {
-        return true;
-    }
-
-    if (IsUnicycle(c, CarJson)) {
         c.SetUnicycleID(ID);
         return true;
+    } else {
+        return c.GetCarCount() < Application::Settings.MaxCars;
     }
-
-    return Application::Settings.MaxCars > c.GetCarCount();
 }
 
 void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network) {

src/VehicleData.cpp

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

src/main.cpp

@@ -78,10 +78,6 @@ int main(int argc, char** argv) {
 int BeamMPServerMain(MainArguments Arguments) {
     setlocale(LC_ALL, "C");
     Application::InitializeConsole();
-    Application::SetSubsystemStatus("Main", Application::Status::Starting);
-
-    SetupSignalHandlers();
-
     ArgsParser Parser;
     Parser.RegisterArgument({ "help" }, ArgsParser::NONE);
     Parser.RegisterArgument({ "version" }, ArgsParser::NONE);
@@ -117,19 +113,26 @@ int BeamMPServerMain(MainArguments Arguments) {
             try {
                 fs::current_path(fs::path(MaybeWorkingDirectory.value()));
             } catch (const std::exception& e) {
-                beammp_error("Could not set working directory to '" + MaybeWorkingDirectory.value() + "': " + e.what());
+                beammp_errorf("Could not set working directory to '{}': {}", MaybeWorkingDirectory.value(), e.what());
             }
         }
     }
 
+    Application::SetSubsystemStatus("Main", Application::Status::Starting);
+
+    Application::Console().StartLoggingToFile();
+
+    SetupSignalHandlers();
+
     bool Shutdown = false;
     Application::RegisterShutdownHandler([&Shutdown] {
+        beammp_info("If this takes too long, you can press Ctrl+C repeatedly to force a shutdown.");
         Application::SetSubsystemStatus("Main", Application::Status::ShuttingDown);
         Shutdown = true;
     });
     Application::RegisterShutdownHandler([] {
         auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", "");
-        TLuaEngine::WaitForAll(Futures);
+        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
     });
 
     TServer Server(Arguments.List);
@@ -160,14 +163,21 @@ int BeamMPServerMain(MainArguments Arguments) {
     PPSMonitor.SetNetwork(Network);
     Application::CheckForUpdates();
 
+    std::unique_ptr<Http::Server::THttpServerInstance> HttpServer;
     if (Application::Settings.HTTPServerEnabled) {
-        Http::Server::SetupEnvironment();
+        HttpServer = std::make_unique<Http::Server::THttpServerInstance>(
-        Http::Server::THttpServerInstance HttpServerInstance {};
+            Server,
+            Network,
+            ResourceManager);
     }
 
     Application::SetSubsystemStatus("Main", Application::Status::Good);
     RegisterThread("Main(Waiting)");
 
+    std::set<std::string> IgnoreSubsystems {
+        "UpdateCheck" // Ignore as not to confuse users (non-vital system)
+    };
+
     bool FullyStarted = false;
     while (!Shutdown) {
         if (!FullyStarted) {
@@ -176,6 +186,9 @@ int BeamMPServerMain(MainArguments Arguments) {
             std::string SystemsBadList {};
             auto Statuses = Application::GetSubsystemStatuses();
             for (const auto& NameStatusPair : Statuses) {
+                if (IgnoreSubsystems.count(NameStatusPair.first) > 0) {
+                    continue; // ignore
+                }
                 if (NameStatusPair.second == Application::Status::Starting) {
                     FullyStarted = false;
                 } else if (NameStatusPair.second == Application::Status::Bad) {

vcpkg.cmake

@@ -0,0 +1,18 @@
+include(FetchContent)
+
+message(STATUS "Getting, checking and running vcpkg, this may take a while")
+
+FetchContent_Declare(
+  vcpkg
+  GIT_REPOSITORY    https://github.com/microsoft/vcpkg.git
+)
+
+FetchContent_GetProperties(vcpkg)
+
+if(NOT vcpkg_POPULATED)
+  FetchContent_Populate(vcpkg)
+  execute_process(COMMAND ./${vcpkg_SOURCE_DIR}/bootstrap-vcpkg.sh)
+endif()
+
+set(CMAKE_TOOLCHAIN_FILE ${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake
+CACHE STRING "Vcpkg toolchain file")

vcpkg.json

@@ -0,0 +1,17 @@
+{
+    "name": "beammp-server",
+    "version-string": "3.0.2",
+    "homepage": "https://beammp.com",
+    "dependencies": [
+        "sentry-native",
+        "lua",
+        "zlib",
+        "rapidjson",
+        "nlohmann-json",
+        "openssl",
+        "curl",
+        "sol2",
+        "cpp-httplib",
+        "toml11"
+    ]
+}