test state commit

fix hang and crash caused by client kick
potentially fix ghost car bug
2026-07-13 02:03:44 +00:00 · 2023-06-23 08:09:56 +01:00 · 2023-04-24 11:41:09 +01:00 · 2022-12-20 02:56:04 +01:00 · 2022-12-19 12:41:45 +01:00 · 2022-12-19 12:41:16 +01:00
133 changed files with 2867 additions and 5240 deletions
@@ -1 +0,0 @@
-patreon: BeamMP
@@ -1,6 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: "[Bug] Enter issue title here"
 labels: bug
 assignees: ''

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

 ---
@@ -1,6 +0,0 @@
-Please replace this text <-> with your PR description and leave the below declarations intact.
-
---
-
-By creating this pull request, I understand that code that is AI generated or otherwise automatically generated may be rejected without further discussion.
-I declare that I fully understand all code I pushed into this PR, and wrote all this code myself and own the rights to this code.
@@ -0,0 +1,78 @@
+name: CMake Linux Build
+
+on: [push]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  linux-build:
+    runs-on: ubuntu-22.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 libboost1.74-all-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 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-22.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-0 libssl3 curl
+
+      - name: Test
+        working-directory: ${{github.workspace}}
+        shell: bash
+        run: |
+            chmod +x ./BeamMP-Server-tests
+            ./BeamMP-Server-tests
@@ -0,0 +1,58 @@
+name: CMake Windows Build
+
+on: [push]
+
+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 boost-variant boost-spirit boost-phoenix boost-core boost-system boost-asio boost-uuid'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: "06b5f4a769d848d1a20fa0acd556019728b56273"
+            vcpkgTriplet: 'x64-windows-static'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-windows
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-windows
+        env:
+          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server.exe
+          path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
+
+      - name: Build debug
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: |
+          cmake --build . --config Debug
+      
+      - name: Archive debug artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-debug.exe
+          path: ${{github.workspace}}/build-windows/Debug/BeamMP-Server.exe
+
@@ -1,156 +0,0 @@
-name: Linux
-
-on:
-  push:
-    branches:
-      - 'develop'
-      - 'minor'
-  pull_request:
-
-env: 
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  VCPKG_FORCE_SYSTEM_BINARIES: 1
-  CMAKE_BUILD_TYPE: "Release"
-  DEBIAN_FRONTEND: "noninteractive"
-
-jobs:
-  x86_64-matrix:
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 24.04
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - 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/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          path: ./bin/BeamMP-Server
-
-      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          path: ./bin/BeamMP-Server.debug
-
-      - name: Build Tests
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build-tests.sh
-
-      - name: Install Runtime Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/4-install-runtime-deps.sh
-
-      - name: Test
-        run: ./bin/BeamMP-Server-tests
-
-  arm64-matrix:
-    runs-on: [Linux, ARM64]
-    env:
-      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 24.04
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - 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/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          path: ./bin/BeamMP-Server
-
-      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          path: ./bin/BeamMP-Server.debug
-
-      - name: Build Tests
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build-tests.sh
-
-      - name: Install Runtime Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/4-install-runtime-deps.sh
-
-      - name: Test
-        run: ./bin/BeamMP-Server-tests
-
@@ -0,0 +1,115 @@
+name: Release Create & Build
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    name: Create Release
+    outputs: 
+      upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: true
+          body: |
+              Files included in this release:
+              - `BeamMP-Server.exe` is the windows build
+              - `BeamMP-Server-linux` is a ubuntu build, so you need the dependencies listed in README.md to run it. For any other distros please build from source as described in README.md.
+
+  upload-release-files-linux:
+    name: Upload Linux Release Files
+    runs-on: ubuntu-22.04
+    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 libboost-dev libboost1.74-all-dev libboost1.74-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 boost-variant boost-spirit boost-phoenix boost-core boost-system boost-asio'
+            vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+            vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
+            vcpkgTriplet: 'x64-windows-static'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-windows
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-windows
+        env:
+          beammp_sentry_url: ${{ secrets.BEAMMP_SECRET_SENTRY_URL }}
+        run: cmake $GITHUB_WORKSPACE -DSENTRY_BACKEND=breakpad -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE='${{ runner.workspace }}/b/vcpkg/scripts/buildsystems/vcpkg.cmake' -DVCPKG_TARGET_TRIPLET=x64-windows-static -DBEAMMP_SECRET_SENTRY_URL="$beammp_sentry_url"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-windows
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ${{github.workspace}}/build-windows/Release/BeamMP-Server.exe
+          asset_name: BeamMP-Server.exe
+          asset_content_type: application/vnd.microsoft.portable-executable
@@ -1,215 +0,0 @@
-name: Release Create & Build
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-env:
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  CMAKE_BUILD_TYPE: "Release"
-  DEBIAN_FRONTEND: "noninteractive"
-
-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 are:
-            - `BeamMP-Server.$DISTRO.$DISTROVERSION.$ARCH` for linux builds, for example `BeamMP-Server.debian.11.x86_64` for the Debian 11 build for x86_64. All require `liblua5.3` to be installed.
-            - `BeamMP-Server.exe` for the Windows build (x86_64). You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this.
-
-  x86_64-matrix:
-    runs-on: ubuntu-22.04
-    needs: create-release
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 24.04
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - 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/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server
-          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:
-          asset_name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server.debug
-          asset_content_type: application/x-elf
-
-  arm64-matrix:
-    runs-on: [Linux, ARM64]
-    needs: create-release
-    strategy:
-      matrix:
-        include:
-          - distro: debian
-            version: 11
-          - distro: debian
-            version: 12
-          - distro: ubuntu
-            version: 22.04
-          - distro: ubuntu
-            version: 24.04
-    env:
-      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
-      VCPKG_FORCE_SYSTEM_BINARIES: 1
-    container:
-      image: ${{ matrix.distro }}:${{ matrix.version }}
-    steps:
-      - name: get-cmake
-        uses: lukka/get-cmake@v3.28.1
-            
-      - 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/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
-
-      - name: Install Dependencies
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
-
-      - name: Create Build Environment
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
-
-      - name: Build Server
-        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
-
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server
-          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:
-          asset_name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./bin/BeamMP-Server.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
@@ -1,48 +0,0 @@
-name: Windows
-
-on:
-  push:
-    branches:
-      - 'develop'
-      - 'minor'
-  pull_request:
-
-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@v4
-        with:
-          name: BeamMP-Server-windows
-          path: ./bin/Release/BeamMP-Server.exe
-
@@ -1,4 +1,5 @@
 .idea/
+.sentry-native/
 *.orig
 *.toml
 boost_*
@@ -1,9 +1,36 @@
 [submodule "deps/commandline"]
 	path = deps/commandline
 	url = https://github.com/lionkor/commandline
-[submodule "vcpkg"]
-	path = vcpkg
-	url = https://github.com/Microsoft/vcpkg.git
+[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 "deps/lk-result"]
+	path = deps/lk-result
+	url = https://gitlab.com/lionkor/lk-result.git
@@ -1,229 +1,286 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+# 3.4 is required for imported targets.
+cmake_minimum_required(VERSION 3.4 FATAL_ERROR)

-if (WIN32)
-    set(VCPKG_TARGET_TRIPLET x64-windows-static)
+message(STATUS "You can find build instructions and a list of dependencies in the README at \
+https://github.com/BeamMP/BeamMP-Server")
+
+include(FetchContent)
+FetchContent_Declare(
+  cmake-tools
+  GIT_REPOSITORY https://github.com/brobeson/cmake-tools.git
+  GIT_TAG main
+)
+FetchContent_MakeAvailable(cmake-tools)
+list(APPEND CMAKE_MODULE_PATH "${cmake-tools_SOURCE_DIR}")
+
+include(CMakeToolsVersionFromGit)
+
+execute_process(
+    COMMAND git log -1 --format=%h
+    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+    OUTPUT_VARIABLE GIT_HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+project(BeamMP-Server
+    DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
+    HOMEPAGE_URL https://beammp.com
+    LANGUAGES CXX C)
+
+# quality of life stuff
+set(CMAKE_COLOR_DIAGNOSTICS ON)
+
+find_package(Git REQUIRED)
+# Update submodules as needed
+option(GIT_SUBMODULE "Check submodules during build" ON)
+if(GIT_SUBMODULE)
+    message(STATUS "Submodule update")
+    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+        message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+    endif()
 endif()

-include(cmake/Vcpkg.cmake) # needs to happen before project()
+set(HTTPLIB_REQUIRE_OPENSSL ON)
+set(SENTRY_BUILD_SHARED_LIBS OFF)

-project(
-    "BeamMP-Server" # replace this
-    VERSION 3.3.0
-)
+add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)

-include(cmake/StandardSettings.cmake)
-include(cmake/StaticAnalyzers.cmake)
-include(cmake/Git.cmake)
+option(WIN32_STATIC_RUNTIME "Build statically-linked runtime on windows (don't touch unless you know what you're doing)" ON)

-# 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
-    include/Env.h
-    include/Settings.h
-    include/Profiling.h
-    include/ChronoWrapper.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
-    src/Env.cpp
-    src/Settings.cpp
-    src/Profiling.cpp
-    src/ChronoWrapper.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
-    CURL::libcurl
-    ${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(CURL CONFIG REQUIRED)
-add_subdirectory("deps/toml11")
-
-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")
-    add_compile_options("/bigobj")
-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
-)
-
-# Ensure the commandline library uses C++11
-set_target_properties(commandline_static PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED YES)
-
-
-if (WIN32)
-    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1)
-else ()
-    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_LINUX=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)
+    if (WIN32_STATIC_RUNTIME)
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    endif()
+# ------------------------ UNIX ------------------------------------
+elseif (UNIX)
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
+    option(SANITIZE "Turns on thread and UB sanitizers" OFF)
+    if (SANITIZE)
+        message(STATUS "sanitize is ON")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize={address,thread,undefined}")
+    endif (SANITIZE)
 endif ()
-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_compile_options(${PROJECT_NAME} PUBLIC "/bigobj")
-    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)
+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 20)
+
+# ------------------------ 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)
+
+find_package(Boost 1.70 REQUIRED COMPONENTS system)
+
+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
+    include/BoostAliases.h
+    include/Uuid.h src/Uuid.cpp
+)
+
+set(BeamMP_Includes
+    ${LUA_INCLUDE_DIR}
+    ${CURL_INCLUDE_DIRS}
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/cpp-httplib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/commandline"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/json/single_include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/sol2/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/rapidjson/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/lk-result/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps"
+    "${CMAKE_CURRENT_SOURCE_DIR}/deps/fmt/include"
+)
+
+set(BeamMP_Definitions
+    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
+    BEAMMP_GIT_HASH="${GIT_HASH}"
+    LK_RESULT_USE_FMT
+)
+
+if (WIN32)
+    list(APPEND BeamMP_Definitions _WIN32_WINNT=0x0601)
+    list(APPEND BeamMP_Definitions _CRT_SECURE_NO_WARNINGS)
+endif()
+if (UNIX)
+    set(BeamMP_CompileOptions
+        -Wall
+        -Wextra
+        -Wpedantic
+    
+        -Werror=uninitialized
+        -Werror=float-equal
+        -Werror=pointer-arith
+        -Werror=double-promotion
+        -Werror=write-strings
+        -Werror=cast-qual
+        -Werror=init-self
+        -Werror=cast-align
+        -Werror=unreachable-code
+        -Werror=strict-aliasing -fstrict-aliasing
+        -Werror=redundant-decls
+        -Werror=missing-declarations
+        -Werror=missing-field-initializers
+        -Werror=write-strings
+        -Werror=ctor-dtor-privacy
+        -Wswitch-enum
+        -Wswitch-default
+        -Werror=old-style-cast
+        -Werror=overloaded-virtual
+        -Werror=overloaded-virtual
+        -Werror=missing-include-dirs
+        -Werror=unused-result
+
+        -fstack-protector
+        -Wzero-as-null-pointer-constant
+    )
+else()
+    set(BeamMP_CompileOptions
+        /bigobj
+        /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMT
+    )
+endif()
+
+set(BeamMP_Libraries
+    Boost::boost
+    Boost::system
+    doctest::doctest
+    OpenSSL::SSL
+    OpenSSL::Crypto
+    sol2::sol2
+    Threads::Threads
+    ZLIB::ZLIB
+    ${LUA_LIBRARIES}
+    commandline
+    sentry
+    fmt::fmt
+)
+
+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_compile_options(BeamMP-Server PRIVATE 
+    ${BeamMP_CompileOptions}
+)
+
+target_include_directories(BeamMP-Server PRIVATE
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+)
+
+target_include_directories(BeamMP-Server SYSTEM PRIVATE
+    ${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_compile_options(BeamMP-Server-tests PRIVATE 
+       ${BeamMP_CompileOptions}
+    )
+
+    target_include_directories(BeamMP-Server-tests PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    )
+
+    target_include_directories(BeamMP-Server-tests SYSTEM PRIVATE
+        ${BeamMP_Includes}
+    )
+    
+    target_link_libraries(BeamMP-Server-tests
+        ${BeamMP_Libraries}
+        ${BeamMP_PlatformLibs}
+    )
+endif()
+
@@ -53,28 +53,11 @@ Do **NOT** pull with merge. This is the default git behavior for `git pull`, but

 The only acceptable merge commits are those which actually merge functionally different branches into each other, for example for merging one feature branch into another.

-## Workflow
-
-### Making an issue and fixing it
-
-1. Create an issue detailing the feature or bug.
-2. Assign a milestone to the issue, or wait for a maintainer to add a milestone to your issue.
-3. Fork the repository and base your work on the branch mentioned in the milestone attached to your issue (e.g. `v3.0.0 (develop)` -> `develop`).
-4. Program your feature or bug fix.
-5. Open a PR that references the issue by number in the format: `#12345`.
-6. Someone will review your PR and merge it, or ask for changes.
-
-### Fixing an existing issue
-
-1. Fork the repository and base your work on the branch mentioned in the milestone attached to your issue (e.g. `v3.0.0 (develop)` -> `develop`).
-2. Program your feature or bug fix.
-3. Open a PR that references the issue by number in the format: `#12345`.
-4. Someone will review your PR and merge it, or ask for changes.
-
 ## Branches

- `minor`: Minor releases, like `v1.2.3` -> `v1.3.0` or `v1.2.3` -> `v1.2.4`.
- `develop`: Major releases, like `v1.2.3` -> `v2.0.0`, and larger feature/minor releases.
+### Which branch should I base my work on?
+
+Each *feature* or *bug-fix* is implemented on a new Git branch, branched off of the branch it should be based on. The `master` branch is usually stable, so we don't do development on it. It is always a safe bet to branch off of `master`, but it may be more work to merge later. Branches to base your work on are usually branches like `rc-v3.3.0`, when the latest public version is `3.2.0`, for example. These can often be found in Pull-Requests on GitHub which are tagged `Release Candidate`.

 ## Unit tests & CI/CD

@@ -108,8 +91,8 @@ A BeamMP-Developer must review your code in detail, and leave a review. If this
 5. Run `git submodule update --init --recursive`.
 6. Make a new branch for your feature or fix from the branch you are on. You can do this via `git checkout -b <branch name>`. See [this section on branches](#branches) for more info on branch naming.
 7. Install all dependencies. Those are usually listed in the `README.md` in the branch you're in, or, more reliably, in one of the files in `.github/workflows` (if you can read `yaml`).
-8. Run CMake to configure the project. You can find tutorials on this online. You will want to tell CMake to build with `CMAKE_BUILD_TYPE=Debug`, for example by passing it to CMake via the commandline switch `-DCMAKE_BUILD_TYPE=Debug`. An example invocation on Linux with GNU make would be 
-`cmake . -DCMAKE_BUILD_TYPE=Debug` . 
+8. Run CMake to configure the project. You can find tutorials on this online. You will want to tell CMake to build with `CMAKE_BUILD_TYPE=Debug`, for example by passing it to CMake via the commandline switch `-DCMAKE_BUILD_TYPE=Debug`. You may also want to turn off sentry by setting `SENTRY_BACKEND=none` (for example via commandline switch `-DSENTRY_BACKEND=none`). An example invocation on Linux with GNU make would be 
+`cmake . -DCMAKE_BUILD_TYPE=Debug -DSENTRY_BACKEND=none` . 
 9. Build the `BeamMP-Server` target to build the BeamMP-Server, or the `BeamMP-Server-tests` target to build the unit-tests (does not include a working server). In the example from 8. (on Linux), you could build with  `make BeamMP-Server`, `make -j BeamMP-Server` or `cmake --build . --parallel --target BeamMP-Server` . Or, on Windows, (in Visual Studio), you would just press some big green "run" or "debug" button.
 10. When making changes, refer to [this section on how to commit properly](#how-to-commit). Not following those guidelines will result in your changes being rejected, so please take a look.
 11. Make sure to add Unit-tests with `doctest` if you build new stuff. You can find examples all over the latest version of the codebase (search for `TEST_CASE`).
@@ -0,0 +1,165 @@
+# v3.2.0
+
+- ADDED `settings` command, which lets you `get`, `list`, and `set` config options from the console
+- ADDED `debug` command, which shows info about connected clients & networking (for developers)
+- ADDED `Util.GenerateUUID()`, which generates an RFC4122 UUID (universally unique identifier)
+- ADDED `version` command, which shows version information
+- ADDED `onPlayerRequestMods` event, letting Lua disallow individual mods from being sent to clients
+- CHANGED `onShutdown` to be called before all players are kicked
+
+# v3.1.1
+
+- FIXED bug which caused GetPlayerIdentifiers, GetPlayerName, etc not to work in `onPlayerDisconnect`
+- FIXED some issues which could cause the server to crash when receiving malformed data
+- FIXED a bug which caused a server to crash during authentication when receiving malformed data
+- FIXED minor vulnerability in chat message handling
+- FIXED a minor formatting bug in the `status` command
+
+# v3.1.0
+
+- ADDED Tab autocomplete in console, smart tab autocomplete (understands lua tables and types) in the lua console
+- ADDED lua debug facilities (type `:help` when attached to lua via `lua`)
+- ADDED Util.JsonEncode() and Util.JsonDecode(), which turn lua tables into json and vice-versa
+- ADDED 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
+- ADDED HOME and END button working in console
+- ADDED `MP.TriggerClientEventJson()` which takes a table as the data argument and sends it as JSON
+- ADDED identifiers (beammp id, ip) to onPlayerAuth (4th argument)
+- ADDED more network debug logging
+- CHANGED all networking to be more stable, performant, and safe
+- FIXED `ip` in MP.GetPlayerIdentifiers
+- FIXED issue with client->server events which contain `:`
+- FIXED a fatal exception on LuaEngine startup if Resources/Server is a symlink
+- FIXED onInit not being called on hot-reload
+- FIXED incorrect timing calculation of Lua EventTimer loop
+- FIXED bug which caused hot-reload not to report syntax errors
+- FIXED missing error messages on some event handler calls
+- FIXED vehicles not deleting for all players if an edit was cancelled by Lua
+- FIXED server not handling binary UDP packets properly
+- REMOVED "Backend response failed to parse as valid json" message
+
+# v3.0.2
+
+- 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
@@ -1,661 +1,2 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor). BeamMP-Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder(s) in order to modify or distribute any part of the source or binaries. Special permission to modify the source-code is implicitly granted only for the purpose of upstreaming those changes directly to github.com/BeamMP/BeamMP-Server via a GitHub pull-request.
+Commercial usage is prohibited, unless explicit permission has been granted prior to usage.
@@ -6,12 +6,13 @@
 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, which are listed below under [Runtime Dependencies](#runtime-dependencies)**
+**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**

 ## Support + Contact

 Feel free to ask any questions via the following channels:

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

@@ -19,7 +20,7 @@ Feel free to ask any questions via the following channels:

 These values are guesstimated and are subject to change with each release.

-* RAM: 30-100 MiB usable (not counting OS overhead)
+* RAM: 50+ MiB usable (not counting OS overhead)
 * CPU: >1GHz, preferably multicore
 * OS: Windows, Linux (theoretically any POSIX)
 * GPU: None
@@ -38,11 +39,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 `v3.4.1`. See [the tags](https://github.com/BeamMP/BeamMP-Server/tags) for possible versions/tags, as well as [the releases](https://github.com/BeamMP/BeamMP-Server/releases) to check which version is marked as a release/prerelease. We recommend using the [latest release](https://github.com/BeamMP/BeamMP-Server/releases/latest).
+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, Windows and FreeBSD. 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.
+The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and sometimes Linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.

 Recommended compilers: MSVC, GCC, CLANG. 

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

 ## Build Instructions

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

+Currently only Linux and Windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
+
+### Prerequisites
+
+#### Windows
+
+There are **no runtime libraries** needed for Windows.
+
+Please use the prepackaged binaries in [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
+
+Dependencies for **Windows** can be installed with `vcpkg`.
+These are:
 ```
-liblua5.3-dev curl zip unzip tar cmake make git g++
+lua zlib rapidjson openssl websocketpp curl boost
 ```
+The triplet we use for releases is `x64-windows-static`.

-You can install these with your distribution's package manager. You will need sudo or need root for ONLY this step.
+#### Linux

-The names of each package may change depending on your platform.
+We recommend Ubuntu 22.04 or Arch Linux. Any Linux distribution will work, but you have to figure out the package names yourself (please feel free to PR in a change to this README with that info).

-If you are building for ARM (like aarch64), you need to run `export VCPKG_FORCE_SYSTEM_BINARIES=1` before the following commands.
-
-You can build on **Windows, Linux** or other platforms by following these steps:
-
-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. Specify the server version to build by checking out a tag: `git checkout tags/v3.4.1` - [Possible versions/tags](https://github.com/BeamMP/BeamMP-Server/tags)
-4. 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.
-5. Build via `cmake --build bin --parallel --config Release -t BeamMP-Server`.
-6. Your executable can be found in `bin/`.
-
-When you make changes to the code, you only have to run step 4 again.
-### Building for FreeBSD
-Building is only supported for major release branches of FreeBSD that are currently not EOL. The build process is the same as on Linux, although build dependencies can be universally installed from ports via pkg:
-```
-pkg install git cmake-core zip bash devel/ninja devel/pkgconf lua53
-```
-After installing the necessary build dependencies, follow the Linux build instructions beginning from step 3. Beware that running the initial cmake command will compile vcpkg from source, as vcpkg has no native FreeBSD port - this may take some time.
-
-On systems with a single logical CPU core, `make` may fail to build the server when using the `--parallel` option when calling CMake. If you see error messages related to make, simply omit the `--parallel` from the command: `cmake --build bin --config Release -t BeamMP-Server`.
-
-### Runtime Dependencies
+##### Runtime Dependencies

 These are needed to *run* the server.

-Debian, Ubuntu and friends: `liblua5.3-0`
+<details>
+<summary>
+Ubuntu 22.04
+</summary>

-Other Linux distros: `liblua` of *some kind*.
+`apt-get install` the following libraries:
+```
+liblua5.3-0
+libssl3
+curl
+```
+</details>

-Windows: No libraries.
+<details>
+<summary>
+Arch Linux
+</summary>
+
+`pacman -Syu` the following libraries:
+```
+lua53
+openssl
+curl
+```
+</details>
+
+##### Build Dependencies
+These are needed for you to *build* the server, in addition to the [runtime dependencies](#runtime-dependencies).
+
+<details>
+<summary>
+Ubuntu 22.04
+</summary>
+
+`apt-get install` the following libraries and programs:
+```
+git
+libz-dev
+rapidjson-dev
+liblua5.3
+libssl-dev
+libwebsocketpp-dev
+libcurl4-openssl-dev
+cmake
+g++-10
+libboost1.74-all-dev
+libssl3
+curl
+```
+</details>
+
+<details>
+<summary>
+Arch Linux
+</summary>
+
+`pacman -Syu` the following libraries and programs:
+```
+lua53
+openssl
+curl
+git
+cmake
+g++
+cmake
+zlib
+boost
+websocketpp
+```
+</details>
+
+#### macOS
+
+Dependencies for **macOS** can be installed with homebrew.
+```
+brew install lua@5.3 rapidjson websocketpp cmake openssl@1.1
+```
+Some packages are included in **macOS** but you might want to install homebrew versions.
+```
+brew install curl zlib git make
+```
+
+### How to build
+
+On Windows, use git-bash for these commands. On Linux, these should work in your shell.
+
+1. Make sure you have all [prerequisites](#prerequisites) installed
+2. Clone the repository in a location of your choice with `git clone https://github.com/BeamMP/BeamMP-Server` . 
+3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`. 
+4. Checkout the branch or tag of the release you want to compile, for example `git checkout tags/v3.0.2` for version 3.0.2. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
+6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`). This may take some time, and will update all submodules and prepare the build.
+7. Run `make -j` . This step will take some time and will use a lot of CPU and RAM. Remove the `-j` if you run out of memory. *If you change something in the source code, you only have to re-run this step.*
+8. You now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (Windows or Linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/server-installation) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
+
+*tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*

 ## Support
 The BeamMP project is supported by community donations via our [Patreon](https://www.patreon.com/BeamMP). This brings perks such as Patreon-only channels on our Discord, early access to new updates, and more server keys. 
+
+## Copyright
+
+Copyright (c) 2019-present Anonymous275 (@Anonymous-275), Lion Kortlepel (@lionkor).
+BeamMP-Server code is not in the public domain and is not free software. One must be granted explicit permission by the copyright holder(s) in order to modify or distribute any part of the source or binaries. Special permission to modify the source-code is implicitly granted only for the purpose of upstreaming those changes directly to github.com/BeamMP/BeamMP-Server via a GitHub pull-request.
+Commercial usage is prohibited, unless explicit permission has been granted prior to usage.
@@ -1,114 +0,0 @@
-# from here:
-#
-# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
-# Courtesy of Jason Turner
-# License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE
-#
-# This version has been modified by the owners of the current respository.
-# Modifications have mostly been marked with "modified" or similar, though this is not
-# strictly required.
-
-function(set_project_warnings project_name)
-    set(MSVC_WARNINGS
-            /W4         # Baseline reasonable warnings
-            /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss
-                            # of data
-            /w14254 # 'operator': conversion from 'type1:field_bits' to
-                            # 'type2:field_bits', possible loss of data
-            /w14263 # 'function': member function does not override any base class
-                            # virtual member function
-            /w14265 # 'classname': class has virtual functions, but destructor is not
-                            # virtual instances of this class may not be destructed correctly
-            /w14287 # 'operator': unsigned/negative constant mismatch
-            /we4289 # nonstandard extension used: 'variable': loop control variable
-                            # declared in the for-loop is used outside the for-loop scope
-            /w14296 # 'operator': expression is always 'boolean_value'
-            /w14311 # 'variable': pointer truncation from 'type1' to 'type2'
-            /w14545 # expression before comma evaluates to a function which is missing
-                            # an argument list
-            /w14546 # function call before comma missing argument list
-            /w14547 # 'operator': operator before comma has no effect; expected
-                            # operator with side-effect
-            /w14549 # 'operator': operator before comma has no effect; did you intend
-                            # 'operator'?
-            /w14555 # expression has no effect; expected expression with side- effect
-            /w14619 # pragma warning: there is no warning number 'number'
-            /w14640 # Enable warning on thread un-safe static member initialization
-            /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may
-                            # cause unexpected runtime behavior.
-            /w14905 # wide string literal cast to 'LPSTR'
-            /w14906 # string literal cast to 'LPWSTR'
-            /w14928 # illegal copy-initialization; more than one user-defined
-                            # conversion has been implicitly applied
-            /permissive- # standards conformance mode for MSVC compiler.
-    )
-
-    set(CLANG_WARNINGS
-            -Wall
-            -Wextra    # reasonable and standard
-            -Wshadow # warn the user if a variable declaration shadows one from a
-                             # parent context
-            -Wnon-virtual-dtor # warn the user if a class with virtual functions has a
-                                                 # non-virtual destructor. This helps catch hard to
-                                                 # track down memory errors
-            -Wold-style-cast # warn for c-style casts
-            -Wcast-align         # warn for potential performance problem casts
-            -Wunused                 # warn on anything being unused
-            -Woverloaded-virtual # warn if you overload (not override) a virtual
-                                                     # function
-            -Wpedantic     # warn if non-standard C++ is used
-            -Wconversion # warn on type conversions that may lose data
-            -Wsign-conversion    # warn on sign conversions
-            -Wnull-dereference # warn if a null dereference is detected
-            -Wdouble-promotion # warn if float is implicit promoted to double
-            -Wformat=2 # warn on security issues around functions that format output
-                                 # (ie printf)
-            # modified; added more errors / warnings
-            # some have been set to be errors, but the option _WARNINGS_AS_ERRORS
-            # (see below) should still be used in strict pipelines.
-            -Werror=uninitialized
-            -Werror=float-equal
-            -Werror=write-strings
-            -Werror=strict-aliasing -fstrict-aliasing
-            -Werror=missing-declarations
-            -Werror=missing-field-initializers
-            -Werror=ctor-dtor-privacy
-            -Wswitch-default
-            -Werror=unused-result
-            -Werror=implicit-fallthrough
-            -Werror=return-type
-            -Wmissing-include-dirs
-    )
-
-    if (${PROJECT_NAME}_WARNINGS_AS_ERRORS)
-        set(CLANG_WARNINGS ${CLANG_WARNINGS} -Werror)
-        set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)
-    endif()
-
-    set(GCC_WARNINGS
-            ${CLANG_WARNINGS}
-            -Wmisleading-indentation # warn if indentation implies blocks where blocks
-                                                             # do not exist
-            -Wduplicated-cond # warn if if / else chain has duplicated conditions
-            -Wduplicated-branches # warn if if / else branches have duplicated code
-            -Wlogical-op     # warn about logical operations being used where bitwise were
-                                         # probably wanted
-            # -Wuseless-cast # warn if you perform a cast to the same type (modified: removed)
-    )
-
-    if(MSVC)
-        set(PRJ_WARNINGS ${MSVC_WARNINGS})
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
-        set(PRJ_WARNINGS ${CLANG_WARNINGS})
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        set(PRJ_WARNINGS ${GCC_WARNINGS})
-    else()
-        message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
-    endif()
-
-    target_compile_options(${project_name} PUBLIC ${PRJ_WARNINGS})
-
-    if(NOT TARGET ${project_name})
-        message(AUTHOR_WARNING "${project_name} is not a target, thus no compiler warning were added.")
-    endif()
-endfunction()
@@ -1,21 +0,0 @@
-find_package(Git)
-if(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES)
-    if(Git_FOUND)
-        message(STATUS "Git found, submodule update and init")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init
-                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
-        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-            message(SEND_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules. This may result in missing dependencies.")
-        endif()
-    else()
-        message(SEND_ERROR "git required for checking out submodules, but not found. Submodules will not be checked out - this may result in missing dependencies.")
-    endif()
-endif()
-
-if(Git_FOUND)
-
-else()
-    message(STATUS "Git not found - the version will not include a git hash.")
-    set(PRJ_GIT_HASH "unknown")
-endif()
@@ -1,44 +0,0 @@
-# Modified, original version from https://github.com/filipdutescu/modern-cpp-template (Unlicense)
-
-option(${PROJECT_NAME}_WARNINGS_AS_ERRORS "Treat compiler warnings as errors." OFF)
-option(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES "If git is found, initialize all submodules." ON)
-option(${PROJECT_NAME}_ENABLE_UNIT_TESTING "Enable unit tests for the projects (from the `test` subfolder)." ON)
-option(${PROJECT_NAME}_ENABLE_CLANG_TIDY "Enable static analysis with Clang-Tidy." OFF)
-option(${PROJECT_NAME}_ENABLE_CPPCHECK "Enable static analysis with Cppcheck." OFF)
-# TODO Implement code coverage
-# option(${PROJECT_NAME}_ENABLE_CODE_COVERAGE "Enable code coverage through GCC." OFF)
-option(${PROJECT_NAME}_ENABLE_DOXYGEN "Enable Doxygen documentation builds of source." OFF)
-
-# Generate compile_commands.json for clang based tools
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# Export all symbols when building a shared library
-if(BUILD_SHARED_LIBS)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF)
-    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-endif()
-
-option(${PROJECT_NAME}_ENABLE_LTO "Enable Interprocedural Optimization, aka Link Time Optimization (LTO)." OFF)
-if(${PROJECT_NAME}_ENABLE_LTO)
-    include(CheckIPOSupported)
-    check_ipo_supported(RESULT result OUTPUT output)
-    if(result)
-        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-    else()
-        message(SEND_ERROR "IPO is not supported: ${output}.")
-    endif()
-endif()
-
-option(${PROJECT_NAME}_ENABLE_CCACHE "Enable the usage of Ccache, in order to speed up rebuild times." ON)
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif()
-
-option(${PROJECT_NAME}_ENABLE_SANITIZER "Enable sanitizer to detect memory errors, undefined behavior, etc. (slows down the executable)." OFF)
-if(${PROJECT_NAME}_ENABLE_SANITIZER)
-    add_compile_options(-fsanitize=address,undefined)
-    add_link_options(-fsanitize=address,undefined)
-endif()
@@ -1,20 +0,0 @@
-if(${PROJECT_NAME}_ENABLE_CLANG_TIDY)
-  find_program(CLANGTIDY clang-tidy)
-  if(CLANGTIDY)
-    set(CMAKE_CXX_CLANG_TIDY ${CLANGTIDY} -extra-arg=-Wno-unknown-warning-option)
-    message("Clang-Tidy finished setting up.")
-  else()
-    message(SEND_ERROR "Clang-Tidy requested but executable not found.")
-  endif()
-endif()
-
-if(${PROJECT_NAME}_ENABLE_CPPCHECK)
-  find_program(CPPCHECK cppcheck)
-  if(CPPCHECK)
-    set(CMAKE_CXX_CPPCHECK ${CPPCHECK} --suppress=missingInclude --enable=all
-                           --inline-suppr --inconclusive)
-    message("Cppcheck finished setting up.")
-  else()
-    message(SEND_ERROR "Cppcheck requested but executable not found.")
-  endif()
-endif()
@@ -1,17 +0,0 @@
-if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-    if(NOT EXISTS ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
-        find_package(Git)
-        if(Git_FOUND)
-            execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive vcpkg
-                            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                            RESULT_VARIABLE GIT_SUBMOD_RESULT)
-            if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-                message(SEND_ERROR "Checking out vcpkg in source tree failed with ${GIT_SUBMOD_RESULT}.")
-            endif()
-        else()
-            message(FATAL_ERROR "Could not find git or vcpkg.cmake. Please either, install git and re-run cmake (or run `git submodule update --init --recursive`), or install vcpkg and add `-DCMAKE_TOOLCHAIN_FILE=<path-to-vcpkg>/scripts/buildsystems/vcpkg.cmake` to your cmake invocation. Please try again after making those changes.")
-        endif()
-    endif()
-    set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
-endif()
-
@@ -0,0 +1,6 @@
+include_directories("${PROJECT_SOURCE_DIR}/deps")
+
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest")
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <initializer_list>
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <boost/asio.hpp>
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <string>
-
-namespace ChronoWrapper {
-std::chrono::high_resolution_clock::duration TimeFromStringWithLiteral(const std::string& time_str);
-}
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <chrono>
@@ -28,6 +10,7 @@
 #include "BoostAliases.h"
 #include "Common.h"
 #include "Compat.h"
+#include "TResourceManager.h"
 #include "VehicleData.h"

 class TServer;
@@ -66,6 +49,7 @@ public:
    std::string GetCarData(int Ident);
    std::string GetCarPositionRaw(int Ident);
    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(); }
@@ -74,6 +58,8 @@ public:
    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
    [[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; }
@@ -85,7 +71,8 @@ public:
    void ClearCars();
    [[nodiscard]] int GetID() const { return mID; }
    [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
-    [[nodiscard]] bool IsUDPConnected() const { return mIsUDPConnected; }
+    bool mUDPCONNECTED = false;
+    [[nodiscard]] bool IsConnected() const { return mIsConnected; }
    [[nodiscard]] bool IsSynced() const { return mIsSynced; }
    [[nodiscard]] bool IsSyncing() const { return mIsSyncing; }
    [[nodiscard]] bool IsGuest() const { return mIsGuest; }
@@ -97,16 +84,34 @@ public:
    [[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 SetIsUDPConnected(bool NewIsConnected) { mIsUDPConnected = NewIsConnected; }
+    void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
    [[nodiscard]] TServer& Server() const;
    void UpdatePingTime();
    int SecondsSinceLastPing();

+    // bytes received on UDP
+    std::atomic_size_t UdpReceived = 0;
+    // number of packets received on UDP
+    std::atomic_size_t UdpPacketsReceived = 0;
+    // bytes sent on UDP
+    std::atomic_size_t UdpSent = 0;
+    // number of packets sent on UDP
+    std::atomic_size_t UdpPacketsSent = 0;
+
+    // bytes received on TCP
+    std::atomic_size_t TcpReceived = 0;
+    // bytes sent on TCP
+    std::atomic_size_t TcpSent = 0;
+
+    TimeType::time_point ConnectionTime {};
+
+    ModMap AllowedMods;
+
 private:
    void InsertVehicle(int ID, const std::string& Data);

    TServer& mServer;
-    bool mIsUDPConnected = false;
+    bool mIsConnected = false;
    bool mIsSynced = false;
    bool mIsSyncing = false;
    mutable std::mutex mMissedPacketsMutex;
@@ -119,12 +124,15 @@ private:
    SparseArray<std::string> mVehiclePosition;
    std::string mName = "Unknown Client";
    ip::tcp::socket mSocket;
+    ip::tcp::socket mDownSocket;
    ip::udp::endpoint mUDPAddress {};
    int mUnicycleID = -1;
    std::string mRole;
    std::string mDID;
    int mID = -1;
-    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime = std::chrono::high_resolution_clock::now();
+    std::chrono::time_point<TimeType> mLastPingTime;
+    std::mutex mDisconnectMtx;
 };

-std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);
+// Returns a valid client, or nullptr if no such client exists
+std::shared_ptr<TClient> GetClient(class TServer& Server, int ID);
@@ -1,24 +1,9 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

-#include <algorithm>
+#include "CustomAssert.h"
+#include "TSentry.h"
+extern TSentry Sentry;
+
 #include <array>
 #include <atomic>
 #include <cstring>
@@ -29,7 +14,6 @@
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
-#include <span>
 #include <sstream>
 #include <unordered_map>
 #include <zlib.h>
@@ -38,9 +22,52 @@
 #include <filesystem>
 namespace fs = std::filesystem;

-#include "Settings.h"
 #include "TConsole.h"

+#include <boost/container/flat_map.hpp>
+#include <boost/variant.hpp>
+
+#include <chrono>
+#include <variant>
+
+using TimeType = std::chrono::system_clock;
+
+#include <lk/Result.h>
+
+template <typename T>
+using Result = lk::Result<T>;
+using Error = lk::Error;
+
+// General
+constexpr std::string_view StrDebug = "Debug";
+constexpr std::string_view StrPrivate = "Private";
+constexpr std::string_view StrPort = "Port";
+constexpr std::string_view StrMaxCars = "MaxCars";
+constexpr std::string_view StrMaxPlayers = "MaxPlayers";
+constexpr std::string_view StrMap = "Map";
+constexpr std::string_view StrName = "Name";
+constexpr std::string_view StrDescription = "Description";
+constexpr std::string_view StrResourceFolder = "ResourceFolder";
+constexpr std::string_view StrAuthKey = "AuthKey";
+constexpr std::string_view StrLogChat = "LogChat";
+
+// Misc
+constexpr std::string_view StrSendErrors = "SendErrors";
+constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
+constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
+constexpr std::string_view StrIncludeSubdirectories = "IncludeSubdirectories";
+
+// HTTP
+constexpr std::string_view StrHTTPServerEnabled = "HTTPServerEnabled";
+constexpr std::string_view StrHTTPServerUseSSL = "UseSSL";
+constexpr std::string_view StrSSLKeyPath = "SSLKeyPath";
+constexpr std::string_view StrSSLCertPath = "SSLCertPath";
+constexpr std::string_view StrHTTPServerPort = "HTTPServerPort";
+constexpr std::string_view StrHTTPServerIP = "HTTPServerIP";
+
+// Unused
+constexpr std::string_view StrCustomIP = "Unused.CustomIP";
+
 struct Version {
    uint8_t major;
    uint8_t minor;
@@ -53,6 +80,12 @@ struct Version {
 template <typename T>
 using SparseArray = std::unordered_map<size_t, T>;

+template <typename K, typename V>
+using HashMap = std::unordered_map<K, V>;
+
+using boost::variant;
+using boost::container::flat_map;
+
 // static class handling application start, shutdown, etc.
 // yes, static classes, singletons, globals are all pretty
 // bad idioms. In this case we need a central way to access
@@ -62,6 +95,17 @@ class Application final {
 public:
    // types

+    using SettingValue = std::variant<std::string, bool, int>;
+    using SettingsMap = flat_map<std::string_view, SettingValue>;
+
+    static SettingsMap mSettings;
+
+    static std::string GetSettingString(std::string_view Name);
+    static int GetSettingInt(std::string_view Name);
+    static bool GetSettingBool(std::string_view Name);
+
+    static void SetSetting(std::string_view Name, const SettingValue& value);
+
    using TShutdownHandler = std::function<void()>;

    // methods
@@ -71,22 +115,22 @@ 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 Version ClientMinimumVersion() { return Version { 2, 2, 0 }; }
+    static uint8_t ClientMajorVersion() { return 2; }
    static std::string PPS() { return mPPS; }
    static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }

-    static inline struct Settings Settings { };
-
    static std::vector<std::string> GetBackendUrlsInOrder() {
        return {
-            "https://backend.beammp.com",
+            "backend.beammp.com",
+            "backup1.beammp.com",
+            "backup2.beammp.com"
        };
    }

-    static std::string GetBackendUrlForAuth() { return "https://auth.beammp.com"; }
+    static std::string GetBackendUrlForAuth() { return "auth.beammp.com"; }
    static std::string GetBackendUrlForSocketIO() { return "https://backend.beammp.com"; }
    static void CheckForUpdates();
    static std::array<uint8_t, 3> VersionStrToInts(const std::string& str);
@@ -95,7 +139,9 @@ public:
    static void SleepSafeSeconds(size_t Seconds);

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

    enum class Status {
@@ -115,23 +161,31 @@ public:

    static void SetSubsystemStatus(const std::string& Subsystem, Status status);

+    static std::string SettingToString(const SettingValue& Value);
+
+    // Keeps track of how many packets we dropped on UDP due to fundamentally being malformed
+    static inline std::atomic_size_t MalformedUdpPackets { 0 };
+    // Keeps track of how many packets we dropped on UDP due to
+    // 1) not having a valid (known) player id
+    // 2) player disconnecting
+    // 3) packet failing to parse
+    static inline std::atomic_size_t InvalidUdpPackets { 0 };
+
 private:
    static void SetShutdown(bool Val);

    static inline SystemStatusMap mSystemStatusMap {};
    static inline std::mutex mSystemStatusMapMutex {};
    static inline std::string mPPS;
-    static inline TConsole mConsole;
+    static inline std::unique_ptr<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, 8, 1 };
+    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__)
@@ -139,6 +193,8 @@ void RegisterThread(const std::string& str);
 #define KB 1024llu
 #define MB (KB * 1024llu)
 #define GB (MB * 1024llu)
+#define TB (GB * 1024llu)
+#define SSU_UNRAW SECRET_SENTRY_URL

 #define _file_basename std::filesystem::path(__FILE__).filename().string()
 #define _line std::to_string(__LINE__)
@@ -161,13 +217,13 @@ void RegisterThread(const std::string& str);
    #else
        #define _function_name std::string(__func__)
    #endif
-
+    
    #ifndef NDEBUG
        #define DEBUG
    #endif
-
+    
    #if defined(DEBUG)
-
+        
        // if this is defined, we will show the full function signature infront of
        // each info/debug/warn... call instead of the 'filename:line' format.
        #if defined(BMP_FULL_FUNCTION_NAMES)
@@ -177,50 +233,94 @@ void RegisterThread(const std::string& str);
        #endif

    #endif // defined(DEBUG)
-
-    #define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
-    #define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
-    #define beammp_error(x)                                                               \
-        do {                                                                              \
-            Application::Console().Write(_this_location + std::string("[ERROR] ") + (x)); \
+    
+    #define beammp_internal_error(x) Application::Console().Write(_this_location + std::string("[INTERNAL ERROR] ") + (x))
+    
+    #define beammp_warn(x)                                                                          \
+        do {                                                                                        \
+            try{                                                                                    \
+                Application::Console().Write(_this_location + std::string("[WARN] ") + (x));        \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
        } while (false)
-    #define beammp_lua_error(x)                                                               \
-        do {                                                                                  \
-            Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x)); \
+    #define beammp_info(x)                                                                          \
+        do {                                                                                        \
+            try{                                                                                    \
+                Application::Console().Write(_this_location + std::string("[INFO] ") + (x));        \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
        } while (false)
-    #define beammp_lua_log(level, plugin, x)                                                               \
-        do {                                                                                 \
-            Application::Console().Write(_this_location + fmt::format("[{}] [{}] ", plugin, level) + (x)); \
+    #define beammp_error(x)                                                                         \
+        do {                                                                                        \
+            try{                                                                                    \
+                Application::Console().Write(_this_location + std::string("[ERROR] ") + (x));       \
+                Sentry.AddErrorBreadcrumb((x), _file_basename, _line);                              \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
        } while (false)
-    #define beammp_lua_warn(x)                                                               \
-        do {                                                                                 \
-            Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x)); \
+    #define beammp_lua_error(x)                                                                     \
+        do {                                                                                        \
+            try{                                                                                    \
+                Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x));   \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
        } while (false)
-    #define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
-    #define beammp_debug(x)                                                                   \
-        do {                                                                                  \
-            if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
-                Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
-            }                                                                                 \
+    #define beammp_lua_warn(x)                                                                      \
+        do {                                                                                        \
+            try{                                                                                    \
+                Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x));    \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
        } while (false)
-    #define beammp_event(x)                                                                   \
-        do {                                                                                  \
-            if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
-                Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
-            }                                                                                 \
+    #define luaprint(x)                                                                             \
+        do {                                                                                        \
+            try{                                                                                    \
+                Application::Console().Write(_this_location + std::string("[LUA] ") + (x));         \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
+        } while (false)
+    #define beammp_debug(x)                                                                         \
+        do {                                                                                        \
+            try{                                                                                    \
+                if (Application::GetSettingBool("Debug")) {                                         \
+                    Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x));   \
+                }                                                                                   \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
+        } while (false)
+    #define beammp_event(x)                                                                         \
+        do {                                                                                        \
+            try{                                                                                    \
+                if (Application::GetSettingBool("Debug")) {                                         \
+                    Application::Console().Write(_this_location + std::string("[EVENT] ") + (x));   \
+                }                                                                                   \
+            } catch (const std::exception& e) {                                                     \
+                beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}': {}", #x, e.what()));\
+            }                                                                                       \
        } while (false)
    // trace() is a debug-build debug()
    #if defined(DEBUG)
-        #define beammp_trace(x)                                                                   \
-            do {                                                                                  \
-                if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
-                    Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
-                }                                                                                 \
+        #define beammp_trace(x)                                                                         \
+            do {                                                                                        \
+                try{                                                                                    \
+                    if (Application::GetSettingBool("Debug")) {                                         \
+                        Application::Console().Write(_this_location + std::string("[TRACE] ") + (x));   \
+                    }                                                                                   \
+                } catch (const std::exception& e) {                                                     \
+                    beammp_internal_error(fmt::format("Exception in logging function, failed to print '{}'", #x));           \
+                }                                                                                       \
            } while (false)
    #else
        #define beammp_trace(x)
    #endif // defined(DEBUG)
-
+    
    #define beammp_errorf(...) beammp_error(fmt::format(__VA_ARGS__))
    #define beammp_infof(...) beammp_info(fmt::format(__VA_ARGS__))
    #define beammp_debugf(...) beammp_debug(fmt::format(__VA_ARGS__))
@@ -247,7 +347,6 @@ void RegisterThread(const std::string& str);
    #define beammp_tracef(...) beammp_trace(fmt::format(__VA_ARGS__))
    #define beammp_lua_errorf(...) beammp_lua_error(fmt::format(__VA_ARGS__))
    #define beammp_lua_warnf(...) beammp_lua_warn(fmt::format(__VA_ARGS__))
-    #define beammp_lua_log(level, plugin, x) /* x */

 #endif // DOCTEST_CONFIG_DISABLE

@@ -262,14 +361,59 @@ void RegisterThread(const std::string& str);

 void LogChatMessage(const std::string& name, int id, const std::string& msg);

-std::vector<uint8_t> Comp(std::span<const uint8_t> input);
-std::vector<uint8_t> DeComp(std::span<const uint8_t> input);
+#define Biggest 30000
+
+template <typename T>
+inline T Comp(const T& Data) {
+    std::array<char, Biggest> C {};
+    // obsolete
+    C.fill(0);
+    z_stream defstream;
+    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);
+    deflate(&defstream, Z_SYNC_FLUSH);
+    deflate(&defstream, Z_FINISH);
+    deflateEnd(&defstream);
+    size_t TotalOut = defstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}
+
+template <typename T>
+inline T DeComp(const T& Compressed) {
+    std::array<char, Biggest> C {};
+    // not needed
+    C.fill(0);
+    z_stream infstream;
+    infstream.zalloc = nullptr;
+    infstream.zfree = nullptr;
+    infstream.opaque = nullptr;
+    infstream.avail_in = Biggest;
+    infstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Compressed[0]));
+    infstream.avail_out = Biggest;
+    infstream.next_out = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(C.data()));
+    inflateInit(&infstream);
+    inflate(&infstream, Z_SYNC_FLUSH);
+    inflate(&infstream, Z_FINISH);
+    inflateEnd(&infstream);
+    size_t TotalOut = infstream.total_out;
+    T Ret;
+    Ret.resize(TotalOut);
+    std::fill(Ret.begin(), Ret.end(), 0);
+    std::copy_n(C.begin(), TotalOut, Ret.begin());
+    return Ret;
+}

 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW

-class InvalidDataError : std::runtime_error {
-public:
-    InvalidDataError() : std::runtime_error("Invalid data") {
-    }
-};
+std::string ToHumanReadableSize(size_t Size);
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "Environment.h"
@@ -27,17 +9,7 @@
 #include <termios.h>
 #include <unistd.h>
 char _getch();
-#endif // linux
-
-#ifdef BEAMMP_FREEBSD
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-char _getch();
-// macros 'major' and 'minor' need to be undefined on FreeBSD to avoid naming collision with system headers
-#undef major
-#undef minor
-#endif // freebsd
+#endif // unix

 // ======================= APPLE ========================

@@ -1,20 +1,4 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+// Copyright Anonymous275 8/11/2020

 #pragma once
 #include <array>
@@ -1,20 +1,4 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+// Author: lionkor

 /*
 * Asserts are to be used anywhere where assumptions about state are made
@@ -32,7 +16,6 @@
 #include <thread>

 #include "Common.h"
-#include "Compat.h"

 static const char* const ANSI_RESET = "\u001b[0m";

@@ -57,7 +40,7 @@ static const char* const ANSI_WHITE_BOLD = "\u001b[37;1m";
 static const char* const ANSI_BOLD = "\u001b[1m";
 static const char* const ANSI_UNDERLINE = "\u001b[4m";

-#if defined(DEBUG) && !defined(BEAMMP_FREEBSD)
+#ifdef DEBUG
 #include <iostream>
 inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const char* function, [[maybe_unused]] unsigned line,
    [[maybe_unused]] const char* condition_string, [[maybe_unused]] bool result) {
@@ -80,10 +63,12 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
        bool result = (cond);                                                          \
        if (!result) {                                                                 \
            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
+            Sentry.LogAssert(#cond, _file_basename, _line, __func__);                  \
        }                                                                              \
    } while (false)
 #define beammp_assert_not_reachable()                                                                                                                           \
    do {                                                                                                                                                        \
        beammp_errorf("Assertion failed in '{}:{}': Unreachable code reached. This may result in a crash or undefined state of the program.", __func__, _line); \
+        Sentry.LogAssert("code is unreachable", _file_basename, _line, __func__);                                                                               \
    } while (false)
 #endif // DEBUG
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <functional>
@@ -1,36 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-#pragma once
-
-#include <optional>
-#include <string>
-namespace Env {
-
-enum class Key {
-    // provider settings
-    PROVIDER_UPDATE_MESSAGE,
-    PROVIDER_DISABLE_CONFIG,
-    PROVIDER_PORT_ENV,
-};
-
-std::optional<std::string> Get(Key key);
-
-std::string_view ToString(Key key);
-
-}
@@ -1,33 +1,13 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 // one of BEAMMP_{WINDOWS,LINUX,APPLE} will be set at the end of this

 // clang-format off
-#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE) && !defined(BEAMMP_FREEBSD)
+#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE)
    #if defined(_WIN32) || defined(__CYGWIN__)
        #define BEAMMP_WINDOWS
-    #elif defined(__linux__) || defined(__linux) || defined(linux)
+    #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__unix__) || defined(__unix) || defined(unix)
        #define BEAMMP_LINUX
-    #elif defined(__FreeBSD__)
-	#define BEAMMP_FREEBSD
    #elif defined(__APPLE__) || defined(__MACH__)
        #define BEAMMP_APPLE
    #else
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <Common.h>
@@ -23,7 +5,6 @@
 #include <filesystem>
 #include <string>
 #include <unordered_map>
-#include <curl/curl.h>

 #if defined(BEAMMP_LINUX)
 #pragma GCC diagnostic push
@@ -39,8 +20,8 @@
 namespace fs = std::filesystem;

 namespace Http {
-std::string GET(const std::string& url, unsigned int* status = nullptr);
-std::string POST(const std::string& url, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr, const std::map<std::string, std::string>& headers = {});
+std::string GET(const std::string& host, int port, const std::string& target, unsigned int* status = nullptr);
+std::string POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status = nullptr, const httplib::Headers& headers = {});
 namespace Status {
    std::string ToString(int code);
 }
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <thread>
@@ -26,7 +8,7 @@ public:
    IThreaded()
        // invokes operator() on this object
        : mThread() { }
-    virtual ~IThreaded() noexcept {
+    ~IThreaded() noexcept {
        if (mThread.joinable()) {
            mThread.join();
        }
@@ -0,0 +1,6 @@
+#pragma once
+
+enum IterationDecision {
+    Continue,
+    Break,
+};
@@ -1,20 +1,6 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
 //
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
+// Created by anon on 4/21/21.
 //
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.

 #pragma once
 #include "rapidjson/document.h"
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "TLuaEngine.h"
@@ -35,10 +17,8 @@ namespace MP {
    inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
    std::pair<bool, std::string> DropPlayer(int ID, std::optional<std::string> MaybeReason);
    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
-    std::pair<bool, std::string> SendNotification(int ID, const std::string& Message, const std::string& Icon, const std::string& Category);
    std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);
    void Set(int ConfigID, sol::object NewValue);
-    TLuaValue Get(int ConfigID);
    bool IsPlayerGuest(int ID);
    bool IsPlayerConnected(int ID);
    void Sleep(size_t Ms);
@@ -1,75 +0,0 @@
-#pragma once
-
-#include <boost/thread/synchronized_value.hpp>
-#include <chrono>
-#include <cstddef>
-#include <limits>
-#include <unordered_map>
-
-#undef max
-#undef min
-
-namespace prof {
-
-using Duration = std::chrono::duration<double, std::milli>;
-using TimePoint = std::chrono::high_resolution_clock::time_point;
-
-/// Returns the current time.
-TimePoint now();
-
-/// Returns a sub-millisecond resolution duration between start and end.
-Duration duration(const TimePoint& start, const TimePoint& end);
-
-struct Stats {
-    double mean;
-    double stdev;
-    double min;
-    double max;
-    size_t n;
-};
-
-/// Calculates and stores the moving average over K samples of execution time data
-/// for some single unit of code. Threadsafe.
-struct UnitExecutionTime {
-    UnitExecutionTime();
-
-    /// Adds a sample to the collection, overriding the oldest sample if needed.
-    void add_sample(const Duration& dur);
-
-    /// Calculates the mean duration over the `measurement_count()` measurements,
-    /// as well as the standard deviation.
-    Stats stats() const;
-
-    /// Returns the number of elements the moving average is calculated over.
-    size_t measurement_count() const;
-
-private:
-    mutable std::mutex m_mtx {};
-    size_t m_total_calls {};
-    double m_sum {};
-    // sum of measurements squared (for running stdev)
-    double m_measurement_sqr_sum {};
-    double m_min { std::numeric_limits<double>::max() };
-    double m_max { std::numeric_limits<double>::min() };
-};
-
-/// Holds profiles for multiple units by name. Threadsafe.
-struct UnitProfileCollection {
-    /// Adds a sample to the collection, overriding the oldest sample if needed.
-    void add_sample(const std::string& unit, const Duration& duration);
-
-    /// Calculates the mean duration over the `measurement_count()` measurements,
-    /// as well as the standard deviation.
-    Stats stats(const std::string& unit);
-
-    /// Returns the number of elements the moving average is calculated over.
-    size_t measurement_count(const std::string& unit);
-
-    /// Returns the stats for all stored units.
-    std::unordered_map<std::string, Stats> all_stats();
-
-private:
-    boost::synchronized_value<std::unordered_map<std::string, UnitExecutionTime>> m_map;
-};
-
-}
@@ -1,21 +1,4 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
+// Author: lionkor
 #pragma once

 /*
@@ -1,143 +0,0 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-#pragma once
-#include "Sync.h"
-#include <concepts>
-#include <cstdint>
-#include <doctest/doctest.h>
-#include <fmt/core.h>
-#include <fmt/format.h>
-#include <stdexcept>
-#include <string>
-#include <unordered_map>
-#include <variant>
-
-struct ComposedKey {
-    std::string Category;
-    std::string Key;
-
-    bool operator==(const ComposedKey& rhs) const {
-        return (this->Category == rhs.Category && this->Key == rhs.Key);
-    }
-};
-
-template <>
-struct fmt::formatter<ComposedKey> : formatter<std::string> {
-    auto format(ComposedKey key, format_context& ctx) const;
-};
-
-inline auto fmt::formatter<ComposedKey>::format(ComposedKey key, fmt::format_context& ctx) const {
-    std::string key_metadata = fmt::format("{}::{}", key.Category, key.Key);
-    return formatter<std::string>::format(key_metadata, ctx);
-}
-
-namespace std {
-template <>
-class hash<ComposedKey> {
-public:
-    std::uint64_t operator()(const ComposedKey& key) const {
-        std::hash<std::string> hash_fn;
-        return hash_fn(key.Category + key.Key);
-    }
-};
-}
-
-struct Settings {
-    using SettingsTypeVariant = std::variant<std::string, bool, int>;
-
-    Settings();
-
-    enum Key {
-        // Keys that correspond to the keys set in TOML
-        // Keys have their TOML section name as prefix
-
-        // [Misc]
-        Misc_ImScaredOfUpdates,
-        Misc_UpdateReminderTime,
-
-        // [General]
-        General_Description,
-        General_Tags,
-        General_MaxPlayers,
-        General_Name,
-        General_Map,
-        General_AuthKey,
-        General_Private,
-        General_Port,
-        General_MaxCars,
-        General_LogChat,
-        General_ResourceFolder,
-        General_Debug,
-        General_AllowGuests,
-        General_InformationPacket,
-    };
-
-    Sync<std::unordered_map<Key, SettingsTypeVariant>> SettingsMap;
-    enum SettingsAccessMask {
-        READ_ONLY, // Value can be read from console
-        READ_WRITE, // Value can be read and written to from console
-        NO_ACCESS // Value is inaccessible from console (no read OR write)
-    };
-
-    using SettingsAccessControl = std::pair<
-        Key, // The Key's corresponding enum encoding
-        SettingsAccessMask // Console read/write permissions
-        >;
-
-    Sync<std::unordered_map<ComposedKey, SettingsAccessControl>> InputAccessMapping;
-    std::string getAsString(Key key);
-
-    int getAsInt(Key key);
-
-    bool getAsBool(Key key);
-
-    SettingsTypeVariant get(Key key);
-
-    void set(Key key, const std::string& value);
-
-    template <typename Integer, std::enable_if_t<std::is_same_v<Integer, int>, bool> = true>
-    void set(Key key, Integer value) {
-        auto map = SettingsMap.synchronize();
-        if (!map->contains(key)) {
-            throw std::logic_error { "Undefined setting key accessed in Settings::set(int)" };
-        }
-        if (!std::holds_alternative<int>(map->at(key))) {
-            throw std::logic_error { fmt::format("Wrong value type in Settings::set(int): index {}", map->at(key).index()) };
-        }
-        map->at(key) = value;
-    }
-    template <typename Boolean, std::enable_if_t<std::is_same_v<bool, Boolean>, bool> = true>
-    void set(Key key, Boolean value) {
-        auto map = SettingsMap.synchronize();
-        if (!map->contains(key)) {
-            throw std::logic_error { "Undefined setting key accessed in Settings::set(bool)" };
-        }
-        if (!std::holds_alternative<bool>(map->at(key))) {
-            throw std::logic_error { fmt::format("Wrong value type in Settings::set(bool): index {}", map->at(key).index()) };
-        }
-        map->at(key) = value;
-    }
-
-    const std::unordered_map<ComposedKey, SettingsAccessControl> getAccessControlMap() const;
-    SettingsAccessControl getConsoleInputAccessMapping(const ComposedKey& keyName);
-
-    void setConsoleInputAccessMapping(const ComposedKey& keyName, const std::string& value);
-    void setConsoleInputAccessMapping(const ComposedKey& keyName, int value);
-    void setConsoleInputAccessMapping(const ComposedKey& keyName, bool value);
-};
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 void SetupSignalHandlers();
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <boost/thread/synchronized_value.hpp>
-#include <mutex>
-
-/// This header provides convenience aliases for synchronization primitives.
-
-template <typename T>
-using Sync = boost::synchronized_value<T, std::recursive_mutex>;
@@ -1,31 +1,12 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "Common.h"
-#include "Settings.h"

 #include <atomic>
 #include <filesystem>

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

 namespace fs = std::filesystem;

@@ -36,17 +17,15 @@ public:
    [[nodiscard]] bool Failed() const { return mFailed; }

    void FlushToFile();
-    void PrintDebug();

 private:
    void CreateConfigFile();
    void ParseFromFile(std::string_view name);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, Settings::Key key);
+    void PrintDebug();
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key);

    void ParseOldFormat();
-    std::string TagsAsPrettyArray() const;
    bool IsDefault();
    bool mFailed { false };
-    bool mDisableConfig { false };
    std::string mConfigFileName;
 };
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "Cryptography.h"
@@ -23,7 +5,6 @@
 #include <atomic>
 #include <fstream>
 #include <functional>
-#include <mutex>
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -35,15 +16,12 @@ 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);
@@ -58,7 +36,12 @@ private:
    void Command_Status(const std::string& cmd, const std::vector<std::string>& args);
    void Command_Settings(const std::string& cmd, const std::vector<std::string>& args);
    void Command_Clear(const std::string&, const std::vector<std::string>& args);
-    void Command_Version(const std::string& cmd, const std::vector<std::string>& args);
+    void Command_Debug(const std::string&, const std::vector<std::string>& args);
+    void Command_Version(const std::string&, const std::vector<std::string>& args);
+
+    void Autocomplete_Lua(const std::string&, std::vector<std::string>& suggestions);
+    void Autocomplete_Kick(const std::string&, std::vector<std::string>& suggestions);
+    void Autocomplete_Settings(const std::string&, std::vector<std::string>& suggestions);

    void Command_Say(const std::string& FullCommand);
    bool EnsureArgsCount(const std::vector<std::string>& args, size_t n);
@@ -75,11 +58,18 @@ private:
        { "status", [this](const auto& a, const auto& b) { Command_Status(a, b); } },
        { "settings", [this](const auto& a, const auto& b) { Command_Settings(a, b); } },
        { "clear", [this](const auto& a, const auto& b) { Command_Clear(a, b); } },
-        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
+        { "debug", [this](const auto& a, const auto& b) { Command_Debug(a, b); } },
        { "version", [this](const auto& a, const auto& b) { Command_Version(a, b); } },
+        { "say", [this](const auto&, const auto&) { Command_Say(""); } }, // shouldn't actually be called
    };

-    std::unique_ptr<Commandline> mCommandline { nullptr };
+    std::unordered_map<std::string, std::function<void(const std::string&, std::vector<std::string>&)>> mCommandAutocompleteMap = {
+        { "lua", [this](const auto& a, auto& b) { Autocomplete_Lua(a, b); } },
+        { "kick", [this](const auto& a, auto& b) { Autocomplete_Kick(a, b); } },
+        { "settings", [this](const auto& a, auto& b) { Autocomplete_Settings(a, b); } },
+    };
+
+    Commandline mCommandline;
    std::vector<std::string> mCachedLuaHistory;
    std::vector<std::string> mCachedRegularHistory;
    TLuaEngine* mLuaEngine { nullptr };
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "Common.h"
@@ -29,7 +11,6 @@ public:
    //~THeartbeatThread();
    void operator()() override;

-    static inline std::string lastCall = "";
 private:
    std::string GenerateCall();
    std::string GetPlayers();
@@ -1,28 +1,8 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

-#include "Profiling.h"
 #include "TNetwork.h"
 #include "TServer.h"
 #include <any>
-#include <chrono>
 #include <condition_variable>
 #include <filesystem>
 #include <initializer_list>
@@ -34,14 +14,19 @@
 #include <queue>
 #include <random>
 #include <set>
-#include <toml.hpp>
+#include <toml11/toml.hpp>
 #include <unordered_map>
 #include <vector>

 #define SOL_ALL_SAFETIES_ON 1
 #define SOL_USER_C_ASSERT SOL_ON
-#define SOL_C_ASSERT(...) \
-    beammp_lua_errorf("SOL2 assertion failure: Assertion `{}` failed in {}:{}. This *should* be a fatal error, but BeamMP Server overrides it to not be fatal. This may cause the Lua Engine to crash, or cause other issues.", #__VA_ARGS__, __FILE__, __LINE__)
+#define SOL_C_ASSERT(...)                                                                                                                                                                                                                                                  \
+    do {                                                                                                                                                                                                                                                                   \
+        if (!(__VA_ARGS__)) {                                                                                                                                                                                                                                              \
+            beammp_lua_errorf("SOL2 assertion failure: Assertion `{}` failed in {}:{}. This *should* be a fatal error, but BeamMP Server overrides it to not be fatal. This may cause the Lua Engine to crash, or cause other issues.", #__VA_ARGS__, __FILE__, __LINE__); \
+            std::abort();                                                                                                                                                                                                                                                  \
+        }                                                                                                                                                                                                                                                                  \
+    } while (0)
 #include <sol/sol.hpp>

 struct JsonString {
@@ -58,14 +43,15 @@ namespace fs = std::filesystem;
 /**
 * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
 */
-using TLuaValue = std::variant<std::string, int, JsonString, bool, std::unordered_map<std::string, std::string>, float>;
+using TLuaValue = std::variant<std::string, int, JsonString, bool, std::unordered_map<std::string, std::string>, std::unordered_map<std::string, size_t>, float>;
 enum TLuaType {
    String = 0,
    Int = 1,
    Json = 2,
    Bool = 3,
    StringStringMap = 4,
-    Float = 5,
+    StringSizeTMap = 5,
+    Float = 6,
 };

 class TLuaPlugin;
@@ -77,14 +63,7 @@ struct TLuaResult {
    sol::object Result { sol::lua_nil };
    TLuaStateId StateId;
    std::string Function;
-    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();
+    // TODO: Add condition_variable
    void WaitUntilReady();
 };

@@ -163,11 +142,11 @@ public:
    }

    static void WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results,
-        const std::optional<std::chrono::high_resolution_clock::duration>& Max = std::nullopt);
+        const std::optional<TimeType::duration>& Max = std::nullopt);
    void ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results);
    bool HasState(TLuaStateId StateId);
    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName);
+    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args);
    void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);
    void RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName);
    /**
@@ -192,9 +171,7 @@ public:
        for (const auto& Event : mLuaEvents.at(EventName)) {
            for (const auto& Function : Event.second) {
                if (Event.first != IgnoreId) {
-                    auto Result = EnqueueFunctionCall(Event.first, Function, Arguments, EventName);
-                    Results.push_back(Result);
-                    AddResultToCheck(Result);
+                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments));
                }
            }
        }
@@ -211,7 +188,7 @@ public:
        std::vector<TLuaValue> Arguments { TLuaValue { std::forward<ArgsT>(Args) }... };
        const auto Handlers = GetEventHandlersForState(EventName, StateId);
        for (const auto& Handler : Handlers) {
-            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments, EventName));
+            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments));
        }
        return Results;
    }
@@ -245,7 +222,7 @@ private:
        StateThreadData(const StateThreadData&) = delete;
        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<TLuaValue>& Args, const std::string& EventName);
+        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args);
        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy);
        void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
        void AddPath(const fs::path& Path); // to be added to path and cpath
@@ -263,7 +240,6 @@ private:
        sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
        sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
        sol::table Lua_GetPlayerIdentifiers(int ID);
-        std::variant<std::string, sol::nil_t> Lua_GetPlayerRole(int ID);
        sol::table Lua_GetPlayers();
        std::string Lua_GetPlayerName(int ID);
        sol::table Lua_GetPlayerVehicles(int ID);
@@ -274,9 +250,6 @@ private:
        sol::table Lua_FS_ListFiles(const std::string& Path);
        sol::table Lua_FS_ListDirectories(const std::string& Path);

-        prof::UnitProfileCollection mProfile {};
-        std::unordered_map<std::string, prof::TimePoint> mProfileStarts;
-
        std::string mName;
        TLuaStateId mStateId;
        lua_State* mState;
@@ -296,8 +269,8 @@ private:
    };

    struct TimedEvent {
-        std::chrono::high_resolution_clock::duration Duration {};
-        std::chrono::high_resolution_clock::time_point LastCompletion {};
+        TimeType::duration Duration {};
+        TimeType::time_point LastCompletion {};
        std::string EventName;
        TLuaStateId StateId;
        CallStrategy Strategy;
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #include "TLuaEngine.h"

 class TLuaPlugin {
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "BoostAliases.h"
@@ -58,17 +40,18 @@ private:
    std::mutex mOpenIDMutex;

    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);
-    void Parse(TClient& c, const std::vector<uint8_t>& Packet);
+    ModMap GetClientMods(TClient& Client);
+    void HandleResourcePackets(TClient& c, const std::vector<uint8_t>& Packet);
    void SendFile(TClient& c, const std::string& Name);
    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
-    static void SendFileToClient(TClient& c, size_t Size, const std::string& Name);
+    static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
    static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };

-std::string HashPassword(const std::string& str);
 std::vector<uint8_t> StringToVector(const std::string& Str);
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "Common.h"
@@ -27,7 +9,6 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
    explicit TPPSMonitor(TServer& Server);
-    virtual ~TPPSMonitor() { }

    void operator()() override;

@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "Common.h"
@@ -1,47 +1,22 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "Common.h"
-#include <nlohmann/json.hpp>
+#include <optional>
+
+using ModMap = HashMap<std::string, size_t>;

 class TResourceManager {
 public:
    TResourceManager();

-    [[nodiscard]] size_t MaxModSize() const { return mMaxModSize; }
-    [[nodiscard]] std::string FileList() const { return mFileList; }
-    [[nodiscard]] std::string TrimmedList() const { return mTrimmedList; }
-    [[nodiscard]] std::string FileSizes() const { return mFileSizes; }
-    [[nodiscard]] int ModsLoaded() const { return mModsLoaded; }
-
-    [[nodiscard]] std::string NewFileList() const;
-
-    void RefreshFiles();
+    [[nodiscard]] size_t TotalModsSize() const { return mTotalModSize; }
+    [[nodiscard]] ModMap FileMap() const { return mMods; }
+    [[nodiscard]] static std::string FormatForBackend(const ModMap& mods);
+    [[nodiscard]] static std::string FormatForClient(const ModMap& mods);
+    [[nodiscard]] static std::optional<std::string> IsModValid(std::string& pathString, const ModMap& mods);
+    [[nodiscard]] int LoadedModCount() const { return mMods.size(); }

 private:
-    size_t mMaxModSize = 0;
-    std::string mFileSizes;
-    std::string mFileList;
-    std::string mTrimmedList;
-    int mModsLoaded = 0;
-
-    std::mutex mModsMutex;
-    nlohmann::json mMods = nlohmann::json::array();
-};
+    size_t mTotalModSize = 0; // size of all mods
+    ModMap mMods; // map of mod names
+};
@@ -1,27 +1,11 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <chrono>
 #include <functional>
 #include <string>

+#include "Common.h"
+
 class TScopedTimer {
 public:
    TScopedTimer();
@@ -29,7 +13,7 @@ public:
    TScopedTimer(std::function<void(size_t)> OnDestroy);
    ~TScopedTimer();
    auto GetElapsedTime() const {
-        auto EndTime = std::chrono::high_resolution_clock::now();
+        auto EndTime = TimeType::now();
        auto Delta = EndTime - mStartTime;
        size_t TimeDelta = Delta / std::chrono::milliseconds(1);
        return TimeDelta;
@@ -38,6 +22,6 @@ public:
    std::function<void(size_t /* time_ms */)> OnDestroy { nullptr };

 private:
-    std::chrono::high_resolution_clock::time_point mStartTime;
+    TimeType::time_point mStartTime;
    std::string Name;
 };
@@ -0,0 +1,38 @@
+#ifndef SENTRY_H
+#define SENTRY_H
+
+#include <mutex>
+#include <string>
+#include <unordered_map>
+enum class SentryLevel {
+    Debug = -1,
+    Info = 0,
+    Warning = 1,
+    Error = 2,
+    Fatal = 3,
+};
+
+// singleton, dont make this twice
+class TSentry final {
+public:
+    TSentry();
+    ~TSentry();
+
+    void PrintWelcome();
+    void SetupUser();
+    void Log(SentryLevel level, const std::string& logger, const std::string& text);
+    void LogError(const std::string& text, const std::string& file, const std::string& line);
+    void SetContext(const std::string& context_name, const std::unordered_map<std::string, std::string>& map);
+    void LogException(const std::exception& e, const std::string& file, const std::string& line);
+    void LogAssert(const std::string& condition_string, const std::string& file, const std::string& line, const std::string& function);
+    void AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line);
+    // cleared when Logged
+    void SetTransaction(const std::string& id);
+    [[nodiscard]] std::unique_lock<std::mutex> CreateExclusiveContext();
+
+private:
+    bool mValid { true };
+    std::mutex mMutex;
+};
+
+#endif // SENTRY_H
@@ -1,29 +1,14 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include "IThreaded.h"
+#include "IterationDecision.h"
 #include "RWMutex.h"
 #include "TScopedTimer.h"
+#include <concepts>
 #include <functional>
 #include <memory>
 #include <mutex>
+#include <type_traits>
 #include <unordered_set>

 #include "BoostAliases.h"
@@ -32,6 +17,21 @@ class TClient;
 class TNetwork;
 class TPPSMonitor;

+// clang-format doesn't know how to deal with concepts
+// clang-format off
+template <typename FnT>
+concept ForEachHandlerWithDecision = requires(FnT Fn, const std::shared_ptr<TClient>& Ptr) {
+    requires std::invocable<FnT, const std::shared_ptr<TClient>&> ;
+    { std::invoke(Fn, Ptr) } -> std::convertible_to<IterationDecision>;
+};
+
+template <typename FnT>
+concept ForEachHandler = requires(FnT Fn, const std::shared_ptr<TClient>& Ptr) {
+    requires std::invocable <FnT, const std::shared_ptr<TClient>&> ;
+    { std::invoke(Fn, Ptr) } -> std::same_as<void>;
+};
+// clang-format on
+
 class TServer final {
 public:
    using TClientSet = std::unordered_set<std::shared_ptr<TClient>>;
@@ -40,11 +40,46 @@ public:

    void InsertClient(const std::shared_ptr<TClient>& Ptr);
    void RemoveClient(const std::weak_ptr<TClient>&);
+    void RemoveClientById(int Id);
    // in Fn, return true to continue, return false to break
-    void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
+    [[deprecated("use ForEachClient instead")]] void ForEachClientWeak(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
+    // in Fn, return Break or Continue
+    template <ForEachHandlerWithDecision FnT>
+    void ForEachClient(FnT Fn) {
+        decltype(mClients) Clients;
+        {
+            ReadLock lock(mClientsMutex);
+            Clients = mClients;
+        }
+        for (auto& Client : Clients) {
+            if (Client) [[likely]] {
+                IterationDecision Decision = std::invoke(Fn, Client);
+                if (Decision == IterationDecision::Break) {
+                    break;
+                }
+            } else {
+                beammp_assert_not_reachable();
+            }
+        }
+    }
+    template <ForEachHandler FnT>
+    void ForEachClient(FnT Fn) {
+        decltype(mClients) Clients;
+        {
+            ReadLock lock(mClientsMutex);
+            Clients = mClients;
+        }
+        for (auto& Client : Clients) {
+            if (Client) [[likely]] {
+                std::invoke(Fn, Client);
+            } else {
+                beammp_assert_not_reachable();
+            }
+        }
+    }
    size_t ClientCount() const;

-    void GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
+    static void GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TNetwork& Network);
    static void HandleEvent(TClient& c, const std::string& Data);
    RWMutex& GetClientMutex() const { return mClientsMutex; }

@@ -61,7 +96,8 @@ private:
    static bool ShouldSpawn(TClient& c, const std::string& CarJson, int ID);
    static bool IsUnicycle(TClient& c, const std::string& CarJson);
    static void Apply(TClient& c, int VID, const std::string& pckt);
-    void HandlePosition(TClient& c, const std::string& Packet);
+    static bool HandlePosition(TClient& c, const std::string& PacketStr);
+    static bool HandleVehicleUpdate(const std::string& PacketStr, const int playerID);
 };

 struct BufferView {
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <string>
+
+namespace uuid {
+
+std::string GenerateUuid();
+
+}
@@ -1,21 +1,3 @@
-// BeamMP, the BeamNG.drive multiplayer mod.
-// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
-//
-// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 #pragma once

 #include <string>
@@ -0,0 +1,3 @@
+FROM archlinux
+
+RUN pacman -Syu --noconfirm lua53 openssl curl git cmake gcc make zlib boost websocketpp
@@ -0,0 +1,9 @@
+FROM debian:11
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update -y
+
+RUN apt-get install -y git cmake g++-10 curl libboost1.74-all-dev libssl-dev libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev 
+
+ENV CXX=g++-10
@@ -0,0 +1,9 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update -y
+
+RUN apt-get install -y libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev git make cmake g++
+
+RUN apt-get install -y libboost1.71-all-dev
@@ -0,0 +1,9 @@
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update -y
+
+RUN apt-get install -y git libz-dev rapidjson-dev liblua5.3 libssl-dev libwebsocketpp-dev libcurl4-openssl-dev cmake g++-10 libboost1.74-all-dev libssl3 curl
+
+ENV CXX=g++-10
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+printf "enter DSN (optional): "
+read DSN
+
+docker build -f Ubuntu-20.04-Dockerfile . -t beammp-server-build:Ubuntu-20.04
+docker build -f Ubuntu-22.04-Dockerfile . -t beammp-server-build:Ubuntu-22.04
+docker build -f ArchLinux-Dockerfile . -t beammp-server-build:ArchLinux
+docker build -f Debian-11-Dockerfile . -t beammp-server-build:Debian-11
+
+CMD="cd /beammp; cmake . -DGIT_SUBMODULE=OFF -DCMAKE_BUILD_TYPE=Release -DBEAMMP_SECRET_SENTRY_URL=\"${DSN}\" -B /build && make -j -C /build BeamMP-Server"
+
+docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-ubuntu-20.04:/build -it --rm beammp-server-build:Ubuntu-20.04 bash -c "${CMD}"
+docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-ubuntu-22.04:/build -it --rm beammp-server-build:Ubuntu-22.04 bash -c "${CMD}"
+docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-archlinux:/build -it --rm beammp-server-build:ArchLinux bash -c "${CMD}"
+docker run -v $(pwd)/..:/beammp -v $(pwd)/../build-debian-11:/build -it --rm beammp-server-build:Debian-11 bash -c "${CMD}"
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,10 +0,0 @@
-#!/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
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,10 +0,0 @@
-#!/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
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cmake . -B build -DCMAKE_BUILD_TYPE=Release -DGIT_SUBMODULE=OFF
+
+make -j -C build BeamMP-Server
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,10 +0,0 @@
-#!/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
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-git config --global --add safe.directory $(pwd)
-git config --global --add safe.directory $(pwd)/vcpkg
-git config --global --add safe.directory $(pwd)/deps/commandline
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-./vcpkg/bootstrap-vcpkg.sh
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,10 +0,0 @@
-#!/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
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-apt-get update -y
-
-apt-get install -y liblua5.3-0 curl
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anonymous-275	8c967a5608	test state commit	2023-06-23 08:09:56 +01:00
Anonymous-275	57a58b1a38	fix hang and crash caused by client kick	2023-04-24 11:41:09 +01:00
Lion Kortlepel	2cf27ad837	potentially fix ghost car bug	2022-12-20 02:56:04 +01:00
Lion Kortlepel	e8ef7de4b9	fix a bug in TriggerLocalEvent which would cause the server to std::terminate() it was refusing to push multiple return values onto a result table. Not sure what changed to make this happen, but oh well.	2022-12-19 12:41:45 +01:00
Lion Kortlepel	8ea7b75874	fix sol assert not actually checking the assertion facepalm	2022-12-19 12:41:16 +01:00
Lion Kortlepel	59503ccc90	use a beammp_lua_errorf instead of a std::terminate on sol2 assertion failure	2022-12-19 11:52:22 +01:00
Lion Kortlepel	7316dff519	fix not removing client when disconnecting them	2022-11-25 14:40:21 +01:00
Lion Kortlepel	b1a89125fe	fix spinning a single thread in lua result check thread	2022-11-25 14:21:45 +01:00
Lion Kortlepel	4a6504ec2c	fix "disconnect was called twice" error this would cause players to stick around after being kicked	2022-11-23 09:34:51 +01:00
Lion Kortlepel	b3594dd147	remove invalid naming of settings again ive added this in what can only be described as complete delirium, as it makes no sense whatsoever. reverted.	2022-11-23 09:34:51 +01:00
Lion Kortlepel	7cc426cb96	fix reading and defaulting the IncludeSubdirectories config option	2022-11-23 09:34:51 +01:00
20dka	a91eb02f5f	remove debug print	2022-11-23 09:34:51 +01:00
20dka	6b65907a7f	add ID parameter to `onPlayerRequestMods` and update Changelog.md	2022-11-23 09:34:51 +01:00
20dka	468a6b340e	add event 'onPlayerRequestMods', restructure modloading now every player has their own list of allowed client mods, this can be modified by lua upon joining and is later used as a whitelist to ensure only those files can be sent to each client	2022-11-23 09:34:51 +01:00
20dka	056827546e	assign IDs to new players earlier in the connection process	2022-11-23 09:34:51 +01:00
20dka	6a47521c7c	fix lua autocomplete crash when a table contains number keys	2022-11-23 09:34:51 +01:00
Lion Kortlepel	eaab5eaf30	fix crash which could happen when closing an invalid socket for some reason boost::asio doesn't account for this and lets us simply die when/if this happens.	2022-11-23 09:34:51 +01:00
Lion Kortlepel	35b38f35bb	replace usages of ForEachClientWeak with ForEachClient	2022-11-23 09:34:51 +01:00
Lion Kortlepel	2572530957	ensure clients are valid when iterated over	2022-11-23 09:34:51 +01:00
Lion Kortlepel	8551e68184	fix bug which could cause multiple players to have the same ID (closes #154 )	2022-11-23 09:34:51 +01:00
Lion Kortlepel	2f85c708c5	rework GetClient to use new ForEachClient, return shared_ptr this simplifies a lot of functions, and removes a lot of potential errors when using the function. You now only check whether the return value is null, and if it's not, you have a valid, reference-counted, client pointer.	2022-11-23 09:34:51 +01:00
Lion Kortlepel	844b64f5d9	rework ForEachClient to use concepts instead of SFINAE	2022-11-23 09:34:51 +01:00
Lion Kortlepel	d7369c3bc5	deprecate ForEachClientWeak in favor of new ForEachClient	2022-11-23 09:34:51 +01:00
Lion Kortlepel	a8ad9034b2	update lk-result	2022-11-23 09:34:50 +01:00
Lion Kortlepel	b756ce3c3f	fix formatting in all files	2022-11-23 09:34:50 +01:00
Lion Kortlepel	3f05b72cc2	change internal setting names to set apart categories	2022-11-23 09:34:50 +01:00
Lion Kortlepel	152393f8bf	switch boost variant for std::variant for settings, for sol2	2022-11-23 09:34:50 +01:00
Lion Kortlepel	dd36299436	add lk/result to includes	2022-11-23 09:34:50 +01:00
Lion Kortlepel	da65e97ed1	add lk/result a header-only library to deal with results	2022-11-23 09:34:50 +01:00
Lion Kortlepel	4cc163ea1c	switch to c++20 this will allow us to use more convenience features of the language, and leave more legacy code behind - also we can use c++20 libraries ;)	2022-11-23 09:34:50 +01:00
Lion Kortlepel	01bcc3d18c	replace all clocks with a generic TimeType	2022-11-23 09:34:50 +01:00
Lion Kortlepel	c7f6835702	use high_resolution_clock instead of system_clock	2022-11-23 09:34:50 +01:00
Lion Kortlepel	0327b41611	change to system_clock for times converted to time_t	2022-11-23 09:34:50 +01:00
Lion Kortlepel	48135f4544	add new onShutdown timing to changelog	2022-11-23 09:34:50 +01:00
Lion Kortlepel	0411ba533d	change onShutdown to be called before all players are kicked	2022-11-23 09:34:50 +01:00
Lion Kortlepel	41dd4ff678	add version to changelog	2022-11-23 09:34:50 +01:00
Lion Kortlepel	e1c2d0d5fb	add `version` command	2022-11-23 09:34:50 +01:00
Lion Kortlepel	69c2868025	fix server not closing after detecting an invalid config (fixes #151 )	2022-11-23 09:34:50 +01:00
Lion Kortlepel	c8ca4564a1	fix error which complains about AuthKey not being present before reading the config file	2022-11-23 09:34:50 +01:00
Lion Kortlepel	0c6112c28a	add boost to requirements in README for windows	2022-11-23 09:34:50 +01:00
Lion Kortlepel	4860849f2f	add boost-uuid to vcpkg on windows	2022-11-23 09:34:50 +01:00
Lion Kortlepel	3bd67d959f	handle all exceptions which happen inside a logging macro and print them ;)	2022-11-23 09:34:50 +01:00
Lion Kortlepel	13a86d3e77	add explanative debug messages to parse errors in GetPidVid	2022-11-23 09:34:50 +01:00
Lion Kortlepel	dff94a41be	fix potential out of bounds exception in GetPidVid	2022-11-23 09:34:50 +01:00
Lion Kortlepel	79ee5915b4	fix unhandled out of bounds in Authentication	2022-11-23 09:34:50 +01:00
Lion Kortlepel	3fcf23977b	fix fix for out-of-bounds crash, add disconnect messages to some failure conditions	2022-11-23 09:34:50 +01:00
Lion Kortlepel	487917482f	fix out-of-range crash in SendFile when the UnsafeName does not contain a `/`, the server would simply crash, as an invalid substr() index was given, which triggered a std::out_of_range.	2022-11-23 09:34:50 +01:00
Lion Kortlepel	2ca39a7368	fix cmakelists	2022-11-23 09:34:50 +01:00
20dka	9d8aeef423	refactor of vehicle packet handling	2022-11-23 09:34:50 +01:00
20dka	dee7f74906	remove unused PPSMonitor parameter	2022-11-23 09:34:50 +01:00
20dka	66f014ae42	add autocomplete for lua,kick,settings commands	2022-11-23 09:34:50 +01:00
20dka	12245d81a1	fix compilation error and use boost for string lowercase	2022-11-23 09:34:50 +01:00
20dka	a6e0332e3c	add command 'quit' as alternative to 'exit'	2022-11-23 09:34:50 +01:00
20dka	c461a63d9d	update client pointer lock approach	2022-11-23 09:34:50 +01:00
20dka	69726a9b03	add owner check to other vehicle packets	2022-11-23 09:34:50 +01:00
20dka	9acb6951d6	add owner check to position packets	2022-11-23 09:34:50 +01:00
Lion Kortlepel	6ebfe5743c	add :Wait(timeout_s) function to the result of MP.TriggerGlobalEvent	2022-11-23 09:34:50 +01:00
Lion Kortlepel	3c138e2891	change date format from d/m/y to Y/m/d	2022-11-23 09:34:50 +01:00
Lion Kortlepel	2279ba4d6b	attempt to report errors from event triggers	2022-11-23 09:34:50 +01:00
Lion Kortlepel	30b038a6bb	revert adding nil to json it causes issues, not worth it	2022-11-23 09:34:50 +01:00
Lion Kortlepel	c39c7bb0a4	add scripts & dockerfiles to build on multiple platforms	2022-11-23 09:34:50 +01:00
Lion Kortlepel	06b238d63f	remove unused code	2022-11-23 09:34:50 +01:00
Lion Kortlepel	1856dd2002	fix various little things in the json encode and decode	2022-11-23 09:34:50 +01:00
Lion Kortlepel	b068a9b48f	fix TriggerGlobalEvent not passing event arguments correctly (closes #106 )	2022-11-23 09:34:50 +01:00
Lion Kortlepel	e8d66ef983	add git hash to version print on startup this helps us debug issues	2022-11-23 09:34:50 +01:00
Lion Kortlepel	7f47337e1b	modify authkey notice to mention the possibility of entering an invalid key this makes it clear that you may put anything as your key, as long as you only want private servers.	2022-11-23 09:34:50 +01:00
Lion Kortlepel	b0b4dc51b0	fix crash when the header of a TCP packet is negative	2022-11-23 09:34:50 +01:00
Lion Kortlepel	7abfae425d	move around includes to satisfy the magical msvc	2022-11-23 09:34:50 +01:00
Lion Kortlepel	4791af4453	use system_clock::to_time_t instead of high_resolution_clock::*	2022-11-23 09:34:50 +01:00
Lion Kortlepel	a44f9b3dba	fix various build warnings and errors with clang++	2022-11-23 09:34:50 +01:00
Lion Kortlepel	c51d713969	add uuid source files were missed last commit related to uuids	2022-11-23 09:34:50 +01:00
Lion Kortlepel	3781f2960a	add `debug` to the changelog	2022-11-23 09:34:50 +01:00
Lion Kortlepel	9e469b04f1	add Util.GenerateUUID lua api This api generates a pseudorandom RFC 4122 compliant UUID (https://www.ietf.org/rfc/rfc4122.txt). It's pseudorandom, so it is unlikely to have collisions.	2022-11-23 09:34:49 +01:00
Lion Kortlepel	96273e1d06	fix invalid include, reformat TConsole	2022-11-23 09:34:49 +01:00
Lion Kortlepel	c717037895	add `debug` command to track statistics and debug client connections The `debug` command shows info useful to develpers of the client and server	2022-11-23 09:34:49 +01:00
Lion Kortlepel	692129cb81	add ToHumanReadableSize, which formats data sizes into MiB, GiB, etc. this is needed in order to display data sizes in upcoming changes related to tracking statistics about the server's performance	2022-11-23 09:34:49 +01:00
Lion Kortlepel	6842dccfc3	rework UDP recv loop, add packet statistics tracking The UDPServerMain was badly designed and had multiple potential bugs and unexpected & silent failures. The changes simplify the code here, and tracks those unexpected failures in app-wide statistics. Also added, while at that, some more tracking of how many packets and bytes are sent & received per client	2022-11-23 09:34:49 +01:00
Lion Kortlepel	e77dfd5a57	add boost to vcpkg requirements	2022-11-23 09:34:49 +01:00
Lion Kortlepel	54ad1c2715	add `settings` to changelog	2022-11-23 09:34:49 +01:00
Lion Kortlepel	48ce7c9721	add `settings set/get/list/help` console command this makes use of the new settings-in-a-hashmap in order to make changing any settings (except authkey) easy.	2022-11-23 09:34:49 +01:00
Lion Kortlepel	3aa6784627	bump version to 3.2.0	2022-11-23 09:34:49 +01:00
Lion Kortlepel	bec09a4761	change settings to be a hash map instead of a fixed struct this makes adding settings and changing settings incredibly easy, both from the console and from lua.	2022-11-23 09:34:49 +01:00
Lion Kortlepel	7d35595683	potential fix for #141	2022-11-23 09:34:49 +01:00
Lion Kortlepel	982cbf116c	potential fix to #141	2022-11-23 09:34:49 +01:00
Lion Kortlepel	43e70d80d2	fix dockerfie for archlinux	2022-11-23 09:34:49 +01:00
Lion Kortlepel	00a35a636c	add scripts & dockerfiles to build on multiple platforms	2022-11-23 09:34:49 +01:00