add test error to current build

anon is my accomplice

.github/workflows/cmake-linux.yml

@@ -21,6 +21,8 @@ jobs:
           echo ${#beammp_sentry_url}
           sudo apt-get update
           sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
+          sudo add-apt-repository ppa:mhier/libboost-latest
+          sudo apt-get install -y libboost1.70-dev libboost1.70
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{github.workspace}}/build-linux

.github/workflows/cmake-windows.yml

@@ -15,10 +15,10 @@ jobs:
             submodules: 'recursive'
       
       - name: Restore artifacts, or run vcpkg, build and cache artifacts
-        uses: lukka/run-vcpkg@v7
+        uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgArguments: 'lua zlib rapidjson boost-beast boost-asio openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
             vcpkgGitCommitId: '8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb'
             vcpkgTriplet: 'x64-windows-static'
@@ -44,15 +44,4 @@ jobs:
           name: BeamMP-Server.exe
           path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
 
-      - name: Build debug
-        working-directory: ${{github.workspace}}/build-windows
-        shell: bash
-        run: |
-          cmake --build . --config Debug
-      
-      - name: Archive debug artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-debug.exe
-          path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe
 

.github/workflows/release-build.yml

@@ -43,6 +43,8 @@ jobs:
         run: |
             sudo apt-get update
             sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
+            sudo add-apt-repository ppa:mhier/libboost-latest
+            sudo apt-get install -y libboost1.70-dev libboost1.70
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build-linux
@@ -80,10 +82,10 @@ jobs:
             submodules: 'recursive'
       
       - name: Restore artifacts, or run vcpkg, build and cache artifacts
-        uses: lukka/run-vcpkg@v7
+        uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
-            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
+            vcpkgArguments: 'lua zlib rapidjson boost-beast boost-asio openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
             vcpkgGitCommitId: '8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb'
             vcpkgTriplet: 'x64-windows-static'

.gitignore

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

.gitmodules

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

CMakeLists.txt

@@ -8,27 +8,6 @@ project(BeamMP-Server
     HOMEPAGE_URL https://beammp.com
     LANGUAGES CXX C)
 
-set(HTTPLIB_REQUIRE_OPENSSL ON)
-
-include_directories("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
-include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
-include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
-include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
-include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
-include_directories("${PROJECT_SOURCE_DIR}/deps/cpp-httplib")
-include_directories("${PROJECT_SOURCE_DIR}/deps/json/single_include")
-include_directories("${PROJECT_SOURCE_DIR}/deps")
-
-add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT)
-
-if(APPLE)
-    set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
-    set(LUA_LIBRARIES lua)
-    include_directories(/usr/local/opt/openssl@1.1/include)
-    link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
-    link_directories(/usr/local/opt/openssl@1.1/lib)
-endif()
-
 if (WIN32)
     # this has to happen before sentry, so that crashpad on windows links with these settings.
     message(STATUS "MSVC -> forcing use of statically-linked runtime.")
@@ -41,28 +20,11 @@ set(SENTRY_BUILD_SHARED_LIBS OFF)
 if (MSVC)
     set(SENTRY_BUILD_RUNTIMESTATIC ON)
 endif()
-message(STATUS "Checking for Sentry URL")
-# this is set by the build system.
-# IMPORTANT: if you're building from source, just leave this empty
-if (NOT DEFINED BEAMMP_SECRET_SENTRY_URL)
-    message(WARNING "No sentry URL configured. Sentry logging is disabled for this build. \
-    This is not an error, and if you're building the BeamMP-Server yourself, this is expected and can be ignored.")
-    set(BEAMMP_SECRET_SENTRY_URL "")
-    set(SENTRY_BACKEND none)
-else()
-    string(LENGTH ${BEAMMP_SECRET_SENTRY_URL} URL_LEN)
-    message(STATUS "Sentry URL is length ${URL_LEN}")
-    set(SENTRY_BACKEND breakpad)
-endif()
-add_subdirectory("deps/sentry-native")
-
-if (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-endif ()
+set(SENTRY_BACKEND breakpad)
+add_subdirectory("include/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)
@@ -70,22 +32,39 @@ if (WIN32)
 elseif (UNIX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -gz -fno-builtin")
     if (SANITIZE)
         message(STATUS "sanitize is ON")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,thread")
     endif (SANITIZE)
 endif ()
 
+message(STATUS "Checking for Sentry URL")
+# this is set by the build system.
+# IMPORTANT: if you're building from source, just leave this empty
+if (NOT DEFINED BEAMMP_SECRET_SENTRY_URL)
+    message(WARNING "No sentry URL configured. Sentry logging is disabled for this build. \
+    This is not an error, and if you're building the BeamMP-Server yourself, this is expected and can be ignored.")
+    set(BEAMMP_SECRET_SENTRY_URL "")
+else()
+    string(LENGTH ${BEAMMP_SECRET_SENTRY_URL} URL_LEN)
+    message(STATUS "Sentry URL is length ${URL_LEN}")
+endif()
 
 message(STATUS "Adding local source dependencies")
 # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
-add_subdirectory(deps)
+include_directories("asio/asio/include")
+include_directories("rapidjson/include")
+include_directories("websocketpp")
+add_subdirectory("socket.io-client-cpp")
+add_subdirectory("include/commandline")
 
 set(CMAKE_CXX_STANDARD 17)
-
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
+message(STATUS "Looking for Boost")
+find_package(Boost REQUIRED COMPONENTS system thread)
+
 add_executable(BeamMP-Server
         src/main.cpp
         include/TConsole.h src/TConsole.cpp
@@ -96,73 +75,61 @@ add_executable(BeamMP-Server
         include/VehicleData.h src/VehicleData.cpp
         include/TConfig.h src/TConfig.cpp
         include/TLuaEngine.h src/TLuaEngine.cpp
-        include/TLuaPlugin.h src/TLuaPlugin.cpp
+        include/TLuaFile.h src/TLuaFile.cpp
         include/TResourceManager.h src/TResourceManager.cpp
         include/THeartbeatThread.h src/THeartbeatThread.cpp
         include/Http.h src/Http.cpp
         include/TSentry.h src/TSentry.cpp
         include/TPPSMonitor.h src/TPPSMonitor.cpp
         include/TNetwork.h src/TNetwork.cpp
-        include/LuaAPI.h src/LuaAPI.cpp
-        include/TScopedTimer.h src/TScopedTimer.cpp
-        include/SignalHandling.h src/SignalHandling.cpp
-        include/ArgsParser.h src/ArgsParser.cpp
-        include/Environment.h)
+        include/SignalHandling.h src/SignalHandling.cpp)
 
 target_compile_definitions(BeamMP-Server PRIVATE SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}")
-include_directories(BeamMP-Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 target_include_directories(BeamMP-Server PUBLIC 
     "${CMAKE_CURRENT_SOURCE_DIR}/include" 
     "${CMAKE_CURRENT_SOURCE_DIR}/commandline")
 
-if (APPLE)
-    message(STATUS "NOT looking for Lua on APPLE")
-else()
-    message(STATUS "Looking for Lua")
-    find_package(Lua REQUIRED VERSION 5.3)
-endif()
-
+message(STATUS "Looking for Lua")
+find_package(Lua REQUIRED)
 target_include_directories(BeamMP-Server PUBLIC 
+    ${Boost_INCLUDE_DIRS} 
     ${LUA_INCLUDE_DIR} 
     ${CURL_INCLUDE_DIRS}
+    "socket.io-client-cpp/src" 
     "include/tomlplusplus" 
     "include/sentry-native/include"
     "include/curl/include")
 
 message(STATUS "Looking for SSL")
+find_package(OpenSSL REQUIRED)
 
-if (APPLE)
-    set(OPENSSL_LIBRARIES ssl crypto)
-else()
-    find_package(OpenSSL REQUIRED)
-endif()
-
-target_link_libraries(BeamMP-Server sol2::sol2 ${LUA_LIBRARIES})
 message(STATUS "CURL IS ${CURL_LIBRARIES}")
 
 if (UNIX)
-    target_link_libraries(BeamMP-Server
+    target_link_libraries(BeamMP-Server 
         z 
-        pthread
+        pthread 
+        stdc++fs 
         ${LUA_LIBRARIES} 
         crypto
         ${OPENSSL_LIBRARIES} 
         commandline 
-        sentry
-        ssl)
+        sioclient_tls 
+        sentry)
 elseif (WIN32)
     include(FindLua)
     message(STATUS "Looking for libz")
     find_package(ZLIB REQUIRED)
     message(STATUS "Looking for RapidJSON")
     find_package(RapidJSON CONFIG REQUIRED)
-    target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
-    target_link_libraries(BeamMP-Server
+    target_include_directories(BeamMP-Server PRIVATE ${RAPIDJSON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+    target_link_libraries(BeamMP-Server PRIVATE 
         ws2_32 
         ZLIB::ZLIB 
         ${LUA_LIBRARIES} 
         ${OPENSSL_LIBRARIES} 
         commandline
+        sioclient_tls
         sentry)
 endif ()

Changelog.md

@@ -1,33 +1,3 @@
-# v3.0.1
-
-- ADDED Backup URLs to UpdateCheck (will fail less often now)
-- ADDED console cursor left and right movement (with arrow keys) and working HOME and END key (via github.com/lionkor/commandline)
-- FIXED infinite snowmen / infinite unicycle spawning bug
-- FIXED a bug where, when run with --working-directory, the Server.log would still be in the original directory
-- FIXED a bug which could cause the plugin reload thread to spin at 100% if the reloaded plugin's didn't terminate
-- FIXED an issue which would cause servers to crash on mod download via SIGPIPE on POSIX
-- FIXED an issue which would cause servers to crash when checking if a vehicle is a unicycle
-
-# v3.0.0
-
-- CHANGED entire plugin Lua implementation (rewrite)
-- CHANGED moved *almost all* Lua functions into MP.\*
-- CHANGED console to use a custom language (type `help`, `list`, or `status`!)
-- CHANGED all files of a Lua plugin to share a Lua state (no more state-per-file)
-- ADDED many new Lua API functions, which can be found at <https://wiki.beammp.com/en/Scripting/functions>
-- ADDED Commandline options. Run with `--help` to see all options.
-- ADDED HTTP(S) Server (OpenAPI spec coming soon!)
-- ADDED plugin directories to `package.path` and `package.cpath` before `onInit`
-- ADDED ability to add `PluginConfig.toml` to your plugin folder to change some settings
-- ADDED ability to share a lua state with other plugins via `StateId` setting in `PluginConfig.toml`
-- ADDED ability to see name-to-thread-ID association in debug mode
-- ADDED dumping tables with `print()` (try it with `print(MP)`)
-- ADDED `MP.GetOSName()`, `MP.CreateTimer()`, `MP.GetLuaMemoryUsage()` and many more (see <https://wiki.beammp.com/en/Scripting/functions>)
-- ADDED `MP.Settings` table to make usage of `MP.Set()` easier
-- ADDED `FS.*` table with common filesystem operations (do `print(FS)` to see them!)
-- FIXED i/o thread spin when stdout is /dev/null on linux
-- FIXED removed extra whitespace infront of onChatMessage message
-
 # v2.3.3
 
 - CHANGED servers to be private by default

README.md

@@ -6,15 +6,6 @@
 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:
-
-- **IRC**: `#beammp` on [irc.libera.chat](https://web.libera.chat/)
-- **Discord**: [click for invite](https://discord.gg/beammp)
-
 ## Minimum Requirements
 
 These values are guesstimated and are subject to change with each release.
@@ -50,7 +41,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.3.3`!__**
+**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.0`!__**
 
 Currently only linux and windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
 
@@ -60,57 +51,39 @@ 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`.
-These are:
-```
-lua
-zlib
-rapidjson
-openssl
-websocketpp
-curl
-```
+Dependencies for windows can be installed with `vcpkg`, in which case the current dependencies are the `x64-windows-static` versions of `lua`, `zlib`, `rapidjson`, `boost-beast`, `boost-asio` and `openssl`.
 
-#### Linux
+#### Linux / \*nix
 
 These package names are in the debian / ubuntu style. Feel free to PR your own guide for a different distro.
 
-Runtime dependencies for **linux** are (debian/ubuntu):
-```
-libz-dev
-rapidjson-dev
-liblua5.3
-libssl-dev
-libwebsocketpp-dev
-libcurl4-openssl-dev
-```
+- `git`
+- `make`
+- `cmake`
+- `g++`
+- `libcurl4-openssl-dev` or similar (search for `libcurl` and look for one with `-dev`)
+  
+  Must support ISO C++17. If your distro's `g++` doesn't support C++17, chances are that it has a `g++-8` or `g++-10` package that does. If this is the case. you just need to run CMake with `-DCMAKE_CXX_COMPILER=g++-10` (replace `g++-10` with your compiler's name).
+- `liblua5.3-dev` 
+  
+  Any 5.x version should work, but 5.3 is what we officially use. Any other version might break in the future.
+  You can also use any version of `libluajit`, but the same applies regarding the version.
+- `libz-dev`
+- `rapidjson-dev`
+- `libopenssl-dev` or `libssl-dev`
 
-Build-time dependencies for **linux** are:
-```
-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
+**If** you're building it from source, you'll need `libboost1.70-all-dev` or `libboost1.71-all-dev` or higher as well.
+If you can't find this version of boost (only 1.6x, for example), you can either update to a newer version of your distro, build boost yourself, or use an unstable rolling release (like Debian `sid` aka `unstable`).
 
 ### How to build
 
 On windows, use git-bash for these commands. On Linux, these should work in your shell.
 
 1. Make sure you have all [prerequisites](#prerequisites) installed
-2. Clone the repository in a location of your choice with `git clone --recurse-submodules https://github.com/BeamMP/BeamMP-Server`. 
+2. Clone the repository in a location of your choice with **`git clone --recurse-submodules https://github.com/BeamMP/BeamMP-Server`**. Now change into the cloned directory by running `cd BeamMP-Server`.
 3. Ensure that all submodules are initialized by running `git submodule update --init --recursive`. Then change into the cloned directory by running `cd BeamMP-Server`.
-4. Checkout the branch of the release you want to compile (`master` is often unstable), for example `git checkout tags/v2.3.3` for version 2.3.3. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
-5. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
+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).
+5. Run `cmake .` (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 +0,0 @@
-include_directories("${PROJECT_SOURCE_DIR}/deps/asio/asio/include")
-include_directories("${PROJECT_SOURCE_DIR}/deps/rapidjson/include")
-include_directories("${PROJECT_SOURCE_DIR}/deps/websocketpp")
-include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
-include_directories("${PROJECT_SOURCE_DIR}/deps/sol2/include")
-include_directories("${PROJECT_SOURCE_DIR}/deps")
-
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")

include/ArgsParser.h

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

include/Client.h

@@ -2,7 +2,6 @@
 
 #include <chrono>
 #include <memory>
-#include <optional>
 #include <queue>
 #include <string>
 #include <unordered_set>
@@ -13,17 +12,6 @@
 
 class TServer;
 
-#ifdef BEAMMP_WINDOWS
-// for socklen_t
-#include <WS2tcpip.h>
-#endif // WINDOWS
-
-struct TConnection final {
-    SOCKET Socket;
-    struct sockaddr SockAddr;
-    socklen_t SockAddrLen;
-};
-
 class TClient final {
 public:
     using TSetOfVehicleData = std::vector<TVehicleData>;
@@ -42,7 +30,7 @@ public:
     TVehicleDataLockPair GetAllCars();
     void SetName(const std::string& Name) { mName = Name; }
     void SetRoles(const std::string& Role) { mRole = Role; }
-    void SetIdentifier(const std::string& key, const std::string& value) { mIdentifiers[key] = value; }
+    void AddIdentifier(const std::string& ID) { mIdentifiers.insert(ID); };
     std::string GetCarData(int Ident);
     void SetUDPAddr(sockaddr_in Addr) { mUDPAddress = Addr; }
     void SetDownSock(SOCKET CSock) { mSocket[1] = CSock; }
@@ -50,7 +38,7 @@ public:
     void SetStatus(int Status) { mStatus = Status; }
     // locks
     void DeleteCar(int Ident);
-    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
+    [[nodiscard]] std::set<std::string> GetIdentifiers() const { return mIdentifiers; }
     [[nodiscard]] sockaddr_in GetUDPAddr() const { return mUDPAddress; }
     [[nodiscard]] SOCKET GetDownSock() const { return mSocket[1]; }
     [[nodiscard]] SOCKET GetTCPSock() const { return mSocket[0]; }
@@ -90,7 +78,7 @@ private:
     bool mIsSyncing = false;
     mutable std::mutex mMissedPacketsMutex;
     std::queue<std::string> mPacketsSync;
-    std::unordered_map<std::string, std::string> mIdentifiers;
+    std::set<std::string> mIdentifiers;
     bool mIsGuest = false;
     std::mutex mVehicleDataMutex;
     TSetOfVehicleData mVehicleData;
@@ -104,5 +92,3 @@ private:
     int mID = -1;
     std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime;
 };
-
-std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);

include/Common.h

@@ -5,27 +5,13 @@ extern TSentry Sentry;
 
 #include <array>
 #include <atomic>
-#include <cstring>
 #include <deque>
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <sstream>
-#include <zlib.h>
-
-#include "Compat.h"
 
 #include "TConsole.h"
 
-struct Version {
-    uint8_t major;
-    uint8_t minor;
-    uint8_t patch;
-    Version(uint8_t major, uint8_t minor, uint8_t patch);
-    Version(const std::array<uint8_t, 3>& v);
-    std::string AsString();
-};
-
 // static class handling application start, shutdown, etc.
 // yes, static classes, singletons, globals are all pretty
 // bad idioms. In this case we need a central way to access
@@ -35,27 +21,33 @@ class Application final {
 public:
     // types
     struct TSettings {
-        std::string ServerName { "BeamMP Server" };
-        std::string ServerDesc { "BeamMP Default Description" };
-        std::string Resource { "Resources" };
-        std::string MapName { "/levels/gridmap_v2/info.json" };
-        std::string Key {};
-        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
-        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
-        bool HTTPServerEnabled { false };
-        int MaxPlayers { 10 };
-        bool Private { true };
-        int MaxCars { 1 };
-        bool DebugModeEnabled { false };
-        int Port { 30814 };
-        std::string CustomIP {};
-        bool SendErrors { true };
-        bool SendErrorsMessageEnabled { true };
-        int HTTPServerPort { 8080 };
-        bool HTTPServerUseSSL { true };
+        TSettings() noexcept
+            : ServerName("BeamMP Server")
+            , ServerDesc("BeamMP Default Description")
+            , Resource("Resources")
+            , MapName("/levels/gridmap_v2/info.json")
+            , MaxPlayers(10)
+            , Private(true)
+            , MaxCars(1)
+            , DebugModeEnabled(false)
+            , Port(30814)
+            , SendErrors(true)
+            , SendErrorsMessageEnabled(true) { }
+        std::string ServerName;
+        std::string ServerDesc;
+        std::string Resource;
+        std::string MapName;
+        std::string Key;
+        int MaxPlayers;
+        bool Private;
+        int MaxCars;
+        bool DebugModeEnabled;
+        int Port;
+        std::string CustomIP;
+        bool SendErrors;
+        bool SendErrorsMessageEnabled;
         [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
     };
-
     using TShutdownHandler = std::function<void()>;
 
     // methods
@@ -66,60 +58,27 @@ public:
     // Causes all threads to finish up and exit gracefull gracefully
     static void GracefullyShutdown();
     static TConsole& Console() { return *mConsole; }
-    static std::string ServerVersionString();
-    static const Version& ServerVersion() { return mVersion; }
-    static std::string ClientVersionString() { return "2.0"; }
+    static std::string ServerVersion() { return "2.3.2"; }
+    static std::string ClientVersion() { return "2.0"; }
     static std::string PPS() { return mPPS; }
     static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }
 
-    static TSettings Settings;
-
-    static std::vector<std::string> GetBackendUrlsInOrder() {
-        return {
-            "backend.beammp.com",
-            "backup1.beammp.com",
-            "backup2.beammp.com"
-        };
-    }
+    static inline TSettings Settings {};
 
     static std::string GetBackendUrlForAuth() { return "auth.beammp.com"; }
+    static std::string GetBackendHostname() { return "backend.beammp.com"; }
+    static std::string GetBackup1Hostname() { return "backup1.beammp.com"; }
+    static std::string GetBackup2Hostname() { return "backup2.beammp.com"; }
     static std::string GetBackendUrlForSocketIO() { return "https://backend.beammp.com"; }
     static void CheckForUpdates();
-    static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
-    static bool IsOutdated(const Version& Current, const Version& Newest);
-
-    static void InitializeConsole() {
-        if (!mConsole) {
-            mConsole = std::make_unique<TConsole>();
-        }
-    }
-
-    enum class Status {
-        Starting,
-        Good,
-        Bad,
-        ShuttingDown,
-        Shutdown,
-    };
-
-    using SystemStatusMap = std::unordered_map<std::string /* system name */, Status /* status */>;
-
-    static const SystemStatusMap& GetSubsystemStatuses() {
-        std::unique_lock Lock(mSystemStatusMapMutex);
-        return mSystemStatusMap;
-    }
-
-    static void SetSubsystemStatus(const std::string& Subsystem, Status status);
+    static std::array<int, 3> VersionStrToInts(const std::string& str);
+    static bool IsOutdated(const std::array<int, 3>& Current, const std::array<int, 3>& Newest);
 
 private:
-    static inline SystemStatusMap mSystemStatusMap {};
-    static inline std::mutex mSystemStatusMapMutex {};
     static inline std::string mPPS;
-    static inline std::unique_ptr<TConsole> mConsole;
+    static std::unique_ptr<TConsole> mConsole;
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
-
-    static inline Version mVersion { 3, 0, 1 };
 };
 
 std::string ThreadName(bool DebugModeOverride = false);
@@ -163,104 +122,36 @@ void RegisterThread(const std::string& str);
 
 #endif // defined(DEBUG)
 
-#define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
-#define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
-#define beammp_error(x)                                                               \
+#define warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
+#define info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
+#define error(x)                                                                      \
     do {                                                                              \
         Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
         Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                        \
     } while (false)
-#define beammp_lua_error(x)                                                               \
-    do {                                                                                  \
-        Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x)); \
-    } while (false)
-#define beammp_lua_warn(x)                                                               \
-    do {                                                                                 \
-        Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x)); \
-    } while (false)
 #define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
-#define beammp_debug(x)                                                                   \
+#define debug(x)                                                                          \
     do {                                                                                  \
         if (Application::Settings.DebugModeEnabled) {                                     \
             Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
         }                                                                                 \
     } while (false)
-#define beammp_event(x)                                                                   \
-    do {                                                                                  \
-        if (Application::Settings.DebugModeEnabled) {                                     \
-            Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
-        }                                                                                 \
-    } while (false)
-// for those times when you just need to ignore something :^)
-// explicity disables a [[nodiscard]] warning
-#define beammp_ignore(x) (void)x
 // trace() is a debug-build debug()
 #if defined(DEBUG)
-#define beammp_trace(x)                                                                   \
+#define trace(x)                                                                          \
     do {                                                                                  \
         if (Application::Settings.DebugModeEnabled) {                                     \
             Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
         }                                                                                 \
     } while (false)
 #else
-#define beammp_trace(x)
+#define trace(x)
 #endif // defined(DEBUG)
 
 void LogChatMessage(const std::string& name, int id, const std::string& msg);
 
 #define Biggest 30000
+std::string Comp(std::string Data);
+std::string DeComp(std::string Compressed);
 
-template <typename T>
-inline T Comp(const T& Data) {
-    std::array<char, Biggest> C {};
-    // obsolete
-    C.fill(0);
-    z_stream defstream;
-    defstream.zalloc = Z_NULL;
-    defstream.zfree = Z_NULL;
-    defstream.opaque = Z_NULL;
-    defstream.avail_in = (uInt)Data.size();
-    defstream.next_in = (Bytef*)&Data[0];
-    defstream.avail_out = Biggest;
-    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
-    deflateInit(&defstream, Z_BEST_COMPRESSION);
-    deflate(&defstream, Z_SYNC_FLUSH);
-    deflate(&defstream, Z_FINISH);
-    deflateEnd(&defstream);
-    size_t TotalOut = defstream.total_out;
-    T Ret;
-    Ret.resize(TotalOut);
-    std::fill(Ret.begin(), Ret.end(), 0);
-    std::copy_n(C.begin(), TotalOut, Ret.begin());
-    return Ret;
-}
-
-template <typename T>
-inline T DeComp(const T& Compressed) {
-    std::array<char, Biggest> C {};
-    // not needed
-    C.fill(0);
-    z_stream infstream;
-    infstream.zalloc = Z_NULL;
-    infstream.zfree = Z_NULL;
-    infstream.opaque = Z_NULL;
-    infstream.avail_in = Biggest;
-    infstream.next_in = (Bytef*)(&Compressed[0]);
-    infstream.avail_out = Biggest;
-    infstream.next_out = (Bytef*)(C.data());
-    inflateInit(&infstream);
-    inflate(&infstream, Z_SYNC_FLUSH);
-    inflate(&infstream, Z_FINISH);
-    inflateEnd(&infstream);
-    size_t TotalOut = infstream.total_out;
-    T Ret;
-    Ret.resize(TotalOut);
-    std::fill(Ret.begin(), Ret.end(), 0);
-    std::copy_n(C.begin(), TotalOut, Ret.begin());
-    return Ret;
-}
-
-std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW
-
-void LogChatMessage(const std::string& name, int id, const std::string& msg);

include/Compat.h

@@ -1,15 +1,12 @@
 #pragma once
 
-#include "Environment.h"
-
 // ======================= UNIX ========================
 
-#ifdef BEAMMP_LINUX
+#ifdef __unix
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
-#include <errno.h>
 using SOCKET = int;
 using DWORD = unsigned long;
 using PDWORD = unsigned long*;
@@ -21,33 +18,19 @@ inline void CloseSocketProper(int TheSocket) {
 }
 #endif // unix
 
-// ======================= APPLE ========================
+// ======================= WIN32 =======================
 
-#ifdef BEAMMP_APPLE
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <termios.h>
-#include <unistd.h>
-#include <errno.h>
-using SOCKET = int;
-using DWORD = unsigned long;
-using PDWORD = unsigned long*;
-using LPDWORD = unsigned long*;
-char _getch();
-inline void CloseSocketProper(int TheSocket) {
-    shutdown(TheSocket, SHUT_RDWR);
-    close(TheSocket);
-}
-#endif // unix
-
-// ======================= WINDOWS =======================
-
-#ifdef BEAMMP_WINDOWS
+#ifdef WIN32
 #include <conio.h>
 #include <winsock2.h>
 inline void CloseSocketProper(SOCKET TheSocket) {
     shutdown(TheSocket, 2); // 2 == SD_BOTH
     closesocket(TheSocket);
-
 }
 #endif // WIN32
+
+// ======================= OTHER =======================
+
+#if !defined(WIN32) && !defined(__unix)
+#error "OS not supported"
+#endif

include/Cryptography.h

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

include/CustomAssert.h

@@ -55,18 +55,18 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
     }
 }
 
-#define beammp_assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
-#define beammp_assert_not_reachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
+#define Assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
+#define AssertNotReachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
 #else
 // In release build, these macros turn into NOPs. The compiler will optimize these out.
-#define beammp_assert(cond)                                           \
+#define Assert(cond)                                                  \
     do {                                                              \
         bool result = (cond);                                         \
         if (!result) {                                                \
             Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
         }                                                             \
     } while (false)
-#define beammp_assert_not_reachable()                                             \
+#define AssertNotReachable()                                                      \
     do {                                                                          \
         Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__); \
     } while (false)

include/Environment.h

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

include/Http.h

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

include/IThreaded.h

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

include/LuaAPI.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include "TLuaEngine.h"
-#include <tuple>
-
-namespace LuaAPI {
-int PanicHandler(lua_State* State);
-std::string LuaToString(const sol::object Value, size_t Indent = 1, bool QuoteStrings = false);
-void Print(sol::variadic_args);
-namespace MP {
-    extern TLuaEngine* Engine;
-
-    std::string GetOSName();
-    std::tuple<int, int, int> GetServerVersion();
-    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data);
-    inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
-    void DropPlayer(int ID, std::optional<std::string> MaybeReason);
-    void SendChatMessage(int ID, const std::string& Message);
-    void RemoveVehicle(int PlayerID, int VehicleID);
-    void Set(int ConfigID, sol::object NewValue);
-    bool IsPlayerGuest(int ID);
-    bool IsPlayerConnected(int ID);
-    void Sleep(size_t Ms);
-    void PrintRaw(sol::variadic_args);
-}
-namespace FS {
-    std::pair<bool, std::string> CreateDirectory(const std::string& Path);
-    std::pair<bool, std::string> Remove(const std::string& Path);
-    std::pair<bool, std::string> Rename(const std::string& Path, const std::string& NewPath);
-    std::pair<bool, std::string> Copy(const std::string& Path, const std::string& NewPath);
-    std::string GetFilename(const std::string& Path);
-    std::string GetExtension(const std::string& Path);
-    std::string GetParentFolder(const std::string& Path);
-    bool Exists(const std::string& Path);
-    bool IsDirectory(const std::string& Path);
-    bool IsFile(const std::string& Path);
-    std::string ConcatPaths(sol::variadic_args Args);
-}
-}

include/SocketIO.h

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

include/TConfig.h

@@ -4,29 +4,18 @@
 
 #include <atomic>
 
-#define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
-#include <toml11/toml.hpp> // header-only version of TOML++
-
-namespace fs = std::filesystem;
-
 class TConfig {
 public:
-    explicit TConfig(const std::string& ConfigFileName);
+    explicit TConfig();
 
     [[nodiscard]] bool Failed() const { return mFailed; }
 
-    void FlushToFile();
-
 private:
     void CreateConfigFile(std::string_view name);
     void ParseFromFile(std::string_view name);
     void PrintDebug();
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue);
 
     void ParseOldFormat();
-    bool IsDefault();
+
     bool mFailed { false };
-    std::string mConfigFileName;
 };

include/TConsole.h

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

include/THeartbeatThread.h

@@ -18,4 +18,4 @@ private:
     bool mShutdown = false;
     TResourceManager& mResourceManager;
     TServer& mServer;
-};
+};

include/TLuaEngine.h

@@ -1,225 +1,39 @@
 #pragma once
 
-#include "TNetwork.h"
+#include "Common.h"
+#include "IThreaded.h"
+#include "TLuaFile.h"
 #include "TServer.h"
-#include <any>
-#include <condition_variable>
-#include <filesystem>
-#include <initializer_list>
 #include <lua.hpp>
 #include <memory>
-#include <mutex>
-#include <queue>
+#include <optional>
 #include <set>
-#include <toml11/toml.hpp>
-#include <unordered_map>
-#include <vector>
 
-#define SOL_ALL_SAFETIES_ON 1
-#include <sol/sol.hpp>
-
-using TLuaStateId = std::string;
-namespace fs = std::filesystem;
-/**
- * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
- */
-using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool>;
-static constexpr size_t TLuaArgTypes_String = 0;
-static constexpr size_t TLuaArgTypes_Int = 1;
-static constexpr size_t TLuaArgTypes_VariadicArgs = 2;
-static constexpr size_t TLuaArgTypes_Bool = 3;
-
-class TLuaPlugin;
-
-struct TLuaResult {
-    std::atomic_bool Ready;
-    std::atomic_bool Error;
-    std::string ErrorMessage;
-    sol::object Result { sol::lua_nil };
-    TLuaStateId StateId;
-    std::string Function;
-    // TODO: Add condition_variable
-    void WaitUntilReady();
-};
-
-struct TLuaPluginConfig {
-    static inline const std::string FileName = "PluginConfig.toml";
-    TLuaStateId StateId;
-    // TODO: Add execute list
-};
-
-struct TLuaChunk {
-    TLuaChunk(std::shared_ptr<std::string> Content,
-        std::string FileName,
-        std::string PluginPath);
-    std::shared_ptr<std::string> Content;
-    std::string FileName;
-    std::string PluginPath;
-};
-
-class TPluginMonitor : IThreaded {
+class TLuaEngine : public IThreaded {
 public:
-    TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown);
+    explicit TLuaEngine(TServer& Server, TNetwork& Network);
 
-    void operator()();
-
-private:
-    TLuaEngine& mEngine;
-    fs::path mPath;
-    std::atomic_bool& mShutdown;
-    std::unordered_map<std::string, fs::file_time_type> mFileTimes;
-};
-
-class TLuaEngine : IThreaded {
-public:
-    TLuaEngine();
-    ~TLuaEngine() noexcept {
-        beammp_debug("Lua Engine terminated");
-    }
+    using TSetOfLuaFile = std::set<std::unique_ptr<TLuaFile>>;
 
     void operator()() override;
 
-    TNetwork& Network() { return *mNetwork; }
-    TServer& Server() { return *mServer; }
+    [[nodiscard]] const TSetOfLuaFile& LuaFiles() const { return mLuaFiles; }
+    [[nodiscard]] TServer& Server() { return mServer; }
+    [[nodiscard]] const TServer& Server() const { return mServer; }
+    [[nodiscard]] TNetwork& Network() { return mNetwork; }
+    [[nodiscard]] const TNetwork& Network() const { return mNetwork; }
 
-    void SetNetwork(TNetwork* Network) { mNetwork = Network; }
-    void SetServer(TServer* Server) { mServer = Server; }
-
-    size_t GetResultsToCheckSize() {
-        std::unique_lock Lock(mResultsToCheckMutex);
-        return mResultsToCheck.size();
-    }
-    size_t GetLuaStateCount() {
-        std::unique_lock Lock(mLuaStatesMutex);
-        return mLuaStates.size();
-    }
-    size_t GetTimedEventsCount() {
-        std::unique_lock Lock(mTimedEventsMutex);
-        return mTimedEvents.size();
-    }
-    size_t GetRegisteredEventHandlerCount() {
-        std::unique_lock Lock(mLuaEventsMutex);
-        size_t LuaEventsCount = 0;
-        for (const auto& State : mLuaEvents) {
-            for (const auto& Events : State.second) {
-                LuaEventsCount += Events.second.size();
-            }
-        }
-        return LuaEventsCount - GetLuaStateCount();
-    }
-
-    static void WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results,
-        const std::optional<std::chrono::high_resolution_clock::duration>& Max = std::nullopt);
-    void ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results);
-    bool HasState(TLuaStateId StateId);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
-    void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);
-    void RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName);
-    template <typename... ArgsT>
-    /**
-     *
-     * @tparam ArgsT Template Arguments for the event (Metadata) todo: figure out what this means
-     * @param EventName Name of the event
-     * @param IgnoreId
-     * @param Args
-     * @return
-     */
-    [[nodiscard]] std::vector<std::shared_ptr<TLuaResult>> TriggerEvent(const std::string& EventName, TLuaStateId IgnoreId, ArgsT&&... Args) {
-        std::unique_lock Lock(mLuaEventsMutex);
-        beammp_event(EventName);
-        if (mLuaEvents.find(EventName) == mLuaEvents.end()) { // if no event handler is defined for 'EventName', return immediately
-            return {};
-        }
-
-        std::vector<std::shared_ptr<TLuaResult>> Results;
-        std::vector<TLuaArgTypes> Arguments { TLuaArgTypes { std::forward<ArgsT>(Args) }... };
-
-        for (const auto& Event : mLuaEvents.at(EventName)) {
-            for (const auto& Function : Event.second) {
-                if (Event.first != IgnoreId) {
-                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments));
-                }
-            }
-        }
-        return Results; //
-    }
-    std::set<std::string> GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId);
-    void CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS);
-    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::optional<std::reference_wrapper<TLuaFile>> GetScript(lua_State* L);
 
 private:
-    void CollectAndInitPlugins();
-    void InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config);
-    void FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config);
-    size_t CalculateMemoryUsage();
+    void FolderList(const std::string& Path, bool HotSwap);
+    void RegisterFiles(const fs::path& Path, bool HotSwap);
+    bool IsNewFile(const std::string& Path);
 
-    class StateThreadData : IThreaded {
-    public:
-        StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine);
-        StateThreadData(const StateThreadData&) = delete;
-        ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
-        void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
-        void AddPath(const fs::path& Path); // to be added to path and cpath
-        void operator()() override;
-        sol::state_view State() { return sol::state_view(mState); }
-
-    private:
-        sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
-        sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
-        sol::table Lua_GetPlayerIdentifiers(int ID);
-        sol::table Lua_GetPlayers();
-        std::string Lua_GetPlayerName(int ID);
-        sol::table Lua_GetPlayerVehicles(int ID);
-        sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
-        int Lua_GetPlayerIDByName(const std::string& Name);
-
-        std::string mName;
-        std::atomic_bool& mShutdown;
-        TLuaStateId mStateId;
-        lua_State* mState;
-        std::thread mThread;
-        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> mStateExecuteQueue;
-        std::recursive_mutex mStateExecuteQueueMutex;
-        std::queue<std::tuple<std::string, std::shared_ptr<TLuaResult>, std::vector<TLuaArgTypes>>> mStateFunctionQueue;
-        std::mutex mStateFunctionQueueMutex;
-        std::condition_variable mStateFunctionQueueCond;
-        TLuaEngine* mEngine;
-        sol::state_view mStateView { mState };
-        std::queue<fs::path> mPaths;
-        std::recursive_mutex mPathsMutex;
-    };
-
-    struct TimedEvent {
-        std::chrono::high_resolution_clock::duration Duration {};
-        std::chrono::high_resolution_clock::time_point LastCompletion {};
-        std::string EventName;
-        TLuaStateId StateId;
-        bool Expired();
-        void Reset();
-    };
-
-    TNetwork* mNetwork;
-    TServer* mServer;
-    TPluginMonitor mPluginMonitor;
-    std::atomic_bool mShutdown { false };
-    fs::path mResourceServerPath;
-    std::vector<std::shared_ptr<TLuaPlugin>> mLuaPlugins;
-    std::unordered_map<TLuaStateId, std::unique_ptr<StateThreadData>> mLuaStates;
-    std::recursive_mutex mLuaStatesMutex;
-    std::unordered_map<std::string /* event name */, std::unordered_map<TLuaStateId, std::set<std::string>>> mLuaEvents;
-    std::recursive_mutex mLuaEventsMutex;
-    std::vector<TimedEvent> mTimedEvents;
-    std::recursive_mutex mTimedEventsMutex;
-    std::queue<std::shared_ptr<TLuaResult>> mResultsToCheck;
-    std::recursive_mutex mResultsToCheckMutex;
+    TNetwork& mNetwork;
+    TServer& mServer;
+    std::string mPath;
+    bool mShutdown { false };
+    TSetOfLuaFile mLuaFiles;
+    std::mutex mListMutex;
 };
-
-// std::any TriggerLuaEvent(const std::string& Event, bool local, TLuaPlugin* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);

include/TLuaFile.h

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

include/TLuaPlugin.h

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

include/TNetwork.h

@@ -4,8 +4,6 @@
 #include "TResourceManager.h"
 #include "TServer.h"
 
-struct TConnection;
-
 class TNetwork {
 public:
     TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager);
@@ -17,8 +15,8 @@ public:
     std::string TCPRcv(TClient& c);
     void ClientKick(TClient& c, const std::string& R);
     [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
-    void Identify(const TConnection& client);
-    void Authentication(const TConnection& ClientConnection);
+    void Identify(SOCKET TCPSock);
+    void Authentication(SOCKET TCPSock);
     [[nodiscard]] bool CheckBytes(TClient& c, int32_t BytesRcv);
     void SyncResources(TClient& c);
     [[nodiscard]] bool UDPSend(TClient& Client, std::string Data) const;

include/TScopedTimer.h

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

include/TServer.h

@@ -2,7 +2,6 @@
 
 #include "IThreaded.h"
 #include "RWMutex.h"
-#include "TScopedTimer.h"
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -16,7 +15,7 @@ class TServer final {
 public:
     using TClientSet = std::unordered_set<std::shared_ptr<TClient>>;
 
-    TServer(const std::vector<std::string_view>& Arguments);
+    TServer(int argc, char** argv);
 
     void InsertClient(const std::shared_ptr<TClient>& Ptr);
     std::weak_ptr<TClient> InsertNewClient();
@@ -28,9 +27,6 @@ public:
     static void GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
     static void HandleEvent(TClient& c, const std::string& Data);
     RWMutex& GetClientMutex() const { return mClientsMutex; }
-
-    
-    const TScopedTimer UptimeTimer;
 private:
     TClientSet mClients;
     mutable RWMutex mClientsMutex;

src/ArgsParser.cpp

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

src/Client.cpp

@@ -1,9 +1,7 @@
 #include "Client.h"
 
 #include "CustomAssert.h"
-#include "TServer.h"
 #include <memory>
-#include <optional>
 
 // FIXME: add debug prints
 
@@ -15,7 +13,7 @@ void TClient::DeleteCar(int Ident) {
     if (iter != mVehicleData.end()) {
         mVehicleData.erase(iter);
     } else {
-        beammp_debug("tried to erase a vehicle that doesn't exist (not an error)");
+        debug("tried to erase a vehicle that doesn't exist (not an error)");
     }
 }
 
@@ -101,19 +99,3 @@ int TClient::SecondsSinceLastPing() {
                        .count();
     return int(seconds);
 }
-
-std::optional<std::weak_ptr<TClient>> GetClient(TServer& Server, int ID) {
-    std::optional<std::weak_ptr<TClient>> MaybeClient { std::nullopt };
-    Server.ForEachClient([&](std::weak_ptr<TClient> CPtr) -> bool {
-        ReadLock Lock(Server.GetClientMutex());
-        if (!CPtr.expired()) {
-            auto C = CPtr.lock();
-            if (C->GetID() == ID) {
-                MaybeClient = CPtr;
-                return false;
-            }
-        }
-        return true;
-    });
-    return MaybeClient;
-}

src/Common.cpp

@@ -8,11 +8,12 @@
 #include <regex>
 #include <sstream>
 #include <thread>
+#include <zlib.h>
 
 #include "CustomAssert.h"
 #include "Http.h"
 
-Application::TSettings Application::Settings = {};
+std::unique_ptr<TConsole> Application::mConsole = std::make_unique<TConsole>();
 
 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
     std::unique_lock Lock(mShutdownHandlersMutex);
@@ -28,31 +29,27 @@ void Application::GracefullyShutdown() {
         ++ShutdownAttempts;
         // hard shutdown at 2 additional tries
         if (ShutdownAttempts == 2) {
-            beammp_info("hard shutdown forced by multiple shutdown requests");
+            info("hard shutdown forced by multiple shutdown requests");
             std::exit(0);
         }
-        beammp_info("already shutting down!");
+        info("already shutting down!");
         return;
     } else {
         AlreadyShuttingDown = true;
     }
-    beammp_trace("waiting for lock release");
+    trace("waiting for lock release");
     std::unique_lock Lock(mShutdownHandlersMutex);
-    beammp_info("please wait while all subsystems are shutting down...");
+    info("please wait while all subsystems are shutting down...");
     for (size_t i = 0; i < mShutdownHandlers.size(); ++i) {
-        beammp_info("Subsystem " + std::to_string(i + 1) + "/" + std::to_string(mShutdownHandlers.size()) + " shutting down");
+        info("Subsystem " + std::to_string(i + 1) + "/" + std::to_string(mShutdownHandlers.size()) + " shutting down");
         mShutdownHandlers[i]();
     }
 }
 
-std::string Application::ServerVersionString() {
-    return mVersion.AsString();
-}
-
-std::array<uint8_t, 3> Application::VersionStrToInts(const std::string& str) {
-    std::array<uint8_t, 3> Version;
+std::array<int, 3> Application::VersionStrToInts(const std::string& str) {
+    std::array<int, 3> Version;
     std::stringstream ss(str);
-    for (uint8_t& i : Version) {
+    for (int& i : Version) {
         std::string Part;
         std::getline(ss, Part, '.');
         std::from_chars(&*Part.begin(), &*Part.begin() + Part.size(), i);
@@ -60,71 +57,85 @@ 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) {
+bool Application::IsOutdated(const std::array<int, 3>& Current, const std::array<int, 3>& Newest) {
+    if (Newest[0] > Current[0]) {
         return true;
-    } else if (Newest.major == Current.major && Newest.minor > Current.minor) {
+    } else if (Newest[0] == Current[0] && Newest[1] > Current[1]) {
         return true;
-    } else if (Newest.major == Current.major && Newest.minor == Current.minor && Newest.patch > Current.patch) {
+    } else if (Newest[0] == Current[0] && Newest[1] == Current[1] && Newest[2] > Current[2]) {
         return true;
     } else {
         return false;
     }
 }
 
-void Application::SetSubsystemStatus(const std::string& Subsystem, Status status) {
-    switch (status) {
-    case Status::Good:
-        beammp_trace("Subsystem '" + Subsystem + "': Good");
-        break;
-    case Status::Bad:
-        beammp_trace("Subsystem '" + Subsystem + "': Bad");
-        break;
-    case Status::Starting:
-        beammp_trace("Subsystem '" + Subsystem + "': Starting");
-        break;
-    case Status::ShuttingDown:
-        beammp_trace("Subsystem '" + Subsystem + "': Shutting down");
-        break;
-    case Status::Shutdown:
-        beammp_trace("Subsystem '" + Subsystem + "': Shutdown");
-        break;
-    }
-    std::unique_lock Lock(mSystemStatusMapMutex);
-    mSystemStatusMap[Subsystem] = status;
-}
-
 void Application::CheckForUpdates() {
-    Application::SetSubsystemStatus("UpdateCheck", Application::Status::Starting);
     // checks current version against latest version
     std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
-    for (const auto& url : GetBackendUrlsInOrder()) {
-        auto Response = Http::GET(GetBackendUrlsInOrder().at(0), 443, "/v/s");
-        bool Matches = std::regex_match(Response, VersionRegex);
-        if (Matches) {
-            auto MyVersion = ServerVersion();
-            auto RemoteVersion = Version(VersionStrToInts(Response));
-            if (IsOutdated(MyVersion, RemoteVersion)) {
-                std::string RealVersionString = RemoteVersion.AsString();
-                beammp_warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION 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));
-            } else {
-                beammp_info("Server up-to-date!");
-            }
-            Application::SetSubsystemStatus("UpdateCheck", Application::Status::Good);
-            break;
+    auto Response = Http::GET(GetBackendHostname(), 443, "/v/s");
+    bool Matches = std::regex_match(Response, VersionRegex);
+    if (Matches) {
+        auto MyVersion = VersionStrToInts(ServerVersion());
+        auto RemoteVersion = VersionStrToInts(Response);
+        if (IsOutdated(MyVersion, RemoteVersion)) {
+            std::string RealVersionString = std::to_string(RemoteVersion[0]) + ".";
+            RealVersionString += std::to_string(RemoteVersion[1]) + ".";
+            RealVersionString += std::to_string(RemoteVersion[2]);
+            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));
         } else {
-            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);
+            info("Server up-to-date!");
         }
+    } else {
+        warn("Unable to fetch version from backend.");
+        trace("got " + Response);
+        auto Lock = Sentry.CreateExclusiveContext();
+        Sentry.SetContext("get-response", { { "response", Response } });
+        Sentry.LogError("failed to get server version", _file_basename, _line);
     }
-    if (Application::GetSubsystemStatuses().at("UpdateCheck") == Application::Status::Bad) {
-        beammp_warn("Unable to fetch version info from backend.");
-    }
+}
+
+std::string Comp(std::string Data) {
+    std::array<char, Biggest> C {};
+    // obsolete
+    C.fill(0);
+    z_stream defstream;
+    defstream.zalloc = Z_NULL;
+    defstream.zfree = Z_NULL;
+    defstream.opaque = Z_NULL;
+    defstream.avail_in = (uInt)Data.length();
+    defstream.next_in = (Bytef*)&Data[0];
+    defstream.avail_out = Biggest;
+    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
+    deflateInit(&defstream, Z_BEST_COMPRESSION);
+    deflate(&defstream, Z_SYNC_FLUSH);
+    deflate(&defstream, Z_FINISH);
+    deflateEnd(&defstream);
+    size_t TO = defstream.total_out;
+    std::string Ret(TO, 0);
+    std::copy_n(C.begin(), TO, Ret.begin());
+    return Ret;
+}
+
+std::string DeComp(std::string Compressed) {
+    std::array<char, Biggest> C {};
+    // not needed
+    C.fill(0);
+    z_stream infstream;
+    infstream.zalloc = Z_NULL;
+    infstream.zfree = Z_NULL;
+    infstream.opaque = Z_NULL;
+    infstream.avail_in = Biggest;
+    infstream.next_in = (Bytef*)(&Compressed[0]);
+    infstream.avail_out = Biggest;
+    infstream.next_out = (Bytef*)(C.data());
+    inflateInit(&infstream);
+    inflate(&infstream, Z_SYNC_FLUSH);
+    inflate(&infstream, Z_FINISH);
+    inflateEnd(&infstream);
+    size_t TO = infstream.total_out;
+    std::string Ret(TO, 0);
+    std::copy_n(C.begin(), TO, Ret.begin());
+    return Ret;
 }
 
 // thread name stuff
@@ -145,73 +156,18 @@ std::string ThreadName(bool DebugModeOverride) {
 }
 
 void RegisterThread(const std::string& str) {
-    std::string ThreadId;
-#ifdef BEAMMP_WINDOWS
-    ThreadId = std::to_string(GetCurrentThreadId());
-#elif defined(BEAMMP_APPLE)
-    ThreadId = std::to_string(getpid()); // todo: research if 'getpid()' is a valid, posix compliant alternative to 'gettid()'
-#elif defined(BEAMMP_LINUX)
-    ThreadId = std::to_string(gettid());
-#endif
-    if (Application::Settings.DebugModeEnabled) {
-        std::ofstream ThreadFile("Threads.log", std::ios::app);
-        ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
-    }
     auto Lock = std::unique_lock(ThreadNameMapMutex);
     threadNameMap[std::this_thread::get_id()] = str;
 }
 
-Version::Version(uint8_t major, uint8_t minor, uint8_t patch)
-    : major(major)
-    , minor(minor)
-    , patch(patch) { }
-
-Version::Version(const std::array<uint8_t, 3>& v)
-    : Version(v[0], v[1], v[2]) {
-}
-
-std::string Version::AsString() {
-    std::stringstream ss {};
-    ss << int(major) << "." << int(minor) << "." << int(patch);
-    return ss.str();
-}
-
 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
     std::stringstream ss;
-    ss << ThreadName();
     ss << "[CHAT] ";
     if (id != -1) {
-        ss << "(" << id << ") <" << name << "> ";
+        ss << "(" << id << ") <" << name << ">";
     } else {
         ss << name << "";
     }
     ss << msg;
     Application::Console().Write(ss.str());
 }
-
-std::string GetPlatformAgnosticErrorString() {
-#ifdef BEAMMP_WINDOWS
-    // This will provide us with the error code and an error message, all in one.
-    int err;
-    char msgbuf[256];
-    msgbuf[0] = '\0';
-
-    err = GetLastError();
-
-    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-        nullptr,
-        err,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        msgbuf,
-        sizeof(msgbuf),
-        nullptr);
-
-    if (*msgbuf) {
-        return std::to_string(GetLastError()) + " - " + std::string(msgbuf);
-    } else {
-        return std::to_string(GetLastError());
-    }
-#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
-    return std::strerror(errno);
-#endif
-}

src/Http.cpp

@@ -1,60 +1,216 @@
 #include "Http.h"
 
-#include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
-#include "LuaAPI.h"
-#include "httplib.h"
+#undef error
 
+#include <boost/asio/connect.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/beast.hpp>
+#include <boost/beast/ssl.hpp>
 #include <map>
-#include <random>
-#include <rapidjson/document.h>
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
-#include <stdexcept>
-fs::path Http::Server::THttpServerInstance::KeyFilePath;
-fs::path Http::Server::THttpServerInstance::CertFilePath;
-// TODO: Add sentry error handling back
 
-namespace json = rapidjson;
+namespace beast = boost::beast; // from <boost/beast.hpp>
+namespace http = beast::http; // from <boost/beast/http.hpp>
+namespace net = boost::asio; // from <boost/asio.hpp>
+namespace ssl = net::ssl; // from <boost/asio/ssl.hpp>
+using tcp = net::ip::tcp; // from <boost/asio/ip/tcp.hpp>
 
 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
-    httplib::SSLClient client(host, port);
-    client.enable_server_certificate_verification(false);
-    client.set_address_family(AF_INET);
-    auto res = client.Get(target.c_str());
-    if (res) {
-        if (status) {
-            *status = res->status;
+    try {
+        // Check command line arguments.
+        int version = 11;
+
+        // The io_context is required for all I/O
+        net::io_context ioc;
+
+        // The SSL context is required, and holds certificates
+        ssl::context ctx(ssl::context::tlsv12_client);
+
+        // This holds the root certificate used for verification
+        // we don't do / have this
+        // load_root_certificates(ctx);
+
+        // Verify the remote server's certificate
+        ctx.set_verify_mode(ssl::verify_none);
+
+        // These objects perform our I/O
+        tcp::resolver resolver(ioc);
+        beast::ssl_stream<beast::tcp_stream> stream(ioc, ctx);
+
+        // Set SNI Hostname (many hosts need this to handshake successfully)
+        if (!SSL_set_tlsext_host_name(stream.native_handle(), host.c_str())) {
+            beast::error_code ec { static_cast<int>(::ERR_get_error()), net::error::get_ssl_category() };
+            throw beast::system_error { ec };
         }
-        return res->body;
-    } else {
-        return Http::ErrorString;
+
+        // Look up the domain name
+        auto const results = resolver.resolve(host.c_str(), std::to_string(port));
+
+        // Make the connection on the IP address we get from a lookup
+        beast::get_lowest_layer(stream).connect(results);
+
+        // Perform the SSL handshake
+        stream.handshake(ssl::stream_base::client);
+
+        // Set up an HTTP GET request message
+        http::request<http::string_body> req { http::verb::get, target, version };
+        req.set(http::field::host, host);
+
+        req.set(http::field::user_agent, BOOST_BEAST_VERSION_STRING);
+
+        // Send the HTTP request to the remote host
+        http::write(stream, req);
+
+        // This buffer is used for reading and must be persisted
+        beast::flat_buffer buffer;
+
+        // Declare a container to hold the response
+        http::response<http::string_body> res;
+
+        // Receive the HTTP response
+        http::read(stream, buffer, res);
+
+        // Gracefully close the stream
+        beast::error_code ec;
+        stream.shutdown(ec);
+        if (ec == net::error::eof) {
+            // Rationale:
+            // http://stackoverflow.com/questions/25587403/boost-asio-ssl-async-shutdown-always-finishes-with-an-error
+            ec = {};
+        }
+
+        if (status) {
+            *status = res.base().result_int();
+        }
+
+        // ignore ec
+
+        // If we get here then the connection is closed gracefully
+        return std::string(res.body());
+    } catch (std::exception const& e) {
+        Application::Console().Write(__func__ + std::string(": ") + e.what());
+        return "-1";
     }
 }
 
-std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
-    httplib::SSLClient client(host, port);
-    client.set_read_timeout(std::chrono::seconds(10));
-    beammp_assert(client.is_valid());
-    client.enable_server_certificate_verification(false);
-    client.set_address_family(AF_INET);
-    auto res = client.Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
-    if (res) {
-        if (status) {
-            *status = res->status;
+std::string Http::POST(const std::string& host, const std::string& target, const std::unordered_map<std::string, std::string>& fields, const std::string& body, bool json, int* status) {
+    try {
+        net::io_context io;
+
+        // The SSL context is required, and holds certificates
+        ssl::context ctx(ssl::context::tlsv13);
+
+        ctx.set_verify_mode(ssl::verify_none);
+
+        tcp::resolver resolver(io);
+        beast::ssl_stream<beast::tcp_stream> stream(io, ctx);
+        decltype(resolver)::results_type results;
+        auto try_connect_with_protocol = [&](tcp protocol) {
+            try {
+                results = resolver.resolve(protocol, host, std::to_string(443));
+                if (!SSL_set_tlsext_host_name(stream.native_handle(), host.c_str())) {
+                    boost::system::error_code ec { static_cast<int>(::ERR_get_error()), boost::asio::error::get_ssl_category() };
+                    // FIXME: we could throw and crash, if we like
+                    // throw boost::system::system_error { ec };
+                    //debug("POST " + host + target + " failed.");
+                    return false;
+                }
+                beast::get_lowest_layer(stream).connect(results);
+            } catch (const boost::system::system_error&) {
+                return false;
+            }
+            return true;
+        };
+        //bool ok = try_connect_with_protocol(tcp::v6());
+        //if (!ok) {
+        //debug("IPv6 connect failed, trying IPv4");
+        bool ok = try_connect_with_protocol(tcp::v4());
+        if (!ok) {
+            Application::Console().Write("[ERROR] failed to resolve or connect in POST " + host + target);
+            Sentry.AddErrorBreadcrumb("failed to resolve or connect to " + host + target, __FILE__, std::to_string(__LINE__)); // FIXME: this is ugly.
+            return "-1";
         }
-        return res->body;
-    } else {
-        beammp_debug("POST failed: " + httplib::to_string(res.error()));
-        return Http::ErrorString;
+        //}
+        stream.handshake(ssl::stream_base::client);
+        http::request<http::string_body> req { http::verb::post, target, 11 /* http 1.1 */ };
+
+        req.set(http::field::host, host);
+        if (!body.empty()) {
+            if (json) {
+                req.set(http::field::content_type, "application/json");
+            } else {
+                req.set(http::field::content_type, "application/x-www-form-urlencoded");
+            }
+            req.set(http::field::content_length, std::to_string(body.size()));
+            req.body() = body;
+            // info("body is " + body + " (" + req.body() + ")");
+            // info("content size is " + std::to_string(body.size()) + " (" + boost::lexical_cast<std::string>(body.size()) + ")");
+        }
+        for (const auto& pair : fields) {
+            // info("setting " + pair.first + " to " + pair.second);
+            req.set(pair.first, pair.second);
+        }
+
+        std::unordered_map<std::string, std::string> request_data;
+        for (const auto& header : req.base()) {
+            // need to do explicit casts to convert string_view to string
+            // since string_view may not be null-terminated (and in fact isn't, here)
+            std::string KeyString(header.name_string());
+            std::string ValueString(header.value());
+            request_data[KeyString] = ValueString;
+        }
+        Sentry.SetContext("https-post-request-data", request_data);
+
+        std::stringstream oss;
+        oss << req;
+
+        beast::get_lowest_layer(stream).expires_after(std::chrono::seconds(5));
+
+        http::write(stream, req);
+
+        // used for reading
+        beast::flat_buffer buffer;
+        http::response<http::string_body> response;
+
+        http::read(stream, buffer, response);
+
+        std::unordered_map<std::string, std::string> response_data;
+        response_data["reponse-code"] = std::to_string(response.result_int());
+        if (status) {
+            *status = response.result_int();
+        }
+        for (const auto& header : response.base()) {
+            // need to do explicit casts to convert string_view to string
+            // since string_view may not be null-terminated (and in fact isn't, here)
+            std::string KeyString(header.name_string());
+            std::string ValueString(header.value());
+            response_data[KeyString] = ValueString;
+        }
+        Sentry.SetContext("https-post-response-data", response_data);
+
+        std::stringstream result;
+        result << response;
+
+        beast::error_code ec;
+        stream.shutdown(ec);
+        // IGNORING ec
+
+        // info(result.str());
+        std::string debug_response_str;
+        std::getline(result, debug_response_str);
+        //debug("POST " + host + target + ": " + debug_response_str);
+        return std::string(response.body());
+
+    } catch (const std::exception& e) {
+        Application::Console().Write(e.what());
+        Sentry.AddErrorBreadcrumb(e.what(), __FILE__, std::to_string(__LINE__)); // FIXME: this is ugly.
+        return "-1";
     }
 }
 
 // RFC 2616, RFC 7231
 static std::map<size_t, const char*> Map = {
-    { -1, "Invalid Response Code" },
+    { -1, "Invalid Response Code"},
     { 100, "Continue" },
     { 101, "Switching Protocols" },
     { 102, "Processing" },
@@ -129,247 +285,10 @@ static std::map<size_t, const char*> Map = {
     { 530, "(CDN) 1XXX Internal Error" },
 };
 
-static const char Magic[] = {
-    0x20, 0x2f, 0x5c, 0x5f,
-    0x2f, 0x5c, 0x0a, 0x28,
-    0x20, 0x6f, 0x2e, 0x6f,
-    0x20, 0x29, 0x0a, 0x20,
-    0x3e, 0x20, 0x5e, 0x20,
-    0x3c, 0x0a, 0x00
-};
-
-std::string Http::Status::ToString(int Code) {
-    if (Map.find(Code) != Map.end()) {
-        return Map.at(Code);
+std::string Http::Status::ToString(int code) {
+    if (Map.find(code) != Map.end()) {
+        return Map.at(code);
     } else {
-        return std::to_string(Code);
+        return std::to_string(code);
     }
 }
-
-long Http::Server::Tx509KeypairGenerator::GenerateRandomId() {
-    std::random_device R;
-    std::default_random_engine E1(R());
-    std::uniform_int_distribution<long> UniformDist(0, ULONG_MAX);
-    return UniformDist(E1);
-}
-
-// Http::Server::THttpServerInstance::THttpServerInstance() { }
-EVP_PKEY* Http::Server::Tx509KeypairGenerator::GenerateKey() {
-    /**
-     * Allocate memory for the pkey
-     */
-    EVP_PKEY* PKey = EVP_PKEY_new();
-    if (PKey == nullptr) {
-        beammp_error("Could not allocate memory for X.509 private key (PKEY) generation.");
-        throw std::runtime_error { std::string { "X.509 PKEY allocation error" } };
-    }
-    BIGNUM* E = BN_new();
-    beammp_assert(E); // TODO: replace all these asserts with beammp_errors
-    unsigned char three = 3;
-    BIGNUM* EErr = BN_bin2bn(&three, sizeof(three), E);
-    beammp_assert(EErr);
-    RSA* Rsa = RSA_new();
-    beammp_assert(Rsa);
-    int Ret = RSA_generate_key_ex(Rsa, Crypto::RSA_DEFAULT_KEYLENGTH, E, nullptr);
-    beammp_assert(Ret == 1);
-    BN_free(E);
-    if (!EVP_PKEY_assign_RSA(PKey, Rsa)) {
-        EVP_PKEY_free(PKey);
-        beammp_error(std::string("Could not generate " + std::to_string(Crypto::RSA_DEFAULT_KEYLENGTH) + "-bit RSA key."));
-        throw std::runtime_error { std::string("X.509 RSA key generation error") };
-    }
-    // todo: figure out if returning by reference instead of passing pointers is a security breach
-    return PKey;
-}
-
-X509* Http::Server::Tx509KeypairGenerator::GenerateCertificate(EVP_PKEY& PKey) {
-    X509* X509 = X509_new();
-    if (X509 == nullptr) {
-        X509_free(X509);
-        beammp_error("Could not allocate memory for X.509 certificate generation.");
-        throw std::runtime_error { std::string("X.509 certificate generation error") };
-    }
-
-    /**Set the metadata of the certificate*/
-    ASN1_INTEGER_set(X509_get_serialNumber(X509), GenerateRandomId());
-
-    /**Set the cert validity to a year*/
-    X509_gmtime_adj(X509_get_notBefore(X509), 0);
-    X509_gmtime_adj(X509_get_notAfter(X509), 31536000L);
-
-    /**Set the public key of the cert*/
-    X509_set_pubkey(X509, &PKey);
-
-    X509_NAME* Name = X509_get_subject_name(X509);
-
-    /**Set cert metadata*/
-    X509_NAME_add_entry_by_txt(Name, "C", MBSTRING_ASC, (unsigned char*)"GB", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(Name, "O", MBSTRING_ASC, (unsigned char*)"BeamMP Ltd.", -1, -1, 0);
-    X509_NAME_add_entry_by_txt(Name, "CN", MBSTRING_ASC, (unsigned char*)"localhost", -1, -1, 0);
-
-    X509_set_issuer_name(X509, Name);
-
-    // TODO: Hashing with sha256 might cause problems, check later
-    if (!X509_sign(X509, &PKey, EVP_sha1())) {
-        X509_free(X509);
-        beammp_error("Could not sign X.509 certificate.");
-        throw std::runtime_error { std::string("X.509 certificate signing error") };
-    }
-    return X509;
-}
-
-void Http::Server::Tx509KeypairGenerator::GenerateAndWriteToDisk(const fs::path& KeyFilePath, const fs::path& CertFilePath) {
-    // todo: generate directories for ssl keys
-    FILE* KeyFile = std::fopen(reinterpret_cast<const char*>(KeyFilePath.c_str()), "wb");
-    if (!KeyFile) {
-        beammp_error("Could not create file 'key.pem', check your permissions");
-        throw std::runtime_error("Could not create file 'key.pem'");
-    }
-
-    EVP_PKEY* PKey = Http::Server::Tx509KeypairGenerator::GenerateKey();
-
-    bool WriteOpResult = PEM_write_PrivateKey(KeyFile, PKey, nullptr, nullptr, 0, nullptr, nullptr);
-    fclose(KeyFile);
-
-    if (!WriteOpResult) {
-        beammp_error("Could not write to file 'key.pem', check your permissions");
-        throw std::runtime_error("Could not write to file 'key.pem'");
-    }
-
-    FILE* CertFile = std::fopen(reinterpret_cast<const char*>(CertFilePath.c_str()), "wb"); // x509 file
-    if (!CertFile) {
-        beammp_error("Could not create file 'cert.pem', check your permissions");
-        throw std::runtime_error("Could not create file 'cert.pem'");
-    }
-
-    X509* x509 = Http::Server::Tx509KeypairGenerator::GenerateCertificate(*PKey);
-    WriteOpResult = PEM_write_X509(CertFile, x509);
-    fclose(CertFile);
-
-    if (!WriteOpResult) {
-        beammp_error("Could not write to file 'cert.pem', check your permissions");
-        throw std::runtime_error("Could not write to file 'cert.pem'");
-    }
-    EVP_PKEY_free(PKey);
-    X509_free(x509);
-    return;
-}
-
-bool Http::Server::Tx509KeypairGenerator::EnsureTLSConfigExists() {
-    if (fs::is_regular_file(Application::Settings.SSLKeyPath)
-        && fs::is_regular_file(Application::Settings.SSLCertPath)) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-void Http::Server::SetupEnvironment() {
-    if (!Application::Settings.HTTPServerUseSSL) {
-        return;
-    }
-    auto parent = fs::path(Application::Settings.SSLKeyPath).parent_path();
-    if (!fs::exists(parent))
-        fs::create_directories(parent);
-
-    Application::TSettings defaultSettings {};
-    if (!Tx509KeypairGenerator::EnsureTLSConfigExists()) {
-        beammp_warn(std::string("No default TLS Key / Cert found. "
-                                "IF YOU HAVE NOT MODIFIED THE SSLKeyPath OR SSLCertPath VALUES "
-                                "THIS IS NORMAL ON FIRST STARTUP! BeamMP will generate it's own certs in the default directory "
-                                "(Check for permissions or corrupted key-/certfile)"));
-        Tx509KeypairGenerator::GenerateAndWriteToDisk(defaultSettings.SSLKeyPath, defaultSettings.SSLCertPath);
-        Http::Server::THttpServerInstance::KeyFilePath = defaultSettings.SSLKeyPath;
-        Http::Server::THttpServerInstance::CertFilePath = defaultSettings.SSLCertPath;
-    } else {
-        Http::Server::THttpServerInstance::KeyFilePath = Application::Settings.SSLKeyPath;
-        Http::Server::THttpServerInstance::CertFilePath = Application::Settings.SSLCertPath;
-    }
-}
-
-Http::Server::THttpServerInstance::THttpServerInstance() {
-    Application::SetSubsystemStatus("HTTPServer", Application::Status::Starting);
-    mThread = std::thread(&Http::Server::THttpServerInstance::operator(), this);
-    mThread.detach();
-}
-
-void Http::Server::THttpServerInstance::operator()() {
-    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
-    std::unique_ptr<httplib::Server> HttpLibServerInstance;
-    if (Application::Settings.HTTPServerUseSSL) {
-        HttpLibServerInstance = std::make_unique<httplib::SSLServer>(
-            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::CertFilePath.c_str()),
-            reinterpret_cast<const char*>(Http::Server::THttpServerInstance::KeyFilePath.c_str()));
-    } else {
-        HttpLibServerInstance = std::make_unique<httplib::Server>();
-    }
-    // todo: make this IP agnostic so people can set their own IP
-    HttpLibServerInstance->Get("/", [](const httplib::Request&, httplib::Response& res) {
-        res.set_content("<!DOCTYPE html><article><h1>Hello World!</h1><section><p>BeamMP Server can now serve HTTP requests!</p></section></article></html>", "text/html");
-    });
-    HttpLibServerInstance->Get("/health", [](const httplib::Request&, httplib::Response& res) {
-        size_t SystemsGood = 0;
-        size_t SystemsBad = 0;
-        auto Statuses = Application::GetSubsystemStatuses();
-        for (const auto& NameStatusPair : Statuses) {
-            switch (NameStatusPair.second) {
-            case Application::Status::Starting:
-            case Application::Status::ShuttingDown:
-            case Application::Status::Shutdown:
-            case Application::Status::Good:
-                SystemsGood++;
-                break;
-            case Application::Status::Bad:
-                SystemsBad++;
-                break;
-            }
-        }
-        res.set_content(SystemsBad == 0 ? "0" : "1", "text/plain");
-        res.status = 200;
-    });
-    /*
-    HttpLibServerInstance->Get("/status", [](const httplib::Request&, httplib::Response& res) {
-        try {
-            json::Document response;
-            response.SetObject();
-            rapidjson::Document::AllocatorType& Allocator = response.GetAllocator();
-            // add to response
-            auto& Server = LuaAPI::MP::Engine->Server();
-            size_t CarCount = 0;
-            size_t GuestCount = 0;
-            json::Value Array(rapidjson::kArrayType);
-            LuaAPI::MP::Engine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-                if (!Client.expired()) {
-                    auto Locked = Client.lock();
-                    CarCount += Locked->GetCarCount();
-                    GuestCount += Locked->IsGuest() ? 1 : 0;
-                    json::Value Player(json::kObjectType);
-                    Player.AddMember("name", json::StringRef(Locked->GetName().c_str()), Allocator);
-                    Player.AddMember("id", Locked->GetID(), Allocator);
-                    Array.PushBack(Player, Allocator);
-                }
-                return true;
-            });
-            response.AddMember("players", Array, Allocator);
-            response.AddMember("player_count", Server.ClientCount(), Allocator);
-            response.AddMember("guest_count", GuestCount, Allocator);
-            response.AddMember("car_count", CarCount, Allocator);
-
-            // compile & send response
-            json::StringBuffer sb;
-            json::Writer<json::StringBuffer> writer(sb);
-            response.Accept(writer);
-            res.set_content(sb.GetString(), "application/json");
-        } catch (const std::exception& e) {
-            beammp_error("Exception in /status endpoint: " + std::string(e.what()));
-            res.status = 500;
-        }
-    });
-    */
-    // magic endpoint
-    HttpLibServerInstance->Get({ 0x2f, 0x6b, 0x69, 0x74, 0x74, 0x79 }, [](const httplib::Request&, httplib::Response& res) {
-        res.set_content(std::string(Magic), "text/plain");
-    });
-    Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
-    HttpLibServerInstance->listen("0.0.0.0", Application::Settings.HTTPServerPort);
-}

src/LuaAPI.cpp

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

src/SignalHandling.cpp

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

src/SocketIO.cpp

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

src/TConfig.cpp

@@ -1,4 +1,4 @@
-#include "Common.h"
+#include <toml.hpp> // header-only version of TOML++
 
 #include "TConfig.h"
 #include <fstream>
@@ -6,7 +6,8 @@
 #include <istream>
 #include <sstream>
 
-// General
+static const char* ConfigFileName = static_cast<const char*>("ServerConfig.toml");
+
 static constexpr std::string_view StrDebug = "Debug";
 static constexpr std::string_view StrPrivate = "Private";
 static constexpr std::string_view StrPort = "Port";
@@ -19,71 +20,27 @@ static constexpr std::string_view StrResourceFolder = "ResourceFolder";
 static constexpr std::string_view StrAuthKey = "AuthKey";
 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 StrHTTPServerUseSSL = "UseSSL";
 
-// HTTP
-static constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
-static constexpr std::string_view StrSSLCertPath = "SSLCertPath";
-static constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
-
-TConfig::TConfig(const std::string& ConfigFileName)
-    : mConfigFileName(ConfigFileName) {
-    Application::SetSubsystemStatus("Config", Application::Status::Starting);
-    if (!fs::exists(mConfigFileName) || !fs::is_regular_file(mConfigFileName)) {
-        beammp_info("No config file found! Generating one...");
-        CreateConfigFile(mConfigFileName);
+TConfig::TConfig() {
+    if (!fs::exists(ConfigFileName) || !fs::is_regular_file(ConfigFileName)) {
+        info("No config file found! Generating one...");
+        CreateConfigFile(ConfigFileName);
     }
     if (!mFailed) {
         if (fs::exists("Server.cfg")) {
-            beammp_warn("An old \"Server.cfg\" file still exists. Please note that this is no longer used. Instead, \"" + std::string(mConfigFileName) + "\" is used. You can safely delete the \"Server.cfg\".");
+            warn("An old \"Server.cfg\" file still exists. Please note that this is no longer used. Instead, \"" + std::string(ConfigFileName) + "\" is used. You can safely delete the \"Server.cfg\".");
         }
-        ParseFromFile(mConfigFileName);
+        ParseFromFile(ConfigFileName);
     }
 }
 
-template <typename CommentsT>
-void SetComment(CommentsT& Comments, const std::string& Comment) {
-    Comments.clear();
-    Comments.push_back(Comment);
-}
-
-/**
- * @brief Writes out the loaded application state into ServerConfig.toml
- *
- * This writes out the current state of application settings that are
- * applied to the server instance (i.e. the current application settings loaded in the server).
- * If the state of the application settings changes during runtime,
- * call this function whenever something about the config changes
- * whether it is in TConfig.cpp or the configuration file.
- */
-void TConfig::FlushToFile() {
-    auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
-    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"][StrDebug.data()] = Application::Settings.DebugModeEnabled;
-    data["General"][StrPrivate.data()] = Application::Settings.Private;
-    data["General"][StrPort.data()] = Application::Settings.Port;
-    data["General"][StrName.data()] = Application::Settings.ServerName;
-    data["General"][StrMaxCars.data()] = Application::Settings.MaxCars;
-    data["General"][StrMaxPlayers.data()] = Application::Settings.MaxPlayers;
-    data["General"][StrMap.data()] = Application::Settings.MapName;
-    data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
-    data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
-    data["General"][StrSendErrors.data()] = Application::Settings.SendErrors;
-    SetComment(data["General"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
-    data["General"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
-    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["HTTP"][StrSSLKeyPath.data()] = Application::Settings.SSLKeyPath;
-    data["HTTP"][StrSSLCertPath.data()] = Application::Settings.SSLCertPath;
-    data["HTTP"][StrHTTPServerPort.data()] = Application::Settings.HTTPServerPort;
-    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::Settings.HTTPServerUseSSL;
-    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"][StrHTTPServerEnabled.data()] = Application::Settings.HTTPServerEnabled;
-    SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
-    std::ofstream Stream(mConfigFileName);
-    Stream << data << std::flush;
+void WriteSendErrors(const std::string& name) {
+    std::ofstream CfgFile { name, std::ios::out | std::ios::app };
+    CfgFile << "# You can turn on/off the SendErrors message you get on startup here" << std::endl
+            << StrSendErrorsMessageEnabled << " = true" << std::endl
+            << "# If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`."
+            << std::endl
+            << StrSendErrors << " = true" << std::endl;
 }
 
 void TConfig::CreateConfigFile(std::string_view name) {
@@ -95,115 +52,138 @@ void TConfig::CreateConfigFile(std::string_view name) {
             ParseOldFormat();
         }
     } catch (const std::exception& e) {
-        beammp_error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
+        error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
     }
 
-    { // create file context
-        std::ofstream ofs(name.data());
-    }
+    toml::table tbl { {
 
-    FlushToFile();
+        { "General",
+            toml::table { {
 
-    size_t FileSize = fs::file_size(name);
-    std::fstream ofs { std::string(name), std::ios::in | std::ios::out };
+                { StrDebug, Application::Settings.DebugModeEnabled },
+                { StrPrivate, Application::Settings.Private },
+                { StrPort, Application::Settings.Port },
+                { StrMaxCars, Application::Settings.MaxCars },
+                { StrMaxPlayers, Application::Settings.MaxPlayers },
+                { StrMap, Application::Settings.MapName },
+                { StrName, Application::Settings.ServerName },
+                { StrDescription, Application::Settings.ServerDesc },
+                { StrResourceFolder, Application::Settings.Resource },
+                { StrAuthKey, Application::Settings.Key },
+                //{ StrSendErrors, Application::Settings.SendErrors },
+
+            } } },
+
+    } };
+    std::ofstream ofs { std::string(name) };
     if (ofs.good()) {
-        std::string Contents {};
-        Contents.resize(FileSize);
-        ofs.readsome(Contents.data(), FileSize);
-        ofs.seekp(0);
         ofs << "# This is the BeamMP-Server config file.\n"
                "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
                "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
-            << '\n'
-            << Contents;
-        beammp_error("There was no \"" + std::string(mConfigFileName) + "\" file (this is normal for the first time running the server), so one was generated for you. It was automatically filled with the settings from your Server.cfg, if you have one. Please open ServerConfig.toml and ensure your AuthKey and other settings are filled in and correct, then restart the server. The old Server.cfg file will no longer be used and causes a warning if it exists from now on.");
+            << '\n';
+        ofs << tbl << '\n';
+        error("There was no \"" + std::string(ConfigFileName) + "\" file (this is normal for the first time running the server), so one was generated for you. It was automatically filled with the settings from your Server.cfg, if you have one. Please open ServerConfig.toml and ensure your AuthKey and other settings are filled in and correct, then restart the server. The old Server.cfg file will no longer be used and causes a warning if it exists from now on.");
         mFailed = true;
         ofs.close();
+        WriteSendErrors(std::string(name));
     } else {
-        beammp_error("Couldn't create " + std::string(name) + ". Check permissions, try again, and contact support if it continues not to work.");
-        Application::SetSubsystemStatus("Config", Application::Status::Bad);
+        error("Couldn't create " + std::string(name) + ". Check permissions, try again, and contact support if it continues not to work.");
         mFailed = true;
     }
 }
 
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue) {
-    if (Table[Category.c_str()][Key.data()].is_string()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_string();
-    }
-}
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue) {
-    if (Table[Category.c_str()][Key.data()].is_boolean()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
-    }
-}
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue) {
-    if (Table[Category.c_str()][Key.data()].is_integer()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_integer();
-    }
-}
-
 void TConfig::ParseFromFile(std::string_view name) {
     try {
-        toml::value data = toml::parse<toml::preserve_comments>(name.data());
-        // GENERAL
-        TryReadValue(data, "General", StrDebug, Application::Settings.DebugModeEnabled);
-        TryReadValue(data, "General", StrPrivate, Application::Settings.Private);
-        TryReadValue(data, "General", StrPort, Application::Settings.Port);
-        TryReadValue(data, "General", StrMaxCars, Application::Settings.MaxCars);
-        TryReadValue(data, "General", StrMaxPlayers, Application::Settings.MaxPlayers);
-        TryReadValue(data, "General", StrMap, Application::Settings.MapName);
-        TryReadValue(data, "General", StrName, Application::Settings.ServerName);
-        TryReadValue(data, "General", StrDescription, Application::Settings.ServerDesc);
-        TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
-        TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
-        TryReadValue(data, "General", StrSendErrors, Application::Settings.SendErrors);
-        TryReadValue(data, "General", 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", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
-        TryReadValue(data, "HTTP", StrHTTPServerUseSSL, Application::Settings.HTTPServerUseSSL);
+        toml::table FullTable = toml::parse_file(name);
+        toml::table GeneralTable = *FullTable["General"].as_table();
+        if (auto val = GeneralTable[StrDebug].value<bool>(); val.has_value()) {
+            Application::Settings.DebugModeEnabled = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrDebug));
+        }
+        if (auto val = GeneralTable[StrPrivate].value<bool>(); val.has_value()) {
+            Application::Settings.Private = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrPrivate));
+        }
+        if (auto val = GeneralTable[StrPort].value<int>(); val.has_value()) {
+            Application::Settings.Port = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrPort));
+        }
+        if (auto val = GeneralTable[StrMaxCars].value<int>(); val.has_value()) {
+            Application::Settings.MaxCars = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrMaxCars));
+        }
+        if (auto val = GeneralTable[StrMaxPlayers].value<int>(); val.has_value()) {
+            Application::Settings.MaxPlayers = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrMaxPlayers));
+        }
+        if (auto val = GeneralTable[StrMap].value<std::string>(); val.has_value()) {
+            Application::Settings.MapName = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrMap));
+        }
+        if (auto val = GeneralTable[StrName].value<std::string>(); val.has_value()) {
+            Application::Settings.ServerName = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrName));
+        }
+        if (auto val = GeneralTable[StrDescription].value<std::string>(); val.has_value()) {
+            Application::Settings.ServerDesc = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrDescription));
+        }
+        if (auto val = GeneralTable[StrResourceFolder].value<std::string>(); val.has_value()) {
+            Application::Settings.Resource = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrResourceFolder));
+        }
+        if (auto val = GeneralTable[StrAuthKey].value<std::string>(); val.has_value()) {
+            Application::Settings.Key = val.value();
+        } else {
+            throw std::runtime_error(std::string(StrAuthKey));
+        }
+        // added later, so behaves differently
+        if (auto val = GeneralTable[StrSendErrors].value<bool>(); val.has_value()) {
+            Application::Settings.SendErrors = val.value();
+        } else {
+            // dont throw, instead write it into the file and use default
+            WriteSendErrors(std::string(name));
+        }
+        if (auto val = GeneralTable[StrSendErrorsMessageEnabled].value<bool>(); val.has_value()) {
+            Application::Settings.SendErrorsMessageEnabled = val.value();
+        } else {
+            // no idea what to do here, ignore...?
+            // this entire toml parser sucks and is replaced in the upcoming lua.
+        }
     } catch (const std::exception& err) {
-        beammp_error("Error parsing config file value: " + std::string(err.what()));
+        error("Error parsing config file value: " + std::string(err.what()));
         mFailed = true;
-        Application::SetSubsystemStatus("Config", Application::Status::Bad);
         return;
     }
     PrintDebug();
-
-    // Update in any case
-    FlushToFile();
     // all good so far, let's check if there's a key
     if (Application::Settings.Key.empty()) {
-        beammp_error("No AuthKey specified in the \"" + std::string(mConfigFileName) + "\" file. Please get an AuthKey, enter it into the config file, and restart this server.");
-        Application::SetSubsystemStatus("Config", Application::Status::Bad);
+        error("No AuthKey specified in the \"" + std::string(ConfigFileName) + "\" file. Please get an AuthKey, enter it into the config file, and restart this server.");
         mFailed = true;
-        return;
-    }
-    Application::SetSubsystemStatus("Config", Application::Status::Good);
-    if (Application::Settings.Key.size() != 36) {
-        beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
     }
 }
 
 void TConfig::PrintDebug() {
-    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
-    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
-    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
-    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
-    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
-    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
-    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
-    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
-    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
-    beammp_debug(std::string(StrSSLKeyPath) + ": \"" + Application::Settings.SSLKeyPath + "\"");
-    beammp_debug(std::string(StrSSLCertPath) + ": \"" + Application::Settings.SSLCertPath + "\"");
-    beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
+    debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
+    debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
+    debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
+    debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
+    debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
+    debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
+    debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
+    debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
+    debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
     // special!
-    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
+    debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
 }
 
 void TConfig::ParseOldFormat() {
@@ -253,7 +233,7 @@ void TConfig::ParseOldFormat() {
         } else if (Key == "AuthKey") {
             Application::Settings.Key = Value.substr(1, Value.size() - 3);
         } else {
-            beammp_warn("unknown key in old auth file (ignored): " + Key);
+            warn("unknown key in old auth file (ignored): " + Key);
         }
         Str >> std::ws;
     }

src/TConsole.cpp

@@ -2,421 +2,65 @@
 #include "Common.h"
 #include "Compat.h"
 
-#include "Client.h"
-#include "CustomAssert.h"
-#include "LuaAPI.h"
-#include "TLuaEngine.h"
-
 #include <ctime>
 #include <sstream>
 
-static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
-    return What.size() >= StartsWith.size() && What.substr(0, StartsWith.size()) == StartsWith;
-}
-
-static inline std::string TrimString(std::string S) {
-    S.erase(S.begin(), std::find_if(S.begin(), S.end(), [](unsigned char ch) {
-        return !std::isspace(ch);
-    }));
-    S.erase(std::find_if(S.rbegin(), S.rend(), [](unsigned char ch) {
-        return !std::isspace(ch);
-    }).base(),
-        S.end());
-    return S;
-}
-
 std::string GetDate() {
     std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
     time_t tt = std::chrono::system_clock::to_time_t(now);
-    auto local_tm = std::localtime(&tt);
-    char buf[30];
-    std::string date;
-    if (Application::Settings.DebugModeEnabled) {
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T.", local_tm);
-        date += buf;
-        auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
-        auto fraction = now - seconds;
-        size_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(fraction).count();
-        char fracstr[5];
-        std::sprintf(fracstr, "%03lu", ms);
-        date += fracstr;
-        date += "] ";
-    } else {
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T] ", local_tm);
-        date += buf;
+    tm local_tm {};
+#ifdef WIN32
+    localtime_s(&local_tm, &tt);
+#else // unix
+    localtime_r(&tt, &local_tm);
+#endif // WIN32
+    std::stringstream date;
+    int S = local_tm.tm_sec;
+    int M = local_tm.tm_min;
+    int H = local_tm.tm_hour;
+    std::string Secs = (S > 9 ? std::to_string(S) : "0" + std::to_string(S));
+    std::string Min = (M > 9 ? std::to_string(M) : "0" + std::to_string(M));
+    std::string Hour = (H > 9 ? std::to_string(H) : "0" + std::to_string(H));
+    date
+        << "["
+        << local_tm.tm_mday << "/"
+        << local_tm.tm_mon + 1 << "/"
+        << local_tm.tm_year + 1900 << " "
+        << Hour << ":"
+        << Min << ":"
+        << Secs
+        << "] ";
+    /* TODO
+    if (Debug) {
+        date << ThreadName()
+             << " ";
     }
-
-    return date;
-}
-
-void TConsole::BackupOldLog() {
-    fs::path Path = "Server.log";
-    if (fs::exists(Path)) {
-        auto OldLog = Path.filename().stem().string() + ".old.log";
-        try {
-            fs::rename(Path, OldLog);
-            beammp_debug("renamed old log file to '" + OldLog + "'");
-        } catch (const std::exception& e) {
-            beammp_warn(e.what());
-        }
-        /*
-        int err = 0;
-        zip* z = zip_open("ServerLogs.zip", ZIP_CREATE, &err);
-        if (!z) {
-            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
-            return;
-        }
-        FILE* File = std::fopen(Path.string().c_str(), "r");
-        if (!File) {
-            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
-            return;
-        }
-        std::vector<uint8_t> Buffer;
-        Buffer.resize(fs::file_size(Path));
-        std::fread(Buffer.data(), 1, Buffer.size(), File);
-        std::fclose(File);
-
-        auto s = zip_source_buffer(z, Buffer.data(), Buffer.size(), 0);
-
-        auto TimePoint = fs::last_write_time(Path);
-        auto Secs = TimePoint.time_since_epoch().count();
-        auto MyTimeT = std::time(&Secs);
-
-        std::string NewName = Path.stem().string();
-        NewName += "_";
-        std::string Time;
-        Time.resize(32);
-        size_t n = strftime(Time.data(), Time.size(), "%F_%H.%M.%S", localtime(&MyTimeT));
-        Time.resize(n);
-        NewName += Time;
-        NewName += ".log";
-
-        zip_file_add(z, NewName.c_str(), s, 0);
-        zip_close(z);
     */
-    }
-}
-
-void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
-    if (!mIsLuaConsole) {
-        if (!mLuaEngine) {
-            beammp_error("Lua engine not initialized yet, please wait and try again");
-            return;
-        }
-        mLuaEngine->EnsureStateExists(mDefaultStateId, "Console");
-        mStateId = LuaStateId;
-        mIsLuaConsole = true;
-        if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Entered Lua console for state '" + mStateId + "'. To exit, type `exit()`");
-            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
-        } else {
-            Application::Console().WriteRaw("Entered Lua console. To exit, type `exit()`");
-            mCommandline.set_prompt("lua> ");
-        }
-        mCachedRegularHistory = mCommandline.history();
-        mCommandline.set_history(mCachedLuaHistory);
-    }
-}
-
-void TConsole::ChangeToRegularConsole() {
-    if (mIsLuaConsole) {
-        mIsLuaConsole = false;
-        if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Left Lua console for state '" + mStateId + "'.");
-        } else {
-            Application::Console().WriteRaw("Left Lua console.");
-        }
-        mCachedLuaHistory = mCommandline.history();
-        mCommandline.set_history(mCachedRegularHistory);
-        mCommandline.set_prompt("> ");
-        mStateId = mDefaultStateId;
-    }
-}
-
-void TConsole::Command_Lua(const std::string& cmd) {
-    if (cmd.size() > 3) {
-        auto NewStateId = cmd.substr(4);
-        beammp_assert(!NewStateId.empty());
-        if (mLuaEngine->HasState(NewStateId)) {
-            ChangeToLuaConsole(NewStateId);
-        } else {
-            Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
-        }
-    } else {
-        ChangeToLuaConsole(mDefaultStateId);
-    }
-}
-
-void TConsole::Command_Help(const std::string&) {
-    static constexpr const char* sHelpString = R"(
-    Commands:
-        help                    displays this help
-        exit                    shuts down the server
-        kick <name> [reason]    kicks specified player with an optional reason
-        list                    lists all players and info about them
-        say <message>           sends the message to all players in chat
-        lua [state id]          switches to lua, optionally into a specific state id's lua
-        status                  how the server is doing and what it's up to)";
-    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
-}
-
-void TConsole::Command_Kick(const std::string& cmd) {
-    if (cmd.size() > 4) {
-        auto Name = cmd.substr(5);
-        std::string Reason = "Kicked by server console";
-        auto SpacePos = Name.find(' ');
-        if (SpacePos != Name.npos) {
-            Reason = Name.substr(SpacePos + 1);
-            Name = cmd.substr(5, cmd.size() - Reason.size() - 5 - 1);
-        }
-        beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
-        bool Kicked = false;
-        auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-            std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
-            std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
-            return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
-        };
-        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-            if (!Client.expired()) {
-                auto locked = Client.lock();
-                if (NameCompare(locked->GetName(), Name)) {
-                    mLuaEngine->Network().ClientKick(*locked, Reason);
-                    Kicked = true;
-                    return false;
-                }
-            }
-            return true;
-        });
-        if (!Kicked) {
-            Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
-        } else {
-            Application::Console().WriteRaw("Kicked player '" + Name + "' for reason: '" + Reason + "'.");
-        }
-    }
-}
-
-void TConsole::Command_Say(const std::string& cmd) {
-    if (cmd.size() > 3) {
-        auto Message = cmd.substr(4);
-        LuaAPI::MP::SendChatMessage(-1, Message);
-    }
-}
-
-void TConsole::Command_List(const std::string&) {
-    if (mLuaEngine->Server().ClientCount() == 0) {
-        Application::Console().WriteRaw("No players online.");
-    } else {
-        std::stringstream ss;
-        ss << std::left << std::setw(25) << "Name" << std::setw(6) << "ID" << std::setw(6) << "Cars" << std::endl;
-        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-            if (!Client.expired()) {
-                auto locked = Client.lock();
-                ss << std::left << std::setw(25) << locked->GetName()
-                   << std::setw(6) << locked->GetID()
-                   << std::setw(6) << locked->GetCarCount() << "\n";
-            }
-            return true;
-        });
-        auto Str = ss.str();
-        Application::Console().WriteRaw(Str.substr(0, Str.size() - 1));
-    }
-}
-
-void TConsole::Command_Status(const std::string&) {
-    std::stringstream Status;
-
-    size_t CarCount = 0;
-    size_t ConnectedCount = 0;
-    size_t GuestCount = 0;
-    size_t SyncedCount = 0;
-    size_t SyncingCount = 0;
-    size_t MissedPacketQueueSum = 0;
-    int LargestSecondsSinceLastPing = 0;
-    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-        if (!Client.expired()) {
-            auto Locked = Client.lock();
-            CarCount += Locked->GetCarCount();
-            ConnectedCount += Locked->IsConnected() ? 1 : 0;
-            GuestCount += Locked->IsGuest() ? 1 : 0;
-            SyncedCount += Locked->IsSynced() ? 1 : 0;
-            SyncingCount += Locked->IsSyncing() ? 1 : 0;
-            MissedPacketQueueSum += Locked->MissedPacketQueueSize();
-            if (Locked->SecondsSinceLastPing() < LargestSecondsSinceLastPing) {
-                LargestSecondsSinceLastPing = Locked->SecondsSinceLastPing();
-            }
-        }
-        return true;
-    });
-
-    size_t SystemsStarting = 0;
-    size_t SystemsGood = 0;
-    size_t SystemsBad = 0;
-    size_t SystemsShuttingDown = 0;
-    size_t SystemsShutdown = 0;
-    std::string SystemsBadList {};
-    std::string SystemsGoodList {};
-    std::string SystemsStartingList {};
-    std::string SystemsShuttingDownList {};
-    std::string SystemsShutdownList {};
-    auto Statuses = Application::GetSubsystemStatuses();
-    for (const auto& NameStatusPair : Statuses) {
-        switch (NameStatusPair.second) {
-        case Application::Status::Good:
-            SystemsGood++;
-            SystemsGoodList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::Bad:
-            SystemsBad++;
-            SystemsBadList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::Starting:
-            SystemsStarting++;
-            SystemsStartingList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::ShuttingDown:
-            SystemsShuttingDown++;
-            SystemsShuttingDownList += NameStatusPair.first + ", ";
-            break;
-        case Application::Status::Shutdown:
-            SystemsShutdown++;
-            SystemsShutdownList += NameStatusPair.first + ", ";
-            break;
-        }
-    }
-    // remove ", " at the end
-    SystemsBadList = SystemsBadList.substr(0, SystemsBadList.size() - 2);
-    SystemsGoodList = SystemsGoodList.substr(0, SystemsGoodList.size() - 2);
-    SystemsStartingList = SystemsStartingList.substr(0, SystemsStartingList.size() - 2);
-    SystemsShuttingDownList = SystemsShuttingDownList.substr(0, SystemsShuttingDownList.size() - 2);
-    SystemsShutdownList = SystemsShutdownList.substr(0, SystemsShutdownList.size() - 2);
-
-    auto ElapsedTime = mLuaEngine->Server().UptimeTimer.GetElapsedTime();
-
-    Status << "BeamMP-Server Status:\n"
-           << "\tTotal Players:             " << mLuaEngine->Server().ClientCount() << "\n"
-           << "\tSyncing Players:           " << SyncingCount << "\n"
-           << "\tSynced Players:            " << SyncedCount << "\n"
-           << "\tConnected Players:         " << ConnectedCount << "\n"
-           << "\tGuests:                    " << GuestCount << "\n"
-           << "\tCars:                      " << CarCount << "\n"
-           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(ElapsedTime / 1000.0 / 60.0 / 60.0) << "h) \n"
-           << "\tLua:\n"
-           << "\t\tQueued results to check:     " << mLuaEngine->GetResultsToCheckSize() << "\n"
-           << "\t\tStates:                      " << mLuaEngine->GetLuaStateCount() << "\n"
-           << "\t\tEvent timers:                " << mLuaEngine->GetTimedEventsCount() << "\n"
-           << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
-           << "\tSubsystems:\n"
-           << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
-           << "\t\tShutting down/Shutdown:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
-           << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
-           << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
-           << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
-           << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShutdown:                    [ " << SystemsShutdownList << " ]\n"
-           << "";
-
-    Application::Console().WriteRaw(Status.str());
-}
-
-void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
-    auto FutureIsNonNil =
-        [](const std::shared_ptr<TLuaResult>& Future) {
-            if (!Future->Error && Future->Result.valid()) {
-                auto Type = Future->Result.get_type();
-                return Type != sol::type::lua_nil && Type != sol::type::none;
-            }
-            return false;
-        };
-    std::vector<std::shared_ptr<TLuaResult>> NonNilFutures;
-    { // Futures scope
-        auto Futures = mLuaEngine->TriggerEvent("onConsoleInput", "", cmd);
-        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
-        size_t Count = 0;
-        for (auto& Future : Futures) {
-            if (!Future->Error) {
-                ++Count;
-            }
-        }
-        for (const auto& Future : Futures) {
-            if (FutureIsNonNil(Future)) {
-                NonNilFutures.push_back(Future);
-            }
-        }
-    }
-    if (NonNilFutures.size() == 0) {
-        if (!IgnoreNotACommand) {
-            Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");
-        }
-    } else {
-        std::stringstream Reply;
-        if (NonNilFutures.size() > 1) {
-            for (size_t i = 0; i < NonNilFutures.size(); ++i) {
-                Reply << NonNilFutures[i]->StateId << ": \n"
-                      << LuaAPI::LuaToString(NonNilFutures[i]->Result);
-                if (i < NonNilFutures.size() - 1) {
-                    Reply << "\n";
-                }
-            }
-        } else {
-            Reply << LuaAPI::LuaToString(NonNilFutures[0]->Result);
-        }
-        Application::Console().WriteRaw(Reply.str());
-    }
+    return date.str();
 }
 
 TConsole::TConsole() {
     mCommandline.enable_history();
     mCommandline.set_history_limit(20);
     mCommandline.set_prompt("> ");
-    BackupOldLog();
+    bool success = mCommandline.enable_write_to_file("Server.log");
+    if (!success) {
+        error("unable to open file for writing: \"Server.log\"");
+    }
     mCommandline.on_command = [this](Commandline& c) {
-        try {
-            auto cmd = c.get_command();
-            cmd = TrimString(cmd);
-            mCommandline.write(mCommandline.prompt() + cmd);
-            if (mIsLuaConsole) {
-                if (!mLuaEngine) {
-                    beammp_info("Lua not started yet, please try again in a second");
-                } else if (cmd == "exit()") {
-                    ChangeToRegularConsole();
-                } else {
-                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(cmd), "", "" });
-                    while (!Future->Ready) {
-                        std::this_thread::yield(); // TODO: Add a timeout
-                    }
-                    if (Future->Error) {
-                        beammp_lua_error(Future->ErrorMessage);
-                    }
-                }
+        auto cmd = c.get_command();
+        mCommandline.write("> " + cmd);
+        if (cmd == "exit") {
+            info("gracefully shutting down");
+            Application::GracefullyShutdown();
+        } else if (cmd == "clear" || cmd == "cls") {
+            // TODO: clear screen
+        } else {
+            if (mLuaConsole) {
+                mLuaConsole->Execute(cmd);
             } else {
-                if (!mLuaEngine) {
-                    beammp_error("Attempted to run a command before Lua engine started. Please wait and try again.");
-                } else if (cmd == "exit") {
-                    beammp_info("gracefully shutting down");
-                    Application::GracefullyShutdown();
-                } else if (StringStartsWith(cmd, "lua")) {
-                    Command_Lua(cmd);
-                } else if (StringStartsWith(cmd, "help")) {
-                    RunAsCommand(cmd, true);
-                    Command_Help(cmd);
-                } else if (StringStartsWith(cmd, "kick")) {
-                    RunAsCommand(cmd, true);
-                    Command_Kick(cmd);
-                } else if (StringStartsWith(cmd, "say")) {
-                    RunAsCommand(cmd, true);
-                    Command_Say(cmd);
-                } else if (StringStartsWith(cmd, "list")) {
-                    RunAsCommand(cmd, true);
-                    Command_List(cmd);
-                } else if (StringStartsWith(cmd, "status")) {
-                    RunAsCommand(cmd, true);
-                    Command_Status(cmd);
-                } else if (!cmd.empty()) {
-                    RunAsCommand(cmd);
-                }
+                error("Lua subsystem not yet initialized, please wait a few seconds and try again");
             }
-        } 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.");
         }
     };
 }
@@ -424,12 +68,11 @@ TConsole::TConsole() {
 void TConsole::Write(const std::string& str) {
     auto ToWrite = GetDate() + str;
     mCommandline.write(ToWrite);
+    // TODO write to logfile, too
+}
+void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
+    mLuaConsole = std::make_unique<TLuaFile>(Engine, true);
 }
-
 void TConsole::WriteRaw(const std::string& str) {
     mCommandline.write(str);
 }
-
-void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
-    mLuaEngine = &Engine;
-}

src/THeartbeatThread.cpp

@@ -30,40 +30,41 @@ void THeartbeatThread::operator()() {
             std::this_thread::sleep_for(std::chrono::milliseconds(100));
             continue;
         }
-        beammp_debug("heartbeat (after " + std::to_string(std::chrono::duration_cast<std::chrono::seconds>(TimePassed).count()) + "s)");
+        debug("heartbeat (after " + std::to_string(std::chrono::duration_cast<std::chrono::seconds>(TimePassed).count()) + "s)");
 
         Last = Body;
         LastNormalUpdateTime = Now;
-        if (!Application::Settings.CustomIP.empty()) {
+        if (!Application::Settings.CustomIP.empty())
             Body += "&ip=" + Application::Settings.CustomIP;
-        }
 
         Body += "&pps=" + Application::PPS();
 
-        beammp_trace("heartbeat body: '" + Body + "'");
-
         auto SentryReportError = [&](const std::string& transaction, int status) {
             auto Lock = Sentry.CreateExclusiveContext();
             Sentry.SetContext("heartbeat",
                 { { "response-body", T },
                     { "request-body", Body } });
             Sentry.SetTransaction(transaction);
-            beammp_trace("sending log to sentry: " + std::to_string(status) + " for " + transaction);
             Sentry.Log(SentryLevel::Error, "default", Http::Status::ToString(status) + " (" + std::to_string(status) + ")");
         };
 
         auto Target = "/heartbeat";
-        unsigned int ResponseCode = 0;
+        int ResponseCode = -1;
+        const std::vector<std::string> Urls = {
+            Application::GetBackendHostname(),
+            Application::GetBackup1Hostname(),
+            Application::GetBackup2Hostname(),
+        };
 
         json::Document Doc;
         bool Ok = false;
-        for (const auto& Url : Application::GetBackendUrlsInOrder()) {
-            T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
-            beammp_trace(T);
+        for (const auto& Url : Urls) {
+            T = Http::POST(Url, Target, { { "api-v", "2" } }, Body, false, &ResponseCode);
+            trace(T);
             Doc.Parse(T.data(), T.size());
             if (Doc.HasParseError() || !Doc.IsObject()) {
-                beammp_error("Backend response failed to parse as valid json");
-                beammp_debug("Response was: `" + T + "`");
+                error("Backend response failed to parse as valid json");
+                debug("Response was: `" + T + "`");
                 Sentry.SetContext("JSON Response", { { "reponse", T } });
                 SentryReportError(Url + Target, ResponseCode);
             } else if (ResponseCode != 200) {
@@ -102,28 +103,25 @@ void THeartbeatThread::operator()() {
                 Ok = false;
             }
             if (!Ok) {
-                beammp_error("Missing/invalid json members in backend response");
+                error("Missing/invalid json members in backend response");
                 Sentry.LogError("Missing/invalid json members in backend response", __FILE__, std::to_string(__LINE__));
             }
         }
 
         if (Ok && !isAuth) {
             if (Status == "2000") {
-                beammp_info(("Authenticated!"));
+                info(("Authenticated!"));
                 isAuth = true;
             } else if (Status == "200") {
-                beammp_info(("Resumed authenticated session!"));
+                info(("Resumed authenticated session!"));
                 isAuth = true;
             } else {
                 if (Message.empty()) {
                     Message = "Backend didn't provide a reason";
                 }
-                beammp_error("Backend REFUSED the auth key. " + Message);
+                error("Backend REFUSED the auth key. " + Message);
             }
         }
-        if (isAuth) {
-            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
-        }
     }
 }
 
@@ -136,8 +134,8 @@ std::string THeartbeatThread::GenerateCall() {
         << "&port=" << Application::Settings.Port
         << "&map=" << Application::Settings.MapName
         << "&private=" << (Application::Settings.Private ? "true" : "false")
-        << "&version=" << Application::ServerVersionString()
-        << "&clientversion=" << Application::ClientVersionString()
+        << "&version=" << Application::ServerVersion()
+        << "&clientversion=" << Application::ClientVersion()
         << "&name=" << Application::Settings.ServerName
         << "&modlist=" << mResourceManager.TrimmedList()
         << "&modstotalsize=" << mResourceManager.MaxModSize()
@@ -149,14 +147,11 @@ std::string THeartbeatThread::GenerateCall() {
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
     : mResourceManager(ResourceManager)
     , mServer(Server) {
-    Application::SetSubsystemStatus("Heartbeat", Application::Status::Starting);
     Application::RegisterShutdownHandler([&] {
-        Application::SetSubsystemStatus("Heartbeat", Application::Status::ShuttingDown);
         if (mThread.joinable()) {
             mShutdown = true;
             mThread.join();
         }
-        Application::SetSubsystemStatus("Heartbeat", Application::Status::Shutdown);
     });
     Start();
 }

src/TLuaEngine.cpp

@@ -1,781 +1,111 @@
 #include "TLuaEngine.h"
-#include "Client.h"
-#include "CustomAssert.h"
-#include "Http.h"
-#include "LuaAPI.h"
-#include "TLuaPlugin.h"
+#include "TLuaFile.h"
 
-#include <chrono>
-#include <condition_variable>
-#include <httplib.h>
-#include <random>
-#include <thread>
-#include <tuple>
+#include <filesystem>
+#include <sys/stat.h>
 
-TLuaEngine* LuaAPI::MP::Engine;
+namespace fs = std::filesystem;
 
-TLuaEngine::TLuaEngine()
-    : mPluginMonitor(fs::path(Application::Settings.Resource) / "Server", *this, mShutdown) {
-    Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
-    LuaAPI::MP::Engine = this;
+// necessary as lua relies on global state
+TLuaEngine* TheEngine;
+
+TLuaEngine::TLuaEngine(TServer& Server, TNetwork& Network)
+    : mNetwork(Network)
+    , mServer(Server) {
+    TheEngine = this;
     if (!fs::exists(Application::Settings.Resource)) {
         fs::create_directory(Application::Settings.Resource);
     }
-    fs::path Path = fs::path(Application::Settings.Resource) / "Server";
+    std::string Path = Application::Settings.Resource + ("/Server");
     if (!fs::exists(Path)) {
         fs::create_directory(Path);
     }
-    mResourceServerPath = Path;
-    Application::RegisterShutdownHandler([&] {
-        Application::SetSubsystemStatus("LuaEngine", Application::Status::ShuttingDown);
+    FolderList(Path, false);
+    mPath = Path;
+    Application::RegisterShutdownHandler([&] {if (mThread.joinable()) {
         mShutdown = true;
-        if (mThread.joinable()) {
-            mThread.join();
-        }
-        Application::SetSubsystemStatus("LuaEngine", Application::Status::Shutdown);
-    });
+        mThread.join();
+    } });
     Start();
 }
 
 void TLuaEngine::operator()() {
     RegisterThread("LuaEngine");
-    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
-    // lua engine main thread
-    CollectAndInitPlugins();
-    // now call all onInit's
-    auto Futures = TriggerEvent("onInit", "");
-    WaitForAll(Futures);
-    for (const auto& Future : Futures) {
-        if (Future->Error && Future->ErrorMessage != BeamMPFnNotFoundError) {
-            beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage);
-        }
-    }
-
-    auto ResultCheckThread = std::thread([&] {
-        RegisterThread("ResultCheckThread");
-        while (!mShutdown) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-            std::unique_lock Lock(mResultsToCheckMutex);
-            if (!mResultsToCheck.empty()) {
-                auto Res = mResultsToCheck.front();
-                mResultsToCheck.pop();
-                Lock.unlock();
-
-                if (!Res->Ready) {
-                    Lock.lock();
-                    mResultsToCheck.push(Res);
-                    Lock.unlock();
-                }
-                if (Res->Error) {
-                    if (Res->ErrorMessage != BeamMPFnNotFoundError) {
-                        beammp_lua_error(Res->Function + ": " + Res->ErrorMessage);
-                    }
-                }
-            }
-            std::this_thread::yield();
-        }
-    });
-    // event loop
-    auto Before = std::chrono::high_resolution_clock::now();
+    info("Lua system online");
     while (!mShutdown) {
-        if (mLuaStates.size() == 0) {
-            std::this_thread::sleep_for(std::chrono::seconds(100));
-        }
-        { // Timed Events Scope
-            std::unique_lock Lock(mTimedEventsMutex);
-            for (auto& Timer : mTimedEvents) {
-                if (Timer.Expired()) {
-                    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, {});
-                        mResultsToCheck.push(Res);
-                    }
+        if (!mLuaFiles.empty()) {
+            for (auto& Script : mLuaFiles) {
+                struct stat Info { };
+                if (stat(Script->GetFileName().c_str(), &Info) != 0) {
+                    Script->SetStopThread(true);
+                    mLuaFiles.erase(Script);
+                    info(("[HOTSWAP] Removed removed script due to delete"));
+                    break;
+                }
+                if (Script->GetLastWrite() != fs::last_write_time(Script->GetFileName())) {
+                    Script->SetStopThread(true);
+                    info(("[HOTSWAP] Updated Scripts due to edit"));
+                    Script->SetLastWrite(fs::last_write_time(Script->GetFileName()));
+                    Script->Reload();
                 }
             }
         }
-        std::chrono::high_resolution_clock::duration Diff;
-        if ((Diff = std::chrono::high_resolution_clock::now() - Before)
-            < std::chrono::milliseconds(10)) {
-            std::this_thread::sleep_for(Diff);
-        } else {
-            beammp_trace("Event loop cannot keep up! Running " + std::to_string(Diff.count()) + "s behind");
-        }
-        Before = std::chrono::high_resolution_clock::now();
-    }
-
-    if (ResultCheckThread.joinable()) {
-        ResultCheckThread.join();
+        FolderList(mPath, true);
+        std::this_thread::sleep_for(std::chrono::seconds(2));
     }
 }
 
-size_t TLuaEngine::CalculateMemoryUsage() {
-    size_t Usage = 0;
-    std::unique_lock Lock(mLuaStatesMutex);
-    for (auto& State : mLuaStates) {
-        Usage += State.second->State().memory_used();
+std::optional<std::reference_wrapper<TLuaFile>> TLuaEngine::GetScript(lua_State* L) {
+    for (auto& Script : mLuaFiles) {
+        if (Script->GetState() == L)
+            return *Script;
     }
-    return Usage;
+    return std::nullopt;
 }
 
-sol::state_view TLuaEngine::GetStateForPlugin(const fs::path& PluginPath) {
-    for (const auto& Plugin : mLuaPlugins) {
-        if (fs::equivalent(Plugin->GetFolder(), PluginPath)) {
-            std::unique_lock Lock(mLuaStatesMutex);
-            return mLuaStates.at(Plugin->GetConfig().StateId)->State();
-        }
-    }
-    beammp_assert_not_reachable();
-    return mLuaStates.begin()->second->State();
-}
-
-TLuaStateId TLuaEngine::GetStateIDForPlugin(const fs::path& PluginPath) {
-    for (const auto& Plugin : mLuaPlugins) {
-        if (fs::equivalent(Plugin->GetFolder(), PluginPath)) {
-            std::unique_lock Lock(mLuaStatesMutex);
-            return Plugin->GetConfig().StateId;
-        }
-    }
-    beammp_assert_not_reachable();
-    return "";
-}
-
-void TLuaEngine::AddResultToCheck(const std::shared_ptr<TLuaResult>& Result) {
-    std::unique_lock Lock(mResultsToCheckMutex);
-    mResultsToCheck.push(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;
-        while (!Result->Ready && !Cancelled) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-            ms += 10;
-            if (Max.has_value() && std::chrono::milliseconds(ms) > Max.value()) {
-                beammp_trace("'" + Result->Function + "' in '" + Result->StateId + "' did not finish executing in time (took: " + std::to_string(ms) + "ms)");
-                Cancelled = true;
-            }
-        }
-        if (Cancelled) {
-            beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
-            LuaAPI::MP::Engine->ReportErrors({ Result });
-        } else if (Result->Error) {
-            if (Result->ErrorMessage != BeamMPFnNotFoundError) {
-                beammp_lua_error(Result->Function + ": " + Result->ErrorMessage);
-            }
+void TLuaEngine::FolderList(const std::string& Path, bool HotSwap) {
+    auto Lock = std::unique_lock(mListMutex);
+    for (const auto& entry : fs::directory_iterator(Path)) {
+        if (fs::is_directory(entry)) {
+            RegisterFiles(entry.path(), HotSwap);
         }
     }
 }
 
-// run this on the error checking thread
-void TLuaEngine::ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results) {
-    std::unique_lock Lock2(mResultsToCheckMutex);
-    for (const auto& Result : Results) {
-        mResultsToCheck.push(Result);
-    }
-}
-
-bool TLuaEngine::HasState(TLuaStateId StateId) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.find(StateId) != mLuaStates.end();
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.at(StateID)->EnqueueScript(Script);
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
-}
-
-void TLuaEngine::CollectAndInitPlugins() {
-    for (const auto& Dir : fs::directory_iterator(mResourceServerPath)) {
-        auto Path = Dir.path();
-        Path = fs::relative(Path);
-        if (!Dir.is_directory()) {
-            beammp_error("\"" + Dir.path().string() + "\" is not a directory, skipping");
-        } else {
-            TLuaPluginConfig Config { Path.stem().string() };
-            FindAndParseConfig(Path, Config);
-            InitializePlugin(Path, Config);
+void TLuaEngine::RegisterFiles(const fs::path& Path, bool HotSwap) {
+    std::string Name = Path.filename().string();
+    if (!HotSwap)
+        info(("Loading plugin : ") + Name);
+    std::vector<fs::path> Entries;
+    for (const auto& entry : fs::directory_iterator(Path)) {
+        if (entry.path().extension() == ".lua") {
+            Entries.push_back(entry);
         }
     }
-}
-
-void TLuaEngine::InitializePlugin(const fs::path& Folder, const TLuaPluginConfig& Config) {
-    beammp_assert(fs::exists(Folder));
-    beammp_assert(fs::is_directory(Folder));
-    std::unique_lock Lock(mLuaStatesMutex);
-    EnsureStateExists(Config.StateId, Folder.stem().string(), true);
-    mLuaStates[Config.StateId]->AddPath(Folder); // add to cpath + path
-    Lock.unlock();
-    auto Plugin = std::make_shared<TLuaPlugin>(*this, Config, Folder);
-    mLuaPlugins.emplace_back(std::move(Plugin));
-}
-
-void TLuaEngine::FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config) {
-    auto ConfigFile = Folder / TLuaPluginConfig::FileName;
-    if (fs::exists(ConfigFile) && fs::is_regular_file(ConfigFile)) {
-        try {
-            auto Data = toml::parse(ConfigFile);
-            if (Data.contains("LuaStateID")) {
-                auto ID = toml::find<std::string>(Data, "LuaStateID");
-                if (!ID.empty()) {
-                    beammp_debug("Plugin \"" + Folder.string() + "\" specified it wants LuaStateID \"" + ID + "\"");
-                    Config.StateId = ID;
-                } else {
-                    beammp_debug("LuaStateID empty, using plugin name");
-                }
-            }
-        } catch (const std::exception& e) {
-            beammp_error(Folder.string() + ": " + e.what());
-        }
-    }
-}
-
-void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit) {
-    beammp_assert(!StateId.empty());
-    std::unique_lock Lock(mLuaStatesMutex);
-    if (mLuaStates.find(StateId) == mLuaStates.end()) {
-        beammp_debug("Creating lua state for state id \"" + StateId + "\"");
-        auto DataPtr = std::make_unique<StateThreadData>(Name, mShutdown, StateId, *this);
-        mLuaStates[StateId] = std::move(DataPtr);
-        RegisterEvent("onInit", StateId, "onInit");
-        if (!DontCallOnInit) {
-            auto Res = EnqueueFunctionCall(StateId, "onInit", {});
-            Res->WaitUntilReady();
-            if (Res->Error && Res->ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
-                beammp_lua_error("Calling \"onInit\" on \"" + StateId + "\" failed: " + Res->ErrorMessage);
-            }
-        }
-    }
-}
-
-void TLuaEngine::RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName) {
-    std::unique_lock Lock(mLuaEventsMutex);
-    mLuaEvents[EventName][StateId].insert(FunctionName);
-}
-
-std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& EventName, TLuaStateId StateId) {
-    return mLuaEvents[EventName][StateId];
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
-    auto Return = mEngine->TriggerEvent(EventName, mStateId, EventArgs);
-    // TODO Synchronous call to the event handlers
-    auto MyHandlers = mEngine->GetEventHandlersForState(EventName, mStateId);
-    for (const auto& Handler : MyHandlers) {
-        auto Fn = mStateView[Handler];
-        if (Fn.valid()) {
-            auto LuaResult = Fn(EventArgs);
-            auto Result = std::make_shared<TLuaResult>();
-            Result->Ready = true;
-            if (LuaResult.valid()) {
-                Result->Error = false;
-                Result->Result = LuaResult;
-            } else {
-                Result->Error = true;
-                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
-            }
-            Return.push_back(Result);
-        }
-    }
-    sol::state_view StateView(mState);
-    sol::table AsyncEventReturn = StateView.create_table();
-    AsyncEventReturn["ReturnValueImpl"] = Return;
-    AsyncEventReturn.set_function("IsDone",
-        [&](const sol::table& Self) -> bool {
-            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
-            for (const auto& Value : Vector) {
-                if (!Value->Ready) {
-                    return false;
-                }
-            }
-            return true;
-        });
-    AsyncEventReturn.set_function("GetResults",
-        [&](const sol::table& Self) -> sol::table {
-            sol::state_view StateView(mState);
-            sol::table Result = StateView.create_table();
-            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
-            for (const auto& Value : Vector) {
-                if (!Value->Ready) {
-                    return sol::lua_nil;
-                }
-                Result.add(Value->Result);
-            }
-            return Result;
-        });
-    return AsyncEventReturn;
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
-    // TODO: make asynchronous?
-    sol::table Result = mStateView.create_table();
-    for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) {
-        auto Fn = mStateView[Handler];
-        if (Fn.valid() && Fn.get_type() == sol::type::function) {
-            auto FnRet = Fn(EventArgs);
-            if (FnRet.valid()) {
-                Result.add(FnRet);
-            } else {
-                sol::error Err = FnRet;
-                beammp_lua_error(Err.what());
-            }
-        }
-    }
-    return Result;
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
-        if (IDs.empty()) {
-            return sol::lua_nil;
-        }
-        sol::table Result = mStateView.create_table();
-        for (const auto& Pair : IDs) {
-            Result[Pair.first] = Pair.second;
-        }
-        return Result;
-    } else {
-        return sol::lua_nil;
-    }
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
-    sol::table Result = mStateView.create_table();
-    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
-        if (!Client.expired()) {
-            auto locked = Client.lock();
-            Result[locked->GetID()] = locked->GetName();
-        }
-        return true;
+    std::sort(Entries.begin(), Entries.end(), [](const fs::path& first, const fs::path& second) {
+        auto firstStr = first.string();
+        auto secondStr = second.string();
+        std::transform(firstStr.begin(), firstStr.end(), firstStr.begin(), ::tolower);
+        std::transform(secondStr.begin(), secondStr.end(), secondStr.begin(), ::tolower);
+        return firstStr < secondStr;
     });
-    return Result;
-}
-
-int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
-    int Id = -1;
-    mEngine->mServer->ForEachClient([&Id, &Name](std::weak_ptr<TClient> Client) -> bool {
-        if (!Client.expired()) {
-            auto locked = Client.lock();
-            if (locked->GetName() == Name) {
-                Id = locked->GetID();
-                return false;
-            }
-        }
-        return true;
-    });
-    return Id;
-}
-
-std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        return MaybeClient.value().lock()->GetName();
-    } else {
-        return "";
-    }
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
-    auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        auto Client = MaybeClient.value().lock();
-        TClient::TSetOfVehicleData VehicleData;
-        { // Vehicle Data Lock Scope
-            auto LockedData = Client->GetAllCars();
-            VehicleData = *LockedData.VehicleData;
-        } // End Vehicle Data Lock Scope
-        if (VehicleData.empty()) {
-            return sol::lua_nil;
-        }
-        sol::state_view StateView(mState);
-        sol::table Result = StateView.create_table();
-        for (const auto& v : VehicleData) {
-            Result[v.ID()] = v.Data().substr(3);
-        }
-        return Result;
-    } else
-        return sol::lua_nil;
-}
-
-sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::string& host, uint16_t port) {
-    auto table = mStateView.create_table();
-    constexpr const char* InternalClient = "__InternalClient";
-    table["host"] = host;
-    table["port"] = port;
-    auto client = std::make_shared<httplib::Client>(host, port);
-    table[InternalClient] = client;
-    table.set_function("Get", [&InternalClient](const sol::table& table, const std::string& path, const sol::table& headers) {
-        httplib::Headers GetHeaders;
-        for (const auto& pair : headers) {
-            if (pair.first.is<std::string>() && pair.second.is<std::string>()) {
-                GetHeaders.insert(std::pair(pair.first.as<std::string>(), pair.second.as<std::string>()));
-            } else {
-                beammp_lua_error("Http:Get: Expected string-string pairs for headers, got something else, ignoring that header");
-            }
-        }
-        auto client = table[InternalClient].get<std::shared_ptr<httplib::Client>>();
-        client->Get(path.c_str(), GetHeaders);
-    });
-    return table;
-}
-
-TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, std::atomic_bool& Shutdown, TLuaStateId StateId, TLuaEngine& Engine)
-    : mName(Name)
-    , mShutdown(Shutdown)
-    , mStateId(StateId)
-    , mState(luaL_newstate())
-    , mEngine(&Engine) {
-    if (!mState) {
-        beammp_error("failed to create lua state for \"" + StateId + "\"");
-        return;
-    }
-    luaL_openlibs(mState);
-    sol::state_view StateView(mState);
-    lua_atpanic(mState, LuaAPI::PanicHandler);
-    // StateView.globals()["package"].get()
-    StateView.set_function("print", &LuaAPI::Print);
-    StateView.set_function("printRaw", &LuaAPI::MP::PrintRaw);
-    StateView.set_function("exit", &Application::GracefullyShutdown);
-
-    auto MPTable = StateView.create_named_table("MP");
-    MPTable.set_function("CreateTimer", [&]() -> sol::table {
-        sol::state_view StateView(mState);
-        sol::table Result = StateView.create_table();
-        Result["__StartTime"] = std::chrono::high_resolution_clock::now();
-        Result.set_function("GetCurrent", [&](const sol::table& Table) -> float {
-            auto End = std::chrono::high_resolution_clock::now();
-            auto Start = Table.get<std::chrono::high_resolution_clock::time_point>("__StartTime");
-            return std::chrono::duration_cast<std::chrono::microseconds>(End - Start).count() / 1000000.0f;
-        });
-        Result.set_function("Start", [&](sol::table Table) {
-            Table["__StartTime"] = std::chrono::high_resolution_clock::now();
-        });
-        return Result;
-    });
-    MPTable.set_function("GetOSName", &LuaAPI::MP::GetOSName);
-    MPTable.set_function("GetServerVersion", &LuaAPI::MP::GetServerVersion);
-    MPTable.set_function("RegisterEvent", [this](const std::string& EventName, const std::string& FunctionName) {
-        RegisterEvent(EventName, FunctionName);
-    });
-    MPTable.set_function("TriggerGlobalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
-        return Lua_TriggerGlobalEvent(EventName, EventArgs);
-    });
-    MPTable.set_function("TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
-        return Lua_TriggerLocalEvent(EventName, EventArgs);
-    });
-    MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent);
-    MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount);
-    MPTable.set_function("IsPlayerConnected", &LuaAPI::MP::IsPlayerConnected);
-    MPTable.set_function("GetPlayerIDByName", [&](const std::string& Name) -> int {
-        return Lua_GetPlayerIDByName(Name);
-    });
-    MPTable.set_function("GetPlayerName", [&](int ID) -> std::string {
-        return Lua_GetPlayerName(ID);
-    });
-    MPTable.set_function("RemoveVehicle", &LuaAPI::MP::RemoveVehicle);
-    MPTable.set_function("GetPlayerVehicles", [&](int ID) -> sol::table {
-        return Lua_GetPlayerVehicles(ID);
-    });
-    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
-    MPTable.set_function("GetPlayers", [&]() -> sol::table {
-        return Lua_GetPlayers();
-    });
-    MPTable.set_function("IsPlayerGuest", &LuaAPI::MP::IsPlayerGuest);
-    MPTable.set_function("DropPlayer", &LuaAPI::MP::DropPlayer);
-    MPTable.set_function("GetStateMemoryUsage", [&]() -> size_t {
-        return mStateView.memory_used();
-    });
-    MPTable.set_function("GetLuaMemoryUsage", [&]() -> size_t {
-        return mEngine->CalculateMemoryUsage();
-    });
-    MPTable.set_function("GetPlayerIdentifiers", [&](int ID) -> sol::table {
-        return Lua_GetPlayerIdentifiers(ID);
-    });
-    MPTable.set_function("Sleep", &LuaAPI::MP::Sleep);
-    MPTable.set_function("CreateEventTimer", [&](const std::string& EventName, size_t IntervalMS) {
-        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);
-    });
-    MPTable.set_function("CancelEventTimer", [&](const std::string& EventName) {
-        mEngine->CancelEventTimers(EventName, mStateId);
-    });
-    MPTable.set_function("Set", &LuaAPI::MP::Set);
-    auto HttpTable = StateView.create_named_table("Http");
-    HttpTable.set_function("CreateConnection", [this](const std::string& host, uint16_t port) {
-        return Lua_HttpCreateConnection(host, port);
-    });
-
-    MPTable.create_named("Settings",
-        "Debug", 0,
-        "Private", 1,
-        "MaxCars", 2,
-        "MaxPlayers", 3,
-        "Map", 4,
-        "Name", 5,
-        "Description", 6);
-
-    auto FSTable = StateView.create_named_table("FS");
-    FSTable.set_function("CreateDirectory", &LuaAPI::FS::CreateDirectory);
-    FSTable.set_function("Exists", &LuaAPI::FS::Exists);
-    FSTable.set_function("Remove", &LuaAPI::FS::Remove);
-    FSTable.set_function("Rename", &LuaAPI::FS::Rename);
-    FSTable.set_function("Copy", &LuaAPI::FS::Copy);
-    FSTable.set_function("GetFilename", &LuaAPI::FS::GetFilename);
-    FSTable.set_function("GetExtension", &LuaAPI::FS::GetExtension);
-    FSTable.set_function("GetParentFolder", &LuaAPI::FS::GetParentFolder);
-    FSTable.set_function("IsDirectory", &LuaAPI::FS::IsDirectory);
-    FSTable.set_function("IsFile", &LuaAPI::FS::IsFile);
-    FSTable.set_function("ConcatPaths", &LuaAPI::FS::ConcatPaths);
-    Start();
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLuaChunk& Script) {
-    std::unique_lock Lock(mStateExecuteQueueMutex);
-    auto Result = std::make_shared<TLuaResult>();
-    mStateExecuteQueue.push({ Script, Result });
-    return Result;
-}
-
-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::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 });
-    mStateFunctionQueueCond.notify_all();
-    return Result;
-}
-
-void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, const std::string& FunctionName) {
-    mEngine->RegisterEvent(EventName, mStateId, FunctionName);
-}
-
-void TLuaEngine::StateThreadData::operator()() {
-    RegisterThread("Lua:" + mStateId);
-    while (!mShutdown) {
-        { // StateExecuteQueue Scope
-            std::unique_lock Lock(mStateExecuteQueueMutex);
-            if (!mStateExecuteQueue.empty()) {
-                auto S = mStateExecuteQueue.front();
-                mStateExecuteQueue.pop();
-                Lock.unlock();
-
-                { // Paths Scope
-                    std::unique_lock Lock(mPathsMutex);
-                    if (!mPaths.empty()) {
-                        std::stringstream PathAdditions;
-                        std::stringstream CPathAdditions;
-                        while (!mPaths.empty()) {
-                            auto Path = mPaths.front();
-                            mPaths.pop();
-                            PathAdditions << ";" << (Path / "?.lua").string();
-                            PathAdditions << ";" << (Path / "lua/?.lua").string();
-#if WIN32
-                            CPathAdditions << ";" << (Path / "?.dll").string();
-                            CPathAdditions << ";" << (Path / "lib/?.dll").string();
-#else // unix
-                            CPathAdditions << ";" << (Path / "?.so").string();
-                            CPathAdditions << ";" << (Path / "lib/?.so").string();
-#endif
-                        }
-                        sol::state_view StateView(mState);
-                        auto PackageTable = StateView.globals().get<sol::table>("package");
-                        PackageTable["path"] = PackageTable.get<std::string>("path") + PathAdditions.str();
-                        PackageTable["cpath"] = PackageTable.get<std::string>("cpath") + CPathAdditions.str();
-                        StateView.globals()["package"] = PackageTable;
-                    }
-                }
-                sol::state_view StateView(mState);
-                auto Res = StateView.safe_script(*S.first.Content, sol::script_pass_on_error, S.first.FileName);
-                S.second->Ready = true;
-                if (Res.valid()) {
-                    S.second->Error = false;
-                    S.second->Result = std::move(Res);
-                } else {
-                    S.second->Error = true;
-                    sol::error Err = Res;
-                    S.second->ErrorMessage = Err.what();
-                }
-            }
-        }
-        { // StateFunctionQueue Scope
-            std::unique_lock Lock(mStateFunctionQueueMutex);
-            auto NotExpired = mStateFunctionQueueCond.wait_for(Lock,
-                std::chrono::milliseconds(500),
-                [&]() -> bool { return !mStateFunctionQueue.empty(); });
-            if (NotExpired) {
-                auto FnNameResultPair = std::move(mStateFunctionQueue.front());
-                mStateFunctionQueue.pop();
-                Lock.unlock();
-                auto& FnName = std::get<0>(FnNameResultPair);
-                auto& Result = std::get<1>(FnNameResultPair);
-                auto Args = std::get<2>(FnNameResultPair);
-                Result->StateId = mStateId;
-                sol::state_view StateView(mState);
-                auto Fn = StateView[FnName];
-                if (Fn.valid() && Fn.get_type() == sol::type::function) {
-                    std::vector<sol::object> LuaArgs;
-                    for (const auto& Arg : Args) {
-                        if (Arg.valueless_by_exception()) {
-                            continue;
-                        }
-                        switch (Arg.index()) {
-                        case TLuaArgTypes_String:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<std::string>(Arg)));
-                            break;
-                        case TLuaArgTypes_Int:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<int>(Arg)));
-                            break;
-                        case TLuaArgTypes_VariadicArgs:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<sol::variadic_args>(Arg)));
-                            break;
-                        case TLuaArgTypes_Bool:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
-                            break;
-                        default:
-                            beammp_error("Unknown argument type, passed as nil");
-                            break;
-                        }
-                    }
-                    auto Res = Fn(sol::as_args(LuaArgs));
-                    if (Res.valid()) {
-                        Result->Error = false;
-                        Result->Result = std::move(Res);
-                    } else {
-                        Result->Error = true;
-                        sol::error Err = Res;
-                        Result->ErrorMessage = Err.what();
-                    }
-                    Result->Ready = true;
-                } else {
-                    Result->Error = true;
-                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->Ready = true;
-                }
-            }
+    for (const fs::path& Entry : Entries) {
+        if (!HotSwap || IsNewFile(Entry.string())) {
+            auto FileName = Entry.string();
+            std::unique_ptr<TLuaFile> ScriptToInsert(new TLuaFile(*this));
+            auto& Script = *ScriptToInsert;
+            mLuaFiles.insert(std::move(ScriptToInsert));
+            Script.Init(Name, FileName, fs::last_write_time(FileName));
+            if (HotSwap)
+                info(("[HOTSWAP] Added : ") + Script.GetFileName().substr(Script.GetFileName().find('\\')));
         }
     }
 }
 
-void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS) {
-    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
-    };
-    mTimedEvents.push_back(std::move(Event));
-    beammp_trace("created event timer for \"" + EventName + "\" on \"" + StateId + "\" with " + std::to_string(IntervalMS) + "ms interval");
-}
-
-void TLuaEngine::CancelEventTimers(const std::string& EventName, TLuaStateId StateId) {
-    std::unique_lock Lock(mTimedEventsMutex);
-    beammp_trace("cancelling event timer for \"" + EventName + "\" on \"" + StateId + "\"");
-    for (;;) {
-        auto Iter = std::find_if(mTimedEvents.begin(), mTimedEvents.end(), [&](const TimedEvent& Event) -> bool {
-            return Event.EventName == EventName && Event.StateId == StateId;
-        });
-        if (Iter != mTimedEvents.end()) {
-            mTimedEvents.erase(Iter);
-        } else {
-            break;
-        }
-    }
-}
-
-void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
-    std::unique_lock Lock(mPathsMutex);
-    mPaths.push(Path);
-}
-
-void TLuaResult::WaitUntilReady() {
-    while (!Ready) {
-        std::this_thread::yield();
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-    }
-}
-
-TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
-    : Content(Content)
-    , FileName(FileName)
-    , PluginPath(PluginPath) {
-}
-
-bool TLuaEngine::TimedEvent::Expired() {
-    auto Waited = (std::chrono::high_resolution_clock::now() - LastCompletion);
-    return Waited >= Duration;
-}
-
-void TLuaEngine::TimedEvent::Reset() {
-    LastCompletion = std::chrono::high_resolution_clock::now();
-}
-
-TPluginMonitor::TPluginMonitor(const fs::path& Path, TLuaEngine& Engine, std::atomic_bool& Shutdown)
-    : mEngine(Engine)
-    , mPath(Path)
-    , mShutdown(Shutdown) {
-    if (!fs::exists(mPath)) {
-        fs::create_directories(mPath);
-    }
-    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
-        // TODO: trigger an event when a subfolder file changes
-        if (Entry.is_regular_file()) {
-            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
-        }
-    }
-    Start();
-}
-
-void TPluginMonitor::operator()() {
-    RegisterThread("PluginMonitor");
-    beammp_info("PluginMonitor started");
-    while (!mShutdown) {
-        std::this_thread::sleep_for(std::chrono::seconds(3));
-        for (const auto& Pair : mFileTimes) {
-            auto CurrentTime = fs::last_write_time(Pair.first);
-            if (CurrentTime != Pair.second) {
-                mFileTimes[Pair.first] = CurrentTime;
-                // grandparent of the path should be Resources/Server
-                if (fs::equivalent(fs::path(Pair.first).parent_path().parent_path(), mPath)) {
-                    beammp_info("File \"" + Pair.first + "\" changed, reloading");
-                    // is in root folder, so reload
-                    std::ifstream FileStream(Pair.first, std::ios::in | std::ios::binary);
-                    auto Size = std::filesystem::file_size(Pair.first);
-                    auto Contents = std::make_shared<std::string>();
-                    Contents->resize(Size);
-                    FileStream.read(Contents->data(), Contents->size());
-                    TLuaChunk Chunk(Contents, Pair.first, fs::path(Pair.first).parent_path().string());
-                    auto StateID = mEngine.GetStateIDForPlugin(fs::path(Pair.first).parent_path());
-                    auto Res = mEngine.EnqueueScript(StateID, Chunk);
-                    // TODO: call onInit
-                    mEngine.AddResultToCheck(Res);
-                } else {
-                    // TODO: trigger onFileChanged event
-                    beammp_trace("Change detected in file \"" + Pair.first + "\", event trigger not implemented yet");
-                    /*
-                    // is in subfolder, dont reload, just trigger an event
-                    auto Results = mEngine.TriggerEvent("onFileChanged", "", Pair.first);
-                    mEngine.WaitForAll(Results);
-                    for (const auto& Result : Results)  {
-                        if (Result->Error) {
-                            beammp_lua_error(Result->ErrorMessage);
-                        }
-                    }*/
-                }
-            }
-        }
+bool TLuaEngine::IsNewFile(const std::string& Path) {
+    for (auto& Script : mLuaFiles) {
+        if (fs::absolute(Path) == fs::absolute(Script->GetFileName()))
+            return false;
     }
+    return true;
 }

src/TLuaFile.cpp

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

src/TLuaPlugin.cpp

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

src/TNetwork.cpp

@@ -1,7 +1,5 @@
 #include "TNetwork.h"
 #include "Client.h"
-#include "LuaAPI.h"
-#include "TLuaEngine.h"
 #include <CustomAssert.h>
 #include <Http.h>
 #include <array>
@@ -11,10 +9,8 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
     : mServer(Server)
     , mPPSMonitor(PPSMonitor)
     , mResourceManager(ResourceManager) {
-    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Starting);
-    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Starting);
     Application::RegisterShutdownHandler([&] {
-        beammp_debug("Kicking all players due to shutdown");
+        debug("Kicking all players due to shutdown");
         Server.ForEachClient([&](std::weak_ptr<TClient> client) -> bool {
             if (!client.expired()) {
                 ClientKick(*client.lock(), "Server shutdown");
@@ -23,20 +19,16 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
         });
     });
     Application::RegisterShutdownHandler([&] {
-        Application::SetSubsystemStatus("UDPNetwork", Application::Status::ShuttingDown);
         if (mUDPThread.joinable()) {
             mShutdown = true;
             mUDPThread.detach();
         }
-        Application::SetSubsystemStatus("UDPNetwork", Application::Status::Shutdown);
     });
     Application::RegisterShutdownHandler([&] {
-        Application::SetSubsystemStatus("TCPNetwork", Application::Status::ShuttingDown);
         if (mTCPThread.joinable()) {
             mShutdown = true;
             mTCPThread.detach();
         }
-        Application::SetSubsystemStatus("TCPNetwork", Application::Status::Shutdown);
     });
     mTCPThread = std::thread(&TNetwork::TCPServerMain, this);
     mUDPThread = std::thread(&TNetwork::UDPServerMain, this);
@@ -44,34 +36,50 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
 
 void TNetwork::UDPServerMain() {
     RegisterThread("UDPServer");
-#if defined(BEAMMP_WINDOWS)
+#ifdef WIN32
     WSADATA data;
     if (WSAStartup(514, &data)) {
-        beammp_error(("Can't start Winsock!"));
-        // return;
+        error(("Can't start Winsock!"));
+        //return;
     }
-#endif // WINDOWS
+
     mUDPSock = socket(AF_INET, SOCK_DGRAM, 0);
     // Create a server hint structure for the server
     sockaddr_in serverAddr {};
-    serverAddr.sin_addr.s_addr = INADDR_ANY; // Any Local
+    serverAddr.sin_addr.S_un.S_addr = ADDR_ANY; //Any Local
+    serverAddr.sin_family = AF_INET; // Address format is IPv4
+    serverAddr.sin_port = htons(Application::Settings.Port); // Convert from little to big endian
+
+    // Try and bind the socket to the IP and port
+    if (bind(mUDPSock, (sockaddr*)&serverAddr, sizeof(serverAddr)) == SOCKET_ERROR) {
+        error(("Can't bind socket!") + std::to_string(WSAGetLastError()));
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        exit(-1);
+        //return;
+    }
+#else // unix
+    mUDPSock = socket(AF_INET, SOCK_DGRAM, 0);
+    // Create a server hint structure for the server
+    sockaddr_in serverAddr {};
+    serverAddr.sin_addr.s_addr = INADDR_ANY; //Any Local
     serverAddr.sin_family = AF_INET; // Address format is IPv4
     serverAddr.sin_port = htons(uint16_t(Application::Settings.Port)); // Convert from little to big endian
 
     // Try and bind the socket to the IP and port
     if (bind(mUDPSock, (sockaddr*)&serverAddr, sizeof(serverAddr)) != 0) {
-        beammp_error("bind() failed: " + GetPlatformAgnosticErrorString());
+        error(("Can't bind socket!") + std::string(strerror(errno)));
         std::this_thread::sleep_for(std::chrono::seconds(5));
-        exit(-1); // TODO: Wtf.
-        // return;
+        exit(-1);
+        //return;
     }
-    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Good);
-    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.Port) + (" with a Max of ")
+#endif
+
+    info(("Vehicle data network online on port ") + std::to_string(Application::Settings.Port) + (" with a Max of ")
         + std::to_string(Application::Settings.MaxPlayers) + (" Clients"));
     while (!mShutdown) {
         try {
             sockaddr_in client {};
-            std::string Data = UDPRcvFromClient(client); // Receives any data from Socket
+            std::string Data = UDPRcvFromClient(client); //Receives any data from Socket
             size_t Pos = Data.find(':');
             if (Data.empty() || Pos > 2)
                 continue;
@@ -98,104 +106,125 @@ void TNetwork::UDPServerMain() {
                 return true;
             });
         } catch (const std::exception& e) {
-            beammp_error(("fatal: ") + std::string(e.what()));
+            error(("fatal: ") + std::string(e.what()));
         }
     }
 }
 
 void TNetwork::TCPServerMain() {
     RegisterThread("TCPServer");
-#if defined(BEAMMP_WINDOWS)
+#ifdef WIN32
     WSADATA wsaData;
     if (WSAStartup(514, &wsaData)) {
-        beammp_error("Can't start Winsock!");
+        error("Can't start Winsock!");
         return;
     }
-#endif // WINDOWS
-    TConnection client {};
+    SOCKET client, Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    sockaddr_in addr {};
+    addr.sin_addr.S_un.S_addr = ADDR_ANY;
+    addr.sin_family = AF_INET;
+    addr.sin_port = htons(Application::Settings.Port);
+    if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) == SOCKET_ERROR) {
+        error("Can't bind socket! " + std::to_string(WSAGetLastError()));
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        exit(-1);
+    }
+    if (Listener == -1) {
+        error("Invalid listening socket");
+        return;
+    }
+
+    if (listen(Listener, SOMAXCONN)) {
+        error("listener failed " + std::to_string(GetLastError()));
+        //TODO Fix me leak for Listener socket
+        return;
+    }
+    info("Vehicle event network online");
+    do {
+        try {
+            client = accept(Listener, nullptr, nullptr);
+            if (client == -1) {
+                warn("Got an invalid client socket on connect! Skipping...");
+                continue;
+            }
+            std::thread ID(&TNetwork::Identify, this, client);
+            ID.detach();
+        } catch (const std::exception& e) {
+            error("fatal: " + std::string(e.what()));
+        }
+    } while (client);
+
+    CloseSocketProper(client);
+    WSACleanup();
+#else // unix
+    // wondering why we need slightly different implementations of this?
+    // ask ms.
+    SOCKET client = -1;
     SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
     int optval = 1;
-#if defined(BEAMMP_WINDOWS)
-    const char* optval_ptr = reinterpret_cast<const char*>(&optval);
-#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
-    void* optval_ptr = reinterpret_cast<void*>(&optval);
-#endif
-    setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, optval_ptr, sizeof(optval));
+    setsockopt(Listener, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval));
     // TODO: check optval or return value idk
     sockaddr_in addr {};
     addr.sin_addr.s_addr = INADDR_ANY;
     addr.sin_family = AF_INET;
     addr.sin_port = htons(uint16_t(Application::Settings.Port));
     if (bind(Listener, (sockaddr*)&addr, sizeof(addr)) != 0) {
-        beammp_error("bind() failed: " + GetPlatformAgnosticErrorString());
+        error(("Can't bind socket! ") + std::string(strerror(errno)));
         std::this_thread::sleep_for(std::chrono::seconds(5));
-        exit(-1); // TODO: Wtf.
+        exit(-1);
     }
     if (Listener == -1) {
-        beammp_error("Invalid listening socket");
+        error(("Invalid listening socket"));
         return;
     }
     if (listen(Listener, SOMAXCONN)) {
-        beammp_error("listen() failed: " + GetPlatformAgnosticErrorString());
-        // FIXME leak Listener
+        error(("listener failed ") + std::string(strerror(errno)));
+        //TODO fix me leak Listener
         return;
     }
-    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good);
-    beammp_info(("Vehicle event network online"));
+    info(("Vehicle event network online"));
     do {
         try {
             if (mShutdown) {
-                beammp_debug("shutdown during TCP wait for accept loop");
+                debug("shutdown during TCP wait for accept loop");
                 break;
             }
-            client.SockAddrLen = sizeof(client.SockAddr);
-            client.Socket = accept(Listener, &client.SockAddr, &client.SockAddrLen);
-            if (client.Socket == -1) {
-                beammp_warn(("Got an invalid client socket on connect! Skipping..."));
+            client = accept(Listener, nullptr, nullptr);
+            if (client == -1) {
+                warn(("Got an invalid client socket on connect! Skipping..."));
                 continue;
             }
             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()));
+            error(("fatal: ") + std::string(e.what()));
         }
-    } while (client.Socket);
+    } while (client);
 
-    beammp_debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));
+    debug("all ok, arrived at " + std::string(__func__) + ":" + std::to_string(__LINE__));
 
-    CloseSocketProper(client.Socket);
-#ifdef BEAMMP_WINDOWS
-    CloseSocketProper(client.Socket);
-    WSACleanup();
-#endif // WINDOWS
+    CloseSocketProper(client);
+#endif
 }
 
-#undef GetObject // Fixes Windows
+#undef GetObject //Fixes Windows
 
 #include "Json.h"
 namespace json = rapidjson;
 
-void TNetwork::Identify(const TConnection& client) {
+void TNetwork::Identify(SOCKET TCPSock) {
     RegisterThreadAuto();
     char Code;
-    if (recv(client.Socket, &Code, 1, 0) != 1) {
-        CloseSocketProper(client.Socket);
+    if (recv(TCPSock, &Code, 1, 0) != 1) {
+        CloseSocketProper(TCPSock);
         return;
     }
     if (Code == 'C') {
-        Authentication(client);
+        Authentication(TCPSock);
     } 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;
+        HandleDownload(TCPSock);
     } else {
-        CloseSocketProper(client.Socket);
+        CloseSocketProper(TCPSock);
     }
 }
 
@@ -218,22 +247,17 @@ void TNetwork::HandleDownload(SOCKET TCPSock) {
     });
 }
 
-void TNetwork::Authentication(const TConnection& ClientConnection) {
-    auto Client = CreateClient(ClientConnection.Socket);
-    char AddrBuf[64];
-    // TODO: IPv6 would need this to be changed
-    auto str = inet_ntop(AF_INET, reinterpret_cast<const void*>(&ClientConnection.SockAddr), AddrBuf, sizeof(ClientConnection.SockAddr));
-    beammp_trace("This thread is ip " + std::string(str));
-    Client->SetIdentifier("ip", str);
+void TNetwork::Authentication(SOCKET TCPSock) {
+    auto Client = CreateClient(TCPSock);
 
-    std::string Rc; // TODO: figure out why this is not default constructed
-    beammp_info("Identifying new ClientConnection...");
+    std::string Rc;
+    info("Identifying new client...");
 
     Rc = TCPRcv(*Client);
 
     if (Rc.size() > 3 && Rc.substr(0, 2) == "VC") {
         Rc = Rc.substr(2);
-        if (Rc.length() > 4 || Rc != Application::ClientVersionString()) {
+        if (Rc.length() > 4 || Rc != Application::ClientVersion()) {
             ClientKick(*Client, "Outdated Version!");
             return;
         }
@@ -255,14 +279,14 @@ void TNetwork::Authentication(const TConnection& ClientConnection) {
     auto RequestString = R"({"key":")" + Rc + "\"}";
 
     auto Target = "/pkToUser";
-    unsigned int ResponseCode = 0;
+    int ResponseCode = -1;
     if (!Rc.empty()) {
-        Rc = Http::POST(Application::GetBackendUrlForAuth(), 443, Target, RequestString, "application/json", &ResponseCode);
+        Rc = Http::POST(Application::GetBackendUrlForAuth(), Target, {}, RequestString, true, &ResponseCode);
     }
 
     json::Document AuthResponse;
     AuthResponse.Parse(Rc.c_str());
-    if (Rc == Http::ErrorString || AuthResponse.HasParseError()) {
+    if (Rc == "-1" || AuthResponse.HasParseError()) {
         ClientKick(*Client, "Invalid key! Please restart your game.");
         return;
     }
@@ -277,7 +301,7 @@ void TNetwork::Authentication(const TConnection& ClientConnection) {
             Sentry.Log(SentryLevel::Info, "default", "backend returned 0 instead of json (" + std::to_string(ResponseCode) + ")");
         } else { // Rc != "0"
             ClientKick(*Client, "Backend returned invalid auth response format.");
-            beammp_error("Backend returned invalid auth response format. This should never happen.");
+            error("Backend returned invalid auth response format. This should never happen.");
             auto Lock = Sentry.CreateExclusiveContext();
             Sentry.SetContext("auth",
                 { { "response-body", Rc },
@@ -295,16 +319,14 @@ void TNetwork::Authentication(const TConnection& ClientConnection) {
         Client->SetRoles(AuthResponse["roles"].GetString());
         Client->SetIsGuest(AuthResponse["guest"].GetBool());
         for (const auto& ID : AuthResponse["identifiers"].GetArray()) {
-            auto Raw = std::string(ID.GetString());
-            auto SepIndex = Raw.find(':');
-            Client->SetIdentifier(Raw.substr(0, SepIndex), Raw.substr(SepIndex + 1));
+            Client->AddIdentifier(ID.GetString());
         }
     } else {
         ClientKick(*Client, "Invalid authentication data!");
         return;
     }
 
-    beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
+    debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
     mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
         std::shared_ptr<TClient> Cl;
         {
@@ -323,32 +345,18 @@ void TNetwork::Authentication(const TConnection& ClientConnection) {
         return true;
     });
 
-    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest());
-    TLuaEngine::WaitForAll(Futures);
-    bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
-        [](const std::shared_ptr<TLuaResult>& Result) {
-            return !Result->Error && Result->Result.is<int>() && bool(Result->Result.as<int>());
-        });
-    std::string Reason;
-    bool NotAllowedWithReason = std::any_of(Futures.begin(), Futures.end(),
-        [&Reason](const std::shared_ptr<TLuaResult>& Result) -> bool {
-            if (!Result->Error && Result->Result.is<std::string>()) {
-                Reason = Result->Result.as<std::string>();
-                return true;
-            }
-            return false;
-        });
-
-    if (NotAllowed) {
+    auto arg = std::make_unique<TLuaArg>(TLuaArg { { Client->GetName(), Client->GetRoles(), Client->IsGuest() } });
+    std::any Res = TriggerLuaEvent("onPlayerAuth", false, nullptr, std::move(arg), true);
+    if (Res.type() == typeid(int) && std::any_cast<int>(Res)) {
         ClientKick(*Client, "you are not allowed on the server!");
         return;
-    } else if (NotAllowedWithReason) {
-        ClientKick(*Client, Reason);
+    } else if (Res.type() == typeid(std::string)) {
+        ClientKick(*Client, std::any_cast<std::string>(Res));
         return;
     }
 
     if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) {
-        beammp_info("Identification success");
+        info("Identification success");
         mServer.InsertClient(Client);
         TCPClient(Client);
     } else
@@ -381,18 +389,18 @@ bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) {
     Sent = 0;
     Size += 4;
     do {
-#if defined(BEAMMP_WINDOWS)
+#ifdef WIN32
         int32_t Temp = send(c.GetTCPSock(), &Send[Sent], Size - Sent, 0);
-#elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
+#else //WIN32
         int32_t Temp = send(c.GetTCPSock(), &Send[Sent], Size - Sent, MSG_NOSIGNAL);
-#endif
+#endif //WIN32
         if (Temp == 0) {
-            beammp_debug("send() == 0: " + GetPlatformAgnosticErrorString());
+            debug("send() == 0: " + std::string(std::strerror(errno)));
             if (c.GetStatus() > -1)
                 c.SetStatus(-1);
             return false;
         } else if (Temp < 0) {
-            beammp_debug("send() < 0: " + GetPlatformAgnosticErrorString()); // TODO fix it was spamming yet everyone stayed on the server
+            debug("send() < 0: " + std::string(std::strerror(errno))); //TODO fix it was spamming yet everyone stayed on the server
             if (c.GetStatus() > -1)
                 c.SetStatus(-1);
             CloseSocketProper(c.GetTCPSock());
@@ -406,12 +414,16 @@ bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) {
 
 bool TNetwork::CheckBytes(TClient& c, int32_t BytesRcv) {
     if (BytesRcv == 0) {
-        beammp_trace("(TCP) Connection closing...");
+        trace("(TCP) Connection closing...");
         if (c.GetStatus() > -1)
             c.SetStatus(-1);
         return false;
     } else if (BytesRcv < 0) {
-        beammp_debug("(TCP) recv() failed: " + GetPlatformAgnosticErrorString());
+#ifdef WIN32
+        debug(("(TCP) recv failed with error: ") + std::to_string(WSAGetLastError()));
+#else // unix
+        debug(("(TCP) recv failed with error: ") + std::string(strerror(errno)));
+#endif // WIN32
         if (c.GetStatus() > -1)
             c.SetStatus(-1);
         CloseSocketProper(c.GetTCPSock());
@@ -442,7 +454,7 @@ std::string TNetwork::TCPRcv(TClient& c) {
         Data.resize(Header);
     } else {
         ClientKick(c, "Header size limit exceeded");
-        beammp_warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header of >100MB - assuming malicious intent and disconnecting the client.");
+        warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header of >100MB - assuming malicious intent and disconnecting the client.");
         return "";
     }
     BytesRcv = 0;
@@ -462,8 +474,8 @@ 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)) {
+    info("Client kicked: " + R);
+    if (!TCPSend(c, "E" + R)) {
         // TODO handle
     }
     c.SetStatus(-2);
@@ -474,17 +486,15 @@ void TNetwork::ClientKick(TClient& c, const std::string& R) {
     if (c.GetDownSock())
         CloseSocketProper(c.GetDownSock());
 }
-
 void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
-    RegisterThreadAuto();
     while (!c.expired()) {
         auto Client = c.lock();
         if (Client->GetStatus() < 0) {
-            beammp_debug("client status < 0, breaking client loop");
+            debug("client status < 0, breaking client loop");
             break;
         }
         if (!Client->IsSyncing() && Client->IsSynced() && Client->MissedPacketQueueSize() != 0) {
-            // debug("sending " + std::to_string(Client->MissedPacketQueueSize()) + " queued packets");
+            //debug("sending " + std::to_string(Client->MissedPacketQueueSize()) + " queued packets");
             while (Client->MissedPacketQueueSize() > 0) {
                 std::string QData {};
                 { // locked context
@@ -495,7 +505,7 @@ void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
                     QData = Client->MissedPacketQueue().front();
                     Client->MissedPacketQueue().pop();
                 } // end locked context
-                // beammp_debug("sending a missed packet: " + QData);
+                // debug("sending a missed packet: " + QData);
                 if (!TCPSend(*Client, QData, true)) {
                     if (Client->GetStatus() > -1)
                         Client->SetStatus(-1);
@@ -530,13 +540,13 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
             break;
         auto Client = c.lock();
         if (Client->GetStatus() < 0) {
-            beammp_debug("client status < 0, breaking client loop");
+            debug("client status < 0, breaking client loop");
             break;
         }
 
         auto res = TCPRcv(*Client);
         if (res == "") {
-            beammp_debug("TCPRcv error, break client loop");
+            debug("TCPRcv error, break client loop");
             break;
         }
         TServer::GlobalParser(c, res, mPPSMonitor, *this);
@@ -548,7 +558,7 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
         auto Client = c.lock();
         OnDisconnect(c, Client->GetStatus() == -2);
     } else {
-        beammp_warn("client expired in TCPClient, should never happen");
+        warn("client expired in TCPClient, should never happen");
     }
 }
 
@@ -568,10 +578,10 @@ void TNetwork::UpdatePlayer(TClient& Client) {
 }
 
 void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr, bool kicked) {
-    beammp_assert(!ClientPtr.expired());
+    Assert(!ClientPtr.expired());
     auto LockedClientPtr = ClientPtr.lock();
     TClient& c = *LockedClientPtr;
-    beammp_info(c.GetName() + (" Connection Terminated"));
+    info(c.GetName() + (" Connection Terminated"));
     std::string Packet;
     TClient::TSetOfVehicleData VehicleData;
     { // Vehicle Data Lock Scope
@@ -588,8 +598,7 @@ void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr, bool kicked
         Packet = ("L") + c.GetName() + (" left the server!");
     SendToAll(&c, Packet, false, true);
     Packet.clear();
-    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerDisconnect", "", c.GetID());
-    LuaAPI::MP::Engine->ReportErrors(Futures);
+    TriggerLuaEvent(("onPlayerDisconnect"), false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { c.GetID() } }), false);
     if (c.GetTCPSock())
         CloseSocketProper(c.GetTCPSock());
     if (c.GetDownSock())
@@ -618,18 +627,18 @@ int TNetwork::OpenID() {
 }
 
 void TNetwork::OnConnect(const std::weak_ptr<TClient>& c) {
-    beammp_assert(!c.expired());
-    beammp_info("Client connected");
+    Assert(!c.expired());
+    info("Client connected");
     auto LockedClient = c.lock();
     LockedClient->SetID(OpenID());
-    beammp_info("Assigned ID " + std::to_string(LockedClient->GetID()) + " to " + LockedClient->GetName());
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerConnecting", "", LockedClient->GetID()));
+    info("Assigned ID " + std::to_string(LockedClient->GetID()) + " to " + LockedClient->GetName());
+    TriggerLuaEvent("onPlayerConnecting", false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { LockedClient->GetID() } }), false);
     SyncResources(*LockedClient);
     if (LockedClient->GetStatus() < 0)
         return;
-    (void)Respond(*LockedClient, "M" + Application::Settings.MapName, true); // Send the Map on connect
-    beammp_info(LockedClient->GetName() + " : Connected");
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->GetID()));
+    (void)Respond(*LockedClient, "M" + Application::Settings.MapName, true); //Send the Map on connect
+    info(LockedClient->GetName() + " : Connected");
+    TriggerLuaEvent("onPlayerJoining", false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { LockedClient->GetID() } }), false);
 }
 
 void TNetwork::SyncResources(TClient& c) {
@@ -648,7 +657,7 @@ void TNetwork::SyncResources(TClient& c) {
         }
 #ifndef DEBUG
     } catch (std::exception& e) {
-        beammp_error("Exception! : " + std::string(e.what()));
+        error("Exception! : " + std::string(e.what()));
         c.SetStatus(-1);
     }
 #endif
@@ -666,7 +675,7 @@ void TNetwork::Parse(TClient& c, const std::string& Packet) {
         return;
     case 'S':
         if (SubCode == 'R') {
-            beammp_debug("Sending Mod Info");
+            debug("Sending Mod Info");
             std::string ToSend = mResourceManager.FileList() + mResourceManager.FileSizes();
             if (ToSend.empty())
                 ToSend = "-";
@@ -681,13 +690,13 @@ void TNetwork::Parse(TClient& c, const std::string& Packet) {
 }
 
 void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
-    beammp_info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
+    info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
 
     if (!fs::path(UnsafeName).has_filename()) {
         if (!TCPSend(c, "CO")) {
             // TODO: handle
         }
-        beammp_warn("File " + UnsafeName + " is not a file!");
+        warn("File " + UnsafeName + " is not a file!");
         return;
     }
     auto FileName = fs::path(UnsafeName).filename().string();
@@ -697,7 +706,7 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
         if (!TCPSend(c, "CO")) {
             // TODO: handle
         }
-        beammp_warn("File " + UnsafeName + " could not be accessed!");
+        warn("File " + UnsafeName + " could not be accessed!");
         return;
     }
 
@@ -705,7 +714,7 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
         // TODO: handle
     }
 
-    /// Wait for connections
+    ///Wait for connections
     int T = 0;
     while (c.GetDownSock() < 1 && T < 50) {
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
@@ -713,7 +722,7 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
     }
 
     if (c.GetDownSock() < 1) {
-        beammp_error("Client doesn't have a download socket!");
+        error("Client doesn't have a download socket!");
         if (c.GetStatus() > -1)
             c.SetStatus(-1);
         return;
@@ -723,11 +732,9 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
 
     std::thread SplitThreads[2] {
         std::thread([&] {
-            RegisterThread("SplitLoad_0");
             SplitLoad(c, 0, MSize, false, FileName);
         }),
         std::thread([&] {
-            RegisterThread("SplitLoad_1");
             SplitLoad(c, MSize, Size, true, FileName);
         })
     };
@@ -741,7 +748,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 = 0x7735940; //125MB
     char* Data;
     if (Size > Split)
         Data = new char[Split];
@@ -752,7 +759,7 @@ void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std
         TCPSock = c.GetDownSock();
     else
         TCPSock = c.GetTCPSock();
-    beammp_debug("Split load Socket " + std::to_string(TCPSock));
+    info("Split load Socket " + std::to_string(TCPSock));
     while (c.GetStatus() > -1 && Sent < Size) {
         size_t Diff = Size - Sent;
         if (Diff > Split) {
@@ -782,13 +789,9 @@ 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));
+            info("Socket Closed! " + std::to_string(socket));
             CloseSocketProper(socket);
             return false;
         }
@@ -834,7 +837,7 @@ bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
     // ignore error
     (void)SendToAll(LockedClient.get(), ("JWelcome ") + LockedClient->GetName() + "!", false, true);
 
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoin", "", LockedClient->GetID()));
+    TriggerLuaEvent(("onPlayerJoin"), false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { LockedClient->GetID() } }), false);
     LockedClient->SetIsSyncing(true);
     bool Return = false;
     bool res = true;
@@ -870,13 +873,13 @@ bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
         return res;
     }
     LockedClient->SetIsSynced(true);
-    beammp_info(LockedClient->GetName() + (" is now synced!"));
+    info(LockedClient->GetName() + (" is now synced!"));
     return true;
 }
 
 void TNetwork::SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel) {
     if (!Self)
-        beammp_assert(c);
+        Assert(c);
     char C = Data.at(0);
     bool ret = true;
     mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) -> bool {
@@ -898,10 +901,10 @@ void TNetwork::SendToAll(TClient* c, const std::string& Data, bool Self, bool Re
                         } else {
                             Client->EnqueuePacket(Data);
                         }
-                        // ret = SendLarge(*Client, Data);
+                        //ret = SendLarge(*Client, Data);
                     } else {
                         Client->EnqueuePacket(Data);
-                        // ret = TCPSend(*Client, Data);
+                        //ret = TCPSend(*Client, Data);
                     }
                 } else {
                     ret = UDPSend(*Client, Data);
@@ -939,17 +942,31 @@ bool TNetwork::UDPSend(TClient& Client, std::string Data) const {
 #endif // WIN32
 
     sendOk = sendto(mUDPSock, Data.c_str(), len, 0, (sockaddr*)&Addr, int(AddrSize));
+#ifdef WIN32
     if (sendOk == -1) {
-        beammp_debug("(UDP) sendto() failed: " + GetPlatformAgnosticErrorString());
+        debug(("(UDP) Send Failed Code : ") + std::to_string(WSAGetLastError()));
         if (Client.GetStatus() > -1)
             Client.SetStatus(-1);
         return false;
     } else if (sendOk == 0) {
-        beammp_debug(("(UDP) sendto() returned 0"));
+        debug(("(UDP) sendto returned 0"));
         if (Client.GetStatus() > -1)
             Client.SetStatus(-1);
         return false;
     }
+#else // unix
+    if (sendOk == -1) {
+        debug(("(UDP) Send Failed Code : ") + std::string(strerror(errno)));
+        if (Client.GetStatus() > -1)
+            Client.SetStatus(-1);
+        return false;
+    } else if (sendOk == 0) {
+        debug(("(UDP) sendto returned 0"));
+        if (Client.GetStatus() > -1)
+            Client.SetStatus(-1);
+        return false;
+    }
+#endif // WIN32
     return true;
 }
 
@@ -963,7 +980,11 @@ std::string TNetwork::UDPRcvFromClient(sockaddr_in& client) const {
 #endif // WIN32
 
     if (Rcv == -1) {
-        beammp_error("(UDP) Error receiving from client! recvfrom() failed: " + GetPlatformAgnosticErrorString());
+#ifdef WIN32
+        error(("(UDP) Error receiving from Client! Code : ") + std::to_string(WSAGetLastError()));
+#else // unix
+        error(("(UDP) Error receiving from Client! Code : ") + std::string(strerror(errno)));
+#endif // WIN32
         return "";
     }
     return std::string(Ret.begin(), Ret.begin() + Rcv);

src/TPPSMonitor.cpp

@@ -4,28 +4,22 @@
 
 TPPSMonitor::TPPSMonitor(TServer& Server)
     : mServer(Server) {
-    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Starting);
     Application::SetPPS("-");
     Application::RegisterShutdownHandler([&] {
-        Application::SetSubsystemStatus("PPSMonitor", Application::Status::ShuttingDown);
         if (mThread.joinable()) {
-            beammp_debug("shutting down PPSMonitor");
             mShutdown = true;
             mThread.join();
-            beammp_debug("shut down PPSMonitor");
         }
-        Application::SetSubsystemStatus("PPSMonitor", Application::Status::Shutdown);
     });
     Start();
 }
 void TPPSMonitor::operator()() {
     RegisterThread("PPSMonitor");
     while (!mNetwork) {
-        // hard(-ish) spin
-        std::this_thread::yield();
+        // hard spi
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
     }
-    beammp_debug("PPSMonitor starting");
-    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Good);
+    info("PPSMonitor starting");
     std::vector<std::shared_ptr<TClient>> TimedOutClients;
     while (!mShutdown) {
         std::this_thread::sleep_for(std::chrono::seconds(1));
@@ -49,7 +43,7 @@ void TPPSMonitor::operator()() {
             }
             // kick on "no ping"
             if (c->SecondsSinceLastPing() > (20 * 60)) {
-                beammp_debug("client " + std::string("(") + std::to_string(c->GetID()) + ")" + c->GetName() + " timing out: " + std::to_string(c->SecondsSinceLastPing()) + ", pps: " + Application::PPS());
+                debug("client " + std::string("(") + std::to_string(c->GetID()) + ")" + c->GetName() + " timing out: " + std::to_string(c->SecondsSinceLastPing()) + ", pps: " + Application::PPS());
                 TimedOutClients.push_back(c);
             }
 

src/TResourceManager.cpp

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

src/TScopedTimer.cpp

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

src/TSentry.cpp

@@ -12,8 +12,9 @@ TSentry::TSentry() {
         mValid = true;
         sentry_options_t* options = sentry_options_new();
         sentry_options_set_dsn(options, S_DSN);
-        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersionString();
+        sentry_options_set_debug(options, false); // needs to always be false
         sentry_options_set_symbolize_stacktraces(options, true);
+        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersion();
         sentry_options_set_release(options, ReleaseString.c_str());
         sentry_options_set_max_breadcrumbs(options, 10);
         sentry_init(options);
@@ -31,22 +32,22 @@ void TSentry::PrintWelcome() {
         if (!Application::Settings.SendErrors) {
             mValid = false;
             if (Application::Settings.SendErrorsMessageEnabled) {
-                beammp_info("Opted out of error reporting (SendErrors), Sentry disabled.");
+                info("Opted out of error reporting (SendErrors), Sentry disabled.");
             } else {
-                beammp_info("Sentry disabled");
+                info("Sentry disabled");
             }
         } else {
             if (Application::Settings.SendErrorsMessageEnabled) {
-                beammp_info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
+                info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
             } else {
-                beammp_info("Sentry started");
+                info("Sentry started");
             }
         }
     } else {
         if (Application::Settings.SendErrorsMessageEnabled) {
-            beammp_info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
+            info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
         } else {
-            beammp_info("Sentry disabled in unofficial build");
+            info("Sentry disabled in unofficial build");
         }
     }
 }
@@ -55,7 +56,6 @@ void TSentry::SetupUser() {
     if (!mValid) {
         return;
     }
-    Application::SetSubsystemStatus("Sentry", Application::Status::Good);
     sentry_value_t user = sentry_value_new_object();
     if (Application::Settings.Key.size() == 36) {
         sentry_value_set_by_key(user, "id", sentry_value_new_string(Application::Settings.Key.c_str()));

src/TServer.cpp

@@ -3,39 +3,35 @@
 #include "Common.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
-#include <TLuaPlugin.h>
+#include <TLuaFile.h>
 #include <any>
 #include <sstream>
 
-#include <nlohmann/json.hpp>
-
-#include "LuaAPI.h"
-
 #undef GetObject // Fixes Windows
 
 #include "Json.h"
 
-TServer::TServer(const std::vector<std::string_view>& Arguments) {
-    beammp_info("BeamMP Server v" + Application::ServerVersionString());
-    Application::SetSubsystemStatus("Server", Application::Status::Starting);
-    if (Arguments.size() > 1) {
-        Application::Settings.CustomIP = Arguments[0];
+namespace json = rapidjson;
+
+TServer::TServer(int argc, char** argv) {
+    info("BeamMP Server v" + Application::ServerVersion());
+    if (argc > 1) {
+        Application::Settings.CustomIP = argv[1];
         size_t n = std::count(Application::Settings.CustomIP.begin(), Application::Settings.CustomIP.end(), '.');
         auto p = Application::Settings.CustomIP.find_first_not_of(".0123456789");
         if (p != std::string::npos || n != 3 || Application::Settings.CustomIP.substr(0, 3) == "127") {
             Application::Settings.CustomIP.clear();
-            beammp_warn("IP Specified is invalid! Ignoring");
+            warn("IP Specified is invalid! Ignoring");
         } else {
-            beammp_info("server started with custom IP");
+            info("server started with custom IP");
         }
     }
-    Application::SetSubsystemStatus("Server", Application::Status::Good);
 }
 
 void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
     if (!WeakClientPtr.expired()) {
         TClient& Client = *WeakClientPtr.lock();
-        beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
+        debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
         Client.ClearCars();
         WriteLock Lock(mClientsMutex);
         mClients.erase(WeakClientPtr.lock());
@@ -43,7 +39,7 @@ void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
 }
 
 std::weak_ptr<TClient> TServer::InsertNewClient() {
-    beammp_debug("inserting new client (" + std::to_string(ClientCount()) + ")");
+    debug("inserting new client (" + std::to_string(ClientCount()) + ")");
     WriteLock Lock(mClientsMutex);
     auto [Iter, Replaced] = mClients.insert(std::make_shared<TClient>(*this));
     return *Iter;
@@ -69,7 +65,7 @@ size_t TServer::ClientCount() const {
 
 void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
     if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
-        // abort();
+        //abort();
     }
     if (Packet.substr(0, 4) == "ABG:") {
         Packet = DeComp(Packet.substr(4));
@@ -86,7 +82,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
     std::any Res;
     char Code = Packet.at(0);
 
-    // V to Z
+    //V to Z
     if (Code <= 90 && Code >= 86) {
         PPSMonitor.IncrementInternalPPS();
         Network.SendToAll(LockedClient.get(), Packet, false, false);
@@ -94,7 +90,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
     }
     switch (Code) {
     case 'H': // initial connection
-        beammp_trace(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
+        trace(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
         if (!Network.SyncClient(Client)) {
             // TODO handle
         }
@@ -111,38 +107,30 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
         return;
     case 'O':
         if (Packet.length() > 1000) {
-            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.length()));
+            debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.length()));
         }
         ParseVehicle(*LockedClient, Packet, Network);
         return;
     case 'J':
-        beammp_trace(std::string(("got 'J' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'J' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         Network.SendToAll(LockedClient.get(), Packet, false, true);
         return;
-    case 'C': {
-        beammp_trace(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+    case 'C':
+        trace(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         if (Packet.length() < 4 || Packet.find(':', 3) == std::string::npos)
             break;
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 2));
-        TLuaEngine::WaitForAll(Futures);
+        Res = TriggerLuaEvent("onChatMessage", false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 1) } }), true);
         LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1)); // FIXME: this needs to be adjusted once lua is merged
-        if (std::any_of(Futures.begin(), Futures.end(),
-                [](const std::shared_ptr<TLuaResult>& Elem) {
-                    return !Elem->Error
-                        && Elem->Result.is<int>()
-                        && bool(Elem->Result.as<int>());
-                })) {
+        if (std::any_cast<int>(Res))
             break;
-        }
         Network.SendToAll(nullptr, Packet, true, true);
         return;
-    }
     case 'E':
-        beammp_trace(std::string(("got 'E' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'E' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         HandleEvent(*LockedClient, Packet);
         return;
     case 'N':
-        beammp_trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
+        trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
         Network.SendToAll(LockedClient.get(), Packet, false, true);
         return;
     default:
@@ -160,7 +148,7 @@ void TServer::HandleEvent(TClient& c, const std::string& Data) {
             Name = t;
             break;
         case 2:
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.GetID(), t));
+            TriggerLuaEvent(Name, false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), t } }), false);
             break;
         default:
             break;
@@ -171,25 +159,27 @@ void TServer::HandleEvent(TClient& c, const std::string& Data) {
     }
 }
 bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
-    try {
-        auto Car = nlohmann::json::parse(CarJson);
-        const std::string jbm = "jbm";
-        if (Car.contains(jbm) && Car[jbm].is_string() && Car[jbm] == "unicycle") {
-            return true;
-        }
-    } catch (const std::exception& e) {
-        beammp_error("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'");
+    rapidjson::Document Car;
+    Car.Parse(CarJson.c_str(), CarJson.size());
+    if (Car.HasParseError()) {
+        error("Failed to parse vehicle data -> " + CarJson);
+    } else if (Car["jbm"].IsString() && std::string(Car["jbm"].GetString()) == "unicycle") {
+        return true;
     }
     return false;
 }
-
 bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
-    if (IsUnicycle(c, CarJson) && c.GetUnicycleID() < 0) {
+
+    if (c.GetUnicycleID() > -1 && (c.GetCarCount() - 1) < Application::Settings.MaxCars) {
+        return true;
+    }
+
+    if (IsUnicycle(c, CarJson)) {
         c.SetUnicycleID(ID);
         return true;
-    } else {
-        return c.GetCarCount() < Application::Settings.MaxCars;
     }
+
+    return Application::Settings.MaxCars > c.GetCarCount();
 }
 
 void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network) {
@@ -200,23 +190,18 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
     int PID = -1;
     int VID = -1, Pos;
     std::string Data = Packet.substr(3), pid, vid;
-    switch (Code) { // Spawned Destroyed Switched/Moved NotFound Reset
+    switch (Code) { //Spawned Destroyed Switched/Moved NotFound Reset
     case 's':
-        beammp_trace(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         if (Data.at(0) == '0') {
             int CarID = c.GetOpenCarID();
-            beammp_debug(c.GetName() + (" created a car with ID ") + std::to_string(CarID));
+            debug(c.GetName() + (" created a car with ID ") + std::to_string(CarID));
 
             std::string CarJson = Packet.substr(5);
             Packet = "Os:" + c.GetRoles() + ":" + c.GetName() + ":" + std::to_string(c.GetID()) + "-" + std::to_string(CarID) + ":" + CarJson;
-            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleSpawn", "", c.GetID(), CarID, Packet.substr(3));
-            TLuaEngine::WaitForAll(Futures);
-            bool ShouldntSpawn = std::any_of(Futures.begin(), Futures.end(),
-                [](const std::shared_ptr<TLuaResult>& Result) {
-                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
-                });
+            auto Res = TriggerLuaEvent(("onVehicleSpawn"), false, nullptr, std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), CarID, Packet.substr(3) } }), true);
 
-            if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn) {
+            if (ShouldSpawn(c, CarJson, CarID) && std::any_cast<int>(Res) == 0) {
                 c.AddNewCar(CarID, Packet);
                 Network.SendToAll(nullptr, Packet, true, true);
             } else {
@@ -227,12 +212,12 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
                 if (!Network.Respond(c, Destroy, true)) {
                     // TODO: handle
                 }
-                beammp_debug(c.GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
+                debug(c.GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
             }
         }
         return;
     case 'c':
-        beammp_trace(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         pid = Data.substr(0, Data.find('-'));
         vid = Data.substr(Data.find('-') + 1, Data.find(':', 1) - Data.find('-') - 1);
         if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
@@ -240,17 +225,14 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
             VID = stoi(vid);
         }
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
-            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleEdited", "", c.GetID(), VID, Packet.substr(3));
-            TLuaEngine::WaitForAll(Futures);
-            bool ShouldntAllow = std::any_of(Futures.begin(), Futures.end(),
-                [](const std::shared_ptr<TLuaResult>& Result) {
-                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
-                });
+            auto Res = TriggerLuaEvent(("onVehicleEdited"), false, nullptr,
+                std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), VID, Packet.substr(3) } }),
+                true);
 
             auto FoundPos = Packet.find('{');
             FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
             if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
-                && !ShouldntAllow) {
+                && std::any_cast<int>(Res) == 0) {
                 Network.SendToAll(&c, Packet, false, true);
                 Apply(c, VID, Packet);
             } else {
@@ -266,7 +248,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         }
         return;
     case 'd':
-        beammp_trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         pid = Data.substr(0, Data.find('-'));
         vid = Data.substr(Data.find('-') + 1);
         if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
@@ -278,14 +260,14 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
                 c.SetUnicycleID(-1);
             }
             Network.SendToAll(nullptr, Packet, true, true);
-            // TODO: should this trigger on all vehicle deletions?
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
+            TriggerLuaEvent(("onVehicleDeleted"), false, nullptr,
+                std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), VID } }), false);
             c.DeleteCar(VID);
-            beammp_debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
+            debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
         }
         return;
     case 'r':
-        beammp_trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         Pos = int(Data.find('-'));
         pid = Data.substr(0, Pos++);
         vid = Data.substr(Pos, Data.find(':') - Pos);
@@ -297,19 +279,18 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
 
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
             Data = Data.substr(Data.find('{'));
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
+            TriggerLuaEvent("onVehicleReset", false, nullptr,
+                std::make_unique<TLuaArg>(TLuaArg { { c.GetID(), VID, Data } }),
+                false);
             Network.SendToAll(&c, Packet, false, true);
         }
         return;
     case 't':
-        beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         Network.SendToAll(&c, Packet, false, true);
         return;
-    case 'm':
-        Network.SendToAll(&c, Packet, true, true);
-        return;
     default:
-        beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
+        trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
         return;
     }
 }
@@ -317,13 +298,13 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
 void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
     auto FoundPos = pckt.find('{');
     if (FoundPos == std::string::npos) {
-        beammp_error("Malformed packet received, no '{' found");
+        error("Malformed packet received, no '{' found");
         return;
     }
     std::string Packet = pckt.substr(FoundPos);
     std::string VD = c.GetCarData(VID);
     if (VD.empty()) {
-        beammp_error("Tried to apply change to vehicle that does not exist");
+        error("Tried to apply change to vehicle that does not exist");
         auto Lock = Sentry.CreateExclusiveContext();
         Sentry.SetContext("vehicle-change",
             { { "packet", Packet },
@@ -340,18 +321,19 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
         Sentry.SetContext("vehicle-change-packet",
             { { "packet", VD } });
         Sentry.LogError("malformed packet", _file_basename, _line);
+        error("Malformed packet received, no '{' found");
         return;
     }
     VD = VD.substr(FoundPos);
     rapidjson::Document Veh, Pack;
     Veh.Parse(VD.c_str());
     if (Veh.HasParseError()) {
-        beammp_error("Could not get vehicle config!");
+        error("Could not get vehicle config!");
         return;
     }
     Pack.Parse(Packet.c_str());
     if (Pack.HasParseError() || Pack.IsNull()) {
-        beammp_error("Could not get active vehicle config!");
+        error("Could not get active vehicle config!");
         return;
     }
 
@@ -369,7 +351,7 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
 }
 
 void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
-    beammp_debug("inserting client (" + std::to_string(ClientCount()) + ")");
-    WriteLock Lock(mClientsMutex); // TODO why is there 30+ threads locked here
+    debug("inserting client (" + std::to_string(ClientCount()) + ")");
+    WriteLock Lock(mClientsMutex); //TODO why is there 30+ threads locked here
     (void)mClients.insert(NewClient);
 }

src/VehicleData.cpp

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

src/main.cpp

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