test state commit

fix hang and crash caused by client kick
potentially fix ghost car bug
2026-07-13 18:24:16 +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
109 changed files with 4423 additions and 3365 deletions
@@ -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: ''

 ---
@@ -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,152 +0,0 @@
-name: Linux
-
-on: [push]
-
-
-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: 20.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@v2
-        with:
-          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
-          path: ./bin/BeamMP-Server
-
-      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v2
-        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: 20.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@v2
-        with:
-          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
-          path: ./bin/BeamMP-Server
-
-      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v2
-        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,214 +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: 20.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: 20.04
-    env:
-      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
-    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,43 +0,0 @@
-name: Windows
-
-on: [push]
-
-env:
-  VCPKG_DEFAULT_TRIPLET: x64-windows-static
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  CMAKE_BUILD_TYPE: "Release"
-
-jobs:
-  windows-build:
-    runs-on: windows-latest
-    steps:
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Setup vcpkg
-        uses: lukka/run-vcpkg@v11
-        with:
-          runVcpkgInstall: true
-
-      - name: Create Build Environment
-        shell: bash
-        run: ./scripts/windows/1-configure.sh
-
-      - name: Build Server
-        shell: bash
-        run: bash ./scripts/windows/2-build.sh
-
-      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: BeamMP-Server-windows
-          path: ./bin/Release/BeamMP-Server.exe
-
@@ -1,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/BeamMP-Protocol"]
-	path = deps/BeamMP-Protocol
-	url = https://github.com/BeamMP/BeamMP-Protocol
+[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,215 +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)

-add_subdirectory(deps/BeamMP-Protocol)
-
-# 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/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/TPluginMonitor.h
-    include/TScopedTimer.h
-    include/VehicleData.h
-    include/Env.h
-    include/Network.h
-)
-# add all source files (.cpp) to this, except the one with main()
-set(PRJ_SOURCES
-    src/ArgsParser.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/TPluginMonitor.cpp
-    src/TScopedTimer.cpp
-    src/VehicleData.cpp
-    src/Env.cpp
-    src/Network.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
-    protocol
-    ${LUA_LIBRARIES}
-    zstd::libzstd_static
-    Boost::thread
-    glm::glm
-)
-
-# 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 COMPONENTS thread)
-find_package(httplib CONFIG REQUIRED)
-find_package(libzip CONFIG REQUIRED)
-find_package(RapidJSON CONFIG REQUIRED)
-find_package(sol2 CONFIG REQUIRED)
-find_package(toml11 CONFIG REQUIRED)
-find_package(zstd CONFIG REQUIRED)
-find_package(glm CONFIG REQUIRED)
-
-include_directories(include)
-
-# to enable multithreading and the Threads::Threads dependency
-include(FindThreads)
-
-### END SETTINGS ###
-
-# DONT change anything beyond this point unless you've read the cmake bible and 
-# swore on it not to bonk up the ci/cd pipelines with your changes.
-
-####################
-
-
-# enables compile_commands.json for clang-related tools (such as the clang LS)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# build release builds by default (if not specified otherwise)
-if(NOT DEFINED CMAKE_BUILD_TYPE)
-    message(NOTICE "No build type specified, defaulting to 'Release'")
-    set(CMAKE_BUILD_TYPE "Release")
-endif()
-
-if(UNIX)
-    # this will allow to use same _DEBUG macro available in both Linux as well as Windows - MSCV environment. Easy to put Debug specific code.
-    add_compile_options("$<$<CONFIG:DEBUG>:-D_DEBUG>")
-endif(UNIX)
-
-if (WIN32)
-    add_compile_options("-D_WIN32_WINNT=0x0601")
-endif(WIN32)
-
-
-include(cmake/CompilerWarnings.cmake)
-
-# set MT library for msvc - this is required (says documentation)
-# linux/mac/etc should simply ignore this by default.
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-
-set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
-    PRJ_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
-    PRJ_VERSION_MINOR=${PROJECT_VERSION_MINOR}
-    PRJ_VERSION_PATCH=${PROJECT_VERSION_PATCH}
-)
-
-# build commandline manually for funky windows flags to carry over without a custom toolchain file
-add_library(commandline_static 
-    deps/commandline/src/impls.h
-    deps/commandline/src/windows_impl.cpp
-    deps/commandline/src/linux_impl.cpp
-    deps/commandline/src/backends/InteractiveBackend.cpp
-    deps/commandline/src/backends/InteractiveBackend.h
-    deps/commandline/src/backends/Backend.cpp
-    deps/commandline/src/backends/Backend.h
-    deps/commandline/src/commandline.h
-    deps/commandline/src/commandline.cpp
-    deps/commandline/src/backends/BufferedBackend.cpp
-    deps/commandline/src/backends/BufferedBackend.h
-)
-if (WIN32)
-    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1)
-else ()
-    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_LINUX=1)
+# ------------------------ 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
+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
 )

-if(MSVC)
-    target_link_options(${PROJECT_NAME} PRIVATE "/SUBSYSTEM:CONSOLE")
-endif(MSVC)
+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"
+)

-# setup all warnings (from cmake/CompilerWarnings.cmake)
-set_project_warnings(${PROJECT_NAME})
+set(BeamMP_Definitions
+    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
+    BEAMMP_GIT_HASH="${GIT_HASH}"
+    LK_RESULT_USE_FMT
+)

-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)
+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()

@@ -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
@@ -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)

@@ -42,7 +43,7 @@ We only allow building unmodified (original) source code for public use. `master

 ## Supported Operating Systems

-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and 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,37 +51,128 @@ 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. Run CMake `cmake -S . -B bin -DCMAKE_BUILD_TYPE=Release` - this can take a few minutes and may take a lot of disk space and bandwidth.
-4. Build via `cmake --build bin --parallel --config Release -t BeamMP-Server`.
-5. Your executable can be found in `bin/`.
-
-When you make changes to the code, you only have to run step 4 again.
-
-### 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. 
@@ -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=ctor-dtor-privacy
-            -Wno-missing-field-initializers
-            -Wswitch-default
-            -Werror=unused-result
-            -Werror=implicit-fallthrough
-            -Werror=return-type
-            -Wmissing-include-dirs
-    )
-
-    if (${PROJECT_NAME}_WARNINGS_AS_ERRORS)
-        set(CLANG_WARNINGS ${CLANG_WARNINGS} -Werror)
-        set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)
-    endif()
-
-    set(GCC_WARNINGS
-            ${CLANG_WARNINGS}
-            -Wmisleading-indentation # warn if indentation implies blocks where blocks
-                                                             # do not exist
-            -Wduplicated-cond # warn if if / else chain has duplicated conditions
-            -Wduplicated-branches # warn if if / else branches have duplicated code
-            -Wlogical-op     # warn about logical operations being used where bitwise were
-                                         # probably wanted
-            # -Wuseless-cast # warn if you perform a cast to the same type (modified: removed)
-    )
-
-    if(MSVC)
-        set(PRJ_WARNINGS ${MSVC_WARNINGS})
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
-        set(PRJ_WARNINGS ${CLANG_WARNINGS})
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        set(PRJ_WARNINGS ${GCC_WARNINGS})
-    else()
-        message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
-    endif()
-
-    target_compile_options(${project_name} PUBLIC ${PRJ_WARNINGS})
-
-    if(NOT TARGET ${project_name})
-        message(AUTHOR_WARNING "${project_name} is not a target, thus no compiler warning were added.")
-    endif()
-endfunction()
@@ -1,21 +0,0 @@
-find_package(Git)
-if(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES)
-    if(Git_FOUND)
-        message(STATUS "Git found, submodule update and init")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
-                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
-        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-            message(SEND_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules. This may result in missing dependencies.")
-        endif()
-    else()
-        message(SEND_ERROR "git required for checking out submodules, but not found. Submodules will not be checked out - this may result in missing dependencies.")
-    endif()
-endif()
-
-if(Git_FOUND)
-
-else()
-    message(STATUS "Git not found - the version will not include a git hash.")
-    set(PRJ_GIT_HASH "unknown")
-endif()
@@ -1,44 +0,0 @@
-# Modified, original version from https://github.com/filipdutescu/modern-cpp-template (Unlicense)
-
-option(${PROJECT_NAME}_WARNINGS_AS_ERRORS "Treat compiler warnings as errors." OFF)
-option(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES "If git is found, initialize all submodules." ON)
-option(${PROJECT_NAME}_ENABLE_UNIT_TESTING "Enable unit tests for the projects (from the `test` subfolder)." ON)
-option(${PROJECT_NAME}_ENABLE_CLANG_TIDY "Enable static analysis with Clang-Tidy." OFF)
-option(${PROJECT_NAME}_ENABLE_CPPCHECK "Enable static analysis with Cppcheck." OFF)
-# TODO Implement code coverage
-# option(${PROJECT_NAME}_ENABLE_CODE_COVERAGE "Enable code coverage through GCC." OFF)
-option(${PROJECT_NAME}_ENABLE_DOXYGEN "Enable Doxygen documentation builds of source." OFF)
-
-# Generate compile_commands.json for clang based tools
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# Export all symbols when building a shared library
-if(BUILD_SHARED_LIBS)
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF)
-    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
-endif()
-
-option(${PROJECT_NAME}_ENABLE_LTO "Enable Interprocedural Optimization, aka Link Time Optimization (LTO)." OFF)
-if(${PROJECT_NAME}_ENABLE_LTO)
-    include(CheckIPOSupported)
-    check_ipo_supported(RESULT result OUTPUT output)
-    if(result)
-        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-    else()
-        message(SEND_ERROR "IPO is not supported: ${output}.")
-    endif()
-endif()
-
-option(${PROJECT_NAME}_ENABLE_CCACHE "Enable the usage of Ccache, in order to speed up rebuild times." ON)
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif()
-
-option(${PROJECT_NAME}_ENABLE_SANITIZER "Enable sanitizer to detect memory errors, undefined behavior, etc. (slows down the executable)." OFF)
-if(${PROJECT_NAME}_ENABLE_SANITIZER)
-    add_compile_options(-fsanitize=address,undefined)
-    add_link_options(-fsanitize=address,undefined)
-endif()
@@ -1,20 +0,0 @@
-if(${PROJECT_NAME}_ENABLE_CLANG_TIDY)
-  find_program(CLANGTIDY clang-tidy)
-  if(CLANGTIDY)
-    set(CMAKE_CXX_CLANG_TIDY ${CLANGTIDY} -extra-arg=-Wno-unknown-warning-option)
-    message("Clang-Tidy finished setting up.")
-  else()
-    message(SEND_ERROR "Clang-Tidy requested but executable not found.")
-  endif()
-endif()
-
-if(${PROJECT_NAME}_ENABLE_CPPCHECK)
-  find_program(CPPCHECK cppcheck)
-  if(CPPCHECK)
-    set(CMAKE_CXX_CPPCHECK ${CPPCHECK} --suppress=missingInclude --enable=all
-                           --inline-suppr --inconclusive)
-    message("Cppcheck finished setting up.")
-  else()
-    message(SEND_ERROR "Cppcheck requested but executable not found.")
-  endif()
-endif()
@@ -1,17 +0,0 @@
-if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-    if(NOT EXISTS ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
-        find_package(Git)
-        if(Git_FOUND)
-            execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive vcpkg
-                            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                            RESULT_VARIABLE GIT_SUBMOD_RESULT)
-            if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-                message(SEND_ERROR "Checking out vcpkg in source tree failed with ${GIT_SUBMOD_RESULT}.")
-            endif()
-        else()
-            message(FATAL_ERROR "Could not find git or vcpkg.cmake. Please either, install git and re-run cmake (or run `git submodule update --init --recursive`), or install vcpkg and add `-DCMAKE_TOOLCHAIN_FILE=<path-to-vcpkg>/scripts/buildsystems/vcpkg.cmake` to your cmake invocation. Please try again after making those changes.")
-        endif()
-    endif()
-    set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
-endif()
-
@@ -0,0 +1,6 @@
+include_directories("${PROJECT_SOURCE_DIR}/deps")
+
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/commandline")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/fmt")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/sol2")
+add_subdirectory("${PROJECT_SOURCE_DIR}/deps/doctest")
@@ -0,0 +1,138 @@
+#pragma once
+
+#include <chrono>
+#include <memory>
+#include <optional>
+#include <queue>
+#include <string>
+#include <unordered_set>
+
+#include "BoostAliases.h"
+#include "Common.h"
+#include "Compat.h"
+#include "TResourceManager.h"
+#include "VehicleData.h"
+
+class TServer;
+
+#ifdef BEAMMP_WINDOWS
+// for socklen_t
+#include <WS2tcpip.h>
+#endif // WINDOWS
+
+struct TConnection final {
+    ip::tcp::socket Socket;
+    ip::tcp::endpoint SockAddr;
+};
+
+class TClient final {
+public:
+    using TSetOfVehicleData = std::vector<TVehicleData>;
+
+    struct TVehicleDataLockPair {
+        TSetOfVehicleData* VehicleData;
+        std::unique_lock<std::mutex> Lock;
+    };
+
+    TClient(TServer& Server, ip::tcp::socket&& Socket);
+    TClient(const TClient&) = delete;
+    ~TClient();
+    TClient& operator=(const TClient&) = delete;
+
+    void AddNewCar(int Ident, const std::string& Data);
+    void SetCarData(int Ident, const std::string& Data);
+    void SetCarPosition(int Ident, const std::string& Data);
+    TVehicleDataLockPair GetAllCars();
+    void SetName(const std::string& Name) { mName = Name; }
+    void SetRoles(const std::string& Role) { mRole = Role; }
+    void SetIdentifier(const std::string& key, const std::string& value) { mIdentifiers[key] = value; }
+    std::string GetCarData(int Ident);
+    std::string GetCarPositionRaw(int Ident);
+    void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
+    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
+    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
+    void Disconnect(std::string_view Reason);
+    bool IsDisconnected() const { return !mSocket.is_open(); }
+    // locks
+    void DeleteCar(int Ident);
+    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
+    [[nodiscard]] const ip::udp::endpoint& GetUDPAddr() const { return mUDPAddress; }
+    [[nodiscard]] ip::udp::endpoint& GetUDPAddr() { return mUDPAddress; }
+    [[nodiscard]] ip::tcp::socket& GetDownSock() { return mDownSocket; }
+    [[nodiscard]] const ip::tcp::socket& GetDownSock() const { return mDownSocket; }
+    [[nodiscard]] ip::tcp::socket& GetTCPSock() { return mSocket; }
+    [[nodiscard]] const ip::tcp::socket& GetTCPSock() const { return mSocket; }
+    [[nodiscard]] std::string GetRoles() const { return mRole; }
+    [[nodiscard]] std::string GetName() const { return mName; }
+    void SetUnicycleID(int ID) { mUnicycleID = ID; }
+    void SetID(int ID) { mID = ID; }
+    [[nodiscard]] int GetOpenCarID() const;
+    [[nodiscard]] int GetCarCount() const;
+    void ClearCars();
+    [[nodiscard]] int GetID() const { return mID; }
+    [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
+    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; }
+    void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
+    void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
+    void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
+    void EnqueuePacket(const std::vector<uint8_t>& Packet);
+    [[nodiscard]] std::queue<std::vector<uint8_t>>& MissedPacketQueue() { return mPacketsSync; }
+    [[nodiscard]] const std::queue<std::vector<uint8_t>>& MissedPacketQueue() const { return mPacketsSync; }
+    [[nodiscard]] size_t MissedPacketQueueSize() const { return mPacketsSync.size(); }
+    [[nodiscard]] std::mutex& MissedPacketQueueMutex() const { return mMissedPacketsMutex; }
+    void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
+    [[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 mIsConnected = false;
+    bool mIsSynced = false;
+    bool mIsSyncing = false;
+    mutable std::mutex mMissedPacketsMutex;
+    std::queue<std::vector<uint8_t>> mPacketsSync;
+    std::unordered_map<std::string, std::string> mIdentifiers;
+    bool mIsGuest = false;
+    mutable std::mutex mVehicleDataMutex;
+    mutable std::mutex mVehiclePositionMutex;
+    TSetOfVehicleData mVehicleData;
+    SparseArray<std::string> mVehiclePosition;
+    std::string mName = "Unknown Client";
+    ip::tcp::socket mSocket;
+    ip::tcp::socket mDownSocket;
+    ip::udp::endpoint mUDPAddress {};
+    int mUnicycleID = -1;
+    std::string mRole;
+    std::string mDID;
+    int mID = -1;
+    std::chrono::time_point<TimeType> mLastPingTime;
+    std::mutex mDisconnectMtx;
+};
+
+// Returns a valid client, or nullptr if no such client exists
+std::shared_ptr<TClient> GetClient(class TServer& Server, int ID);
@@ -1,5 +1,9 @@
 #pragma once

+#include "CustomAssert.h"
+#include "TSentry.h"
+extern TSentry Sentry;
+
 #include <array>
 #include <atomic>
 #include <cstring>
@@ -20,6 +24,50 @@ namespace fs = std::filesystem;

 #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;
@@ -32,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
@@ -40,32 +94,17 @@ using SparseArray = std::unordered_map<size_t, T>;
 class Application final {
 public:
    // types
-    struct TSettings {
-        std::string ServerName { "BeamMP Server" };
-        std::string ServerDesc { "BeamMP Default Description" };
-        std::string ServerTags { "Freeroam" };
-        std::string Resource { "Resources" };
-        std::string MapName { "/levels/gridmap_v2/info.json" };
-        std::string Key {};
-        std::string Password{};
-        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
-        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
-        bool HTTPServerEnabled { false };
-        int MaxPlayers { 8 };
-        bool Private { true };
-        int MaxCars { 1 };
-        bool DebugModeEnabled { false };
-        int Port { 30814 };
-        std::string CustomIP {};
-        bool LogChat { true };
-        bool SendErrors { true };
-        bool SendErrorsMessageEnabled { true };
-        int HTTPServerPort { 8080 };
-        std::string HTTPServerIP { "127.0.0.1" };
-        bool HTTPServerUseSSL { false };
-        bool HideUpdateMessages { false };
-        [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
-    };
+
+    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()>;

@@ -76,15 +115,13 @@ 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 uint8_t ClientMajorVersion() { return 2; }
    static std::string PPS() { return mPPS; }
    static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }

-    static TSettings Settings;
-
    static std::vector<std::string> GetBackendUrlsInOrder() {
        return {
            "backend.beammp.com",
@@ -102,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 {
@@ -122,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, 2, 2 };
+    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__)
@@ -146,6 +193,7 @@ 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()
@@ -186,40 +234,88 @@ void RegisterThread(const std::string& str);

    #endif // defined(DEBUG)
    
-    #define beammp_warn(x) Application::Console().Write(_this_location + std::string("[WARN] ") + (x))
-    #define beammp_info(x) Application::Console().Write(_this_location + std::string("[INFO] ") + (x))
-    #define beammp_error(x)                                                               \
-        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_warn(x)                                                               \
-        do {                                                                                 \
-            Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (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 luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
-    #define beammp_debug(x)                                                                   \
-        do {                                                                                  \
-            if (Application::Settings.DebugModeEnabled) {                                     \
-                Application::Console().Write(_this_location + std::string("[DEBUG] ") + (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 beammp_event(x)                                                                   \
-        do {                                                                                  \
-            if (Application::Settings.DebugModeEnabled) {                                     \
-                Application::Console().Write(_this_location + std::string("[EVENT] ") + (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 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.DebugModeEnabled) {                                     \
-                    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)
@@ -265,5 +361,59 @@ void RegisterThread(const std::string& str);

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

+#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
+
+std::string ToHumanReadableSize(size_t Size);
@@ -63,10 +63,12 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
        bool result = (cond);                                                          \
        if (!result) {                                                                 \
            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
+            Sentry.LogAssert(#cond, _file_basename, _line, __func__);                  \
        }                                                                              \
    } while (false)
-#define beammp_assert_not_reachable()                                                      \
-    do {                                                                                   \
+#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,16 +0,0 @@
-#pragma once
-
-#include <optional>
-#include <string>
-namespace Env {
-
-enum class Key {
-    // provider settings
-    PROVIDER_UPDATE_MESSAGE,
-};
-
-std::optional<std::string> Get(Key key);
-
-std::string_view ToString(Key key);
-
-}
@@ -1,6 +1,5 @@
 #pragma once

-#include <boost/thread/scoped_thread.hpp>
 #include <thread>

 // pure virtual class to be inherited from by classes which intend to be threaded
@@ -9,15 +8,17 @@ public:
    IThreaded()
        // invokes operator() on this object
        : mThread() { }
-    virtual ~IThreaded() noexcept {
-        mThread.interrupt();
+    ~IThreaded() noexcept {
+        if (mThread.joinable()) {
+            mThread.join();
+        }
    }

    virtual void Start() final {
-        mThread = boost::scoped_thread<>([this] { (*this)(); });
+        mThread = std::thread([this] { (*this)(); });
    }
    virtual void operator()() = 0;

 protected:
-    boost::scoped_thread<> mThread {};
+    std::thread mThread;
 };
@@ -0,0 +1,6 @@
+#pragma once
+
+enum IterationDecision {
+    Continue,
+    Break,
+};
@@ -3,7 +3,7 @@
 //

 #pragma once
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/prettywriter.h"
 #include "rapidjson/document.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
@@ -14,7 +14,7 @@ namespace MP {
    std::tuple<int, int, int> GetServerVersion();
    std::pair<bool, std::string> TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& Data);
    std::pair<bool, std::string> TriggerClientEventJson(int PlayerID, const std::string& EventName, const sol::table& Data);
-    inline size_t GetPlayerCount() { return Engine->Network()->authenticated_client_count(); }
+    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> RemoveVehicle(int PlayerID, int VehicleID);
@@ -1,250 +0,0 @@
-#pragma once
-
-#include "Common.h"
-#include "Packet.h"
-#include "State.h"
-#include "Sync.h"
-#include "Transport.h"
-#include "Util.h"
-#include <boost/asio.hpp>
-#include <boost/asio/execution_context.hpp>
-#include <boost/asio/thread_pool.hpp>
-#include <boost/thread/scoped_thread.hpp>
-#include <boost/thread/synchronized_value.hpp>
-#include <cstdint>
-#include <filesystem>
-#include <glm/detail/qualifier.hpp>
-#include <glm/vec3.hpp>
-#include <glm/vec4.hpp>
-#include <memory>
-#include <mutex>
-#include <nlohmann/json.hpp>
-#include <optional>
-#include <unordered_map>
-#include <vector>
-
-using ClientID = uint32_t;
-using VehicleID = uint16_t;
-
-using namespace boost::asio;
-
-struct Client : std::enable_shared_from_this<Client> {
-    using StrandPtr = std::shared_ptr<boost::asio::strand<ip::tcp::socket::executor_type>>;
-    using Ptr = std::shared_ptr<Client>;
-
-    ClientID id;
-    Sync<bmp::State> state { bmp::State::None };
-
-    Sync<std::string> name;
-    Sync<std::string> role;
-    Sync<bool> is_guest;
-    Sync<std::unordered_map<std::string /* identifier */, std::string /* value */>> identifiers;
-    /// Writes the packet to the TCP stream. Blocks all other writes.
-    void tcp_write(bmp::Packet& packet);
-    /// Writes the specified to the TCP stream without a header or any metadata - use in
-    /// conjunction with something else. Blocks other writes.
-    void tcp_write_file_raw(const std::filesystem::path& path);
-
-    /// Ensures no client is ever created as a non-shared-ptr, so that enable_shared_from_this works.
-    static Client::Ptr make_ptr(ClientID new_id, class Network& network, ip::tcp::socket&& tcp_socket);
-    ~Client();
-
-    ip::tcp::socket& tcp_socket() { return m_tcp_socket; }
-
-    void start_tcp();
-
-    /// Used to associate the udp socket with this client.
-    /// This isn't very secure and still allows spoofing of the UDP connection (technically),
-    /// but better than simply using the ID like the old protocol.
-    const uint64_t udp_magic;
-
-    const ip::udp::endpoint& udp_endpoint() const { return m_udp_endpoint; }
-    void set_udp_endpoint(const ip::udp::endpoint& ep) { m_udp_endpoint = ep; }
-
-private:
-    /// Ctor must be private to ensure all clients are constructed as shared_ptr to enable_shared_from_this.
-    Client(ClientID id, class Network& network, ip::tcp::socket&& tcp_socket);
-    /// Call this when the client seems to have timed out. Will send a ping and set a flag.
-    /// Returns true if try-again, false if the connection was closed.
-    [[nodiscard]] bool handle_timeout();
-    bool m_timed_out { false };
-
-    /// Timeout used for typical tcp reads.
-    boost::posix_time::milliseconds m_read_timeout { 5000 };
-    /// Timeout used for typical tcp writes. Specified in milliseconds per byte.
-    /// For example, 10 mbit/s works out to 1250 B/ms, so a value of 1250 here would
-    /// cause clients with >10 mbit/s download speed to usually not time out.
-    /// This is done because a write is considered completed when all data is written,
-    /// and worst-case this could mean that we're limited by their download speed.
-    /// We're setting it to 50, which will drop clients who are below a download speed + ping
-    /// combination of 0.4 mbit/s.
-    double m_write_byte_timeout { 0.01 };
-    /// Timeout used for mod download tcp writes.
-    /// This is typically orders of magnitude larger
-    /// to allow for slow downloads.
-    boost::posix_time::milliseconds m_download_write_timeout { 60000 };
-
-    std::mutex m_tcp_read_mtx;
-    std::mutex m_tcp_write_mtx;
-    std::mutex m_udp_read_mtx;
-
-    ip::tcp::socket m_tcp_socket;
-
-    boost::scoped_thread<> m_tcp_thread;
-
-    std::vector<uint8_t> m_header { bmp::Header::SERIALIZED_SIZE };
-    bmp::Packet m_packet {};
-
-    ip::udp::endpoint m_udp_endpoint;
-
-    class Network& m_network;
-
-    StrandPtr m_tcp_strand;
-};
-
-struct Vehicle {
-    using Ptr = std::shared_ptr<Vehicle>;
-    Sync<ClientID> owner;
-    Sync<std::vector<uint8_t>> data;
-
-    Vehicle(std::span<uint8_t> raw_data)
-        : data(std::vector<uint8_t>(raw_data.begin(), raw_data.end())) {
-        reset_status(data.get());
-    }
-
-    /// Resets all status fields to zero and reads any statuses present in the data into the fields.
-    void reset_status(std::span<const uint8_t> status_data);
-
-    struct Status {
-        glm::vec3 rvel {};
-        glm::vec4 rot {};
-        glm::vec3 vel {};
-        glm::vec3 pos {};
-        float time {};
-    };
-
-    Status get_status();
-
-    void update_status(std::span<const uint8_t> raw_packet);
-
-    const std::vector<uint8_t>& get_raw_status() const { return m_status_data; }
-
-private:
-    std::recursive_mutex m_mtx;
-
-    /// Holds pos, rvel, vel, etc. raw, updated every time
-    /// such a packet arrives.
-    std::vector<uint8_t> m_status_data;
-
-    /// Parses the status_data on request sets needs_refresh = false.
-    void refresh_cache(std::unique_lock<std::recursive_mutex>& lock);
-
-    bool m_needs_refresh = false;
-    glm::vec3 m_rvel {};
-    glm::vec4 m_rot {};
-    glm::vec3 m_vel {};
-    glm::vec3 m_pos {};
-    float m_time {};
-};
-
-class Network {
-public:
-    Network();
-    ~Network();
-
-    friend Client;
-
-    void disconnect(ClientID id, const std::string& msg);
-
-    void send_to(ClientID id, bmp::Packet& packet);
-
-    /// Returns a map of <id, client> containing only clients which are
-    /// fully connected, i.e. who have mods downloaded and everything spawned in.
-    /// If you're unsure which to use, use this one.
-    std::unordered_map<ClientID, Client::Ptr> playing_clients() const;
-    /// Returns a map of <id, client> containing only clients who are authenticated.
-    std::unordered_map<ClientID, Client::Ptr> authenticated_clients() const;
-    /// Returns all clients, including non-authenticated clients. Use only for debugging,
-    /// information, stats, status.
-    std::unordered_map<ClientID, Client::Ptr> all_clients() const;
-
-    std::optional<Client::Ptr> get_client(ClientID id, bmp::State min_state) const;
-
-    std::unordered_map<VehicleID, Vehicle::Ptr> get_vehicles_owned_by(ClientID id);
-
-    std::optional<Vehicle::Ptr> get_vehicle(VehicleID id);
-
-    /// Builds the SessionSetup.PlayersInfo json which contains all player info and all vehicles.
-    nlohmann::json build_players_info();
-
-    size_t authenticated_client_count() const;
-
-    size_t clients_in_state_count(bmp::State state) const;
-
-    size_t guest_count() const;
-
-    size_t vehicle_count() const;
-
-    /// Creates a Playing state packet from uncompressed data.
-    bmp::Packet make_playing_packet(bmp::Purpose purpose, ClientID from_id, VehicleID veh_id, const std::vector<uint8_t>& data);
-
-    /// Sends a <System> or <Server> chat message to all or only one client(s).
-    void send_system_chat_message(const std::string& msg, ClientID to = 0xffffffff);
-
-    /// To be called by accept() async handler once an accept() is completed.
-    void accept();
-
-    /// Gets the async i/o context of the network - can be used to "schedule" tasks on it.
-    boost::asio::thread_pool& context() {
-        return m_threadpool;
-    }
-
-private:
-    void handle_packet(ClientID id, const bmp::Packet& packet);
-
-    /// Reads a packet from the given UDP socket, returning the client's endpoint as an out-argument.
-    bmp::Packet udp_read(ip::udp::endpoint& out_ep);
-    /// Sends a packet to the specified UDP endpoint via the UDP socket.
-    void udp_write(bmp::Packet& packet, const ip::udp::endpoint& ep);
-
-    void udp_read_main();
-    void tcp_listen_main();
-
-    /// Handles all packets which are allowed during the Identification state.
-    void handle_identification(ClientID id, const bmp::Packet& packet, std::shared_ptr<Client>& client);
-    /// Handles all packets which are allowed during the Authentication state.
-    void handle_authentication(ClientID id, const bmp::Packet& packet, std::shared_ptr<Client>& client);
-    /// Handles all packets which are allowed during the ModDownload state.
-    void handle_mod_download(ClientID id, const bmp::Packet& packet, std::shared_ptr<Client>& client);
-    /// Handles all packets which are allowed during the SessionSetup state.
-    void handle_session_setup(ClientID id, const bmp::Packet& packet, std::shared_ptr<Client>& client);
-    /// Handles all packets which are allowed during the Playing state.
-    void handle_playing(ClientID id, const bmp::Packet& packet, std::shared_ptr<Client>& client);
-
-    /// On failure, throws an exception with the error for the client.
-    static void authenticate_user(const std::string& public_key, std::shared_ptr<Client>& client);
-
-    /// Called by accept() once completed (completion handler).
-    void handle_accept(const boost::system::error_code& ec);
-
-    Sync<std::unordered_map<ClientID, Client::Ptr>> m_clients {};
-    Sync<std::unordered_map<VehicleID, Vehicle::Ptr>> m_vehicles {};
-    Sync<std::unordered_map<uint64_t, ClientID>> m_client_magics {};
-    Sync<std::unordered_map<ip::udp::endpoint, ClientID>> m_udp_endpoints {};
-
-    ClientID new_client_id();
-    VehicleID new_vehicle_id();
-
-    thread_pool m_threadpool { std::thread::hardware_concurrency() };
-    Sync<bool> m_shutdown { false };
-
-    ip::udp::socket m_udp_socket { m_threadpool };
-
-    ip::tcp::socket m_tcp_listener { m_threadpool };
-    ip::tcp::acceptor m_tcp_acceptor { m_threadpool };
-    /// This socket gets accepted into, and is then moved.
-    ip::tcp::socket m_temp_socket { m_threadpool };
-
-    boost::scoped_thread<> m_tcp_listen_thread;
-    boost::scoped_thread<> m_udp_read_thread;
-};
@@ -6,8 +6,8 @@
 * and write locks and read locks are mutually exclusive.
 */

-#include <shared_mutex>
 #include <mutex>
+#include <shared_mutex>

 // Use ReadLock(m) and WriteLock(m) to lock it.
 using RWMutex = std::shared_mutex;
@@ -1,10 +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>;
-
@@ -6,7 +6,7 @@
 #include <filesystem>

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

 namespace fs = std::filesystem;

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

    void ParseOldFormat();
-    std::string TagsAsPrettyArray() const;
    bool IsDefault();
    bool mFailed { false };
    std::string mConfigFileName;
@@ -1,40 +1,14 @@
 #pragma once

 #include "Cryptography.h"
-#include "TScopedTimer.h"
 #include "commandline.h"
 #include <atomic>
 #include <fstream>
 #include <functional>
-#include <mutex>
 #include <string>
 #include <tuple>
 #include <unordered_map>
 #include <vector>
-#include <boost/container/deque.hpp>
-#include <boost/thread/scoped_thread.hpp>
-#include <boost/thread/synchronized_value.hpp>
-#include <memory>
-#include <optional>
-#include <span>
-#include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
-#include <spdlog/sinks/sink.h>
-#include <string>
-#include <string_view>
-
-class TConsole;
-
-class ConsoleSink : public spdlog::sinks::base_sink<spdlog::details::null_mutex> {
-public:
-    ConsoleSink(TConsole& console);
-
-private:
-    void sink_it_(const spdlog::details::log_msg& msg) override;
-    void flush_() override;
-
-    TConsole* m_console;
-};

 class TLuaEngine;

@@ -42,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);
@@ -65,6 +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_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);
@@ -81,10 +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); } },
+        { "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 };
@@ -94,5 +79,4 @@ private:
    const std::string mDefaultStateId = "BEAMMP_SERVER_CONSOLE";
    std::ofstream mLogFileStream;
    std::mutex mLogFileStreamMtx;
-    TScopedTimer mUptimeTimer{};
 };
@@ -2,11 +2,12 @@

 #include "Common.h"
 #include "IThreaded.h"
-#include "Network.h"
+#include "TResourceManager.h"
+#include "TServer.h"

 class THeartbeatThread : public IThreaded {
 public:
-    THeartbeatThread(std::shared_ptr<Network> network);
+    THeartbeatThread(TResourceManager& ResourceManager, TServer& Server);
    //~THeartbeatThread();
    void operator()() override;

@@ -14,5 +15,6 @@ private:
    std::string GenerateCall();
    std::string GetPlayers();

-    std::shared_ptr<Network> m_network;
+    TResourceManager& mResourceManager;
+    TServer& mServer;
 };
@@ -1,10 +1,8 @@
 #pragma once

-#include "Common.h"
-#include "IThreaded.h"
-#include "Network.h"
+#include "TNetwork.h"
+#include "TServer.h"
 #include <any>
-#include <boost/thread/scoped_thread.hpp>
 #include <condition_variable>
 #include <filesystem>
 #include <initializer_list>
@@ -12,27 +10,49 @@
 #include <lua.hpp>
 #include <memory>
 #include <mutex>
+#include <nlohmann/json.hpp>
 #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(...)                                                                                                                                                                                                                                                  \
+    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 {
+    std::string value;
+};
+
+// value used to keep nils in a table or array, across serialization boundaries like
+// JsonEncode, so that the nil stays at the same index and isn't treated like a special
+// value (e.g. one that can be ignored or discarded).
+const inline std::string BEAMMP_INTERNAL_NIL = "BEAMMP_SERVER_INTERNAL_NIL_VALUE";
+
 using TLuaStateId = std::string;
 namespace fs = std::filesystem;
 /**
 * std::variant means, that TLuaArgTypes may be one of the Types listed as template args
 */
-using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool, std::unordered_map<std::string, std::string>>;
-static constexpr size_t TLuaArgTypes_String = 0;
-static constexpr size_t TLuaArgTypes_Int = 1;
-static constexpr size_t TLuaArgTypes_VariadicArgs = 2;
-static constexpr size_t TLuaArgTypes_Bool = 3;
-static constexpr size_t TLuaArgTypes_StringStringMap = 4;
+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,
+    StringSizeTMap = 5,
+    Float = 6,
+};

 class TLuaPlugin;

@@ -43,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();
 };

@@ -70,7 +83,7 @@ struct TLuaChunk {
    std::string PluginPath;
 };

-class TLuaEngine : public std::enable_shared_from_this<TLuaEngine> {
+class TLuaEngine : public std::enable_shared_from_this<TLuaEngine>, IThreaded {
 public:
    enum CallStrategy : int {
        BestEffort,
@@ -80,7 +93,7 @@ public:
    struct QueuedFunction {
        std::string FunctionName;
        std::shared_ptr<TLuaResult> Result;
-        std::vector<TLuaArgTypes> Args;
+        std::vector<TLuaValue> Args;
        std::string EventName; // optional, may be empty
    };

@@ -89,11 +102,13 @@ public:
        beammp_debug("Lua Engine terminated");
    }

-    void Start();
+    void operator()() override;

-    std::shared_ptr<::Network> Network() { return mNetwork; }
+    TNetwork& Network() { return *mNetwork; }
+    TServer& Server() { return *mServer; }

-    void SetNetwork(const std::shared_ptr<::Network>& network) { mNetwork = network; }
+    void SetNetwork(TNetwork* Network) { mNetwork = Network; }
+    void SetServer(TServer* Server) { mServer = Server; }

    size_t GetResultsToCheckSize() {
        std::unique_lock Lock(mResultsToCheckMutex);
@@ -127,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<TLuaArgTypes>& Args);
+    [[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);
    /**
@@ -151,7 +166,7 @@ public:
        }

        std::vector<std::shared_ptr<TLuaResult>> Results;
-        std::vector<TLuaArgTypes> Arguments { TLuaArgTypes { std::forward<ArgsT>(Args) }... };
+        std::vector<TLuaValue> Arguments { TLuaValue { std::forward<ArgsT>(Args) }... };

        for (const auto& Event : mLuaEvents.at(EventName)) {
            for (const auto& Function : Event.second) {
@@ -170,7 +185,7 @@ public:
            return {};
        }
        std::vector<std::shared_ptr<TLuaResult>> Results;
-        std::vector<TLuaArgTypes> Arguments { TLuaArgTypes { std::forward<ArgsT>(Args) }... };
+        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));
@@ -201,17 +216,17 @@ private:
    void FindAndParseConfig(const fs::path& Folder, TLuaPluginConfig& Config);
    size_t CalculateMemoryUsage();

-    class StateThreadData {
+    class StateThreadData : IThreaded {
    public:
        StateThreadData(const std::string& Name, TLuaStateId StateId, TLuaEngine& Engine);
        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<TLuaArgTypes>& Args);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy);
+        [[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
-        void Start();
+        void operator()() override;
        sol::state_view State() { return sol::state_view(mState); }

        std::vector<std::string> GetStateGlobalKeys();
@@ -221,8 +236,6 @@ private:
        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
        std::vector<TLuaEngine::QueuedFunction> Debug_GetStateFunctionQueue();

-        sol::table Lua_JsonDecode(const std::string& str);
-
    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);
@@ -230,8 +243,9 @@ private:
        sol::table Lua_GetPlayers();
        std::string Lua_GetPlayerName(int ID);
        sol::table Lua_GetPlayerVehicles(int ID);
-        std::pair<sol::table, std::string> Lua_GetVehicleStatus(int VID);
+        std::pair<sol::table, std::string> Lua_GetPositionRaw(int PID, int VID);
        sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
+        sol::table Lua_JsonDecode(const std::string& str);
        int Lua_GetPlayerIDByName(const std::string& Name);
        sol::table Lua_FS_ListFiles(const std::string& Path);
        sol::table Lua_FS_ListDirectories(const std::string& Path);
@@ -239,6 +253,7 @@ private:
        std::string mName;
        TLuaStateId mStateId;
        lua_State* mState;
+        std::thread mThread;
        std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> mStateExecuteQueue;
        std::recursive_mutex mStateExecuteQueueMutex;
        std::vector<QueuedFunction> mStateFunctionQueue;
@@ -250,12 +265,12 @@ private:
        std::recursive_mutex mPathsMutex;
        std::mt19937 mMersenneTwister;
        std::uniform_real_distribution<double> mUniformRealDistribution01;
-        boost::scoped_thread<> mThread;
+        std::vector<sol::object> JsonStringToArray(JsonString Str);
    };

    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;
@@ -263,7 +278,8 @@ private:
        void Reset();
    };

-    std::shared_ptr<::Network> mNetwork;
+    TNetwork* mNetwork;
+    TServer* mServer;
    const fs::path mResourceServerPath;
    std::vector<std::shared_ptr<TLuaPlugin>> mLuaPlugins;
    std::unordered_map<TLuaStateId, std::unique_ptr<StateThreadData>> mLuaStates;
@@ -275,7 +291,6 @@ private:
    std::list<std::shared_ptr<TLuaResult>> mResultsToCheck;
    std::mutex mResultsToCheckMutex;
    std::condition_variable mResultsToCheckCond;
-    boost::scoped_thread<> mThread;
 };

 // std::any TriggerLuaEvent(const std::string& Event, bool local, TLuaPlugin* Caller, std::shared_ptr<TLuaArg> arg, bool Wait);
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "BoostAliases.h"
+#include "Compat.h"
+#include "TResourceManager.h"
+#include "TServer.h"
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/udp.hpp>
+
+struct TConnection;
+
+class TNetwork {
+public:
+    TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager);
+
+    [[nodiscard]] bool TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync = false);
+    [[nodiscard]] bool SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync = false);
+    [[nodiscard]] bool Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync = false);
+    std::shared_ptr<TClient> CreateClient(ip::tcp::socket&& TCPSock);
+    std::vector<uint8_t> TCPRcv(TClient& c);
+    void ClientKick(TClient& c, const std::string& R);
+    [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
+    void Identify(TConnection&& client);
+    std::shared_ptr<TClient> Authentication(TConnection&& ClientConnection);
+    void SyncResources(TClient& c);
+    [[nodiscard]] bool UDPSend(TClient& Client, std::vector<uint8_t> Data);
+    void SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self, bool Rel);
+    void UpdatePlayer(TClient& Client);
+
+private:
+    void UDPServerMain();
+    void TCPServerMain();
+
+    TServer& mServer;
+    TPPSMonitor& mPPSMonitor;
+    ip::udp::socket mUDPSock;
+    TResourceManager& mResourceManager;
+    std::thread mUDPThread;
+    std::thread mTCPThread;
+    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);
+    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 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::vector<uint8_t> StringToVector(const std::string& Str);
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "Common.h"
+#include "TServer.h"
+#include <optional>
+
+class TNetwork;
+
+class TPPSMonitor : public IThreaded {
+public:
+    explicit TPPSMonitor(TServer& Server);
+
+    void operator()() override;
+
+    void SetInternalPPS(int NewPPS) { mInternalPPS = NewPPS; }
+    void IncrementInternalPPS() { ++mInternalPPS; }
+    [[nodiscard]] int InternalPPS() const { return mInternalPPS; }
+    void SetNetwork(TNetwork& Server) { mNetwork = std::ref(Server); }
+
+private:
+    TNetwork& Network() { return mNetwork->get(); }
+
+    TServer& mServer;
+    std::optional<std::reference_wrapper<TNetwork>> mNetwork { std::nullopt };
+    int mInternalPPS { 0 };
+};
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "Common.h"
+#include <optional>
+
+using ModMap = HashMap<std::string, size_t>;
+
+class TResourceManager {
+public:
+    TResourceManager();
+
+    [[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 mTotalModSize = 0; // size of all mods
+    ModMap mMods; // map of mod names
+};
@@ -4,6 +4,8 @@
 #include <functional>
 #include <string>

+#include "Common.h"
+
 class TScopedTimer {
 public:
    TScopedTimer();
@@ -11,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;
@@ -20,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
@@ -0,0 +1,109 @@
+#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"
+
+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>>;
+
+    TServer(const std::vector<std::string_view>& Arguments);
+
+    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
+    [[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;
+
+    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; }
+
+    const TScopedTimer UptimeTimer;
+
+    // asio io context
+    io_context& IoCtx() { return mIoCtx; }
+
+private:
+    io_context mIoCtx {};
+    TClientSet mClients;
+    mutable RWMutex mClientsMutex;
+    static void ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Network);
+    static bool ShouldSpawn(TClient& c, const std::string& CarJson, int ID);
+    static bool IsUnicycle(TClient& c, const std::string& CarJson);
+    static void Apply(TClient& c, int VID, const std::string& pckt);
+    static bool HandlePosition(TClient& c, const std::string& PacketStr);
+    static bool HandleVehicleUpdate(const std::string& PacketStr, const int playerID);
+};
+
+struct BufferView {
+    uint8_t* Data { nullptr };
+    size_t Size { 0 };
+    const uint8_t* data() const { return Data; }
+    uint8_t* data() { return Data; }
+    size_t size() const { return Size; }
+};
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <string>
+
+namespace uuid {
+
+std::string GenerateUuid();
+
+}
@@ -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,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,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,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,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,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,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,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,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
-
-./vcpkg/vcpkg add port lua
-
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DBeamMP-Server_ENABLE_LTO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server-tests
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cmake --build bin --parallel -t BeamMP-Server --config Release
@@ -13,7 +13,7 @@ void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
                ConsumeLongFlag(std::string(Arg));
            }
        } else {
-            beammp_errorf("Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
+            fmt::print(stderr, "Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
        }
    }
 }
@@ -22,17 +22,17 @@ bool ArgsParser::Verify() {
    bool Ok = true;
    for (const auto& RegisteredArg : mRegisteredArguments) {
        if (RegisteredArg.Flags & Flags::REQUIRED && !FoundArgument(RegisteredArg.Names)) {
-            beammp_errorf("Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
+            fmt::print(stderr, "Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
            Ok = false;
            continue;
        } else if (FoundArgument(RegisteredArg.Names)) {
            if (RegisteredArg.Flags & Flags::HAS_VALUE) {
                if (!GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                    beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' expects a value, but no value was given.");
+                    fmt::print(stderr, "Error in commandline arguments: Argument '{}' expects a value, but no value was given.", RegisteredArg.Names.at(0));
                    Ok = false;
                }
            } else if (GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' does not expect a value, but one was given.");
+                fmt::print(stderr, "Error in commandline arguments: Argument '{}' does not expect a value, but one was given.", RegisteredArg.Names.at(0));
                Ok = false;
            }
        }
@@ -81,7 +81,7 @@ void ArgsParser::ConsumeLongAssignment(const std::string& Arg) {
    auto Value = Arg.substr(Arg.rfind("=") + 1);
    auto Name = Arg.substr(2, Arg.rfind("=") - 2);
    if (!IsRegistered(Name)) {
-        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
+        fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
    }
    mFoundArgs.push_back({ Name, Value });
 }
@@ -90,7 +90,7 @@ void ArgsParser::ConsumeLongFlag(const std::string& Arg) {
    auto Name = Arg.substr(2, Arg.rfind("=") - 2);
    mFoundArgs.push_back({ Name, std::nullopt });
    if (!IsRegistered(Name)) {
-        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
+        fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
    }
 }

@@ -0,0 +1,162 @@
+#include "Client.h"
+
+#include "CustomAssert.h"
+#include "LuaAPI.h"
+#include "TServer.h"
+#include <memory>
+#include <optional>
+
+void TClient::DeleteCar(int Ident) {
+    // TODO: Send delete packets
+    std::unique_lock lock(mVehicleDataMutex);
+    auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {
+        return Ident == elem.ID();
+    });
+    if (iter != mVehicleData.end()) {
+        std::string Destroy = "Od:" + std::to_string(GetID()) + "-" + std::to_string(iter->ID());
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
+        mVehicleData.erase(iter);
+    } else {
+        beammp_debug("tried to erase a vehicle that doesn't exist (not an error)");
+    }
+}
+
+void TClient::ClearCars() {
+    std::unique_lock lock(mVehicleDataMutex);
+    for (const auto& Car : mVehicleData) {
+        std::string Destroy = "Od:" + std::to_string(GetID()) + "-" + std::to_string(Car.ID());
+        LuaAPI::MP::Engine->Network().SendToAll(this, StringToVector(Destroy), false, true);
+    }
+    mVehicleData.clear();
+}
+
+int TClient::GetOpenCarID() const {
+    int OpenID = 0;
+    bool found;
+    std::unique_lock lock(mVehicleDataMutex);
+    do {
+        found = true;
+        for (auto& v : mVehicleData) {
+            if (v.ID() == OpenID) {
+                OpenID++;
+                found = false;
+            }
+        }
+    } while (!found);
+    return OpenID;
+}
+
+void TClient::AddNewCar(int Ident, const std::string& Data) {
+    std::unique_lock lock(mVehicleDataMutex);
+    mVehicleData.emplace_back(Ident, Data);
+}
+
+TClient::TVehicleDataLockPair TClient::GetAllCars() {
+    return { &mVehicleData, std::unique_lock(mVehicleDataMutex) };
+}
+
+std::string TClient::GetCarPositionRaw(int Ident) {
+    std::unique_lock lock(mVehiclePositionMutex);
+    try {
+        return mVehiclePosition.at(Ident);
+    } catch (const std::out_of_range& oor) {
+        return "";
+    }
+    return "";
+}
+
+void TClient::Disconnect(std::string_view Reason) {
+    // we need exclusivity here in case we can't
+    std::unique_lock Lock(mDisconnectMtx);
+    beammp_debugf("Disconnecting client {} for reason: {}", GetID(), Reason);
+    if (mSocket.is_open()) {
+        beammp_debugf("Socket for client {} already closed", GetID());
+    }
+    boost::system::error_code ec;
+    mSocket.shutdown(socket_base::shutdown_both, ec);
+    if (ec) {
+        beammp_debugf("Failed to shutdown client socket: {}", ec.message());
+    }
+    mSocket.close(ec);
+    if (ec) {
+        beammp_debugf("Failed to close client socket: {}", ec.message());
+    }
+    mServer.RemoveClientById(GetID());
+}
+
+void TClient::SetCarPosition(int Ident, const std::string& Data) {
+    std::unique_lock lock(mVehiclePositionMutex);
+    mVehiclePosition[Ident] = Data;
+}
+
+std::string TClient::GetCarData(int Ident) {
+    { // lock
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
+            if (v.ID() == Ident) {
+                return v.Data();
+            }
+        }
+    } // unlock
+    DeleteCar(Ident);
+    return "";
+}
+
+void TClient::SetCarData(int Ident, const std::string& Data) {
+    { // lock
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
+            if (v.ID() == Ident) {
+                v.SetData(Data);
+                return;
+            }
+        }
+    } // unlock
+    DeleteCar(Ident);
+}
+
+int TClient::GetCarCount() const {
+    return int(mVehicleData.size());
+}
+
+TServer& TClient::Server() const {
+    return mServer;
+}
+
+void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
+    std::unique_lock Lock(mMissedPacketsMutex);
+    mPacketsSync.push(Packet);
+}
+
+TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
+    : mServer(Server)
+    , mSocket(std::move(Socket))
+    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
+    , mLastPingTime(TimeType::now()) {
+}
+
+TClient::~TClient() {
+    beammp_debugf("client destroyed: {} ('{}')", this->GetID(), this->GetName());
+}
+
+void TClient::UpdatePingTime() {
+    mLastPingTime = TimeType::now();
+}
+int TClient::SecondsSinceLastPing() {
+    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(
+        TimeType::now() - mLastPingTime)
+                       .count();
+    return int(seconds);
+}
+
+std::shared_ptr<TClient> GetClient(TServer& Server, int ID) {
+    std::shared_ptr<TClient> Result {};
+    Server.ForEachClient([&](const auto& Client) {
+        if (Client->GetID() == ID) {
+            Result = Client;
+            return Break;
+        }
+        return Continue;
+    });
+    return Result;
+}
@@ -1,10 +1,8 @@
 #include "Common.h"

-#include "Env.h"
 #include "TConsole.h"
 #include <array>
 #include <charconv>
-#include <fmt/core.h>
 #include <iostream>
 #include <map>
 #include <regex>
@@ -15,7 +13,85 @@
 #include "CustomAssert.h"
 #include "Http.h"

-Application::TSettings Application::Settings = {};
+Application::SettingsMap Application::mSettings = {
+    { StrName, std::string("BeamMP Server") },
+    { StrDescription, std::string("No description") },
+    { StrResourceFolder, std::string("Resources") },
+    { StrMap, std::string("/levels/gridmap_v2/info.json") },
+    { StrSSLKeyPath, std::string("./.ssl/HttpServer/key.pem") },
+    { StrSSLCertPath, std::string("./.ssl/HttpServer/cert.pem") },
+    { StrHTTPServerEnabled, false },
+    { StrMaxPlayers, int(8) },
+    { StrPrivate, true },
+    { StrMaxCars, int(1) },
+    { StrDebug, false },
+    { StrPort, int(30814) },
+    { StrCustomIP, std::string("") },
+    { StrLogChat, true },
+    { StrSendErrors, true },
+    { StrSendErrorsMessageEnabled, true },
+    { StrHTTPServerPort, int(8080) },
+    { StrHTTPServerIP, std::string("127.0.0.1") },
+    { StrHTTPServerUseSSL, false },
+    { StrHideUpdateMessages, false },
+    { StrAuthKey, std::string("") },
+    { StrIncludeSubdirectories, false },
+};
+
+// global, yes, this is ugly, no, it cant be done another way
+TSentry Sentry {};
+
+std::string Application::SettingToString(const Application::SettingValue& Value) {
+    switch (Value.index()) {
+    case 0:
+        return fmt::format("{}", std::get<std::string>(Value));
+    case 1:
+        return fmt::format("{}", std::get<bool>(Value));
+    case 2:
+        return fmt::format("{}", std::get<int>(Value));
+    default:
+        return "<unknown type>";
+    }
+}
+
+std::string Application::GetSettingString(std::string_view Name) {
+    try {
+        return std::get<std::string>(Application::mSettings.at(Name));
+    } catch (const std::exception& e) {
+        beammp_errorf("Failed to get string setting '{}': {}", Name, e.what());
+        return "";
+    }
+}
+
+int Application::GetSettingInt(std::string_view Name) {
+    try {
+        return std::get<int>(Application::mSettings.at(Name));
+    } catch (const std::exception& e) {
+        beammp_errorf("Failed to get int setting '{}': {}", Name, e.what());
+        return 0;
+    }
+}
+
+bool Application::GetSettingBool(std::string_view Name) {
+    try {
+        return std::get<bool>(Application::mSettings.at(Name));
+    } catch (const std::exception& e) {
+        beammp_errorf("Failed to get bool setting '{}': {}", Name, e.what());
+        return false;
+    }
+}
+
+void Application::SetSetting(std::string_view Name, const Application::SettingValue& Value) {
+    if (mSettings.contains(Name)) {
+        if (mSettings[Name].index() == Value.index()) {
+            mSettings[Name] = Value;
+        } else {
+            beammp_errorf("Could not change value of setting '{}', because it has a different type.", Name);
+        }
+    } else {
+        mSettings[Name] = Value;
+    }
+}

 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
    std::unique_lock Lock(mShutdownHandlersMutex);
@@ -203,11 +279,8 @@ void Application::CheckForUpdates() {
            auto MyVersion = ServerVersion();
            auto RemoteVersion = Version(VersionStrToInts(Response));
            if (IsOutdated(MyVersion, RemoteVersion)) {
-                std::string RealVersionString = std::string("v") + RemoteVersion.AsString();
-                const std::string DefaultUpdateMsg = "NEW VERSION IS OUT! Please update to the new version ({}) of the BeamMP-Server! Download it here: https://beammp.com/! For a guide on how to update, visit: https://wiki.beammp.com/en/home/server-maintenance#updating-the-server";
-                auto UpdateMsg = Env::Get(Env::Key::PROVIDER_UPDATE_MESSAGE).value_or(DefaultUpdateMsg);
-                UpdateMsg = fmt::vformat(std::string_view(UpdateMsg), fmt::make_format_args(RealVersionString));
-                beammp_warnf("{}{}{}", ANSI_YELLOW_BOLD, UpdateMsg, ANSI_RESET);
+                std::string RealVersionString = RemoteVersion.AsString();
+                beammp_warn(std::string(ANSI_YELLOW_BOLD) + "NEW VERSION IS OUT! Please update to the new version (v" + RealVersionString + ") of the BeamMP-Server! Download it here: https://beammp.com/! For a guide on how to update, visit: https://wiki.beammp.com/en/home/server-maintenance#updating-the-server" + std::string(ANSI_RESET));
            } else {
                if (FirstTime) {
                    beammp_info("Server up-to-date!");
@@ -219,6 +292,9 @@ void Application::CheckForUpdates() {
            if (FirstTime) {
                beammp_debug("Failed to fetch version from: " + url);
                beammp_trace("got " + Response);
+                auto Lock = Sentry.CreateExclusiveContext();
+                Sentry.SetContext("get-response", { { "response", Response } });
+                Sentry.LogError("failed to get server version", _file_basename, _line);
                Application::SetSubsystemStatus("UpdateCheck", Application::Status::Bad);
            }
        }
@@ -238,7 +314,7 @@ static std::mutex ThreadNameMapMutex {};

 std::string ThreadName(bool DebugModeOverride) {
    auto Lock = std::unique_lock(ThreadNameMapMutex);
-    if (DebugModeOverride || Application::Settings.DebugModeEnabled) {
+    if (DebugModeOverride || Application::GetSettingBool(StrDebug)) {
        auto id = std::this_thread::get_id();
        if (threadNameMap.find(id) != threadNameMap.end()) {
            // found
@@ -250,21 +326,21 @@ std::string ThreadName(bool DebugModeOverride) {

 TEST_CASE("ThreadName") {
    RegisterThread("MyThread");
-    auto OrigDebug = Application::Settings.DebugModeEnabled;
+    auto OrigDebug = Application::GetSettingBool(StrDebug);

    // ThreadName adds a space at the end, legacy but we need it still
    SUBCASE("Debug mode enabled") {
-        Application::Settings.DebugModeEnabled = true;
+        Application::SetSetting(StrDebug, true);
        CHECK(ThreadName(true) == "MyThread ");
        CHECK(ThreadName(false) == "MyThread ");
    }
    SUBCASE("Debug mode disabled") {
-        Application::Settings.DebugModeEnabled = false;
+        Application::SetSetting(StrDebug, false);
        CHECK(ThreadName(true) == "MyThread ");
        CHECK(ThreadName(false) == "");
    }
    // cleanup
-    Application::Settings.DebugModeEnabled = OrigDebug;
+    Application::SetSetting(StrDebug, OrigDebug);
 }

 void RegisterThread(const std::string& str) {
@@ -276,7 +352,7 @@ void RegisterThread(const std::string& str) {
 #elif defined(BEAMMP_LINUX)
    ThreadId = std::to_string(gettid());
 #endif
-    if (Application::Settings.DebugModeEnabled) {
+    if (Application::GetSettingBool(StrDebug)) {
        std::ofstream ThreadFile(".Threads.log", std::ios::app);
        ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
    }
@@ -309,7 +385,7 @@ TEST_CASE("Version::AsString") {
 }

 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    if (Application::Settings.LogChat) {
+    if (Application::GetSettingBool(StrLogChat)) {
        std::stringstream ss;
        ss << ThreadName();
        ss << "[CHAT] ";
@@ -354,13 +430,16 @@ std::string GetPlatformAgnosticErrorString() {
 #endif
 }

-// TODO: add unit tests to SplitString
-void SplitString(const std::string& str, const char delim, std::vector<std::string>& out) {
-    size_t start;
-    size_t end = 0;
-
-    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
-        end = str.find(delim, start);
-        out.push_back(str.substr(start, end - start));
+std::string ToHumanReadableSize(size_t Size) {
+    if (Size > TB) {
+        return fmt::format("{:.2f} TiB", double(Size) / TB);
+    } else if (Size > GB) {
+        return fmt::format("{:.2f} GiB", double(Size) / GB);
+    } else if (Size > MB) {
+        return fmt::format("{:.2f} MiB", double(Size) / MB);
+    } else if (Size > KB) {
+        return fmt::format("{:.2f} KiB", double(Size) / KB);
+    } else {
+        return fmt::format("{} B", Size);
    }
 }
@@ -1,20 +0,0 @@
-#include "Env.h"
-#include <optional>
-
-std::optional<std::string> Env::Get(Env::Key key) {
-    auto StrKey = ToString(key);
-    auto Value = std::getenv(StrKey.data());
-    if (!Value || std::string_view(Value).empty()) {
-        return std::nullopt;
-    }
-    return Value;
-}
-
-std::string_view Env::ToString(Env::Key key) {
-    switch (key) {
-    case Key::PROVIDER_UPDATE_MESSAGE:
-        return "BEAMMP_PROVIDER_UPDATE_MESSAGE";
-        break;
-    }
-    return "";
-}
@@ -1,5 +1,6 @@
 #include "Http.h"

+#include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
@@ -14,7 +15,7 @@
 using json = nlohmann::json;

 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
-    static thread_local httplib::SSLClient client(host, port);
+    httplib::SSLClient client(host, port);
    client.enable_server_certificate_verification(false);
    client.set_address_family(AF_INET);
    auto res = client.Get(target.c_str());
@@ -29,7 +30,7 @@ std::string Http::GET(const std::string& host, int port, const std::string& targ
 }

 std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
-    static thread_local httplib::SSLClient client(host, port);
+    httplib::SSLClient client(host, port);
    client.set_read_timeout(std::chrono::seconds(10));
    beammp_assert(client.is_valid());
    client.enable_server_certificate_verification(false);
@@ -153,7 +154,7 @@ Http::Server::THttpServerInstance::THttpServerInstance() {
 }

 void Http::Server::THttpServerInstance::operator()() try {
-    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
+    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::GetSettingInt(StrHTTPServerPort)));
    std::unique_ptr<httplib::Server> HttpLibServerInstance;
    HttpLibServerInstance = std::make_unique<httplib::Server>();
    // todo: make this IP agnostic so people can set their own IP
@@ -180,7 +181,7 @@ void Http::Server::THttpServerInstance::operator()() try {
            }
        }
        res.set_content(
-            nlohmann::json {
+            json {
                { "ok", SystemsBad == 0 },
            }
                .dump(),
@@ -195,7 +196,7 @@ void Http::Server::THttpServerInstance::operator()() try {
        beammp_debug("Http Server: " + Req.method + " " + Req.target + " -> " + std::to_string(Res.status));
    });
    Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
-    auto ret = HttpLibServerInstance->listen(Application::Settings.HTTPServerIP.c_str(), Application::Settings.HTTPServerPort);
+    auto ret = HttpLibServerInstance->listen(Application::GetSettingString(StrHTTPServerIP).c_str(), Application::GetSettingInt(StrHTTPServerPort));
    if (!ret) {
        beammp_error("Failed to start http server (failed to listen). Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it.");
    }
@@ -1,4 +1,5 @@
 #include "LuaAPI.h"
+#include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
 #include "TLuaEngine.h"
@@ -113,26 +114,23 @@ TEST_CASE("LuaAPI::MP::GetServerVersion") {
 }

 static inline std::pair<bool, std::string> InternalTriggerClientEvent(int PlayerID, const std::string& EventName, const std::string& Data) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
-        std::string Packet = "E:" + EventName + ":" + Data;
-        if (PlayerID == -1) {
-            LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
-            return { true, "" };
-        } else {
-            auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
-            if (!MaybeClient) {
-                beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
-                return { false, "Invalid Player ID" };
-            }
-            auto c = MaybeClient.value();
-            if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
-                beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
-                LuaAPI::MP::Engine->Network().Disconnect(*c);
-                return { false, "Respond failed, dropping client" };
-            }
-            return { true, "" };
-        }*/
+    std::string Packet = "E:" + EventName + ":" + Data;
+    if (PlayerID == -1) {
+        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+        return { true, "" };
+    } else {
+        auto Client = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
+        if (!Client) {
+            beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
+            return { false, "Invalid Player ID" };
+        }
+        if (!LuaAPI::MP::Engine->Network().Respond(*Client, StringToVector(Packet), true)) {
+            beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
+            LuaAPI::MP::Engine->Network().ClientKick(*Client, "Disconnected after failing to receive packets");
+            return { false, "Respond failed, dropping client" };
+        }
+        return { true, "" };
+    }
 }

 std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const std::string& EventName, const sol::object& DataObj) {
@@ -141,22 +139,16 @@ std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const
 }

 std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (!MaybeClient) {
+    auto Client = GetClient(Engine->Server(), ID);
+    if (!Client) {
        beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
        return { false, "Player does not exist" };
    }
-    auto c = MaybeClient.value();
-    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
+    LuaAPI::MP::Engine->Network().ClientKick(*Client, MaybeReason.value_or("No reason"));
    return { true, "" };
-    */
 }

 std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::string& Message) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
    std::pair<bool, std::string> Result;
    std::string Packet = "C:Server: " + Message;
    if (ID == -1) {
@@ -164,19 +156,17 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
        Result.first = true;
    } else {
-        auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient) {
-            auto c = MaybeClient.value();
-            if (!c->IsSynced) {
+        auto Client = GetClient(Engine->Server(), ID);
+        if (Client) {
+            if (!Client->IsSynced()) {
                Result.first = false;
                Result.second = "Player still syncing data";
                return Result;
            }
-            LogChatMessage("<Server> (to \"" + c->Name.get() + "\")", -1, Message);
-            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+            LogChatMessage("<Server> (to \"" + Client->GetName() + "\")", -1, Message);
+            if (!Engine->Network().Respond(*Client, StringToVector(Packet), true)) {
                beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
-                beammp_infof("Disconnecting client {} for failure to receive a chat message (TCP disconnect)", c->Name.get());
-                Engine->Network().Disconnect(c);
+                // TODO: should we return an error here?
            }
            Result.first = true;
        } else {
@@ -187,88 +177,83 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
        return Result;
    }
    return Result;
-    */
 }

 std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
    std::pair<bool, std::string> Result;
-    auto MaybeClient = GetClient(Engine->Server(), PID);
-    if (!MaybeClient) {
+    auto Client = GetClient(Engine->Server(), PID);
+    if (!Client) {
        beammp_lua_error("RemoveVehicle invalid Player ID");
        Result.first = false;
        Result.second = "Invalid Player ID";
        return Result;
    }
-    auto c = MaybeClient.value();
-    if (!c->GetCarData(VID).empty()) {
+    if (!Client->GetCarData(VID).empty()) {
        std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
-        c->DeleteCar(VID);
+        Client->DeleteCar(VID);
        Result.first = true;
    } else {
        Result.first = false;
        Result.second = "Vehicle does not exist";
    }
    return Result;
-    */
 }

 void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
    switch (ConfigID) {
    case 0: // debug
        if (NewValue.is<bool>()) {
-            Application::Settings.DebugModeEnabled = NewValue.as<bool>();
-            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
+            Application::SetSetting(StrDebug, NewValue.as<bool>());
+            beammp_info(std::string("Set `Debug` to ") + (Application::GetSettingBool(StrDebug) ? "true" : "false"));
        } else {
            beammp_lua_error("set invalid argument [2] expected boolean");
        }
        break;
    case 1: // private
        if (NewValue.is<bool>()) {
-            Application::Settings.Private = NewValue.as<bool>();
-            beammp_info(std::string("Set `Private` to ") + (Application::Settings.Private ? "true" : "false"));
+            Application::SetSetting(StrPrivate, NewValue.as<bool>());
+            beammp_info(std::string("Set `Private` to ") + (Application::GetSettingBool(StrPrivate) ? "true" : "false"));
        } else {
            beammp_lua_error("set invalid argument [2] expected boolean");
        }
        break;
    case 2: // max cars
        if (NewValue.is<int>()) {
-            Application::Settings.MaxCars = NewValue.as<int>();
-            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.MaxCars));
+            Application::SetSetting(StrMaxCars, NewValue.as<int>());
+            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::GetSettingInt(StrMaxCars)));
        } else {
            beammp_lua_error("set invalid argument [2] expected integer");
        }
        break;
    case 3: // max players
        if (NewValue.is<int>()) {
-            Application::Settings.MaxPlayers = NewValue.as<int>();
-            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.MaxPlayers));
+            Application::SetSetting(StrMaxPlayers, NewValue.as<int>());
+            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::GetSettingInt(StrMaxPlayers)));
        } else {
            beammp_lua_error("set invalid argument [2] expected integer");
        }
        break;
    case 4: // Map
        if (NewValue.is<std::string>()) {
-            Application::Settings.MapName = NewValue.as<std::string>();
-            beammp_info(std::string("Set `Map` to ") + Application::Settings.MapName);
+            Application::SetSetting(StrMap, NewValue.as<std::string>());
+            beammp_info(std::string("Set `Map` to ") + Application::GetSettingString(StrMap));
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
        break;
    case 5: // Name
        if (NewValue.is<std::string>()) {
-            Application::Settings.ServerName = NewValue.as<std::string>();
-            beammp_info(std::string("Set `Name` to ") + Application::Settings.ServerName);
+            Application::SetSetting(StrName, NewValue.as<std::string>());
+            beammp_info(std::string("Set `Name` to ") + Application::GetSettingString(StrName));
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
        break;
    case 6: // Desc
        if (NewValue.is<std::string>()) {
-            Application::Settings.ServerDesc = NewValue.as<std::string>();
-            beammp_info(std::string("Set `Description` to ") + Application::Settings.ServerDesc);
+            Application::SetSetting(StrDescription, NewValue.as<std::string>());
+            beammp_info(std::string("Set `Description` to ") + Application::GetSettingString(StrDescription));
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
@@ -284,26 +269,21 @@ void LuaAPI::MP::Sleep(size_t Ms) {
 }

 bool LuaAPI::MP::IsPlayerConnected(int ID) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
-        return MaybeClient.value()->IsConnected.get();
-    } else {
-        return false;
-    }*/
-}
-
-bool LuaAPI::MP::IsPlayerGuest(int ID) {
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
-    auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
-        return MaybeClient.value()->IsGuest.get();
+    auto Client = GetClient(Engine->Server(), ID);
+    if (Client) {
+        return Client->IsConnected();
+    } else {
+        return false;
+    }
+}
+
+bool LuaAPI::MP::IsPlayerGuest(int ID) {
+    auto Client = GetClient(Engine->Server(), ID);
+    if (Client) {
+        return Client->IsGuest();
    } else {
        return false;
    }
-    */
 }

 void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
@@ -318,6 +298,7 @@ void LuaAPI::MP::PrintRaw(sol::variadic_args Args) {
 }

 int LuaAPI::PanicHandler(lua_State* State) {
+    // FIXME: unsafe operation, can cause stack overflow
    beammp_lua_error("PANIC: " + sol::stack::get<std::string>(State, 1));
    return 0;
 }
@@ -588,7 +569,11 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        value = right.as<std::string>();
        break;
    case sol::type::number:
-        value = right.as<double>();
+        if (right.is<int>()) {
+            value = right.as<int>();
+        } else {
+            value = right.as<float>();
+        }
        break;
    case sol::type::function:
        beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring");
@@ -598,6 +583,7 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        for (const auto& pair : right.as<sol::table>()) {
            if (pair.first.get_type() != sol::type::number) {
                local_is_array = false;
+                break;
            }
        }
        for (const auto& pair : right.as<sol::table>()) {
@@ -622,10 +608,11 @@ std::string LuaAPI::MP::JsonEncode(const sol::table& object) {
    for (const auto& pair : object.as<sol::table>()) {
        if (pair.first.get_type() != sol::type::number) {
            is_array = false;
+            break;
        }
    }
-    for (const auto& entry : object) {
-        JsonEncodeRecursive(json, entry.first, entry.second, is_array);
+    for (const auto& [key, value] : object) {
+        JsonEncodeRecursive(json, key, value, is_array);
    }
    return json.dump();
 }
@@ -1,6 +1,8 @@
 #include "SignalHandling.h"
 #include "Common.h"

+#include "Compat.h"
+
 #if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
 #include <csignal>
 static void UnixSignalHandler(int sig) {
@@ -1,44 +1,11 @@
 #include "Common.h"

 #include "TConfig.h"
-#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <istream>
 #include <sstream>

-// General
-static constexpr std::string_view StrDebug = "Debug";
-static constexpr std::string_view EnvStrDebug = "BEAMMP_DEBUG";
-static constexpr std::string_view StrPrivate = "Private";
-static constexpr std::string_view EnvStrPrivate = "BEAMMP_PRIVATE";
-static constexpr std::string_view StrPort = "Port";
-static constexpr std::string_view EnvStrPort = "BEAMMP_PORT";
-static constexpr std::string_view StrMaxCars = "MaxCars";
-static constexpr std::string_view EnvStrMaxCars = "BEAMMP_MAX_CARS";
-static constexpr std::string_view StrMaxPlayers = "MaxPlayers";
-static constexpr std::string_view EnvStrMaxPlayers = "BEAMMP_MAX_PLAYERS";
-static constexpr std::string_view StrMap = "Map";
-static constexpr std::string_view EnvStrMap = "BEAMMP_MAP";
-static constexpr std::string_view StrName = "Name";
-static constexpr std::string_view EnvStrName = "BEAMMP_NAME";
-static constexpr std::string_view StrDescription = "Description";
-static constexpr std::string_view EnvStrDescription = "BEAMMP_DESCRIPTION";
-static constexpr std::string_view StrTags = "Tags";
-static constexpr std::string_view EnvStrTags = "BEAMMP_TAGS";
-static constexpr std::string_view StrResourceFolder = "ResourceFolder";
-static constexpr std::string_view EnvStrResourceFolder = "BEAMMP_RESOURCE_FOLDER";
-static constexpr std::string_view StrAuthKey = "AuthKey";
-static constexpr std::string_view EnvStrAuthKey = "BEAMMP_AUTH_KEY";
-static constexpr std::string_view StrLogChat = "LogChat";
-static constexpr std::string_view EnvStrLogChat = "BEAMMP_LOG_CHAT";
-static constexpr std::string_view StrPassword = "Password";
-
-// Misc
-static constexpr std::string_view StrSendErrors = "SendErrors";
-static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
-static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
-
 TEST_CASE("TConfig::TConfig") {
    const std::string CfgFile = "beammp_server_testconfig.toml";
    fs::remove(CfgFile);
@@ -62,6 +29,7 @@ TEST_CASE("TConfig::TConfig") {
    const auto table = toml::parse(CfgFile);
    CHECK(table.at("General").is_table());
    CHECK(table.at("Misc").is_table());
+    CHECK(table.at("HTTP").is_table());

    fs::remove(CfgFile);
 }
@@ -99,34 +67,42 @@ void SetComment(CommentsT& Comments, const std::string& Comment) {
 void TConfig::FlushToFile() {
    // auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
    auto data = toml::value {};
-    data["General"][StrAuthKey.data()] = Application::Settings.Key;
+    data["General"][StrAuthKey.data()] = Application::GetSettingString(StrAuthKey.data());
    SetComment(data["General"][StrAuthKey.data()].comments(), " AuthKey has to be filled out in order to run the server");
-    data["General"][StrLogChat.data()] = Application::Settings.LogChat;
+    data["General"][StrLogChat.data()] = Application::GetSettingBool(StrLogChat.data());
    SetComment(data["General"][StrLogChat.data()].comments(), " Whether to log chat messages in the console / log");
-    data["General"][StrDebug.data()] = Application::Settings.DebugModeEnabled;
-    data["General"][StrPrivate.data()] = Application::Settings.Private;
-    data["General"][StrPort.data()] = Application::Settings.Port;
-    data["General"][StrName.data()] = Application::Settings.ServerName;
-    SetComment(data["General"][StrTags.data()].comments(), " Add custom identifying tags to your server to make it easier to find. Format should be TagA,TagB,TagC. Note the comma seperation.");
-    data["General"][StrTags.data()] = Application::Settings.ServerTags;
-    data["General"][StrMaxCars.data()] = Application::Settings.MaxCars;
-    data["General"][StrMaxPlayers.data()] = Application::Settings.MaxPlayers;
-    data["General"][StrMap.data()] = Application::Settings.MapName;
-    data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
-    data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
-    // data["General"][StrPassword.data()] = Application::Settings.Password;
-    // SetComment(data["General"][StrPassword.data()].comments(), " Sets a password on this server, which restricts people from joining. To join, a player must enter this exact password. Leave empty ("") to disable the password.");
+    data["General"][StrDebug.data()] = Application::GetSettingBool(StrDebug.data());
+    data["General"][StrPrivate.data()] = Application::GetSettingBool(StrPrivate.data());
+    data["General"][StrPort.data()] = Application::GetSettingInt(StrPort.data());
+    data["General"][StrName.data()] = Application::GetSettingString(StrName.data());
+    data["General"][StrMaxCars.data()] = Application::GetSettingInt(StrMaxCars.data());
+    data["General"][StrMaxPlayers.data()] = Application::GetSettingInt(StrMaxPlayers.data());
+    data["General"][StrMap.data()] = Application::GetSettingString(StrMap.data());
+    data["General"][StrDescription.data()] = Application::GetSettingString(StrDescription.data());
+    data["General"][StrResourceFolder.data()] = Application::GetSettingString(StrResourceFolder.data());
    // Misc
-    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
+    data["Misc"][StrHideUpdateMessages.data()] = Application::GetSettingBool(StrHideUpdateMessages.data());
    SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
-    data["Misc"][StrSendErrors.data()] = Application::Settings.SendErrors;
-    SetComment(data["Misc"][StrSendErrors.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
-    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
-    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
+    data["Misc"][StrSendErrors.data()] = Application::GetSettingBool(StrSendErrors.data());
+    SetComment(data["Misc"][StrSendErrors.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
+    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::GetSettingBool(StrSendErrorsMessageEnabled.data());
+    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
+    data["Misc"][StrIncludeSubdirectories.data()] = Application::GetSettingBool(StrIncludeSubdirectories.data());
+    SetComment(data["Misc"][StrIncludeSubdirectories.data()].comments(), " Whether or not to include subdirectories in General.ResourceFolder/Client when searching for `.zip`s");
+    // HTTP
+    data["HTTP"][StrSSLKeyPath.data()] = Application::GetSettingString(StrSSLKeyPath.data());
+    data["HTTP"][StrSSLCertPath.data()] = Application::GetSettingString(StrSSLCertPath.data());
+    data["HTTP"][StrHTTPServerPort.data()] = Application::GetSettingInt(StrHTTPServerPort.data());
+    SetComment(data["HTTP"][StrHTTPServerIP.data()].comments(), " Which IP to listen on. Pick 0.0.0.0 for a public-facing server with no specific IP, and 127.0.0.1 or 'localhost' for a local server.");
+    data["HTTP"][StrHTTPServerIP.data()] = Application::GetSettingString(StrHTTPServerIP.data());
+    data["HTTP"][StrHTTPServerUseSSL.data()] = Application::GetSettingBool(StrHTTPServerUseSSL.data());
+    SetComment(data["HTTP"][StrHTTPServerUseSSL.data()].comments(), " Recommended to have enabled for servers which face the internet. With SSL the server will serve https and requires valid key and cert files");
+    data["HTTP"][StrHTTPServerEnabled.data()] = Application::GetSettingBool(StrHTTPServerEnabled.data());
+    SetComment(data["HTTP"][StrHTTPServerEnabled.data()].comments(), " Enables the internal HTTP server");
    std::stringstream Ss;
    Ss << "# This is the BeamMP-Server config file.\n"
          "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
+          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
       << data;
    auto File = std::fopen(mConfigFileName.c_str(), "w+");
    if (!File) {
@@ -156,64 +132,42 @@ void TConfig::CreateConfigFile() {
    FlushToFile();
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue) {
-    if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
-            OutValue = std::string(envp);
-            return;
-        }
-    }
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key) {
    if (Table[Category.c_str()][Key.data()].is_string()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_string();
+        Application::SetSetting(Key, std::string(Table[Category.c_str()][Key.data()].as_string()));
+    } else if (Table[Category.c_str()][Key.data()].is_boolean()) {
+        Application::SetSetting(Key, bool(Table[Category.c_str()][Key.data()].as_boolean()));
+    } else if (Table[Category.c_str()][Key.data()].is_integer()) {
+        Application::SetSetting(Key, int(Table[Category.c_str()][Key.data()].as_integer()));
    }
 }
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue) {
-    if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
-            auto Str = std::string(envp);
-            OutValue = Str == "1" || Str == "true";
-            return;
-        }
-    }
-    if (Table[Category.c_str()][Key.data()].is_boolean()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
-    }
-}
-
-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue) {
-    if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
-            OutValue = int(std::strtol(envp, nullptr, 10));
-            return;
-        }
-    }
-    if (Table[Category.c_str()][Key.data()].is_integer()) {
-        OutValue = int(Table[Category.c_str()][Key.data()].as_integer());
-    }
-}
-
 void TConfig::ParseFromFile(std::string_view name) {
    try {
        toml::value data = toml::parse<toml::preserve_comments>(name.data());
        // GENERAL
-        TryReadValue(data, "General", StrDebug, EnvStrDebug, Application::Settings.DebugModeEnabled);
-        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Application::Settings.Private);
-        TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
-        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Application::Settings.MaxCars);
-        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Application::Settings.MaxPlayers);
-        TryReadValue(data, "General", StrMap, EnvStrMap, Application::Settings.MapName);
-        TryReadValue(data, "General", StrName, EnvStrName, Application::Settings.ServerName);
-        TryReadValue(data, "General", StrDescription, EnvStrDescription, Application::Settings.ServerDesc);
-        TryReadValue(data, "General", StrTags, EnvStrTags, Application::Settings.ServerTags);
-        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Application::Settings.Resource);
-        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Application::Settings.Key);
-        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Application::Settings.LogChat);
-        TryReadValue(data, "General", StrPassword, "", Application::Settings.Password);
+        TryReadValue(data, "General", StrDebug);
+        TryReadValue(data, "General", StrPrivate);
+        TryReadValue(data, "General", StrPort);
+        TryReadValue(data, "General", StrMaxCars);
+        TryReadValue(data, "General", StrMaxPlayers);
+        TryReadValue(data, "General", StrMap);
+        TryReadValue(data, "General", StrName);
+        TryReadValue(data, "General", StrDescription);
+        TryReadValue(data, "General", StrResourceFolder);
+        TryReadValue(data, "General", StrAuthKey);
+        TryReadValue(data, "General", StrLogChat);
        // Misc
-        TryReadValue(data, "Misc", StrSendErrors, "", Application::Settings.SendErrors);
-        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Application::Settings.HideUpdateMessages);
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Application::Settings.SendErrorsMessageEnabled);
+        TryReadValue(data, "Misc", StrSendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled);
+        TryReadValue(data, "Misc", StrIncludeSubdirectories);
+        // HTTP
+        TryReadValue(data, "HTTP", StrSSLKeyPath);
+        TryReadValue(data, "HTTP", StrSSLCertPath);
+        TryReadValue(data, "HTTP", StrHTTPServerPort);
+        TryReadValue(data, "HTTP", StrHTTPServerIP);
+        TryReadValue(data, "HTTP", StrHTTPServerEnabled);
+        TryReadValue(data, "HTTP", StrHTTPServerUseSSL);
    } catch (const std::exception& err) {
        beammp_error("Error parsing config file value: " + std::string(err.what()));
        mFailed = true;
@@ -225,94 +179,28 @@ void TConfig::ParseFromFile(std::string_view name) {
    // Update in any case
    FlushToFile();
    // all good so far, let's check if there's a key
-    if (Application::Settings.Key.empty()) {
-        beammp_error("No AuthKey specified in the \"" + std::string(mConfigFileName) + "\" file. Please get an AuthKey, enter it into the config file, and restart this server.");
+    if (Application::GetSettingString(StrAuthKey).empty()) {
+        beammp_error("No AuthKey specified in the \"" + std::string(mConfigFileName) + "\" file. Please get an AuthKey, enter it into the config file, and restart this server. Alternatively, if you only want a private server (one that doesn't show up in the server list), you may put anything as your AuthKey, like \"hello\".");
        Application::SetSubsystemStatus("Config", Application::Status::Bad);
        mFailed = true;
        return;
    }
    Application::SetSubsystemStatus("Config", Application::Status::Good);
-    if (Application::Settings.Key.size() != 36) {
+    if (Application::GetSettingString(StrAuthKey).size() != 36) {
        beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
    }
 }

 void TConfig::PrintDebug() {
-    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
-    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
-    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
-    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
-    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
-    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
-    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
-    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
-    beammp_debug(std::string(StrTags) + ": " + TagsAsPrettyArray());
-    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
-    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
-    // special!
-    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
-    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
+    for (const auto& [k, v] : Application::mSettings) {
+        if (k == StrAuthKey) {
+            beammp_debugf("AuthKey: length {}", std::get<std::string>(v).size());
+            continue;
+        }
+        beammp_debugf("{}: {}", k, Application::SettingToString(v));
+    }
 }

 void TConfig::ParseOldFormat() {
-    std::ifstream File("Server.cfg");
-    // read all, strip comments
-    std::string Content;
-    for (;;) {
-        std::string Line;
-        std::getline(File, Line);
-        if (!Line.empty() && Line.at(0) != '#') {
-            Line = Line.substr(0, Line.find_first_of('#'));
-            Content += Line + "\n";
-        }
-        if (!File.good()) {
-            break;
-        }
-    }
-    std::stringstream Str(Content);
-    std::string Key, Ignore, Value;
-    for (;;) {
-        Str >> Key >> std::ws >> Ignore >> std::ws;
-        std::getline(Str, Value);
-        if (Str.eof()) {
-            break;
-        }
-        std::stringstream ValueStream(Value);
-        ValueStream >> std::ws; // strip leading whitespace if any
-        Value = ValueStream.str();
-        if (Key == "Debug") {
-            Application::Settings.DebugModeEnabled = Value.find("true") != std::string::npos;
-        } else if (Key == "Private") {
-            Application::Settings.Private = Value.find("true") != std::string::npos;
-        } else if (Key == "Port") {
-            ValueStream >> Application::Settings.Port;
-        } else if (Key == "Cars") {
-            ValueStream >> Application::Settings.MaxCars;
-        } else if (Key == "MaxPlayers") {
-            ValueStream >> Application::Settings.MaxPlayers;
-        } else if (Key == "Map") {
-            Application::Settings.MapName = Value.substr(1, Value.size() - 3);
-        } else if (Key == "Name") {
-            Application::Settings.ServerName = Value.substr(1, Value.size() - 3);
-        } else if (Key == "Desc") {
-            Application::Settings.ServerDesc = Value.substr(1, Value.size() - 3);
-        } else if (Key == "use") {
-            Application::Settings.Resource = Value.substr(1, Value.size() - 3);
-        } else if (Key == "AuthKey") {
-            Application::Settings.Key = Value.substr(1, Value.size() - 3);
-        } else {
-            beammp_warn("unknown key in old auth file (ignored): " + Key);
-        }
-        Str >> std::ws;
-    }
-}
-std::string TConfig::TagsAsPrettyArray() const {
-    std::vector<std::string> TagsArray = {};
-    SplitString(Application::Settings.ServerTags, ',', TagsArray);
-    std::string Pretty = {};
-    for (size_t i = 0; i < TagsArray.size() - 1; ++i) {
-        Pretty += '\"' + TagsArray[i] + "\", ";
-    }
-    Pretty += '\"' + TagsArray.at(TagsArray.size() - 1) + "\"";
-    return Pretty;
+    beammp_warnf("You still have a 'Server.cfg' - this will not be used (this server uses 'ServerConfig.toml'. Since v3.0.2 we no longer parse and import these old settings. Remove the file to avoid confusion and disable this message.");
 }
@@ -2,18 +2,39 @@
 #include "Common.h"
 #include "Compat.h"

+#include "Client.h"
 #include "CustomAssert.h"
 #include "LuaAPI.h"
 #include "TLuaEngine.h"

+#include <boost/asio/ip/address.hpp>
+#include <boost/spirit/home/qi/directive/lexeme.hpp>
+#include <boost/spirit/home/qi/parse.hpp>
+#include <chrono>
 #include <ctime>
-#include <mutex>
+#include <fmt/chrono.h>
 #include <sstream>

+#include <boost/phoenix.hpp>
+#include <boost/spirit/include/qi.hpp>
+
+#include <boost/algorithm/string.hpp>
+
 static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
    return What.size() >= StartsWith.size() && What.substr(0, StartsWith.size()) == StartsWith;
 }

+static inline bool StringStartsWithLower(const std::string& Name1, const std::string& Name2) {
+    std::string Name1Lower = boost::algorithm::to_lower_copy(Name1);
+    return StringStartsWith(Name1Lower, Name2) || StringStartsWith(Name2, Name1Lower);
+};
+
+static inline bool StringStartsWithLowerBoth(const std::string& Name1, const std::string& Name2) {
+    std::string Name1Lower = boost::algorithm::to_lower_copy(Name1);
+    std::string Name2Lower = boost::algorithm::to_lower_copy(Name2);
+    return StringStartsWith(Name1Lower, Name2Lower) || StringStartsWith(Name2Lower, Name1Lower);
+};
+
 TEST_CASE("StringStartsWith") {
    CHECK(StringStartsWith("Hello, World", "Hello"));
    CHECK(StringStartsWith("Hello, World", "H"));
@@ -51,14 +72,25 @@ TEST_CASE("TrimString") {
    CHECK(TrimString("") == "");
 }

+// TODO: add unit tests to SplitString
+static inline void SplitString(std::string const& str, const char delim, std::vector<std::string>& out) {
+    size_t start;
+    size_t end = 0;
+
+    while ((start = str.find_first_not_of(delim, end)) != std::string::npos) {
+        end = str.find(delim, start);
+        out.push_back(str.substr(start, end - start));
+    }
+}
+
 static std::string GetDate() {
-    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
-    time_t tt = std::chrono::system_clock::to_time_t(now);
+    TimeType::time_point now = TimeType::now();
+    time_t tt = TimeType::to_time_t(now);
    auto local_tm = std::localtime(&tt);
    char buf[30];
    std::string date;
-    if (Application::Settings.DebugModeEnabled) {
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T.", local_tm);
+    if (Application::GetSettingBool(StrDebug)) {
+        std::strftime(buf, sizeof(buf), "[%Y/%m/%d %T.", local_tm);
        date += buf;
        auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
        auto fraction = now - seconds;
@@ -68,7 +100,7 @@ static std::string GetDate() {
        date += fracstr;
        date += "] ";
    } else {
-        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T] ", local_tm);
+        std::strftime(buf, sizeof(buf), "[%Y/%m/%d %T] ", local_tm);
        date += buf;
    }

@@ -145,13 +177,13 @@ void TConsole::ChangeToLuaConsole(const std::string& LuaStateId) {
        mIsLuaConsole = true;
        if (mStateId != mDefaultStateId) {
            Application::Console().WriteRaw("Attached to Lua state '" + mStateId + "'. For help, type `:help`. To detach, type `:exit`");
-            mCommandline->set_prompt("lua @" + LuaStateId + "> ");
+            mCommandline.set_prompt("lua @" + LuaStateId + "> ");
        } else {
            Application::Console().WriteRaw("Attached to Lua. For help, type `:help`. To detach, type `:exit`");
-            mCommandline->set_prompt("lua> ");
+            mCommandline.set_prompt("lua> ");
        }
-        mCachedRegularHistory = mCommandline->history();
-        mCommandline->set_history(mCachedLuaHistory);
+        mCachedRegularHistory = mCommandline.history();
+        mCommandline.set_history(mCachedLuaHistory);
    }
 }

@@ -163,9 +195,9 @@ void TConsole::ChangeToRegularConsole() {
        } else {
            Application::Console().WriteRaw("Detached from Lua.");
        }
-        mCachedLuaHistory = mCommandline->history();
-        mCommandline->set_history(mCachedRegularHistory);
-        mCommandline->set_prompt("> ");
+        mCachedLuaHistory = mCommandline.history();
+        mCommandline.set_history(mCachedRegularHistory);
+        mCommandline.set_prompt("> ");
        mStateId = mDefaultStateId;
    }
 }
@@ -221,14 +253,17 @@ void TConsole::Command_Help(const std::string&, const std::vector<std::string>&
    static constexpr const char* sHelpString = R"(
    Commands:
        help                    displays this help
-        exit                    shuts down the server
+        exit
+        quit                    shuts down the server
        kick <name> [reason]    kicks specified player with an optional reason
        list                    lists all players and info about them
        say <message>           sends the message to all players in chat
        lua [state id]          switches to lua, optionally into a specific state id's lua
        settings [command]      sets or gets settings for the server, run `settings help` for more info
        status                  how the server is doing and what it's up to
-        clear                   clears the console window)";
+        debug                   internal error and debug state of the server (for development)
+        clear                   clears the console window
+        version                 version info)";
    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
 }

@@ -245,35 +280,118 @@ void TConsole::Command_Clear(const std::string&, const std::vector<std::string>&
    if (!EnsureArgsCount(args, 0, size_t(-1))) {
        return;
    }
-    mCommandline->write("\x1b[;H\x1b[2J");
+    mCommandline.write("\x1b[;H\x1b[2J");
+}
+
+void TConsole::Command_Debug(const std::string&, const std::vector<std::string>& args) {
+    if (!EnsureArgsCount(args, 0)) {
+        return;
+    }
+    Application::Console().WriteRaw(fmt::format(R"(Debug info (for developers):
+    UDP:
+        Malformed packets:  {}
+        Invalid packets:    {})",
+        Application::MalformedUdpPackets,
+        Application::InvalidUdpPackets));
+    Application::Console().WriteRaw(fmt::format(R"(    Clients:
+        Note: All data/second rates are an average across the total time since
+              connection and do not necessarily reflect the *current* data rate
+              of that client.
+)"));
+    mLuaEngine->Server().ForEachClient([&](const auto& Client) {
+        std::string State = "";
+        if (Client->IsSyncing()) {
+            State += "Syncing";
+        }
+        if (Client->IsSynced()) {
+            if (!State.empty()) {
+                State += " & ";
+            }
+            State += "Synced";
+        }
+        if (Client->IsConnected()) {
+            if (!State.empty()) {
+                State += " & ";
+            }
+            State += "Connected";
+        }
+        if (Client->IsDisconnected()) {
+            if (!State.empty()) {
+                State += " & ";
+            }
+            State += "Disconnected";
+        }
+        auto Now = TimeType::now();
+        auto Seconds = std::chrono::duration_cast<std::chrono::seconds>(Now - Client->ConnectionTime);
+        std::string ConnectedSince = fmt::format("{:%Y/%m/%d %H:%M:%S}, {:%H:%M:%S} ago ({} seconds)",
+            fmt::localtime(TimeType::to_time_t(Client->ConnectionTime)),
+            Seconds,
+            Seconds.count());
+        Application::Console().WriteRaw(fmt::format(
+            R"(        {} ('{}'):
+            Roles:              {}
+            Cars:               {}
+            Is guest:           {}
+            Has unicycle:       {}
+            TCP:                {} (on port {})
+            UDP:                {} (on port {})
+            Sent via TCP:       {}
+            Received via TCP:   {}
+            Sent via UDP:       {} ({} packets)
+            Received via UDP:   {} ({} packets)
+            Status:             {}
+            Queued packets:     {}
+            Latest packet:      {}s ago
+            Connected since:    {}
+            Average send:       {}/s
+            Average receive:    {}/s)",
+            Client->GetID(), Client->GetName(),
+            Client->GetRoles(),
+            Client->GetCarCount(),
+            Client->IsGuest() ? "yes" : "no",
+            Client->GetUnicycleID() == -1 ? "no" : "yes",
+            Client->GetTCPSock().remote_endpoint().address() == ip::address::from_string("0.0.0.0") ? "not connected" : "connected", Client->GetTCPSock().remote_endpoint().port(),
+            Client->GetUDPAddr().address() == ip::address::from_string("0.0.0.0") ? "NOT connected" : "connected", Client->GetUDPAddr().port(),
+            ToHumanReadableSize(Client->TcpSent),
+            ToHumanReadableSize(Client->TcpReceived),
+            ToHumanReadableSize(Client->UdpSent), Client->UdpPacketsSent,
+            ToHumanReadableSize(Client->UdpReceived), Client->UdpPacketsReceived,
+            State.empty() ? "None (likely pre-sync)" : State,
+            Client->MissedPacketQueueSize(),
+            Client->SecondsSinceLastPing(),
+            ConnectedSince,
+            ToHumanReadableSize((Client->TcpSent + Client->UdpSent) / Seconds.count()),
+            ToHumanReadableSize((Client->TcpReceived + Client->UdpReceived) / Seconds.count())));
+    });
+}
+
+void TConsole::Command_Version(const std::string&, const std::vector<std::string>& args) {
+    if (!EnsureArgsCount(args, 0)) {
+        return;
+    }
+    Application::Console().WriteRaw(fmt::format("BeamMP Server v{} ({})", Application::ServerVersionString(), BEAMMP_GIT_HASH));
 }

 void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
    if (!EnsureArgsCount(args, 1, size_t(-1))) {
        return;
    }
-    auto Name = args.at(0);
+    auto Name = boost::algorithm::to_lower_copy(args.at(0));
    std::string Reason = "Kicked by server console";
    if (args.size() > 1) {
        Reason = ConcatArgs({ args.begin() + 1, args.end() });
    }
    beammp_trace("attempt to kick '" + Name + "' for '" + Reason + "'");
    bool Kicked = false;
-    // TODO: this sucks, tolower is locale-dependent.
-    auto NameCompare = [](std::string Name1, std::string Name2) -> bool {
-        std::for_each(Name1.begin(), Name1.end(), [](char& c) { c = char(std::tolower(char(c))); });
-        std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = char(std::tolower(char(c))); });
-        return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
-    };
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*mLuaEngine->Server().ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
-            if (NameCompare(Client->Name.get(), Name)) {
-                mLuaEngine->Network().ClientKick(*Client, Reason);
-                Kicked = true;
-                return false;
-            }
-        return true;
-    });*/
+
+    mLuaEngine->Server().ForEachClient([&](const auto& Client) -> IterationDecision {
+        if (StringStartsWithLower(Client->GetName(), Name)) {
+            mLuaEngine->Network().ClientKick(*Client, Reason);
+            Kicked = true;
+            return Break;
+        }
+        return Continue;
+    });
    if (!Kicked) {
        Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
    } else {
@@ -337,16 +455,80 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
 }

 void TConsole::Command_Settings(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 1, 2)) {
+    if (!EnsureArgsCount(args, 1, 100)) {
        return;
    }
+
+    static const char* SETTINGS_HELP = R"(Settings:
+    settings help                   Displays this help
+    settings list                   Lists all settings
+    settings get <setting>          Prints the current value of the specified setting
+    settings set <setting> <value>  Sets the specified setting to the value)";
+    if (args.at(0) == "help") {
+        Application::Console().WriteRaw(SETTINGS_HELP);
+    } else if (args.at(0) == "list") {
+        Application::Console().WriteRaw("Available settings:");
+        Application::Console().WriteRaw(fmt::format("\t{:<25} {}", "<NAME>", "<CURRENT VALUE>"));
+        for (const auto& [k, v] : Application::mSettings) {
+            if (k == StrAuthKey) {
+                Application::Console().WriteRaw(fmt::format("\t{:<25} <key of length {}>", k, Application::SettingToString(v).size()));
+            } else {
+                Application::Console().WriteRaw(fmt::format("\t{:<25} {}", k, Application::SettingToString(v)));
+            }
+        }
+    } else if (args.at(0) == "get") {
+        if (args.size() < 2) {
+            Application::Console().WriteRaw("Not enough arguments: `settings get` requires a setting name.");
+        } else {
+            if (Application::mSettings.contains(args.at(1))) {
+                if (args.at(1) != StrAuthKey) {
+                    Application::Console().WriteRaw(fmt::format("{} = {}", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1)))));
+                } else {
+                    Application::Console().WriteRaw(fmt::format("{} = <key of length {}>", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1))).size()));
+                }
+            } else {
+                Application::Console().WriteRaw(fmt::format("Setting '{}' doesn't exist.", args.at(1)));
+            }
+        }
+    } else if (args.at(0) == "set") {
+        if (args.size() < 3) {
+            Application::Console().WriteRaw("Not enough arguments: `settings set` requires a setting name and value.");
+        } else {
+            if (args.at(1) == StrAuthKey) {
+                Application::Console().WriteRaw("It's not allowed to set the AuthKey during runtime.");
+            } else {
+                using namespace boost::spirit;
+                using qi::_1;
+                std::string ValueString = args.at(2);
+                Application::SettingValue Value;
+                qi::rule<std::string::iterator, std::string()> StringRule;
+                StringRule
+                    %= qi::lexeme['"' >> *(qi::char_ - '"') >> '"']
+                    | +(qi::char_ - '"');
+                qi::rule<std::string::iterator, Application::SettingValue()> ValueRule
+                    = qi::bool_
+                    | qi::int_
+                    | StringRule;
+                auto It = ValueString.begin();
+                if (qi::phrase_parse(It, ValueString.end(), ValueRule[boost::phoenix::ref(Value) = _1], ascii::space)
+                    && It == ValueString.end()) {
+                    Application::SetSetting(args.at(1), Value);
+                    Application::Console().WriteRaw(fmt::format("{} := {}", args.at(1), Application::SettingToString(Application::mSettings.at(args.at(1)))));
+                } else {
+                    Application::Console().WriteRaw(fmt::format("New value '{}' did not parse as a valid value.", ValueString));
+                }
+            }
+        }
+    } else {
+        Application::Console().WriteRaw(fmt::format("Unknown argument '{}' - 'settings {}' is not a valid command.", args.at(0), args.at(0)));
+    }
 }

 void TConsole::Command_Say(const std::string& FullCmd) {
    if (FullCmd.size() > 3) {
        auto Message = FullCmd.substr(4);
        LuaAPI::MP::SendChatMessage(-1, Message);
-        if (!Application::Settings.LogChat) {
+        if (!Application::GetSettingBool(StrLogChat)) {
            Application::Console().WriteRaw("Chat message sent!");
        }
    }
@@ -356,24 +538,19 @@ void TConsole::Command_List(const std::string&, const std::vector<std::string>&
    if (!EnsureArgsCount(args, 0)) {
        return;
    }
-    // Implement once running
-    throw std::runtime_error(fmt::format("NOT IMPLEMENTED: {}", __func__));
-    /*
    if (mLuaEngine->Server().ClientCount() == 0) {
        Application::Console().WriteRaw("No players online.");
    } else {
        std::stringstream ss;
        ss << std::left << std::setw(25) << "Name" << std::setw(6) << "ID" << std::setw(6) << "Cars" << std::endl;
-        mLuaEngine->Server().ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
-            ss << std::left << std::setw(25) << Client->Name.get()
-               << std::setw(6) << Client->ID.get()
+        mLuaEngine->Server().ForEachClient([&](const auto& Client) {
+            ss << std::left << std::setw(25) << Client->GetName()
+               << std::setw(6) << Client->GetID()
               << std::setw(6) << Client->GetCarCount() << "\n";
-            return true;
        });
        auto Str = ss.str();
        Application::Console().WriteRaw(Str.substr(0, Str.size() - 1));
    }
-*/
 }

 void TConsole::Command_Status(const std::string&, const std::vector<std::string>& args) {
@@ -382,6 +559,25 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    }
    std::stringstream Status;

+    size_t CarCount = 0;
+    size_t ConnectedCount = 0;
+    size_t GuestCount = 0;
+    size_t SyncedCount = 0;
+    size_t SyncingCount = 0;
+    size_t MissedPacketQueueSum = 0;
+    int LargestSecondsSinceLastPing = 0;
+    mLuaEngine->Server().ForEachClient([&](const auto& Client) {
+        CarCount += Client->GetCarCount();
+        ConnectedCount += Client->IsConnected() ? 1 : 0;
+        GuestCount += Client->IsGuest() ? 1 : 0;
+        SyncedCount += Client->IsSynced() ? 1 : 0;
+        SyncingCount += Client->IsSyncing() ? 1 : 0;
+        MissedPacketQueueSum += Client->MissedPacketQueueSize();
+        if (Client->SecondsSinceLastPing() < LargestSecondsSinceLastPing) {
+            LargestSecondsSinceLastPing = Client->SecondsSinceLastPing();
+        }
+    });
+
    size_t SystemsStarting = 0;
    size_t SystemsGood = 0;
    size_t SystemsBad = 0;
@@ -426,21 +622,15 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    SystemsShuttingDownList = SystemsShuttingDownList.substr(0, SystemsShuttingDownList.size() - 2);
    SystemsShutdownList = SystemsShutdownList.substr(0, SystemsShutdownList.size() - 2);

-    auto ElapsedTime = mUptimeTimer.GetElapsedTime();
-
-    auto network = mLuaEngine->Network();
-    auto clients = network->all_clients();
+    auto ElapsedTime = mLuaEngine->Server().UptimeTimer.GetElapsedTime();

    Status << "BeamMP-Server Status:\n"
-           << "\tTotal Players:             " << clients.size() << "\n"
-           << "\tPlayers identifying:       " << network->clients_in_state_count(bmp::State::Identification) << "\n"
-           << "\tPlayers authenticating:    " << network->clients_in_state_count(bmp::State::Authentication) << "\n"
-           << "\tPlayers downloading mods:  " << network->clients_in_state_count(bmp::State::ModDownload) << "\n"
-           << "\tPlayers spawning in:       " << network->clients_in_state_count(bmp::State::SessionSetup) << "\n"
-           << "\tPlayers playing:           " << network->clients_in_state_count(bmp::State::Playing) << "\n"
-           << "\tPlayers leaving:           " << network->clients_in_state_count(bmp::State::Leaving) << "\n"
-           << "\tGuests:                    " << network->guest_count() << "\n"
-           << "\tVehicles:                  " << network->vehicle_count() << "\n"
+           << "\tTotal Players:             " << mLuaEngine->Server().ClientCount() << "\n"
+           << "\tSyncing Players:           " << SyncingCount << "\n"
+           << "\tSynced Players:            " << SyncedCount << "\n"
+           << "\tConnected Players:         " << ConnectedCount << "\n"
+           << "\tGuests:                    " << GuestCount << "\n"
+           << "\tCars:                      " << CarCount << "\n"
           << "\tUptime:                    " << ElapsedTime << "ms (~" << size_t(double(ElapsedTime) / 1000.0 / 60.0 / 60.0) << "h) \n"
           << "\tLua:\n"
           << "\t\tQueued results to check:     " << mLuaEngine->GetResultsToCheckSize() << "\n"
@@ -460,6 +650,55 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    Application::Console().WriteRaw(Status.str());
 }

+void TConsole::Autocomplete_Lua(const std::string& stub, std::vector<std::string>& suggestions) {
+    auto stateNames = mLuaEngine->GetLuaStateNames();
+
+    for (const auto& name : stateNames) {
+        if (name.find(stub) == 0) {
+            suggestions.push_back("lua " + name);
+        }
+    }
+}
+
+void TConsole::Autocomplete_Kick(const std::string& stub, std::vector<std::string>& suggestions) {
+    std::string stub_lower = boost::algorithm::to_lower_copy(stub);
+
+    mLuaEngine->Server().ForEachClient([&](const auto& Client) {
+        if (StringStartsWithLower(Client->GetName(), stub_lower)) {
+            suggestions.push_back("kick " + Client->GetName());
+        }
+    });
+}
+
+void TConsole::Autocomplete_Settings(const std::string& stub, std::vector<std::string>& suggestions) {
+    const std::string subcommands[] = { "help", "list", "set", "get" };
+
+    auto [command, args] = ParseCommand(stub);
+
+    std::string arg;
+    if (!args.empty())
+        arg = boost::algorithm::to_lower_copy(args.at(0));
+
+    // suggest setting names
+    if (command == "set" || command == "get") {
+        for (const auto& [k, v] : Application::mSettings) {
+            std::string key = std::string(k);
+            if (StringStartsWithLower(key, arg)) {
+                suggestions.push_back("settings " + command + " " + key);
+            }
+        }
+
+        return;
+    }
+
+    // suggest subcommands
+    for (const auto& cmd : subcommands) {
+        if (cmd.find(command) == 0) {
+            suggestions.push_back("settings " + cmd);
+        }
+    }
+}
+
 void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
    auto FutureIsNonNil =
        [](const std::shared_ptr<TLuaResult>& Future) {
@@ -559,20 +798,15 @@ Commands
 }

 TConsole::TConsole() {
-}
-
-void TConsole::InitializeCommandline() {
-    mCommandline = std::make_unique<Commandline>();
-    mCommandline->enable_history();
-    mCommandline->set_history_limit(20);
-    mCommandline->set_prompt("> ");
+    mCommandline.enable_history();
+    mCommandline.set_history_limit(20);
    BackupOldLog();
-    mCommandline->on_command = [this](Commandline& c) {
+    mCommandline.on_command = [this](Commandline& c) {
        try {
            auto TrimmedCmd = c.get_command();
            TrimmedCmd = TrimString(TrimmedCmd);
            auto [cmd, args] = ParseCommand(TrimmedCmd);
-            mCommandline->write(mCommandline->prompt() + TrimmedCmd);
+            mCommandline.write(mCommandline.prompt() + TrimmedCmd);
            if (mIsLuaConsole) {
                if (!mLuaEngine) {
                    beammp_info("Lua not started yet, please try again in a second");
@@ -580,7 +814,9 @@ void TConsole::InitializeCommandline() {
                    HandleLuaInternalCommand(cmd.substr(1));
                } else {
                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    Future->WaitUntilReady();
+                    while (!Future->Ready) {
+                        std::this_thread::yield(); // TODO: Add a timeout
+                    }
                    if (Future->Error) {
                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                    }
@@ -588,7 +824,7 @@ void TConsole::InitializeCommandline() {
            } else {
                if (!mLuaEngine) {
                    beammp_error("Attempted to run a command before Lua engine started. Please wait and try again.");
-                } else if (cmd == "exit") {
+                } else if (cmd == "exit" || cmd == "quit") {
                    beammp_info("gracefully shutting down");
                    Application::GracefullyShutdown();
                } else if (cmd == "say") {
@@ -607,7 +843,7 @@ void TConsole::InitializeCommandline() {
            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
        }
    };
-    mCommandline->on_autocomplete = [this](Commandline&, std::string stub, int) {
+    mCommandline.on_autocomplete = [this](Commandline&, std::string stub, int) {
        std::vector<std::string> suggestions;
        try {
            if (mIsLuaConsole) { // if lua
@@ -650,16 +886,15 @@ void TConsole::InitializeCommandline() {
                    }
                }
            } else { // if not lua
-                if (stub.find("lua") == 0) { // starts with "lua" means we should suggest state names
-                    std::string after_prefix = TrimString(stub.substr(3));
-                    auto stateNames = mLuaEngine->GetLuaStateNames();
-
-                    for (const auto& name : stateNames) {
-                        if (name.find(after_prefix) == 0) {
-                            suggestions.push_back("lua " + name);
-                        }
+                for (const auto& [cmd_name, autocomplete_fn] : mCommandAutocompleteMap) {
+                    if (stub.find(cmd_name) == 0) { // input starts with a full command (that has autocomplete)
+                        std::size_t cmd_len = cmd_name.length();
+                        std::string trimmed = TrimString(stub.substr(cmd_len));
+                        autocomplete_fn(trimmed, suggestions);
+                        break;
                    }
-                } else {
+                }
+                if (suggestions.empty()) {
                    for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
                        if (cmd_name.find(stub) == 0) {
                            suggestions.push_back(cmd_name);
@@ -677,21 +912,11 @@ void TConsole::InitializeCommandline() {

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

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

 void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
@@ -1,7 +1,8 @@
 #include "THeartbeatThread.h"

+#include "Client.h"
 #include "Http.h"
-// #include "SocketIO.h"
+//#include "SocketIO.h"
 #include <rapidjson/document.h>
 #include <rapidjson/rapidjson.h>
 #include <sstream>
@@ -16,14 +17,14 @@ void THeartbeatThread::operator()() {
    // these are "hot-change" related variables
    static std::string Last;

-    static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::now();
+    static TimeType::time_point LastNormalUpdateTime = TimeType::now();
    bool isAuth = false;
    size_t UpdateReminderCounter = 0;
    while (!Application::IsShuttingDown()) {
        ++UpdateReminderCounter;
        Body = GenerateCall();
        // a hot-change occurs when a setting has changed, to update the backend of that change.
-        auto Now = std::chrono::high_resolution_clock::now();
+        auto Now = TimeType::now();
        bool Unchanged = Last == Body;
        auto TimePassed = (Now - LastNormalUpdateTime);
        auto Threshold = Unchanged ? 30 : 5;
@@ -35,10 +36,20 @@ void THeartbeatThread::operator()() {

        Last = Body;
        LastNormalUpdateTime = Now;
-        if (!Application::Settings.CustomIP.empty()) {
-            Body += "&ip=" + Application::Settings.CustomIP;
+        if (!Application::GetSettingString(StrCustomIP).empty()) {
+            Body += "&ip=" + Application::GetSettingString(StrCustomIP);
        }

+        auto SentryReportError = [&](const std::string& transaction, int status) {
+            auto Lock = Sentry.CreateExclusiveContext();
+            Sentry.SetContext("heartbeat",
+                { { "response-body", T },
+                    { "request-body", Body } });
+            Sentry.SetTransaction(transaction);
+            beammp_trace("sending log to sentry: " + std::to_string(status) + " for " + transaction);
+            Sentry.Log(SentryLevel::Error, "default", Http::Status::ToString(status) + " (" + std::to_string(status) + ")");
+        };
+
        auto Target = "/heartbeat";
        unsigned int ResponseCode = 0;

@@ -48,12 +59,14 @@ void THeartbeatThread::operator()() {
            T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
            Doc.Parse(T.data(), T.size());
            if (Doc.HasParseError() || !Doc.IsObject()) {
-                if (!Application::Settings.Private) {
+                if (!Application::GetSettingBool(StrPrivate)) {
                    beammp_trace("Backend response failed to parse as valid json");
                    beammp_trace("Response was: `" + T + "`");
                }
+                Sentry.SetContext("JSON Response", { { "reponse", T } });
+                SentryReportError(Url + Target, ResponseCode);
            } else if (ResponseCode != 200) {
-                beammp_errorf("Response code from the heartbeat: {}", ResponseCode);
+                SentryReportError(Url + Target, ResponseCode);
            } else {
                // all ok
                Ok = true;
@@ -72,28 +85,32 @@ void THeartbeatThread::operator()() {
            if (Doc.HasMember(StatusKey) && Doc[StatusKey].IsString()) {
                Status = Doc[StatusKey].GetString();
            } else {
+                Sentry.SetContext("JSON Response", { { StatusKey, "invalid string / missing" } });
                Ok = false;
            }
            if (Doc.HasMember(CodeKey) && Doc[CodeKey].IsString()) {
                Code = Doc[CodeKey].GetString();
            } else {
+                Sentry.SetContext("JSON Response", { { CodeKey, "invalid string / missing" } });
                Ok = false;
            }
            if (Doc.HasMember(MessageKey) && Doc[MessageKey].IsString()) {
                Message = Doc[MessageKey].GetString();
            } else {
+                Sentry.SetContext("JSON Response", { { MessageKey, "invalid string / missing" } });
                Ok = false;
            }
            if (!Ok) {
                beammp_error("Missing/invalid json members in backend response");
+                Sentry.LogError("Missing/invalid json members in backend response", __FILE__, std::to_string(__LINE__));
            }
        } else {
-            if (!Application::Settings.Private) {
+            if (!Application::GetSettingBool(StrPrivate)) {
                beammp_warn("Backend failed to respond to a heartbeat. Your server may temporarily disappear from the server list. This is not an error, and will likely resolve itself soon. Direct connect will still work.");
            }
        }

-        if (Ok && !isAuth && !Application::Settings.Private) {
+        if (Ok && !isAuth && !Application::GetSettingBool(StrPrivate)) {
            if (Status == "2000") {
                beammp_info(("Authenticated! " + Message));
                isAuth = true;
@@ -107,10 +124,10 @@ void THeartbeatThread::operator()() {
                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
            }
        }
-        if (isAuth || Application::Settings.Private) {
+        if (isAuth || Application::GetSettingBool(StrPrivate)) {
            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
        }
-        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
+        if (!Application::GetSettingBool(StrHideUpdateMessages) && UpdateReminderCounter % 5) {
            Application::CheckForUpdates();
        }
    }
@@ -119,26 +136,25 @@ void THeartbeatThread::operator()() {
 std::string THeartbeatThread::GenerateCall() {
    std::stringstream Ret;

-    Ret << "uuid=" << Application::Settings.Key
-        << "&players=" << m_network->authenticated_client_count()
-        << "&maxplayers=" << Application::Settings.MaxPlayers
-        << "&port=" << Application::Settings.Port
-        << "&map=" << Application::Settings.MapName
-        << "&private=" << (Application::Settings.Private ? "true" : "false")
+    Ret << "uuid=" << Application::GetSettingString(StrAuthKey)
+        << "&players=" << mServer.ClientCount()
+        << "&maxplayers=" << Application::GetSettingInt(StrMaxPlayers)
+        << "&port=" << Application::GetSettingInt(StrPort)
+        << "&map=" << Application::GetSettingString(StrMap)
+        << "&private=" << (Application::GetSettingBool(StrPrivate) ? "true" : "false")
        << "&version=" << Application::ServerVersionString()
        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
-        << "&name=" << Application::Settings.ServerName
-        << "&tags=" << Application::Settings.ServerTags
-        << "&modlist=" << "-"//mResourceManager.TrimmedList()
-        << "&modstotalsize=" << 0 //mResourceManager.MaxModSize()
-        << "&modstotal=" << 0 // mResourceManager.ModsLoaded()
+        << "&name=" << Application::GetSettingString(StrName)
+        << "&modlist=" << TResourceManager::FormatForBackend(mResourceManager.FileMap())
+        << "&modstotalsize=" << mResourceManager.TotalModsSize()
+        << "&modstotal=" << mResourceManager.LoadedModCount()
        << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.ServerDesc
-        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
+        << "&desc=" << Application::GetSettingString(StrDescription);
    return Ret.str();
 }
-THeartbeatThread::THeartbeatThread(std::shared_ptr<Network> network)
-    : m_network(std::move(network)) {
+THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
+    : mResourceManager(ResourceManager)
+    , mServer(Server) {
    Application::SetSubsystemStatus("Heartbeat", Application::Status::Starting);
    Application::RegisterShutdownHandler([&] {
        Application::SetSubsystemStatus("Heartbeat", Application::Status::ShuttingDown);
@@ -150,10 +166,11 @@ THeartbeatThread::THeartbeatThread(std::shared_ptr<Network> network)
    Start();
 }
 std::string THeartbeatThread::GetPlayers() {
-    std::string players;
-    for (const auto& [id, client] : m_network->authenticated_clients()) {
-        players += client->name.get() + ";";
-    }
-    return players;
+    std::string Return;
+    mServer.ForEachClient([&](const auto& Client) {
+        Return += Client->GetName() + ";";
+    });
+    return Return;
 }
-
+/*THeartbeatThread::~THeartbeatThread() {
+}*/
@@ -1,9 +1,11 @@
 #include "TLuaEngine.h"
+#include "Client.h"
 #include "CustomAssert.h"
 #include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaPlugin.h"
-#include "sol/object.hpp"
+#include "Uuid.h"
+#include "sol/types.hpp"

 #include <chrono>
 #include <condition_variable>
@@ -15,11 +17,11 @@
 TLuaEngine* LuaAPI::MP::Engine;

 TLuaEngine::TLuaEngine()
-    : mResourceServerPath(fs::path(Application::Settings.Resource) / "Server") {
+    : mResourceServerPath(fs::path(Application::GetSettingString(StrResourceFolder)) / "Server") {
    Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
    LuaAPI::MP::Engine = this;
-    if (!fs::exists(Application::Settings.Resource)) {
-        fs::create_directory(Application::Settings.Resource);
+    if (!fs::exists(Application::GetSettingString(StrResourceFolder))) {
+        fs::create_directory(Application::GetSettingString(StrResourceFolder));
    }
    if (!fs::exists(mResourceServerPath)) {
        fs::create_directory(mResourceServerPath);
@@ -31,16 +33,16 @@ TLuaEngine::TLuaEngine()
        }
        Application::SetSubsystemStatus("LuaEngine", Application::Status::Shutdown);
    });
-    mThread = boost::scoped_thread<>(&TLuaEngine::Start, this);
+    IThreaded::Start();
 }

 TEST_CASE("TLuaEngine ctor & dtor") {
-    Application::Settings.Resource = "beammp_server_test_resources";
+    Application::SetSetting(StrResourceFolder, "beammp_server_test_resources");
    TLuaEngine engine;
    Application::GracefullyShutdown();
 }

-void TLuaEngine::Start() {
+void TLuaEngine::operator()() {
    RegisterThread("LuaEngine");
    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
    // lua engine main thread
@@ -70,13 +72,12 @@ void TLuaEngine::Start() {
                    }
                    return false;
                });
-            } else {
-                mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
            }
+            mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(10));
        }
    });
    // event loop
-    auto Before = std::chrono::high_resolution_clock::now();
+    auto Before = TimeType::now();
    while (!Application::IsShuttingDown()) {
        { // Timed Events Scope
            std::unique_lock Lock(mTimedEventsMutex);
@@ -109,14 +110,14 @@ void TLuaEngine::Start() {
        } else {
            constexpr double NsFactor = 1000000.0;
            constexpr double Expected = 10.0; // ms
-            const auto Diff = (std::chrono::high_resolution_clock::now() - Before).count() / NsFactor;
+            const auto Diff = (TimeType::now() - Before).count() / NsFactor;
            if (Diff < Expected) {
                std::this_thread::sleep_for(std::chrono::nanoseconds(size_t((Expected - Diff) * NsFactor)));
            } else {
                beammp_tracef("Event loop cannot keep up! Running {}ms behind", Diff);
            }
        }
-        Before = std::chrono::high_resolution_clock::now();
+        Before = TimeType::now();
    }

    if (ResultCheckThread.joinable()) {
@@ -252,11 +253,15 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const st
        } else if (i == keys.size() - 1) {
            if (obj.get_type() == sol::type::table) {
                for (const auto& [key, value] : obj.as<sol::table>()) {
-                    std::string s = key.as<std::string>();
-                    if (value.get_type() == sol::type::function) {
-                        s += "(";
+                    if (key.get_type() == sol::type::string) {
+                        std::string s = key.as<std::string>();
+
+                        if (value.get_type() == sol::type::function) {
+                            s += "(";
+                        }
+
+                        Result.push_back(s);
                    }
-                    Result.push_back(s);
                }
            } else {
                Result = { obj.as<std::string>() };
@@ -280,12 +285,11 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const st

 */

-void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<std::chrono::high_resolution_clock::duration>& Max) {
+void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<TimeType::duration>& Max) {
    for (const auto& Result : Results) {
        bool Cancelled = false;
        size_t ms = 0;
        std::set<std::string> WarnedResults;
-
        while (!Result->Ready && !Cancelled) {
            std::this_thread::sleep_for(std::chrono::milliseconds(10));
            ms += 10;
@@ -300,7 +304,6 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                }
            }
        }
-
        if (Cancelled) {
            beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
            LuaAPI::MP::Engine->ReportErrors({ Result });
@@ -331,7 +334,7 @@ std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const
    return mLuaStates.at(StateID)->EnqueueScript(Script);
 }

-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
    std::unique_lock Lock(mLuaStatesMutex);
    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
 }
@@ -411,13 +414,55 @@ std::set<std::string> TLuaEngine::GetEventHandlersForState(const std::string& Ev
    return mLuaEvents[EventName][StateId];
 }

+std::vector<sol::object> TLuaEngine::StateThreadData::JsonStringToArray(JsonString Str) {
+    auto LocalTable = Lua_JsonDecode(Str.value).as<std::vector<sol::object>>();
+    for (auto& value : LocalTable) {
+        if (value.is<std::string>() && value.as<std::string>() == BEAMMP_INTERNAL_NIL) {
+            value = sol::object {};
+        }
+    }
+    return LocalTable;
+}
+
 sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
-    auto Return = mEngine->TriggerEvent(EventName, mStateId, EventArgs);
+    auto Table = mStateView.create_table();
+    for (const sol::stack_proxy& Arg : EventArgs) {
+        switch (Arg.get_type()) {
+        case sol::type::none:
+        case sol::type::userdata:
+        case sol::type::lightuserdata:
+        case sol::type::thread:
+        case sol::type::function:
+        case sol::type::poly:
+            Table.add(BEAMMP_INTERNAL_NIL);
+            beammp_warnf("Passed a value of type '{}' to TriggerGlobalEvent(\"{}\", ...). This type can not be serialized, and cannot be passed between states. It will arrive as <nil> in handlers.", sol::type_name(EventArgs.lua_state(), Arg.get_type()), EventName);
+            break;
+        case sol::type::lua_nil:
+            Table.add(BEAMMP_INTERNAL_NIL);
+            break;
+        case sol::type::string:
+        case sol::type::number:
+        case sol::type::boolean:
+        case sol::type::table:
+            Table.add(Arg);
+            break;
+        }
+    }
+    JsonString Str { "" };
+    if (!Table.empty()) {
+        Str.value = LuaAPI::MP::JsonEncode(Table);
+    }
+
+    auto Return = mEngine->TriggerEvent(EventName, mStateId, Str);
+    mEngine->ReportErrors(Return);
    auto MyHandlers = mEngine->GetEventHandlersForState(EventName, mStateId);
+
+    sol::variadic_results LocalArgs = Str.value.empty() ? sol::variadic_results {} : JsonStringToArray(Str);
+
    for (const auto& Handler : MyHandlers) {
        auto Fn = mStateView[Handler];
        if (Fn.valid()) {
-            auto LuaResult = Fn(EventArgs);
+            auto LuaResult = LocalArgs.empty() ? Fn() : Fn(LocalArgs);
            auto Result = std::make_shared<TLuaResult>();
            if (LuaResult.valid()) {
                Result->Error = false;
@@ -426,7 +471,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                Result->Error = true;
                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
            }
-            Result->MarkAsReady();
+            Result->Ready = true;
            Return.push_back(Result);
        }
    }
@@ -456,36 +501,49 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
            }
            return Result;
        });
+    AsyncEventReturn.set_function("Wait",
+        [](const sol::table& Self, std::optional<float> TimeoutS) {
+            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
+            if (TimeoutS.has_value()) {
+                TLuaEngine::WaitForAll(Vector, std::chrono::milliseconds(size_t(TimeoutS.value() * 1000.0f)));
+            } else {
+                TLuaEngine::WaitForAll(Vector);
+            }
+        });
    return AsyncEventReturn;
 }

 sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
    // TODO: make asynchronous?
-    sol::table Result = mStateView.create_table();
+    auto Result = mStateView.create_table();
    for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) {
        auto Fn = mStateView[Handler];
        if (Fn.valid() && Fn.get_type() == sol::type::function) {
            auto FnRet = Fn(EventArgs);
            if (FnRet.valid()) {
-                Result.add(FnRet);
+                for (const auto& Res : FnRet) {
+                    Result.add(Res);
+                }
            } else {
                sol::error Err = FnRet;
                beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
            }
+        } else {
+            beammp_lua_errorf("Handler '{}' for event '{}' in state '{}' is NOT a function, and will be ignored.", Handler, EventName, mStateId);
        }
    }
    return Result;
 }

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
-    auto MaybeClient = mEngine->Network()->get_client(ClientID(ID), bmp::State::Authentication);
-    if (MaybeClient) {
-        auto IDs = MaybeClient.value()->identifiers.synchronize();
-        if (IDs->empty()) {
+    auto Client = GetClient(mEngine->Server(), ID);
+    if (Client) {
+        auto IDs = Client->GetIdentifiers();
+        if (IDs.empty()) {
            return sol::lua_nil;
        }
        sol::table Result = mStateView.create_table();
-        for (const auto& Pair : *IDs) {
+        for (const auto& Pair : IDs) {
            Result[Pair.first] = Pair.second;
        }
        return Result;
@@ -495,22 +553,23 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
 }

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
-    sol::table result = mStateView.create_table();
-    auto clients = mEngine->Network()->authenticated_clients();
-    for (const auto& [id, client] : clients) {
-        result[client->id] = client->name.get();
-    }
-    return result;
+    sol::table Result = mStateView.create_table();
+    mEngine->Server().ForEachClient([&](const auto& Client) {
+        Result[Client->GetID()] = Client->GetName();
+    });
+    return Result;
 }

 int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
-    auto clients = mEngine->Network()->authenticated_clients();
-    for (const auto& [id, client] : clients) {
-        if (client->name.get() == Name) {
-            return int(client->id);
+    int Id = -1;
+    mEngine->mServer->ForEachClient([&Id, &Name](const auto& Client) -> IterationDecision {
+        if (Client->GetName() == Name) {
+            Id = Client->GetID();
+            return Break;
        }
-    }
-    return -1;
+        return Continue;
+    });
+    return Id;
 }

 sol::table TLuaEngine::StateThreadData::Lua_FS_ListFiles(const std::string& Path) {
@@ -540,51 +599,58 @@ sol::table TLuaEngine::StateThreadData::Lua_FS_ListDirectories(const std::string
 }

 std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
-    auto maybe_client = mEngine->Network()->get_client(ClientID(ID), bmp::State::Authentication);
-    if (maybe_client) {
-        return maybe_client.value()->name.get();
+    auto Client = GetClient(mEngine->Server(), ID);
+    if (Client) {
+        return Client->GetName();
    } else {
        return "";
    }
 }

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
-    auto vehicles = mEngine->Network()->get_vehicles_owned_by(ClientID(ID));
-    if (vehicles.empty()) {
+    auto Client = GetClient(mEngine->Server(), ID);
+    if (Client) {
+        TClient::TSetOfVehicleData VehicleData;
+        { // Vehicle Data Lock Scope
+            auto LockedData = Client->GetAllCars();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (VehicleData.empty()) {
+            return sol::lua_nil;
+        }
+        sol::state_view StateView(mState);
+        sol::table Result = StateView.create_table();
+        for (const auto& v : VehicleData) {
+            Result[v.ID()] = v.Data().substr(3);
+        }
+        return Result;
+    } else
        return sol::lua_nil;
-    }
-    sol::state_view state_view(mState);
-    sol::table result = state_view.create_table();
-    for (const auto& [vid, vehicle] : vehicles) {
-        result[vid] = vehicle->data.get();
-    }
-    return result;
 }

-std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetVehicleStatus(int VID) {
-    auto maybe_vehicle = mEngine->Network()->get_vehicle(VehicleID(VID));
-    if (maybe_vehicle) {
-        sol::state_view state_view(mState);
-        sol::table result = state_view.create_table();
-        auto veh = maybe_vehicle.value();
-        auto status = veh->get_status();
-        result["pos"]["x"] = status.pos.x;
-        result["pos"]["y"] = status.pos.y;
-        result["pos"]["z"] = status.pos.z;
-        result["vel"]["x"] = status.vel.x;
-        result["vel"]["y"] = status.vel.y;
-        result["vel"]["z"] = status.vel.z;
-        result["rvel"]["x"] = status.rvel.x;
-        result["rvel"]["y"] = status.rvel.y;
-        result["rvel"]["z"] = status.rvel.z;
-        result["rot"]["x"] = status.rot.x;
-        result["rot"]["y"] = status.rot.y;
-        result["rot"]["z"] = status.rot.z;
-        result["rot"]["w"] = status.rot.w;
-        result["time"] = status.time;
-        return { result, "" };
+std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetPositionRaw(int PID, int VID) {
+    std::pair<sol::table, std::string> Result;
+    auto Client = GetClient(mEngine->Server(), PID);
+    if (Client) {
+        std::string VehiclePos = Client->GetCarPositionRaw(VID);
+
+        if (VehiclePos.empty()) {
+            // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Vehicle not found"));
+            Result.second = "Vehicle not found";
+            return Result;
+        }
+
+        sol::table t = Lua_JsonDecode(VehiclePos);
+        if (t == sol::lua_nil) {
+            Result.second = "Packet decode failed";
+        }
+        // return std::make_tuple(Result, sol::make_object(StateView, sol::lua_nil));
+        Result.first = t;
+        return Result;
    } else {
-        return { sol::lua_nil, fmt::format("Vehicle {} not found", VID) };
+        // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Client expired"));
+        Result.second = "Client expired";
+        return Result;
    }
 }

@@ -710,14 +776,14 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("CreateTimer", [&]() -> sol::table {
        sol::state_view StateView(mState);
        sol::table Result = StateView.create_table();
-        Result["__StartTime"] = std::chrono::high_resolution_clock::now();
+        Result["__StartTime"] = TimeType::now();
        Result.set_function("GetCurrent", [&](const sol::table& Table) -> float {
-            auto End = std::chrono::high_resolution_clock::now();
-            auto Start = Table.get<std::chrono::high_resolution_clock::time_point>("__StartTime");
+            auto End = TimeType::now();
+            auto Start = Table.get<TimeType::time_point>("__StartTime");
            return std::chrono::duration_cast<std::chrono::microseconds>(End - Start).count() / 1000000.0f;
        });
        Result.set_function("Start", [&](sol::table Table) {
-            Table["__StartTime"] = std::chrono::high_resolution_clock::now();
+            Table["__StartTime"] = TimeType::now();
        });
        return Result;
    });
@@ -729,9 +795,10 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("TriggerGlobalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
        return Lua_TriggerGlobalEvent(EventName, EventArgs);
    });
-    MPTable.set_function("TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
-        return Lua_TriggerLocalEvent(EventName, EventArgs);
-    });
+    MPTable.set_function(
+        "TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> auto{
+            return Lua_TriggerLocalEvent(EventName, EventArgs);
+        });
    MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent);
    MPTable.set_function("TriggerClientEventJson", &LuaAPI::MP::TriggerClientEventJson);
    MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount);
@@ -746,8 +813,8 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("GetPlayerVehicles", [&](int ID) -> sol::table {
        return Lua_GetPlayerVehicles(ID);
    });
-    MPTable.set_function("GetVehicleStatus", [&](int VID) -> std::pair<sol::table, std::string> {
-        return Lua_GetVehicleStatus(VID);
+    MPTable.set_function("GetPositionRaw", [&](int PID, int VID) -> std::pair<sol::table, std::string> {
+        return Lua_GetPositionRaw(PID, VID);
    });
    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
    MPTable.set_function("GetPlayers", [&]() -> sol::table {
@@ -802,6 +869,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    UtilTable.set_function("JsonUnflatten", &LuaAPI::MP::JsonUnflatten);
    UtilTable.set_function("JsonPrettify", &LuaAPI::MP::JsonPrettify);
    UtilTable.set_function("JsonMinify", &LuaAPI::MP::JsonMinify);
+    UtilTable.set_function("GenerateUUID", &uuid::GenerateUuid);
    UtilTable.set_function("Random", [this] {
        return mUniformRealDistribution01(mMersenneTwister);
    });
@@ -848,7 +916,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    FSTable.set_function("ListDirectories", [this](const std::string& Path) {
        return Lua_FS_ListDirectories(Path);
    });
-    mThread = boost::scoped_thread<>(&StateThreadData::Start, this);
+    Start();
 }

 std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLuaChunk& Script) {
@@ -858,7 +926,7 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueScript(const TLu
    return Result;
 }

-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy) {
    // TODO: Document all this
    decltype(mStateFunctionQueue)::iterator Iter = mStateFunctionQueue.end();
    if (Strategy == CallStrategy::BestEffort) {
@@ -880,7 +948,7 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFrom
    }
 }

-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
    auto Result = std::make_shared<TLuaResult>();
    Result->StateId = mStateId;
    Result->Function = FunctionName;
@@ -894,7 +962,7 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co
    mEngine->RegisterEvent(EventName, mStateId, FunctionName);
 }

-void TLuaEngine::StateThreadData::Start() {
+void TLuaEngine::StateThreadData::operator()() {
    RegisterThread("Lua:" + mStateId);
    while (!Application::IsShuttingDown()) {
        { // StateExecuteQueue Scope
@@ -939,7 +1007,7 @@ void TLuaEngine::StateThreadData::Start() {
                    sol::error Err = Res;
                    S.second->ErrorMessage = Err.what();
                }
-                S.second->MarkAsReady();
+                S.second->Ready = true;
            }
        }
        { // StateFunctionQueue Scope
@@ -965,19 +1033,24 @@ void TLuaEngine::StateThreadData::Start() {
                            continue;
                        }
                        switch (Arg.index()) {
-                        case TLuaArgTypes_String:
+                        case TLuaType::String:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<std::string>(Arg)));
                            break;
-                        case TLuaArgTypes_Int:
+                        case TLuaType::Int:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<int>(Arg)));
                            break;
-                        case TLuaArgTypes_VariadicArgs:
-                            LuaArgs.push_back(sol::make_object(StateView, std::get<sol::variadic_args>(Arg)));
+                        case TLuaType::Json: {
+                            auto Str = std::get<JsonString>(Arg);
+                            if (!Str.value.empty()) {
+                                auto LocalArgs = JsonStringToArray(Str);
+                                LuaArgs.insert(LuaArgs.end(), LocalArgs.begin(), LocalArgs.end());
+                            }
                            break;
-                        case TLuaArgTypes_Bool:
+                        }
+                        case TLuaType::Bool:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
                            break;
-                        case TLuaArgTypes_StringStringMap: {
+                        case TLuaType::StringStringMap: {
                            auto Map = std::get<std::unordered_map<std::string, std::string>>(Arg);
                            auto Table = StateView.create_table();
                            for (const auto& [k, v] : Map) {
@@ -986,6 +1059,15 @@ void TLuaEngine::StateThreadData::Start() {
                            LuaArgs.push_back(sol::make_object(StateView, Table));
                            break;
                        }
+                        case TLuaType::StringSizeTMap: {
+                            auto Map = std::get<std::unordered_map<std::string, size_t>>(Arg);
+                            auto Table = StateView.create_table();
+                            for (const auto& [k, v] : Map) {
+                                Table[k] = v;
+                            }
+                            LuaArgs.push_back(sol::make_object(StateView, Table));
+                            break;
+                        }
                        default:
                            beammp_error("Unknown argument type, passed as nil");
                            break;
@@ -1000,11 +1082,11 @@ void TLuaEngine::StateThreadData::Start() {
                        sol::error Err = Res;
                        Result->ErrorMessage = Err.what();
                    }
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                } else {
                    Result->Error = true;
                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                }
            }
        }
@@ -1024,8 +1106,8 @@ std::vector<TLuaEngine::QueuedFunction> TLuaEngine::StateThreadData::Debug_GetSt
 void TLuaEngine::CreateEventTimer(const std::string& EventName, TLuaStateId StateId, size_t IntervalMS, CallStrategy Strategy) {
    std::unique_lock Lock(mTimedEventsMutex);
    TimedEvent Event {
-        std::chrono::high_resolution_clock::duration { std::chrono::milliseconds(IntervalMS) },
-        std::chrono::high_resolution_clock::now(),
+        TimeType::duration { std::chrono::milliseconds(IntervalMS) },
+        TimeType::now(),
        EventName,
        StateId,
        Strategy
@@ -1054,19 +1136,11 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
    mPaths.push(Path);
 }

-void TLuaResult::MarkAsReady() {
-    {
-        std::lock_guard<std::mutex> readyLock(*this->ReadyMutex);
-        this->Ready = true;
-    }
-    this->ReadyCondition->notify_all();
-}
-
 void TLuaResult::WaitUntilReady() {
-    std::unique_lock readyLock(*this->ReadyMutex);
-    // wait if not ready yet
-    if (!this->Ready)
-        this->ReadyCondition->wait(readyLock);
+    while (!Ready) {
+        std::this_thread::yield();
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
 }

 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)
@@ -1076,10 +1150,10 @@ TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName,
 }

 bool TLuaEngine::TimedEvent::Expired() {
-    auto Waited = (std::chrono::high_resolution_clock::now() - LastCompletion);
+    auto Waited = (TimeType::now() - LastCompletion);
    return Waited >= Duration;
 }

 void TLuaEngine::TimedEvent::Reset() {
-    LastCompletion = std::chrono::high_resolution_clock::now();
+    LastCompletion = TimeType::now();
 }
@@ -0,0 +1,957 @@
+#include "TNetwork.h"
+#include "Client.h"
+#include "Common.h"
+#include "IterationDecision.h"
+#include "LuaAPI.h"
+#include "TLuaEngine.h"
+#include "nlohmann/json.hpp"
+#include <CustomAssert.h>
+#include <Http.h>
+#include <array>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+#include <chrono>
+#include <cstring>
+
+std::vector<uint8_t> StringToVector(const std::string& Str) {
+    return std::vector<uint8_t>(Str.data(), Str.data() + Str.size());
+}
+
+static void CompressProperly(std::vector<uint8_t>& Data) {
+    constexpr std::string_view ABG = "ABG:";
+    auto CombinedData = std::vector<uint8_t>(ABG.begin(), ABG.end());
+    auto CompData = Comp(Data);
+    CombinedData.resize(ABG.size() + CompData.size());
+    std::copy(CompData.begin(), CompData.end(), CombinedData.begin() + ABG.size());
+    Data = CombinedData;
+}
+
+TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager)
+    : mServer(Server)
+    , mPPSMonitor(PPSMonitor)
+    , mUDPSock(Server.IoCtx())
+    , mResourceManager(ResourceManager) {
+    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Starting);
+    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Starting);
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("UDPNetwork", Application::Status::ShuttingDown);
+        if (mUDPThread.joinable()) {
+            mUDPThread.detach();
+        }
+        Application::SetSubsystemStatus("UDPNetwork", Application::Status::Shutdown);
+    });
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("TCPNetwork", Application::Status::ShuttingDown);
+        if (mTCPThread.joinable()) {
+            mTCPThread.detach();
+        }
+        Application::SetSubsystemStatus("TCPNetwork", Application::Status::Shutdown);
+    });
+    mTCPThread = std::thread(&TNetwork::TCPServerMain, this);
+    mUDPThread = std::thread(&TNetwork::UDPServerMain, this);
+    Application::RegisterShutdownHandler([&] {
+        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", "");
+        TLuaEngine::WaitForAll(Futures, std::chrono::seconds(60));
+        beammp_debug("Kicking all players due to shutdown");
+        Server.ForEachClient([&](const auto& Client) {
+            ClientKick(*Client, "Server shutdown");
+        });
+    });
+}
+
+void TNetwork::UDPServerMain() {
+    RegisterThread("UDPServer");
+    ip::udp::endpoint UdpListenEndpoint(ip::address::from_string("0.0.0.0"), Application::GetSettingInt(StrPort));
+    boost::system::error_code ec;
+    mUDPSock.open(UdpListenEndpoint.protocol(), ec);
+    if (ec) {
+        beammp_error("open() failed: " + ec.message());
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        Application::GracefullyShutdown();
+    }
+    mUDPSock.bind(UdpListenEndpoint, ec);
+    if (ec) {
+        beammp_error("bind() failed: " + ec.message());
+        std::this_thread::sleep_for(std::chrono::seconds(5));
+        Application::GracefullyShutdown();
+    }
+    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Good);
+    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::GetSettingInt(StrPort)) + (" with a Max of ")
+        + std::to_string(Application::GetSettingInt(StrMaxPlayers)) + (" Clients"));
+    while (!Application::IsShuttingDown()) {
+        try {
+            ip::udp::endpoint client {};
+            std::vector<uint8_t> Data = UDPRcvFromClient(client); // Receives any data from Socket
+            // It has to be size>=2, because each UDP packet has a header of
+            // <id+1>:
+            // where id+1 is one byte.
+            // We discard a UDP packet if it doesn't start like this.
+            if (Data.size() < 2 || Data.at(1) != ':') {
+                ++Application::MalformedUdpPackets;
+                continue;
+            }
+            // We do -1 here, because the launcher does +1
+            // because it uses (or used to use) null-terminated strings
+            // to represent packets. This would mean that player 0 would
+            // cause empty packets.
+            uint8_t ID = uint8_t(Data.at(0)) - 1;
+            auto Client = GetClient(mServer, ID);
+            if (Client) {
+                try {
+                    if (Client->IsConnected() && Client->GetUDPAddr() != client) {
+                        beammp_debugf("Client at {}:{} tried to send UDP for client {}", client.address().to_string(), client.port(), Client->GetID());
+                        ++Application::InvalidUdpPackets;
+                        continue;
+                    } else {
+                        Client->SetUDPAddr(client);
+                        Client->SetIsConnected(true);
+                        Client->mUDPCONNECTED = true;
+                    }
+                    Client->UdpReceived += Data.size();
+                    ++Client->UdpPacketsReceived;
+                    Data.erase(Data.begin() + 0, Data.begin() + 2);
+                    TServer::GlobalParser(Client, std::move(Data), *this);
+                } catch (const std::exception&) {
+                    ++Application::InvalidUdpPackets;
+                }
+            }
+        } catch (const std::exception& e) {
+            beammp_error(("fatal: ") + std::string(e.what()));
+        }
+    }
+}
+
+void TNetwork::TCPServerMain() {
+    RegisterThread("TCPServer");
+
+    ip::tcp::endpoint ListenEp(ip::address::from_string("0.0.0.0"), Application::GetSettingInt(StrPort));
+    ip::tcp::socket Listener(mServer.IoCtx());
+    boost::system::error_code ec;
+    Listener.open(ListenEp.protocol(), ec);
+    if (ec) {
+        beammp_errorf("Failed to open socket: {}", ec.message());
+        return;
+    }
+    socket_base::linger LingerOpt {};
+    LingerOpt.enabled(false);
+    Listener.set_option(LingerOpt, ec);
+    if (ec) {
+        beammp_errorf("Failed to set up listening socket to not linger / reuse address. "
+                      "This may cause the socket to refuse to bind(). Error: {}",
+            ec.message());
+    }
+
+    ip::tcp::acceptor Acceptor(mServer.IoCtx(), ListenEp);
+    Acceptor.listen(socket_base::max_listen_connections, ec);
+    if (ec) {
+        beammp_errorf("listen() failed, which is needed for the server to operate. "
+                      "Shutting down. Error: {}",
+            ec.message());
+        Application::GracefullyShutdown();
+    }
+    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Good);
+    beammp_info("Vehicle event network online");
+    do {
+        try {
+            if (Application::IsShuttingDown()) {
+                beammp_debug("shutdown during TCP wait for accept loop");
+                break;
+            }
+            ip::tcp::endpoint ClientEp;
+            ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
+            if (ec) {
+                beammp_errorf("failed to accept: {}", ec.message());
+            }
+            TConnection Conn { std::move(ClientSocket), ClientEp };
+            std::thread ID(&TNetwork::Identify, this, std::move(Conn));
+            ID.detach(); // TODO: Add to a queue and attempt to join periodically
+        } catch (const std::exception& e) {
+            beammp_error("fatal: " + std::string(e.what()));
+        }
+    } while (!Application::IsShuttingDown());
+}
+
+#undef GetObject // Fixes Windows
+
+#include "Json.h"
+namespace json = rapidjson;
+
+void TNetwork::Identify(TConnection&& RawConnection) {
+    RegisterThreadAuto();
+    char Code;
+
+    boost::system::error_code ec;
+    read(RawConnection.Socket, buffer(&Code, 1), ec);
+    if (ec) {
+        // TODO: is this right?!
+        RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
+        return;
+    }
+    std::shared_ptr<TClient> Client { nullptr };
+    if (Code == 'C') {
+        Client = Authentication(std::move(RawConnection));
+    } else if (Code == 'D') {
+        HandleDownload(std::move(RawConnection));
+    } else if (Code == 'P') {
+        boost::system::error_code ec;
+        write(RawConnection.Socket, buffer("P"), ec);
+        return;
+    } else {
+        beammp_errorf("Invalid code got in Identify: '{}'", Code);
+    }
+}
+
+void TNetwork::HandleDownload(TConnection&& Conn) {
+    char D;
+    boost::system::error_code ec;
+    read(Conn.Socket, buffer(&D, 1), ec);
+    if (ec) {
+        Conn.Socket.shutdown(socket_base::shutdown_both, ec);
+        // ignore ec
+        return;
+    }
+    auto ID = uint8_t(D);
+    mServer.ForEachClient([&](const auto& Client) -> IterationDecision {
+        if (Client->GetID() == ID) {
+            Client->SetDownSock(std::move(Conn.Socket));
+            return Break;
+        }
+        return Continue;
+    });
+}
+
+std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
+    auto Client = CreateClient(std::move(RawConnection.Socket));
+    Client->ConnectionTime = TimeType::now();
+    Client->SetIdentifier("ip", RawConnection.SockAddr.address().to_string());
+    beammp_tracef("This thread is ip {}", RawConnection.SockAddr.address().to_string());
+
+    beammp_info("Identifying new ClientConnection...");
+
+    auto Data = TCPRcv(*Client);
+
+    constexpr std::string_view VC = "VC";
+    if (Data.size() > 3 && std::equal(Data.begin(), Data.begin() + VC.size(), VC.begin(), VC.end())) {
+        std::string ClientVersionStr(reinterpret_cast<const char*>(Data.data() + 2), Data.size() - 2);
+        Version ClientVersion = Application::VersionStrToInts(ClientVersionStr + ".0");
+        if (ClientVersion.major != Application::ClientMajorVersion()) {
+            beammp_errorf("Client tried to connect with version '{}', but only versions '{}.x.x' is allowed",
+                ClientVersion.AsString(), Application::ClientMajorVersion());
+            ClientKick(*Client, "Outdated Version!");
+            return nullptr;
+        }
+    } else {
+        ClientKick(*Client, fmt::format("Invalid version header: '{}' ({})", std::string(reinterpret_cast<const char*>(Data.data()), Data.size()), Data.size()));
+        return nullptr;
+    }
+    if (!TCPSend(*Client, StringToVector("S"))) {
+        // TODO: handle
+    }
+
+    Data = TCPRcv(*Client);
+
+    if (Data.size() > 50) {
+        ClientKick(*Client, "Invalid Key (too long)!");
+        return nullptr;
+    }
+
+    nlohmann::json AuthReq {
+        { "key", std::string(reinterpret_cast<const char*>(Data.data()), Data.size()) }
+    };
+    auto Target = "/pkToUser";
+    unsigned int ResponseCode = 0;
+    const auto AuthResStr = Http::POST(Application::GetBackendUrlForAuth(), 443, Target, AuthReq.dump(), "application/json", &ResponseCode);
+
+    try {
+        nlohmann::json AuthRes = nlohmann::json::parse(AuthResStr);
+
+        if (AuthRes["username"].is_string() && AuthRes["roles"].is_string()
+            && AuthRes["guest"].is_boolean() && AuthRes["identifiers"].is_array()) {
+
+            Client->SetName(AuthRes["username"]);
+            Client->SetRoles(AuthRes["roles"]);
+            Client->SetIsGuest(AuthRes["guest"]);
+            for (const auto& ID : AuthRes["identifiers"]) {
+                auto Raw = std::string(ID);
+                auto SepIndex = Raw.find(':');
+                if (SepIndex != std::string::npos) {
+                    Client->SetIdentifier(Raw.substr(0, SepIndex), Raw.substr(SepIndex + 1));
+                } else {
+                    beammp_errorf("Invalid response from auth servers: No ':' in identifier '{}', ignoring it", Raw);
+                }
+            }
+        } else {
+            beammp_error("Invalid authentication data received from authentication backend");
+            ClientKick(*Client, "Invalid authentication data!");
+            return nullptr;
+        }
+    } catch (const std::exception& e) {
+        beammp_errorf("Client sent invalid key. Error was: {}", e.what());
+        // TODO: we should really clarify that this was a backend response or parsing error
+        ClientKick(*Client, "Invalid key! Please restart your game.");
+        return nullptr;
+    }
+
+    beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
+    mServer.ForEachClient([&](const auto& ThisClient) -> IterationDecision {
+        // FIXME: This doesn't respect forum ID, and it should :^)
+        if (ThisClient->GetName() == Client->GetName() && ThisClient->IsGuest() == Client->IsGuest()) {
+            ThisClient->Disconnect("Stale Client (replaced by new client)");
+            return Break;
+        }
+        return Continue;
+    });
+
+    Client->SetID(OpenID());
+    beammp_info("Assigned ID " + std::to_string(Client->GetID()) + " to " + Client->GetName());
+
+    mServer.InsertClient(Client);
+
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest(), Client->GetIdentifiers(), Client->GetID());
+    TLuaEngine::WaitForAll(Futures);
+    bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
+        [](const std::shared_ptr<TLuaResult>& Result) {
+            return !Result->Error && Result->Result.is<int>() && bool(Result->Result.as<int>());
+        });
+    std::string Reason;
+    bool NotAllowedWithReason = std::any_of(Futures.begin(), Futures.end(),
+        [&Reason](const std::shared_ptr<TLuaResult>& Result) -> bool {
+            if (!Result->Error && Result->Result.is<std::string>()) {
+                Reason = Result->Result.as<std::string>();
+                return true;
+            }
+            return false;
+        });
+
+    bool fitsOnServer = mServer.ClientCount() < size_t(Application::GetSettingInt(StrMaxPlayers)); // || luaplayercountbypass;
+
+    if (!NotAllowed && !NotAllowedWithReason && fitsOnServer) {
+        beammp_info("Identification success");
+        TCPClient(Client);
+        return Client;
+    }
+
+    if (NotAllowed) {
+        ClientKick(*Client, "You are not allowed on the server!");
+    } else if (NotAllowedWithReason) {
+        ClientKick(*Client, Reason);
+    } else {
+        ClientKick(*Client, "Server full!");
+    }
+
+    mServer.RemoveClient(Client);
+    return {};
+}
+
+std::shared_ptr<TClient> TNetwork::CreateClient(ip::tcp::socket&& TCPSock) {
+    auto c = std::make_shared<TClient>(mServer, std::move(TCPSock));
+    return c;
+}
+
+bool TNetwork::TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync) {
+    if (!IsSync) {
+        if (c.IsSyncing()) {
+            if (!Data.empty()) {
+                if (Data.at(0) == 'O' || Data.at(0) == 'A' || Data.at(0) == 'C' || Data.at(0) == 'E') {
+                    c.EnqueuePacket(Data);
+                }
+            }
+            return true;
+        }
+    }
+
+    auto& Sock = c.GetTCPSock();
+
+    /*
+     * our TCP protocol sends a header of 4 bytes, followed by the data.
+     *
+     *  [][][][][][]...[]
+     *  ^------^^---...-^
+     *    size    data
+     */
+
+    const auto Size = int32_t(Data.size());
+    std::vector<uint8_t> ToSend;
+    ToSend.resize(Data.size() + sizeof(Size));
+    std::memcpy(ToSend.data(), &Size, sizeof(Size));
+    std::memcpy(ToSend.data() + sizeof(Size), Data.data(), Data.size());
+    boost::system::error_code ec;
+    write(Sock, buffer(ToSend), ec);
+    if (ec) {
+        beammp_debugf("write(): {}", ec.message());
+        c.Disconnect("write() failed");
+        return false;
+    }
+    c.UpdatePingTime();
+    c.TcpSent += ToSend.size();
+    return true;
+}
+
+std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
+    if (c.IsDisconnected() || (c.mUDPCONNECTED && !c.IsConnected())) {
+        beammp_error("Client disconnected, cancelling TCPRcv");
+        return {};
+    }
+
+    int32_t Header {};
+    auto& Sock = c.GetTCPSock();
+
+    boost::system::error_code ec;
+    std::array<uint8_t, sizeof(Header)> HeaderData;
+    read(Sock, buffer(HeaderData), ec);
+    if (ec) {
+        // TODO: handle this case (read failed)
+        beammp_debugf("TCPRcv: Reading header failed: {}", ec.message());
+        return {};
+    }
+    Header = *reinterpret_cast<int32_t*>(HeaderData.data());
+
+    if (Header < 0) {
+        ClientKick(c, "Invalid packet - header negative");
+        beammp_errorf("Client {} send negative TCP header, ignoring packet", c.GetID());
+        return {};
+    }
+
+    std::vector<uint8_t> Data;
+    // TODO: This is arbitrary, this needs to be handled another way
+    if (Header < int32_t(100 * MB)) {
+        Data.resize(Header);
+    } else {
+        ClientKick(c, "Header size limit exceeded");
+        beammp_warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header of >100MB - assuming malicious intent and disconnecting the client.");
+        return {};
+    }
+    auto N = read(Sock, buffer(Data), ec);
+    if (ec) {
+        // TODO: handle this case properly
+        beammp_debugf("TCPRcv: Reading data failed: {}", ec.message());
+        return {};
+    }
+
+    if (N != Header) {
+        beammp_errorf("Expected to read {} bytes, instead got {}", Header, N);
+    }
+
+    c.TcpReceived += N + HeaderData.size();
+    constexpr std::string_view ABG = "ABG:";
+    if (Data.size() >= ABG.size() && std::equal(Data.begin(), Data.begin() + ABG.size(), ABG.begin(), ABG.end())) {
+        Data.erase(Data.begin(), Data.begin() + ABG.size());
+        return DeComp(Data);
+    } else {
+        return Data;
+    }
+}
+
+void TNetwork::ClientKick(TClient& c, const std::string& R) {
+    beammp_info("Client kicked: " + R);
+    if (!TCPSend(c, StringToVector("K" + R))) {
+        beammp_debugf("tried to kick player '{}' (id {}), but was already disconnected", c.GetName(), c.GetID());
+    }
+    c.Disconnect("Kicked");
+}
+
+void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
+    RegisterThreadAuto();
+    while (!c.expired()) {
+        auto Client = c.lock();
+        if (Client->IsDisconnected()) {
+            beammp_debug("client is disconnected, breaking client loop");
+            break;
+        }
+        if (!Client->IsSyncing() && Client->IsSynced() && Client->MissedPacketQueueSize() != 0) {
+            // debug("sending " + std::to_string(Client->MissedPacketQueueSize()) + " queued packets");
+            while (Client->MissedPacketQueueSize() > 0) {
+                std::vector<uint8_t> QData {};
+                { // locked context
+                    std::unique_lock lock(Client->MissedPacketQueueMutex());
+                    if (Client->MissedPacketQueueSize() <= 0) {
+                        break;
+                    }
+                    QData = Client->MissedPacketQueue().front();
+                    Client->MissedPacketQueue().pop();
+                } // end locked context
+                // beammp_debug("sending a missed packet: " + QData);
+                if (!TCPSend(*Client, QData, true)) {
+                    Client->Disconnect("Failed to TCPSend while clearing the missed packet queue");
+                    std::unique_lock lock(Client->MissedPacketQueueMutex());
+                    while (!Client->MissedPacketQueue().empty()) {
+                        Client->MissedPacketQueue().pop();
+                    }
+                    break;
+                }
+            }
+        } else {
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        }
+    }
+}
+
+void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
+    // TODO: the c.expired() might cause issues here, remove if you end up here with your debugger
+    if (c.expired() || !c.lock()->GetTCPSock().is_open()) {
+        mServer.RemoveClient(c);
+        return;
+    }
+    OnConnect(c);
+    RegisterThread("(" + std::to_string(c.lock()->GetID()) + ") \"" + c.lock()->GetName() + "\"");
+
+    std::thread QueueSync(&TNetwork::Looper, this, c);
+
+    while (true) {
+        if (c.expired())
+            break;
+        auto Client = c.lock();
+        if (Client->IsDisconnected()) {
+            beammp_debug("client status < 0, breaking client loop");
+            break;
+        }
+
+        auto res = TCPRcv(*Client);
+        if (res.empty()) {
+            beammp_debug("TCPRcv empty");
+            Client->Disconnect("TCPRcv failed");
+            break;
+        }
+        TServer::GlobalParser(c, std::move(res), *this);
+    }
+
+    if (QueueSync.joinable())
+        QueueSync.join();
+
+    if (!c.expired()) {
+        auto Client = c.lock();
+        OnDisconnect(c);
+    } else {
+        beammp_warn("client expired in TCPClient, should never happen");
+    }
+}
+
+void TNetwork::UpdatePlayer(TClient& Client) {
+    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::GetSettingInt(StrMaxPlayers)) + ":";
+    mServer.ForEachClient([&](const auto& ThisClient) {
+        Packet += ThisClient->GetName() + ",";
+    });
+    Packet = Packet.substr(0, Packet.length() - 1);
+    Client.EnqueuePacket(StringToVector(Packet));
+    //(void)Respond(Client, Packet, true);
+}
+
+void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr) {
+    std::shared_ptr<TClient> LockedClientPtr { nullptr };
+    try {
+        LockedClientPtr = ClientPtr.lock();
+    } catch (const std::exception&) {
+        beammp_warn("Client expired in OnDisconnect, this is unexpected");
+        return;
+    }
+    beammp_assert(LockedClientPtr != nullptr);
+    TClient& c = *LockedClientPtr;
+    beammp_info(c.GetName() + (" Connection Terminated"));
+    std::string Packet;
+    TClient::TSetOfVehicleData VehicleData;
+    { // Vehicle Data Lock Scope
+        auto LockedData = c.GetAllCars();
+        VehicleData = *LockedData.VehicleData;
+    } // End Vehicle Data Lock Scope
+    for (auto& v : VehicleData) {
+        Packet = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(v.ID());
+        SendToAll(&c, StringToVector(Packet), false, true);
+    }
+    Packet = ("L") + c.GetName() + (" left the server!");
+    SendToAll(&c, StringToVector(Packet), false, true);
+    Packet.clear();
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerDisconnect", "", c.GetID());
+    LuaAPI::MP::Engine->WaitForAll(Futures);
+    c.Disconnect("Already Disconnected (OnDisconnect)");
+    mServer.RemoveClient(ClientPtr);
+}
+
+int TNetwork::OpenID() {
+    // This lock ensures that each call to OpenID is exclusive.
+    // If we didn't have this, two concurrent calls to this function may result
+    // in the same ID.
+    std::unique_lock Lock(mOpenIDMutex);
+    int ID = 0;
+    bool found;
+    do {
+        found = true;
+        mServer.ForEachClient([&](const auto& Client) {
+            if (Client->GetID() == ID) {
+                found = false;
+                ID++;
+            }
+        });
+    } while (!found);
+    return ID;
+}
+
+void TNetwork::OnConnect(const std::weak_ptr<TClient>& c) {
+    beammp_assert(!c.expired());
+    beammp_info("Client connected");
+    auto LockedClient = c.lock();
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerConnecting", "", LockedClient->GetID()));
+    SyncResources(*LockedClient);
+    if (LockedClient->IsDisconnected())
+        return;
+    (void)Respond(*LockedClient, StringToVector("M" + Application::GetSettingString(StrMap)), true); // Send the Map on connect
+    beammp_info(LockedClient->GetName() + " : Connected");
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->GetID()));
+}
+
+void TNetwork::SyncResources(TClient& c) {
+    if (!TCPSend(c, StringToVector("P" + std::to_string(c.GetID())))) {
+        // TODO handle
+    }
+    std::vector<uint8_t> Data;
+    while (!c.IsDisconnected()) {
+        Data = TCPRcv(c);
+        if (Data.empty()) {
+            break;
+        }
+        constexpr std::string_view Done = "Done";
+        if (std::equal(Data.begin(), Data.end(), Done.begin(), Done.end()))
+            break;
+        HandleResourcePackets(c, Data);
+    }
+}
+
+ModMap TNetwork::GetClientMods(TClient& Client) {
+    auto AllMods = mResourceManager.FileMap();
+
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerRequestMods", "", Client.GetName(), Client.GetRoles(), Client.IsGuest(), Client.GetIdentifiers(), Client.GetID(), AllMods);
+    TLuaEngine::WaitForAll(Futures);
+
+    ModMap AllowedMods = AllMods;
+
+    for (const std::shared_ptr<TLuaResult>& Future : Futures) {
+        sol::table Result;
+        if (!Future->Error && Future->Result.is<sol::table>()) {
+            Result = Future->Result.as<sol::table>();
+
+            for (const auto& [name, size] : AllMods) {
+                auto val = Result.get<sol::optional<int>>(name);
+                if (!val.has_value()) {
+                    AllowedMods.erase(name);
+                    beammp_debugf("Not sending mod '{}' to player '{}' (from state '{}')", name, Client.GetName(), Future->StateId);
+                }
+            }
+        }
+    }
+
+    Client.AllowedMods = AllowedMods;
+
+    return AllowedMods;
+}
+
+void TNetwork::HandleResourcePackets(TClient& c, const std::vector<uint8_t>& Packet) {
+    if (Packet.empty())
+        return;
+    char Code = Packet.at(0), SubCode = 0;
+    if (Packet.size() > 1)
+        SubCode = Packet.at(1);
+    switch (Code) {
+    case 'f':
+        SendFile(c, std::string(reinterpret_cast<const char*>(Packet.data() + 1), Packet.size() - 1));
+        return;
+    case 'S':
+        if (SubCode == 'R') {
+            beammp_debug("Sending Mod Info");
+            std::string ToSend = TResourceManager::FormatForClient(GetClientMods(c));
+            if (ToSend.empty())
+                ToSend = "-";
+            if (!TCPSend(c, StringToVector(ToSend))) {
+                // TODO: error
+            }
+        }
+        return;
+    default:
+        return;
+    }
+}
+
+void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
+    beammp_infof("{} ({}) requesting mod: '{}'", c.GetName(), c.GetID(), UnsafeName);
+
+    auto FileName = UnsafeName;
+
+    auto res = TResourceManager::IsModValid(FileName, c.AllowedMods);
+
+    if (res.has_value()) {
+        if (!TCPSend(c, StringToVector("CO"))) {
+            c.Disconnect("TCP send failed in SendFile, when trying to cancel file transfer because " + res.value());
+        }
+        return;
+    }
+
+    if (!TCPSend(c, StringToVector("AG"))) {
+        c.Disconnect("TCP send failed in SendFile, when trying to send ");
+        return;
+    }
+
+    /// Wait for connections
+    int T = 0;
+    while (!c.GetDownSock().is_open() && T < 50) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        T++;
+    }
+
+    if (!c.GetDownSock().is_open()) {
+        beammp_error("Client doesn't have a download socket!");
+        if (!c.IsDisconnected())
+            c.Disconnect("Missing download socket");
+        return;
+    }
+
+    size_t Size = size_t(std::filesystem::file_size(FileName)), MSize = Size / 2;
+
+    std::thread SplitThreads[2] {
+        std::thread([&] {
+            RegisterThread("SplitLoad_0");
+            SplitLoad(c, 0, MSize, false, FileName);
+        }),
+        std::thread([&] {
+            RegisterThread("SplitLoad_1");
+            SplitLoad(c, MSize, Size, true, FileName);
+        })
+    };
+
+    for (auto& SplitThread : SplitThreads) {
+        if (SplitThread.joinable()) {
+            SplitThread.join();
+        }
+    }
+}
+
+static std::pair<size_t /* count */, size_t /* last chunk */> SplitIntoChunks(size_t FullSize, size_t ChunkSize) {
+    if (FullSize < ChunkSize) {
+        return { 0, FullSize };
+    }
+    size_t Count = FullSize / (FullSize / ChunkSize);
+    size_t LastChunkSize = FullSize - (Count * ChunkSize);
+    return { Count, LastChunkSize };
+}
+
+TEST_CASE("SplitIntoChunks") {
+    size_t FullSize;
+    size_t ChunkSize;
+    SUBCASE("Normal case") {
+        FullSize = 1234567;
+        ChunkSize = 1234;
+    }
+    SUBCASE("Zero original size") {
+        FullSize = 0;
+        ChunkSize = 100;
+    }
+    SUBCASE("Equal full size and chunk size") {
+        FullSize = 125;
+        ChunkSize = 125;
+    }
+    SUBCASE("Even split") {
+        FullSize = 10000;
+        ChunkSize = 100;
+    }
+    SUBCASE("Odd split") {
+        FullSize = 13;
+        ChunkSize = 2;
+    }
+    SUBCASE("Large sizes") {
+        FullSize = 10 * GB;
+        ChunkSize = 125 * MB;
+    }
+    auto [Count, LastSize] = SplitIntoChunks(FullSize, ChunkSize);
+    CHECK((Count * ChunkSize) + LastSize == FullSize);
+}
+
+const uint8_t* /* end ptr */ TNetwork::SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size) {
+    if (TCPSendRaw(c, Socket, DataPtr, Size)) {
+        return DataPtr + Size;
+    } else {
+        return nullptr;
+    }
+}
+
+void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name) {
+    std::ifstream f(Name.c_str(), std::ios::binary);
+    uint32_t Split = 125 * MB;
+    std::vector<uint8_t> Data;
+    if (Size > Split)
+        Data.resize(Split);
+    else
+        Data.resize(Size);
+    ip::tcp::socket* TCPSock { nullptr };
+    if (D)
+        TCPSock = &c.GetDownSock();
+    else
+        TCPSock = &c.GetTCPSock();
+    while (!c.IsDisconnected() && Sent < Size) {
+        size_t Diff = Size - Sent;
+        if (Diff > Split) {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(reinterpret_cast<char*>(Data.data()), Split);
+            if (!TCPSendRaw(c, *TCPSock, Data.data(), Split)) {
+                if (!c.IsDisconnected())
+                    c.Disconnect("TCPSendRaw failed in mod download (1)");
+                break;
+            }
+            Sent += Split;
+        } else {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(reinterpret_cast<char*>(Data.data()), Diff);
+            if (!TCPSendRaw(c, *TCPSock, Data.data(), int32_t(Diff))) {
+                if (!c.IsDisconnected())
+                    c.Disconnect("TCPSendRaw failed in mod download (2)");
+                break;
+            }
+            Sent += Diff;
+        }
+    }
+}
+
+bool TNetwork::TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size) {
+    boost::system::error_code ec;
+    write(socket, buffer(Data, Size), ec);
+    if (ec) {
+        beammp_errorf("Failed to send raw data to client: {}", ec.message());
+        return false;
+    }
+    C.UpdatePingTime();
+    C.TcpSent += Size;
+    return true;
+}
+
+bool TNetwork::SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync) {
+    if (Data.size() > 400) {
+        CompressProperly(Data);
+    }
+    return TCPSend(c, Data, isSync);
+}
+
+bool TNetwork::Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync) {
+    char C = MSG.at(0);
+    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+        if (C == 'O' || C == 'T' || MSG.size() > 1000) {
+            return SendLarge(c, MSG, isSync);
+        } else {
+            return TCPSend(c, MSG, isSync);
+        }
+    } else {
+        return UDPSend(c, MSG);
+    }
+}
+
+bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
+    if (c.expired()) {
+        return false;
+    }
+    auto LockedClient = c.lock();
+    if (LockedClient->IsSynced())
+        return true;
+    // Syncing, later set isSynced
+    // after syncing is done, we apply all packets they missed
+    if (!Respond(*LockedClient, StringToVector("Sn" + LockedClient->GetName()), true)) {
+        return false;
+    }
+    // ignore error
+    (void)SendToAll(LockedClient.get(), StringToVector("JWelcome " + LockedClient->GetName() + "!"), false, true);
+
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoin", "", LockedClient->GetID()));
+    LockedClient->SetIsSyncing(true);
+    bool Return = false;
+    bool res = true;
+    mServer.ForEachClient([&](const auto& Client) -> IterationDecision {
+        TClient::TSetOfVehicleData VehicleData;
+        { // Vehicle Data Lock Scope
+            auto LockedData = Client->GetAllCars();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (Client != LockedClient) {
+            for (auto& v : VehicleData) {
+                if (LockedClient->IsDisconnected()) {
+                    Return = true;
+                    res = false;
+                    return Break;
+                }
+                res = Respond(*LockedClient, StringToVector(v.Data()), true, true);
+            }
+        }
+        return Continue;
+    });
+    LockedClient->SetIsSyncing(false);
+    if (Return) {
+        return res;
+    }
+    LockedClient->SetIsSynced(true);
+    beammp_info(LockedClient->GetName() + (" is now synced!"));
+    return true;
+}
+
+void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self, bool Rel) {
+    if (!Self)
+        beammp_assert(c);
+    char C = Data.at(0);
+    bool ret = true;
+    mServer.ForEachClient([&](const auto& Client) {
+        if (Self || Client.get() != c) {
+            if (Client->IsSynced() || Client->IsSyncing()) {
+                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+                    if (C == 'O' || C == 'T' || Data.size() > 1000) {
+                        if (Data.size() > 400) {
+                            auto CompressedData = Data;
+                            CompressProperly(CompressedData);
+                            Client->EnqueuePacket(CompressedData);
+                        } else {
+                            Client->EnqueuePacket(Data);
+                        }
+                        // ret = SendLarge(*Client, Data);
+                    } else {
+                        Client->EnqueuePacket(Data);
+                        // ret = TCPSend(*Client, Data);
+                    }
+                } else {
+                    ret = UDPSend(*Client, Data);
+                }
+            }
+        }
+    });
+    if (!ret) {
+        // TODO: handle
+    }
+    return;
+}
+
+bool TNetwork::UDPSend(TClient& Client, std::vector<uint8_t> Data) {
+    if (!Client.IsConnected() || Client.IsDisconnected()) {
+        // this can happen if we try to send a packet to a client that is either
+        // 1. not yet fully connected, or
+        // 2. disconnected and not yet fully removed
+        // this is fine can can be ignored :^)
+        return true;
+    }
+    const auto Addr = Client.GetUDPAddr();
+    if (Data.size() > 400) {
+        CompressProperly(Data);
+    }
+    boost::system::error_code ec;
+    mUDPSock.send_to(buffer(Data), Addr, 0, ec);
+    if (ec) {
+        beammp_debugf("UDP sendto() failed: {}", ec.message());
+        if (!Client.IsDisconnected())
+            Client.Disconnect("UDP send failed");
+        return false;
+    }
+    Client.UdpSent += Data.size();
+    ++Client.UdpPacketsSent;
+    return true;
+}
+
+std::vector<uint8_t> TNetwork::UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint) {
+    std::array<char, 1024> Ret {};
+    boost::system::error_code ec;
+    const auto Rcv = mUDPSock.receive_from(mutable_buffer(Ret.data(), Ret.size()), ClientEndpoint, 0, ec);
+    if (ec) {
+        beammp_errorf("UDP recvfrom() failed: {}", ec.message());
+        return {};
+    }
+    beammp_assert(Rcv <= Ret.size());
+    return std::vector<uint8_t>(Ret.begin(), Ret.begin() + Rcv);
+}
@@ -0,0 +1,59 @@
+#include "TPPSMonitor.h"
+#include "Client.h"
+#include "TNetwork.h"
+
+TPPSMonitor::TPPSMonitor(TServer& Server)
+    : mServer(Server) {
+    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Starting);
+    Application::SetPPS("-");
+    Application::RegisterShutdownHandler([&] {
+        Application::SetSubsystemStatus("PPSMonitor", Application::Status::ShuttingDown);
+        if (mThread.joinable()) {
+            beammp_debug("shutting down PPSMonitor");
+            mThread.join();
+            beammp_debug("shut down PPSMonitor");
+        }
+        Application::SetSubsystemStatus("PPSMonitor", Application::Status::Shutdown);
+    });
+    Start();
+}
+void TPPSMonitor::operator()() {
+    RegisterThread("PPSMonitor");
+    while (!mNetwork) {
+        // hard(-ish) spin
+        std::this_thread::yield();
+    }
+    beammp_debug("PPSMonitor starting");
+    Application::SetSubsystemStatus("PPSMonitor", Application::Status::Good);
+    std::vector<std::shared_ptr<TClient>> TimedOutClients;
+    while (!Application::IsShuttingDown()) {
+        std::this_thread::sleep_for(std::chrono::seconds(1));
+        int C = 0, V = 0;
+        if (mServer.ClientCount() == 0) {
+            Application::SetPPS("-");
+            continue;
+        }
+        mServer.ForEachClient([&](const auto& Client) {
+            if (Client->GetCarCount() > 0) {
+                C++;
+                V += Client->GetCarCount();
+            }
+            // kick on "no ping"
+            if (Client->SecondsSinceLastPing() > (20 * 60)) {
+                beammp_debugf("Client {} ({}) timing out: {}s since last contact", Client->GetName(), Client->GetID(), Client->SecondsSinceLastPing());
+                TimedOutClients.push_back(Client);
+            }
+        });
+        for (auto& ClientToKick : TimedOutClients) {
+            Network().ClientKick(*ClientToKick, "Timeout (no ping for way too long)");
+        }
+        TimedOutClients.clear();
+        if (C == 0 || mInternalPPS == 0) {
+            Application::SetPPS("-");
+        } else {
+            int R = (mInternalPPS / C) / V;
+            Application::SetPPS(std::to_string(R));
+        }
+        mInternalPPS = 0;
+    }
+}
--- 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