use lua 5.3.6 for static build

update docker-build.sh to add an option to run-only
add ability to change openssl and zlib
2026-07-14 18:55:58 +00:00 · 2022-09-29 11:19:20 +02:00 · 2022-09-28 00:01:09 +02:00 · 2022-09-27 23:46:19 +02:00 · 2022-09-27 23:41:47 +02:00
70 changed files with 1426 additions and 1603 deletions
@@ -0,0 +1,83 @@
 name: CMake Linux Build
 on:
  push:
  pull_request:
    types: [opened, reopened]
  pull_request_review:
    types: [submitted]
 env:
  BUILD_TYPE: Release
 jobs:
  linux-build:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v2
        with:
          submodules: "recursive"
      - name: Install Dependencies
        env:
          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
        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
      - name: Create Build Environment
        run: cmake -E make_directory ${{github.workspace}}/build-linux
      - name: Configure CMake
        shell: bash
        working-directory: ${{github.workspace}}/build-linux
        env:
          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
      - name: Build Server
        working-directory: ${{github.workspace}}/build-linux
        shell: bash
        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server --parallel
      - name: Build Tests
        working-directory: ${{github.workspace}}/build-linux
        shell: bash
        run: cmake --build . --config $BUILD_TYPE -t BeamMP-Server-tests --parallel
      - name: Archive server artifact
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-linux
          path: ${{github.workspace}}/build-linux/BeamMP-Server
      - name: Archive test artifact
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-linux-tests
          path: ${{github.workspace}}/build-linux/BeamMP-Server-tests
  run-tests:
    needs: linux-build
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/download-artifact@master
        with:
          name: BeamMP-Server-linux-tests
          path: ${{github.workspace}}
      - name: Install Runtime Dependencies
        shell: bash
        run: |
          sudo apt-get update
          sudo apt-get install -y liblua5.3 openssl
      - name: Test
        working-directory: ${{github.workspace}}
        shell: bash
        run: |
          chmod +x ./BeamMP-Server-tests
          ./BeamMP-Server-tests
@@ -0,0 +1,62 @@
 name: CMake Windows Build
 on:
  push:
  pull_request:
    types: [opened, reopened]
  pull_request_review:
    types: [submitted]
 env:
  BUILD_TYPE: Release
 jobs:
  windows-build:
    runs-on: windows-latest
    steps:
      - uses: actions/checkout@v2
        with:
          submodules: "recursive"
      - name: Restore artifacts, or run vcpkg, build and cache artifacts
        uses: lukka/run-vcpkg@v7
        id: runvcpkg
        with:
          vcpkgArguments: "lua zlib rapidjson openssl websocketpp curl"
          vcpkgDirectory: "${{ runner.workspace }}/b/vcpkg"
          vcpkgGitCommitId: "a106de33bbee694e3be6243718aa2a549a692832"
          vcpkgTriplet: "x64-windows-static"
      - name: Create Build Environment
        run: cmake -E make_directory ${{github.workspace}}/build-windows
      - name: Configure CMake
        shell: bash
        working-directory: ${{github.workspace}}/build-windows
        env:
          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
      - name: Build
        working-directory: ${{github.workspace}}/build-windows
        shell: bash
        run: cmake --build . --config $BUILD_TYPE
      - name: Archive artifacts
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server.exe
          path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
      - name: Build debug
        working-directory: ${{github.workspace}}/build-windows
        shell: bash
        run: |
          cmake --build . --config Debug
      - name: Archive debug artifacts
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-debug.exe
          path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe
@@ -1,150 +0,0 @@
 name: Linux
 on: [push]
 env: 
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 jobs:
  debian-11-build:
    runs-on: ubuntu-latest
    container:
      image: debian:11
    steps:
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
          script: |
            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
      - name: Install git
        run: |
          apt-get update -y
          apt-get install -y git
      - uses: actions/checkout@v2
        with:
          submodules: 'recursive'
      - name: Git config safe directory
        shell: bash
        run: bash ./scripts/debian-11/1.5-git-safe.sh
      - name: Install Dependencies
        run: bash ./scripts/debian-11/1-install-deps.sh
      - name: Create Build Environment
        run: bash ./scripts/debian-11/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
      - name: Build Server
        run: bash ./scripts/debian-11/3-build.sh
      - name: Archive server artifact
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-debian
          path: ./bin/BeamMP-Server
      - name: Build Tests
        run: bash ./scripts/debian-11/3-build-tests.sh
      - name: Archive server tests artifact
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-debian-tests
          path: ./bin/BeamMP-Server-tests
  ubuntu-22-04-build:
    runs-on: ubuntu-latest
    container:
      image: ubuntu:22.04
    steps:
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
          script: |
            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
      - name: Install git
        run: |
          apt-get update -y
          apt-get install -y git
      - uses: actions/checkout@v2
        with:
          submodules: 'recursive'
      - name: Git config safe directory
        shell: bash
        run: bash ./scripts/ubuntu-22.04/1.5-git-safe.sh
      - name: Install Dependencies
        run: bash ./scripts/ubuntu-22.04/1-install-deps.sh
      - name: Setup vcpkg
        uses: lukka/run-vcpkg@v11
        with:
          runVcpkgInstall: true
      - name: Create Build Environment
        run: bash ./scripts/ubuntu-22.04/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
      - name: Build Server
        run: bash ./scripts/ubuntu-22.04/3-build.sh
      - name: Archive server artifact
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-ubuntu
          path: ./bin/BeamMP-Server
      - name: Build Tests
        run: bash ./scripts/ubuntu-22.04/3-build-tests.sh
      - name: Archive server tests artifact
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-ubuntu-tests
          path: ./bin/BeamMP-Server-tests
  run-debian-11-tests:
    needs: debian-11-build
    runs-on: ubuntu-latest
    container:
      image: debian:11
    steps:
      - uses: actions/download-artifact@master
        with:
          name: BeamMP-Server-debian-tests
      - name: Install Runtime Dependencies
        run: |
          apt-get update -y
          apt-get install -y liblua5.3-0
      - name: Test
        run: |
            chmod +x ./BeamMP-Server-tests
            ./BeamMP-Server-tests
  run-ubuntu-22-04-tests:
    needs: ubuntu-22-04-build
    runs-on: ubuntu-latest
    container:
      image: ubuntu:22.04
    steps:
      - uses: actions/download-artifact@master
        with:
          name: BeamMP-Server-ubuntu-tests
      - name: Install Runtime Dependencies
        run: |
          apt-get update -y
          apt-get install -y liblua5.3-0
      - name: Test
        run: |
            chmod +x ./BeamMP-Server-tests
            ./BeamMP-Server-tests
@@ -0,0 +1,115 @@
 name: Release Create & Build
 on:
  push:
    # Sequence of patterns matched against refs/tags
    tags:
    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 env:
  BUILD_TYPE: Release
 jobs:
  create-release:
    runs-on: ubuntu-latest
    name: Create Release
    outputs: 
      upload_url: ${{ steps.create_release.outputs.upload_url }} 
    steps:
      - name: Create Release
        id: create_release
        uses: actions/create-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          tag_name: ${{ github.ref }}
          release_name: ${{ github.ref }}
          draft: false
          prerelease: true
          body: |
              Files included in this release:
              - `BeamMP-Server.exe` is the windows build
              - `BeamMP-Server-linux` is a ubuntu build, so you need the dependencies listed in README.md to run it. For any other distros please build from source as described in README.md.
  upload-release-files-linux:
    name: Upload Linux Release Files
    runs-on: ubuntu-latest
    needs: create-release
    steps:
      - uses: actions/checkout@v2
        with:
            submodules: 'recursive'
      - 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
      - name: Create Build Environment
        run: cmake -E make_directory ${{github.workspace}}/build-linux
      - name: Configure CMake
        shell: bash
        working-directory: ${{github.workspace}}/build-linux
        env:
          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=g++-10 -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
      - name: Build
        working-directory: ${{github.workspace}}/build-linux
        shell: bash
        run: cmake --build . --config $BUILD_TYPE
      - name: Upload Release Asset
        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
          asset_path: ${{github.workspace}}/build-linux/BeamMP-Server
          asset_name: BeamMP-Server-linux
          asset_content_type: application/x-elf
  upload-release-files-windows:
    name: Upload Windows Release Files
    runs-on: windows-latest
    needs: create-release
    steps:
      - uses: actions/checkout@v2
        with:
            submodules: 'recursive'
      - name: Restore artifacts, or run vcpkg, build and cache artifacts
        uses: lukka/run-vcpkg@v7
        id: runvcpkg
        with:
            vcpkgArguments: 'lua zlib rapidjson openssl websocketpp curl'
            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
            vcpkgGitCommitId: 'a106de33bbee694e3be6243718aa2a549a692832'
            vcpkgTriplet: 'x64-windows-static'
      - name: Create Build Environment
        run: cmake -E make_directory ${{github.workspace}}/build-windows
      - name: Configure CMake
        shell: bash
        working-directory: ${{github.workspace}}/build-windows
        env:
          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
      - name: Build
        working-directory: ${{github.workspace}}/build-windows
        shell: bash
        run: cmake --build . --config $BUILD_TYPE
      - name: Upload Release Asset
        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
          asset_path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
          asset_name: BeamMP-Server.exe
          asset_content_type: application/vnd.microsoft.portable-executable
@@ -1,168 +0,0 @@
 name: Release Create & Build
 on:
  push:
    # Sequence of patterns matched against refs/tags
    tags:
    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 env:
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 jobs:
  create-release:
    runs-on: ubuntu-latest
    name: Create Release
    outputs: 
      upload_url: ${{ steps.create_release.outputs.upload_url }} 
    steps:
      - name: Create Release
        id: create_release
        uses: actions/create-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          tag_name: ${{ github.ref }}
          release_name: ${{ github.ref }}
          draft: false
          prerelease: true
          body: |
              Files included in this release:
              - `BeamMP-Server.exe` is the windows build.
              - `BeamMP-Server-debian` is a Debian 11 build, requires `liblua5.3-0`.
              - `BeamMP-Server-ubuntu` is a Ubuntu 22.04 build, requires `liblua5.3-0`.
  upload-release-files-debian-11:
    name: Build and upload Debian 11 Release Files
    runs-on: ubuntu-22.04
    needs: create-release
    container:
      image: debian:11
    steps:
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
          script: |
            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
      - name: Install git
        run: |
          apt-get update -y
          apt-get install -y git
      - uses: actions/checkout@v2
        with:
          submodules: 'recursive'
      - name: Git config safe directory
        shell: bash
        run: bash ./scripts/debian-11/1.5-git-safe.sh
      - name: Install Dependencies
        run: bash ./scripts/debian-11/1-install-deps.sh
      - name: Setup vcpkg
        uses: lukka/run-vcpkg@v11
        with:
          runVcpkgInstall: true
      - name: Create Build Environment
        run: bash ./scripts/debian-11/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
      - name: Build Server
        run: bash ./scripts/debian-11/3-build.sh
      - name: Upload Release Asset
        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.create-release.outputs.upload_url }}
          asset_path: ./bin/BeamMP-Server
          asset_name: BeamMP-Server-debian
          asset_content_type: application/x-elf
  upload-release-files-ubuntu-22-04:
    name: Build and upload Ubuntu 22.04 Release Files
    runs-on: ubuntu-22.04
    needs: create-release
    container:
      image: ubuntu:22.04
    steps:
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
          script: |
            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
      - name: Install git
        run: |
          apt-get update -y
          apt-get install -y git
      - uses: actions/checkout@v2
        with:
          submodules: 'recursive'
      - name: Git config safe directory
        shell: bash
        run: bash ./scripts/ubuntu-22.04/1.5-git-safe.sh
      - name: Install Dependencies
        run: bash ./scripts/ubuntu-22.04/1-install-deps.sh
      - name: Create Build Environment
        run: bash ./scripts/ubuntu-22.04/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
      - name: Build Server
        run: bash ./scripts/ubuntu-22.04/3-build.sh
      - name: Upload Release Asset
        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.create-release.outputs.upload_url }}
          asset_path: ./bin/BeamMP-Server
          asset_name: BeamMP-Server-ubuntu
          asset_content_type: application/x-elf
  upload-release-files-windows:
    name: Build and upload Windows Release Files
    runs-on: windows-latest
    needs: create-release
    env:
      VCPKG_DEFAULT_TRIPLET: x64-windows-static
    steps:
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
          script: |
            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
      - uses: actions/checkout@v2
        with:
          submodules: 'recursive'
      - name: Create Build Environment
        shell: bash
        run: ./scripts/windows/1-configure.sh
      - name: Build Server
        shell: bash
        run: bash ./scripts/windows/2-build.sh
      - name: Upload Release Asset
        id: upload-release-asset 
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ needs.create-release.outputs.upload_url }}
          asset_path: ./bin/BeamMP-Server.exe
          asset_name: BeamMP-Server.exe
          asset_content_type: application/vnd.microsoft.portable-executable
@@ -1,42 +0,0 @@
 name: Windows
 on: [push]
 env:
  VCPKG_DEFAULT_TRIPLET: x64-windows-static
  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 jobs:
  windows-build:
    runs-on: windows-latest
    steps:
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@v6
        with:
          script: |
            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
      - uses: actions/checkout@v2
        with:
          submodules: 'recursive'
      - name: Setup vcpkg
        uses: lukka/run-vcpkg@v11
        with:
          runVcpkgInstall: true
      - name: Create Build Environment
        shell: bash
        run: ./scripts/windows/1-configure.sh
      - name: Build Server
        shell: bash
        run: bash ./scripts/windows/2-build.sh
      - name: Archive server artifact
        uses: actions/upload-artifact@v2
        with:
          name: BeamMP-Server-windows
          path: ./bin/BeamMP-Server.exe
@@ -1,6 +1,33 @@
 [submodule "deps/commandline"]
 	path = deps/commandline
 	url = https://github.com/lionkor/commandline
-[submodule "vcpkg"]
+[submodule "deps/asio"]
-	path = vcpkg
+	path = deps/asio
-	url = https://github.com/Microsoft/vcpkg.git
+	url = https://github.com/chriskohlhoff/asio
 [submodule "deps/rapidjson"]
 	path = deps/rapidjson
 	url = https://github.com/Tencent/rapidjson
 [submodule "deps/toml11"]
 	path = deps/toml11
 	url = https://github.com/ToruNiina/toml11
 [submodule "deps/sentry-native"]
 	path = deps/sentry-native
 	url = https://github.com/getsentry/sentry-native
 [submodule "deps/sol2"]
 	path = deps/sol2
 	url = https://github.com/ThePhD/sol2
 [submodule "deps/libzip"]
 	path = deps/libzip
 	url = https://github.com/nih-at/libzip
 [submodule "deps/cpp-httplib"]
 	path = deps/cpp-httplib
 	url = https://github.com/yhirose/cpp-httplib
 [submodule "deps/json"]
 	path = deps/json
 	url = https://github.com/nlohmann/json
 [submodule "deps/fmt"]
 	path = deps/fmt
 	url = https://github.com/fmtlib/fmt
 [submodule "deps/doctest"]
 	path = deps/doctest
 	url = https://github.com/doctest/doctest
@@ -1,212 +1,266 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+# 3.4 is required for imported targets.
 cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
-if (WIN32)
+message(STATUS "You can find build instructions and a list of dependencies in the README at \
-    set(VCPKG_TARGET_TRIPLET x64-windows-static)
+https://github.com/BeamMP/BeamMP-Server")
 project(BeamMP-Server
    DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
    HOMEPAGE_URL https://beammp.com
    LANGUAGES CXX C)
 find_package(Git REQUIRED)
 # Update submodules as needed
 option(GIT_SUBMODULE "Check submodules during build" ON)
 if(GIT_SUBMODULE)
    message(STATUS "Submodule update")
    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
        message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
    endif()
 endif()
 include(cmake/Vcpkg.cmake) # needs to happen before project()
-project(
+set(HTTPLIB_REQUIRE_OPENSSL ON)
-    "BeamMP-Server" # replace this
+set(SENTRY_BUILD_SHARED_LIBS OFF)
    VERSION 3.3.0
 )
-include(cmake/StandardSettings.cmake)
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
 include(cmake/StaticAnalyzers.cmake)
 include(cmake/Git.cmake)
-# below are options which should be changed
+# ------------------------ APPLE ---------------------------------
 if(APPLE)
    if(IS_DIRECTORY /opt/homebrew/Cellar/lua@5.3/5.3.6)
        set(LUA_INCLUDE_DIR /opt/homebrew/Cellar/lua@5.3/5.3.6/include/lua5.3)
        link_directories(/opt/homebrew/Cellar/lua@5.3/5.3.6/lib)
    else()
        set(LUA_INCLUDE_DIR /usr/local/Cellar/lua@5.3/5.3.6/include/lua5.3)
        link_directories(/usr/local/Cellar/lua@5.3/5.3.6/lib)
    endif()
    set(LUA_LIBRARIES lua)
    if(IS_DIRECTORY /opt/homebrew/opt/openssl@1.1)
        include_directories(/opt/homebrew/opt/openssl@1.1/include)
        link_directories(/opt/homebrew/opt/openssl@1.1/lib)
    else()
        include_directories(/usr/local/opt/openssl@1.1/include)
        link_directories(/usr/local/opt/openssl@1.1/lib)
    endif()
 # ------------------------ WINDOWS ---------------------------------
 elseif (WIN32)
    # this has to happen before sentry, so that crashpad on windows links with these settings.
    message(STATUS "MSVC -> forcing use of statically-linked runtime.")
    STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
 # ------------------------ LINUX ---------------------------------
 elseif (UNIX)
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
    option(SANITIZE "Turns on thread and UB sanitizers" OFF)
    if (SANITIZE)
        message(STATUS "sanitize is ON")
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize={address,thread,undefined}")
    endif (SANITIZE)
 endif ()
-### SETTINGS ###
+set(BUILD_SHARED_LIBS OFF)
 # ------------------------ SENTRY ---------------------------------
 message(STATUS "Checking for Sentry URL")
 # this is set by the build system.
 # IMPORTANT: if you're building from source, just leave this empty
 if (NOT DEFINED BEAMMP_SECRET_SENTRY_URL)
    message(WARNING "No sentry URL configured. Sentry logging is disabled for this build. \
    This is not an error, and if you're building the BeamMP-Server yourself, this is expected and can be ignored.")
    set(BEAMMP_SECRET_SENTRY_URL "")
    set(SENTRY_BACKEND none)
 else()
    set(SENTRY_BACKEND breakpad)
 endif()
 add_subdirectory("deps/sentry-native")
-# add all headers (.h, .hpp) to this
+# ------------------------ C++ SETUP ---------------------------------
-set(PRJ_HEADERS 
+set(CMAKE_CXX_STANDARD 17)
-    include/ArgsParser.h
+if (MSVC)
-    include/BoostAliases.h
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-    include/Client.h
+endif ()
    include/Common.h
    include/Compat.h
    include/Cryptography.h
    include/CustomAssert.h
    include/Defer.h
    include/Environment.h
    include/Http.h
    include/IThreaded.h
    include/Json.h
    include/LuaAPI.h
    include/RWMutex.h
    include/SignalHandling.h
    include/TConfig.h
    include/TConsole.h
    include/THeartbeatThread.h
    include/TLuaEngine.h
    include/TLuaPlugin.h
    include/TNetwork.h
    include/TPluginMonitor.h
    include/TPPSMonitor.h
    include/TResourceManager.h
    include/TScopedTimer.h
    include/TServer.h
    include/VehicleData.h
 )
 # add all source files (.cpp) to this, except the one with main()
 set(PRJ_SOURCES
    src/ArgsParser.cpp
    src/Client.cpp
    src/Common.cpp
    src/Compat.cpp
    src/Http.cpp
    src/LuaAPI.cpp
    src/SignalHandling.cpp
    src/TConfig.cpp
    src/TConsole.cpp
    src/THeartbeatThread.cpp
    src/TLuaEngine.cpp
    src/TLuaPlugin.cpp
    src/TNetwork.cpp
    src/TPluginMonitor.cpp
    src/TPPSMonitor.cpp
    src/TResourceManager.cpp
    src/TScopedTimer.cpp
    src/TServer.cpp
    src/VehicleData.cpp
 )
-find_package(Lua REQUIRED)
+# ------------------------ DEPENDENCIES ------------------------------
 message(STATUS "Adding local source dependencies")
 # this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
 add_subdirectory(deps)
-# set the source file containing main()
+# ------------------------ VARIABLES ---------------------------------
 set(PRJ_MAIN src/main.cpp)
 # set the source file containing the test's main
 set(PRJ_TEST_MAIN test/test_main.cpp)
 # set include paths not part of libraries
 set(PRJ_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
 # set compile features (e.g. standard version)
 set(PRJ_COMPILE_FEATURES cxx_std_20)
 # set #defines (test enable/disable not included here)
 set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT)
 # add all libraries used by the project (WARNING: also set them in vcpkg.json!)
 set(PRJ_LIBRARIES 
    fmt::fmt
    doctest::doctest
    Threads::Threads
    commandline_static
    toml11::toml11
    rapidjson
    sol2
    httplib::httplib
    libzip::zip
    OpenSSL::SSL OpenSSL::Crypto
    ${LUA_LIBRARIES}
 )
-# add dependency find_package calls and similar here
+option(FIND_OPENSSL "Whether or not to find openssl automatically (keep on unless you know what you're doing)" ON)
-find_package(fmt CONFIG REQUIRED)
+option(FIND_ZLIB "Whether or not to find zlib automatically (keep on unless you know what you're doing)" ON)
 find_package(OpenSSL REQUIRED)
 find_package(doctest CONFIG REQUIRED)
 find_package(Boost REQUIRED)
 find_package(httplib CONFIG REQUIRED)
 find_package(libzip CONFIG REQUIRED)
 find_package(RapidJSON CONFIG REQUIRED)
 find_package(sol2 CONFIG REQUIRED)
 find_package(toml11 CONFIG REQUIRED)
-include_directories(include)
+include(FindOpenSSL)
 if (${FIND_OPENSSL})
    set(OPENSSL_CRYPTO OpenSSL::Crypto)
    set(OPENSSL_SSL OpenSSL::SSL)
 else()
    message(STATUS "Using custom openssl libs: ${OPENSSL_CRYPTO} ${OPENSSL_SSL}")
 endif()
-# to enable multithreading and the Threads::Threads dependency
+include(FindLua)
 include(FindThreads)
-### END SETTINGS ###
+include(FindZLIB)
-# DONT change anything beyond this point unless you've read the cmake bible and 
+if (${FIND_ZLIB})
-# swore on it not to bonk up the ci/cd pipelines with your changes.
+    set(ZLIB_ZLIB ZLIB::ZLIB)
-
+else()
-####################
+    message(STATUS "Using custom zlib: ${ZLIB_ZLIB}")
 # enables compile_commands.json for clang-related tools (such as the clang LS)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # build debug builds by default (if not specified otherwise)
 if(NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE "Debug")
 endif()
-if(UNIX)
+set(BeamMP_Sources
-    # this will allow to use same _DEBUG macro available in both Linux as well as Windows - MSCV environment. Easy to put Debug specific code.
+    include/TConsole.h src/TConsole.cpp
-    add_compile_options("$<$<CONFIG:DEBUG>:-D_DEBUG>")
+    include/TServer.h src/TServer.cpp
-endif(UNIX)
+    include/Compat.h src/Compat.cpp
-
+    include/Common.h src/Common.cpp
-if (WIN32)
+    include/Client.h src/Client.cpp
-    add_compile_options("-D_WIN32_WINNT=0x0601")
+    include/VehicleData.h src/VehicleData.cpp
-endif(WIN32)
+    include/TConfig.h src/TConfig.cpp
-
+    include/TLuaEngine.h src/TLuaEngine.cpp
-
+    include/TLuaPlugin.h src/TLuaPlugin.cpp
-include(cmake/CompilerWarnings.cmake)
+    include/TResourceManager.h src/TResourceManager.cpp
-
+    include/THeartbeatThread.h src/THeartbeatThread.cpp
-# set MT library for msvc - this is required (says documentation)
+    include/Http.h src/Http.cpp
-# linux/mac/etc should simply ignore this by default.
+    include/TSentry.h src/TSentry.cpp
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    include/TPPSMonitor.h src/TPPSMonitor.cpp
-
+    include/TNetwork.h src/TNetwork.cpp
-set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
+    include/LuaAPI.h src/LuaAPI.cpp
-    PRJ_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
+    include/TScopedTimer.h src/TScopedTimer.cpp
-    PRJ_VERSION_MINOR=${PROJECT_VERSION_MINOR}
+    include/SignalHandling.h src/SignalHandling.cpp
-    PRJ_VERSION_PATCH=${PROJECT_VERSION_PATCH}
+    include/ArgsParser.h src/ArgsParser.cpp
    include/TPluginMonitor.h src/TPluginMonitor.cpp
    include/Environment.h
 )
-# build commandline manually for funky windows flags to carry over without a custom toolchain file
+set(BeamMP_Includes
-add_library(commandline_static 
+    ${LUA_INCLUDE_DIR}
-    deps/commandline/src/impls.h
+    ${CURL_INCLUDE_DIRS}
-    deps/commandline/src/windows_impl.cpp
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib"
-    deps/commandline/src/linux_impl.cpp
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline"
-    deps/commandline/src/backends/InteractiveBackend.cpp
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include"
-    deps/commandline/src/backends/InteractiveBackend.h
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include"
-    deps/commandline/src/backends/Backend.cpp
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include"
-    deps/commandline/src/backends/Backend.h
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
-    deps/commandline/src/commandline.h
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps"
    deps/commandline/src/commandline.cpp
    deps/commandline/src/backends/BufferedBackend.cpp
    deps/commandline/src/backends/BufferedBackend.h
 )
 set(BeamMP_Definitions
    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
 )
 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=zero-as-null-pointer-constant
        -Werror=overloaded-virtual
        -Werror=missing-include-dirs
        -Werror=unused-result
        -fstack-protector
    )
 endif()
 set(BeamMP_Libraries
    doctest::doctest
    ${OPENSSL_SSL}
    ${OPENSSL_CRYPTO}
    sol2::sol2
    fmt::fmt
    Threads::Threads
    ${ZLIB_ZLIB}
    ${LUA_LIBRARIES}
    commandline
    sentry
 )
 if (WIN32)
-    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1)
+    set(BeamMP_PlatformLibs wsock32 ws2_32)
 else ()
    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_LINUX=1)
 endif ()
 target_include_directories(commandline_static PUBLIC "deps/commandline/src")
 target_link_libraries(commandline_static Threads::Threads)
 # end of commandline custom build
-add_executable(${PROJECT_NAME} ${PRJ_HEADERS} ${PRJ_SOURCES} ${PRJ_MAIN})
+# ------------------------ BEAMMP SERVER -----------------------------
-set_target_properties(${PROJECT_NAME} PROPERTIES
+
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+add_executable(BeamMP-Server
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+        src/main.cpp
-    MACOSX_BUNDLE TRUE
+        ${BeamMP_Sources}
    WIN32_EXECUTABLE TRUE
 )
 target_include_directories(${PROJECT_NAME} PRIVATE ${PRJ_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} ${PRJ_LIBRARIES})
 target_compile_features(${PROJECT_NAME} PRIVATE ${PRJ_COMPILE_FEATURES})
 target_compile_definitions(${PROJECT_NAME} PRIVATE ${PRJ_DEFINITIONS} ${PRJ_WARNINGS}
    DOCTEST_CONFIG_DISABLE # disables all test code in the final executable
 )
-if(MSVC)
+target_compile_definitions(BeamMP-Server PRIVATE
-    target_link_options(${PROJECT_NAME} PRIVATE "/SUBSYSTEM:CONSOLE")
+    ${BeamMP_Definitions}
-endif(MSVC)
+    DOCTEST_CONFIG_DISABLE
 )
-# setup all warnings (from cmake/CompilerWarnings.cmake)
+target_compile_options(BeamMP-Server PRIVATE 
-set_project_warnings(${PROJECT_NAME})
+    ${BeamMP_CompileOptions}
 )
-if(${PROJECT_NAME}_ENABLE_UNIT_TESTING)
+target_include_directories(BeamMP-Server PRIVATE
-    message(STATUS "Unit tests are enabled and will be built as '${PROJECT_NAME}-tests'")
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    add_executable(${PROJECT_NAME}-tests ${PRJ_HEADERS} ${PRJ_SOURCES} ${PRJ_TEST_MAIN})
+)
-    target_include_directories(${PROJECT_NAME}-tests PRIVATE ${PRJ_INCLUDE_DIRS})
+
-    target_link_libraries(${PROJECT_NAME}-tests ${PRJ_LIBRARIES})
+target_include_directories(BeamMP-Server SYSTEM PRIVATE
-    target_compile_features(${PROJECT_NAME}-tests PRIVATE ${PRJ_COMPILE_FEATURES})
+    ${BeamMP_Includes}
-    target_compile_definitions(${PROJECT_NAME}-tests PRIVATE ${PRJ_DEFINITIONS} ${PRJ_WARNINGS})
+)
-    set_project_warnings(${PROJECT_NAME}-tests)
+
-    if(MSVC)
+target_link_libraries(BeamMP-Server
-        target_link_options(${PROJECT_NAME}-tests PRIVATE "/SUBSYSTEM:CONSOLE")
+    ${BeamMP_Libraries}
-    endif(MSVC)
+    ${BeamMP_PlatformLibs}
 )
 # ------------------------ BEAMMP SERVER TESTS -----------------------
 option(BUILD_TESTS "Build BeamMP-Server tests" ON)
 if(BUILD_TESTS)
    add_executable(BeamMP-Server-tests
            test/test_main.cpp
            ${BeamMP_Sources}
    )
    target_compile_definitions(BeamMP-Server-tests PRIVATE
        ${BeamMP_Definitions}
    )
    target_compile_options(BeamMP-Server-tests PRIVATE 
       ${BeamMP_CompileOptions}
    )
    target_include_directories(BeamMP-Server-tests PRIVATE
        "${CMAKE_CURRENT_SOURCE_DIR}/include"
    )
    target_include_directories(BeamMP-Server-tests SYSTEM PRIVATE
        ${BeamMP_Includes}
    )
    target_link_libraries(BeamMP-Server-tests
        ${BeamMP_Libraries}
        ${BeamMP_PlatformLibs}
    )
 endif()
@@ -1,10 +1,3 @@
 # v3.1.1
 - FIXED bug which caused GetPlayerIdentifiers, GetPlayerName, etc not to work in `onPlayerDisconnect`
 - FIXED some issues which could cause the server to crash when receiving malformed data
 - FIXED a bug which caused a server to crash during authentication when receiving malformed data
 - FIXED minor vulnerability in chat message handling
 - FIXED a minor formatting bug in the `status` command
 # v3.1.0
@@ -17,9 +10,6 @@
 - ADDED error messages to some lua functions
 - ADDED HOME and END button working in console
 - ADDED `MP.TriggerClientEventJson()` which takes a table as the data argument and sends it as JSON
 - ADDED identifiers (beammp id, ip) to onPlayerAuth (4th argument)
 - ADDED more network debug logging
 - CHANGED all networking to be more stable, performant, and safe
 - FIXED `ip` in MP.GetPlayerIdentifiers
 - FIXED issue with client->server events which contain `:`
 - FIXED a fatal exception on LuaEngine startup if Resources/Server is a symlink
@@ -28,8 +18,6 @@
 - 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
@@ -0,0 +1,11 @@
 FROM lionkor/alpine-static-cpp:latest
 ARG LUA_V=5.3.6
 RUN apk update && apk --no-cache add python3 git lua zlib-static openssl curl rapidjson curl-dev wget readline-static
 RUN apk --no-cache add openssl-libs-static curl-static readline-dev
 RUN wget "https://www.lua.org/ftp/lua-${LUA_V}.tar.gz"; tar xzvf lua-${LUA_V}.tar.gz; mv "lua-${LUA_V}" /lua; rm lua-${LUA_V}.tar.gz
 RUN cd /lua; make all -j linux; cd ..
@@ -29,7 +29,7 @@ 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.
 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.
@@ -39,7 +39,7 @@ If you need support with understanding the codebase, please write us in the Disc
 ## 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
@@ -51,7 +51,7 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea
 ## Build Instructions
-**__Do not compile from `master`. Always build from a release tag, i.e. `tags/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)).
@@ -59,104 +59,35 @@ Currently only Linux and Windows are supported (generally). See [Releases](https
 #### 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`.
 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).
+Runtime dependencies - you want to find packages for:
 - libz
 - rapidjson
 - lua5.3
 - ssl / openssl
 - websocketpp
 - curl (with ssl support)
-##### Runtime Dependencies
+Build-time dependencies are:
 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
+make
 rapidjson-dev
 liblua5.3-dev
 libssl-dev
 libwebsocketpp-dev
 libcurl4-openssl-dev
 cmake
 g++-10
 libboost1.74-all-dev
 libssl3
 curl
 ```
 </details>
 <details>
 <summary>
 Arch Linux
 </summary>
 `pacman -Syu` the following libraries and programs:
 ```
 lua53
 openssl
 curl
 git
 cmake
 g++
 zlib
 boost
 websocketpp
 ```
 </details>
 #### macOS
 Dependencies for **macOS** can be installed with homebrew.
 ```
 brew install lua@5.3 rapidjson websocketpp cmake openssl@1.1
 ```
 Some packages are included in **macOS** but you might want to install homebrew versions.
 ```
 brew install curl zlib git make
 ```
 ### How to build
@@ -164,12 +95,13 @@ brew install curl zlib git make
 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`. 
-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, 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).
-6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`). This may take some time, and will update all submodules and prepare the build.
+5. Ensure that all submodules are initialized by running `git submodule update --init --recursive`
-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 `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
-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. Run `make`
 8. You will now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (Windows or Linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/server-installation) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
 *tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*
@@ -1,115 +0,0 @@
 # from here:
 #
 # https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
 # Courtesy of Jason Turner
 # License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE
 # 
 # This version has been modified by the owners of the current respository.
 # Modifications have mostly been marked with "modified" or similar, though this is not 
 # strictly required.
 function(set_project_warnings project_name)
    set(MSVC_WARNINGS
            /W4         # Baseline reasonable warnings
            /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss
                            # of data
            /w14254 # 'operator': conversion from 'type1:field_bits' to
                            # 'type2:field_bits', possible loss of data
            /w14263 # 'function': member function does not override any base class
                            # virtual member function
            /w14265 # 'classname': class has virtual functions, but destructor is not
                            # virtual instances of this class may not be destructed correctly
            /w14287 # 'operator': unsigned/negative constant mismatch
            /we4289 # nonstandard extension used: 'variable': loop control variable
                            # declared in the for-loop is used outside the for-loop scope
            /w14296 # 'operator': expression is always 'boolean_value'
            /w14311 # 'variable': pointer truncation from 'type1' to 'type2'
            /w14545 # expression before comma evaluates to a function which is missing
                            # an argument list
            /w14546 # function call before comma missing argument list
            /w14547 # 'operator': operator before comma has no effect; expected
                            # operator with side-effect
            /w14549 # 'operator': operator before comma has no effect; did you intend
                            # 'operator'?
            /w14555 # expression has no effect; expected expression with side- effect
            /w14619 # pragma warning: there is no warning number 'number'
            /w14640 # Enable warning on thread un-safe static member initialization
            /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may
                            # cause unexpected runtime behavior.
            /w14905 # wide string literal cast to 'LPSTR'
            /w14906 # string literal cast to 'LPWSTR'
            /w14928 # illegal copy-initialization; more than one user-defined
                            # conversion has been implicitly applied
            /permissive- # standards conformance mode for MSVC compiler.
    )
    set(CLANG_WARNINGS
            -Wall
            -Wextra    # reasonable and standard
            -Wshadow # warn the user if a variable declaration shadows one from a
                             # parent context
            -Wnon-virtual-dtor # warn the user if a class with virtual functions has a
                                                 # non-virtual destructor. This helps catch hard to
                                                 # track down memory errors
            -Wold-style-cast # warn for c-style casts
            -Wcast-align         # warn for potential performance problem casts
            -Wunused                 # warn on anything being unused
            -Woverloaded-virtual # warn if you overload (not override) a virtual
                                                     # function
            -Wpedantic     # warn if non-standard C++ is used
            -Wconversion # warn on type conversions that may lose data
            -Wsign-conversion    # warn on sign conversions
            -Wnull-dereference # warn if a null dereference is detected
            -Wdouble-promotion # warn if float is implicit promoted to double
            -Wformat=2 # warn on security issues around functions that format output
                                 # (ie printf)
            # modified; added more errors / warnings
            # some have been set to be errors, but the option _WARNINGS_AS_ERRORS
            # (see below) should still be used in strict pipelines.
            -Werror=uninitialized
            -Werror=float-equal
            -Werror=write-strings
            -Werror=strict-aliasing -fstrict-aliasing
            -Werror=missing-declarations
            -Werror=missing-field-initializers
            -Werror=ctor-dtor-privacy
            -Werror=switch-enum
            -Wswitch-default
            -Werror=unused-result
            -Werror=implicit-fallthrough
            -Werror=return-type
            -Wmissing-include-dirs
    )
    if (${PROJECT_NAME}_WARNINGS_AS_ERRORS)
        set(CLANG_WARNINGS ${CLANG_WARNINGS} -Werror)
        set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)
    endif()
    set(GCC_WARNINGS
            ${CLANG_WARNINGS}
            -Wmisleading-indentation # warn if indentation implies blocks where blocks
                                                             # do not exist
            -Wduplicated-cond # warn if if / else chain has duplicated conditions
            -Wduplicated-branches # warn if if / else branches have duplicated code
            -Wlogical-op     # warn about logical operations being used where bitwise were
                                         # probably wanted
            # -Wuseless-cast # warn if you perform a cast to the same type (modified: removed)
    )
    if(MSVC)
        set(PRJ_WARNINGS ${MSVC_WARNINGS})
    elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
        set(PRJ_WARNINGS ${CLANG_WARNINGS})
    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
        set(PRJ_WARNINGS ${GCC_WARNINGS})
    else()
        message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
    endif()
    target_compile_options(${project_name} PUBLIC ${PRJ_WARNINGS})
    if(NOT TARGET ${project_name})
        message(AUTHOR_WARNING "${project_name} is not a target, thus no compiler warning were added.")
    endif()
 endfunction()
@@ -1,21 +0,0 @@
 find_package(Git)
 if(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES)
    if(Git_FOUND)
        message(STATUS "Git found, submodule update and init")
        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
            message(SEND_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules. This may result in missing dependencies.")
        endif()
    else()
        message(SEND_ERROR "git required for checking out submodules, but not found. Submodules will not be checked out - this may result in missing dependencies.")
    endif()
 endif()
 if(Git_FOUND)
 else()
    message(STATUS "Git not found - the version will not include a git hash.")
    set(PRJ_GIT_HASH "unknown")
 endif()
@@ -1,44 +0,0 @@
 # Modified, original version from https://github.com/filipdutescu/modern-cpp-template (Unlicense)
 option(${PROJECT_NAME}_WARNINGS_AS_ERRORS "Treat compiler warnings as errors." OFF)
 option(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES "If git is found, initialize all submodules." ON)
 option(${PROJECT_NAME}_ENABLE_UNIT_TESTING "Enable unit tests for the projects (from the `test` subfolder)." ON)
 option(${PROJECT_NAME}_ENABLE_CLANG_TIDY "Enable static analysis with Clang-Tidy." OFF)
 option(${PROJECT_NAME}_ENABLE_CPPCHECK "Enable static analysis with Cppcheck." OFF)
 # TODO Implement code coverage
 # option(${PROJECT_NAME}_ENABLE_CODE_COVERAGE "Enable code coverage through GCC." OFF)
 option(${PROJECT_NAME}_ENABLE_DOXYGEN "Enable Doxygen documentation builds of source." OFF)
 # Generate compile_commands.json for clang based tools
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # Export all symbols when building a shared library
 if(BUILD_SHARED_LIBS)
    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF)
    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 endif()
 option(${PROJECT_NAME}_ENABLE_LTO "Enable Interprocedural Optimization, aka Link Time Optimization (LTO)." OFF)
 if(${PROJECT_NAME}_ENABLE_LTO)
    include(CheckIPOSupported)
    check_ipo_supported(RESULT result OUTPUT output)
    if(result)
        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
    else()
        message(SEND_ERROR "IPO is not supported: ${output}.")
    endif()
 endif()
 option(${PROJECT_NAME}_ENABLE_CCACHE "Enable the usage of Ccache, in order to speed up rebuild times." ON)
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif()
 option(${PROJECT_NAME}_ENABLE_SANITIZER "Enable sanitizer to detect memory errors, undefined behavior, etc. (slows down the executable)." OFF)
 if(${PROJECT_NAME}_ENABLE_SANITIZER)
    add_compile_options(-fsanitize=address,undefined)
    add_link_options(-fsanitize=address,undefined)
 endif()
@@ -1,20 +0,0 @@
 if(${PROJECT_NAME}_ENABLE_CLANG_TIDY)
  find_program(CLANGTIDY clang-tidy)
  if(CLANGTIDY)
    set(CMAKE_CXX_CLANG_TIDY ${CLANGTIDY} -extra-arg=-Wno-unknown-warning-option)
    message("Clang-Tidy finished setting up.")
  else()
    message(SEND_ERROR "Clang-Tidy requested but executable not found.")
  endif()
 endif()
 if(${PROJECT_NAME}_ENABLE_CPPCHECK)
  find_program(CPPCHECK cppcheck)
  if(CPPCHECK)
    set(CMAKE_CXX_CPPCHECK ${CPPCHECK} --suppress=missingInclude --enable=all
                           --inline-suppr --inconclusive)
    message("Cppcheck finished setting up.")
  else()
    message(SEND_ERROR "Cppcheck requested but executable not found.")
  endif()
 endif()
@@ -1,17 +0,0 @@
 if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
    if(NOT EXISTS ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
        find_package(Git)
        if(Git_FOUND)
            execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive vcpkg
                            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                            RESULT_VARIABLE GIT_SUBMOD_RESULT)
            if(NOT GIT_SUBMOD_RESULT EQUAL "0")
                message(SEND_ERROR "Checking out vcpkg in source tree failed with ${GIT_SUBMOD_RESULT}.")
            endif()
        else()
            message(FATAL_ERROR "Could not find git or vcpkg.cmake. Please either, install git and re-run cmake (or run `git submodule update --init --recursive`), or install vcpkg and add `-DCMAKE_TOOLCHAIN_FILE=<path-to-vcpkg>/scripts/buildsystems/vcpkg.cmake` to your cmake invocation. Please try again after making those changes.")
        endif()
    endif()
    set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
 endif()
@@ -0,0 +1,6 @@
 include_directories("${PROJECT_SOURCE_DIR}/deps")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")
 add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest")
@@ -0,0 +1,22 @@
 #!/bin/sh
 # usage:
 # ./docker-build.sh
 #       builds the image, and then runs it
 # ./docker-build.sh run
 #       only runs it
 set -e
 if [ "$1" != "run" ]
 then
    git submodule update --init --recursive
    docker build . --tag beammp-static
 fi
 docker run -v $(pwd):/root -it --rm beammp-static sh -c "cd root; cmake . -B build -DGIT_SUBMODULE=OFF -DLUA_INCLUDE_DIR=/lua/src -DSOL2_SINGLE=ON -DFIND_OPENSSL=OFF -DOPENSSL_CRYPTO=\"/usr/lib/libcrypto.a\" -DOPENSSL_SSL=\"/usr/lib/libssl.a\" -DFIND_ZLIB=OFF -DZLIB_ZLIB=/lib/libz.a -DCURL_FOUND=ON -DCURL_LIBRARIES=\"/usr/lib/libcurl.a\" -DLUA_LIBRARIES=\"/lua/src/liblua.a\" -DSENTRY_BACKEND=none -DSENTRY_TRANSPORT=none; make -C build -j BeamMP-Server"
 # try to chown the build directory afterwards
 sudo chown -R "$USER":"$USER" build
@@ -1,6 +0,0 @@
 #pragma once
 #include <boost/asio.hpp>
 #include <boost/system/error_code.hpp>
 using namespace boost::asio;
@@ -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,9 +33,8 @@ 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);
@@ -47,20 +46,16 @@ public:
    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(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
+    void SetUDPAddr(sockaddr_in Addr) { mUDPAddress = Addr; }
-    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
+    void SetDownSock(SOCKET CSock) { mSocket[1] = CSock; }
-    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
+    void SetTCPSock(SOCKET CSock) { mSocket[0] = CSock; }
-    void Disconnect(std::string_view Reason);
+    void SetStatus(int Status) { mStatus = Status; }
    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 +63,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 +73,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,7 +91,7 @@ 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;
@@ -103,12 +99,12 @@ private:
    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;
 };
@@ -1,5 +1,8 @@
 #pragma once
 #include "TSentry.h"
 extern TSentry Sentry;
 #include <array>
 #include <atomic>
 #include <cstring>
@@ -46,7 +49,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 };
@@ -78,7 +80,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; }
@@ -135,7 +137,7 @@ private:
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};
-    static inline Version mVersion { 3, 1, 2 };
+    static inline Version mVersion { 3, 1, 0 };
 };
 std::string ThreadName(bool DebugModeOverride = false);
@@ -190,6 +192,7 @@ void RegisterThread(const std::string& str);
    #define beammp_error(x)                                                               \
        do {                                                                              \
            Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
            Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                        \
        } while (false)
    #define beammp_lua_error(x)                                                               \
        do {                                                                                  \
@@ -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
@@ -63,10 +63,12 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
        bool result = (cond);                                                          \
        if (!result) {                                                                 \
            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
            Sentry.LogAssert(#cond, _file_basename, _line, __func__);                  \
        }                                                                              \
    } while (false)
 #define beammp_assert_not_reachable()                                                      \
    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__);          \
    } while (false)
 #endif // DEBUG
@@ -8,7 +8,7 @@ public:
    IThreaded()
        // invokes operator() on this object
        : mThread() { }
-    virtual ~IThreaded() noexcept {
+    ~IThreaded() noexcept {
        if (mThread.joinable()) {
            mThread.join();
        }
@@ -6,7 +6,7 @@
 #include <filesystem>
 #define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
-#include <toml.hpp> // header-only version of TOML++
+#include <toml11/toml.hpp> // header-only version of TOML++
 namespace fs = std::filesystem;
@@ -5,7 +5,6 @@
 #include <atomic>
 #include <fstream>
 #include <functional>
 #include <mutex>
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -13,14 +13,11 @@
 #include <queue>
 #include <random>
 #include <set>
-#include <toml.hpp>
+#include <toml11/toml.hpp>
 #include <unordered_map>
 #include <vector>
 #define SOL_ALL_SAFETIES_ON 1
 #define SOL_USER_C_ASSERT SOL_ON
 #define SOL_C_ASSERT(...) \
    beammp_lua_errorf("SOL2 assertion failure: Assertion `{}` failed in {}:{}. This *should* be a fatal error, but BeamMP Server overrides it to not be fatal. This may cause the Lua Engine to crash, or cause other issues.", #__VA_ARGS__, __FILE__, __LINE__)
 #include <sol/sol.hpp>
 using TLuaStateId = std::string;
@@ -28,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;
@@ -44,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();
 };
@@ -86,7 +75,7 @@ public:
    };
    TLuaEngine();
-    virtual ~TLuaEngine() noexcept {
+    ~TLuaEngine() noexcept {
        beammp_debug("Lua Engine terminated");
    }
@@ -108,8 +97,8 @@ public:
        return mLuaStates.size();
    }
    std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names {};
+        std::vector<std::string> names{};
-        for (auto const& [stateId, _] : mLuaStates) {
+        for(auto const& [stateId, _ ] : mLuaStates) {
            names.push_back(stateId);
        }
        return names;
@@ -208,7 +197,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);
@@ -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);
@@ -9,7 +9,6 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
    explicit TPPSMonitor(TServer& Server);
    virtual ~TPPSMonitor() {}
    void operator()() override;
@@ -0,0 +1,38 @@
 #ifndef SENTRY_H
 #define SENTRY_H
 #include <mutex>
 #include <string>
 #include <unordered_map>
 enum class SentryLevel {
    Debug = -1,
    Info = 0,
    Warning = 1,
    Error = 2,
    Fatal = 3,
 };
 // singleton, dont make this twice
 class TSentry final {
 public:
    TSentry();
    ~TSentry();
    void PrintWelcome();
    void SetupUser();
    void Log(SentryLevel level, const std::string& logger, const std::string& text);
    void LogError(const std::string& text, const std::string& file, const std::string& line);
    void SetContext(const std::string& context_name, const std::unordered_map<std::string, std::string>& map);
    void LogException(const std::exception& e, const std::string& file, const std::string& line);
    void LogAssert(const std::string& condition_string, const std::string& file, const std::string& line, const std::string& function);
    void AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line);
    // cleared when Logged
    void SetTransaction(const std::string& id);
    [[nodiscard]] std::unique_lock<std::mutex> CreateExclusiveContext();
 private:
    bool mValid { true };
    std::mutex mMutex;
 };
 #endif // SENTRY_H
@@ -8,8 +8,6 @@
 #include <mutex>
 #include <unordered_set>
 #include "BoostAliases.h"
 class TClient;
 class TNetwork;
 class TPPSMonitor;
@@ -21,22 +19,19 @@ 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);
@@ -45,11 +40,3 @@ private:
    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; }
 };
@@ -1,7 +0,0 @@
 #!/bin/bash
 set -ex
 apt-get update -y
 apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++
@@ -1,7 +0,0 @@
 #!/bin/bash
 set -ex
 git config --global --add safe.directory $(pwd)
 git config --global --add safe.directory $(pwd)/vcpkg
 git config --global --add safe.directory $(pwd)/deps/commandline
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -s -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake --build bin --parallel -t BeamMP-Server
@@ -1,8 +0,0 @@
 #!/bin/bash
 set -ex
 apt-get update -y
 apt-get install -y liblua5.3-0 curl
@@ -1,7 +0,0 @@
 #!/bin/bash
 set -ex
 apt-get update -y
 apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++
@@ -1,7 +0,0 @@
 #!/bin/bash
 set -ex
 git config --global --add safe.directory $(pwd)
 git config --global --add safe.directory $(pwd)/vcpkg
 git config --global --add safe.directory $(pwd)/deps/commandline
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -s -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake --build bin --parallel -t BeamMP-Server
@@ -1,8 +0,0 @@
 #!/bin/bash
 set -ex
 apt-get update -y
 apt-get install -y liblua5.3-0 curl
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DBeamMP-Server_ENABLE_LTO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,5 +0,0 @@
 #!/bin/bash
 set -ex
 cmake --build bin --parallel -t BeamMP-Server
@@ -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();
@@ -50,30 +49,19 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {
 std::string TClient::GetCarPositionRaw(int Ident) {
    std::unique_lock lock(mVehiclePositionMutex);
-    try {
+    try
-        return mVehiclePosition.at(size_t(Ident));
+    {
-    } catch (const std::out_of_range& oor) {
+        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[size_t(Ident)] = Data;
+    mVehiclePosition[Ident] = Data;
 }
 std::string TClient::GetCarData(int Ident) {
@@ -110,22 +98,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();
 }
@@ -13,6 +13,9 @@
 #include "CustomAssert.h"
 #include "Http.h"
 // global, yes, this is ugly, no, it cant be done another way
 TSentry Sentry {};
 Application::TSettings Application::Settings = {};
 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
@@ -214,6 +217,9 @@ void Application::CheckForUpdates() {
            if (FirstTime) {
                beammp_debug("Failed to fetch version from: " + url);
                beammp_trace("got " + Response);
                auto Lock = Sentry.CreateExclusiveContext();
                Sentry.SetContext("get-response", { { "response", Response } });
                Sentry.LogError("failed to get server version", _file_basename, _line);
                Application::SetSubsystemStatus("UpdateCheck", Application::Status::Bad);
            }
        }
@@ -116,7 +116,7 @@ TEST_CASE("LuaAPI::MP::GetServerVersion") {
 static inline std::pair<bool, std::string> InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
    std::string Packet = "E:" + EventName + ":" + Data;
    if (PlayerID == -1) {
-        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, Packet, true, true);
        return { true, "" };
    } else {
        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
@@ -125,7 +125,7 @@ static inline std::pair<bool, std::string> InternalTriggerClientEvent(int Player
            return { false, "Invalid Player ID" };
        }
        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);
            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
            return { false, "Respond failed, dropping client" };
@@ -155,7 +155,7 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
    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);
@@ -167,7 +167,7 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
                return Result;
            }
            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
-            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+            if (!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?
            }
@@ -194,7 +194,7 @@ std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
    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 {
@@ -526,7 +526,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:
@@ -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";
@@ -107,8 +106,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.");
@@ -192,7 +189,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 +240,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() {
@@ -8,7 +8,6 @@
 #include "TLuaEngine.h"
 #include <ctime>
 #include <mutex>
 #include <sstream>
 static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
@@ -199,10 +198,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;
        }
    }
@@ -351,7 +350,7 @@ 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;
    }
 }
@@ -606,7 +605,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);
                    }
@@ -40,6 +40,20 @@ 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",
                { { "response-body", T },
                    { "request-body", Body } });
            Sentry.SetTransaction(transaction);
            beammp_trace("sending log to sentry: " + std::to_string(status) + " for " + transaction);
            Sentry.Log(SentryLevel::Error, "default", Http::Status::ToString(status) + " (" + std::to_string(status) + ")");
        };
        auto Target = "/heartbeat";
        unsigned int ResponseCode = 0;
@@ -47,14 +61,17 @@ 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 } });
                SentryReportError(Url + Target, ResponseCode);
            } else if (ResponseCode != 200) {
-                beammp_errorf("Response code from the heartbeat: {}", ResponseCode);
+                SentryReportError(Url + Target, ResponseCode);
            } else {
                // all ok
                Ok = true;
@@ -73,20 +90,24 @@ void THeartbeatThread::operator()() {
            if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) {
                Status = Doc[StatusKey].GetString();
            } else {
                Sentry.SetContext("JSON Response", { { StatusKey, "invalid string / missing" } });
                Ok = false;
            }
            if (Doc.HasMember(CodeKey) && Doc[CodeKey].IsString()) {
                Code = Doc[CodeKey].GetString();
            } else {
                Sentry.SetContext("JSON Response", { { CodeKey, "invalid string / missing" } });
                Ok = false;
            }
            if (Doc.HasMember(MessageKey) && Doc[MessageKey].IsString()) {
                Message = Doc[MessageKey].GetString();
            } else {
                Sentry.SetContext("JSON Response", { { MessageKey, "invalid string / missing" } });
                Ok = false;
            }
            if (!Ok) {
                beammp_error("Missing/invalid json members in backend response");
                Sentry.LogError("Missing/invalid json members in backend response", __FILE__, std::to_string(__LINE__));
            }
        } else {
            if (!Application::Settings.Private) {
@@ -127,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)
@@ -4,7 +4,6 @@
 #include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaPlugin.h"
 #include "sol/object.hpp"
 #include <chrono>
 #include <condition_variable>
@@ -286,7 +285,6 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
        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 +299,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 +417,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 +425,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);
        }
    }
@@ -587,25 +584,27 @@ std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetPositionR
        std::string VehiclePos = Client->GetCarPositionRaw(VID);
        if (VehiclePos.empty()) {
-            // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Vehicle not found"));
+            //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) {
+        if (t == sol::lua_nil){
            Result.second = "Packet decode failed";
        }
-        // return std::make_tuple(Result, sol::make_object(StateView, sol::lua_nil));
+        //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"));
+    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";
@@ -949,6 +948,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 +957,6 @@ void TLuaEngine::StateThreadData::operator()() {
                    sol::error Err = Res;
                    S.second->ErrorMessage = Err.what();
                }
                S.second->MarkAsReady();
            }
        }
        { // StateFunctionQueue Scope
@@ -995,15 +994,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 +1008,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 +1062,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)
@@ -0,0 +1,138 @@
 #include "TSentry.h"
 #include "Common.h"
 #include <cstring>
 #include <sentry.h>
 #include <sstream>
 TSentry::TSentry() {
    if (std::strlen(S_DSN) == /* DISABLES CODE */ (0)) {
        mValid = false;
    } else {
        mValid = true;
        sentry_options_t* options = sentry_options_new();
        sentry_options_set_dsn(options, S_DSN);
        auto ReleaseString = "BeamMP-Server@" + Application::ServerVersionString();
        sentry_options_set_symbolize_stacktraces(options, true);
        sentry_options_set_release(options, ReleaseString.c_str());
        sentry_options_set_max_breadcrumbs(options, 10);
        sentry_init(options);
    }
 }
 TSentry::~TSentry() {
    if (mValid) {
        sentry_close();
    }
 }
 void TSentry::PrintWelcome() {
    if (mValid) {
        if (!Application::Settings.SendErrors) {
            mValid = false;
            if (Application::Settings.SendErrorsMessageEnabled) {
                beammp_info("Opted out of error reporting (SendErrors), Sentry disabled.");
            } else {
                beammp_info("Sentry disabled");
            }
        } else {
            if (Application::Settings.SendErrorsMessageEnabled) {
                beammp_info("Sentry started! Reporting errors automatically. This sends data to the developers in case of errors and crashes. You can learn more, turn this message off or opt-out of this in the ServerConfig.toml.");
            } else {
                beammp_info("Sentry started");
            }
        }
    } else {
        if (Application::Settings.SendErrorsMessageEnabled) {
            beammp_info("Sentry disabled in unofficial build. Automatic error reporting disabled.");
        } else {
            beammp_info("Sentry disabled in unofficial build");
        }
    }
 }
 void TSentry::SetupUser() {
    if (!mValid) {
        return;
    }
    Application::SetSubsystemStatus("Sentry", Application::Status::Good);
    sentry_value_t user = sentry_value_new_object();
    if (Application::Settings.Key.size() == 36) {
        sentry_value_set_by_key(user, "id", sentry_value_new_string(Application::Settings.Key.c_str()));
    } else {
        sentry_value_set_by_key(user, "id", sentry_value_new_string("unauthenticated"));
    }
    sentry_set_user(user);
 }
 void TSentry::Log(SentryLevel level, const std::string& logger, const std::string& text) {
    if (!mValid) {
        return;
    }
    SetContext("threads", { { "thread-name", ThreadName(true) } });
    auto Msg = sentry_value_new_message_event(sentry_level_t(level), logger.c_str(), text.c_str());
    sentry_capture_event(Msg);
    sentry_set_transaction(nullptr);
 }
 void TSentry::LogError(const std::string& text, const std::string& file, const std::string& line) {
    if (!mValid) {
        return;
    }
    SetTransaction(file + ":" + line);
    Log(SentryLevel::Error, "default", file + ": " + text);
 }
 void TSentry::SetContext(const std::string& context_name, const std::unordered_map<std::string, std::string>& map) {
    if (!mValid) {
        return;
    }
    auto ctx = sentry_value_new_object();
    for (const auto& pair : map) {
        std::string key = pair.first;
        if (key == "type") {
            // `type` is reserved
            key = "_type";
        }
        sentry_value_set_by_key(ctx, key.c_str(), sentry_value_new_string(pair.second.c_str()));
    }
    sentry_set_context(context_name.c_str(), ctx);
 }
 void TSentry::LogException(const std::exception& e, const std::string& file, const std::string& line) {
    if (!mValid) {
        return;
    }
    SetTransaction(file + ":" + line);
    Log(SentryLevel::Fatal, "exceptions", std::string(e.what()) + " @ " + file + ":" + line);
 }
 void TSentry::LogAssert(const std::string& condition_string, const std::string& file, const std::string& line, const std::string& function) {
    if (!mValid) {
        return;
    }
    SetTransaction(file + ":" + line + ":" + function);
    std::stringstream ss;
    ss << "\"" << condition_string << "\" failed @ " << file << ":" << line;
    Log(SentryLevel::Fatal, "asserts", ss.str());
 }
 void TSentry::AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line) {
    if (!mValid) {
        return;
    }
    auto crumb = sentry_value_new_breadcrumb("default", (msg + " @ " + file + ":" + line).c_str());
    sentry_value_set_by_key(crumb, "level", sentry_value_new_string("error"));
    sentry_add_breadcrumb(crumb);
 }
 void TSentry::SetTransaction(const std::string& id) {
    if (!mValid) {
        return;
    }
    sentry_set_transaction(id.c_str());
 }
 std::unique_lock<std::mutex> TSentry::CreateExclusiveContext() {
    return std::unique_lock<std::mutex>(mMutex);
 }
@@ -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>
@@ -95,20 +93,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();
    } catch (const std::exception&) {
        // silently fail, as there's nothing to do
        return;
    }
    beammp_assert(LockedClientPtr != nullptr);
    TClient& Client = *LockedClientPtr;
        beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
    // TODO: Send delete packets for all cars
        Client.ClearCars();
        WriteLock Lock(mClientsMutex);
        mClients.erase(WeakClientPtr.lock());
    }
 }
 std::weak_ptr<TClient> TServer::InsertNewClient() {
    beammp_debug("inserting new client (" + std::to_string(ClientCount()) + ")");
    WriteLock Lock(mClientsMutex);
    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 +127,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,8 +146,6 @@ 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 Y
    if (Code <= 89 && Code >= 86) {
        PPSMonitor.IncrementInternalPPS();
@@ -157,40 +154,38 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
    }
    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,12 +194,12 @@ 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()) + ")");
@@ -213,7 +208,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
    case 'Z': // position packet
        PPSMonitor.IncrementInternalPPS();
        Network.SendToAll(LockedClient.get(), Packet, false, false);
-        HandlePosition(*LockedClient, StringPacket);
+
        HandlePosition(*LockedClient, Packet);
    default:
        return;
    }
@@ -222,10 +218,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 +235,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,7 +250,7 @@ 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);
@@ -267,10 +259,10 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
    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,16 +275,16 @@ 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;
@@ -314,14 +306,14 @@ 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);
+                Network.SendToAll(nullptr, Destroy, true, true);
                c.DeleteCar(VID);
            }
        }
@@ -329,7 +321,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
    }
    case 'd': {
        beammp_trace(std::string(("got 'Od' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        auto MaybePidVid = GetPidVid(Data);
        if (MaybePidVid) {
            std::tie(PID, VID) = MaybePidVid.value();
        }
@@ -337,7 +329,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
            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);
@@ -347,7 +339,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
    }
    case 'r': {
        beammp_trace(std::string(("got 'Or' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        auto MaybePidVid = GetPidVid(Data);
        if (MaybePidVid) {
            std::tie(PID, VID) = MaybePidVid.value();
        }
@@ -355,16 +347,16 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
        if (PID != -1 && VID != -1 && PID == c.GetID()) {
            Data = Data.substr(Data.find('{'));
            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
-            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()) + (")")));
@@ -382,12 +374,22 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
    std::string VD = c.GetCarData(VID);
    if (VD.empty()) {
        beammp_error("Tried to apply change to vehicle that does not exist");
        auto Lock = Sentry.CreateExclusiveContext();
        Sentry.SetContext("vehicle-change",
            { { "packet", Packet },
                { "vehicle-id", std::to_string(VID) },
                { "client-car-count", std::to_string(c.GetCarCount()) } });
        Sentry.LogError("attempt to apply change to nonexistent vehicle", _file_basename, _line);
        return;
    }
    std::string Header = VD.substr(0, VD.find('{'));
    FoundPos = VD.find('{');
    if (FoundPos == std::string::npos) {
        auto Lock = Sentry.CreateExclusiveContext();
        Sentry.SetContext("vehicle-change-packet",
            { { "packet", VD } });
        Sentry.LogError("malformed packet", _file_basename, _line);
        return;
    }
    VD = VD.substr(FoundPos);
@@ -423,24 +425,10 @@ void TServer::InsertClient(const std::shared_ptr<TClient>& 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
@@ -448,7 +436,6 @@ void TServer::HandlePosition(TClient& c, const std::string& Packet) {
    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);
@@ -1,3 +1,5 @@
 #include "TSentry.h"
 #include "ArgsParser.h"
 #include "Common.h"
 #include "Http.h"
@@ -62,6 +64,7 @@ int main(int argc, char** argv) {
    } catch (const std::exception& e) {
        beammp_error("A fatal exception has occurred and the server is forcefully shutting down.");
        beammp_error(e.what());
        Sentry.LogException(e, _file_basename, _line);
        MainRet = -1;
    }
    std::exit(MainRet);
@@ -145,6 +148,8 @@ int BeamMPServerMain(MainArguments Arguments) {
    RegisterThread("Main");
    beammp_trace("Running in debug mode on a debug build");
    Sentry.SetupUser();
    Sentry.PrintWelcome();
    TResourceManager ResourceManager;
    TPPSMonitor PPSMonitor(Server);
    THeartbeatThread Heartbeat(ResourceManager, Server);
@@ -1,19 +0,0 @@
 {
  "name": "server",
  "version-string": "0.1.0",
  "dependencies": [
    "fmt",
    "doctest",
    "boost-asio",
    "boost-variant",
    "boost-spirit",
    "boost-uuid",
    "cpp-httplib",
    "toml11",
    "libzip",
    "rapidjson",
    "nlohmann-json",
    "openssl",
    "sol2"
  ]
 }
Author	SHA1	Message	Date
Lion Kortlepel	5f456584a8	use lua 5.3.6 for static build	2022-09-29 11:19:20 +02:00
Lion Kortlepel	b88b64cd0e	update docker-build.sh to add an option to run-only	2022-09-28 00:01:09 +02:00
Lion Kortlepel	dccdd3f5f2	add ability to change openssl and zlib	2022-09-27 23:46:19 +02:00
Lion Kortlepel	ae38f01fdc	add initial docker static build container	2022-09-27 23:41:47 +02:00