update commandline to fix redirect issue

remove custom ip functionality
because it never worked
2026-07-13 10:13:42 +00:00 · 2023-12-28 21:21:51 +01:00 · 2023-12-28 17:20:31 +01:00 · 2023-12-28 14:25:42 +01:00 · 2023-12-28 13:58:59 +01:00 · 2023-12-28 13:57:49 +01:00
74 changed files with 1774 additions and 1705 deletions
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[Bug] Enter issue title here"
 labels: bug
 assignees: ''

@@ -1,8 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[Feature Request]"
-labels: enhancement
+labels: feature
 assignees: ''

 ---
@@ -1,83 +0,0 @@
-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
@@ -1,62 +0,0 @@
-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
@@ -0,0 +1,123 @@
+name: Linux
+
+on: [push]
+
+env: 
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  CMAKE_BUILD_TYPE: "Release"
+
+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: Archive server debug info artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-debian.debug
+          path: ./bin/BeamMP-Server.debug
+
+      - name: Build Tests
+        run: bash ./scripts/debian-11/3-build-tests.sh
+
+      - name: Install Runtime Dependencies
+        run: bash ./scripts/debian-11/4-install-runtime-deps.sh
+
+      - name: Test
+        run: ./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: Archive server debug info artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-ubuntu.debug
+          path: ./bin/BeamMP-Server.debug
+
+      - name: Build Tests
+        run: bash ./scripts/ubuntu-22.04/3-build-tests.sh
+
+      - name: Install Runtime Dependencies
+        run: bash ./scripts/ubuntu-22.04/4-install-runtime-deps.sh
+
+      - name: Test
+        run: ./bin/BeamMP-Server-tests
@@ -1,115 +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:
-  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
@@ -0,0 +1,191 @@
+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"
+  CMAKE_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. You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this.
+              - `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
+
+      - name: Upload Debug Info
+        id: upload-debug-info
+        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.debug
+          asset_name: debuginfo-debian.debug
+          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
+
+      - name: Upload Debug Info
+        id: upload-debug-info
+        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.debug
+          asset_name: debuginfo-ubuntu.debug
+          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/Release/BeamMP-Server.exe
+          asset_name: BeamMP-Server.exe
+          asset_content_type: application/vnd.microsoft.portable-executable
@@ -0,0 +1,43 @@
+name: Windows
+
+on: [push]
+
+env:
+  VCPKG_DEFAULT_TRIPLET: x64-windows-static
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  CMAKE_BUILD_TYPE: "Release"
+
+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/Release/BeamMP-Server.exe
+
@@ -1,33 +1,6 @@
 [submodule "deps/commandline"]
 	path = deps/commandline
 	url = https://github.com/lionkor/commandline
-[submodule "deps/asio"]
-	path = deps/asio
-	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
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/Microsoft/vcpkg.git
@@ -1,208 +1,213 @@
-# 3.4 is required for imported targets.
-cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
-
-message(STATUS "You can find build instructions and a list of dependencies in the README at \
-https://github.com/BeamMP/BeamMP-Server")
-
-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()
-
-
-set(HTTPLIB_REQUIRE_OPENSSL ON)
-set(SENTRY_BUILD_SHARED_LIBS OFF)
-
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps")
-
-add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
-
-# ------------------------ APPLE ---------------------------------
-if(APPLE)
-    if(IS_DIRECTORY /opt/homebrew/Cellar/lua@5.3/5.3.6)
-        set(LUA_INCLUDE_DIR /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 "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -static-libstdc++ -static-libgcc")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-builtin")
-    option(SANITIZE "Turns on thread and UB sanitizers" OFF)
-    if (SANITIZE)
-        message(STATUS "sanitize is ON")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,thread")
-    endif (SANITIZE)
-endif ()
-
-include_directories("include/sentry-native/include")
-set(BUILD_SHARED_LIBS OFF)
-# ------------------------ SENTRY ---------------------------------
-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")
-
-# ------------------------ C++ SETUP ---------------------------------
-set(CMAKE_CXX_STANDARD 17)
-if (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-endif ()
-
-# ------------------------ DEPENDENCIES ------------------------------
-message(STATUS "Adding local source dependencies")
-# this has to happen before -DDEBUG since it wont compile properly with -DDEBUG
-add_subdirectory(deps)
-
-# ------------------------ VARIABLES ---------------------------------
-
-include(FindLua)
-include(FindOpenSSL)
-include(FindThreads)
-include(FindZLIB)
-
-set(BeamMP_Sources
-    include/TConsole.h src/TConsole.cpp
-    include/TServer.h src/TServer.cpp
-    include/Compat.h src/Compat.cpp
-    include/Common.h src/Common.cpp
-    include/Client.h src/Client.cpp
-    include/VehicleData.h src/VehicleData.cpp
-    include/TConfig.h src/TConfig.cpp
-    include/TLuaEngine.h src/TLuaEngine.cpp
-    include/TLuaPlugin.h src/TLuaPlugin.cpp
-    include/TResourceManager.h src/TResourceManager.cpp
-    include/THeartbeatThread.h src/THeartbeatThread.cpp
-    include/Http.h src/Http.cpp
-    include/TSentry.h src/TSentry.cpp
-    include/TPPSMonitor.h src/TPPSMonitor.cpp
-    include/TNetwork.h src/TNetwork.cpp
-    include/LuaAPI.h src/LuaAPI.cpp
-    include/TScopedTimer.h src/TScopedTimer.cpp
-    include/SignalHandling.h src/SignalHandling.cpp
-    include/ArgsParser.h src/ArgsParser.cpp
-    include/TPluginMonitor.h src/TPluginMonitor.cpp
-    include/Environment.h
-)
-
-set(BeamMP_Includes
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/commandline"
-    ${LUA_INCLUDE_DIR}
-    ${CURL_INCLUDE_DIRS}
-    "include/tomlplusplus"
-    "include/sentry-native/include"
-    "include/curl/include"
-)
-
-set(BeamMP_Definitions
-    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
-)
-
-set(BeamMP_Libraries
-    doctest::doctest
-    OpenSSL::SSL
-    OpenSSL::Crypto
-    sol2::sol2
-    fmt::fmt
-    Threads::Threads
-    ZLIB::ZLIB
-    ${LUA_LIBRARIES}
-    commandline
-    sentry
-)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

 if (WIN32)
-    set(BeamMP_PlatformLibs wsock32 ws2_32)
-endif ()
-
-# ------------------------ BEAMMP SERVER -----------------------------
-
-add_executable(BeamMP-Server
-        src/main.cpp
-        ${BeamMP_Sources}
-)
-
-target_compile_definitions(BeamMP-Server PRIVATE
-    ${BeamMP_Definitions}
-    DOCTEST_CONFIG_DISABLE
-)
-
-target_include_directories(BeamMP-Server PUBLIC 
-    ${BeamMP_Includes}
-)
-
-target_link_libraries(BeamMP-Server
-    ${BeamMP_Libraries}
-    ${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_include_directories(BeamMP-Server-tests PUBLIC
-        ${BeamMP_Includes}
-    )
-
-    target_link_libraries(BeamMP-Server-tests
-        ${BeamMP_Libraries}
-        ${BeamMP_PlatformLibs}
-    )
+    set(VCPKG_TARGET_TRIPLET x64-windows-static)
+endif()
+
+include(cmake/Vcpkg.cmake) # needs to happen before project()
+
+project(
+    "BeamMP-Server" # replace this
+    VERSION 3.3.0
+)
+
+include(cmake/StandardSettings.cmake)
+include(cmake/StaticAnalyzers.cmake)
+include(cmake/Git.cmake)
+
+# below are options which should be changed
+
+### SETTINGS ###
+
+# add all headers (.h, .hpp) to this
+set(PRJ_HEADERS 
+    include/ArgsParser.h
+    include/BoostAliases.h
+    include/Client.h
+    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)
+
+# set the source file containing main()
+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
+find_package(fmt CONFIG REQUIRED)
+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)
+
+# to enable multithreading and the Threads::Threads dependency
+include(FindThreads)
+
+### END SETTINGS ###
+
+# DONT change anything beyond this point unless you've read the cmake bible and 
+# swore on it not to bonk up the ci/cd pipelines with your changes.
+
+####################
+
+
+# enables compile_commands.json for clang-related tools (such as the clang LS)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# build release builds by default (if not specified otherwise)
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    message(NOTICE "No build type specified, defaulting to 'Release'")
+    set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+if(UNIX)
+    # this will allow to use same _DEBUG macro available in both Linux as well as Windows - MSCV environment. Easy to put Debug specific code.
+    add_compile_options("$<$<CONFIG:DEBUG>:-D_DEBUG>")
+endif(UNIX)
+
+if (WIN32)
+    add_compile_options("-D_WIN32_WINNT=0x0601")
+endif(WIN32)
+
+
+include(cmake/CompilerWarnings.cmake)
+
+# set MT library for msvc - this is required (says documentation)
+# linux/mac/etc should simply ignore this by default.
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
+    PRJ_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
+    PRJ_VERSION_MINOR=${PROJECT_VERSION_MINOR}
+    PRJ_VERSION_PATCH=${PROJECT_VERSION_PATCH}
+)
+
+# build commandline manually for funky windows flags to carry over without a custom toolchain file
+add_library(commandline_static 
+    deps/commandline/src/impls.h
+    deps/commandline/src/windows_impl.cpp
+    deps/commandline/src/linux_impl.cpp
+    deps/commandline/src/backends/InteractiveBackend.cpp
+    deps/commandline/src/backends/InteractiveBackend.h
+    deps/commandline/src/backends/Backend.cpp
+    deps/commandline/src/backends/Backend.h
+    deps/commandline/src/commandline.h
+    deps/commandline/src/commandline.cpp
+    deps/commandline/src/backends/BufferedBackend.cpp
+    deps/commandline/src/backends/BufferedBackend.h
+)
+if (WIN32)
+    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1)
+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})
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    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_link_options(${PROJECT_NAME} PRIVATE "/SUBSYSTEM:CONSOLE")
+endif(MSVC)
+
+# setup all warnings (from cmake/CompilerWarnings.cmake)
+set_project_warnings(${PROJECT_NAME})
+
+if(${PROJECT_NAME}_ENABLE_UNIT_TESTING)
+    message(STATUS "Unit tests are enabled and will be built as '${PROJECT_NAME}-tests'")
+    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_compile_features(${PROJECT_NAME}-tests PRIVATE ${PRJ_COMPILE_FEATURES})
+    target_compile_definitions(${PROJECT_NAME}-tests PRIVATE ${PRJ_DEFINITIONS} ${PRJ_WARNINGS})
+    set_project_warnings(${PROJECT_NAME}-tests)
+    if(MSVC)
+        target_link_options(${PROJECT_NAME}-tests PRIVATE "/SUBSYSTEM:CONSOLE")
+    endif(MSVC)
 endif()

@@ -1,142 +0,0 @@
-
-# v3.1.0
-
- ADDED Tab autocomplete in console, smart tab autocomplete (understands lua tables and types) in the lua console
- ADDED lua debug facilities (type `:help` when attached to lua via `lua`)
- ADDED MP.JsonEncode() and MP.JsonDecode(), which turn lua tables into json and vice-versa
- ADDED FS.ListFiles and FS.ListDirectories
- ADDED onFileChanged event, triggered when a server plugin file changes
- ADDED MP.GetPositionRaw(), which can be used to retrieve the latest position packet per player, per vehicle
- ADDED error messages to some lua functions
- FIXED `ip` in MP.GetIdentifiers
- FIXED issue with client->server events which contain ':'
- FIXED a fatal exception on LuaEngine startup if Resources/Server is a symlink
- FIXED onInit not being called on hot-reload
- FIXED incorrect timing calculation of Lua EventTimer loop
- FIXED bug which caused hot-reload not to report syntax errors
- FIXED missing error messages on some event handler calls
- FIXED vehicles not deleting for all players if an edit was cancelled by Lua
-
-# v3.0.2
-
- ADDED Periodic update message if a new server is released
- ADDED Config setting for the IP the http server listens on
- CHANGED Default MaxPlayers to 8
- CHANGED Default http server listen IP to localhost
- FIXED `MP.CreateEventTimer` filling up the queue (see <https://wiki.beammp.com/en/Scripting/new-lua-scripting#mpcreateeventtimerevent_name-string-interval_ms-number-strategy-number-since-v302>)
- FIXED `MP.TriggerClientEvent` not kicking the client if it failed
- FIXED Lua result queue handling not checking all results
- FIXED bug which caused ServerConfig.toml to generate incorrectly
-
-# v3.0.1
-
- ADDED Backup URLs to UpdateCheck (will fail less often now)
- ADDED console cursor left and right movement (with arrow keys) and working HOME and END key (via github.com/lionkor/commandline)
- FIXED infinite snowmen / infinite unicycle spawning bug
- FIXED a bug where, when run with --working-directory, the Server.log would still be in the original directory
- FIXED a bug which could cause the plugin reload thread to spin at 100% if the reloaded plugin's didn't terminate
- FIXED an issue which would cause servers to crash on mod download via SIGPIPE on POSIX
- FIXED an issue which would cause servers to crash when checking if a vehicle is a unicycle
-
-# v3.0.0
-
- CHANGED entire plugin Lua implementation (rewrite)
- CHANGED moved *almost all* Lua functions into MP.\*
- CHANGED console to use a custom language (type `help`, `list`, or `status`!)
- CHANGED all files of a Lua plugin to share a Lua state (no more state-per-file)
- ADDED many new Lua API functions, which can be found at <https://wiki.beammp.com/en/Scripting/functions>
- ADDED Commandline options. Run with `--help` to see all options.
- ADDED HTTP(S) Server (OpenAPI spec coming soon!)
- ADDED plugin directories to `package.path` and `package.cpath` before `onInit`
- ADDED ability to add `PluginConfig.toml` to your plugin folder to change some settings
- ADDED ability to share a lua state with other plugins via `StateId` setting in `PluginConfig.toml`
- ADDED ability to see name-to-thread-ID association in debug mode
- ADDED dumping tables with `print()` (try it with `print(MP)`)
- ADDED `MP.GetOSName()`, `MP.CreateTimer()`, `MP.GetLuaMemoryUsage()` and many more (see <https://wiki.beammp.com/en/Scripting/functions>)
- ADDED `MP.Settings` table to make usage of `MP.Set()` easier
- ADDED `FS.*` table with common filesystem operations (do `print(FS)` to see them!)
- FIXED i/o thread spin when stdout is /dev/null on linux
- FIXED removed extra whitespace infront of onChatMessage message
-
-# v2.3.3
-
- CHANGED servers to be private by default
-
-# v2.3.2
-
- ADDED Ctrl+C causes a graceful shutdown on windows (did already on linux)
- ADDED more meaningful shutdown messages
- ADDED even better backend connection error reporting
- ADDED `SendErrors` config in `ServerConfig.toml` to opt-out of error reporting
- ADDED hard-shutdown if Ctrl+C pressed 3 times
- FIXED issue with shells like bash being unusable after server exit
-
-# v2.3.1
-
- CHANGED join/sync timeout to 20 minutes, players wont drop if loading takes >5 mins
-
-# v2.3.0
-
- ADDED version check - the server will now let you know when a new release is out
- ADDED logging of various errors, crashes and exceptions to the backend
- ADDED chat messages are now logged to the server console as [CHAT]
- ADDED debug message telling you when the server heartbeats to the backend
- REMOVED various [DEBUG] messages which were confusing (such as "breaking client loop")
- FIXED various crashes and issues with handling unexpected backend responses
- FIXED minor bugs due to code correctness
-
-# v2.2.0
-
- FIXED major security flaw
- FIXED minor bugs
-
-# v2.1.4
-
- ADDED debug heartbeat print
- ADDED kicking every player before shutdown
- FIXED rare bug which led to violent crash
- FIXED minor bugs
-
-# v2.1.3
-
- FIXED Lua events not cancelling properly on Linux
-
-# v2.1.2
-
- CHANGED default map to gridmap v2
- FIXED version number display
-
-# v2.1.1
-# v2.1.0 (pre-v2.1.1)
-# v2.0.4 (pre-v2.1.0)
-
- REMOVED boost as a runtime dependency
- FIXED Lua plugins on Linux
- FIXED console history on Windows
- CHANGED to new config format TOML
-
-# v2.0.3
-
- WORKAROUND for timeout bug / ghost player bug
- FIXED 100% CPU spin when stdin is /dev/null.
-
-# v2.0.2
-
- ADDED fully new commandline
- ADDED new backend
- ADDED automated build system
- ADDED lua GetPlayerIdentifiers
- ADDED lots of debug info
- ADDED better POSTing and GETing
- ADDED a license
- FIXED ghost players in player list issue
- FIXED ghost vehicle after joining issue
- FIXED missing vehicle after joining issue
- FIXED a lot of desync issues
- FIXED some memory leaks
- FIXED various crashes
- FIXED various data-races
- FIXED some linux-specific crashes
- FIXED some linux-specific issues
- FIXED bug which caused kicking to be logged as leaving
- FIXED various internal developer quality-of-life things
@@ -6,13 +6,12 @@
 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
 The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).

-**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**
+**For Linux, you __need__ the runtime dependencies, which are listed below under [Runtime Dependencies](#runtime-dependencies)**

 ## Support + Contact

 Feel free to ask any questions via the following channels:

- **IRC**: `#beammp` on [irc.libera.chat](https://web.libera.chat/)
 - **Discord**: [click for invite](https://discord.gg/beammp)
 - **BeamMP Forum**: [BeamMP Forum Support](https://forum.beammp.com/c/support/33)

@@ -29,7 +28,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" label or with nobody assigned.
+TLDR; [Issues](https://github.com/BeamMP/BeamMP-Server/issues) with the "help wanted" or "good first issue" 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,11 +38,11 @@ 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 `v1.20`. 
+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`. 

 ## Supported Operating Systems

-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and sometimes Linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.
+The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and Linux. For any other distro or OS, you just have to find the same libraries listed in [Runtime Dependencies](#runtime-dependencies) further down the page, and it should build fine.

 Recommended compilers: MSVC, GCC, CLANG. 

@@ -51,59 +50,35 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea

 ## Build Instructions

-**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v2.3.3`!__**
+On Linux, you need some dependencies to **build** the server (on Windows, you don't):

-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)).
+For Debian, Ubuntu and others you can find scripts that do this in `scripts/`.

-### Prerequisites
-
-#### 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
+liblua5.3-dev curl zip unzip tar cmake make git g++
 ```

-#### Linux
+The names of each package may change depending on your platform. See in `scripts/` or use a search engine to find out what they're called for you.

-Runtime dependencies - you want to find packages for:
- libz
- rapidjson
- lua5.3
- ssl / openssl
- websocketpp
- curl (with ssl support)
+You can build on **Windows, Linux** or other platforms by following these steps:

-Build-time dependencies are:
-```
-git
-make
-cmake
-g++
-```
+1. Check out the repository with git: `git clone --recursive https://github.com/BeamMP/BeamMP-Server`.
+2. Go into the directory `cd BeamMP-Server`.
+3. Run CMake `cmake -S . -B bin -DCMAKE_BUILD_TYPE=Release` - this can take a few minutes and may take a lot of disk space and bandwidth.
+4. Build via `cmake --build bin --parallel -t BeamMP-Server`.
+5. Your executable can be found in `bin/`.

-### How to build
+When you make changes to the code, you only have to run step 4 again.

-On Windows, use git-bash for these commands. On Linux, these should work in your shell.
+### Runtime Dependencies

-1. Make sure you have all [prerequisites](#prerequisites) installed
-2. Clone the repository in a location of your choice with `git clone --recurse-submodules https://github.com/BeamMP/BeamMP-Server`. 
-3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`. 
-4. Checkout the branch of the release you want to compile, for example `git checkout tags/v3.0.2` for version 3.0.2. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
-5. Ensure that all submodules are initialized by running `git submodule update --init --recursive`
-6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`)
-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.
+These are needed to *run* the server.

-*tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*
+Debian, Ubuntu and friends: `liblua5.3-0`
+
+Other Linux distros: `liblua` of *some kind*.
+
+Windows: No libraries.

 ## Support
 The BeamMP project is supported by community donations via our [Patreon](https://www.patreon.com/BeamMP). This brings perks such as Patreon-only channels on our Discord, early access to new updates, and more server keys. 
@@ -0,0 +1,115 @@
+# 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()
@@ -0,0 +1,21 @@
+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()
@@ -0,0 +1,44 @@
+# 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()
@@ -0,0 +1,20 @@
+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()
@@ -0,0 +1,17 @@
+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()
+
@@ -1,7 +0,0 @@
-include_directories("${PROJECT_SOURCE_DIR}/deps")
-include_directories("${PROJECT_SOURCE_DIR}/deps/commandline")
-
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")
-add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest")
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <boost/asio.hpp>
+#include <boost/system/error_code.hpp>
+
+using namespace boost::asio;
@@ -7,6 +7,7 @@
 #include <string>
 #include <unordered_set>

+#include "BoostAliases.h"
 #include "Common.h"
 #include "Compat.h"
 #include "VehicleData.h"
@@ -19,9 +20,8 @@ class TServer;
 #endif // WINDOWS

 struct TConnection final {
-    SOCKET Socket;
-    struct sockaddr SockAddr;
-    socklen_t SockAddrLen;
+    ip::tcp::socket Socket;
+    ip::tcp::endpoint SockAddr;
 };

 class TClient final {
@@ -33,8 +33,9 @@ public:
        std::unique_lock<std::mutex> Lock;
    };

-    explicit TClient(TServer& Server);
+    TClient(TServer& Server, ip::tcp::socket&& Socket);
    TClient(const TClient&) = delete;
+    ~TClient();
    TClient& operator=(const TClient&) = delete;

    void AddNewCar(int Ident, const std::string& Data);
@@ -46,16 +47,20 @@ 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(sockaddr_in Addr) { mUDPAddress = Addr; }
-    void SetDownSock(SOCKET CSock) { mSocket[1] = CSock; }
-    void SetTCPSock(SOCKET CSock) { mSocket[0] = CSock; }
-    void SetStatus(int Status) { mStatus = Status; }
+    void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
+    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
+    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
+    void Disconnect(std::string_view Reason);
+    bool IsDisconnected() const { return !mSocket.is_open(); }
    // locks
    void DeleteCar(int Ident);
    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
-    [[nodiscard]] sockaddr_in GetUDPAddr() const { return mUDPAddress; }
-    [[nodiscard]] SOCKET GetDownSock() const { return mSocket[1]; }
-    [[nodiscard]] SOCKET GetTCPSock() const { return mSocket[0]; }
+    [[nodiscard]] const ip::udp::endpoint& GetUDPAddr() const { return mUDPAddress; }
+    [[nodiscard]] ip::udp::endpoint& GetUDPAddr() { return mUDPAddress; }
+    [[nodiscard]] ip::tcp::socket& GetDownSock() { return mDownSocket; }
+    [[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; }
@@ -63,7 +68,6 @@ 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; }
@@ -73,9 +77,9 @@ public:
    void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
    void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
    void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
-    void EnqueuePacket(const std::string& Packet);
-    [[nodiscard]] std::queue<std::string>& MissedPacketQueue() { return mPacketsSync; }
-    [[nodiscard]] const std::queue<std::string>& MissedPacketQueue() const { return mPacketsSync; }
+    void EnqueuePacket(const std::vector<uint8_t>& Packet);
+    [[nodiscard]] std::queue<std::vector<uint8_t>>& MissedPacketQueue() { return mPacketsSync; }
+    [[nodiscard]] const std::queue<std::vector<uint8_t>>& 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; }
@@ -91,7 +95,7 @@ private:
    bool mIsSynced = false;
    bool mIsSyncing = false;
    mutable std::mutex mMissedPacketsMutex;
-    std::queue<std::string> mPacketsSync;
+    std::queue<std::vector<uint8_t>> mPacketsSync;
    std::unordered_map<std::string, std::string> mIdentifiers;
    bool mIsGuest = false;
    mutable std::mutex mVehicleDataMutex;
@@ -99,12 +103,12 @@ private:
    TSetOfVehicleData mVehicleData;
    SparseArray<std::string> mVehiclePosition;
    std::string mName = "Unknown Client";
-    SOCKET mSocket[2] { SOCKET(0), SOCKET(0) };
-    sockaddr_in mUDPAddress {}; // is this initialization OK? yes it is
+    ip::tcp::socket mSocket;
+    ip::tcp::socket mDownSocket;
+    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,10 +1,6 @@
 #pragma once

-#include "TSentry.h"
-extern TSentry Sentry;
-
 #include <array>
-#include <unordered_map>
 #include <atomic>
 #include <cstring>
 #include <deque>
@@ -15,14 +11,13 @@ extern TSentry Sentry;
 #include <mutex>
 #include <shared_mutex>
 #include <sstream>
+#include <unordered_map>
 #include <zlib.h>

 #include <doctest/doctest.h>
 #include <filesystem>
 namespace fs = std::filesystem;

-#include "Compat.h"
-
 #include "TConsole.h"

 struct Version {
@@ -34,7 +29,7 @@ struct Version {
    std::string AsString();
 };

-template<typename T>
+template <typename T>
 using SparseArray = std::unordered_map<size_t, T>;

 // static class handling application start, shutdown, etc.
@@ -48,9 +43,11 @@ public:
    struct TSettings {
        std::string ServerName { "BeamMP Server" };
        std::string ServerDesc { "BeamMP Default Description" };
+        std::string ServerTags { "Freeroam" };
        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 };
@@ -79,10 +76,10 @@ public:
    static void RegisterShutdownHandler(const TShutdownHandler& Handler);
    // Causes all threads to finish up and exit gracefull gracefully
    static void GracefullyShutdown();
-    static TConsole& Console() { return *mConsole; }
+    static TConsole& Console() { return mConsole; }
    static std::string ServerVersionString();
    static const Version& ServerVersion() { return mVersion; }
-    static std::string ClientVersionString() { return "2.0"; }
+    static uint8_t ClientMajorVersion() { return 2; }
    static std::string PPS() { return mPPS; }
    static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }

@@ -105,9 +102,7 @@ public:
    static void SleepSafeSeconds(size_t Seconds);

    static void InitializeConsole() {
-        if (!mConsole) {
-            mConsole = std::make_unique<TConsole>();
-        }
+        mConsole.InitializeCommandline();
    }

    enum class Status {
@@ -133,15 +128,17 @@ private:
    static inline SystemStatusMap mSystemStatusMap {};
    static inline std::mutex mSystemStatusMapMutex {};
    static inline std::string mPPS;
-    static inline std::unique_ptr<TConsole> mConsole;
+    static inline TConsole mConsole;
    static inline std::shared_mutex mShutdownMtx {};
    static inline bool mShutdown { false };
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};

-    static inline Version mVersion { 3, 1, 0 };
+    static inline Version mVersion { 3, 2, 0 };
 };

+void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);
+
 std::string ThreadName(bool DebugModeOverride = false);
 void RegisterThread(const std::string& str);
 #define RegisterThreadAuto() RegisterThread(__func__)
@@ -194,7 +191,6 @@ 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 {                                                                                  \
@@ -277,11 +273,11 @@ inline T Comp(const T& Data) {
    // obsolete
    C.fill(0);
    z_stream defstream;
-    defstream.zalloc = Z_NULL;
-    defstream.zfree = Z_NULL;
-    defstream.opaque = Z_NULL;
-    defstream.avail_in = (uInt)Data.size();
-    defstream.next_in = (Bytef*)&Data[0];
+    defstream.zalloc = nullptr;
+    defstream.zfree = nullptr;
+    defstream.opaque = nullptr;
+    defstream.avail_in = uInt(Data.size());
+    defstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Data[0]));
    defstream.avail_out = Biggest;
    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
    deflateInit(&defstream, Z_BEST_COMPRESSION);
@@ -302,13 +298,13 @@ inline T DeComp(const T& Compressed) {
    // not needed
    C.fill(0);
    z_stream infstream;
-    infstream.zalloc = Z_NULL;
-    infstream.zfree = Z_NULL;
-    infstream.opaque = Z_NULL;
+    infstream.zalloc = nullptr;
+    infstream.zfree = nullptr;
+    infstream.opaque = nullptr;
    infstream.avail_in = Biggest;
-    infstream.next_in = (Bytef*)(&Compressed[0]);
+    infstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Compressed[0]));
    infstream.avail_out = Biggest;
-    infstream.next_out = (Bytef*)(C.data());
+    infstream.next_out = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(C.data()));
    inflateInit(&infstream);
    inflate(&infstream, Z_SYNC_FLUSH);
    inflate(&infstream, Z_FINISH);
@@ -323,5 +319,3 @@ inline T DeComp(const T& Compressed) {

 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW
-
-void LogChatMessage(const std::string& name, int id, const std::string& msg);
@@ -5,54 +5,23 @@
 // ======================= 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
@@ -58,16 +58,15 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
 #define beammp_assert(cond) _assert(__FILE__, __func__, __LINE__, #cond, (cond))
 #define beammp_assert_not_reachable() _assert(__FILE__, __func__, __LINE__, "reached unreachable code", false)
 #else
-// In release build, these macros turn into NOPs. The compiler will optimize these out.
-#define beammp_assert(cond)                                           \
-    do {                                                              \
-        bool result = (cond);                                         \
-        if (!result) {                                                \
-            Sentry.LogAssert(#cond, _file_basename, _line, __func__); \
-        }                                                             \
+#define beammp_assert(cond)                                                            \
+    do {                                                                               \
+        bool result = (cond);                                                          \
+        if (!result) {                                                                 \
+            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
+        }                                                                              \
    } while (false)
-#define beammp_assert_not_reachable()                                             \
-    do {                                                                          \
-        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__); \
+#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); \
    } while (false)
 #endif // DEBUG
@@ -9,6 +9,8 @@
 #if defined(BEAMMP_LINUX)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 #include <httplib.h>
 #if defined(BEAMMP_LINUX)
@@ -8,7 +8,7 @@ public:
    IThreaded()
        // invokes operator() on this object
        : mThread() { }
-    ~IThreaded() noexcept {
+    virtual ~IThreaded() noexcept {
        if (mThread.joinable()) {
            mThread.join();
        }
@@ -6,7 +6,7 @@
 #include <filesystem>

 #define TOML11_PRESERVE_COMMENTS_BY_DEFAULT
-#include <toml11/toml.hpp> // header-only version of TOML++
+#include <toml.hpp> // header-only version of TOML++

 namespace fs = std::filesystem;

@@ -22,11 +22,12 @@ private:
    void CreateConfigFile();
    void ParseFromFile(std::string_view name);
    void PrintDebug();
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue);

    void ParseOldFormat();
+    std::string TagsAsPrettyArray() const;
    bool IsDefault();
    bool mFailed { false };
    std::string mConfigFileName;
@@ -5,6 +5,7 @@
 #include <atomic>
 #include <fstream>
 #include <functional>
+#include <mutex>
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -16,12 +17,15 @@ class TConsole {
 public:
    TConsole();

+    // Initializes the commandline app to take over I/O
+    void InitializeCommandline();
+
    void Write(const std::string& str);
    void WriteRaw(const std::string& str);
    void InitializeLuaConsole(TLuaEngine& Engine);
    void BackupOldLog();
    void StartLoggingToFile();
-    Commandline& Internal() { return mCommandline; }
+    Commandline& Internal() { return *mCommandline; }

 private:
    void RunAsCommand(const std::string& cmd, bool IgnoreNotACommand = false);
@@ -55,7 +59,7 @@ private:
        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
    };

-    Commandline mCommandline;
+    std::unique_ptr<Commandline> mCommandline { nullptr };
    std::vector<std::string> mCachedLuaHistory;
    std::vector<std::string> mCachedRegularHistory;
    TLuaEngine* mLuaEngine { nullptr };
@@ -13,7 +13,7 @@
 #include <queue>
 #include <random>
 #include <set>
-#include <toml11/toml.hpp>
+#include <toml.hpp>
 #include <unordered_map>
 #include <vector>

@@ -25,11 +25,12 @@ 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>;
+using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool, std::unordered_map<std::string, std::string>>;
 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;

@@ -40,7 +41,14 @@ struct TLuaResult {
    sol::object Result { sol::lua_nil };
    TLuaStateId StateId;
    std::string Function;
-    // TODO: Add condition_variable
+    std::shared_ptr<std::mutex> ReadyMutex {
+        std::make_shared<std::mutex>()
+    };
+    std::shared_ptr<std::condition_variable> ReadyCondition {
+        std::make_shared<std::condition_variable>()
+    };
+
+    void MarkAsReady();
    void WaitUntilReady();
 };

@@ -75,7 +83,7 @@ public:
    };

    TLuaEngine();
-    ~TLuaEngine() noexcept {
+    virtual ~TLuaEngine() noexcept {
        beammp_debug("Lua Engine terminated");
    }

@@ -97,8 +105,8 @@ public:
        return mLuaStates.size();
    }
    std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names{};
-        for(auto const& [stateId, _ ] : mLuaStates) {
+        std::vector<std::string> names {};
+        for (auto const& [stateId, _] : mLuaStates) {
            names.push_back(stateId);
        }
        return names;
@@ -197,7 +205,7 @@ private:
    public:
        StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
        StateThreadData(const StateThreadData&) = delete;
-        ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
+        virtual ~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,8 +1,11 @@
 #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;

@@ -10,19 +13,18 @@ class TNetwork {
 public:
    TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager);

-    [[nodiscard]] bool TCPSend(TClient& c, const std::string& Data, bool IsSync = false);
-    [[nodiscard]] bool SendLarge(TClient& c, std::string Data, bool isSync = false);
-    [[nodiscard]] bool Respond(TClient& c, const std::string& MSG, bool Rel, bool isSync = false);
-    std::shared_ptr<TClient> CreateClient(SOCKET TCPSock);
-    std::string TCPRcv(TClient& c);
+    [[nodiscard]] bool TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync = false);
+    [[nodiscard]] bool SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync = false);
+    [[nodiscard]] bool Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync = false);
+    std::shared_ptr<TClient> CreateClient(ip::tcp::socket&& TCPSock);
+    std::vector<uint8_t> TCPRcv(TClient& c);
    void ClientKick(TClient& c, const std::string& R);
    [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
-    void Identify(const TConnection& client);
-    void Authentication(const TConnection& ClientConnection);
-    [[nodiscard]] bool CheckBytes(TClient& c, int32_t BytesRcv);
+    void Identify(TConnection&& client);
+    std::shared_ptr<TClient> Authentication(TConnection&& ClientConnection);
    void SyncResources(TClient& c);
-    [[nodiscard]] bool UDPSend(TClient& Client, std::string Data) const;
-    void SendToAll(TClient* c, const std::string& Data, bool Self, bool Rel);
+    [[nodiscard]] bool UDPSend(TClient& Client, std::vector<uint8_t> Data);
+    void SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self, bool Rel);
    void UpdatePlayer(TClient& Client);

 private:
@@ -31,21 +33,24 @@ private:

    TServer& mServer;
    TPPSMonitor& mPPSMonitor;
-    SOCKET mUDPSock {};
+    ip::udp::socket mUDPSock;
    TResourceManager& mResourceManager;
    std::thread mUDPThread;
    std::thread mTCPThread;

-    std::string UDPRcvFromClient(sockaddr_in& client) const;
-    void HandleDownload(SOCKET TCPSock);
+    std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
+    void HandleDownload(TConnection&& 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, bool kicked);
-    void Parse(TClient& c, const std::string& Packet);
+    void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr);
+    void Parse(TClient& c, const std::vector<uint8_t>& Packet);
    void SendFile(TClient& c, const std::string& Name);
-    static bool TCPSendRaw(TClient& C, SOCKET socket, char* Data, int32_t Size);
+    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
    static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
-    static uint8_t* SendSplit(TClient& c, SOCKET Socket, uint8_t* DataPtr, size_t Size);
+    static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };
+
+std::string HashPassword(const std::string& str);
+std::vector<uint8_t> StringToVector(const std::string& Str);
@@ -9,6 +9,7 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
    explicit TPPSMonitor(TServer& Server);
+    virtual ~TPPSMonitor() {}

    void operator()() override;

@@ -1,38 +0,0 @@
-#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,6 +8,8 @@
 #include <mutex>
 #include <unordered_set>

+#include "BoostAliases.h"
+
 class TClient;
 class TNetwork;
 class TPPSMonitor;
@@ -19,19 +21,22 @@ 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::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
+    static void GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& 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);
@@ -40,3 +45,11 @@ 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; }
+};
@@ -0,0 +1,7 @@
+#!/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++
@@ -0,0 +1,7 @@
+#!/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
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -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
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
@@ -0,0 +1,7 @@
+#!/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++
@@ -0,0 +1,7 @@
+#!/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
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -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
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DBeamMP-Server_ENABLE_LTO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server --config Release
@@ -6,6 +6,7 @@
 #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();
@@ -49,19 +50,30 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {

 std::string TClient::GetCarPositionRaw(int Ident) {
    std::unique_lock lock(mVehiclePositionMutex);
-    try
-    {
-        return mVehiclePosition.at(Ident);
-    }
-    catch (const std::out_of_range& oor) {
+    try {
+        return mVehiclePosition.at(size_t(Ident));
+    } catch (const std::out_of_range& oor) {
        return "";
    }
    return "";
 }

+void TClient::Disconnect(std::string_view Reason) {
+    beammp_debugf("Disconnecting client {} for reason: {}", GetID(), Reason);
+    boost::system::error_code ec;
+    mSocket.shutdown(socket_base::shutdown_both, ec);
+    if (ec) {
+        beammp_debugf("Failed to shutdown client socket: {}", ec.message());
+    }
+    mSocket.close(ec);
+    if (ec) {
+        beammp_debugf("Failed to close client socket: {}", ec.message());
+    }
+}
+
 void TClient::SetCarPosition(int Ident, const std::string& Data) {
    std::unique_lock lock(mVehiclePositionMutex);
-    mVehiclePosition[Ident] = Data;
+    mVehiclePosition[size_t(Ident)] = Data;
 }

 std::string TClient::GetCarData(int Ident) {
@@ -98,16 +110,22 @@ TServer& TClient::Server() const {
    return mServer;
 }

-void TClient::EnqueuePacket(const std::string& Packet) {
+void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
    std::unique_lock Lock(mMissedPacketsMutex);
    mPacketsSync.push(Packet);
 }

-TClient::TClient(TServer& Server)
+TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
    : 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();
 }
@@ -9,12 +9,10 @@
 #include <sstream>
 #include <thread>

+#include "Compat.h"
 #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) {
@@ -170,6 +168,8 @@ void Application::SetSubsystemStatus(const std::string& Subsystem, Status status
    case Status::Shutdown:
        beammp_trace("Subsystem '" + Subsystem + "': Shutdown");
        break;
+    default:
+        beammp_assert_not_reachable();
    }
    std::unique_lock Lock(mSystemStatusMapMutex);
    mSystemStatusMap[Subsystem] = status;
@@ -195,7 +195,7 @@ void Application::CheckForUpdates() {
    // checks current version against latest version
    std::regex VersionRegex { R"(\d+\.\d+\.\d+\n*)" };
    for (const auto& url : GetBackendUrlsInOrder()) {
-        auto Response = Http::GET(GetBackendUrlsInOrder().at(0), 443, "/v/s");
+        auto Response = Http::GET(url, 443, "/v/s");
        bool Matches = std::regex_match(Response, VersionRegex);
        if (Matches) {
            auto MyVersion = ServerVersion();
@@ -214,9 +214,6 @@ 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);
            }
        }
@@ -347,5 +344,18 @@ std::string GetPlatformAgnosticErrorString() {
    }
 #elif defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
    return std::strerror(errno);
+#else
+    return "(no human-readable errors on this platform)";
 #endif
 }
+
+// TODO: add unit tests to SplitString
+void SplitString(const std::string& str, const char delim, std::vector<std::string>& out) {
+    size_t start;
+    size_t end = 0;
+
+    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
+        end = str.find(delim, start);
+        out.push_back(str.substr(start, end - start));
+    }
+}
@@ -7,7 +7,7 @@

 static struct termios old, current;

-void initTermios(int echo) {
+static void initTermios(int echo) {
    tcgetattr(0, &old); /* grab old terminal i/o settings */
    current = old; /* make new settings same as old settings */
    current.c_lflag &= ~ICANON; /* disable buffered i/o */
@@ -19,7 +19,7 @@ void initTermios(int echo) {
    tcsetattr(0, TCSANOW, &current); /* use these new terminal i/o settings now */
 }

-void resetTermios(void) {
+static void resetTermios(void) {
    tcsetattr(0, TCSANOW, &old);
 }

@@ -47,10 +47,12 @@ TEST_CASE("init and reset termios") {
    }
 }

-char getch_(int echo) {
+static char getch_(int echo) {
    char ch;
    initTermios(echo);
-    read(STDIN_FILENO, &ch, 1);
+    if (read(STDIN_FILENO, &ch, 1) < 0) {
+        // ignore, not much we can do
+    }
    resetTermios();
    return ch;
 }
@@ -4,7 +4,6 @@
 #include "Common.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
-#include "httplib.h"

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

 #include <nlohmann/json.hpp>
@@ -74,8 +75,10 @@ std::string LuaAPI::LuaToString(const sol::object Value, size_t Indent, bool Quo
        ss << "[[function: " << Value.as<sol::function>().pointer() << "]]";
        return ss.str();
    }
+    case sol::type::poly:
+        return "<poly>";
    default:
-        return "((unprintable type))";
+        return "<unprintable type>";
    }
 }

@@ -113,22 +116,21 @@ 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, Packet, true, true);
-        return {true, ""};
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+        return { true, "" };
    } else {
        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
        if (!MaybeClient || MaybeClient.value().expired()) {
            beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
-            return {false, "Invalid Player ID"};
+            return { false, "Invalid Player ID" };
        }
        auto c = MaybeClient.value().lock();
-        if (!LuaAPI::MP::Engine->Network().Respond(*c, Packet, true)) {
+        if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(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"};
-
+            return { false, "Respond failed, dropping client" };
        }
-        return {true, ""};
+        return { true, "" };
    }
 }

@@ -141,11 +143,11 @@ std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::s
    auto MaybeClient = GetClient(Engine->Server(), ID);
    if (!MaybeClient || MaybeClient.value().expired()) {
        beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
-        return {false, "Player does not exist"};
+        return { false, "Player does not exist" };
    }
    auto c = MaybeClient.value().lock();
    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
-    return {true, ""};
+    return { true, "" };
 }

 std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
@@ -153,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, Packet, true, true);
+        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
        Result.first = true;
    } else {
        auto MaybeClient = GetClient(Engine->Server(), ID);
@@ -165,7 +167,10 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
                return Result;
            }
            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
-            Engine->Network().Respond(*c, Packet, true);
+            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+                beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
+                // TODO: should we return an error here?
+            }
            Result.first = true;
        } else {
            beammp_lua_error("SendChatMessage invalid argument [1] invalid ID");
@@ -189,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, Destroy, true, true);
+        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
        c->DeleteCar(VID);
        Result.first = true;
    } else {
@@ -521,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:
@@ -540,6 +545,8 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
    case sol::type::number:
        key = std::to_string(left.as<double>());
        break;
+    default:
+        beammp_assert_not_reachable();
    }
    nlohmann::json value;
    switch (right.get_type()) {
@@ -582,6 +589,8 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        }
        break;
    }
+    default:
+        beammp_assert_not_reachable();
    }
    if (is_array) {
        json.push_back(value);
@@ -1,6 +1,7 @@
 #include "Common.h"

 #include "TConfig.h"
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <istream>
@@ -8,30 +9,36 @@

 // General
 static constexpr std::string_view StrDebug = "Debug";
+static constexpr std::string_view EnvStrDebug = "BEAMMP_DEBUG";
 static constexpr std::string_view StrPrivate = "Private";
+static constexpr std::string_view EnvStrPrivate = "BEAMMP_PRIVATE";
 static constexpr std::string_view StrPort = "Port";
+static constexpr std::string_view EnvStrPort = "BEAMMP_PORT";
 static constexpr std::string_view StrMaxCars = "MaxCars";
+static constexpr std::string_view EnvStrMaxCars = "BEAMMP_MAX_CARS";
 static constexpr std::string_view StrMaxPlayers = "MaxPlayers";
+static constexpr std::string_view EnvStrMaxPlayers = "BEAMMP_MAX_PLAYERS";
 static constexpr std::string_view StrMap = "Map";
+static constexpr std::string_view EnvStrMap = "BEAMMP_MAP";
 static constexpr std::string_view StrName = "Name";
+static constexpr std::string_view EnvStrName = "BEAMMP_NAME";
 static constexpr std::string_view StrDescription = "Description";
+static constexpr std::string_view EnvStrDescription = "BEAMMP_DESCRIPTION";
+static constexpr std::string_view StrTags = "Tags";
+static constexpr std::string_view EnvStrTags = "BEAMMP_TAGS";
 static constexpr std::string_view StrResourceFolder = "ResourceFolder";
+static constexpr std::string_view EnvStrResourceFolder = "BEAMMP_RESOURCE_FOLDER";
 static constexpr std::string_view StrAuthKey = "AuthKey";
+static constexpr std::string_view EnvStrAuthKey = "BEAMMP_AUTH_KEY";
 static constexpr std::string_view StrLogChat = "LogChat";
+static constexpr std::string_view EnvStrLogChat = "BEAMMP_LOG_CHAT";
+static constexpr std::string_view StrPassword = "Password";

 // Misc
 static constexpr std::string_view StrSendErrors = "SendErrors";
 static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
 static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";

-// HTTP
-static constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
-static constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
-static constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
-static constexpr std::string_view StrSSLCertPath = "SSLCertPath";
-static constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
-static constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";
-
 TEST_CASE("TConfig::TConfig") {
    const std::string CfgFile = "beammp_server_testconfig.toml";
    fs::remove(CfgFile);
@@ -44,7 +51,10 @@ TEST_CASE("TConfig::TConfig") {
    {
        buf.resize(fs::file_size(CfgFile));
        auto fp = std::fopen(CfgFile.c_str(), "r");
-        std::fread(buf.data(), 1, buf.size(), fp);
+        auto res = std::fread(buf.data(), 1, buf.size(), fp);
+        if (res != buf.size()) {
+            // IGNORE?
+        }
        std::fclose(fp);
    }
    INFO("file contents are:", buf);
@@ -52,7 +62,6 @@ TEST_CASE("TConfig::TConfig") {
    const auto table = toml::parse(CfgFile);
    CHECK(table.at("General").is_table());
    CHECK(table.at("Misc").is_table());
-    CHECK(table.at("HTTP").is_table());

    fs::remove(CfgFile);
 }
@@ -98,11 +107,15 @@ void TConfig::FlushToFile() {
    data["General"][StrPrivate.data()] = Application::Settings.Private;
    data["General"][StrPort.data()] = Application::Settings.Port;
    data["General"][StrName.data()] = Application::Settings.ServerName;
+    SetComment(data["General"][StrTags.data()].comments(), " Add custom identifying tags to your server to make it easier to find. Format should be TagA,TagB,TagC. Note the comma seperation.");
+    data["General"][StrTags.data()] = Application::Settings.ServerTags;
    data["General"][StrMaxCars.data()] = Application::Settings.MaxCars;
    data["General"][StrMaxPlayers.data()] = Application::Settings.MaxPlayers;
    data["General"][StrMap.data()] = Application::Settings.MapName;
    data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
    data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
+    // data["General"][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.");
@@ -110,20 +123,10 @@ void TConfig::FlushToFile() {
    SetComment(data["Misc"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
-    // HTTP
-    data["HTTP"][StrSSLKeyPath.data()] = Application::Settings.SSLKeyPath;
-    data["HTTP"][StrSSLCertPath.data()] = Application::Settings.SSLCertPath;
-    data["HTTP"][StrHTTPServerPort.data()] = Application::Settings.HTTPServerPort;
-    SetComment(data["HTTP"][StrHTTPServerIP.data()].comments(), " Which IP to listen on. Pick 0.0.0.0 for a public-facing server with no specific IP, and 127.0.0.1 or 'localhost' for a local server.");
-    data["HTTP"][StrHTTPServerIP.data()] = Application::Settings.HTTPServerIP;
-    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::Settings.HTTPServerUseSSL;
-    SetComment(data["HTTP"][StrHTTPServerUseSSL.data()].comments(), " Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files");
-    data["HTTP"][StrHTTPServerEnabled.data()] = Application::Settings.HTTPServerEnabled;
-    SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
    std::stringstream Ss;
    Ss << "# This is the BeamMP-Server config file.\n"
          "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
+          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
       << data;
    auto File = std::fopen(mConfigFileName.c_str(), "w+");
    if (!File) {
@@ -153,21 +156,40 @@ void TConfig::CreateConfigFile() {
    FlushToFile();
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, std::string& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            OutValue = std::string(envp);
+            return;
+        }
+    }
    if (Table[Category.c_str()][Key.data()].is_string()) {
        OutValue = Table[Category.c_str()][Key.data()].as_string();
    }
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, bool& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            auto Str = std::string(envp);
+            OutValue = Str == "1" || Str == "true";
+            return;
+        }
+    }
    if (Table[Category.c_str()][Key.data()].is_boolean()) {
        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
    }
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, int& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            OutValue = int(std::strtol(envp, nullptr, 10));
+            return;
+        }
+    }
    if (Table[Category.c_str()][Key.data()].is_integer()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_integer();
+        OutValue = int(Table[Category.c_str()][Key.data()].as_integer());
    }
 }

@@ -175,28 +197,23 @@ void TConfig::ParseFromFile(std::string_view name) {
    try {
        toml::value data = toml::parse<toml::preserve_comments>(name.data());
        // GENERAL
-        TryReadValue(data, "General", StrDebug, Application::Settings.DebugModeEnabled);
-        TryReadValue(data, "General", StrPrivate, Application::Settings.Private);
-        TryReadValue(data, "General", StrPort, Application::Settings.Port);
-        TryReadValue(data, "General", StrMaxCars, Application::Settings.MaxCars);
-        TryReadValue(data, "General", StrMaxPlayers, Application::Settings.MaxPlayers);
-        TryReadValue(data, "General", StrMap, Application::Settings.MapName);
-        TryReadValue(data, "General", StrName, Application::Settings.ServerName);
-        TryReadValue(data, "General", StrDescription, Application::Settings.ServerDesc);
-        TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
-        TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
-        TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
+        TryReadValue(data, "General", StrDebug, EnvStrDebug, Application::Settings.DebugModeEnabled);
+        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Application::Settings.Private);
+        TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
+        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Application::Settings.MaxCars);
+        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Application::Settings.MaxPlayers);
+        TryReadValue(data, "General", StrMap, EnvStrMap, Application::Settings.MapName);
+        TryReadValue(data, "General", StrName, EnvStrName, Application::Settings.ServerName);
+        TryReadValue(data, "General", StrDescription, EnvStrDescription, Application::Settings.ServerDesc);
+        TryReadValue(data, "General", StrTags, EnvStrTags, Application::Settings.ServerTags);
+        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Application::Settings.Resource);
+        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Application::Settings.Key);
+        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, 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);
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, Application::Settings.SendErrorsMessageEnabled);
-        // HTTP
-        TryReadValue(data, "HTTP", StrSSLKeyPath, Application::Settings.SSLKeyPath);
-        TryReadValue(data, "HTTP", StrSSLCertPath, Application::Settings.SSLCertPath);
-        TryReadValue(data, "HTTP", StrHTTPServerPort, Application::Settings.HTTPServerPort);
-        TryReadValue(data, "HTTP", StrHTTPServerIP, Application::Settings.HTTPServerIP);
-        TryReadValue(data, "HTTP", StrHTTPServerEnabled, Application::Settings.HTTPServerEnabled);
-        TryReadValue(data, "HTTP", StrHTTPServerUseSSL, Application::Settings.HTTPServerUseSSL);
+        TryReadValue(data, "Misc", StrSendErrors, "", Application::Settings.SendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Application::Settings.HideUpdateMessages);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Application::Settings.SendErrorsMessageEnabled);
    } catch (const std::exception& err) {
        beammp_error("Error parsing config file value: " + std::string(err.what()));
        mFailed = true;
@@ -229,14 +246,12 @@ void TConfig::PrintDebug() {
    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
+    beammp_debug(std::string(StrTags) + ": " + TagsAsPrettyArray());
    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
-    beammp_debug(std::string(StrSSLKeyPath) + ": \"" + Application::Settings.SSLKeyPath + "\"");
-    beammp_debug(std::string(StrSSLCertPath) + ": \"" + Application::Settings.SSLCertPath + "\"");
-    beammp_debug(std::string(StrHTTPServerPort) + ": \"" + std::to_string(Application::Settings.HTTPServerPort) + "\"");
-    beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
    // special!
    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
+    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
 }

 void TConfig::ParseOldFormat() {
@@ -291,3 +306,13 @@ void TConfig::ParseOldFormat() {
        Str >> std::ws;
    }
 }
+std::string TConfig::TagsAsPrettyArray() const {
+    std::vector<std::string> TagsArray = {};
+    SplitString(Application::Settings.ServerTags, ',', TagsArray);
+    std::string Pretty = {};
+    for (size_t i = 0; i < TagsArray.size() - 1; ++i) {
+        Pretty += '\"' + TagsArray[i] + "\", ";
+    }
+    Pretty += '\"' + TagsArray.at(TagsArray.size()-1) + "\"";
+    return Pretty;
+}
@@ -8,6 +8,7 @@
 #include "TLuaEngine.h"

 #include <ctime>
+#include <mutex>
 #include <sstream>

 static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
@@ -51,19 +52,7 @@ TEST_CASE("TrimString") {
    CHECK(TrimString("") == "");
 }

-// TODO: add unit tests to SplitString
-static inline void SplitString(std::string const& str, const char delim, std::vector<std::string>& out) {
-    size_t start;
-    size_t end = 0;
-
-    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
-        end = str.find(delim, start);
-        out.push_back(str.substr(start, end - start));
-    }
-}
-
-
-std::string GetDate() {
+static std::string GetDate() {
    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
    time_t tt = std::chrono::system_clock::to_time_t(now);
    auto local_tm = std::localtime(&tt);
@@ -156,14 +145,14 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
        mStateId = LuaStateId;
        mIsLuaConsole = true;
        if (mStateId != mDefaultStateId) {
-            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:detach`");
-            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
+            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:exit`");
+            mCommandline->set_prompt("lua @" + LuaStateId + "> ");
        } else {
-            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:detach`");
-            mCommandline.set_prompt("lua> ");
+            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:exit`");
+            mCommandline->set_prompt("lua> ");
        }
-        mCachedRegularHistory = mCommandline.history();
-        mCommandline.set_history(mCachedLuaHistory);
+        mCachedRegularHistory = mCommandline->history();
+        mCommandline->set_history(mCachedLuaHistory);
    }
 }

@@ -175,9 +164,9 @@ void TConsole::ChangeToRegularConsole() {
        } else {
            Application::Console().WriteRaw("Detached from Lua.");
        }
-        mCachedLuaHistory = mCommandline.history();
-        mCommandline.set_history(mCachedRegularHistory);
-        mCommandline.set_prompt("> ");
+        mCachedLuaHistory = mCommandline->history();
+        mCommandline->set_history(mCachedRegularHistory);
+        mCommandline->set_prompt("> ");
        mStateId = mDefaultStateId;
    }
 }
@@ -199,10 +188,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) + " arguments expected, got " + std::to_string(args.size()) + " instead.");
+            Application::Console().WriteRaw("Too many arguments. At most " + std::to_string(max) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
            return false;
        } else if (args.size() < min) {
-            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(max) + " arguments expected, got " + std::to_string(args.size()) + " instead.");
+            Application::Console().WriteRaw("Too few arguments. At least " + std::to_string(min) + " argument(s) expected, got " + std::to_string(args.size()) + " instead.");
            return false;
        }
    }
@@ -257,7 +246,7 @@ void TConsole::Command_Clear(const std::string&, const std::vector<std::string>&
    if (!EnsureArgsCount(args, 0, size_t(-1))) {
        return;
    }
-    mCommandline.write("\x1b[;H\x1b[2J");
+    mCommandline->write("\x1b[;H\x1b[2J");
 }

 void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
@@ -271,9 +260,10 @@ void TConsole::Command_Kick(const std::string&, const std::vector<std::string>&
    }
    beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
    bool Kicked = false;
+    // TODO: this sucks, tolower is locale-dependent.
    auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = tolower(c); });
-        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = tolower(c); });
+        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = char(std::tolower(char(c))); });
+        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = char(std::tolower(char(c))); });
        return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
    };
    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
@@ -332,7 +322,9 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
            }
            ++Ptr;
        }
-        Arg = std::string(PrevPtr, Ptr - PrevPtr);
+        // this is required, otherwise we get negative int to unsigned cast in the next operations
+        beammp_assert(PrevPtr <= Ptr);
+        Arg = std::string(PrevPtr, std::string::size_type(Ptr - PrevPtr));
        // remove quotes if enclosed in quotes
        for (char Quote : { '"', '\'', '`' }) {
            if (!Arg.empty() && Arg.at(0) == Quote && Arg.at(Arg.size() - 1) == Quote) {
@@ -348,7 +340,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, 0)) {
+    if (!EnsureArgsCount(args, 1, 2)) {
        return;
    }
 }
@@ -448,6 +440,8 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
            SystemsShutdown++;
            SystemsShutdownList += NameStatusPair.first + ", ";
            break;
+        default:
+            beammp_assert_not_reachable();
        }
    }
    // remove ", " at the end
@@ -466,7 +460,7 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
           << "\tConnected Players:         " << ConnectedCount << "\n"
           << "\tGuests:                    " << GuestCount << "\n"
           << "\tCars:                      " << CarCount << "\n"
-           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(ElapsedTime / 1000.0 / 60.0 / 60.0) << "h) \n"
+           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(double(ElapsedTime) / 1000.0 / 60.0 / 60.0) << "h) \n"
           << "\tLua:\n"
           << "\t\tQueued results to check:     " << mLuaEngine->GetResultsToCheckSize() << "\n"
           << "\t\tStates:                      " << mLuaEngine->GetLuaStateCount() << "\n"
@@ -474,12 +468,12 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
           << "\t\tEvent handlers:              " << mLuaEngine->GetRegisteredEventHandlerCount() << "\n"
           << "\tSubsystems:\n"
           << "\t\tGood/Starting/Bad:           " << SystemsGood << "/" << SystemsStarting << "/" << SystemsBad << "\n"
-           << "\t\tShutting down/Shut down:      " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
+           << "\t\tShutting down/Shut down:     " << SystemsShuttingDown << "/" << SystemsShutdown << "\n"
           << "\t\tGood:                        [ " << SystemsGoodList << " ]\n"
           << "\t\tStarting:                    [ " << SystemsStartingList << " ]\n"
           << "\t\tBad:                         [ " << SystemsBadList << " ]\n"
           << "\t\tShutting down:               [ " << SystemsShuttingDownList << " ]\n"
-           << "\t\tShut down:                    [ " << SystemsShutdownList << " ]\n"
+           << "\t\tShut down:                   [ " << SystemsShutdownList << " ]\n"
           << "";

    Application::Console().WriteRaw(Status.str());
@@ -584,16 +578,20 @@ Commands
 }

 TConsole::TConsole() {
-    mCommandline.enable_history();
-    mCommandline.set_history_limit(20);
-    mCommandline.set_prompt("> ");
+}
+
+void TConsole::InitializeCommandline() {
+    mCommandline = std::make_unique<Commandline>();
+    mCommandline->enable_history();
+    mCommandline->set_history_limit(20);
+    mCommandline->set_prompt("> ");
    BackupOldLog();
-    mCommandline.on_command = [this](Commandline& c) {
+    mCommandline->on_command = [this](Commandline& c) {
        try {
            auto TrimmedCmd = c.get_command();
            TrimmedCmd = TrimString(TrimmedCmd);
            auto [cmd, args] = ParseCommand(TrimmedCmd);
-            mCommandline.write(mCommandline.prompt() + TrimmedCmd);
+            mCommandline->write(mCommandline->prompt() + TrimmedCmd);
            if (mIsLuaConsole) {
                if (!mLuaEngine) {
                    beammp_info("Lua not started yet, please try again in a second");
@@ -601,9 +599,7 @@ TConsole::TConsole() {
                    HandleLuaInternalCommand(cmd.substr(1));
                } else {
                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    while (!Future->Ready) {
-                        std::this_thread::yield(); // TODO: Add a timeout
-                    }
+                    Future->WaitUntilReady();
                    if (Future->Error) {
                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                    }
@@ -630,7 +626,7 @@ TConsole::TConsole() {
            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
        }
    };
-    mCommandline.on_autocomplete = [this](Commandline& c, std::string stub, int cursorPos) {
+    mCommandline->on_autocomplete = [this](Commandline&, std::string stub, int) {
        std::vector<std::string> suggestions;
        try {
            if (mIsLuaConsole) { // if lua
@@ -638,7 +634,7 @@ TConsole::TConsole() {
                    beammp_info("Lua not started yet, please try again in a second");
                } else {
                    std::string prefix {}; // stores non-table part of input
-                    for (size_t i = stub.length(); i > 0; i--) { //separate table from input
+                    for (size_t i = stub.length(); i > 0; i--) { // separate table from input
                        if (!std::isalnum(stub[i - 1]) && stub[i - 1] != '_' && stub[i - 1] != '.') {
                            prefix = stub.substr(0, i);
                            stub = stub.substr(i);
@@ -700,11 +696,21 @@ TConsole::TConsole() {

 void TConsole::Write(const std::string& str) {
    auto ToWrite = GetDate() + str;
-    mCommandline.write(ToWrite);
+    // allows writing to stdout without an initialized console
+    if (mCommandline) {
+        mCommandline->write(ToWrite);
+    } else {
+        std::cout << ToWrite << std::endl;
+    }
 }

 void TConsole::WriteRaw(const std::string& str) {
-    mCommandline.write(str);
+    // allows writing to stdout without an initialized console
+    if (mCommandline) {
+        mCommandline->write(str);
+    } else {
+        std::cout << str << std::endl;
+    }
 }

 void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
@@ -40,20 +40,6 @@ 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;

@@ -61,17 +47,14 @@ 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_error("Backend response failed to parse as valid json");
+                    beammp_trace("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) {
-                SentryReportError(Url + Target, ResponseCode);
+                beammp_errorf("Response code from the heartbeat: {}", ResponseCode);
            } else {
                // all ok
                Ok = true;
@@ -90,24 +73,20 @@ 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) {
@@ -148,13 +127,15 @@ std::string THeartbeatThread::GenerateCall() {
        << "&map=" << Application::Settings.MapName
        << "&private=" << (Application::Settings.Private ? "true" : "false")
        << "&version=" << Application::ServerVersionString()
-        << "&clientversion=" << Application::ClientVersionString()
+        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
        << "&name=" << Application::Settings.ServerName
+        << "&tags=" << Application::Settings.ServerTags
        << "&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,10 +4,10 @@
 #include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaPlugin.h"
+#include "sol/object.hpp"

 #include <chrono>
 #include <condition_variable>
-#include <httplib.h>
 #include <nlohmann/json.hpp>
 #include <random>
 #include <thread>
@@ -286,6 +286,7 @@ 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;
@@ -300,6 +301,7 @@ 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 });
@@ -418,7 +420,6 @@ 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;
@@ -426,6 +427,7 @@ 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);
        }
    }
@@ -585,27 +587,25 @@ 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";
@@ -679,6 +679,8 @@ static void JsonDecodeRecursive(sol::state_view& StateView, sol::table& table, c
        return;
    case nlohmann::detail::value_t::discarded:
        return;
+    default:
+        beammp_assert_not_reachable();
    }
 }

@@ -947,7 +949,6 @@ 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);
@@ -956,6 +957,7 @@ void TLuaEngine::StateThreadData::operator()() {
                    sol::error Err = Res;
                    S.second->ErrorMessage = Err.what();
                }
+                S.second->MarkAsReady();
            }
        }
        { // StateFunctionQueue Scope
@@ -993,6 +995,15 @@ 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;
@@ -1007,11 +1018,11 @@ void TLuaEngine::StateThreadData::operator()() {
                        sol::error Err = Res;
                        Result->ErrorMessage = Err.what();
                    }
-                    Result->Ready = true;
+                    Result->MarkAsReady();
                } else {
                    Result->Error = true;
                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->Ready = true;
+                    Result->MarkAsReady();
                }
            }
        }
@@ -1061,11 +1072,19 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
    mPaths.push(Path);
 }

-void TLuaResult::WaitUntilReady() {
-    while (!Ready) {
-        std::this_thread::yield();
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+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);
+    // wait if not ready yet
+    if(!this->Ready)
+        this->ReadyCondition->wait(readyLock);
 }

 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
@@ -1,6 +1,7 @@
 #include "TPluginMonitor.h"

 #include "TLuaEngine.h"
+#include <filesystem>

 TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine)
    : mEngine(Engine)
@@ -9,7 +10,7 @@ TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine>
    if (!fs::exists(mPath)) {
        fs::create_directories(mPath);
    }
-    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
+    for (const auto& Entry : fs::recursive_directory_iterator(mPath, fs::directory_options::follow_directory_symlink)) {
        // TODO: trigger an event when a subfolder file changes
        if (Entry.is_regular_file()) {
            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
@@ -1,138 +0,0 @@
-#include "TSentry.h"
-#include "Common.h"
-
-#include <cstring>
-#include <sentry.h>
-#include <sstream>
-
-TSentry::TSentry() {
-    if (std::strlen(S_DSN) == 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,9 +1,11 @@
 #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>

@@ -22,10 +24,10 @@ static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {

    if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
        try {
-        int PID = stoi(pid);
-        int VID = stoi(vid);
-        return {{ PID, VID }};
-        } catch(const std::exception&) {
+            int PID = stoi(pid);
+            int VID = stoi(vid);
+            return { { PID, VID } };
+        } catch (const std::exception&) {
            return std::nullopt;
        }
    }
@@ -75,39 +77,27 @@ TEST_CASE("GetPidVid") {
    }
 }

-
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
    beammp_info("BeamMP Server v" + Application::ServerVersionString());
    Application::SetSubsystemStatus("Server", Application::Status::Starting);
-    if (Arguments.size() > 1) {
-        Application::Settings.CustomIP = Arguments[0];
-        size_t n = std::count(Application::Settings.CustomIP.begin(), Application::Settings.CustomIP.end(), '.');
-        auto p = Application::Settings.CustomIP.find_first_not_of(".0123456789");
-        if (p != std::string::npos || n != 3 || Application::Settings.CustomIP.substr(0, 3) == "127") {
-            Application::Settings.CustomIP.clear();
-            beammp_warn("IP Specified is invalid! Ignoring");
-        } else {
-            beammp_info("server started with custom IP");
-        }
-    }
    Application::SetSubsystemStatus("Server", Application::Status::Good);
 }

 void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
-    if (!WeakClientPtr.expired()) {
-        TClient& Client = *WeakClientPtr.lock();
-        beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
-        Client.ClearCars();
-        WriteLock Lock(mClientsMutex);
-        mClients.erase(WeakClientPtr.lock());
+    std::shared_ptr<TClient> LockedClientPtr { nullptr };
+    try {
+        LockedClientPtr = WeakClientPtr.lock();
+    } catch (const std::exception&) {
+        // silently fail, as there's nothing to do
+        return;
    }
-}
-
-std::weak_ptr<TClient> TServer::InsertNewClient() {
-    beammp_debug("inserting new client (" + std::to_string(ClientCount()) + ")");
+    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);
-    auto [Iter, Replaced] = mClients.insert(std::make_shared<TClient>(*this));
-    return *Iter;
+    mClients.erase(WeakClientPtr.lock());
 }

 void TServer::ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
@@ -128,12 +118,11 @@ size_t TServer::ClientCount() const {
    return mClients.size();
 }

-void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
-    if (Packet.find("Zp") != std::string::npos && Packet.size() > 500) {
-        // abort();
-    }
-    if (Packet.substr(0, 4) == "ABG:") {
-        Packet = DeComp(Packet.substr(4));
+void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
+    constexpr std::string_view ABG = "ABG:";
+    if (Packet.size() >= ABG.size() && std::equal(Packet.begin(), Packet.begin() + ABG.size(), ABG.begin(), ABG.end())) {
+        Packet.erase(Packet.begin(), Packet.begin() + ABG.size());
+        Packet = DeComp(Packet);
    }
    if (Packet.empty()) {
        return;
@@ -147,6 +136,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
    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();
@@ -155,38 +146,40 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
    }
    switch (Code) {
    case 'H': // initial connection
-        beammp_trace(std::string("got 'H' packet: '") + Packet + "' (" + std::to_string(Packet.size()) + ")");
        if (!Network.SyncClient(Client)) {
            // TODO handle
        }
        return;
    case 'p':
-        if (!Network.Respond(*LockedClient, ("p"), false)) {
+        if (!Network.Respond(*LockedClient, StringToVector("p"), false)) {
            // failed to send
-            if (LockedClient->GetStatus() > -1) {
-                LockedClient->SetStatus(-1);
-            }
+            LockedClient->Disconnect("Failed to send ping");
        } else {
            Network.UpdatePlayer(*LockedClient);
        }
        return;
    case 'O':
-        if (Packet.length() > 1000) {
-            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.length()));
+        if (Packet.size() > 1000) {
+            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.size()));
        }
-        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);
+        ParseVehicle(*LockedClient, StringPacket, Network);
        return;
    case 'C': {
-        beammp_trace(std::string(("got 'C' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        if (Packet.length() < 4 || Packet.find(':', 3) == std::string::npos)
+        if (Packet.size() < 4 || std::find(Packet.begin() + 3, Packet.end(), ':') == Packet.end())
            break;
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Packet.substr(Packet.find(':', 3) + 2));
+        const auto PacketAsString = std::string(reinterpret_cast<const char*>(Packet.data()), Packet.size());
+        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(), Packet.substr(Packet.find(':', 3) + 1));
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
        if (std::any_of(Futures.begin(), Futures.end(),
                [](const std::shared_ptr<TLuaResult>& Elem) {
                    return !Elem->Error
@@ -195,12 +188,12 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
                })) {
            break;
        }
-        Network.SendToAll(nullptr, Packet, true, true);
+        std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
+        Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
        return;
    }
    case 'E':
-        beammp_trace(std::string(("got 'E' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        HandleEvent(*LockedClient, Packet);
+        HandleEvent(*LockedClient, StringPacket);
        return;
    case 'N':
        beammp_trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
@@ -209,8 +202,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
    case 'Z': // position packet
        PPSMonitor.IncrementInternalPPS();
        Network.SendToAll(LockedClient.get(), Packet, false, false);
-
-        HandlePosition(*LockedClient, Packet);
+        HandlePosition(*LockedClient, StringPacket);
    default:
        return;
    }
@@ -219,6 +211,10 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::string Pac
 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 + "'");
@@ -236,7 +232,7 @@ bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
            return true;
        }
    } catch (const std::exception& e) {
-        beammp_error("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'");
+        beammp_warn("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'.");
    }
    return false;
 }
@@ -251,19 +247,19 @@ bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
 }

 void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network) {
-    if (Pckt.length() < 4)
+    if (Pckt.length() < 6)
        return;
    std::string Packet = Pckt;
    char Code = Packet.at(1);
    int PID = -1;
-    int VID = -1, Pos;
+    int VID = -1;
    std::string Data = Packet.substr(3), pid, vid;
    switch (Code) { // Spawned Destroyed Switched/Moved NotFound Reset
    case 's':
-        beammp_trace(std::string(("got 'Os' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        beammp_tracef("got 'Os' packet: '{}' ({})", Packet, Packet.size());
        if (Data.at(0) == '0') {
            int CarID = c.GetOpenCarID();
-            beammp_debug(c.GetName() + (" created a car with ID ") + std::to_string(CarID));
+            beammp_debugf("'{}' created a car with ID {}", c.GetName(), CarID);

            std::string CarJson = Packet.substr(5);
            Packet = "Os:" + c.GetRoles() + ":" + c.GetName() + ":" + std::to_string(c.GetID()) + "-" + std::to_string(CarID) + ":" + CarJson;
@@ -276,16 +272,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, Packet, true, true);
+                Network.SendToAll(nullptr, StringToVector(Packet), true, true);
            } else {
-                if (!Network.Respond(c, Packet, true)) {
+                if (!Network.Respond(c, StringToVector(Packet), true)) {
                    // TODO: handle
                }
                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
-                if (!Network.Respond(c, Destroy, true)) {
+                if (!Network.Respond(c, StringToVector(Destroy), true)) {
                    // TODO: handle
                }
-                beammp_debug(c.GetName() + (" (force : car limit/lua) removed ID ") + std::to_string(CarID));
+                beammp_debugf("{} (force : car limit/lua) removed ID {}", c.GetName(), CarID);
            }
        }
        return;
@@ -307,14 +303,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, Packet, false, true);
+                Network.SendToAll(&c, StringToVector(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, Destroy, true, true);
+                Network.SendToAll(nullptr, StringToVector(Destroy), true, true);
                c.DeleteCar(VID);
            }
        }
@@ -322,7 +318,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);
+        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
        if (MaybePidVid) {
            std::tie(PID, VID) = MaybePidVid.value();
        }
@@ -330,7 +326,7 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
            if (c.GetUnicycleID() == VID) {
                c.SetUnicycleID(-1);
            }
-            Network.SendToAll(nullptr, Packet, true, true);
+            Network.SendToAll(nullptr, StringToVector(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);
@@ -340,7 +336,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);
+        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
        if (MaybePidVid) {
            std::tie(PID, VID) = MaybePidVid.value();
        }
@@ -348,16 +344,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, Packet, false, true);
+            Network.SendToAll(&c, StringToVector(Packet), false, true);
        }
        return;
    }
    case 't':
        beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
-        Network.SendToAll(&c, Packet, false, true);
+        Network.SendToAll(&c, StringToVector(Packet), false, true);
        return;
    case 'm':
-        Network.SendToAll(&c, Packet, true, true);
+        Network.SendToAll(&c, StringToVector(Packet), true, true);
        return;
    default:
        beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
@@ -375,23 +371,13 @@ 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;
+       return;
    }
    VD = VD.substr(FoundPos);
    rapidjson::Document Veh, Pack;
@@ -426,10 +412,24 @@ 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
@@ -437,6 +437,7 @@ 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,8 +1,5 @@
-#include "TSentry.h"
-
 #include "ArgsParser.h"
 #include "Common.h"
-#include "CustomAssert.h"
 #include "Http.h"
 #include "LuaAPI.h"
 #include "SignalHandling.h"
@@ -13,7 +10,6 @@
 #include "TPPSMonitor.h"
 #include "TPluginMonitor.h"
 #include "TResourceManager.h"
-#include "TScopedTimer.h"
 #include "TServer.h"

 #include <iostream>
@@ -56,7 +52,7 @@ int BeamMPServerMain(MainArguments Arguments);

 int main(int argc, char** argv) {
    MainArguments Args { argc, argv, {}, argv[0] };
-    Args.List.reserve(argc);
+    Args.List.reserve(size_t(argc));
    for (int i = 1; i < argc; ++i) {
        Args.List.push_back(argv[i]);
    }
@@ -66,7 +62,6 @@ 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);
@@ -74,7 +69,6 @@ int main(int argc, char** argv) {

 int BeamMPServerMain(MainArguments Arguments) {
    setlocale(LC_ALL, "C");
-    Application::InitializeConsole();
    ArgsParser Parser;
    Parser.RegisterArgument({ "help" }, ArgsParser::NONE);
    Parser.RegisterArgument({ "version" }, ArgsParser::NONE);
@@ -85,12 +79,10 @@ int BeamMPServerMain(MainArguments Arguments) {
        return 1;
    }
    if (Parser.FoundArgument({ "help" })) {
-        Application::Console().Internal().set_prompt("");
        Application::Console().WriteRaw(sCommandlineArguments);
        return 0;
    }
    if (Parser.FoundArgument({ "version" })) {
-        Application::Console().Internal().set_prompt("");
        Application::Console().WriteRaw("BeamMP-Server v" + Application::ServerVersionString());
        return 0;
    }
@@ -114,11 +106,22 @@ int BeamMPServerMain(MainArguments Arguments) {
            }
        }
    }
+    
+    TConfig Config(ConfigPath);
+
+    if (Config.Failed()) {
+        beammp_info("Closing in 10 seconds");
+        // loop to make it possible to ctrl+c instead
+        for (size_t i = 0; i < 20; ++i) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        }
+        return 1;
+    }
+    Application::InitializeConsole();
+    Application::Console().StartLoggingToFile();

    Application::SetSubsystemStatus("Main", Application::Status::Starting);

-    Application::Console().StartLoggingToFile();
-
    SetupSignalHandlers();

    bool Shutdown = false;
@@ -133,25 +136,14 @@ int BeamMPServerMain(MainArguments Arguments) {
    });

    TServer Server(Arguments.List);
-    TConfig Config(ConfigPath);
+
    auto LuaEngine = std::make_shared<TLuaEngine>();
    LuaEngine->SetServer(&Server);
    Application::Console().InitializeLuaConsole(*LuaEngine);

-    if (Config.Failed()) {
-        beammp_info("Closing in 10 seconds");
-        // loop to make it possible to ctrl+c instead
-        for (size_t i = 0; i < 20; ++i) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-        }
-        return 1;
-    }
-
    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);
@@ -0,0 +1,19 @@
+{
+  "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	f9b9d4642a	update commandline to fix redirect issue	2023-12-28 21:21:51 +01:00
Lion Kortlepel	b4d6f90012	remove custom ip functionality because it never worked	2023-12-28 17:20:31 +01:00
Lion	d5000aea87	Remove changelog (#232 ) now fully replaced by github releases due to issue-based workflow	2023-12-28 14:25:42 +01:00
Lion	810788a3e4	Add Tags Feature (#192 ) This PR adds a tags functionality to the BeamMP server config and heartbeat. The intended purpose of this is to enable better filtering on the server list based on keywords such as gamemode or roleplay.	2023-12-28 13:58:59 +01:00
Lion Kortlepel	e724a2e467	Merge remote-tracking branch 'origin/master' into feature-tags	2023-12-28 13:57:49 +01:00
Lion Kortlepel	54ba295fce	remove changelog now fully replaced by github releases due to issue-based workflow	2023-12-28 13:53:32 +01:00
Lion	f419550061	Allow env to override serverconfig (#227 )	2023-12-28 13:51:00 +01:00
Lion Kortlepel	8cccbe8542	Merge remote-tracking branch 'origin/master' into 226-allow-env-to-override-serverconfig	2023-12-28 13:49:02 +01:00
Lion Kortlepel	6787843b37	pretty-print tags on startup	2023-12-28 12:58:29 +01:00
Lion Kortlepel	16d3c6f796	Merge remote-tracking branch 'origin/master' into feature-tags	2023-12-28 12:36:22 +01:00
Lion	21e5101560	Make debug symbols available for release builds (#216 ) Closes #214	2023-12-28 12:30:40 +01:00
Lion	1adf19d416	Bump version to 3.2.0 (#231 ) Due to new features like ENV reading this is now a feature release, so minor	2023-12-28 12:16:05 +01:00
Lion	c7e228fbae	bump version to 3.2.0 due to new features like ENV reading this is now a feature release, so minor	2023-12-28 11:56:25 +01:00
Lion	6e04b2d93a	Fix GitHub Actions not downloading the latest tests to run them (#220 ) Closes #219	2023-12-28 11:55:02 +01:00
Lion	57a4c47cb0	Remove HTTP Server settings from config (#221 ) This is not implemented and won't be implemented	2023-12-28 11:50:33 +01:00
Lion	416e0399af	Remove [Feature Request] from issue title (#217 )	2023-12-28 11:47:51 +01:00
Lion	050b574cc0	Remove [Bug] title from issue template (#218 )	2023-12-28 11:47:39 +01:00
Lion	d65f3cf75b	Fix hot reload not working with symlinked entire plugins (#230 )	2023-12-28 11:42:39 +01:00
Lion Kortlepel	329d2eb268	fix hot reload not working with symlinked entire plugins	2023-12-28 11:22:00 +01:00
Lion Kortlepel	221f491019	return early after reading ENV in config	2023-12-25 16:19:53 +01:00
Lion Kortlepel	89db370e12	use env variables by default to override config values	2023-12-25 16:16:01 +01:00
Lion	aa84a65546	Update feature_request.md	2023-12-21 13:15:48 +01:00
Lion Kortlepel	b28c69a515	remove http settings from config	2023-12-21 13:07:35 +01:00
Lion Kortlepel	ac41547123	bump version to 3.1.4	2023-12-21 13:05:33 +01:00
Lion Kortlepel	2fc610f6bc	fix tests not downloading artifacts by not using artifacts	2023-12-21 13:01:50 +01:00
Lion Kortlepel	ddd3883aa9	fix failing gh actions test run	2023-12-21 13:01:50 +01:00
Lion	defadf094f	Fix exit after 10 seconds (#215 ) Also fixes initializing the console too early by @lionkor	2023-12-21 12:50:19 +01:00
Lion Kortlepel	81299db946	fix console initializing too early the console was initialized too early, leading to the server waiting for it to shut down if the authkey is invalid, among other issues.	2023-12-21 12:49:20 +01:00
Lion	c3895ec1ca	remove [Bug] title from issue template	2023-12-21 12:17:50 +01:00
Lion	c741fe5310	remove [Feature Request] from issue title	2023-12-21 12:17:11 +01:00
Lion Kortlepel	e1dfb1085e	modify release workflows to add debug info artifacts	2023-12-21 11:17:17 +01:00
Lion Kortlepel	142b6fa47a	modify build scripts to generate .debug files with debug info	2023-12-21 11:13:51 +01:00
Bennett	a6cbffc774	fix exit after 10 seconds	2023-12-21 02:01:21 -08:00
Starystars67	dc4ead532d	Changed default tag to Freeroam as that is the majority of servers.	2023-12-18 14:10:07 +00:00
Lion	f28d9bc7dc	Update README.md	2023-12-16 20:18:40 +00:00
Starystars67	8c73eb8aea	Added Tags Feature to the BeamMP Server. This allows better filtering on the server list.	2023-12-10 12:50:24 +01:00
Lion	43b1b050e2	Fix workflows to make release builds (#202 ) Currently the Windows workflow doesn't properly create a release binary.	2023-12-09 20:17:10 +01:00
Lion Kortlepel	9f87edc6e9	add msvcp140.dll comment to the release text	2023-12-09 20:09:56 +01:00
Lion Kortlepel	c6f78c5522	fix release build path	2023-12-09 20:06:50 +01:00
Lion Kortlepel	9f01268538	update version to 3.1.3	2023-12-09 20:01:53 +01:00
Lion Kortlepel	5523a4fe4b	force build release config on windows	2023-12-09 20:00:33 +01:00
Lion Kortlepel	7f11d0f002	make release builds by default	2023-12-09 19:22:50 +01:00
Lion Kortlepel	6b31ba35fd	attempt to fix workflows to make release builds	2023-12-09 19:18:33 +01:00
Lion	d2329f0723	Remove password setting from config to avoid confusion (#199 ) ...until implemented. The client afaik currently doesn't support this setting.	2023-12-09 19:05:54 +01:00
Luuk van Oijen	ef45efeb86	Update readme to new build system (#200 ) Now building is like 2 steps, so the readme reflects that now.	2023-12-09 18:33:46 +01:00
Lion	edcca75637	Update README.md	2023-12-08 17:18:54 +01:00
Lion	c1bacf1f3a	remove old instructions from readme, cleanup	2023-12-08 17:16:47 +01:00
Lion Kortlepel	795b651744	remove macos section	2023-12-05 18:35:57 +01:00
Lion Kortlepel	be108bb8b3	update readme to new build system	2023-12-05 18:34:06 +01:00
Lion Kortlepel	d8b8812026	remove password setting from config to avoid confusion ...until implemented	2023-12-05 18:23:23 +01:00
Lion	872c2d410d	New buildsystem (#197 )	2023-12-05 18:21:20 +01:00
Lion Kortlepel	f98704e0f3	fix warnings about implicit conversion	2023-12-05 18:05:35 +01:00
Lion Kortlepel	dea203c108	make IThreaded::~IThreaded virtual to make destruction happen	2023-12-05 18:03:13 +01:00
Lion Kortlepel	e245c9e9e2	fix pps monitor warning about virtual dtor	2023-12-05 18:02:35 +01:00
Lion Kortlepel	11fe5ad200	fix invalid timeout value	2023-12-05 18:00:34 +01:00
Lion Kortlepel	667da22b0e	Merge remote-tracking branch 'origin/master' into new-buildsystem	2023-12-05 17:59:05 +01:00
Lion Kortlepel	a6eb2f7bfe	switch to vcpkg+cmake, add debian build to workflows using lionkor's template (MIT licensed) This is a combination of 64 commits.	2023-12-05 17:57:19 +01:00
Lion Kortlepel	103d2dc030	update vcpkg in workflows	2023-12-03 17:50:45 +01:00
Lion Kortlepel	7f206fd0d4	bump version to 3.1.2	2023-12-03 17:49:12 +01:00
Lion Kortlepel	22805af716	fix crash in authentication	2023-12-03 17:43:41 +01:00
Lion	2c29a195f9	optimize: Add conditional variable to LuaResult (#162 ) Implementing TODO for optimization I saw in the code.	2023-03-27 13:31:21 +02:00
rgnter	222d2492ff	Merge branch 'master' into optimize/add_cv_to_luaresult	2023-03-21 20:17:17 +01:00
Simon	879b9772f5	Apply suggestions from code review Co-authored-by: Lion <development@kortlepel.com>	2023-01-15 17:12:35 +00:00
Anonymous275	c51cf090ef	fix linux build	2023-01-15 17:12:35 +00:00
Anonymous275	d677d8d58d	rename Hash function to HashPassword move HashPassword to cpp only move check to line 285	2023-01-15 17:12:35 +00:00
Anonymous275	4b30918659	- add 120 seconds timeout	2023-01-15 17:12:35 +00:00
Anonymous275	688e46f524	- fix linux build	2023-01-15 17:12:35 +00:00
Anonymous275	9f59c27b1f	- add hash function - add password config - add debug messages for password stages - add pass boolean for heartbeat - adjust network codes	2023-01-15 17:12:35 +00:00
Lion	6a11bcd20b	fix bad package name for Ubuntu in Readme (#161 ) The package name for liblua required to build is not correct. The correct name is [`liblua-5.3-dev`](https://packages.ubuntu.com/search?suite=all&searchon=names&keywords=liblua5.3)	2022-12-21 16:29:49 +01:00
rgnter	b7b578bf3e	add conditional variable to LuaResult	2022-12-18 14:45:33 +01:00
rgnter	6c145a6dbf	fix: Bad package name for Ubuntu	2022-12-18 12:32:45 +01:00
Lion	67d792e0e0	remove repeated dependency from README (#155 )	2022-11-14 14:32:19 +01:00
Qest333	eaeef0c7d0	Remove double dependency from README	2022-11-14 14:00:21 +01:00
Lion	47e64a7343	merge release candidate v3.1.1 (#142 ) patches and hotfixes!	2022-10-31 11:32:16 +01:00
Lion Kortlepel	7f5b3919f4	make destructors of virtual classes virtual this causes warnings in clang, and rightfully so :^)	2022-10-31 11:31:16 +01:00
Lion Kortlepel	896e777e23	update changelog	2022-10-31 11:31:16 +01:00
Lion Kortlepel	aa58c1e211	another potential fix for #141	2022-10-31 11:31:15 +01:00
Lion Kortlepel	49a9226dca	update changelog to mention fixes	2022-10-31 11:31:15 +01:00
Lion Kortlepel	b10d5d0f4e	fix empty events causing issues in the server an empty event packet, if sent just right, could crash the server	2022-10-31 11:31:15 +01:00
Lion Kortlepel	5581fd1692	fix chat message impersonation issue instead of using the supplied name, we ignore it entirely and use the server's internal name for the client	2022-10-31 11:31:15 +01:00
Lion Kortlepel	d36bb7962c	ignore empty chat messages this could happen with a malicious client of some kind, we should simply ignore them	2022-10-31 11:31:15 +01:00
Lion Kortlepel	4e8bd993d5	remove J packet handler it wasn't used by anything in the launcher, mod, or during the join sequence, so i removed it for now.	2022-10-31 11:31:15 +01:00
Lion Kortlepel	abff9bfbdb	fix crash when chat message is malformed	2022-10-31 11:31:15 +01:00
Lion Kortlepel	b024533f90	fix crash when the header of a TCP packet is negative	2022-10-31 11:31:15 +01:00
Lion Kortlepel	f9251ff92c	add more warning prints on unexpected cases	2022-10-31 11:31:15 +01:00
Lion Kortlepel	99f41c28cb	fix #135 by making onPlayerDisconnect blocking, and calling it before removing the player before, the handlers were not waited for, so the client was usually destructed before lua got to the actual event handler call. Now, the handler is called and waited on, and once all handlers are done, the client is properly removed from the players internally, thus making calls to GetPlayerName, GetPlayerIdentifiers, etc. return nil etc.	2022-10-31 11:31:15 +01:00
Lion Kortlepel	bbd27c9cba	fix formatting bug in `status` (closes #143 )	2022-10-31 11:31:15 +01:00
Lion Kortlepel	4682922467	add more fixes for msvc static linking	2022-10-31 11:31:15 +01:00
Lion Kortlepel	83fb387dfe	potential fix to #141	2022-10-31 11:31:09 +01:00
Lion Kortlepel	2b61f11a86	fix EnsureArgsCount not properly printing min/max	2022-10-31 11:24:13 +01:00
Lion Kortlepel	a8b1a205f7	bump version to 3.1.1 I'm expecting to release a 3.1.1 with some fixes	2022-10-31 11:24:13 +01:00
Lion	dd9376447a	Fix README errors (#138 )	2022-10-26 14:34:01 +02:00
Lion	aa185afabf	Update README.md	2022-10-23 03:35:39 +02:00
Lion	e8caeb9126	merge release candidate v3.1.0 (#83 ) See https://github.com/BeamMP/BeamMP-Server/blob/rc-v3.1.0/Changelog.md for a list of changes	2022-10-22 23:24:48 +02:00
Lion Kortlepel	fa1944dbef	update readme to reflect dependency- and code-changes in 3.1.0	2022-10-22 23:22:42 +02:00
Lion Kortlepel	093f905fd8	remove redundant addition libboost library install in cmake-linux action	2022-10-22 23:06:11 +02:00
Lion Kortlepel	2a45d2282d	update rc-v3.1.0 to master	2022-10-22 22:55:12 +02:00
Lion Kortlepel	aeb024953a	fix sentry line that caused build to fail	2022-10-22 22:48:23 +02:00
ㄗㄠˋ ㄑㄧˊ	12a0ab7fdd	document dependencies for macos (#109 )	2022-10-22 22:47:53 +02:00
Lion Kortlepel	917c501faf	fix typo causing beammp forum id not to show in identifiers (fix #137 )	2022-10-22 21:16:31 +02:00
Lion Kortlepel	340933bbb3	fix dependencies for test run (add curl, fix ssl)	2022-10-22 21:01:44 +02:00
Lion Kortlepel	a63359479e	rename dependencies for test run in github actions	2022-10-22 20:44:47 +02:00
Lion Kortlepel	bdf2da758c	remove pps from heartbeat "PPS has no meaning anymore and is completely irrelevant. You should ignore it, it is not an indicator of ANYTHING. If it’s high, that means NOTHING. If it’s low, that means NOTHING. If it’s -, that means NOTHING." It's packets per second per player per vehicle, but is only sent every 30 seconds, its not averaged, and on the client-side, it shows a ping icon next to it. A client can open a new connection to the server and send a `P`, and measure the time to the `P` response packet. The connection is then closed. This was added ages ago, please use this instead for ping :)	2022-10-17 14:05:51 +02:00
Lion Kortlepel	88c0ed56e4	add _WIN32_WINNT and move CRT no warnings flag	2022-10-17 12:25:13 +02:00
Lion Kortlepel	4256977400	remove crt's "this function or variable may be unsafe" warnings they are useless, as they are in dependencies or parts of the code we don't care about. Also, the "safe" alternatives straightup dont work on linux.	2022-10-17 12:21:27 +02:00
Lion Kortlepel	309a9d1fa9	fix invalid windows workflows indentation	2022-10-17 12:12:55 +02:00
Lion Kortlepel	ad860835ca	fix linux tests run not installing openssl properly	2022-10-17 12:10:52 +02:00
Lion Kortlepel	c6c2efb0b1	revert "update linux and windows workflows to run on pr open, reopen, review submit" This reverts commit `23e9941704`.	2022-10-17 12:09:36 +02:00
Lion	c4c3b03b7a	replace networking with boost::asio (synchronous) (#134 ) - replaced all networking with boost::asio abstractions - rewrote the SetStatus(), GetStatus() crap (now IsDisconnected() and Disconnect() with reason) - fixed bug related to ghost players / ghost cars - handles packets as binary for the most part (vector<uint8_t> instead of string) to fix various issues	2022-10-17 12:03:43 +02:00
Lion Kortlepel	fd51336a91	update vcpkg	2022-10-17 12:01:08 +02:00
Lion Kortlepel	466845b314	add udp binary data fix to Changelog	2022-10-16 00:05:02 +02:00
Lion Kortlepel	92632b53b5	fix binary data breaking in UDPRcvFromClient	2022-10-15 23:30:09 +02:00
Lion Kortlepel	331a597ec7	add info about new networking to changelog	2022-10-15 23:19:33 +02:00
Lion Kortlepel	87965433c2	change log levels of common warnings and errors to debug this hides a lot of the "standard" errors we get behind the debug flag. for example, disconnecting a disconnected player would be such an error	2022-10-15 23:16:16 +02:00
Lion Kortlepel	75ff9f7571	remove "backend response failed to parse as valid json"	2022-10-15 23:16:16 +02:00
Lion Kortlepel	94c0547a35	fix crash when the client disconnects while sending first identify setting	2022-10-15 23:16:16 +02:00
Lion Kortlepel	98f77e157f	add WIN32_STATIC_RUNTIME option to cmake	2022-10-15 23:16:16 +02:00
Lion Kortlepel	54730d2baf	remove heartbeat spam logging	2022-10-15 23:16:16 +02:00
Lion Kortlepel	064e71e59f	fix client version check	2022-10-15 23:16:16 +02:00
Lion Kortlepel	2678234d67	dont check for -Werror=zero-as-null-pointer-constant	2022-10-15 23:16:16 +02:00
Lion Kortlepel	4320a91e5c	use message() instead of what() for ec	2022-10-15 23:16:16 +02:00
Lion Kortlepel	7d1318653c	fix boost::system::error_code	2022-10-15 23:16:16 +02:00
Lion Kortlepel	67d02d4cf2	remove unused error check	2022-10-15 23:16:16 +02:00
Lion Kortlepel	93b2559120	switch to boost 1.74	2022-10-15 23:16:05 +02:00
Lion Kortlepel	ed872f730d	link against boost::system	2022-10-06 00:57:31 +02:00
Lion Kortlepel	b25f4a875c	run on latest ubuntu	2022-10-06 00:54:57 +02:00
Lion Kortlepel	cc6b7846b2	add system include	2022-10-06 00:51:51 +02:00
Lion Kortlepel	88f5db514f	remove unused headers	2022-10-06 00:46:35 +02:00
Lion Kortlepel	e595192829	rename header to boost errc	2022-10-06 00:43:17 +02:00
Lion Kortlepel	c69418ea5e	add boost_system dependency for linux gh actions	2022-10-06 00:40:39 +02:00
Lion Kortlepel	917e3f98ab	fix github actions dependencies for linux to use proper boost version	2022-10-06 00:36:57 +02:00
Lion Kortlepel	c42a523532	remove SO_SNDTIMEO for now	2022-10-06 00:24:13 +02:00
Lion Kortlepel	95ae0f5d03	fix 'Od' and 'Or' packets not being broadcast	2022-10-05 22:17:56 +02:00
Lion Kortlepel	fc0a509bd9	fix clientversion parameter in heartbeat	2022-10-05 21:15:11 +02:00
Lion Kortlepel	6249397fb5	add libboost-all-dev to github actions it's a new dependency	2022-10-05 20:50:28 +02:00
Lion Kortlepel	231b13a0e7	fix a ghost client bug	2022-10-05 18:17:18 +02:00
Lion Kortlepel	7d2e4d4581	replace tcp networking with boost::asio tcp networking	2022-10-05 18:17:04 +02:00
Lion Kortlepel	7446526a19	fix binding of udp server socket it was not binding properly because it wasn't open()ed, i guess	2022-10-05 13:06:36 +02:00
Lion Kortlepel	6e97a3cd6e	switch udp networking to boost implementation	2022-10-05 12:14:25 +02:00
Lion Kortlepel	30482d290a	add boost 1.75 dependency this should be available on most platforms. boost allows us to simplify a LOT of code.	2022-10-05 11:50:15 +02:00
Lion Kortlepel	5f1d003077	fix various potential crashes in TServer::HandlePosition	2022-10-03 17:06:32 +02:00
Lion Kortlepel	5d3dff3c88	add identifiers (beammp id, ip) as an argument to onPlayerAuth	2022-10-03 15:31:32 +02:00
Lion Kortlepel	cb0cb30797	fix windows compiler not understanding a CLEAR AND SIMPLE FUNCTION-STYLE CONSTRUCTOR CALL AHHHHHHH	2022-10-03 15:12:59 +02:00
Lion Kortlepel	1f14de2e71	revert `9c6127a105` and apply proper fix	2022-10-03 15:11:26 +02:00
Lion Kortlepel	658b37acac	fix error sometimes not displaying when failing inside global event handler	2022-10-03 14:38:19 +02:00
Lion Kortlepel	d63c84286e	replace logging functions with new fmt versions in ParseVehicle	2022-10-01 22:25:45 +02:00
Lion Kortlepel	9c6127a105	fix bug which may cause a server to crash when a car is spawned thanks @Anonymous275	2022-10-01 19:10:21 +02:00
Lion Kortlepel	a1d99c0203	update commandline library includes a fix for alpine	2022-09-27 23:07:30 +02:00
Lion Kortlepel	10dff185e0	change changelog to correctly say "Util.Json*", not MP	2022-09-27 17:25:18 +02:00
Lion Kortlepel	dd17b95427	add changelog message about MP.TriggerClientEventJson	2022-09-27 17:02:25 +02:00
Lion Kortlepel	1a9872db00	fix unhandled return value of fread in TConfig::TConfig unit test	2022-09-27 15:49:55 +02:00
Lion Kortlepel	dbb01998ea	fix ignored return value in getch_	2022-09-26 12:24:44 +02:00
Lion	3c4737a145	fix colon in changelog once more, thanks to github's editor being bad	2022-09-26 12:23:30 +02:00
Lion	36e8ba1614	fix colon in changelog to be in proper code quotes	2022-09-26 12:22:22 +02:00
Lion Kortlepel	988f19fd00	fix getch_ to explicitly ignore read() return value	2022-09-26 12:20:07 +02:00
ㄗㄠˋ ㄑㄧˊ	fdf24815bb	document dependencies for macos (#109 )	2022-09-26 12:18:47 +02:00
Lion Kortlepel	b145c8159e	update changelog to add HOME and END button, fix ip comment	2022-09-26 12:12:16 +02:00
Lion Kortlepel	ae517b30c0	fix bug which caused updates to only check the first URL	2022-09-26 12:04:42 +02:00
Lion Kortlepel	e638c25f70	change assertions to print the error in release builds this should make it easier to debug crashes in the server remotely in release builds when sentry is down.	2022-09-26 12:03:57 +02:00
Lion Kortlepel	24c98eb2b2	add more compile-time diagnostics, implement fixes for them Before, a lot of common errors went unnoticed, due to insufficient compiler diagnostics. This commit fixes this by adding a lot of new diagnostics, and fixing the issues found by this.	2022-09-26 12:02:05 +02:00
Lion	501fddadc6	Merge pull request #127 from BeamMP/feature-betterautocomplete Feature: Better autocomplete	2022-09-26 10:44:15 +02:00