add Stress ;)

.github/workflows/cmake-linux.yml

@@ -7,7 +7,7 @@ env:
 
 jobs:
   linux-build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
@@ -20,7 +20,7 @@ jobs:
         run: |
           echo ${#beammp_sentry_url}
           sudo apt-get update
-          sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10 libboost1.74-all-dev
+          sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build-linux
@@ -56,7 +56,7 @@ jobs:
 
   run-tests:
     needs: linux-build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/download-artifact@master
@@ -68,7 +68,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update
-          sudo apt-get install -y liblua5.3-0 libssl3 curl
+          sudo apt-get install -y liblua5.3 openssl 
 
       - name: Test
         working-directory: ${{github.workspace}}

.github/workflows/cmake-windows.yml

@@ -20,7 +20,7 @@ jobs:
         with:
             vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: "06b5f4a769d848d1a20fa0acd556019728b56273"
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

.github/workflows/release-build.yml

@@ -32,7 +32,7 @@ jobs:
 
   upload-release-files-linux:
     name: Upload Linux Release Files
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: create-release
     steps:
       - uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
       - name: Install Dependencies
         run: |
             sudo apt-get update
-            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev libboost-dev libboost1.74-all-dev libboost1.74-dev
+            sudo apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build-linux
@@ -85,7 +85,7 @@ jobs:
         with:
             vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
+            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

CMakeLists.txt

@@ -26,43 +26,43 @@ endif()
 set(HTTPLIB_REQUIRE_OPENSSL ON)
 set(SENTRY_BUILD_SHARED_LIBS OFF)
 
-add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps")
 
-option(WIN32_STATIC_RUNTIME "Build statically-linked runtime on windows (don't touch unless you know what you're doing)" ON)
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
 
 # ------------------------ APPLE ---------------------------------
 if(APPLE)
-    if(IS_DIRECTORY /opt/homebrew/Cellar/lua@5.3/5.3.6)
+    set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
-        set(LUA_INCLUDE_DIR /opt/homebrew/Cellar/lua@5.3/5.3.6/include/lua5.3)
-        link_directories(/opt/homebrew/Cellar/lua@5.3/5.3.6/lib)
-    else()
-        set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
-        link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
-    endif()
     set(LUA_LIBRARIES lua)
-    if(IS_DIRECTORY /opt/homebrew/opt/openssl@1.1)
+    include_directories(/usr/local/opt/openssl@1.1/include)
-        include_directories(/opt/homebrew/opt/openssl@1.1/include)
+    link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
-        link_directories(/opt/homebrew/opt/openssl@1.1/lib)
+    link_directories(/usr/local/opt/openssl@1.1/lib)
-    else()
-        include_directories(/usr/local/opt/openssl@1.1/include)
-        link_directories(/usr/local/opt/openssl@1.1/lib)
-    endif()
 # ------------------------ WINDOWS ---------------------------------
 elseif (WIN32)
-    if (WIN32_STATIC_RUNTIME)
+    # this has to happen before sentry, so that crashpad on windows links with these settings.
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    message(STATUS "MSVC -> forcing use of statically-linked runtime.")
-    endif()
+    STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-# ------------------------ UNIX ------------------------------------
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+# ------------------------ LINUX ---------------------------------
 elseif (UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++ -static-libgcc")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
     option(SANITIZE "Turns on thread and UB sanitizers" OFF)
     if (SANITIZE)
         message(STATUS "sanitize is ON")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize={address,thread,undefined}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,thread")
     endif (SANITIZE)
 endif ()
 
+include_directories("include/sentry-native/include")
 set(BUILD_SHARED_LIBS OFF)
 # ------------------------ SENTRY ---------------------------------
 message(STATUS "Checking for Sentry URL")
@@ -80,6 +80,9 @@ add_subdirectory("deps/sentry-native")
 
 # ------------------------ C++ SETUP ---------------------------------
 set(CMAKE_CXX_STANDARD 17)
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+endif ()
 
 # ------------------------ DEPENDENCIES ------------------------------
 message(STATUS "Adding local source dependencies")
@@ -93,8 +96,6 @@ include(FindOpenSSL)
 include(FindThreads)
 include(FindZLIB)
 
-find_package(Boost 1.70 REQUIRED COMPONENTS system)
-
 set(BeamMP_Sources
     include/TConsole.h src/TConsole.cpp
     include/TServer.h src/TServer.cpp
@@ -117,72 +118,23 @@ set(BeamMP_Sources
     include/ArgsParser.h src/ArgsParser.cpp
     include/TPluginMonitor.h src/TPluginMonitor.cpp
     include/Environment.h
-    include/BoostAliases.h
 )
 
 set(BeamMP_Includes
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/commandline"
     ${LUA_INCLUDE_DIR}
     ${CURL_INCLUDE_DIRS}
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib"
+    "include/tomlplusplus"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline"
+    "include/sentry-native/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include"
+    "include/curl/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/deps"
 )
 
 set(BeamMP_Definitions
     SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
 )
 
-if (WIN32)
-    list(APPEND BeamMP_Definitions _WIN32_WINNT=0x0601)
-    list(APPEND BeamMP_Definitions _CRT_SECURE_NO_WARNINGS)
-endif()
-if (UNIX)
-    set(BeamMP_CompileOptions
-        -Wall
-        -Wextra
-        -Wpedantic
-    
-        -Werror=uninitialized
-        -Werror=float-equal
-        -Werror=pointer-arith
-        -Werror=double-promotion
-        -Werror=write-strings
-        -Werror=cast-qual
-        -Werror=init-self
-        -Werror=cast-align
-        -Werror=unreachable-code
-        -Werror=strict-aliasing -fstrict-aliasing
-        -Werror=redundant-decls
-        -Werror=missing-declarations
-        -Werror=missing-field-initializers
-        -Werror=write-strings
-        -Werror=ctor-dtor-privacy
-        -Werror=switch-enum
-        -Werror=switch-default
-        -Werror=old-style-cast
-        -Werror=overloaded-virtual
-        -Werror=overloaded-virtual
-        -Werror=missing-include-dirs
-        -Werror=unused-result
-
-        -fstack-protector
-        -Wzero-as-null-pointer-constant
-    )
-else()
-
-    set(BeamMP_CompileOptions
-        /bigobj
-        /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMT
-    )
-endif()
-
 set(BeamMP_Libraries
-    Boost::boost
-    Boost::system
     doctest::doctest
     OpenSSL::SSL
     OpenSSL::Crypto
@@ -211,15 +163,7 @@ target_compile_definitions(BeamMP-Server PRIVATE
     DOCTEST_CONFIG_DISABLE
 )
 
-target_compile_options(BeamMP-Server PRIVATE 
+target_include_directories(BeamMP-Server PUBLIC 
-    ${BeamMP_CompileOptions}
-)
-
-target_include_directories(BeamMP-Server PRIVATE
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-)
-
-target_include_directories(BeamMP-Server SYSTEM PRIVATE
     ${BeamMP_Includes}
 )
 
@@ -241,19 +185,11 @@ if(BUILD_TESTS)
     target_compile_definitions(BeamMP-Server-tests PRIVATE
         ${BeamMP_Definitions}
     )
-    
-    target_compile_options(BeamMP-Server-tests PRIVATE 
-       ${BeamMP_CompileOptions}
-    )
 
-    target_include_directories(BeamMP-Server-tests PRIVATE
+    target_include_directories(BeamMP-Server-tests PUBLIC
-        "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    )
-
-    target_include_directories(BeamMP-Server-tests SYSTEM PRIVATE
         ${BeamMP_Includes}
     )
-    
+
     target_link_libraries(BeamMP-Server-tests
         ${BeamMP_Libraries}
         ${BeamMP_PlatformLibs}

CONTRIBUTING.md

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

Changelog.md

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

README.md

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

deps/CMakeLists.txt

@@ -1,4 +1,5 @@
 include_directories("${PROJECT_SOURCE_DIR}/deps")
+include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")

include/BoostAliases.h

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

include/Client.h

@@ -7,7 +7,6 @@
 #include <string>
 #include <unordered_set>
 
-#include "BoostAliases.h"
 #include "Common.h"
 #include "Compat.h"
 #include "VehicleData.h"
@@ -20,8 +19,9 @@ class TServer;
 #endif // WINDOWS
 
 struct TConnection final {
-    ip::tcp::socket Socket;
+    SOCKET Socket;
-    ip::tcp::endpoint SockAddr;
+    struct sockaddr SockAddr;
+    socklen_t SockAddrLen;
 };
 
 class TClient final {
@@ -33,34 +33,27 @@ public:
         std::unique_lock<std::mutex> Lock;
     };
 
-    TClient(TServer& Server, ip::tcp::socket&& Socket);
+    explicit TClient(TServer& Server);
     TClient(const TClient&) = delete;
-    ~TClient();
     TClient& operator=(const TClient&) = delete;
 
     void AddNewCar(int Ident, const std::string& Data);
     void SetCarData(int Ident, const std::string& Data);
-    void SetCarPosition(int Ident, const std::string& Data);
     TVehicleDataLockPair GetAllCars();
     void SetName(const std::string& Name) { mName = Name; }
     void SetRoles(const std::string& Role) { mRole = Role; }
     void SetIdentifier(const std::string& key, const std::string& value) { mIdentifiers[key] = value; }
     std::string GetCarData(int Ident);
-    std::string GetCarPositionRaw(int Ident);
+    void SetUDPAddr(sockaddr_in Addr) { mUDPAddress = Addr; }
-    void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
+    void SetDownSock(SOCKET CSock) { mSocket[1] = CSock; }
-    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
+    void SetTCPSock(SOCKET CSock) { mSocket[0] = CSock; }
-    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
+    void SetStatus(int Status) { mStatus = Status; }
-    void Disconnect(std::string_view Reason);
-    bool IsDisconnected() const { return !mSocket.is_open(); }
     // locks
     void DeleteCar(int Ident);
     [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
-    [[nodiscard]] const ip::udp::endpoint& GetUDPAddr() const { return mUDPAddress; }
+    [[nodiscard]] sockaddr_in GetUDPAddr() const { return mUDPAddress; }
-    [[nodiscard]] ip::udp::endpoint& GetUDPAddr() { return mUDPAddress; }
+    [[nodiscard]] SOCKET GetDownSock() const { return mSocket[1]; }
-    [[nodiscard]] ip::tcp::socket& GetDownSock() { return mDownSocket; }
+    [[nodiscard]] SOCKET GetTCPSock() const { return mSocket[0]; }
-    [[nodiscard]] const ip::tcp::socket& GetDownSock() const { return mDownSocket; }
-    [[nodiscard]] ip::tcp::socket& GetTCPSock() { return mSocket; }
-    [[nodiscard]] const ip::tcp::socket& GetTCPSock() const { return mSocket; }
     [[nodiscard]] std::string GetRoles() const { return mRole; }
     [[nodiscard]] std::string GetName() const { return mName; }
     void SetUnicycleID(int ID) { mUnicycleID = ID; }
@@ -68,6 +61,7 @@ public:
     [[nodiscard]] int GetOpenCarID() const;
     [[nodiscard]] int GetCarCount() const;
     void ClearCars();
+    [[nodiscard]] int GetStatus() const { return mStatus; }
     [[nodiscard]] int GetID() const { return mID; }
     [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
     [[nodiscard]] bool IsConnected() const { return mIsConnected; }
@@ -77,9 +71,9 @@ public:
     void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
     void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
     void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
-    void EnqueuePacket(const std::vector<uint8_t>& Packet);
+    void EnqueuePacket(const std::string& Packet);
-    [[nodiscard]] std::queue<std::vector<uint8_t>>& MissedPacketQueue() { return mPacketsSync; }
+    [[nodiscard]] std::queue<std::string>& MissedPacketQueue() { return mPacketsSync; }
-    [[nodiscard]] const std::queue<std::vector<uint8_t>>& MissedPacketQueue() const { return mPacketsSync; }
+    [[nodiscard]] const std::queue<std::string>& MissedPacketQueue() const { return mPacketsSync; }
     [[nodiscard]] size_t MissedPacketQueueSize() const { return mPacketsSync.size(); }
     [[nodiscard]] std::mutex& MissedPacketQueueMutex() const { return mMissedPacketsMutex; }
     void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
@@ -95,20 +89,18 @@ private:
     bool mIsSynced = false;
     bool mIsSyncing = false;
     mutable std::mutex mMissedPacketsMutex;
-    std::queue<std::vector<uint8_t>> mPacketsSync;
+    std::queue<std::string> mPacketsSync;
     std::unordered_map<std::string, std::string> mIdentifiers;
     bool mIsGuest = false;
     mutable std::mutex mVehicleDataMutex;
-    mutable std::mutex mVehiclePositionMutex;
     TSetOfVehicleData mVehicleData;
-    SparseArray<std::string> mVehiclePosition;
     std::string mName = "Unknown Client";
-    ip::tcp::socket mSocket;
+    SOCKET mSocket[2] { SOCKET(0), SOCKET(0) };
-    ip::tcp::socket mDownSocket;
+    sockaddr_in mUDPAddress {}; // is this initialization OK? yes it is
-    ip::udp::endpoint mUDPAddress {};
     int mUnicycleID = -1;
     std::string mRole;
     std::string mDID;
+    int mStatus = 0;
     int mID = -1;
     std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime;
 };

include/Common.h

@@ -14,13 +14,14 @@ extern TSentry Sentry;
 #include <mutex>
 #include <shared_mutex>
 #include <sstream>
-#include <unordered_map>
 #include <zlib.h>
 
 #include <doctest/doctest.h>
 #include <filesystem>
 namespace fs = std::filesystem;
 
+#include "Compat.h"
+
 #include "TConsole.h"
 
 struct Version {
@@ -32,9 +33,6 @@ struct Version {
     std::string AsString();
 };
 
-template <typename T>
-using SparseArray = std::unordered_map<size_t, T>;
-
 // static class handling application start, shutdown, etc.
 // yes, static classes, singletons, globals are all pretty
 // bad idioms. In this case we need a central way to access
@@ -49,7 +47,6 @@ public:
         std::string Resource { "Resources" };
         std::string MapName { "/levels/gridmap_v2/info.json" };
         std::string Key {};
-        std::string Password{};
         std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
         std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
         bool HTTPServerEnabled { false };
@@ -81,7 +78,7 @@ public:
     static TConsole& Console() { return *mConsole; }
     static std::string ServerVersionString();
     static const Version& ServerVersion() { return mVersion; }
-    static uint8_t ClientMajorVersion() { return 2; }
+    static std::string ClientVersionString() { return "2.0"; }
     static std::string PPS() { return mPPS; }
     static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }
 
@@ -138,7 +135,7 @@ private:
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
 
-    static inline Version mVersion { 3, 1, 1 };
+    static inline Version mVersion { 3, 1, 0 };
 };
 
 std::string ThreadName(bool DebugModeOverride = false);
@@ -276,11 +273,11 @@ inline T Comp(const T& Data) {
     // obsolete
     C.fill(0);
     z_stream defstream;
-    defstream.zalloc = nullptr;
+    defstream.zalloc = Z_NULL;
-    defstream.zfree = nullptr;
+    defstream.zfree = Z_NULL;
-    defstream.opaque = nullptr;
+    defstream.opaque = Z_NULL;
-    defstream.avail_in = uInt(Data.size());
+    defstream.avail_in = (uInt)Data.size();
-    defstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Data[0]));
+    defstream.next_in = (Bytef*)&Data[0];
     defstream.avail_out = Biggest;
     defstream.next_out = reinterpret_cast<Bytef*>(C.data());
     deflateInit(&defstream, Z_BEST_COMPRESSION);
@@ -301,13 +298,13 @@ inline T DeComp(const T& Compressed) {
     // not needed
     C.fill(0);
     z_stream infstream;
-    infstream.zalloc = nullptr;
+    infstream.zalloc = Z_NULL;
-    infstream.zfree = nullptr;
+    infstream.zfree = Z_NULL;
-    infstream.opaque = nullptr;
+    infstream.opaque = Z_NULL;
     infstream.avail_in = Biggest;
-    infstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Compressed[0]));
+    infstream.next_in = (Bytef*)(&Compressed[0]);
     infstream.avail_out = Biggest;
-    infstream.next_out = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(C.data()));
+    infstream.next_out = (Bytef*)(C.data());
     inflateInit(&infstream);
     inflate(&infstream, Z_SYNC_FLUSH);
     inflate(&infstream, Z_FINISH);
@@ -322,3 +319,5 @@ inline T DeComp(const T& Compressed) {
 
 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW
+
+void LogChatMessage(const std::string& name, int id, const std::string& msg);

include/Compat.h

@@ -5,23 +5,54 @@
 // ======================= UNIX ========================
 
 #ifdef BEAMMP_LINUX
+#include <arpa/inet.h>
 #include <errno.h>
+#include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+using SOCKET = int;
+using DWORD = unsigned long;
+using PDWORD = unsigned long*;
+using LPDWORD = unsigned long*;
 char _getch();
+inline void CloseSocketProper(int TheSocket) {
+    shutdown(TheSocket, SHUT_RDWR);
+    close(TheSocket);
+}
 #endif // unix
 
 // ======================= APPLE ========================
 
 #ifdef BEAMMP_APPLE
+#include <arpa/inet.h>
 #include <errno.h>
+#include <sys/socket.h>
 #include <termios.h>
 #include <unistd.h>
+using SOCKET = int;
+using DWORD = unsigned long;
+using PDWORD = unsigned long*;
+using LPDWORD = unsigned long*;
 char _getch();
+inline void CloseSocketProper(int TheSocket) {
+    shutdown(TheSocket, SHUT_RDWR);
+    close(TheSocket);
+}
 #endif // unix
 
 // ======================= WINDOWS =======================
 
 #ifdef BEAMMP_WINDOWS
 #include <conio.h>
+#include <winsock2.h>
+inline void CloseSocketProper(SOCKET TheSocket) {
+    shutdown(TheSocket, 2); // 2 == SD_BOTH
+    closesocket(TheSocket);
+}
 #endif // WIN32
+
+#ifdef INVALID_SOCKET
+static inline constexpr int BEAMMP_INVALID_SOCKET = INVALID_SOCKET;
+#else
+static inline constexpr int BEAMMP_INVALID_SOCKET = -1;
+#endif

include/CustomAssert.h

@@ -58,17 +58,16 @@ 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)
 #else
-#define beammp_assert(cond)                                                            \
+// In release build, these macros turn into NOPs. The compiler will optimize these out.
-    do {                                                                               \
+#define beammp_assert(cond)                                           \
-        bool result = (cond);                                                          \
+    do {                                                              \
-        if (!result) {                                                                 \
+        bool result = (cond);                                         \
-            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
+        if (!result) {                                                \
-            Sentry.LogAssert(#cond, _file_basename, _line, __func__);                  \
+            Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
-        }                                                                              \
+        }                                                             \
     } while (false)
-#define beammp_assert_not_reachable()                                                      \
+#define beammp_assert_not_reachable()                                             \
-    do {                                                                                   \
+    do {                                                                          \
-        beammp_errorf("Assertion failed in '{}:{}': Unreachable code reached. This may result in a crash or undefined state of the program.", __func__, _line); \
+        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__); \
-        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__);          \
     } while (false)
 #endif // DEBUG

include/Http.h

@@ -9,8 +9,6 @@
 #if defined(BEAMMP_LINUX)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 #include <httplib.h>
 #if defined(BEAMMP_LINUX)

include/LuaAPI.h

@@ -12,12 +12,12 @@ namespace MP {
 
     std::string GetOSName();
     std::tuple<int, int, int> GetServerVersion();
-    std::pair<bool, std::string> TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
+    bool TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
-    std::pair<bool, std::string> TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
+    bool TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
     inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
-    std::pair<bool, std::string> DropPlayer(int ID, std::optional<std::string> MaybeReason);
+    void DropPlayer(int ID, std::optional<std::string> MaybeReason);
-    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
+    void SendChatMessage(int ID, const std::string& Message);
-    std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);
+    void RemoveVehicle(int PlayerID, int VehicleID);
     void Set(int ConfigID, sol::object NewValue);
     bool IsPlayerGuest(int ID);
     bool IsPlayerConnected(int ID);

include/TLuaEngine.h

@@ -25,12 +25,11 @@ namespace fs = std::filesystem;
 /**
  * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
  */
-using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool, std::unordered_map<std::string, std::string>>;
+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;
-static constexpr size_t TLuaArgTypes_StringStringMap = 4;
 
 class TLuaPlugin;
 
@@ -41,14 +40,7 @@ struct TLuaResult {
     sol::object Result { sol::lua_nil };
     TLuaStateId StateId;
     std::string Function;
-    std::shared_ptr<std::mutex> ReadyMutex {
+    // TODO: Add condition_variable
-        std::make_shared<std::mutex>()
-    };
-    std::shared_ptr<std::condition_variable> ReadyCondition {
-        std::make_shared<std::condition_variable>()
-    };
-
-    void MarkAsReady();
     void WaitUntilReady();
 };
 
@@ -83,7 +75,7 @@ public:
     };
 
     TLuaEngine();
-    virtual ~TLuaEngine() noexcept {
+    ~TLuaEngine() noexcept {
         beammp_debug("Lua Engine terminated");
     }
 
@@ -104,13 +96,6 @@ public:
         std::unique_lock Lock(mLuaStatesMutex);
         return mLuaStates.size();
     }
-    std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names {};
-        for (auto const& [stateId, _] : mLuaStates) {
-            names.push_back(stateId);
-        }
-        return names;
-    }
     size_t GetTimedEventsCount() {
         std::unique_lock Lock(mTimedEventsMutex);
         return mTimedEvents.size();
@@ -187,7 +172,6 @@ public:
     static constexpr const char* BeamMPFnNotFoundError = "BEAMMP_FN_NOT_FOUND";
 
     std::vector<std::string> GetStateGlobalKeysForState(TLuaStateId StateId);
-    std::vector<std::string> GetStateTableKeysForState(TLuaStateId StateId, std::vector<std::string> keys);
 
     // Debugging functions (slow)
     std::unordered_map<std::string /*event name */, std::vector<std::string> /* handlers */> Debug_GetEventsForState(TLuaStateId StateId);
@@ -205,7 +189,7 @@ private:
     public:
         StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
         StateThreadData(const StateThreadData&) = delete;
-        virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
+        ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
         [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy);
@@ -215,7 +199,6 @@ private:
         sol::state_view State() { return sol::state_view(mState); }
 
         std::vector<std::string> GetStateGlobalKeys();
-        std::vector<std::string> GetStateTableKeys(const std::vector<std::string>& keys);
 
         // Debug functions, slow
         std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
@@ -228,7 +211,6 @@ private:
         sol::table Lua_GetPlayers();
         std::string Lua_GetPlayerName(int ID);
         sol::table Lua_GetPlayerVehicles(int ID);
-        std::pair<sol::table, std::string> Lua_GetPositionRaw(int PID, int VID);
         sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
         sol::table Lua_JsonDecode(const std::string& str);
         int Lua_GetPlayerIDByName(const std::string& Name);

include/TNetwork.h

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

include/TServer.h

@@ -8,8 +8,6 @@
 #include <mutex>
 #include <unordered_set>
 
-#include "BoostAliases.h"
-
 class TClient;
 class TNetwork;
 class TPPSMonitor;
@@ -21,35 +19,23 @@ public:
     TServer(const std::vector<std::string_view>& Arguments);
 
     void InsertClient(const std::shared_ptr<TClient>& Ptr);
+    std::weak_ptr<TClient> InsertNewClient();
     void RemoveClient(const std::weak_ptr<TClient>&);
     // in Fn, return true to continue, return false to break
     void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
     size_t ClientCount() const;
 
-    static void GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
+    static void GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
     static void HandleEvent(TClient& c, const std::string& Data);
     RWMutex& GetClientMutex() const { return mClientsMutex; }
 
+    
     const TScopedTimer UptimeTimer;
-
-    // asio io context
-    io_context& IoCtx() { return mIoCtx; }
-
 private:
-    io_context mIoCtx {};
     TClientSet mClients;
     mutable RWMutex mClientsMutex;
     static void ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network);
     static bool ShouldSpawn(TClient& c, const std::string& CarJson, int ID);
     static bool IsUnicycle(TClient& c, const std::string& CarJson);
     static void Apply(TClient& c, int VID, const std::string& pckt);
-    static void HandlePosition(TClient& c, const std::string& Packet);
-};
-
-struct BufferView {
-    uint8_t* Data { nullptr };
-    size_t Size { 0 };
-    const uint8_t* data() const { return Data; }
-    uint8_t* data() { return Data; }
-    size_t size() const { return Size; }
 };

src/Client.cpp

@@ -6,7 +6,6 @@
 #include <optional>
 
 void TClient::DeleteCar(int Ident) {
-    // TODO: Send delete packets
     std::unique_lock lock(mVehicleDataMutex);
     auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {
         return Ident == elem.ID();
@@ -48,34 +47,6 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {
     return { &mVehicleData, std::unique_lock(mVehicleDataMutex) };
 }
 
-std::string TClient::GetCarPositionRaw(int Ident) {
-    std::unique_lock lock(mVehiclePositionMutex);
-    try {
-        return mVehiclePosition.at(Ident);
-    } catch (const std::out_of_range& oor) {
-        return "";
-    }
-    return "";
-}
-
-void TClient::Disconnect(std::string_view Reason) {
-    beammp_debugf("Disconnecting client {} for reason: {}", GetID(), Reason);
-    boost::system::error_code ec;
-    mSocket.shutdown(socket_base::shutdown_both, ec);
-    if (ec) {
-        beammp_debugf("Failed to shutdown client socket: {}", ec.message());
-    }
-    mSocket.close(ec);
-    if (ec) {
-        beammp_debugf("Failed to close client socket: {}", ec.message());
-    }
-}
-
-void TClient::SetCarPosition(int Ident, const std::string& Data) {
-    std::unique_lock lock(mVehiclePositionMutex);
-    mVehiclePosition[Ident] = Data;
-}
-
 std::string TClient::GetCarData(int Ident) {
     { // lock
         std::unique_lock lock(mVehicleDataMutex);
@@ -110,22 +81,16 @@ TServer& TClient::Server() const {
     return mServer;
 }
 
-void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
+void TClient::EnqueuePacket(const std::string& Packet) {
     std::unique_lock Lock(mMissedPacketsMutex);
     mPacketsSync.push(Packet);
 }
 
-TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
+TClient::TClient(TServer& Server)
     : mServer(Server)
-    , mSocket(std::move(Socket))
-    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
     , mLastPingTime(std::chrono::high_resolution_clock::now()) {
 }
 
-TClient::~TClient() {
-    beammp_debugf("client destroyed: {} ('{}')", this->GetID(), this->GetName());
-}
-
 void TClient::UpdatePingTime() {
     mLastPingTime = std::chrono::high_resolution_clock::now();
 }

src/Common.cpp

@@ -9,7 +9,6 @@
 #include <sstream>
 #include <thread>
 
-#include "Compat.h"
 #include "CustomAssert.h"
 #include "Http.h"
 
@@ -171,8 +170,6 @@ void Application::SetSubsystemStatus(const std::string& Subsystem, Status status
     case Status::Shutdown:
         beammp_trace("Subsystem '" + Subsystem + "': Shutdown");
         break;
-    default:
-        beammp_assert_not_reachable();
     }
     std::unique_lock Lock(mSystemStatusMapMutex);
     mSystemStatusMap[Subsystem] = status;
@@ -198,7 +195,7 @@ void Application::CheckForUpdates() {
     // checks current version against latest version
     std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
     for (const auto& url : GetBackendUrlsInOrder()) {
-        auto Response = Http::GET(url, 443, "/v/s");
+        auto Response = Http::GET(GetBackendUrlsInOrder().at(0), 443, "/v/s");
         bool Matches = std::regex_match(Response, VersionRegex);
         if (Matches) {
             auto MyVersion = ServerVersion();
@@ -350,7 +347,5 @@ std::string GetPlatformAgnosticErrorString() {
     }
 #elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
     return std::strerror(errno);
-#else
-    return "(no human-readable errors on this platform)";
 #endif
 }

src/Compat.cpp

@@ -7,7 +7,7 @@
 
 static struct termios old, current;
 
-static void initTermios(int echo) {
+void initTermios(int echo) {
     tcgetattr(0, &old); /* grab old terminal i/o settings */
     current = old; /* make new settings same as old settings */
     current.c_lflag &= ~ICANON; /* disable buffered i/o */
@@ -19,7 +19,7 @@ static void initTermios(int echo) {
     tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
 }
 
-static void resetTermios(void) {
+void resetTermios(void) {
     tcsetattr(0, TCSANOW, &old);
 }
 
@@ -36,23 +36,14 @@ TEST_CASE("init and reset termios") {
         resetTermios();
         struct termios current;
         tcgetattr(0, &current);
-        CHECK_EQ(std::memcmp(&current.c_cc, &original.c_cc, sizeof(current.c_cc)), 0);
+        CHECK(std::memcmp(&original, &current, sizeof(struct termios)) == 0);
-        CHECK_EQ(current.c_cflag, original.c_cflag);
-        CHECK_EQ(current.c_iflag, original.c_iflag);
-        CHECK_EQ(current.c_ispeed, original.c_ispeed);
-        CHECK_EQ(current.c_lflag, original.c_lflag);
-        CHECK_EQ(current.c_line, original.c_line);
-        CHECK_EQ(current.c_oflag, original.c_oflag);
-        CHECK_EQ(current.c_ospeed, original.c_ospeed);
     }
 }
 
-static char getch_(int echo) {
+char getch_(int echo) {
     char ch;
     initTermios(echo);
-    if (read(STDIN_FILENO, &ch, 1) < 0) {
+    read(STDIN_FILENO, &ch, 1);
-        // ignore, not much we can do
-    }
     resetTermios();
     return ch;
 }

src/Http.cpp

@@ -4,6 +4,7 @@
 #include "Common.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
+#include "httplib.h"
 
 #include <map>
 #include <nlohmann/json.hpp>
@@ -176,8 +177,6 @@ void Http::Server::THttpServerInstance::operator()() try {
             case Application::Status::Bad:
                 SystemsBad++;
                 break;
-            default:
-                beammp_assert_not_reachable();
             }
         }
         res.set_content(

src/LuaAPI.cpp

@@ -1,7 +1,6 @@
 #include "LuaAPI.h"
 #include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
 #include "TLuaEngine.h"
 
 #include <nlohmann/json.hpp>
@@ -75,10 +74,8 @@ std::string LuaAPI::LuaToString(const sol::object Value, size_t Indent, bool Quo
         ss << "[[function: " << Value.as<sol::function>().pointer() << "]]";
         return ss.str();
     }
-    case sol::type::poly:
-        return "<poly>";
     default:
-        return "<unprintable type>";
+        return "((unprintable type))";
     }
 }
 
@@ -113,95 +110,72 @@ TEST_CASE("LuaAPI::MP::GetServerVersion") {
     CHECK(pa == real.patch);
 }
 
-static inline std::pair<bool, std::string> InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
+static inline bool InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
     std::string Packet = "E:" + EventName + ":" + Data;
-    if (PlayerID == -1) {
+    if (PlayerID == -1)
-        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, Packet, true, true);
-        return { true, "" };
+    else {
-    } else {
         auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
         if (!MaybeClient || MaybeClient.value().expired()) {
-            beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
+            beammp_lua_error("TriggerClientEvent invalid Player ID");
-            return { false, "Invalid Player ID" };
+            return false;
         }
         auto c = MaybeClient.value().lock();
-        if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+        if (!LuaAPI::MP::Engine->Network().Respond(*c, Packet, true)) {
-            beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
+            beammp_lua_error("Respond failed, dropping client " + std::to_string(PlayerID));
             LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
-            return { false, "Respond failed, dropping client" };
+            return false;
         }
-        return { true, "" };
     }
+    return true;
 }
 
-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
+bool LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
     std::string Data = DataObj.as<std::string>();
     return InternalTriggerClientEvent(PlayerID, EventName, Data);
 }
 
-std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
+void LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
     auto MaybeClient = GetClient(Engine->Server(), ID);
     if (!MaybeClient || MaybeClient.value().expired()) {
-        beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
+        beammp_lua_error("Tried to drop client with id " + std::to_string(ID) + ", who doesn't exist");
-        return { false, "Player does not exist" };
+        return;
     }
     auto c = MaybeClient.value().lock();
     LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
-    return { true, "" };
 }
 
-std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
+void LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
-    std::pair<bool, std::string> Result;
     std::string Packet = "C:Server: " + Message;
     if (ID == -1) {
         LogChatMessage("<Server> (to everyone) ", -1, Message);
-        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+        Engine->Network().SendToAll(nullptr, Packet, true, true);
-        Result.first = true;
     } else {
         auto MaybeClient = GetClient(Engine->Server(), ID);
         if (MaybeClient && !MaybeClient.value().expired()) {
             auto c = MaybeClient.value().lock();
-            if (!c->IsSynced()) {
+            if (!c->IsSynced())
-                Result.first = false;
+                return;
-                Result.second = "Player still syncing data";
-                return Result;
-            }
             LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
-            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+            Engine->Network().Respond(*c, Packet, true);
-                beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
-                // TODO: should we return an error here?
-            }
-            Result.first = true;
         } else {
             beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
-            Result.first = false;
-            Result.second = "Invalid Player ID";
         }
-        return Result;
     }
-    return Result;
 }
 
-std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
+void LuaAPI::MP::RemoveVehicle(int PID, int VID) {
-    std::pair<bool, std::string> Result;
     auto MaybeClient = GetClient(Engine->Server(), PID);
     if (!MaybeClient || MaybeClient.value().expired()) {
         beammp_lua_error("RemoveVehicle invalid Player ID");
-        Result.first = false;
+        return;
-        Result.second = "Invalid Player ID";
-        return Result;
     }
     auto c = MaybeClient.value().lock();
     if (!c->GetCarData(VID).empty()) {
         std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
-        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
+        Engine->Network().SendToAll(nullptr, Destroy, true, true);
         c->DeleteCar(VID);
-        Result.first = true;
-    } else {
-        Result.first = false;
-        Result.second = "Vehicle does not exist";
     }
-    return Result;
 }
 
 void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
@@ -526,7 +500,7 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
         beammp_lua_error("json serialize will not go deeper than 100 nested tables, internal references assumed, aborted this path");
         return;
     }
-    std::string key {};
+    std::string key;
     switch (left.get_type()) {
     case sol::type::lua_nil:
     case sol::type::none:
@@ -545,8 +519,6 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
     case sol::type::number:
         key = std::to_string(left.as<double>());
         break;
-    default:
-        beammp_assert_not_reachable();
     }
     nlohmann::json value;
     switch (right.get_type()) {
@@ -589,8 +561,6 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
         }
         break;
     }
-    default:
-        beammp_assert_not_reachable();
     }
     if (is_array) {
         json.push_back(value);
@@ -675,6 +645,6 @@ std::string LuaAPI::MP::JsonUnflatten(const std::string& json) {
     return nlohmann::json::parse(json).unflatten().dump(-1);
 }
 
-std::pair<bool, std::string> LuaAPI::MP::TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data) {
+bool LuaAPI::MP::TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data) {
     return InternalTriggerClientEvent(PlayerID, EventName, JsonEncode(Data));
 }

src/TConfig.cpp

@@ -18,7 +18,6 @@ static constexpr std::string_view StrDescription = "Description";
 static constexpr std::string_view StrResourceFolder = "ResourceFolder";
 static constexpr std::string_view StrAuthKey = "AuthKey";
 static constexpr std::string_view StrLogChat = "LogChat";
-static constexpr std::string_view StrPassword = "Password";
 
 // Misc
 static constexpr std::string_view StrSendErrors = "SendErrors";
@@ -45,10 +44,7 @@ TEST_CASE("TConfig::TConfig") {
     {
         buf.resize(fs::file_size(CfgFile));
         auto fp = std::fopen(CfgFile.c_str(), "r");
-        auto res = std::fread(buf.data(), 1, buf.size(), fp);
+        std::fread(buf.data(), 1, buf.size(), fp);
-        if (res != buf.size()) {
-            // IGNORE?
-        }
         std::fclose(fp);
     }
     INFO("file contents are:", buf);
@@ -107,8 +103,6 @@ void TConfig::FlushToFile() {
     data["General"][StrMap.data()] = Application::Settings.MapName;
     data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
     data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
-    data["General"][StrPassword.data()] = Application::Settings.Password;
-    SetComment(data["General"][StrPassword.data()].comments(), " Sets a password on this server, which restricts people from joining. To join, a player must enter this exact password. Leave empty ("") to disable the password.");
     // Misc
     data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
     SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
@@ -173,7 +167,7 @@ void TConfig::TryReadValue(toml::value& Table, const std::string& Category, cons
 
 void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue) {
     if (Table[Category.c_str()][Key.data()].is_integer()) {
-        OutValue = int(Table[Category.c_str()][Key.data()].as_integer());
+        OutValue = Table[Category.c_str()][Key.data()].as_integer();
     }
 }
 
@@ -192,7 +186,6 @@ void TConfig::ParseFromFile(std::string_view name) {
         TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
         TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
         TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
-        TryReadValue(data, "General", StrPassword, Application::Settings.Password);
         // Misc
         TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
         TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
@@ -244,7 +237,6 @@ void TConfig::PrintDebug() {
     beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
     // special!
     beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
-    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
 }
 
 void TConfig::ParseOldFormat() {

src/TConsole.cpp

@@ -51,18 +51,7 @@ TEST_CASE("TrimString") {
     CHECK(TrimString("") == "");
 }
 
-// TODO: add unit tests to SplitString
+std::string GetDate() {
-static inline void SplitString(std::string const& str, const char delim, std::vector<std::string>& out) {
-    size_t start;
-    size_t end = 0;
-
-    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
-        end = str.find(delim, start);
-        out.push_back(str.substr(start, end - start));
-    }
-}
-
-static std::string GetDate() {
     std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
     time_t tt = std::chrono::system_clock::to_time_t(now);
     auto local_tm = std::localtime(&tt);
@@ -155,10 +144,10 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
         mStateId = LuaStateId;
         mIsLuaConsole = true;
         if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:exit`");
+            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:detach`");
             mCommandline.set_prompt("lua @" + LuaStateId + "> ");
         } else {
-            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:exit`");
+            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:detach`");
             mCommandline.set_prompt("lua> ");
         }
         mCachedRegularHistory = mCommandline.history();
@@ -198,10 +187,10 @@ bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t min,
         return EnsureArgsCount(args, min);
     } else {
         if (args.size() > max) {
-            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
+            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " arguments expected, got " + std::to_string(args.size()) + " instead.");
             return false;
         } else if (args.size() < min) {
-            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(min) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
+            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(max) + " arguments expected, got " + std::to_string(args.size()) + " instead.");
             return false;
         }
     }
@@ -270,10 +259,9 @@ void TConsole::Command_Kick(const std::string&, const std::vector<std::string>&
     }
     beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
     bool Kicked = false;
-    // TODO: this sucks, tolower is locale-dependent.
     auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = char(std::tolower(char(c))); });
+        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
-        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = char(std::tolower(char(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 {
@@ -332,9 +320,7 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
             }
             ++Ptr;
         }
-        // this is required, otherwise we get negative int to unsigned cast in the next operations
+        Arg = std::string(PrevPtr, Ptr - PrevPtr);
-        beammp_assert(PrevPtr <= Ptr);
-        Arg = std::string(PrevPtr, std::string::size_type(Ptr - PrevPtr));
         // remove quotes if enclosed in quotes
         for (char Quote : { '"', '\'', '`' }) {
             if (!Arg.empty() && Arg.at(0) == Quote && Arg.at(Arg.size() - 1) == Quote) {
@@ -350,10 +336,9 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
 }
 
 void TConsole::Command_Settings(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 1, 2)) {
+    if (!EnsureArgsCount(args, 0)) {
         return;
     }
-    
 }
 
 void TConsole::Command_Say(const std::string& FullCmd) {
@@ -451,8 +436,6 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
             SystemsShutdown++;
             SystemsShutdownList += NameStatusPair.first + ", ";
             break;
-        default:
-            beammp_assert_not_reachable();
         }
     }
     // remove ", " at the end
@@ -471,7 +454,7 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
            << "\tConnected Players:         " << ConnectedCount << "\n"
            << "\tGuests:                    " << GuestCount << "\n"
            << "\tCars:                      " << CarCount << "\n"
-           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(double(ElapsedTime) / 1000.0 / 60.0 / 60.0) << "h) \n"
+           << "\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"
@@ -479,12 +462,12 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
            << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
            << "\tSubsystems:\n"
            << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
-           << "\t\tShutting down/Shut down:     " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
+           << "\t\tShutting down/Shut down:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
            << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
            << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
            << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
            << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShut down:                   [ " << SystemsShutdownList << " ]\n"
+           << "\t\tShut down:                    [ " << SystemsShutdownList << " ]\n"
            << "";
 
     Application::Console().WriteRaw(Status.str());
@@ -606,7 +589,9 @@ TConsole::TConsole() {
                     HandleLuaInternalCommand(cmd.substr(1));
                 } else {
                     auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    Future->WaitUntilReady();
+                    while (!Future->Ready) {
+                        std::this_thread::yield(); // TODO: Add a timeout
+                    }
                     if (Future->Error) {
                         beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                     }
@@ -636,67 +621,42 @@ TConsole::TConsole() {
     mCommandline.on_autocomplete = [this](Commandline&, std::string stub, int) {
         std::vector<std::string> suggestions;
         try {
+            auto cmd = TrimString(stub);
+            // beammp_error("yes 1");
+            // beammp_error(stub);
             if (mIsLuaConsole) { // if lua
                 if (!mLuaEngine) {
                     beammp_info("Lua not started yet, please try again in a second");
                 } else {
-                    std::string prefix {}; // stores non-table part of input
+                    std::string prefix {};
-                    for (size_t i = stub.length(); i > 0; i--) { // separate table from input
+                    for (size_t i = stub.length(); i > 0; i--) {
-                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_' && stub[i - 1] != '.') {
+                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_') {
                             prefix = stub.substr(0, i);
                             stub = stub.substr(i);
                             break;
                         }
                     }
-
+                    auto keys = mLuaEngine->GetStateGlobalKeysForState(mStateId);
-                    // turn string into vector of keys
+                    for (const auto& key : keys) {
-                    std::vector<std::string> tablekeys;
+                        std::string::size_type n = key.find(stub);
-
-                    SplitString(stub, '.', tablekeys);
-
-                    // remove last key if incomplete
-                    if (stub.rfind('.') != stub.size() - 1 && !tablekeys.empty()) {
-                        tablekeys.pop_back();
-                    }
-
-                    auto keys = mLuaEngine->GetStateTableKeysForState(mStateId, tablekeys);
-
-                    for (const auto& key : keys) { // go through each bottom-level key
-                        auto last_dot = stub.rfind('.');
-                        std::string last_atom;
-                        if (last_dot != std::string::npos) {
-                            last_atom = stub.substr(last_dot + 1);
-                        }
-                        std::string before_last_atom = stub.substr(0, last_dot + 1); // get last confirmed key
-                        auto last = stub.substr(stub.rfind('.') + 1);
-                        std::string::size_type n = key.find(last);
                         if (n == 0) {
-                            suggestions.push_back(prefix + before_last_atom + key);
+                            suggestions.push_back(prefix + key);
+                            // beammp_warn(cmd_name);
                         }
                     }
                 }
             } else { // if not lua
-                if (stub.find("lua") == 0) { // starts with "lua" means we should suggest state names
+                for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
-                    std::string after_prefix = TrimString(stub.substr(3));
+                    std::string::size_type n = cmd_name.find(stub);
-                    auto stateNames = mLuaEngine->GetLuaStateNames();
+                    if (n == 0) {
-
+                        suggestions.push_back(cmd_name);
-                    for (const auto& name : stateNames) {
+                        // beammp_warn(cmd_name);
-                        if (name.find(after_prefix) == 0) {
-                            suggestions.push_back("lua " + name);
-                        }
-                    }
-                } else {
-                    for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
-                        if (cmd_name.find(stub) == 0) {
-                            suggestions.push_back(cmd_name);
-                        }
                     }
                 }
             }
         } catch (const std::exception& e) {
             beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
         }
-        std::sort(suggestions.begin(), suggestions.end());
         return suggestions;
     };
 }

src/THeartbeatThread.cpp

@@ -40,6 +40,10 @@ void THeartbeatThread::operator()() {
             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",
@@ -57,10 +61,11 @@ void THeartbeatThread::operator()() {
         bool Ok = false;
         for (const auto& Url : Application::GetBackendUrlsInOrder()) {
             T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
+            beammp_trace(T);
             Doc.Parse(T.data(), T.size());
             if (Doc.HasParseError() || !Doc.IsObject()) {
                 if (!Application::Settings.Private) {
-                    beammp_trace("Backend response failed to parse as valid json");
+                    beammp_error("Backend response failed to parse as valid json");
                     beammp_trace("Response was: `" + T + "`");
                 }
                 Sentry.SetContext("JSON Response", { { "reponse", T } });
@@ -143,14 +148,13 @@ std::string THeartbeatThread::GenerateCall() {
         << "&map=" << Application::Settings.MapName
         << "&private=" << (Application::Settings.Private ? "true" : "false")
         << "&version=" << Application::ServerVersionString()
-        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
+        << "&clientversion=" << Application::ClientVersionString()
         << "&name=" << Application::Settings.ServerName
         << "&modlist=" << mResourceManager.TrimmedList()
         << "&modstotalsize=" << mResourceManager.MaxModSize()
         << "&modstotal=" << mResourceManager.ModsLoaded()
         << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.ServerDesc
+        << "&desc=" << Application::Settings.ServerDesc;
-        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
     return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)

src/TLuaEngine.cpp

@@ -4,10 +4,10 @@
 #include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaPlugin.h"
-#include "sol/object.hpp"
 
 #include <chrono>
 #include <condition_variable>
+#include <httplib.h>
 #include <nlohmann/json.hpp>
 #include <random>
 #include <thread>
@@ -221,72 +221,11 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateGlobalKeys() {
     return Result;
 }
 
-std::vector<std::string> TLuaEngine::GetStateTableKeysForState(TLuaStateId StateId, std::vector<std::string> keys) {
-    std::unique_lock Lock(mLuaStatesMutex);
-    auto Result = mLuaStates.at(StateId)->GetStateTableKeys(keys);
-    return Result;
-}
-
-std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const std::vector<std::string>& keys) {
-    auto globals = mStateView.globals();
-
-    sol::table current = globals;
-    std::vector<std::string> Result {};
-
-    for (const auto& [key, value] : current) {
-        std::string s = key.as<std::string>();
-        if (value.get_type() == sol::type::function) {
-            s += "(";
-        }
-        Result.push_back(s);
-    }
-
-    if (!keys.empty()) {
-        Result.clear();
-    }
-
-    for (size_t i = 0; i < keys.size(); ++i) {
-        auto obj = current.get<sol::object>(keys.at(i));
-        if (obj.get_type() == sol::type::nil) {
-            // error
-            break;
-        } else if (i == keys.size() - 1) {
-            if (obj.get_type() == sol::type::table) {
-                for (const auto& [key, value] : obj.as<sol::table>()) {
-                    std::string s = key.as<std::string>();
-                    if (value.get_type() == sol::type::function) {
-                        s += "(";
-                    }
-                    Result.push_back(s);
-                }
-            } else {
-                Result = { obj.as<std::string>() };
-            }
-            break;
-        }
-        if (obj.get_type() == sol::type::table) {
-            current = obj;
-        } else {
-            // error
-            break;
-        }
-    }
-
-    return Result;
-}
-
-/*
-
-    _G.a.b.c.d.
-
-*/
-
 void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<std::chrono::high_resolution_clock::duration>& Max) {
     for (const auto& Result : Results) {
         bool Cancelled = false;
         size_t ms = 0;
         std::set<std::string> WarnedResults;
-
         while (!Result->Ready && !Cancelled) {
             std::this_thread::sleep_for(std::chrono::milliseconds(10));
             ms += 10;
@@ -301,7 +240,6 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                 }
             }
         }
-
         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 });
@@ -420,6 +358,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
         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;
@@ -427,7 +366,6 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                 Result->Error = true;
                 Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
             }
-            Result->MarkAsReady();
             Return.push_back(Result);
         }
     }
@@ -579,33 +517,6 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
         return sol::lua_nil;
 }
 
-std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetPositionRaw(int PID, int VID) {
-    std::pair<sol::table, std::string> Result;
-    auto MaybeClient = GetClient(mEngine->Server(), PID);
-    if (MaybeClient && !MaybeClient.value().expired()) {
-        auto Client = MaybeClient.value().lock();
-        std::string VehiclePos = Client->GetCarPositionRaw(VID);
-
-        if (VehiclePos.empty()) {
-            // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Vehicle not found"));
-            Result.second = "Vehicle not found";
-            return Result;
-        }
-
-        sol::table t = Lua_JsonDecode(VehiclePos);
-        if (t == sol::lua_nil) {
-            Result.second = "Packet decode failed";
-        }
-        // return std::make_tuple(Result, sol::make_object(StateView, sol::lua_nil));
-        Result.first = t;
-        return Result;
-    } else {
-        // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Client expired"));
-        Result.second = "Client expired";
-        return Result;
-    }
-}
-
 sol::table TLuaEngine::StateThreadData::Lua_HttpCreateConnection(const std::string& host, uint16_t port) {
     auto table = mStateView.create_table();
     constexpr const char* InternalClient = "__InternalClient";
@@ -679,8 +590,6 @@ static void JsonDecodeRecursive(sol::state_view& StateView, sol::table& table, c
         return;
     case nlohmann::detail::value_t::discarded:
         return;
-    default:
-        beammp_assert_not_reachable();
     }
 }
 
@@ -764,9 +673,6 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     MPTable.set_function("GetPlayerVehicles", [&](int ID) -> sol::table {
         return Lua_GetPlayerVehicles(ID);
     });
-    MPTable.set_function("GetPositionRaw", [&](int PID, int VID) -> std::pair<sol::table, std::string> {
-        return Lua_GetPositionRaw(PID, VID);
-    });
     MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
     MPTable.set_function("GetPlayers", [&]() -> sol::table {
         return Lua_GetPlayers();
@@ -820,6 +726,15 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
     UtilTable.set_function("JsonUnflatten", &LuaAPI::MP::JsonUnflatten);
     UtilTable.set_function("JsonPrettify", &LuaAPI::MP::JsonPrettify);
     UtilTable.set_function("JsonMinify", &LuaAPI::MP::JsonMinify);
+    UtilTable.set_function("Stress", [](size_t n) {
+        std::vector<std::thread> s;
+        for (size_t i = 0; i < n; ++i) {
+            s.emplace_back([]{ while (true); });
+        }
+        for (auto& t : s) {
+            t.detach();
+        }
+    });
     UtilTable.set_function("Random", [this] {
         return mUniformRealDistribution01(mMersenneTwister);
     });
@@ -949,6 +864,7 @@ void TLuaEngine::StateThreadData::operator()() {
                 }
                 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);
@@ -957,7 +873,6 @@ void TLuaEngine::StateThreadData::operator()() {
                     sol::error Err = Res;
                     S.second->ErrorMessage = Err.what();
                 }
-                S.second->MarkAsReady();
             }
         }
         { // StateFunctionQueue Scope
@@ -995,15 +910,6 @@ void TLuaEngine::StateThreadData::operator()() {
                         case TLuaArgTypes_Bool:
                             LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
                             break;
-                        case TLuaArgTypes_StringStringMap: {
-                            auto Map = std::get<std::unordered_map<std::string, std::string>>(Arg);
-                            auto Table = StateView.create_table();
-                            for (const auto& [k, v] : Map) {
-                                Table[k] = v;
-                            }
-                            LuaArgs.push_back(sol::make_object(StateView, Table));
-                            break;
-                        }
                         default:
                             beammp_error("Unknown argument type, passed as nil");
                             break;
@@ -1018,11 +924,11 @@ void TLuaEngine::StateThreadData::operator()() {
                         sol::error Err = Res;
                         Result->ErrorMessage = Err.what();
                     }
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 } else {
                     Result->Error = true;
                     Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 }
             }
         }
@@ -1072,19 +978,11 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
     mPaths.push(Path);
 }
 
-void TLuaResult::MarkAsReady() {
-    {
-        std::lock_guard<std::mutex> readyLock(*this->ReadyMutex);
-        this->Ready = true;
-    }
-    this->ReadyCondition->notify_all();
-}
-
 void TLuaResult::WaitUntilReady() {
-    std::unique_lock readyLock(*this->ReadyMutex);
+    while (!Ready) {
-    // wait if not ready yet
+        std::this_thread::yield();
-    if(!this->Ready)
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        this->ReadyCondition->wait(readyLock);
+    }
 }
 
 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)

src/TSentry.cpp

@@ -6,7 +6,7 @@
 #include <sstream>
 
 TSentry::TSentry() {
-    if (std::strlen(S_DSN) == /* DISABLES CODE */ (0)) {
+    if (std::strlen(S_DSN) == 0) {
         mValid = false;
     } else {
         mValid = true;

src/TServer.cpp

@@ -1,11 +1,9 @@
 #include "TServer.h"
 #include "Client.h"
 #include "Common.h"
-#include "CustomAssert.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
 #include <TLuaPlugin.h>
-#include <algorithm>
 #include <any>
 #include <sstream>
 
@@ -17,66 +15,6 @@
 
 #include "Json.h"
 
-static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {
-    auto IDSep = str.find('-');
-    std::string pid = str.substr(0, IDSep);
-    std::string vid = str.substr(IDSep + 1);
-
-    if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
-        try {
-            int PID = stoi(pid);
-            int VID = stoi(vid);
-            return { { PID, VID } };
-        } catch (const std::exception&) {
-            return std::nullopt;
-        }
-    }
-    return std::nullopt;
-}
-
-TEST_CASE("GetPidVid") {
-    SUBCASE("Valid singledigit") {
-        const auto MaybePidVid = GetPidVid("0-1");
-        CHECK(MaybePidVid);
-        auto [pid, vid] = MaybePidVid.value();
-
-        CHECK_EQ(pid, 0);
-        CHECK_EQ(vid, 1);
-    }
-    SUBCASE("Valid doubledigit") {
-        const auto MaybePidVid = GetPidVid("10-12");
-        CHECK(MaybePidVid);
-        auto [pid, vid] = MaybePidVid.value();
-
-        CHECK_EQ(pid, 10);
-        CHECK_EQ(vid, 12);
-    }
-    SUBCASE("Empty string") {
-        const auto MaybePidVid = GetPidVid("");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid separator") {
-        const auto MaybePidVid = GetPidVid("0x0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Missing pid") {
-        const auto MaybePidVid = GetPidVid("-0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Missing vid") {
-        const auto MaybePidVid = GetPidVid("0-");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid pid") {
-        const auto MaybePidVid = GetPidVid("x-0");
-        CHECK(!MaybePidVid);
-    }
-    SUBCASE("Invalid vid") {
-        const auto MaybePidVid = GetPidVid("0-x");
-        CHECK(!MaybePidVid);
-    }
-}
-
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
     beammp_info("BeamMP Server v" + Application::ServerVersionString());
     Application::SetSubsystemStatus("Server", Application::Status::Starting);
@@ -95,20 +33,20 @@ TServer::TServer(const std::vector<std::string_view>& Arguments) {
 }
 
 void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
-    std::shared_ptr<TClient> LockedClientPtr { nullptr };
+    if (!WeakClientPtr.expired()) {
-    try {
+        TClient& Client = *WeakClientPtr.lock();
-        LockedClientPtr = WeakClientPtr.lock();
+        beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
-    } catch (const std::exception&) {
+        Client.ClearCars();
-        // silently fail, as there's nothing to do
+        WriteLock Lock(mClientsMutex);
-        return;
+        mClients.erase(WeakClientPtr.lock());
     }
-    beammp_assert(LockedClientPtr != nullptr);
+}
-    TClient& Client = *LockedClientPtr;
+
-    beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
+std::weak_ptr<TClient> TServer::InsertNewClient() {
-    // TODO: Send delete packets for all cars
+    beammp_debug("inserting new client (" + std::to_string(ClientCount()) + ")");
-    Client.ClearCars();
     WriteLock Lock(mClientsMutex);
-    mClients.erase(WeakClientPtr.lock());
+    auto [Iter, Replaced] = mClients.insert(std::make_shared<TClient>(*this));
+    return *Iter;
 }
 
 void TServer::ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
@@ -129,11 +67,12 @@ size_t TServer::ClientCount() const {
     return mClients.size();
 }
 
-void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
+void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
-    constexpr std::string_view ABG = "ABG:";
+    if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
-    if (Packet.size() >= ABG.size() && std::equal(Packet.begin(), Packet.begin() + ABG.size(), ABG.begin(), ABG.end())) {
+        // abort();
-        Packet.erase(Packet.begin(), Packet.begin() + ABG.size());
+    }
-        Packet = DeComp(Packet);
+    if (Packet.substr(0, 4) == "ABG:") {
+        Packet = DeComp(Packet.substr(4));
     }
     if (Packet.empty()) {
         return;
@@ -147,50 +86,46 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
     std::any Res;
     char Code = Packet.at(0);
 
-    std::string StringPacket(reinterpret_cast<const char*>(Packet.data()), Packet.size());
+    // V to Z
-
+    if (Code <= 90 && Code >= 86) {
-    // V to Y
-    if (Code <= 89 && Code >= 86) {
         PPSMonitor.IncrementInternalPPS();
         Network.SendToAll(LockedClient.get(), Packet, false, false);
         return;
     }
     switch (Code) {
     case 'H': // initial connection
+        beammp_trace(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
         if (!Network.SyncClient(Client)) {
             // TODO handle
         }
         return;
     case 'p':
-        if (!Network.Respond(*LockedClient, StringToVector("p"), false)) {
+        if (!Network.Respond(*LockedClient, ("p"), false)) {
             // failed to send
-            LockedClient->Disconnect("Failed to send ping");
+            if (LockedClient->GetStatus() > -1) {
+                LockedClient->SetStatus(-1);
+            }
         } else {
             Network.UpdatePlayer(*LockedClient);
         }
         return;
     case 'O':
-        if (Packet.size() > 1000) {
+        if (Packet.length() > 1000) {
-            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.size()));
+            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.length()));
         }
-        ParseVehicle(*LockedClient, StringPacket, Network);
+        ParseVehicle(*LockedClient, Packet, Network);
+        return;
+    case 'J':
+        beammp_trace(std::string(("got 'J' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        Network.SendToAll(LockedClient.get(), Packet, false, true);
         return;
     case 'C': {
-        if (Packet.size() < 4 || std::find(Packet.begin() + 3, Packet.end(), ':') == Packet.end())
+        beammp_trace(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        if (Packet.length() < 4 || Packet.find(':', 3) == std::string::npos)
             break;
-        const auto PacketAsString = std::string(reinterpret_cast<const char*>(Packet.data()), Packet.size());
+        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 2));
-        std::string Message = "";
-        const auto ColonPos = PacketAsString.find(':', 3);
-        if (ColonPos != std::string::npos && ColonPos + 2 < PacketAsString.size()) {
-            Message = PacketAsString.substr(ColonPos + 2);
-        }
-        if (Message.empty()) {
-            beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
-            return;
-        }
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
         TLuaEngine::WaitForAll(Futures);
-        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), Packet.substr(Packet.find(':', 3) + 1));
         if (std::any_of(Futures.begin(), Futures.end(),
                 [](const std::shared_ptr<TLuaResult>& Elem) {
                     return !Elem->Error
@@ -199,21 +134,17 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
                 })) {
             break;
         }
-        std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
+        Network.SendToAll(nullptr, Packet, true, true);
-        Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
         return;
     }
     case 'E':
-        HandleEvent(*LockedClient, StringPacket);
+        beammp_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()) + ")");
         Network.SendToAll(LockedClient.get(), Packet, false, true);
         return;
-    case 'Z': // position packet
-        PPSMonitor.IncrementInternalPPS();
-        Network.SendToAll(LockedClient.get(), Packet, false, false);
-        HandlePosition(*LockedClient, StringPacket);
     default:
         return;
     }
@@ -222,10 +153,6 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
 void TServer::HandleEvent(TClient& c, const std::string& RawData) {
     // E:Name:Data
     // Data is allowed to have ':'
-    if (RawData.size() < 2) {
-        beammp_debugf("Client '{}' ({}) tried to send an empty event, ignoring", c.GetName(), c.GetID());
-        return;
-    }
     auto NameDataSep = RawData.find(':', 2);
     if (NameDataSep == std::string::npos) {
         beammp_warn("received event in invalid format (missing ':'), got: '" + RawData + "'");
@@ -243,7 +170,7 @@ bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
             return true;
         }
     } catch (const std::exception& e) {
-        beammp_warn("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'.");
+        beammp_error("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'");
     }
     return false;
 }
@@ -258,19 +185,19 @@ bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
 }
 
 void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network) {
-    if (Pckt.length() < 6)
+    if (Pckt.length() < 4)
         return;
     std::string Packet = Pckt;
     char Code = Packet.at(1);
     int PID = -1;
-    int VID = -1;
+    int VID = -1, Pos;
     std::string Data = Packet.substr(3), pid, vid;
     switch (Code) { // Spawned Destroyed Switched/Moved NotFound Reset
     case 's':
-        beammp_tracef("got 'Os' packet: '{}' ({})", Packet, Packet.size());
+        beammp_trace(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
         if (Data.at(0) == '0') {
             int CarID = c.GetOpenCarID();
-            beammp_debugf("'{}' created a car with ID {}", c.GetName(), CarID);
+            beammp_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;
@@ -283,24 +210,26 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
 
             if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn) {
                 c.AddNewCar(CarID, Packet);
-                Network.SendToAll(nullptr, StringToVector(Packet), true, true);
+                Network.SendToAll(nullptr, Packet, true, true);
             } else {
-                if (!Network.Respond(c, StringToVector(Packet), true)) {
+                if (!Network.Respond(c, Packet, true)) {
                     // TODO: handle
                 }
                 std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
-                if (!Network.Respond(c, StringToVector(Destroy), true)) {
+                if (!Network.Respond(c, Destroy, true)) {
                     // TODO: handle
                 }
-                beammp_debugf("{} (force : car limit/lua) removed ID {}", c.GetName(), CarID);
+                beammp_debug(c.GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
             }
         }
         return;
-    case 'c': {
+    case 'c':
         beammp_trace(std::string(("got 'Oc' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        pid = Data.substr(0, Data.find('-'));
-        if (MaybePidVid) {
+        vid = Data.substr(Data.find('-') + 1, Data.find(':', 1) - Data.find('-') - 1);
-            std::tie(PID, VID) = MaybePidVid.value();
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
         }
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
             auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleEdited", "", c.GetID(), VID, Packet.substr(3));
@@ -314,57 +243,62 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
             FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
             if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
                 && !ShouldntAllow) {
-                Network.SendToAll(&c, StringToVector(Packet), false, true);
+                Network.SendToAll(&c, Packet, false, true);
                 Apply(c, VID, Packet);
             } else {
                 if (c.GetUnicycleID() == VID) {
                     c.SetUnicycleID(-1);
                 }
                 std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(VID);
-                Network.SendToAll(nullptr, StringToVector(Destroy), true, true);
+                if (!Network.Respond(c, Destroy, true)) {
+                    // TODO: handle
+                }
                 c.DeleteCar(VID);
             }
         }
         return;
-    }
+    case 'd':
-    case 'd': {
         beammp_trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        pid = Data.substr(0, Data.find('-'));
-        if (MaybePidVid) {
+        vid = Data.substr(Data.find('-') + 1);
-            std::tie(PID, VID) = MaybePidVid.value();
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
         }
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
             if (c.GetUnicycleID() == VID) {
                 c.SetUnicycleID(-1);
             }
-            Network.SendToAll(nullptr, StringToVector(Packet), true, true);
+            Network.SendToAll(nullptr, Packet, true, true);
             // TODO: should this trigger on all vehicle deletions?
             LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
             c.DeleteCar(VID);
             beammp_debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
         }
         return;
-    }
+    case 'r':
-    case 'r': {
         beammp_trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        Pos = int(Data.find('-'));
-        if (MaybePidVid) {
+        pid = Data.substr(0, Pos++);
-            std::tie(PID, VID) = MaybePidVid.value();
+        vid = Data.substr(Pos, Data.find(':') - Pos);
+
+        if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
+            PID = stoi(pid);
+            VID = stoi(vid);
         }
 
         if (PID != -1 && VID != -1 && PID == c.GetID()) {
             Data = Data.substr(Data.find('{'));
             LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
-            Network.SendToAll(&c, StringToVector(Packet), false, true);
+            Network.SendToAll(&c, Packet, false, true);
         }
         return;
-    }
     case 't':
         beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        Network.SendToAll(&c, StringToVector(Packet), false, true);
+        Network.SendToAll(&c, Packet, false, true);
         return;
     case 'm':
-        Network.SendToAll(&c, StringToVector(Packet), true, true);
+        Network.SendToAll(&c, Packet, true, true);
         return;
     default:
         beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
@@ -431,36 +365,3 @@ void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
     WriteLock Lock(mClientsMutex); // TODO why is there 30+ threads locked here
     (void)mClients.insert(NewClient);
 }
-
-void TServer::HandlePosition(TClient& c, const std::string& Packet) {
-    if (Packet.size() < 3) {
-        // invalid packet
-        return;
-    }
-    // Zp:serverVehicleID:data
-    // Zp:0:data
-    std::string withoutCode = Packet.substr(3);
-    auto NameDataSep = withoutCode.find(':', 2);
-    if (NameDataSep == std::string::npos || NameDataSep < 2) {
-        // invalid packet
-        return;
-    }
-    // FIXME: ensure that -2 does what it should... it seems weird.
-    std::string ServerVehicleID = withoutCode.substr(2, NameDataSep - 2);
-    if (NameDataSep + 1 > withoutCode.size()) {
-        // invalid packet
-        return;
-    }
-    std::string Data = withoutCode.substr(NameDataSep + 1);
-
-    // parse veh ID
-    auto MaybePidVid = GetPidVid(ServerVehicleID);
-    if (MaybePidVid) {
-        int PID = -1;
-        int VID = -1;
-        // FIXME: check that the VID and PID are valid, so that we don't waste memory
-        std::tie(PID, VID) = MaybePidVid.value();
-
-        c.SetCarPosition(VID, Data);
-    }
-}

src/main.cpp

@@ -2,6 +2,7 @@
 
 #include "ArgsParser.h"
 #include "Common.h"
+#include "CustomAssert.h"
 #include "Http.h"
 #include "LuaAPI.h"
 #include "SignalHandling.h"
@@ -12,6 +13,7 @@
 #include "TPPSMonitor.h"
 #include "TPluginMonitor.h"
 #include "TResourceManager.h"
+#include "TScopedTimer.h"
 #include "TServer.h"
 
 #include <iostream>
@@ -54,7 +56,7 @@ int BeamMPServerMain(MainArguments Arguments);
 
 int main(int argc, char** argv) {
     MainArguments Args { argc, argv, {}, argv[0] };
-    Args.List.reserve(size_t(argc));
+    Args.List.reserve(argc);
     for (int i = 1; i < argc; ++i) {
         Args.List.push_back(argv[i]);
     }