fix typos and phrasing in README.md

Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>
remove unecessary comment
2026-07-13 10:13:42 +00:00 · 2024-01-19 14:14:09 +01:00 · 2024-01-19 14:10:14 +01:00 · 2024-01-19 14:09:56 +01:00 · 2024-01-19 14:09:09 +01:00 · 2024-01-19 12:42:51 +01:00
106 changed files with 2081 additions and 2555 deletions
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[Bug] Enter issue title here"
 labels: bug
 assignees: ''

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

 ---
@@ -1,78 +0,0 @@
-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
@@ -1,58 +0,0 @@
-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
-
@@ -0,0 +1,152 @@
+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
+
@@ -1,115 +0,0 @@
-name: Release Create & Build
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    name: Create Release
-    outputs: 
-      upload_url: ${{ steps.create_release.outputs.upload_url }} 
-    steps:
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: false
-          prerelease: true
-          body: |
-              Files included in this release:
-              - `BeamMP-Server.exe` is the windows build
-              - `BeamMP-Server-linux` is a ubuntu build, so you need the dependencies listed in README.md to run it. For any other distros please build from source as described in README.md.
-
-  upload-release-files-linux:
-    name: Upload Linux Release Files
-    runs-on: ubuntu-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
@@ -0,0 +1,215 @@
+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"
+      VCPKG_FORCE_SYSTEM_BINARIES: 1
+    container:
+      image: ${{ matrix.distro }}:${{ matrix.version }}
+    steps:
+      - name: get-cmake
+        uses: lukka/get-cmake@v3.28.1
+            
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Install git
+        run: |
+          apt-get update -y
+          apt-get install -y git
+
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
+      - name: Git config safe directory
+        shell: bash
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1.5-git-safe.sh
+
+      - name: Install Dependencies
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/1-install-deps.sh
+
+      - name: Create Build Environment
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
+
+      - name: Build Server
+        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh
+
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./bin/BeamMP-Server
+          asset_content_type: application/x-elf
+
+      - name: Upload Debug Info
+        id: upload-debug-info
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./bin/BeamMP-Server.debug
+          asset_content_type: application/x-elf
+
+  upload-release-files-windows:
+    name: Build and upload Windows Release Files
+    runs-on: windows-latest
+    needs: create-release
+    env:
+      VCPKG_DEFAULT_TRIPLET: x64-windows-static
+    steps:
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
+      - name: Create Build Environment
+        shell: bash
+        run: ./scripts/windows/1-configure.sh
+
+      - name: Build Server
+        shell: bash
+        run: bash ./scripts/windows/2-build.sh
+
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./bin/Release/BeamMP-Server.exe
+          asset_name: BeamMP-Server.exe
+          asset_content_type: application/vnd.microsoft.portable-executable
@@ -0,0 +1,43 @@
+name: Windows
+
+on: [push]
+
+env:
+  VCPKG_DEFAULT_TRIPLET: x64-windows-static
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  CMAKE_BUILD_TYPE: "Release"
+
+jobs:
+  windows-build:
+    runs-on: windows-latest
+    steps:
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          runVcpkgInstall: true
+
+      - name: Create Build Environment
+        shell: bash
+        run: ./scripts/windows/1-configure.sh
+
+      - name: Build Server
+        shell: bash
+        run: bash ./scripts/windows/2-build.sh
+
+      - name: Archive server artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Server-windows
+          path: ./bin/Release/BeamMP-Server.exe
+
@@ -1,36 +1,6 @@
 [submodule "deps/commandline"]
 	path = deps/commandline
 	url = https://github.com/lionkor/commandline
-[submodule "deps/asio"]
-	path = deps/asio
-	url = https://github.com/chriskohlhoff/asio
-[submodule "deps/rapidjson"]
-	path = deps/rapidjson
-	url = https://github.com/Tencent/rapidjson
-[submodule "deps/toml11"]
-	path = deps/toml11
-	url = https://github.com/ToruNiina/toml11
-[submodule "deps/sentry-native"]
-	path = deps/sentry-native
-	url = https://github.com/getsentry/sentry-native
-[submodule "deps/sol2"]
-	path = deps/sol2
-	url = https://github.com/ThePhD/sol2
-[submodule "deps/libzip"]
-	path = deps/libzip
-	url = https://github.com/nih-at/libzip
-[submodule "deps/cpp-httplib"]
-	path = deps/cpp-httplib
-	url = https://github.com/yhirose/cpp-httplib
-[submodule "deps/json"]
-	path = deps/json
-	url = https://github.com/nlohmann/json
-[submodule "deps/fmt"]
-	path = deps/fmt
-	url = https://github.com/fmtlib/fmt
-[submodule "deps/doctest"]
-	path = deps/doctest
-	url = https://github.com/doctest/doctest
-[submodule "deps/lk-result"]
-	path = deps/lk-result
-	url = https://gitlab.com/lionkor/lk-result.git
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/Microsoft/vcpkg.git
@@ -1,286 +1,215 @@
-# 3.4 is required for imported targets.
-cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

-message(STATUS "You can find build instructions and a list of dependencies in the README at \
-https://github.com/BeamMP/BeamMP-Server")
+if (WIN32)
+    set(VCPKG_TARGET_TRIPLET x64-windows-static)
+endif()

-include(FetchContent)
-FetchContent_Declare(
-  cmake-tools
-  GIT_REPOSITORY https://github.com/brobeson/cmake-tools.git
-  GIT_TAG main
+include(cmake/Vcpkg.cmake) # needs to happen before project()
+
+project(
+    "BeamMP-Server" # replace this
+    VERSION 3.3.0
 )
-FetchContent_MakeAvailable(cmake-tools)
-list(APPEND CMAKE_MODULE_PATH "${cmake-tools_SOURCE_DIR}")

-include(CMakeToolsVersionFromGit)
+include(cmake/StandardSettings.cmake)
+include(cmake/StaticAnalyzers.cmake)
+include(cmake/Git.cmake)

-execute_process(
-    COMMAND git log -1 --format=%h
-    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-    OUTPUT_VARIABLE GIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
+# below are options which should be changed

-project(BeamMP-Server
-    DESCRIPTION "Server for BeamMP - The Multiplayer Mod for BeamNG.drive"
-    HOMEPAGE_URL https://beammp.com
-    LANGUAGES CXX C)
+### SETTINGS ###

-# 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()
-
-set(HTTPLIB_REQUIRE_OPENSSL ON)
-set(SENTRY_BUILD_SHARED_LIBS OFF)
-
-add_compile_definitions(CPPHTTPLIB_OPENSSL_SUPPORT=1)
-
-option(WIN32_STATIC_RUNTIME "Build statically-linked runtime on windows (don't touch unless you know what you're doing)" ON)
-
-# ------------------------ 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 ()
-
-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
+# add all headers (.h, .hpp) to this
+set(PRJ_HEADERS 
+    include/ArgsParser.h
    include/BoostAliases.h
-    include/Uuid.h src/Uuid.cpp
+    include/Client.h
+    include/Common.h
+    include/Compat.h
+    include/Cryptography.h
+    include/CustomAssert.h
+    include/Defer.h
+    include/Environment.h
+    include/Http.h
+    include/IThreaded.h
+    include/Json.h
+    include/LuaAPI.h
+    include/RWMutex.h
+    include/SignalHandling.h
+    include/TConfig.h
+    include/TConsole.h
+    include/THeartbeatThread.h
+    include/TLuaEngine.h
+    include/TLuaPlugin.h
+    include/TNetwork.h
+    include/TPluginMonitor.h
+    include/TPPSMonitor.h
+    include/TResourceManager.h
+    include/TScopedTimer.h
+    include/TServer.h
+    include/VehicleData.h
+    include/Env.h
+)
+# add all source files (.cpp) to this, except the one with main()
+set(PRJ_SOURCES
+    src/ArgsParser.cpp
+    src/Client.cpp
+    src/Common.cpp
+    src/Compat.cpp
+    src/Http.cpp
+    src/LuaAPI.cpp
+    src/SignalHandling.cpp
+    src/TConfig.cpp
+    src/TConsole.cpp
+    src/THeartbeatThread.cpp
+    src/TLuaEngine.cpp
+    src/TLuaPlugin.cpp
+    src/TNetwork.cpp
+    src/TPluginMonitor.cpp
+    src/TPPSMonitor.cpp
+    src/TResourceManager.cpp
+    src/TScopedTimer.cpp
+    src/TServer.cpp
+    src/VehicleData.cpp
+    src/Env.cpp
 )

-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"
-)
+find_package(Lua REQUIRED)

-set(BeamMP_Definitions
-    SECRET_SENTRY_URL="${BEAMMP_SECRET_SENTRY_URL}"
-    BEAMMP_GIT_HASH="${GIT_HASH}"
-    LK_RESULT_USE_FMT
-)
-
-if (WIN32)
-    list(APPEND BeamMP_Definitions _WIN32_WINNT=0x0601)
-    list(APPEND BeamMP_Definitions _CRT_SECURE_NO_WARNINGS)
-endif()
-if (UNIX)
-    set(BeamMP_CompileOptions
-        -Wall
-        -Wextra
-        -Wpedantic
-    
-        -Werror=uninitialized
-        -Werror=float-equal
-        -Werror=pointer-arith
-        -Werror=double-promotion
-        -Werror=write-strings
-        -Werror=cast-qual
-        -Werror=init-self
-        -Werror=cast-align
-        -Werror=unreachable-code
-        -Werror=strict-aliasing -fstrict-aliasing
-        -Werror=redundant-decls
-        -Werror=missing-declarations
-        -Werror=missing-field-initializers
-        -Werror=write-strings
-        -Werror=ctor-dtor-privacy
-        -Wswitch-enum
-        -Wswitch-default
-        -Werror=old-style-cast
-        -Werror=overloaded-virtual
-        -Werror=overloaded-virtual
-        -Werror=missing-include-dirs
-        -Werror=unused-result
-
-        -fstack-protector
-        -Wzero-as-null-pointer-constant
-    )
-else()
-    set(BeamMP_CompileOptions
-        /bigobj
-        /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMT
-    )
-endif()
-
-set(BeamMP_Libraries
-    Boost::boost
-    Boost::system
-    doctest::doctest
-    OpenSSL::SSL
-    OpenSSL::Crypto
-    sol2::sol2
-    Threads::Threads
-    ZLIB::ZLIB
-    ${LUA_LIBRARIES}
-    commandline
-    sentry
+# set the source file containing main()
+set(PRJ_MAIN src/main.cpp)
+# set the source file containing the test's main
+set(PRJ_TEST_MAIN test/test_main.cpp)
+# set include paths not part of libraries
+set(PRJ_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
+# set compile features (e.g. standard version)
+set(PRJ_COMPILE_FEATURES cxx_std_20)
+# set #defines (test enable/disable not included here)
+set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT)
+# add all libraries used by the project (WARNING: also set them in vcpkg.json!)
+set(PRJ_LIBRARIES 
    fmt::fmt
+    doctest::doctest
+    Threads::Threads
+    commandline_static
+    toml11::toml11
+    rapidjson
+    sol2
+    httplib::httplib
+    libzip::zip
+    OpenSSL::SSL OpenSSL::Crypto
+    ${LUA_LIBRARIES}
 )

-if (WIN32)
-    set(BeamMP_PlatformLibs wsock32 ws2_32)
-endif ()
+# add dependency find_package calls and similar here
+find_package(fmt CONFIG REQUIRED)
+find_package(OpenSSL REQUIRED)
+find_package(doctest CONFIG REQUIRED)
+find_package(Boost REQUIRED)
+find_package(httplib CONFIG REQUIRED)
+find_package(libzip CONFIG REQUIRED)
+find_package(RapidJSON CONFIG REQUIRED)
+find_package(sol2 CONFIG REQUIRED)
+find_package(toml11 CONFIG REQUIRED)

-# ------------------------ BEAMMP SERVER -----------------------------
+include_directories(include)

-add_executable(BeamMP-Server
-        src/main.cpp
-        ${BeamMP_Sources}
-)
+# to enable multithreading and the Threads::Threads dependency
+include(FindThreads)

-target_compile_definitions(BeamMP-Server PRIVATE
-    ${BeamMP_Definitions}
-    DOCTEST_CONFIG_DISABLE
-)
+### END SETTINGS ###

-target_compile_options(BeamMP-Server PRIVATE 
-    ${BeamMP_CompileOptions}
-)
+# 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.

-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}
-)
+# enables compile_commands.json for clang-related tools (such as the clang LS)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

-# ------------------------ 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}
-    )
+# build release builds by default (if not specified otherwise)
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    message(NOTICE "No build type specified, defaulting to 'Release'")
+    set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+if(UNIX)
+    # this will allow to use same _DEBUG macro available in both Linux as well as Windows - MSCV environment. Easy to put Debug specific code.
+    add_compile_options("$<$<CONFIG:DEBUG>:-D_DEBUG>")
+endif(UNIX)
+
+if (WIN32)
+    add_compile_options("-D_WIN32_WINNT=0x0601")
+endif(WIN32)
+
+
+include(cmake/CompilerWarnings.cmake)
+
+# set MT library for msvc - this is required (says documentation)
+# linux/mac/etc should simply ignore this by default.
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
+    PRJ_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
+    PRJ_VERSION_MINOR=${PROJECT_VERSION_MINOR}
+    PRJ_VERSION_PATCH=${PROJECT_VERSION_PATCH}
+)
+
+# build commandline manually for funky windows flags to carry over without a custom toolchain file
+add_library(commandline_static 
+    deps/commandline/src/impls.h
+    deps/commandline/src/windows_impl.cpp
+    deps/commandline/src/linux_impl.cpp
+    deps/commandline/src/backends/InteractiveBackend.cpp
+    deps/commandline/src/backends/InteractiveBackend.h
+    deps/commandline/src/backends/Backend.cpp
+    deps/commandline/src/backends/Backend.h
+    deps/commandline/src/commandline.h
+    deps/commandline/src/commandline.cpp
+    deps/commandline/src/backends/BufferedBackend.cpp
+    deps/commandline/src/backends/BufferedBackend.h
+)
+if (WIN32)
+    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1)
+else ()
+    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_LINUX=1)
+endif ()
+target_include_directories(commandline_static PUBLIC "deps/commandline/src")
+target_link_libraries(commandline_static Threads::Threads)
+# end of commandline custom build
+
+add_executable(${PROJECT_NAME} ${PRJ_HEADERS} ${PRJ_SOURCES} ${PRJ_MAIN})
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+    MACOSX_BUNDLE TRUE
+    WIN32_EXECUTABLE TRUE
+)
+target_include_directories(${PROJECT_NAME} PRIVATE ${PRJ_INCLUDE_DIRS})
+target_link_libraries(${PROJECT_NAME} ${PRJ_LIBRARIES})
+target_compile_features(${PROJECT_NAME} PRIVATE ${PRJ_COMPILE_FEATURES})
+target_compile_definitions(${PROJECT_NAME} PRIVATE ${PRJ_DEFINITIONS} ${PRJ_WARNINGS}
+    DOCTEST_CONFIG_DISABLE # disables all test code in the final executable
+)
+
+if(MSVC)
+    target_link_options(${PROJECT_NAME} PRIVATE "/SUBSYSTEM:CONSOLE")
+endif(MSVC)
+
+# setup all warnings (from cmake/CompilerWarnings.cmake)
+set_project_warnings(${PROJECT_NAME})
+
+if(${PROJECT_NAME}_ENABLE_UNIT_TESTING)
+    message(STATUS "Unit tests are enabled and will be built as '${PROJECT_NAME}-tests'")
+    add_executable(${PROJECT_NAME}-tests ${PRJ_HEADERS} ${PRJ_SOURCES} ${PRJ_TEST_MAIN})
+    target_include_directories(${PROJECT_NAME}-tests PRIVATE ${PRJ_INCLUDE_DIRS})
+    target_link_libraries(${PROJECT_NAME}-tests ${PRJ_LIBRARIES})
+    target_compile_features(${PROJECT_NAME}-tests PRIVATE ${PRJ_COMPILE_FEATURES})
+    target_compile_definitions(${PROJECT_NAME}-tests PRIVATE ${PRJ_DEFINITIONS} ${PRJ_WARNINGS})
+    set_project_warnings(${PROJECT_NAME}-tests)
+    if(MSVC)
+        target_link_options(${PROJECT_NAME}-tests PRIVATE "/SUBSYSTEM:CONSOLE")
+    endif(MSVC)
 endif()

@@ -1,165 +0,0 @@
-# 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,13 +6,12 @@
 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
 The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).

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

 ## Support + Contact

 Feel free to ask any questions via the following channels:

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

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

 Recommended compilers: MSVC, GCC, CLANG. 

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

 ## Build Instructions

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

-Currently only Linux and Windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
-
-### 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:
 ```
-lua zlib rapidjson openssl websocketpp curl boost
+liblua5.3-dev curl zip unzip tar cmake make git g++
 ```
-The triplet we use for releases is `x64-windows-static`.

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

-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).
+The names of each package may change depending on your platform.

-##### Runtime Dependencies
+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.
+### Building for FreeBSD
+Building is only supported for major release branches of FreeBSD that are currently not EOL. The build process is the same as on Linux, although build dependencies can be universally installed from ports via pkg:
+```
+pkg install git cmake-core zip bash devel/ninja devel/pkgconf lua53
+```
+After installing the necessary build dependencies, follow the Linux build instructions beginning from step 3. Beware that running the initial cmake command will compile vcpkg from source, as vcpkg has no native FreeBSD port - this may take some time.
+
+On systems with a single logical CPU core, `make` may fail to build the server when using the `--parallel` option when calling CMake. If you see error messages related to make, simply omit the `--parallel` from the command: `cmake --build bin --config Release -t BeamMP-Server`.
+
+### Runtime Dependencies

 These are needed to *run* the server.

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

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

-<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 &`*.*
+Windows: No libraries.

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

 class TServer;
@@ -71,7 +70,6 @@ public:
    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; }
@@ -89,24 +87,6 @@ public:
    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);

@@ -130,9 +110,7 @@ private:
    std::string mRole;
    std::string mDID;
    int mID = -1;
-    std::chrono::time_point<TimeType> mLastPingTime;
-    std::mutex mDisconnectMtx;
+    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime;
 };

-// Returns a valid client, or nullptr if no such client exists
-std::shared_ptr<TClient> GetClient(class TServer& Server, int ID);
+std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);
@@ -1,9 +1,5 @@
 #pragma once

-#include "CustomAssert.h"
-#include "TSentry.h"
-extern TSentry Sentry;
-
 #include <array>
 #include <atomic>
 #include <cstring>
@@ -24,50 +20,6 @@ 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;
@@ -80,12 +32,6 @@ 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
@@ -94,17 +40,32 @@ using boost::container::flat_map;
 class Application final {
 public:
    // types
-
-    using SettingValue = std::variant<std::string, bool, int>;
-    using SettingsMap = flat_map<std::string_view, SettingValue>;
-
-    static SettingsMap mSettings;
-
-    static std::string GetSettingString(std::string_view Name);
-    static int GetSettingInt(std::string_view Name);
-    static bool GetSettingBool(std::string_view Name);
-
-    static void SetSetting(std::string_view Name, const SettingValue& value);
+    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 TShutdownHandler = std::function<void()>;

@@ -115,13 +76,15 @@ 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",
@@ -139,9 +102,7 @@ public:
    static void SleepSafeSeconds(size_t Seconds);

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

    enum class Status {
@@ -161,31 +122,23 @@ 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 std::unique_ptr<TConsole> mConsole;
+    static inline TConsole mConsole;
    static inline std::shared_mutex mShutdownMtx {};
    static inline bool mShutdown { false };
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};

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

+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__)
@@ -193,7 +146,6 @@ 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()
@@ -234,88 +186,40 @@ void RegisterThread(const std::string& str);

    #endif // defined(DEBUG)
    
-    #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()));\
-            }                                                                                       \
+    #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)); \
        } while (false)
-    #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()));\
-            }                                                                                       \
+    #define beammp_lua_error(x)                                                               \
+        do {                                                                                  \
+            Application::Console().Write(_this_location + std::string("[LUA ERROR] ") + (x)); \
        } while (false)
-    #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()));\
-            }                                                                                       \
+    #define beammp_lua_warn(x)                                                               \
+        do {                                                                                 \
+            Application::Console().Write(_this_location + std::string("[LUA WARN] ") + (x)); \
        } while (false)
-    #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()));\
-            }                                                                                       \
+    #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)); \
+            }                                                                                 \
        } while (false)
-    #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()));\
-            }                                                                                       \
+    #define beammp_event(x)                                                                   \
+        do {                                                                                  \
+            if (Application::Settings.DebugModeEnabled) {                                     \
+                Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
+            }                                                                                 \
        } while (false)
    // trace() is a debug-build debug()
    #if defined(DEBUG)
-        #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));           \
-                }                                                                                       \
+        #define beammp_trace(x)                                                                   \
+            do {                                                                                  \
+                if (Application::Settings.DebugModeEnabled) {                                     \
+                    Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
+                }                                                                                 \
            } while (false)
    #else
        #define beammp_trace(x)
@@ -415,5 +319,3 @@ inline T DeComp(const T& Compressed) {

 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW
-
-std::string ToHumanReadableSize(size_t Size);
@@ -9,7 +9,17 @@
 #include <termios.h>
 #include <unistd.h>
 char _getch();
-#endif // unix
+#endif // linux
+
+#ifdef BEAMMP_FREEBSD
+#include <errno.h>
+#include <termios.h>
+#include <unistd.h>
+char _getch();
+// macros 'major' and 'minor' need to be undefined on FreeBSD to avoid naming collision with system headers
+#undef major
+#undef minor
+#endif // freebsd

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

@@ -63,12 +63,10 @@ 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
@@ -0,0 +1,16 @@
+#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);
+
+}
@@ -3,11 +3,13 @@
 // one of BEAMMP_{WINDOWS,LINUX,APPLE} will be set at the end of this

 // clang-format off
-#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE)
+#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE) && !defined(BEAMMP_FREEBSD)
    #if defined(_WIN32) || defined(__CYGWIN__)
        #define BEAMMP_WINDOWS
-    #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__unix__) || defined(__unix) || defined(unix)
+    #elif defined(__linux__) || defined(__linux) || defined(linux)
        #define BEAMMP_LINUX
+    #elif defined(__FreeBSD__)
+	#define BEAMMP_FREEBSD
    #elif defined(__APPLE__) || defined(__MACH__)
        #define BEAMMP_APPLE
    #else
@@ -8,7 +8,7 @@ public:
    IThreaded()
        // invokes operator() on this object
        : mThread() { }
-    ~IThreaded() noexcept {
+    virtual ~IThreaded() noexcept {
        if (mThread.joinable()) {
            mThread.join();
        }
@@ -1,6 +0,0 @@
-#pragma once
-
-enum IterationDecision {
-    Continue,
-    Break,
-};
@@ -3,7 +3,7 @@
 //

 #pragma once
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
 #include "rapidjson/stringbuffer.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/document.h"
 #include "rapidjson/writer.h"
@@ -6,8 +6,8 @@
 * and write locks and read locks are mutually exclusive.
 */

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

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

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

 namespace fs = std::filesystem;

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

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

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

 private:
    void RunAsCommand(const std::string& cmd, bool IgnoreNotACommand = false);
@@ -36,12 +40,6 @@ 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);
@@ -58,18 +56,10 @@ 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::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::unique_ptr<Commandline> mCommandline { nullptr };
    std::vector<std::string> mCachedLuaHistory;
    std::vector<std::string> mCachedRegularHistory;
    TLuaEngine* mLuaEngine { nullptr };
@@ -10,49 +10,27 @@
 #include <lua.hpp>
 #include <memory>
 #include <mutex>
-#include <nlohmann/json.hpp>
 #include <queue>
 #include <random>
 #include <set>
-#include <toml11/toml.hpp>
+#include <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 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,
-};
+using TLuaArgTypes = std::variant<std::string, int, sol::variadic_args, bool, std::unordered_map<std::string, std::string>>;
+static constexpr size_t TLuaArgTypes_String = 0;
+static constexpr size_t TLuaArgTypes_Int = 1;
+static constexpr size_t TLuaArgTypes_VariadicArgs = 2;
+static constexpr size_t TLuaArgTypes_Bool = 3;
+static constexpr size_t TLuaArgTypes_StringStringMap = 4;

 class TLuaPlugin;

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

@@ -93,7 +78,7 @@ public:
    struct QueuedFunction {
        std::string FunctionName;
        std::shared_ptr<TLuaResult> Result;
-        std::vector<TLuaValue> Args;
+        std::vector<TLuaArgTypes> Args;
        std::string EventName; // optional, may be empty
    };

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

    static void WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results,
-        const std::optional<TimeType::duration>& Max = std::nullopt);
+        const std::optional<std::chrono::high_resolution_clock::duration>& Max = std::nullopt);
    void ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results);
    bool HasState(TLuaStateId StateId);
    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args);
+    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args);
    void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);
    void RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName);
    /**
@@ -166,7 +151,7 @@ public:
        }

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

        for (const auto& Event : mLuaEvents.at(EventName)) {
            for (const auto& Function : Event.second) {
@@ -185,7 +170,7 @@ public:
            return {};
        }
        std::vector<std::shared_ptr<TLuaResult>> Results;
-        std::vector<TLuaValue> Arguments { TLuaValue { std::forward<ArgsT>(Args) }... };
+        std::vector<TLuaArgTypes> Arguments { TLuaArgTypes { std::forward<ArgsT>(Args) }... };
        const auto Handlers = GetEventHandlersForState(EventName, StateId);
        for (const auto& Handler : Handlers) {
            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments));
@@ -222,8 +207,8 @@ private:
        StateThreadData(const StateThreadData&) = delete;
        virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy);
+        [[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);
        void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
        void AddPath(const fs::path& Path); // to be added to path and cpath
        void operator()() override;
@@ -265,12 +250,11 @@ private:
        std::recursive_mutex mPathsMutex;
        std::mt19937 mMersenneTwister;
        std::uniform_real_distribution<double> mUniformRealDistribution01;
-        std::vector<sol::object> JsonStringToArray(JsonString Str);
    };

    struct TimedEvent {
-        TimeType::duration Duration {};
-        TimeType::time_point LastCompletion {};
+        std::chrono::high_resolution_clock::duration Duration {};
+        std::chrono::high_resolution_clock::time_point LastCompletion {};
        std::string EventName;
        TLuaStateId StateId;
        CallStrategy Strategy;
@@ -37,7 +37,6 @@ private:
    TResourceManager& mResourceManager;
    std::thread mUDPThread;
    std::thread mTCPThread;
-    std::mutex mOpenIDMutex;

    std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
    void HandleDownload(TConnection&& TCPSock);
@@ -46,12 +45,12 @@ private:
    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 Parse(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::string HashPassword(const std::string& str);
 std::vector<uint8_t> StringToVector(const std::string& Str);
@@ -9,6 +9,7 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
    explicit TPPSMonitor(TServer& Server);
+    virtual ~TPPSMonitor() {}

    void operator()() override;

@@ -1,22 +1,21 @@
 #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(); }
+    [[nodiscard]] size_t MaxModSize() const { return mMaxModSize; }
+    [[nodiscard]] std::string FileList() const { return mFileList; }
+    [[nodiscard]] std::string TrimmedList() const { return mTrimmedList; }
+    [[nodiscard]] std::string FileSizes() const { return mFileSizes; }
+    [[nodiscard]] int ModsLoaded() const { return mModsLoaded; }

 private:
-    size_t mTotalModSize = 0; // size of all mods
-    ModMap mMods; // map of mod names
+    size_t mMaxModSize = 0;
+    std::string mFileSizes;
+    std::string mFileList;
+    std::string mTrimmedList;
+    int mModsLoaded = 0;
 };
@@ -4,8 +4,6 @@
 #include <functional>
 #include <string>

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

 private:
-    TimeType::time_point mStartTime;
+    std::chrono::high_resolution_clock::time_point mStartTime;
    std::string Name;
 };
@@ -1,38 +0,0 @@
-#ifndef SENTRY_H
-#define SENTRY_H
-
-#include <mutex>
-#include <string>
-#include <unordered_map>
-enum class SentryLevel {
-    Debug = -1,
-    Info = 0,
-    Warning = 1,
-    Error = 2,
-    Fatal = 3,
-};
-
-// singleton, dont make this twice
-class TSentry final {
-public:
-    TSentry();
-    ~TSentry();
-
-    void PrintWelcome();
-    void SetupUser();
-    void Log(SentryLevel level, const std::string& logger, const std::string& text);
-    void LogError(const std::string& text, const std::string& file, const std::string& line);
-    void SetContext(const std::string& context_name, const std::unordered_map<std::string, std::string>& map);
-    void LogException(const std::exception& e, const std::string& file, const std::string& line);
-    void LogAssert(const std::string& condition_string, const std::string& file, const std::string& line, const std::string& function);
-    void AddErrorBreadcrumb(const std::string& msg, const std::string& file, const std::string& line);
-    // cleared when Logged
-    void SetTransaction(const std::string& id);
-    [[nodiscard]] std::unique_lock<std::mutex> CreateExclusiveContext();
-
-private:
-    bool mValid { true };
-    std::mutex mMutex;
-};
-
-#endif // SENTRY_H
@@ -1,14 +1,11 @@
 #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"
@@ -17,21 +14,6 @@ class TClient;
 class TNetwork;
 class TPPSMonitor;

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

    void InsertClient(const std::shared_ptr<TClient>& Ptr);
    void RemoveClient(const std::weak_ptr<TClient>&);
-    void RemoveClientById(int Id);
    // in Fn, return true to continue, return false to break
-    [[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();
-            }
-        }
-    }
+    void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
    size_t ClientCount() const;

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

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

 struct BufferView {
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <string>
-
-namespace uuid {
-
-std::string GenerateUuid();
-
-}
@@ -1,3 +0,0 @@
-FROM archlinux
-
-RUN pacman -Syu --noconfirm lua53 openssl curl git cmake gcc make zlib boost websocketpp
@@ -1,9 +0,0 @@
-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
@@ -1,9 +0,0 @@
-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
@@ -1,9 +0,0 @@
-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
@@ -1,18 +0,0 @@
-#!/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}"
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cmake . -B build -DCMAKE_BUILD_TYPE=Release -DGIT_SUBMODULE=OFF
-
-make -j -C build BeamMP-Server
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 liblua5.3-dev curl zip unzip tar cmake make git g++ ninja-build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+git config --global --add safe.directory $(pwd)
+git config --global --add safe.directory $(pwd)/vcpkg
+git config --global --add safe.directory $(pwd)/deps/commandline
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+./vcpkg/bootstrap-vcpkg.sh
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server
+
+objcopy --only-keep-debug bin/BeamMP-Server bin/BeamMP-Server.debug
+objcopy --add-gnu-debuglink bin/BeamMP-Server bin/BeamMP-Server.debug
+
+strip -s bin/BeamMP-Server
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+apt-get update -y
+
+apt-get install -y liblua5.3-0 curl
+
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+vcpkg add port lua
+
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DBeamMP-Server_ENABLE_LTO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server-tests
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+cmake --build bin --parallel -t BeamMP-Server --config Release
@@ -13,7 +13,7 @@ void ArgsParser::Parse(const std::vector<std::string_view>& ArgList) {
                ConsumeLongFlag(std::string(Arg));
            }
        } else {
-            fmt::print(stderr, "Error parsing commandline arguments: Supplied argument '{}' is not a valid argument and was ignored.", Arg);
+            beammp_errorf("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)) {
-            fmt::print(stderr, "Error in commandline arguments: Argument '{}' is required but wasn't found.", RegisteredArg.Names.at(0));
+            beammp_errorf("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()) {
-                    fmt::print(stderr, "Error in commandline arguments: Argument '{}' expects a value, but no value was given.", RegisteredArg.Names.at(0));
+                    beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' expects a value, but no value was given.");
                    Ok = false;
                }
            } else if (GetValueOfArgument(RegisteredArg.Names).has_value()) {
-                fmt::print(stderr, "Error in commandline arguments: Argument '{}' does not expect a value, but one was given.", RegisteredArg.Names.at(0));
+                beammp_error("Error in commandline arguments: Argument '" + std::string(RegisteredArg.Names.at(0)) + "' does not expect a value, but one was given.");
                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)) {
-        fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
+        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
    }
    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)) {
-        fmt::print(stdout, "Argument '{}' was supplied but isn't a known argument, so it is likely being ignored.", Name);
+        beammp_warn("Argument '" + Name + "' was supplied but isn't a known argument, so it is likely being ignored.");
    }
 }

@@ -1,7 +1,6 @@
 #include "Client.h"

 #include "CustomAssert.h"
-#include "LuaAPI.h"
 #include "TServer.h"
 #include <memory>
 #include <optional>
@@ -13,8 +12,6 @@ void TClient::DeleteCar(int Ident) {
        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)");
@@ -23,10 +20,6 @@ void TClient::DeleteCar(int Ident) {

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

@@ -58,20 +51,15 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {
 std::string TClient::GetCarPositionRaw(int Ident) {
    std::unique_lock lock(mVehiclePositionMutex);
    try {
-        return mVehiclePosition.at(Ident);
+        return mVehiclePosition.at(size_t(Ident));
    } catch (const std::out_of_range& oor) {
+        beammp_debugf("Failed to get vehicle position for {}: {}", Ident, oor.what());
        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) {
@@ -81,12 +69,11 @@ void TClient::Disconnect(std::string_view Reason) {
    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;
+    mVehiclePosition[size_t(Ident)] = Data;
 }

 std::string TClient::GetCarData(int Ident) {
@@ -132,7 +119,7 @@ TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
    : mServer(Server)
    , mSocket(std::move(Socket))
    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
-    , mLastPingTime(TimeType::now()) {
+    , mLastPingTime(std::chrono::high_resolution_clock::now()) {
 }

 TClient::~TClient() {
@@ -140,23 +127,29 @@ TClient::~TClient() {
 }

 void TClient::UpdatePingTime() {
-    mLastPingTime = TimeType::now();
+    mLastPingTime = std::chrono::high_resolution_clock::now();
 }
 int TClient::SecondsSinceLastPing() {
    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(
-        TimeType::now() - mLastPingTime)
+        std::chrono::high_resolution_clock::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;
+std::optional<std::weak_ptr<TClient>> GetClient(TServer& Server, int ID) {
+    std::optional<std::weak_ptr<TClient>> MaybeClient { std::nullopt };
+    Server.ForEachClient([&](std::weak_ptr<TClient> CPtr) -> bool {
+        ReadLock Lock(Server.GetClientMutex());
+        if (!CPtr.expired()) {
+            auto C = CPtr.lock();
+            if (C->GetID() == ID) {
+                MaybeClient = CPtr;
+                return false;
+            }
+        } else {
+            beammp_debugf("Found an expired client while looking for id {}", ID);
        }
-        return Continue;
+        return true;
    });
-    return Result;
+    return MaybeClient;
 }
@@ -1,8 +1,10 @@
 #include "Common.h"

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

-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;
-    }
-}
+Application::TSettings Application::Settings = {};

 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
    std::unique_lock Lock(mShutdownHandlersMutex);
@@ -279,8 +203,11 @@ void Application::CheckForUpdates() {
            auto MyVersion = ServerVersion();
            auto RemoteVersion = Version(VersionStrToInts(Response));
            if (IsOutdated(MyVersion, RemoteVersion)) {
-                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));
+                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);
            } else {
                if (FirstTime) {
                    beammp_info("Server up-to-date!");
@@ -292,9 +219,6 @@ void Application::CheckForUpdates() {
            if (FirstTime) {
                beammp_debug("Failed to fetch version from: " + url);
                beammp_trace("got " + Response);
-                auto Lock = Sentry.CreateExclusiveContext();
-                Sentry.SetContext("get-response", { { "response", Response } });
-                Sentry.LogError("failed to get server version", _file_basename, _line);
                Application::SetSubsystemStatus("UpdateCheck", Application::Status::Bad);
            }
        }
@@ -314,7 +238,7 @@ static std::mutex ThreadNameMapMutex {};

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

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

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

 void RegisterThread(const std::string& str) {
@@ -351,8 +275,10 @@ void RegisterThread(const std::string& str) {
    ThreadId = std::to_string(getpid()); // todo: research if 'getpid()' is a valid, posix compliant alternative to 'gettid()'
 #elif defined(BEAMMP_LINUX)
    ThreadId = std::to_string(gettid());
+#elif defined(BEAMMP_FREEBSD)
+    ThreadId = std::to_string(getpid());
 #endif
-    if (Application::GetSettingBool(StrDebug)) {
+    if (Application::Settings.DebugModeEnabled) {
        std::ofstream ThreadFile(".Threads.log", std::ios::app);
        ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
    }
@@ -385,7 +311,7 @@ TEST_CASE("Version::AsString") {
 }

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

-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);
+// 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));
    }
 }
@@ -41,7 +41,9 @@ TEST_CASE("init and reset termios") {
        CHECK_EQ(current.c_iflag, original.c_iflag);
        CHECK_EQ(current.c_ispeed, original.c_ispeed);
        CHECK_EQ(current.c_lflag, original.c_lflag);
+#ifndef BEAMMP_FREEBSD // The 'c_line' attribute seems to only exist on Linux, so we need to omit it on other platforms
        CHECK_EQ(current.c_line, original.c_line);
+#endif 
        CHECK_EQ(current.c_oflag, original.c_oflag);
        CHECK_EQ(current.c_ospeed, original.c_ospeed);
    }
@@ -0,0 +1,20 @@
+#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 "";
+}
@@ -154,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::GetSettingInt(StrHTTPServerPort)));
+    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
    std::unique_ptr<httplib::Server> HttpLibServerInstance;
    HttpLibServerInstance = std::make_unique<httplib::Server>();
    // todo: make this IP agnostic so people can set their own IP
@@ -196,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::GetSettingString(StrHTTPServerIP).c_str(), Application::GetSettingInt(StrHTTPServerPort));
+    auto ret = HttpLibServerInstance->listen(Application::Settings.HTTPServerIP.c_str(), Application::Settings.HTTPServerPort);
    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.");
    }
@@ -119,14 +119,15 @@ static inline std::pair<bool, std::string> InternalTriggerClientEvent(int Player
        LuaAPI::MP::Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
        return { true, "" };
    } else {
-        auto Client = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
-        if (!Client) {
+        auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
+        if (!MaybeClient || MaybeClient.value().expired()) {
            beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
            return { false, "Invalid Player ID" };
        }
-        if (!LuaAPI::MP::Engine->Network().Respond(*Client, StringToVector(Packet), true)) {
+        auto c = MaybeClient.value().lock();
+        if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
            beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
-            LuaAPI::MP::Engine->Network().ClientKick(*Client, "Disconnected after failing to receive packets");
+            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
            return { false, "Respond failed, dropping client" };
        }
        return { true, "" };
@@ -139,12 +140,13 @@ 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) {
-    auto Client = GetClient(Engine->Server(), ID);
-    if (!Client) {
+    auto MaybeClient = GetClient(Engine->Server(), ID);
+    if (!MaybeClient || MaybeClient.value().expired()) {
        beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
        return { false, "Player does not exist" };
    }
-    LuaAPI::MP::Engine->Network().ClientKick(*Client, MaybeReason.value_or("No reason"));
+    auto c = MaybeClient.value().lock();
+    LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
    return { true, "" };
 }

@@ -156,15 +158,16 @@ 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 Client = GetClient(Engine->Server(), ID);
-        if (Client) {
-            if (!Client->IsSynced()) {
+        auto MaybeClient = GetClient(Engine->Server(), ID);
+        if (MaybeClient && !MaybeClient.value().expired()) {
+            auto c = MaybeClient.value().lock();
+            if (!c->IsSynced()) {
                Result.first = false;
                Result.second = "Player still syncing data";
                return Result;
            }
-            LogChatMessage("<Server> (to \"" + Client->GetName() + "\")", -1, Message);
-            if (!Engine->Network().Respond(*Client, StringToVector(Packet), true)) {
+            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
+            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
                beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
                // TODO: should we return an error here?
            }
@@ -181,17 +184,18 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri

 std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
    std::pair<bool, std::string> Result;
-    auto Client = GetClient(Engine->Server(), PID);
-    if (!Client) {
+    auto MaybeClient = GetClient(Engine->Server(), PID);
+    if (!MaybeClient || MaybeClient.value().expired()) {
        beammp_lua_error("RemoveVehicle invalid Player ID");
        Result.first = false;
        Result.second = "Invalid Player ID";
        return Result;
    }
-    if (!Client->GetCarData(VID).empty()) {
+    auto c = MaybeClient.value().lock();
+    if (!c->GetCarData(VID).empty()) {
        std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
-        Client->DeleteCar(VID);
+        c->DeleteCar(VID);
        Result.first = true;
    } else {
        Result.first = false;
@@ -204,56 +208,56 @@ void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
    switch (ConfigID) {
    case 0: // debug
        if (NewValue.is<bool>()) {
-            Application::SetSetting(StrDebug, NewValue.as<bool>());
-            beammp_info(std::string("Set `Debug` to ") + (Application::GetSettingBool(StrDebug) ? "true" : "false"));
+            Application::Settings.DebugModeEnabled = NewValue.as<bool>();
+            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
        } else {
            beammp_lua_error("set invalid argument [2] expected boolean");
        }
        break;
    case 1: // private
        if (NewValue.is<bool>()) {
-            Application::SetSetting(StrPrivate, NewValue.as<bool>());
-            beammp_info(std::string("Set `Private` to ") + (Application::GetSettingBool(StrPrivate) ? "true" : "false"));
+            Application::Settings.Private = NewValue.as<bool>();
+            beammp_info(std::string("Set `Private` to ") + (Application::Settings.Private ? "true" : "false"));
        } else {
            beammp_lua_error("set invalid argument [2] expected boolean");
        }
        break;
    case 2: // max cars
        if (NewValue.is<int>()) {
-            Application::SetSetting(StrMaxCars, NewValue.as<int>());
-            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::GetSettingInt(StrMaxCars)));
+            Application::Settings.MaxCars = NewValue.as<int>();
+            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.MaxCars));
        } else {
            beammp_lua_error("set invalid argument [2] expected integer");
        }
        break;
    case 3: // max players
        if (NewValue.is<int>()) {
-            Application::SetSetting(StrMaxPlayers, NewValue.as<int>());
-            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::GetSettingInt(StrMaxPlayers)));
+            Application::Settings.MaxPlayers = NewValue.as<int>();
+            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.MaxPlayers));
        } else {
            beammp_lua_error("set invalid argument [2] expected integer");
        }
        break;
    case 4: // Map
        if (NewValue.is<std::string>()) {
-            Application::SetSetting(StrMap, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Map` to ") + Application::GetSettingString(StrMap));
+            Application::Settings.MapName = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Map` to ") + Application::Settings.MapName);
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
        break;
    case 5: // Name
        if (NewValue.is<std::string>()) {
-            Application::SetSetting(StrName, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Name` to ") + Application::GetSettingString(StrName));
+            Application::Settings.ServerName = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Name` to ") + Application::Settings.ServerName);
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
        break;
    case 6: // Desc
        if (NewValue.is<std::string>()) {
-            Application::SetSetting(StrDescription, NewValue.as<std::string>());
-            beammp_info(std::string("Set `Description` to ") + Application::GetSettingString(StrDescription));
+            Application::Settings.ServerDesc = NewValue.as<std::string>();
+            beammp_info(std::string("Set `Description` to ") + Application::Settings.ServerDesc);
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
@@ -269,18 +273,18 @@ void LuaAPI::MP::Sleep(size_t Ms) {
 }

 bool LuaAPI::MP::IsPlayerConnected(int ID) {
-    auto Client = GetClient(Engine->Server(), ID);
-    if (Client) {
-        return Client->IsConnected();
+    auto MaybeClient = GetClient(Engine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsConnected();
    } else {
        return false;
    }
 }

 bool LuaAPI::MP::IsPlayerGuest(int ID) {
-    auto Client = GetClient(Engine->Server(), ID);
-    if (Client) {
-        return Client->IsGuest();
+    auto MaybeClient = GetClient(Engine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsGuest();
    } else {
        return false;
    }
@@ -298,7 +302,6 @@ 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;
 }
@@ -569,11 +572,7 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        value = right.as<std::string>();
        break;
    case sol::type::number:
-        if (right.is<int>()) {
-            value = right.as<int>();
-        } else {
-            value = right.as<float>();
-        }
+        value = right.as<double>();
        break;
    case sol::type::function:
        beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring");
@@ -583,7 +582,6 @@ 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>()) {
@@ -608,11 +606,10 @@ 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& [key, value] : object) {
-        JsonEncodeRecursive(json, key, value, is_array);
+    for (const auto& entry : object) {
+        JsonEncodeRecursive(json, entry.first, entry.second, is_array);
    }
    return json.dump();
 }
@@ -1,8 +1,6 @@
 #include "SignalHandling.h"
 #include "Common.h"

-#include "Compat.h"
-
 #if defined(BEAMMP_LINUX) || defined(BEAMMP_APPLE)
 #include <csignal>
 static void UnixSignalHandler(int sig) {
@@ -1,11 +1,44 @@
 #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);
@@ -29,7 +62,6 @@ TEST_CASE("TConfig::TConfig") {
    const auto table = toml::parse(CfgFile);
    CHECK(table.at("General").is_table());
    CHECK(table.at("Misc").is_table());
-    CHECK(table.at("HTTP").is_table());

    fs::remove(CfgFile);
 }
@@ -67,42 +99,34 @@ 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::GetSettingString(StrAuthKey.data());
+    data["General"][StrAuthKey.data()] = Application::Settings.Key;
    SetComment(data["General"][StrAuthKey.data()].comments(), " AuthKey has to be filled out in order to run the server");
-    data["General"][StrLogChat.data()] = Application::GetSettingBool(StrLogChat.data());
+    data["General"][StrLogChat.data()] = Application::Settings.LogChat;
    SetComment(data["General"][StrLogChat.data()].comments(), " Whether to log chat messages in the console / log");
-    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());
+    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.");
    // Misc
-    data["Misc"][StrHideUpdateMessages.data()] = Application::GetSettingBool(StrHideUpdateMessages.data());
+    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
    SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
-    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");
+    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");
    std::stringstream Ss;
    Ss << "# This is the BeamMP-Server config file.\n"
          "# Help & Documentation: `https://wiki.beammp.com/en/home/server-maintenance`\n"
-          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://beammp.com/k/dashboard` on the left under \"Keys\"\n"
+          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
       << data;
    auto File = std::fopen(mConfigFileName.c_str(), "w+");
    if (!File) {
@@ -132,42 +156,64 @@ void TConfig::CreateConfigFile() {
    FlushToFile();
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue) {
+    if (!Env.empty()) {
+        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
+            OutValue = std::string(envp);
+            return;
+        }
+    }
    if (Table[Category.c_str()][Key.data()].is_string()) {
-        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()));
+        OutValue = Table[Category.c_str()][Key.data()].as_string();
    }
 }
+
+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);
-        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);
+        TryReadValue(data, "General", StrDebug, EnvStrDebug, Application::Settings.DebugModeEnabled);
+        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Application::Settings.Private);
+        TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
+        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Application::Settings.MaxCars);
+        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Application::Settings.MaxPlayers);
+        TryReadValue(data, "General", StrMap, EnvStrMap, Application::Settings.MapName);
+        TryReadValue(data, "General", StrName, EnvStrName, Application::Settings.ServerName);
+        TryReadValue(data, "General", StrDescription, EnvStrDescription, Application::Settings.ServerDesc);
+        TryReadValue(data, "General", StrTags, EnvStrTags, Application::Settings.ServerTags);
+        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Application::Settings.Resource);
+        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Application::Settings.Key);
+        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Application::Settings.LogChat);
+        TryReadValue(data, "General", StrPassword, "", Application::Settings.Password);
        // Misc
-        TryReadValue(data, "Misc", StrSendErrors);
-        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);
+        TryReadValue(data, "Misc", StrSendErrors, "", Application::Settings.SendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Application::Settings.HideUpdateMessages);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Application::Settings.SendErrorsMessageEnabled);
    } catch (const std::exception& err) {
        beammp_error("Error parsing config file value: " + std::string(err.what()));
        mFailed = true;
@@ -179,28 +225,94 @@ 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::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\".");
+    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.");
        Application::SetSubsystemStatus("Config", Application::Status::Bad);
        mFailed = true;
        return;
    }
    Application::SetSubsystemStatus("Config", Application::Status::Good);
-    if (Application::GetSettingString(StrAuthKey).size() != 36) {
+    if (Application::Settings.Key.size() != 36) {
        beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
    }
 }

 void TConfig::PrintDebug() {
-    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));
-    }
+    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"));
 }

 void TConfig::ParseOldFormat() {
-    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.");
+    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;
 }
@@ -7,34 +7,14 @@
 #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 <fmt/chrono.h>
+#include <mutex>
 #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"));
@@ -72,25 +52,14 @@ 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() {
-    TimeType::time_point now = TimeType::now();
-    time_t tt = TimeType::to_time_t(now);
+    std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+    time_t tt = std::chrono::system_clock::to_time_t(now);
    auto local_tm = std::localtime(&tt);
    char buf[30];
    std::string date;
-    if (Application::GetSettingBool(StrDebug)) {
-        std::strftime(buf, sizeof(buf), "[%Y/%m/%d %T.", local_tm);
+    if (Application::Settings.DebugModeEnabled) {
+        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T.", local_tm);
        date += buf;
        auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
        auto fraction = now - seconds;
@@ -100,7 +69,7 @@ static std::string GetDate() {
        date += fracstr;
        date += "] ";
    } else {
-        std::strftime(buf, sizeof(buf), "[%Y/%m/%d %T] ", local_tm);
+        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T] ", local_tm);
        date += buf;
    }

@@ -177,13 +146,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);
    }
 }

@@ -195,9 +164,9 @@ void TConsole::ChangeToRegularConsole() {
        } else {
            Application::Console().WriteRaw("Detached from Lua.");
        }
-        mCachedLuaHistory = mCommandline.history();
-        mCommandline.set_history(mCachedRegularHistory);
-        mCommandline.set_prompt("> ");
+        mCachedLuaHistory = mCommandline->history();
+        mCommandline->set_history(mCachedRegularHistory);
+        mCommandline->set_prompt("> ");
        mStateId = mDefaultStateId;
    }
 }
@@ -253,17 +222,14 @@ void TConsole::Command_Help(const std::string&, const std::vector<std::string>&
    static constexpr const char* sHelpString = R"(
    Commands:
        help                    displays this help
-        exit
-        quit                    shuts down the server
+        exit                    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
-        debug                   internal error and debug state of the server (for development)
-        clear                   clears the console window
-        version                 version info)";
+        clear                   clears the console window)";
    Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
 }

@@ -280,117 +246,36 @@ 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");
-}
-
-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));
+    mCommandline->write("\x1b[;H\x1b[2J");
 }

 void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
    if (!EnsureArgsCount(args, 1, size_t(-1))) {
        return;
    }
-    auto Name = boost::algorithm::to_lower_copy(args.at(0));
+    auto Name = 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;
-
-    mLuaEngine->Server().ForEachClient([&](const auto& Client) -> IterationDecision {
-        if (StringStartsWithLower(Client->GetName(), Name)) {
-            mLuaEngine->Network().ClientKick(*Client, Reason);
-            Kicked = true;
-            return Break;
+    // 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);
+    };
+    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (NameCompare(locked->GetName(), Name)) {
+                mLuaEngine->Network().ClientKick(*locked, Reason);
+                Kicked = true;
+                return false;
+            }
        }
-        return Continue;
+        return true;
    });
    if (!Kicked) {
        Application::Console().WriteRaw("Error: No player with name matching '" + Name + "' was found.");
@@ -455,80 +340,16 @@ 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, 100)) {
+    if (!EnsureArgsCount(args, 1, 2)) {
        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::GetSettingBool(StrLogChat)) {
+        if (!Application::Settings.LogChat) {
            Application::Console().WriteRaw("Chat message sent!");
        }
    }
@@ -543,10 +364,14 @@ void TConsole::Command_List(const std::string&, const std::vector<std::string>&
    } 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 auto& Client) {
-            ss << std::left << std::setw(25) << Client->GetName()
-               << std::setw(6) << Client->GetID()
-               << std::setw(6) << Client->GetCarCount() << "\n";
+        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+            if (!Client.expired()) {
+                auto locked = Client.lock();
+                ss << std::left << std::setw(25) << locked->GetName()
+                   << std::setw(6) << locked->GetID()
+                   << std::setw(6) << locked->GetCarCount() << "\n";
+            }
+            return true;
        });
        auto Str = ss.str();
        Application::Console().WriteRaw(Str.substr(0, Str.size() - 1));
@@ -566,16 +391,20 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
    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();
+    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto Locked = Client.lock();
+            CarCount += Locked->GetCarCount();
+            ConnectedCount += Locked->IsConnected() ? 1 : 0;
+            GuestCount += Locked->IsGuest() ? 1 : 0;
+            SyncedCount += Locked->IsSynced() ? 1 : 0;
+            SyncingCount += Locked->IsSyncing() ? 1 : 0;
+            MissedPacketQueueSum += Locked->MissedPacketQueueSize();
+            if (Locked->SecondsSinceLastPing() < LargestSecondsSinceLastPing) {
+                LargestSecondsSinceLastPing = Locked->SecondsSinceLastPing();
+            }
        }
+        return true;
    });

    size_t SystemsStarting = 0;
@@ -650,55 +479,6 @@ 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) {
@@ -798,15 +578,20 @@ Commands
 }

 TConsole::TConsole() {
-    mCommandline.enable_history();
-    mCommandline.set_history_limit(20);
+}
+
+void TConsole::InitializeCommandline() {
+    mCommandline = std::make_unique<Commandline>();
+    mCommandline->enable_history();
+    mCommandline->set_history_limit(20);
+    mCommandline->set_prompt("> ");
    BackupOldLog();
-    mCommandline.on_command = [this](Commandline& c) {
+    mCommandline->on_command = [this](Commandline& c) {
        try {
            auto TrimmedCmd = c.get_command();
            TrimmedCmd = TrimString(TrimmedCmd);
            auto [cmd, args] = ParseCommand(TrimmedCmd);
-            mCommandline.write(mCommandline.prompt() + TrimmedCmd);
+            mCommandline->write(mCommandline->prompt() + TrimmedCmd);
            if (mIsLuaConsole) {
                if (!mLuaEngine) {
                    beammp_info("Lua not started yet, please try again in a second");
@@ -814,9 +599,7 @@ TConsole::TConsole() {
                    HandleLuaInternalCommand(cmd.substr(1));
                } else {
                    auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    while (!Future->Ready) {
-                        std::this_thread::yield(); // TODO: Add a timeout
-                    }
+                    Future->WaitUntilReady();
                    if (Future->Error) {
                        beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                    }
@@ -824,7 +607,7 @@ TConsole::TConsole() {
            } else {
                if (!mLuaEngine) {
                    beammp_error("Attempted to run a command before Lua engine started. Please wait and try again.");
-                } else if (cmd == "exit" || cmd == "quit") {
+                } else if (cmd == "exit") {
                    beammp_info("gracefully shutting down");
                    Application::GracefullyShutdown();
                } else if (cmd == "say") {
@@ -843,7 +626,7 @@ TConsole::TConsole() {
            beammp_error("Console died with: " + std::string(e.what()) + ". This could be a fatal error and could cause the server to terminate.");
        }
    };
-    mCommandline.on_autocomplete = [this](Commandline&, std::string stub, int) {
+    mCommandline->on_autocomplete = [this](Commandline&, std::string stub, int) {
        std::vector<std::string> suggestions;
        try {
            if (mIsLuaConsole) { // if lua
@@ -886,15 +669,16 @@ TConsole::TConsole() {
                    }
                }
            } else { // if not lua
-                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;
+                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);
+                        }
                    }
-                }
-                if (suggestions.empty()) {
+                } else {
                    for (const auto& [cmd_name, cmd_fn] : mCommandMap) {
                        if (cmd_name.find(stub) == 0) {
                            suggestions.push_back(cmd_name);
@@ -912,11 +696,21 @@ TConsole::TConsole() {

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

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

 void TConsole::InitializeLuaConsole(TLuaEngine& Engine) {
@@ -17,14 +17,14 @@ void THeartbeatThread::operator()() {
    // these are "hot-change" related variables
    static std::string Last;

-    static TimeType::time_point LastNormalUpdateTime = TimeType::now();
+    static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::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 = TimeType::now();
+        auto Now = std::chrono::high_resolution_clock::now();
        bool Unchanged = Last == Body;
        auto TimePassed = (Now - LastNormalUpdateTime);
        auto Threshold = Unchanged ? 30 : 5;
@@ -36,20 +36,10 @@ void THeartbeatThread::operator()() {

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

-        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;

@@ -59,14 +49,12 @@ 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::GetSettingBool(StrPrivate)) {
+                if (!Application::Settings.Private) {
                    beammp_trace("Backend response failed to parse as valid json");
                    beammp_trace("Response was: `" + T + "`");
                }
-                Sentry.SetContext("JSON Response", { { "reponse", T } });
-                SentryReportError(Url + Target, ResponseCode);
            } else if (ResponseCode != 200) {
-                SentryReportError(Url + Target, ResponseCode);
+                beammp_errorf("Response code from the heartbeat: {}", ResponseCode);
            } else {
                // all ok
                Ok = true;
@@ -85,32 +73,28 @@ 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::GetSettingBool(StrPrivate)) {
+            if (!Application::Settings.Private) {
                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::GetSettingBool(StrPrivate)) {
+        if (Ok && !isAuth && !Application::Settings.Private) {
            if (Status == "2000") {
                beammp_info(("Authenticated! " + Message));
                isAuth = true;
@@ -124,10 +108,10 @@ void THeartbeatThread::operator()() {
                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
            }
        }
-        if (isAuth || Application::GetSettingBool(StrPrivate)) {
+        if (isAuth || Application::Settings.Private) {
            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
        }
-        if (!Application::GetSettingBool(StrHideUpdateMessages) && UpdateReminderCounter % 5) {
+        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
            Application::CheckForUpdates();
        }
    }
@@ -136,20 +120,22 @@ void THeartbeatThread::operator()() {
 std::string THeartbeatThread::GenerateCall() {
    std::stringstream Ret;

-    Ret << "uuid=" << Application::GetSettingString(StrAuthKey)
+    Ret << "uuid=" << Application::Settings.Key
        << "&players=" << mServer.ClientCount()
-        << "&maxplayers=" << Application::GetSettingInt(StrMaxPlayers)
-        << "&port=" << Application::GetSettingInt(StrPort)
-        << "&map=" << Application::GetSettingString(StrMap)
-        << "&private=" << (Application::GetSettingBool(StrPrivate) ? "true" : "false")
+        << "&maxplayers=" << Application::Settings.MaxPlayers
+        << "&port=" << Application::Settings.Port
+        << "&map=" << Application::Settings.MapName
+        << "&private=" << (Application::Settings.Private ? "true" : "false")
        << "&version=" << Application::ServerVersionString()
        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
-        << "&name=" << Application::GetSettingString(StrName)
-        << "&modlist=" << TResourceManager::FormatForBackend(mResourceManager.FileMap())
-        << "&modstotalsize=" << mResourceManager.TotalModsSize()
-        << "&modstotal=" << mResourceManager.LoadedModCount()
+        << "&name=" << Application::Settings.ServerName
+        << "&tags=" << Application::Settings.ServerTags
+        << "&modlist=" << mResourceManager.TrimmedList()
+        << "&modstotalsize=" << mResourceManager.MaxModSize()
+        << "&modstotal=" << mResourceManager.ModsLoaded()
        << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::GetSettingString(StrDescription);
+        << "&desc=" << Application::Settings.ServerDesc
+        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
    return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
@@ -167,8 +153,12 @@ THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& S
 }
 std::string THeartbeatThread::GetPlayers() {
    std::string Return;
-    mServer.ForEachClient([&](const auto& Client) {
-        Return += Client->GetName() + ";";
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            Return += ClientPtr.lock()->GetName() + ";";
+        }
+        return true;
    });
    return Return;
 }
@@ -4,8 +4,7 @@
 #include "Http.h"
 #include "LuaAPI.h"
 #include "TLuaPlugin.h"
-#include "Uuid.h"
-#include "sol/types.hpp"
+#include "sol/object.hpp"

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

 TLuaEngine::TLuaEngine()
-    : mResourceServerPath(fs::path(Application::GetSettingString(StrResourceFolder)) / "Server") {
+    : mResourceServerPath(fs::path(Application::Settings.Resource) / "Server") {
    Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
    LuaAPI::MP::Engine = this;
-    if (!fs::exists(Application::GetSettingString(StrResourceFolder))) {
-        fs::create_directory(Application::GetSettingString(StrResourceFolder));
+    if (!fs::exists(Application::Settings.Resource)) {
+        fs::create_directory(Application::Settings.Resource);
    }
    if (!fs::exists(mResourceServerPath)) {
        fs::create_directory(mResourceServerPath);
@@ -37,7 +36,7 @@ TLuaEngine::TLuaEngine()
 }

 TEST_CASE("TLuaEngine ctor & dtor") {
-    Application::SetSetting(StrResourceFolder, "beammp_server_test_resources");
+    Application::Settings.Resource = "beammp_server_test_resources";
    TLuaEngine engine;
    Application::GracefullyShutdown();
 }
@@ -72,12 +71,13 @@ void TLuaEngine::operator()() {
                    }
                    return false;
                });
+            } else {
+                mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(20));
            }
-            mResultsToCheckCond.wait_for(Lock, std::chrono::milliseconds(10));
        }
    });
    // event loop
-    auto Before = TimeType::now();
+    auto Before = std::chrono::high_resolution_clock::now();
    while (!Application::IsShuttingDown()) {
        { // Timed Events Scope
            std::unique_lock Lock(mTimedEventsMutex);
@@ -110,14 +110,14 @@ void TLuaEngine::operator()() {
        } else {
            constexpr double NsFactor = 1000000.0;
            constexpr double Expected = 10.0; // ms
-            const auto Diff = (TimeType::now() - Before).count() / NsFactor;
+            const auto Diff = (std::chrono::high_resolution_clock::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 = TimeType::now();
+        Before = std::chrono::high_resolution_clock::now();
    }

    if (ResultCheckThread.joinable()) {
@@ -253,15 +253,11 @@ 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>()) {
-                    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);
+                    std::string s = key.as<std::string>();
+                    if (value.get_type() == sol::type::function) {
+                        s += "(";
                    }
+                    Result.push_back(s);
                }
            } else {
                Result = { obj.as<std::string>() };
@@ -285,11 +281,12 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const st

 */

-void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<TimeType::duration>& Max) {
+void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, const std::optional<std::chrono::high_resolution_clock::duration>& Max) {
    for (const auto& Result : Results) {
        bool Cancelled = false;
        size_t ms = 0;
        std::set<std::string> WarnedResults;
+
        while (!Result->Ready && !Cancelled) {
            std::this_thread::sleep_for(std::chrono::milliseconds(10));
            ms += 10;
@@ -304,6 +301,7 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                }
            }
        }
+
        if (Cancelled) {
            beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
            LuaAPI::MP::Engine->ReportErrors({ Result });
@@ -334,7 +332,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<TLuaValue>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
    std::unique_lock Lock(mLuaStatesMutex);
    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
 }
@@ -414,55 +412,13 @@ 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 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 Return = mEngine->TriggerEvent(EventName, mStateId, EventArgs);
    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 = LocalArgs.empty() ? Fn() : Fn(LocalArgs);
+            auto LuaResult = Fn(EventArgs);
            auto Result = std::make_shared<TLuaResult>();
            if (LuaResult.valid()) {
                Result->Error = false;
@@ -471,7 +427,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                Result->Error = true;
                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
            }
-            Result->Ready = true;
+            Result->MarkAsReady();
            Return.push_back(Result);
        }
    }
@@ -501,44 +457,31 @@ 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?
-    auto Result = mStateView.create_table();
+    sol::table 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()) {
-                for (const auto& Res : FnRet) {
-                    Result.add(Res);
-                }
+                Result.add(FnRet);
            } 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 Client = GetClient(mEngine->Server(), ID);
-    if (Client) {
-        auto IDs = Client->GetIdentifiers();
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
        if (IDs.empty()) {
            return sol::lua_nil;
        }
@@ -554,20 +497,27 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
    sol::table Result = mStateView.create_table();
-    mEngine->Server().ForEachClient([&](const auto& Client) {
-        Result[Client->GetID()] = Client->GetName();
+    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            Result[locked->GetID()] = locked->GetName();
+        }
+        return true;
    });
    return Result;
 }

 int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
    int Id = -1;
-    mEngine->mServer->ForEachClient([&Id, &Name](const auto& Client) -> IterationDecision {
-        if (Client->GetName() == Name) {
-            Id = Client->GetID();
-            return Break;
+    mEngine->mServer->ForEachClient([&Id, &Name](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (locked->GetName() == Name) {
+                Id = locked->GetID();
+                return false;
+            }
        }
-        return Continue;
+        return true;
    });
    return Id;
 }
@@ -599,17 +549,18 @@ sol::table TLuaEngine::StateThreadData::Lua_FS_ListDirectories(const std::string
 }

 std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
-    auto Client = GetClient(mEngine->Server(), ID);
-    if (Client) {
-        return Client->GetName();
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->GetName();
    } else {
        return "";
    }
 }

 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
-    auto Client = GetClient(mEngine->Server(), ID);
-    if (Client) {
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
        TClient::TSetOfVehicleData VehicleData;
        { // Vehicle Data Lock Scope
            auto LockedData = Client->GetAllCars();
@@ -630,8 +581,9 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {

 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) {
+    auto MaybeClient = GetClient(mEngine->Server(), PID);
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
        std::string VehiclePos = Client->GetCarPositionRaw(VID);

        if (VehiclePos.empty()) {
@@ -649,7 +601,7 @@ std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetPositionR
        return Result;
    } else {
        // return std::make_tuple(sol::lua_nil, sol::make_object(StateView, "Client expired"));
-        Result.second = "Client expired";
+        Result.second = "No such player";
        return Result;
    }
 }
@@ -776,14 +728,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"] = TimeType::now();
+        Result["__StartTime"] = std::chrono::high_resolution_clock::now();
        Result.set_function("GetCurrent", [&](const sol::table& Table) -> float {
-            auto End = TimeType::now();
-            auto Start = Table.get<TimeType::time_point>("__StartTime");
+            auto End = std::chrono::high_resolution_clock::now();
+            auto Start = Table.get<std::chrono::high_resolution_clock::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"] = TimeType::now();
+            Table["__StartTime"] = std::chrono::high_resolution_clock::now();
        });
        return Result;
    });
@@ -795,10 +747,9 @@ 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) -> auto{
-            return Lua_TriggerLocalEvent(EventName, EventArgs);
-        });
+    MPTable.set_function("TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
+        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);
@@ -869,7 +820,6 @@ 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);
    });
@@ -926,7 +876,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<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args, const std::string& EventName, CallStrategy Strategy) {
    // TODO: Document all this
    decltype(mStateFunctionQueue)::iterator Iter = mStateFunctionQueue.end();
    if (Strategy == CallStrategy::BestEffort) {
@@ -948,7 +898,7 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFrom
    }
 }

-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaArgTypes>& Args) {
    auto Result = std::make_shared<TLuaResult>();
    Result->StateId = mStateId;
    Result->Function = FunctionName;
@@ -1007,7 +957,7 @@ void TLuaEngine::StateThreadData::operator()() {
                    sol::error Err = Res;
                    S.second->ErrorMessage = Err.what();
                }
-                S.second->Ready = true;
+                S.second->MarkAsReady();
            }
        }
        { // StateFunctionQueue Scope
@@ -1033,24 +983,19 @@ void TLuaEngine::StateThreadData::operator()() {
                            continue;
                        }
                        switch (Arg.index()) {
-                        case TLuaType::String:
+                        case TLuaArgTypes_String:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<std::string>(Arg)));
                            break;
-                        case TLuaType::Int:
+                        case TLuaArgTypes_Int:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<int>(Arg)));
                            break;
-                        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());
-                            }
+                        case TLuaArgTypes_VariadicArgs:
+                            LuaArgs.push_back(sol::make_object(StateView, std::get<sol::variadic_args>(Arg)));
                            break;
-                        }
-                        case TLuaType::Bool:
+                        case TLuaArgTypes_Bool:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
                            break;
-                        case TLuaType::StringStringMap: {
+                        case TLuaArgTypes_StringStringMap: {
                            auto Map = std::get<std::unordered_map<std::string, std::string>>(Arg);
                            auto Table = StateView.create_table();
                            for (const auto& [k, v] : Map) {
@@ -1059,15 +1004,6 @@ void TLuaEngine::StateThreadData::operator()() {
                            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;
@@ -1082,11 +1018,11 @@ void TLuaEngine::StateThreadData::operator()() {
                        sol::error Err = Res;
                        Result->ErrorMessage = Err.what();
                    }
-                    Result->Ready = true;
+                    Result->MarkAsReady();
                } else {
                    Result->Error = true;
                    Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->Ready = true;
+                    Result->MarkAsReady();
                }
            }
        }
@@ -1106,8 +1042,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 {
-        TimeType::duration { std::chrono::milliseconds(IntervalMS) },
-        TimeType::now(),
+        std::chrono::high_resolution_clock::duration { std::chrono::milliseconds(IntervalMS) },
+        std::chrono::high_resolution_clock::now(),
        EventName,
        StateId,
        Strategy
@@ -1136,11 +1072,19 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
    mPaths.push(Path);
 }

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

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

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

 void TLuaEngine::TimedEvent::Reset() {
-    LastCompletion = TimeType::now();
+    LastCompletion = std::chrono::high_resolution_clock::now();
 }
@@ -1,7 +1,6 @@
 #include "TNetwork.h"
 #include "Client.h"
 #include "Common.h"
-#include "IterationDecision.h"
 #include "LuaAPI.h"
 #include "TLuaEngine.h"
 #include "nlohmann/json.hpp"
@@ -10,9 +9,10 @@
 #include <array>
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/address_v4.hpp>
-#include <chrono>
 #include <cstring>

+typedef boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO> rcv_timeout_option;
+
 std::vector<uint8_t> StringToVector(const std::string& Str) {
    return std::vector<uint8_t>(Str.data(), Str.data() + Str.size());
 }
@@ -33,6 +33,15 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
    , mResourceManager(ResourceManager) {
    Application::SetSubsystemStatus("TCPNetwork", Application::Status::Starting);
    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Starting);
+    Application::RegisterShutdownHandler([&] {
+        beammp_debug("Kicking all players due to shutdown");
+        Server.ForEachClient([&](std::weak_ptr<TClient> client) -> bool {
+            if (!client.expired()) {
+                ClientKick(*client.lock(), "Server shutdown");
+            }
+            return true;
+        });
+    });
    Application::RegisterShutdownHandler([&] {
        Application::SetSubsystemStatus("UDPNetwork", Application::Status::ShuttingDown);
        if (mUDPThread.joinable()) {
@@ -49,19 +58,11 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
    });
    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));
+    ip::udp::endpoint UdpListenEndpoint(ip::address::from_string("0.0.0.0"), Application::Settings.Port);
    boost::system::error_code ec;
    mUDPSock.open(UdpListenEndpoint.protocol(), ec);
    if (ec) {
@@ -76,45 +77,35 @@ void TNetwork::UDPServerMain() {
        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"));
+    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.Port) + (" with a Max of ")
+        + std::to_string(Application::Settings.MaxPlayers) + (" 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;
+            auto Pos = std::find(Data.begin(), Data.end(), ':');
+            if (Data.empty() || Pos > Data.begin() + 2)
                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;
+            mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) -> bool {
+                std::shared_ptr<TClient> Client;
+                {
+                    ReadLock Lock(mServer.GetClientMutex());
+                    if (!ClientPtr.expired()) {
+                        Client = ClientPtr.lock();
+                    } else
+                        return true;
                }
-            }
+
+                if (Client->GetID() == ID) {
+                    Client->SetUDPAddr(client);
+                    Client->SetIsConnected(true);
+                    Data.erase(Data.begin(), Data.begin() + 2);
+                    mServer.GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
+                }
+
+                return true;
+            });
        } catch (const std::exception& e) {
            beammp_error(("fatal: ") + std::string(e.what()));
        }
@@ -124,7 +115,7 @@ void TNetwork::UDPServerMain() {
 void TNetwork::TCPServerMain() {
    RegisterThread("TCPServer");

-    ip::tcp::endpoint ListenEp(ip::address::from_string("0.0.0.0"), Application::GetSettingInt(StrPort));
+    ip::tcp::endpoint ListenEp(ip::address::from_string("0.0.0.0"), Application::Settings.Port);
    ip::tcp::socket Listener(mServer.IoCtx());
    boost::system::error_code ec;
    Listener.open(ListenEp.protocol(), ec);
@@ -188,16 +179,29 @@ void TNetwork::Identify(TConnection&& RawConnection) {
        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') {
+    try {
+        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);
+        }
+    } catch(const std::exception& e) {
+        beammp_errorf("Error during handling of code {} - client left in invalid state, closing socket", Code);
        boost::system::error_code ec;
-        write(RawConnection.Socket, buffer("P"), ec);
-        return;
-    } else {
-        beammp_errorf("Invalid code got in Identify: '{}'", Code);
+        RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
+        if (ec) {
+            beammp_debugf("Failed to shutdown client socket: {}", ec.message());
+        }
+        RawConnection.Socket.close(ec);
+        if (ec) {
+            beammp_debugf("Failed to close client socket: {}", ec.message());
+        }
    }
 }

@@ -211,18 +215,29 @@ void TNetwork::HandleDownload(TConnection&& Conn) {
        return;
    }
    auto ID = uint8_t(D);
-    mServer.ForEachClient([&](const auto& Client) -> IterationDecision {
-        if (Client->GetID() == ID) {
-            Client->SetDownSock(std::move(Conn.Socket));
-            return Break;
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            auto c = ClientPtr.lock();
+            if (c->GetID() == ID) {
+                c->SetDownSock(std::move(Conn.Socket));
+            }
        }
-        return Continue;
+        return true;
    });
 }

+std::string HashPassword(const std::string& str) {
+    std::stringstream ret;
+    unsigned char* hash = SHA256(reinterpret_cast<const unsigned char*>(str.c_str()), str.length(), nullptr);
+    for (int i = 0; i < 32; i++) {
+        ret << std::hex << static_cast<int>(hash[i]);
+    }
+    return ret.str();
+}
+
 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());

@@ -244,7 +259,8 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        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"))) {
+
+    if (!TCPSend(*Client, StringToVector("A"))) { //changed to A for Accepted version
        // TODO: handle
    }

@@ -255,12 +271,24 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        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);
+    std::string key(reinterpret_cast<const char*>(Data.data()), Data.size());
+
+    nlohmann::json AuthReq{};
+    std::string AuthResStr{};
+    try {
+        AuthReq = nlohmann::json {
+            { "key", key }
+        };
+
+        auto Target = "/pkToUser";
+        unsigned int ResponseCode = 0;
+        AuthResStr = Http::POST(Application::GetBackendUrlForAuth(), 443, Target, AuthReq.dump(), "application/json", &ResponseCode);
+
+    } catch (const std::exception& e) {
+        beammp_debugf("Invalid json sent by client, kicking: {}", e.what());
+        ClientKick(*Client, "Invalid Key (invalid UTF8 string)!");
+        return nullptr;
+    }

    try {
        nlohmann::json AuthRes = nlohmann::json::parse(AuthResStr);
@@ -274,11 +302,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
            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);
-                }
+                Client->SetIdentifier(Raw.substr(0, SepIndex), Raw.substr(SepIndex + 1));
            }
        } else {
            beammp_error("Invalid authentication data received from authentication backend");
@@ -292,22 +316,41 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        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;
+    if(!Application::Settings.Password.empty()) { // ask password
+        if(!TCPSend(*Client, StringToVector("S"))) {
+            // TODO: handle
        }
-        return Continue;
+        beammp_info("Waiting for password");
+        Data = TCPRcv(*Client);
+        std::string Pass = std::string(reinterpret_cast<const char*>(Data.data()), Data.size());
+        if(Pass != HashPassword(Application::Settings.Password)) {
+            beammp_debug(Client->GetName() + " attempted to connect with a wrong password");
+            ClientKick(*Client, "Wrong password!");
+            return {};
+        } else {
+            beammp_debug(Client->GetName() + " used the correct password");
+        }
+    }
+
+    beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        std::shared_ptr<TClient> Cl;
+        {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                Cl = ClientPtr.lock();
+            } else
+                return true;
+        }
+        if (Cl->GetName() == Client->GetName() && Cl->IsGuest() == Client->IsGuest()) {
+            Cl->Disconnect("Stale Client (not a real player)");
+            return false;
+        }
+
+        return true;
    });

-    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());
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest(), Client->GetIdentifiers());
    TLuaEngine::WaitForAll(Futures);
    bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
        [](const std::shared_ptr<TLuaResult>& Result) {
@@ -323,24 +366,23 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
            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!");
+        ClientKick(*Client, "you are not allowed on the server!");
+        return {};
    } else if (NotAllowedWithReason) {
        ClientKick(*Client, Reason);
+        return {};
+    }
+
+    if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) {
+        beammp_info("Identification success");
+        mServer.InsertClient(Client);
+        TCPClient(Client);
    } else {
        ClientKick(*Client, "Server full!");
    }

-    mServer.RemoveClient(Client);
-    return {};
+    return Client;
 }

 std::shared_ptr<TClient> TNetwork::CreateClient(ip::tcp::socket&& TCPSock) {
@@ -383,12 +425,11 @@ bool TNetwork::TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync
        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())) {
+    if (c.IsDisconnected()) {
        beammp_error("Client disconnected, cancelling TCPRcv");
        return {};
    }
@@ -432,7 +473,6 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
        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());
@@ -512,7 +552,7 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
            Client->Disconnect("TCPRcv failed");
            break;
        }
-        TServer::GlobalParser(c, std::move(res), *this);
+        mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this);
    }

    if (QueueSync.joinable())
@@ -527,9 +567,14 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
 }

 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() + ",";
+    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::Settings.MaxPlayers) + ":";
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            auto c = ClientPtr.lock();
+            Packet += c->GetName() + ",";
+        }
+        return true;
    });
    Packet = Packet.substr(0, Packet.length() - 1);
    Client.EnqueuePacket(StringToVector(Packet));
@@ -567,19 +612,20 @@ void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& 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++;
+        mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                auto c = ClientPtr.lock();
+                if (c->GetID() == ID) {
+                    found = false;
+                    ID++;
+                }
            }
+            return true;
        });
    } while (!found);
    return ID;
@@ -589,11 +635,13 @@ void TNetwork::OnConnect(const std::weak_ptr<TClient>& c) {
    beammp_assert(!c.expired());
    beammp_info("Client connected");
    auto LockedClient = c.lock();
+    LockedClient->SetID(OpenID());
+    beammp_info("Assigned ID " + std::to_string(LockedClient->GetID()) + " to " + LockedClient->GetName());
    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
+    (void)Respond(*LockedClient, StringToVector("M" + Application::Settings.MapName), true); // Send the Map on connect
    beammp_info(LockedClient->GetName() + " : Connected");
    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->GetID()));
 }
@@ -611,39 +659,11 @@ void TNetwork::SyncResources(TClient& c) {
        constexpr std::string_view Done = "Done";
        if (std::equal(Data.begin(), Data.end(), Done.begin(), Done.end()))
            break;
-        HandleResourcePackets(c, Data);
+        Parse(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) {
+void TNetwork::Parse(TClient& c, const std::vector<uint8_t>& Packet) {
    if (Packet.empty())
        return;
    char Code = Packet.at(0), SubCode = 0;
@@ -656,7 +676,7 @@ void TNetwork::HandleResourcePackets(TClient& c, const std::vector<uint8_t>& Pac
    case 'S':
        if (SubCode == 'R') {
            beammp_debug("Sending Mod Info");
-            std::string ToSend = TResourceManager::FormatForClient(GetClientMods(c));
+            std::string ToSend = mResourceManager.FileList() + mResourceManager.FileSizes();
            if (ToSend.empty())
                ToSend = "-";
            if (!TCPSend(c, StringToVector(ToSend))) {
@@ -670,22 +690,28 @@ void TNetwork::HandleResourcePackets(TClient& c, const std::vector<uint8_t>& Pac
 }

 void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
-    beammp_infof("{} ({}) requesting mod: '{}'", c.GetName(), c.GetID(), UnsafeName);
+    beammp_info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));

-    auto FileName = UnsafeName;
-
-    auto res = TResourceManager::IsModValid(FileName, c.AllowedMods);
-
-    if (res.has_value()) {
+    if (!fs::path(UnsafeName).has_filename()) {
        if (!TCPSend(c, StringToVector("CO"))) {
-            c.Disconnect("TCP send failed in SendFile, when trying to cancel file transfer because " + res.value());
+            // TODO: handle
        }
+        beammp_warn("File " + UnsafeName + " is not a file!");
+        return;
+    }
+    auto FileName = fs::path(UnsafeName).filename().string();
+    FileName = Application::Settings.Resource + "/Client/" + FileName;
+
+    if (!std::filesystem::exists(FileName)) {
+        if (!TCPSend(c, StringToVector("CO"))) {
+            // TODO: handle
+        }
+        beammp_warn("File " + UnsafeName + " could not be accessed!");
        return;
    }

    if (!TCPSend(c, StringToVector("AG"))) {
-        c.Disconnect("TCP send failed in SendFile, when trying to send ");
-        return;
+        // TODO: handle
    }

    /// Wait for connections
@@ -815,7 +841,6 @@ bool TNetwork::TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Da
        return false;
    }
    C.UpdatePingTime();
-    C.TcpSent += Size;
    return true;
 }

@@ -858,23 +883,32 @@ bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
    LockedClient->SetIsSyncing(true);
    bool Return = false;
    bool res = true;
-    mServer.ForEachClient([&](const auto& Client) -> IterationDecision {
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        std::shared_ptr<TClient> client;
+        {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                client = ClientPtr.lock();
+            } else
+                return true;
+        }
        TClient::TSetOfVehicleData VehicleData;
        { // Vehicle Data Lock Scope
-            auto LockedData = Client->GetAllCars();
+            auto LockedData = client->GetAllCars();
            VehicleData = *LockedData.VehicleData;
        } // End Vehicle Data Lock Scope
-        if (Client != LockedClient) {
+        if (client != LockedClient) {
            for (auto& v : VehicleData) {
                if (LockedClient->IsDisconnected()) {
                    Return = true;
                    res = false;
-                    return Break;
+                    return false;
                }
                res = Respond(*LockedClient, StringToVector(v.Data()), true, true);
            }
        }
-        return Continue;
+
+        return true;
    });
    LockedClient->SetIsSyncing(false);
    if (Return) {
@@ -890,7 +924,16 @@ void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self
        beammp_assert(c);
    char C = Data.at(0);
    bool ret = true;
-    mServer.ForEachClient([&](const auto& Client) {
+    mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) -> bool {
+        std::shared_ptr<TClient> Client;
+        try {
+            ReadLock Lock(mServer.GetClientMutex());
+            Client = ClientPtr.lock();
+        } catch (const std::exception&) {
+            // continue
+            beammp_warn("Client expired, shouldn't happen - if a client disconnected recently, you can ignore this");
+            return true;
+        }
        if (Self || Client.get() != c) {
            if (Client->IsSynced() || Client->IsSyncing()) {
                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
@@ -912,6 +955,7 @@ void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self
                }
            }
        }
+        return true;
    });
    if (!ret) {
        // TODO: handle
@@ -939,8 +983,6 @@ bool TNetwork::UDPSend(TClient& Client, std::vector<uint8_t> Data) {
            Client.Disconnect("UDP send failed");
        return false;
    }
-    Client.UdpSent += Data.size();
-    ++Client.UdpPacketsSent;
    return true;
 }

@@ -33,16 +33,26 @@ void TPPSMonitor::operator()() {
            Application::SetPPS("-");
            continue;
        }
-        mServer.ForEachClient([&](const auto& Client) {
-            if (Client->GetCarCount() > 0) {
+        mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+            std::shared_ptr<TClient> c;
+            {
+                ReadLock Lock(mServer.GetClientMutex());
+                if (!ClientPtr.expired()) {
+                    c = ClientPtr.lock();
+                } else
+                    return true;
+            }
+            if (c->GetCarCount() > 0) {
                C++;
-                V += Client->GetCarCount();
+                V += c->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);
+            if (c->SecondsSinceLastPing() > (20 * 60)) {
+                beammp_debug("client " + std::string("(") + std::to_string(c->GetID()) + ")" + c->GetName() + " timing out: " + std::to_string(c->SecondsSinceLastPing()) + ", pps: " + Application::PPS());
+                TimedOutClients.push_back(c);
            }
+
+            return true;
        });
        for (auto& ClientToKick : TimedOutClients) {
            Network().ClientKick(*ClientToKick, "Timeout (no ping for way too long)");
@@ -1,6 +1,7 @@
 #include "TPluginMonitor.h"

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

 TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine> Engine)
    : mEngine(Engine)
@@ -9,7 +10,7 @@ TPluginMonitor::TPluginMonitor(const fs::path& Path, std::shared_ptr<TLuaEngine>
    if (!fs::exists(mPath)) {
        fs::create_directories(mPath);
    }
-    for (const auto& Entry : fs::recursive_directory_iterator(mPath)) {
+    for (const auto& Entry : fs::recursive_directory_iterator(mPath, fs::directory_options::follow_directory_symlink)) {
        // TODO: trigger an event when a subfolder file changes
        if (Entry.is_regular_file()) {
            mFileTimes[Entry.path().string()] = fs::last_write_time(Entry.path());
@@ -5,79 +5,31 @@

 namespace fs = std::filesystem;

-std::string TResourceManager::FormatForBackend(const ModMap& mods) {
-    std::string monkey;
-    for (const auto& [name, size] : mods) {
-        monkey += fs::path(name).filename().string() + ';';
-    }
-    return monkey;
-}
-
-std::string TResourceManager::FormatForClient(const ModMap& mods) {
-    std::string monkey;
-    for (const auto& [name, size] : mods) {
-        monkey += '/' + name + ';';
-    }
-    for (const auto& [name, size] : mods) {
-        monkey += std::to_string(size) + ';';
-    }
-    return monkey;
-}
-
-/// @brief Sanitizes a requested mod string
-/// @param pathString Raw mod path string
-/// @param mods List of allowed mods for this client
-/// @return Error, if any
-std::optional<std::string> TResourceManager::IsModValid(std::string& pathString, const ModMap& mods) {
-    auto path = fs::path(pathString);
-    if (!path.has_filename()) {
-        beammp_warn("File " + pathString + " is not a file!");
-        return { "the requested file doesn't contain a valid filename" };
-    }
-
-    auto BasePath = fs::path(Application::GetSettingString(StrResourceFolder) + "/Client");
-
-    auto CombinedPath = fs::path(BasePath.string() + pathString).lexically_normal();
-
-    // beammp_infof("path: {}, base: {}, combined: {}", pathString, BasePath.string(), CombinedPath.string());
-
-    if (!std::filesystem::exists(CombinedPath)) {
-        beammp_warn("File " + pathString + " could not be accessed!");
-        return { "the requested file doesn't exist or couldn't be accessed" };
-    }
-
-    auto relative = fs::relative(CombinedPath, BasePath);
-
-    if (mods.count(relative.string()) == 0) {
-        beammp_warn("File " + pathString + " is disallowed for this player!");
-        return { "the requested file is disallowed for this player" };
-    }
-
-    pathString = CombinedPath.string();
-    return {};
-}
-
 TResourceManager::TResourceManager() {
    Application::SetSubsystemStatus("ResourceManager", Application::Status::Starting);
-    std::string BasePath = Application::GetSettingString(StrResourceFolder) + "/Client";
-    if (!fs::exists(BasePath))
-        fs::create_directories(BasePath);
-    std::vector<std::string> modNames;
-
-    auto iterator = fs::recursive_directory_iterator(BasePath, fs::directory_options::follow_directory_symlink | fs::directory_options::skip_permission_denied);
-    for (const auto& entry : iterator) {
-        if (iterator.depth() > 0 && !Application::GetSettingBool(StrIncludeSubdirectories))
-            continue;
-        if ((entry.is_regular_file() || entry.is_symlink()) && entry.path().extension() == ".zip") {
-            auto relativePath = fs::relative(entry.path(), BasePath);
-
-            mMods[relativePath.string()] = entry.file_size();
-            mTotalModSize += entry.file_size();
+    std::string Path = Application::Settings.Resource + "/Client";
+    if (!fs::exists(Path))
+        fs::create_directories(Path);
+    for (const auto& entry : fs::directory_iterator(Path)) {
+        std::string File(entry.path().string());
+        if (auto pos = File.find(".zip"); pos != std::string::npos) {
+            if (File.length() - pos == 4) {
+                std::replace(File.begin(), File.end(), '\\', '/');
+                mFileList += File + ';';
+                if (auto i = File.find_last_of('/'); i != std::string::npos) {
+                    ++i;
+                    File = File.substr(i, pos - i);
+                }
+                mTrimmedList += "/" + fs::path(File).filename().string() + ';';
+                mFileSizes += std::to_string(size_t(fs::file_size(entry.path()))) + ';';
+                mMaxModSize += size_t(fs::file_size(entry.path()));
+                mModsLoaded++;
+            }
        }
    }

-    if (!mMods.empty()) {
-        beammp_infof("Loaded {} mod{}", mMods.size(), mMods.size() != 1 ? 's' : ' ');
+    if (mModsLoaded) {
+        beammp_info("Loaded " + std::to_string(mModsLoaded) + " Mods");
    }

    Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
@@ -2,21 +2,21 @@
 #include "Common.h"

 TScopedTimer::TScopedTimer()
-    : mStartTime(TimeType::now()) {
+    : mStartTime(std::chrono::high_resolution_clock::now()) {
 }

 TScopedTimer::TScopedTimer(const std::string& mName)
-    : mStartTime(TimeType::now())
+    : mStartTime(std::chrono::high_resolution_clock::now())
    , Name(mName) {
 }

 TScopedTimer::TScopedTimer(std::function<void(size_t)> OnDestroy)
    : OnDestroy(OnDestroy)
-    , mStartTime(TimeType::now()) {
+    , mStartTime(std::chrono::high_resolution_clock::now()) {
 }

 TScopedTimer::~TScopedTimer() {
-    auto EndTime = TimeType::now();
+    auto EndTime = std::chrono::high_resolution_clock::now();
    auto Delta = EndTime - mStartTime;
    size_t TimeDelta = Delta / std::chrono::milliseconds(1);
    if (OnDestroy) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lucca Jiménez Könings	6f02ff92c2	fix typos and phrasing in README.md Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 14:14:09 +01:00
Lucca Jiménez Könings	3ddc2d8f8b	remove unecessary comment Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 14:10:14 +01:00
Lucca Jiménez Könings	4d0864790a	move undef macros into Compat.h Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 14:09:56 +01:00
Lucca Jiménez Könings	a22ad66d2b	update README.md Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 14:09:09 +01:00
Lucca Jiménez Könings	b17c72f56e	document FreeBSD specific undefs Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 12:42:51 +01:00
Lucca Jiménez Könings	1bd8b024b8	fix typo Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 12:38:12 +01:00
Lucca Jiménez Könings	df524097fb	update README.md Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 12:35:19 +01:00
Lucca Jiménez Könings	38532babd3	fix tests on FreeBSD Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 10:51:04 +01:00
Lucca Jiménez Könings	924efe4331	add FreeBSD build target Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-01-19 09:46:27 +01:00
Lion Kortlepel	9915c83363	fix release arm64 workflow	2024-01-15 14:49:17 +01:00
Lion Kortlepel	9f5a30a871	fix windows build wrongly calling vcpg from the submodule	2024-01-15 14:49:17 +01:00
Lion Kortlepel	6832fd05d6	remove --build-id=none from build flags	2024-01-15 14:49:17 +01:00
Lion Kortlepel	c6aa7776fc	make update message adjustable by provider	2024-01-09 17:41:05 +01:00
Lion	b0f5976121	Update release.yml to fix release message	2024-01-09 15:35:47 +01:00
Lion Kortlepel	1bd47fa649	add noninteractive flag for debian/ubuntu	2024-01-09 15:35:47 +01:00
Lion Kortlepel	0e924d0d51	fix bootstrap call	2024-01-09 15:35:47 +01:00
Lion Kortlepel	70a7a41882	add vcpkg bootstrap step	2024-01-09 15:35:47 +01:00
Lion Kortlepel	6ee816d10d	add lua to vcpkg dependencies on windows	2024-01-09 15:35:47 +01:00
Lion Kortlepel	8695413211	add ubuntu 20.04, debian 12 scripts	2024-01-09 15:35:47 +01:00
Lion Kortlepel	52c5a995cc	fix wrong action dependency	2024-01-09 15:35:47 +01:00
Lion Kortlepel	9d5568dc56	make all ci/cd build actions matrix generic	2024-01-09 15:35:47 +01:00
Lion	c62a1b6add	add arm64 builds to github actions Update linux.yml to build ARM64 binaries for debian11 update linux.yml to fix incorrect runs-on tags add ubuntu 22.04 arm64 build Update linux.yml Update linux.yml Update linux.yml Update linux.yml Update linux.yml Update linux.yml Update 2-configure.sh Update 2-configure.sh Update 1-install-deps.sh Update 1-install-deps.sh Update 2-configure.sh Update 2-configure.sh Update linux.yml use get-cmake update vcpkg force arm64 triplet	2024-01-09 15:35:47 +01:00
Lion Kortlepel	4228e18c90	reset default ID to 0	2024-01-09 15:34:33 +01:00
Lion Kortlepel	023e968302	refactor position packet handling, add regression tests	2024-01-09 15:34:33 +01:00
Lion Kortlepel	a4eb10b6a4	fix MP.GetPositionRaw	2024-01-09 15:34:33 +01:00
Lion Kortlepel	0166e488d0	fix calling GlobalParser as static	2024-01-09 15:34:33 +01:00
Lion Kortlepel	0836fd3af8	fix bug in HandlePosition which caused the vehicle position not to be saved properly	2024-01-09 15:34:33 +01:00
Lion Kortlepel	9791b8875c	fix wrong order of SendErrorsShowMessage and SendErrors	2024-01-09 15:34:16 +01:00
Lion	01e8a1644a	Bump version to v3.2.2 (#253 )	2024-01-08 19:40:00 +01:00
Lion Kortlepel	cebb2634a1	bump version	2024-01-08 17:43:54 +01:00
Lion	21a7ca1b64	Update README.md to remove mention of scripts and add ARM instructions (#243 )	2023-12-30 15:07:39 +01:00
Lion	bd4ab2b10d	Update README.md	2023-12-30 10:22:12 +01:00
Lion	1cdc8e8f48	bump version number (#241 )	2023-12-29 01:43:40 +01:00
Lion Kortlepel	1f72a45231	bump version number	2023-12-29 01:43:03 +01:00
Lion	002223afda	Fix Server.log empty when stdout or stdin redirected (#235 )	2023-12-28 21:27:44 +01:00
Lion Kortlepel	ecc79b1918	update commandline to fix redirect issue	2023-12-28 21:23:31 +01:00
Lion	d5000aea87	Remove changelog (#232 ) now fully replaced by github releases due to issue-based workflow	2023-12-28 14:25:42 +01:00
Lion	810788a3e4	Add Tags Feature (#192 ) This PR adds a tags functionality to the BeamMP server config and heartbeat. The intended purpose of this is to enable better filtering on the server list based on keywords such as gamemode or roleplay.	2023-12-28 13:58:59 +01:00
Lion Kortlepel	e724a2e467	Merge remote-tracking branch 'origin/master' into feature-tags	2023-12-28 13:57:49 +01:00
Lion Kortlepel	54ba295fce	remove changelog now fully replaced by github releases due to issue-based workflow	2023-12-28 13:53:32 +01:00
Lion	f419550061	Allow env to override serverconfig (#227 )	2023-12-28 13:51:00 +01:00
Lion Kortlepel	8cccbe8542	Merge remote-tracking branch 'origin/master' into 226-allow-env-to-override-serverconfig	2023-12-28 13:49:02 +01:00
Lion Kortlepel	6787843b37	pretty-print tags on startup	2023-12-28 12:58:29 +01:00
Lion Kortlepel	16d3c6f796	Merge remote-tracking branch 'origin/master' into feature-tags	2023-12-28 12:36:22 +01:00
Lion	21e5101560	Make debug symbols available for release builds (#216 ) Closes #214	2023-12-28 12:30:40 +01:00
Lion	1adf19d416	Bump version to 3.2.0 (#231 ) Due to new features like ENV reading this is now a feature release, so minor	2023-12-28 12:16:05 +01:00
Lion	c7e228fbae	bump version to 3.2.0 due to new features like ENV reading this is now a feature release, so minor	2023-12-28 11:56:25 +01:00
Lion	6e04b2d93a	Fix GitHub Actions not downloading the latest tests to run them (#220 ) Closes #219	2023-12-28 11:55:02 +01:00
Lion	57a4c47cb0	Remove HTTP Server settings from config (#221 ) This is not implemented and won't be implemented	2023-12-28 11:50:33 +01:00
Lion	416e0399af	Remove [Feature Request] from issue title (#217 )	2023-12-28 11:47:51 +01:00
Lion	050b574cc0	Remove [Bug] title from issue template (#218 )	2023-12-28 11:47:39 +01:00
Lion	d65f3cf75b	Fix hot reload not working with symlinked entire plugins (#230 )	2023-12-28 11:42:39 +01:00
Lion Kortlepel	329d2eb268	fix hot reload not working with symlinked entire plugins	2023-12-28 11:22:00 +01:00
Lion Kortlepel	221f491019	return early after reading ENV in config	2023-12-25 16:19:53 +01:00
Lion Kortlepel	89db370e12	use env variables by default to override config values	2023-12-25 16:16:01 +01:00
Lion	aa84a65546	Update feature_request.md	2023-12-21 13:15:48 +01:00
Lion Kortlepel	b28c69a515	remove http settings from config	2023-12-21 13:07:35 +01:00
Lion Kortlepel	ac41547123	bump version to 3.1.4	2023-12-21 13:05:33 +01:00
Lion Kortlepel	2fc610f6bc	fix tests not downloading artifacts by not using artifacts	2023-12-21 13:01:50 +01:00
Lion Kortlepel	ddd3883aa9	fix failing gh actions test run	2023-12-21 13:01:50 +01:00
Lion	defadf094f	Fix exit after 10 seconds (#215 ) Also fixes initializing the console too early by @lionkor	2023-12-21 12:50:19 +01:00
Lion Kortlepel	81299db946	fix console initializing too early the console was initialized too early, leading to the server waiting for it to shut down if the authkey is invalid, among other issues.	2023-12-21 12:49:20 +01:00
Lion	c3895ec1ca	remove [Bug] title from issue template	2023-12-21 12:17:50 +01:00
Lion	c741fe5310	remove [Feature Request] from issue title	2023-12-21 12:17:11 +01:00
Lion Kortlepel	e1dfb1085e	modify release workflows to add debug info artifacts	2023-12-21 11:17:17 +01:00
Lion Kortlepel	142b6fa47a	modify build scripts to generate .debug files with debug info	2023-12-21 11:13:51 +01:00
Bennett	a6cbffc774	fix exit after 10 seconds	2023-12-21 02:01:21 -08:00
Starystars67	dc4ead532d	Changed default tag to Freeroam as that is the majority of servers.	2023-12-18 14:10:07 +00:00
Lion	f28d9bc7dc	Update README.md	2023-12-16 20:18:40 +00:00
Starystars67	8c73eb8aea	Added Tags Feature to the BeamMP Server. This allows better filtering on the server list.	2023-12-10 12:50:24 +01:00
Lion	43b1b050e2	Fix workflows to make release builds (#202 ) Currently the Windows workflow doesn't properly create a release binary.	2023-12-09 20:17:10 +01:00
Lion Kortlepel	9f87edc6e9	add msvcp140.dll comment to the release text	2023-12-09 20:09:56 +01:00
Lion Kortlepel	c6f78c5522	fix release build path	2023-12-09 20:06:50 +01:00
Lion Kortlepel	9f01268538	update version to 3.1.3	2023-12-09 20:01:53 +01:00
Lion Kortlepel	5523a4fe4b	force build release config on windows	2023-12-09 20:00:33 +01:00
Lion Kortlepel	7f11d0f002	make release builds by default	2023-12-09 19:22:50 +01:00
Lion Kortlepel	6b31ba35fd	attempt to fix workflows to make release builds	2023-12-09 19:18:33 +01:00
Lion	d2329f0723	Remove password setting from config to avoid confusion (#199 ) ...until implemented. The client afaik currently doesn't support this setting.	2023-12-09 19:05:54 +01:00
Luuk van Oijen	ef45efeb86	Update readme to new build system (#200 ) Now building is like 2 steps, so the readme reflects that now.	2023-12-09 18:33:46 +01:00
Lion	edcca75637	Update README.md	2023-12-08 17:18:54 +01:00
Lion	c1bacf1f3a	remove old instructions from readme, cleanup	2023-12-08 17:16:47 +01:00
Lion Kortlepel	795b651744	remove macos section	2023-12-05 18:35:57 +01:00
Lion Kortlepel	be108bb8b3	update readme to new build system	2023-12-05 18:34:06 +01:00
Lion Kortlepel	d8b8812026	remove password setting from config to avoid confusion ...until implemented	2023-12-05 18:23:23 +01:00
Lion	872c2d410d	New buildsystem (#197 )	2023-12-05 18:21:20 +01:00
Lion Kortlepel	f98704e0f3	fix warnings about implicit conversion	2023-12-05 18:05:35 +01:00
Lion Kortlepel	dea203c108	make IThreaded::~IThreaded virtual to make destruction happen	2023-12-05 18:03:13 +01:00
Lion Kortlepel	e245c9e9e2	fix pps monitor warning about virtual dtor	2023-12-05 18:02:35 +01:00
Lion Kortlepel	11fe5ad200	fix invalid timeout value	2023-12-05 18:00:34 +01:00
Lion Kortlepel	667da22b0e	Merge remote-tracking branch 'origin/master' into new-buildsystem	2023-12-05 17:59:05 +01:00
Lion Kortlepel	a6eb2f7bfe	switch to vcpkg+cmake, add debian build to workflows using lionkor's template (MIT licensed) This is a combination of 64 commits.	2023-12-05 17:57:19 +01:00
Lion Kortlepel	103d2dc030	update vcpkg in workflows	2023-12-03 17:50:45 +01:00
Lion Kortlepel	7f206fd0d4	bump version to 3.1.2	2023-12-03 17:49:12 +01:00
Lion Kortlepel	22805af716	fix crash in authentication	2023-12-03 17:43:41 +01:00
Lion	2c29a195f9	optimize: Add conditional variable to LuaResult (#162 ) Implementing TODO for optimization I saw in the code.	2023-03-27 13:31:21 +02:00
rgnter	222d2492ff	Merge branch 'master' into optimize/add_cv_to_luaresult	2023-03-21 20:17:17 +01:00
Simon	879b9772f5	Apply suggestions from code review Co-authored-by: Lion <development@kortlepel.com>	2023-01-15 17:12:35 +00:00
Anonymous275	c51cf090ef	fix linux build	2023-01-15 17:12:35 +00:00
Anonymous275	d677d8d58d	rename Hash function to HashPassword move HashPassword to cpp only move check to line 285	2023-01-15 17:12:35 +00:00
Anonymous275	4b30918659	- add 120 seconds timeout	2023-01-15 17:12:35 +00:00
Anonymous275	688e46f524	- fix linux build	2023-01-15 17:12:35 +00:00
Anonymous275	9f59c27b1f	- add hash function - add password config - add debug messages for password stages - add pass boolean for heartbeat - adjust network codes	2023-01-15 17:12:35 +00:00
Lion	6a11bcd20b	fix bad package name for Ubuntu in Readme (#161 ) The package name for liblua required to build is not correct. The correct name is [`liblua-5.3-dev`](https://packages.ubuntu.com/search?suite=all&searchon=names&keywords=liblua5.3)	2022-12-21 16:29:49 +01:00
rgnter	b7b578bf3e	add conditional variable to LuaResult	2022-12-18 14:45:33 +01:00
rgnter	6c145a6dbf	fix: Bad package name for Ubuntu	2022-12-18 12:32:45 +01:00
Lion	67d792e0e0	remove repeated dependency from README (#155 )	2022-11-14 14:32:19 +01:00
Qest333	eaeef0c7d0	Remove double dependency from README	2022-11-14 14:00:21 +01:00